From 07951b19ba13d746fb58201d44d83d69629bd317 Mon Sep 17 00:00:00 2001 From: Binishma SS Date: Thu, 28 Mar 2024 14:13:04 +0530 Subject: [PATCH 1/4] cliend id and secret update Signed-off-by: Binishma SS --- app-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 7950768350..7f0b76edf7 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -332,8 +332,8 @@ auth: clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET} github: development: - clientId: ${AUTH_GITHUB_CLIENT_ID} - clientSecret: ${AUTH_GITHUB_CLIENT_SECRET} + clientId: 66697c49158239373b26 + clientSecret: 67e38219a58de5ed3e960956ed4b68060a097a26 enterpriseInstanceUrl: ${AUTH_GITHUB_ENTERPRISE_INSTANCE_URL} gitlab: development: From 962b014244c9caeb68a4200b2b860ef74b886eaf Mon Sep 17 00:00:00 2001 From: Binishma SS Date: Thu, 28 Mar 2024 14:28:23 +0530 Subject: [PATCH 2/4] cliend id and secret update set to default Signed-off-by: Binishma SS --- app-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 7f0b76edf7..123e726f32 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -332,8 +332,8 @@ auth: clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET} github: development: - clientId: 66697c49158239373b26 - clientSecret: 67e38219a58de5ed3e960956ed4b68060a097a26 + clientId: ${AUTH_GOOGLE_CLIENT_ID} + clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET} enterpriseInstanceUrl: ${AUTH_GITHUB_ENTERPRISE_INSTANCE_URL} gitlab: development: From 293347f938c7f4dd7cff31e421d75995aa91ea52 Mon Sep 17 00:00:00 2001 From: Binishma SS Date: Mon, 1 Apr 2024 14:07:07 +0530 Subject: [PATCH 3/4] Adds the no-top-level-material-ui-4-import ESLint rule to the home-react plugin to aid with the migration to Material UI v5. Issue: #23467 Signed-off-by: Binishma SS --- .changeset/giant-pots-count.md | 5 +++++ plugins/home-react/.eslintrc.js | 6 +++++- plugins/home-react/src/components/SettingsModal.tsx | 12 +++++------- plugins/home-react/src/extensions.tsx | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 .changeset/giant-pots-count.md diff --git a/.changeset/giant-pots-count.md b/.changeset/giant-pots-count.md new file mode 100644 index 0000000000..432d6f1f47 --- /dev/null +++ b/.changeset/giant-pots-count.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-home-react': patch +--- + +Added ESLint rule `no-top-level-material-ui-4-imports` in the `home-react` plugin to migrate the Material UI imports. diff --git a/plugins/home-react/.eslintrc.js b/plugins/home-react/.eslintrc.js index e2a53a6ad2..6f6668b53d 100644 --- a/plugins/home-react/.eslintrc.js +++ b/plugins/home-react/.eslintrc.js @@ -1 +1,5 @@ -module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, { + rules: { + '@backstage/no-top-level-material-ui-4-imports': 'error', + }, +}); diff --git a/plugins/home-react/src/components/SettingsModal.tsx b/plugins/home-react/src/components/SettingsModal.tsx index 43cb16bb40..b119e6d646 100644 --- a/plugins/home-react/src/components/SettingsModal.tsx +++ b/plugins/home-react/src/components/SettingsModal.tsx @@ -15,13 +15,11 @@ */ import React from 'react'; -import { - Button, - Dialog, - DialogActions, - DialogContent, - DialogTitle, -} from '@material-ui/core'; +import Button from '@material-ui/core/Button'; +import Dialog from '@material-ui/core/Dialog'; +import DialogActions from '@material-ui/core/DialogActions'; +import DialogContent from '@material-ui/core/DialogContent'; +import DialogTitle from '@material-ui/core/DialogTitle'; /** @public */ export const SettingsModal = (props: { diff --git a/plugins/home-react/src/extensions.tsx b/plugins/home-react/src/extensions.tsx index 399857bb94..404b5752ea 100644 --- a/plugins/home-react/src/extensions.tsx +++ b/plugins/home-react/src/extensions.tsx @@ -15,7 +15,7 @@ */ import React, { Suspense } from 'react'; -import { IconButton } from '@material-ui/core'; +import IconButton from '@material-ui/core/IconButton'; import SettingsIcon from '@material-ui/icons/Settings'; import { InfoCard } from '@backstage/core-components'; import { SettingsModal } from './components'; From 959b35ccdbb45e2c538053dce32369cb9e3dc2b0 Mon Sep 17 00:00:00 2001 From: Binishma SS Date: Mon, 1 Apr 2024 14:14:48 +0530 Subject: [PATCH 4/4] Fix for App-config Signed-off-by: Binishma SS --- app-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 123e726f32..7950768350 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -332,8 +332,8 @@ auth: clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET} github: development: - clientId: ${AUTH_GOOGLE_CLIENT_ID} - clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET} + clientId: ${AUTH_GITHUB_CLIENT_ID} + clientSecret: ${AUTH_GITHUB_CLIENT_SECRET} enterpriseInstanceUrl: ${AUTH_GITHUB_ENTERPRISE_INSTANCE_URL} gitlab: development: