Merge pull request #34 from minkimcello/modify-generateStats

Display project & member stats in plugin
minkimcello · Apr 15, 2024 · f7d5a70 · f7d5a70
2 parents 72adc95 + d3a12c3
commit f7d5a70
Show file tree

Hide file tree

Showing 34 changed files with 918 additions and 98 deletions.
diff --git a/generated/landscape_stats.json b/generated/landscape_stats.json
@@ -72,6 +72,12 @@
       }
     }
   },
+  "cncfProjectMaturitySummary": {
+    "sandbox": 117,
+    "incubating": 38,
+    "graduated": 27,
+    "archived": 8
+  },
   "cncfSpecialSummary": {
     "count": 289,
     "commonKeys": [

diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
     "@types/node": "^20.10.4",
     "cncf-common": "*",
     "concurrently": "^8.0.0",
+    "landscape3-eslint-rules": "0.1.0",
     "lerna": "^7.3.0",
     "maketypes": "^1.1.2",
     "node-gyp": "^9.0.0",

diff --git a/packages/app/.eslintrc.js b/packages/app/.eslintrc.js
@@ -1,5 +1,3 @@
 module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
-  rules: {
-    'indent': ['error', 2],
-  }
+  rules: require('landscape3-eslint-rules'),
 });
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -34,8 +34,11 @@
     "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.1",
     "@backstage/plugin-techdocs-react": "^1.1.12",
     "@backstage/theme": "^0.4.3",
-    "@material-ui/core": "^4.12.2",
-    "@material-ui/icons": "^4.9.1",
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/material": "^5.15.15",
+    "@mui/styles": "^5.15.15",
     "backstage-plugin-cncf-stats": "^0.1.0",
     "history": "^5.0.0",
     "react": "^17.0.2",
@@ -52,7 +55,8 @@
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
     "@types/react-dom": "*",
-    "cross-env": "^7.0.0"
+    "cross-env": "^7.0.0",
+    "landscape3-eslint-rules": "0.1.0"
   },
   "browserslist": {
     "production": [

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -25,7 +25,7 @@ import { createApp } from '@backstage/app-defaults';
 import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { UnifiedThemeProvider } from '@backstage/theme';
-import { CssBaseline } from '@material-ui/core';
+import CssBaseline from '@mui/material/CssBaseline';
 import cncfTheme from './theme';
 import { CncfStatsPage } from 'backstage-plugin-cncf-stats';
 

diff --git a/packages/app/src/components/Root/LogoFull.tsx b/packages/app/src/components/Root/LogoFull.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@mui/styles';
 
 const useStyles = makeStyles({
   svg: {

diff --git a/packages/app/src/components/Root/LogoIcon.tsx b/packages/app/src/components/Root/LogoIcon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@mui/styles';
 
 const useStyles = makeStyles({
   svg: {

diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
@@ -1,9 +1,9 @@
 import React, { PropsWithChildren } from 'react';
-import { makeStyles } from '@material-ui/core';
-import HomeIcon from '@material-ui/icons/Home';
-import LibraryBooks from '@material-ui/icons/LibraryBooks';
-import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
-import ChartIcon from '@material-ui/icons/Assessment';
+import { makeStyles } from '@mui/styles';
+import HomeIcon from '@mui/icons-material/Home';
+import LibraryBooks from '@mui/icons-material/LibraryBooks';
+import CreateComponentIcon from '@mui/icons-material/AddCircleOutline';
+import ChartIcon from '@mui/icons-material/Assessment';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
 import { SidebarSearchModal } from '@backstage/plugin-search';
@@ -17,8 +17,8 @@ import {
   useSidebarOpenState,
   Link,
 } from '@backstage/core-components';
-import MenuIcon from '@material-ui/icons/Menu';
-import SearchIcon from '@material-ui/icons/Search';
+import MenuIcon from '@mui/icons-material/Menu';
+import SearchIcon from '@mui/icons-material/Search';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -58,10 +58,10 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
       <SidebarDivider />
       <SidebarGroup label="Menu" icon={<MenuIcon />}>
         {/* Global nav, not org-specific */}
-        <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
-        <SidebarItem icon={ChartIcon} to="stats" text="Stats" />
-        <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
-        <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
+        <SidebarItem icon={() => <HomeIcon />} to="catalog" text="Home" />
+        <SidebarItem icon={() => <ChartIcon />} to="stats" text="Stats" />
+        <SidebarItem icon={() => <LibraryBooks />} to="docs" text="Docs" />
+        <SidebarItem icon={() => <CreateComponentIcon />} to="create" text="Create..." />
         {/* End global nav */}
       </SidebarGroup>
     </Sidebar>

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Button, Grid } from '@material-ui/core';
+import Button from '@mui/material/Button';
+import Grid from '@mui/material/Grid';
 import {
   EntityApiDefinitionCard,
   EntityConsumedApisCard,

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
@@ -1,5 +1,8 @@
 import React from 'react';
-import { makeStyles, Theme, Grid, Paper } from '@material-ui/core';
+import Grid from '@mui/material/Grid';
+import Paper from '@mui/material/Paper';
+import { Theme } from '@mui/material/styles';
+import { makeStyles } from '@mui/styles';
 
 import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
 import {

diff --git a/packages/app/src/theme.ts b/packages/app/src/theme.ts
@@ -5,34 +5,31 @@ import {
   genPageTheme, 
   shapes 
 } from "@backstage/theme";
-import { PaletteOptions } from "@material-ui/core/styles/createPalette";
-
-const cncfPalette: PaletteOptions = {
-  ...palettes.light,
-  primary: {
-    main: "#d62293",
-  },
-  secondary: {
-    main: "#4d6a85",
-  },
-  background: {
-    default: "#fff",
-  },
-  navigation: {
-    ...palettes.light.navigation,
-    background: "#fff",
-    color: "#196bcc",
-    indicator: "#4d6a85",
-    selectedColor: "#4d6a85",
-    navItem: {
-      hoverBackground: "#000",
-    }
-  }
-};
 
 const cncfTheme = createUnifiedTheme({
   ...createBaseThemeOptions({
-    palette: cncfPalette,
+    palette: {
+      ...palettes.light,
+      primary: {
+        main: "#d62293",
+      },
+      secondary: {
+        main: "#4d6a85",
+      },
+      background: {
+        default: "#fff",
+      },
+      navigation: {
+        ...palettes.light.navigation,
+        background: "#fff",
+        color: "#196bcc",
+        indicator: "#4d6a85",
+        selectedColor: "#4d6a85",
+        navItem: {
+          hoverBackground: "#000",
+        }
+      },
+    },
   }),
   defaultPageTheme: "home",
   pageTheme: {
@@ -43,4 +40,4 @@ const cncfTheme = createUnifiedTheme({
   },
 });
 
-export default cncfTheme;
+export default cncfTheme;
diff --git a/packages/backend/.eslintrc.js b/packages/backend/.eslintrc.js
@@ -1,5 +1,3 @@
 module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
-  rules: {
-    'indent': ['error', 2],
-  }
+  rules: require('landscape3-eslint-rules'),
 });
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -48,7 +48,8 @@
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
-    "@types/luxon": "^2.0.4"
+    "@types/luxon": "^2.0.4",
+    "landscape3-eslint-rules": "0.1.0"
   },
   "files": [
     "dist"

diff --git a/packages/cncf-common/.eslintrc.js b/packages/cncf-common/.eslintrc.js
@@ -1,5 +1,3 @@
 module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
-  rules: {
-    'indent': ['error', 2],
-  }
+  rules: require('landscape3-eslint-rules'),
 });
diff --git a/packages/cncf-common/package.json b/packages/cncf-common/package.json
@@ -23,7 +23,8 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.23.0"
+    "@backstage/cli": "^0.23.0",
+    "landscape3-eslint-rules": "0.1.0"
   },
   "files": [
     "dist"

diff --git a/packages/cncf-common/src/index.ts b/packages/cncf-common/src/index.ts
@@ -6,4 +6,5 @@ export type {
   StatsCategoryBreakdown,
   StatsSubcategoryBreakdown,
   CncfProject,
+  StatsProjectMaturityBreakdown,
 } from './types';
diff --git a/packages/cncf-common/src/types.ts b/packages/cncf-common/src/types.ts
@@ -120,3 +120,7 @@ export interface CategoryStats {
   categoryBreakdown: StatsCategoryBreakdown;
   subcategoryBreakdown: StatsSubcategoryBreakdown;
 }
+
+export interface StatsProjectMaturityBreakdown {
+  [key:string]: number;
+}
diff --git a/packages/landscape3-eslint-rules/.eslintrc.js b/packages/landscape3-eslint-rules/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: require('landscape3-eslint-rules'),
+});
diff --git a/packages/landscape3-eslint-rules/README.md b/packages/landscape3-eslint-rules/README.md
@@ -0,0 +1,12 @@
+# eslint-rules
+
+_This package was created through the Backstage CLI_.
+
+## Installation
+
+Install the package via Yarn:
+
+```sh
+cd <package-dir> # if within a monorepo
+yarn add eslint-rules
+```
diff --git a/packages/landscape3-eslint-rules/package.json b/packages/landscape3-eslint-rules/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "landscape3-eslint-rules",
+  "version": "0.1.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "private": true,
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "backstage": {
+    "role": "node-library"
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.23.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/landscape3-eslint-rules/src/index.ts b/packages/landscape3-eslint-rules/src/index.ts
@@ -0,0 +1,6 @@
+module.exports = {
+  'no-console': 0,
+  'indent': ['error', 2],
+  'no-multiple-empty-lines': ['error', { 'max': 1 }],
+  'eol-last': ['error', 'always']
+};
diff --git a/packages/landscape3-eslint-rules/src/setupTests.ts b/packages/landscape3-eslint-rules/src/setupTests.ts
@@ -0,0 +1 @@
+export {};
diff --git a/plugins/cncf-stats-backend/.eslintrc.js b/plugins/cncf-stats-backend/.eslintrc.js
@@ -1 +1,3 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: require('landscape3-eslint-rules'),
+});
diff --git a/plugins/cncf-stats-backend/package.json b/plugins/cncf-stats-backend/package.json
@@ -36,6 +36,7 @@
   "devDependencies": {
     "@backstage/cli": "^0.23.0",
     "@types/supertest": "^2.0.12",
+    "landscape3-eslint-rules": "0.1.0",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"
   },

diff --git a/plugins/cncf-stats/.eslintrc.js b/plugins/cncf-stats/.eslintrc.js
@@ -1 +1,3 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: require('landscape3-eslint-rules'),
+});
diff --git a/plugins/cncf-stats/package.json b/plugins/cncf-stats/package.json
@@ -27,9 +27,13 @@
     "@backstage/core-components": "^0.13.6",
     "@backstage/core-plugin-api": "^1.7.0",
     "@backstage/theme": "^0.4.3",
-    "@material-ui/core": "^4.12.2",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "4.0.0-alpha.61",
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/lab": "^5.0.0-alpha.170",
+    "@mui/material": "^5.15.15",
+    "@mui/styles": "^5.15.15",
+    "@mui/x-charts": "^6.19.3",
     "cncf-common": "*",
     "react-use": "^17.2.4"
   },
@@ -44,6 +48,7 @@
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
+    "landscape3-eslint-rules": "0.1.0",
     "msw": "^1.0.0"
   },
   "files": [