Merge branch 'backstage:master' into plugin-azure-functions

packages/app/CHANGELOG.md

@@ -1,5 +1,67 @@
 # example-app
 
+## 0.2.76-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-user-settings@0.5.0-next.1
+  - @backstage/plugin-scaffolder@1.7.0-next.1
+  - @backstage/plugin-catalog-react@1.2.0-next.1
+  - @backstage/core-app-api@1.1.1-next.1
+  - @backstage/cli@0.20.0-next.1
+  - @backstage/plugin-tech-insights@0.3.1-next.1
+  - @backstage/plugin-gcalendar@0.3.6-next.1
+  - @backstage/plugin-api-docs@0.8.10-next.1
+  - @backstage/plugin-search-react@1.2.0-next.1
+  - @backstage/plugin-search-common@1.1.0-next.1
+  - @backstage/plugin-airbrake@0.3.10-next.1
+  - @backstage/plugin-azure-devops@0.2.1-next.1
+  - @backstage/plugin-badges@0.2.34-next.1
+  - @internal/plugin-catalog-customized@0.0.3-next.1
+  - @backstage/plugin-catalog-graph@0.2.22-next.1
+  - @backstage/plugin-catalog-import@0.8.13-next.1
+  - @backstage/plugin-circleci@0.3.10-next.1
+  - @backstage/plugin-cloudbuild@0.3.10-next.1
+  - @backstage/plugin-code-coverage@0.2.3-next.1
+  - @backstage/plugin-dynatrace@1.0.0-next.1
+  - @backstage/plugin-explore@0.3.41-next.1
+  - @backstage/plugin-github-actions@0.5.10-next.1
+  - @backstage/plugin-gocd@0.1.16-next.1
+  - @backstage/plugin-home@0.4.26-next.1
+  - @backstage/plugin-jenkins@0.7.9-next.1
+  - @backstage/plugin-kafka@0.3.10-next.1
+  - @backstage/plugin-kubernetes@0.7.3-next.1
+  - @backstage/plugin-lighthouse@0.3.10-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.3-next.1
+  - @backstage/plugin-org@0.5.10-next.1
+  - @backstage/plugin-pagerduty@0.5.3-next.1
+  - @backstage/plugin-playlist@0.1.1-next.1
+  - @backstage/plugin-rollbar@0.4.10-next.1
+  - @backstage/plugin-search@1.0.3-next.1
+  - @backstage/plugin-sentry@0.4.3-next.1
+  - @backstage/plugin-techdocs@1.3.3-next.1
+  - @backstage/plugin-todo@0.2.12-next.1
+  - @backstage/app-defaults@1.0.7-next.1
+  - @backstage/core-components@0.11.2-next.1
+  - @backstage/core-plugin-api@1.0.7-next.1
+  - @backstage/plugin-apache-airflow@0.2.3-next.1
+  - @backstage/plugin-cost-insights@0.11.32-next.1
+  - @backstage/plugin-gcp-projects@0.3.29-next.1
+  - @backstage/plugin-graphiql@0.2.42-next.1
+  - @backstage/plugin-newrelic@0.3.28-next.1
+  - @backstage/plugin-shortcuts@0.3.2-next.1
+  - @backstage/plugin-stack-overflow@0.1.6-next.1
+  - @backstage/plugin-tech-radar@0.5.17-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.5-next.1
+  - @backstage/catalog-model@1.1.2-next.1
+  - @backstage/config@1.0.3-next.1
+  - @backstage/integration-react@1.1.5-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.7-next.1
+  - @backstage/plugin-permission-react@0.4.6-next.1
+  - @backstage/plugin-techdocs-react@1.0.5-next.1
+
 ## 0.2.76-next.0
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.76-next.0",
+  "version": "0.2.76-next.1",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -68,6 +68,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@octokit/rest": "^19.0.3",
+    "@oriflame/backstage-plugin-score-card": "^0.5.1",
     "@roadiehq/backstage-plugin-buildkite": "^2.0.8",
     "@roadiehq/backstage-plugin-github-insights": "^2.0.5",
     "@roadiehq/backstage-plugin-github-pull-requests": "^2.2.7",

packages/app/src/App.tsx

@@ -106,6 +106,7 @@ import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
 import { PlaylistIndexPage } from '@backstage/plugin-playlist';
 import { TwoColumnLayout } from './components/scaffolder/customScaffolderLayouts';
+import { ScoreBoardPage } from '@oriflame/backstage-plugin-score-card';
 
 const app = createApp({
   apis,
@@ -273,6 +274,7 @@ const routes = (
     <Route path="/azure-pull-requests" element={<AzurePullRequestsPage />} />
     <Route path="/apache-airflow" element={<ApacheAirflowPage />} />
     <Route path="/playlist" element={<PlaylistIndexPage />} />
+    <Route path="/score-board" element={<ScoreBoardPage />} />
   </FlatRoutes>
 );
 

packages/app/src/components/Root/Root.tsx

@@ -51,6 +51,7 @@ import {
 import { MyGroupsSidebarItem } from '@backstage/plugin-org';
 import GroupIcon from '@material-ui/icons/People';
 import { SearchModal } from '../search/SearchModal';
+import Score from '@material-ui/icons/Score';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -120,6 +121,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
             text="Cost Insights"
           />
           <SidebarItem icon={GraphiQLIcon} to="graphiql" text="GraphiQL" />
+          <SidebarItem icon={Score} to="score-board" text="Score board" />
         </SidebarScrollWrapper>
         <SidebarDivider />
         <Shortcuts />

packages/app/src/components/catalog/EntityPage.tsx

@@ -144,6 +144,7 @@ import {
   EntityNewRelicDashboardCard,
 } from '@backstage/plugin-newrelic-dashboard';
 import { EntityGoCdContent, isGoCdAvailable } from '@backstage/plugin-gocd';
+import { EntityScoreCardContent } from '@oriflame/backstage-plugin-score-card';
 
 import React, { ReactNode, useMemo, useState } from 'react';
 
@@ -704,6 +705,13 @@ const systemPage = (
         </Grid>
       </Grid>
     </EntityLayout.Route>
+    <EntityLayout.Route path="/score" title="Score">
+      <Grid container spacing={3} alignItems="stretch">
+        <Grid item xs={12}>
+          <EntityScoreCardContent />
+        </Grid>
+      </Grid>
+    </EntityLayout.Route>
     <EntityLayout.Route path="/diagram" title="Diagram">
       <EntityCatalogGraphCard
         variant="gridItem"