From 23951608ba408184d5f8acba9a2541e8f1736717 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 22 Jul 2021 13:27:20 +0200 Subject: [PATCH 1/9] chore: use the new maintained library instead of the older one Signed-off-by: blam --- packages/core-components/package.json | 2 +- .../src/components/Table/Table.tsx | 2 +- yarn.lock | 21 +++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 944002c74f..c8f96537f9 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -50,7 +50,7 @@ "dagre": "^0.8.5", "immer": "^9.0.1", "lodash": "^4.17.15", - "material-table": "^1.69.1", + "@material-table/core": "^3.1.0", "pluralize": "^8.0.0", "prop-types": "^15.7.2", "qs": "^6.9.4", diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx index d8db602e93..f7ddb2d218 100644 --- a/packages/core-components/src/components/Table/Table.tsx +++ b/packages/core-components/src/components/Table/Table.tsx @@ -47,7 +47,7 @@ import MTable, { MTableHeader, MTableToolbar, Options, -} from 'material-table'; +} from '@material-table/core'; import React, { forwardRef, MutableRefObject, diff --git a/yarn.lock b/yarn.lock index c2dde8f4c4..c839327ef3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1730,7 +1730,7 @@ resolved "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz#b1a3d57730f3eaaab54d5658be4a71727297e357" integrity sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA== -"@date-io/date-fns@^1.1.0": +"@date-io/date-fns@^1.1.0", "@date-io/date-fns@^1.3.13": version "1.3.13" resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735" integrity sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA== @@ -3445,6 +3445,23 @@ resolved "https://registry.npmjs.org/@material-icons/font/-/font-1.0.3.tgz#f722e5a69a03f20ef47d015cb69420bebeeaabe5" integrity sha512-aIRd0Z9b/HJ/O24KOaP7dNsXypMnXhpWrpLVYvQB/JesVqXYSbioYND200sR+C14a0LSCp+qWnWCnSXmN1hWGw== +"@material-table/core@^3.1.0": + version "3.1.0" + resolved "https://registry.npmjs.org/@material-table/core/-/core-3.1.0.tgz#4fc3bd1553359e628413437a4102d8469852c253" + integrity sha512-46vpm1q9v2B5t/VgaEq2JmnftTBYle1yNAX3cfdQsTRZ1iWkpG34qBkNHx/hbOauQPsm5hmeUo1KJJZdwtGL1g== + dependencies: + "@babel/runtime" "^7.12.5" + "@date-io/date-fns" "^1.3.13" + "@material-ui/pickers" "^3.2.10" + "@material-ui/styles" "^4.11.4" + classnames "^2.2.6" + date-fns "^2.16.1" + debounce "^1.2.0" + fast-deep-equal "^3.1.3" + prop-types "^15.7.2" + react-beautiful-dnd "^13.0.0" + react-double-scrollbar "0.0.15" + "@material-ui/core@^4.11.0", "@material-ui/core@^4.11.3": version "4.11.4" resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4" @@ -3492,7 +3509,7 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@material-ui/pickers@^3.2.2", "@material-ui/pickers@^3.3.10": +"@material-ui/pickers@^3.2.10", "@material-ui/pickers@^3.2.2", "@material-ui/pickers@^3.3.10": version "3.3.10" resolved "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.3.10.tgz#f1b0f963348cc191645ef0bdeff7a67c6aa25485" integrity sha512-hS4pxwn1ZGXVkmgD4tpFpaumUaAg2ZzbTrxltfC5yPw4BJV+mGkfnQOB4VpWEYZw2jv65Z0wLwDE/piQiPPZ3w== From a9ce6d88924f7d313d3818fc52fc966dad4feffa Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 22 Jul 2021 17:06:12 +0200 Subject: [PATCH 2/9] chore: updating typescript and api-reports Signed-off-by: blam --- packages/core-components/api-report.md | 4 ++-- .../BitriseBuildsTableComponent.tsx | 4 ++-- .../src/components/BuildsPage/lib/CITable/CITable.tsx | 4 ++-- .../src/components/WorkflowRunsTable/WorkflowRunsTable.tsx | 4 ++-- .../src/components/WorkflowRunsTable/WorkflowRunsTable.tsx | 4 ++-- plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx | 4 ++-- .../src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx | 4 ++-- .../jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md index ccafa4cfa7..ee75877b1d 100644 --- a/packages/core-components/api-report.md +++ b/packages/core-components/api-report.md @@ -11,7 +11,7 @@ import { Breadcrumbs as Breadcrumbs_2 } from '@material-ui/core'; import { ButtonProps } from '@material-ui/core'; import { ButtonTypeMap } from '@material-ui/core'; import { CardHeaderProps } from '@material-ui/core'; -import { Column } from 'material-table'; +import { Column } from '@material-table/core'; import { CommonProps } from '@material-ui/core/OverridableComponent'; import { ComponentClass } from 'react'; import { ComponentProps } from 'react'; @@ -26,7 +26,7 @@ import { IconComponent } from '@backstage/core-plugin-api'; import { LinearProgressProps } from '@material-ui/core'; import { LinkProps as LinkProps_2 } from '@material-ui/core'; import { LinkProps as LinkProps_3 } from 'react-router-dom'; -import { MaterialTableProps } from 'material-table'; +import { MaterialTableProps } from '@material-table/core'; import { NavLinkProps } from 'react-router-dom'; import { ProfileInfoApi } from '@backstage/core-plugin-api'; import { PropsWithChildren } from 'react'; diff --git a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx index d6c7ab166b..0966de3377 100644 --- a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx +++ b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx @@ -219,10 +219,10 @@ export const BitriseBuildsTable = ({ }} totalCount={builds.value?.paging?.total_item_count || 0} page={page} - onChangePage={pageIndex => { + onPageChange={pageIndex => { handleChangePage(pageIndex, builds.value?.paging?.next); }} - onChangeRowsPerPage={handleChangeRowsPerPage} + onRowsPerPageChange={handleChangeRowsPerPage} columns={columns} data={builds.value?.data || []} onSearchChange={(searchTerm: string) => diff --git a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx index 40829e7e66..b33e1b40cc 100644 --- a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx +++ b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx @@ -260,8 +260,8 @@ export const CITable = ({ }, ]} data={builds} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangePageSize} + onPageChange={onChangePage} + onRowsPerPageChange={onChangePageSize} title={ diff --git a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx index acacc8bec5..8fbf89cdce 100644 --- a/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx +++ b/plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx @@ -138,8 +138,8 @@ export const WorkflowRunsTableView = ({ }, ]} data={runs ?? []} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangePageSize} + onPageChange={onChangePage} + onRowsPerPageChange={onChangePageSize} style={{ width: '100%' }} title={ diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx index 34191bd307..8f1aff780d 100644 --- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx +++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx @@ -130,8 +130,8 @@ export const WorkflowRunsTableView = ({ }, ]} data={runs ?? []} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangePageSize} + onPageChange={onChangePage} + onRowsPerPageChange={onChangePageSize} style={{ width: '100%' }} title={ diff --git a/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx b/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx index de819c4cc2..9a938256e9 100644 --- a/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx +++ b/plugins/ilert/src/components/IncidentsPage/IncidentsTable.tsx @@ -253,8 +253,8 @@ export const IncidentsTable = ({ } page={tableState.page} totalCount={incidentsCount} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangeRowsPerPage} + onPageChange={onChangePage} + onRowsPerPageChange={onChangeRowsPerPage} // localization={{ header: { actions: undefined } }} columns={columns} data={incidents} diff --git a/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx b/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx index 6d93385eb2..3099018e91 100644 --- a/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx +++ b/plugins/ilert/src/components/UptimeMonitorsPage/UptimeMonitorsTable.tsx @@ -165,8 +165,8 @@ export const UptimeMonitorsTable = ({ } page={tableState.page} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangeRowsPerPage} + onPageChange={onChangePage} + onRowsPerPageChange={onChangeRowsPerPage} localization={{ header: { actions: undefined } }} isLoading={isLoading} columns={columns} diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx index 3e5eeffdaa..0519ed3816 100644 --- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx +++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx @@ -208,8 +208,8 @@ export const CITableView = ({ }, ]} data={projects ?? []} - onChangePage={onChangePage} - onChangeRowsPerPage={onChangePageSize} + onPageChange={onChangePage} + onRowsPerPageChange={onChangePageSize} title={ Jenkins logo From 9ed40d1152494ca41a256ba2965e340298832f41 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 27 Jul 2021 14:13:14 +0200 Subject: [PATCH 3/9] chore: removing the toolbarRef, not sure what this did in the first place but it's ni loinger suypported Signed-off-by: blam --- .../src/components/Table/Table.tsx | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx index f7ddb2d218..6eda4e01cc 100644 --- a/packages/core-components/src/components/Table/Table.tsx +++ b/packages/core-components/src/components/Table/Table.tsx @@ -212,7 +212,6 @@ export interface TableProps } export function TableToolbar(toolbarProps: { - toolbarRef: MutableRefObject; setSearch: (value: string) => void; onSearchChanged: (value: string) => void; toggleFilters: () => void; @@ -220,7 +219,6 @@ export function TableToolbar(toolbarProps: { selectedFiltersLength: number; }) { const { - toolbarRef, setSearch, hasFilters, selectedFiltersLength, @@ -248,7 +246,6 @@ export function TableToolbar(toolbarProps: { @@ -256,11 +253,7 @@ export function TableToolbar(toolbarProps: { } return ( - + ); } @@ -298,13 +291,6 @@ export function Table({ const MTColumns = convertColumns(columns, theme); const [search, setSearch] = useState(calculatedInitialState.search); - const toolbarRef = useRef(); - - useEffect(() => { - if (toolbarRef.current) { - toolbarRef.current.onSearchChange(search); - } - }, [search, toolbarRef]); useEffect(() => { if (onStateChange) { @@ -440,7 +426,6 @@ export function Table({ toolbarProps => { return ( ({ /> ); }, - [toggleFilters, hasFilters, selectedFiltersLength, setSearch, toolbarRef], + [toggleFilters, hasFilters, selectedFiltersLength, setSearch], ); const hasNoRows = typeof data !== 'function' && data.length === 0; From b05210593de275cd3f51df2e06efcc560907e52e Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 27 Jul 2021 14:15:42 +0200 Subject: [PATCH 4/9] chore: bump the version of material-ui core to 4.12.2 Signed-off-by: blam --- docs/getting-started/app-custom-theme.md | 2 +- packages/app/package.json | 2 +- .../templates/default-plugin/package.json.hbs | 2 +- packages/core-app-api/package.json | 2 +- packages/core-components/package.json | 1 - packages/core-plugin-api/package.json | 2 +- .../default-app/packages/app/package.json.hbs | 2 +- packages/dev-utils/package.json | 2 +- packages/integration-react/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/theme/package.json | 2 +- packages/theme/src/baseTheme.ts | 2 +- plugins/api-docs/package.json | 2 +- plugins/badges/package.json | 2 +- plugins/bitrise/package.json | 2 +- plugins/catalog-import/package.json | 2 +- plugins/catalog-react/package.json | 2 +- plugins/catalog/package.json | 2 +- plugins/circleci/package.json | 2 +- plugins/cloudbuild/package.json | 2 +- plugins/code-coverage/package.json | 2 +- plugins/config-schema/package.json | 2 +- plugins/cost-insights/package.json | 2 +- plugins/explore/package.json | 2 +- plugins/fossa/package.json | 2 +- plugins/gcp-projects/package.json | 2 +- plugins/git-release-manager/package.json | 2 +- plugins/github-actions/package.json | 2 +- plugins/github-deployments/package.json | 2 +- plugins/gitops-profiles/package.json | 2 +- plugins/graphiql/package.json | 2 +- plugins/ilert/package.json | 2 +- plugins/jenkins/package.json | 2 +- plugins/kafka/package.json | 2 +- plugins/kubernetes/package.json | 2 +- plugins/lighthouse/package.json | 2 +- plugins/newrelic/package.json | 2 +- plugins/org/package.json | 2 +- plugins/pagerduty/package.json | 2 +- plugins/register-component/package.json | 2 +- plugins/rollbar/package.json | 2 +- plugins/scaffolder/package.json | 2 +- plugins/search/package.json | 2 +- plugins/sentry/package.json | 2 +- plugins/shortcuts/package.json | 2 +- plugins/sonarqube/package.json | 2 +- plugins/splunk-on-call/package.json | 2 +- plugins/tech-radar/package.json | 2 +- plugins/techdocs/package.json | 2 +- plugins/todo/package.json | 2 +- plugins/user-settings/package.json | 2 +- plugins/welcome/package.json | 2 +- plugins/xcmetrics/package.json | 2 +- yarn.lock | 18 +++++++++--------- 54 files changed, 61 insertions(+), 62 deletions(-) diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md index aa3851463f..7973a54ab6 100644 --- a/docs/getting-started/app-custom-theme.md +++ b/docs/getting-started/app-custom-theme.md @@ -35,7 +35,7 @@ If you want more control over the theme, and for example customize font sizes and margins, you can use the lower-level `createThemeOverrides` function exported by [@backstage/theme](https://www.npmjs.com/package/@backstage/theme) in combination with -[createMuiTheme](https://material-ui.com/customization/theming/#createmuitheme-options-args-theme) +[createTheme](https://material-ui.com/customization/theming/#createmuitheme-options-args-theme) from [@material-ui/core](https://www.npmjs.com/package/@material-ui/core). See the [@backstage/theme source](https://github.com/backstage/backstage/tree/master/packages/theme/src) diff --git a/packages/app/package.json b/packages/app/package.json index 388635e56b..4bd94adfc3 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -41,7 +41,7 @@ "@backstage/plugin-user-settings": "^0.3.0", "@backstage/search-common": "^0.1.2", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@octokit/rest": "^18.5.3", diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs index dbba628055..fdac5a0c67 100644 --- a/packages/cli/templates/default-plugin/package.json.hbs +++ b/packages/cli/templates/default-plugin/package.json.hbs @@ -27,7 +27,7 @@ "@backstage/core-components": "^{{version '@backstage/core-components'}}", "@backstage/core-plugin-api": "^{{version '@backstage/core-plugin-api'}}", "@backstage/theme": "^{{version '@backstage/theme'}}", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index 41e7c52393..ec00580332 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -33,7 +33,7 @@ "@backstage/config": "^0.1.3", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@types/react": "^16.9", "@types/prop-types": "^15.7.3", diff --git a/packages/core-components/package.json b/packages/core-components/package.json index c8f96537f9..9921f20ccb 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -33,7 +33,6 @@ "@backstage/core-plugin-api": "^0.1.2", "@backstage/errors": "^0.1.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@testing-library/react-hooks": "^3.4.2", diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index 7b2aa3deea..e382adfeef 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -31,7 +31,7 @@ "dependencies": { "@backstage/config": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@types/react": "^16.9", "history": "^5.0.0", "prop-types": "^15.7.2", diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 71cc86ba34..219f503aa0 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -23,7 +23,7 @@ "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}", "@backstage/test-utils": "^{{version '@backstage/test-utils'}}", "@backstage/theme": "^{{version '@backstage/theme'}}", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "history": "^5.0.0", "react": "^16.13.1", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index a80745284c..c8466b0aa3 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -37,7 +37,7 @@ "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/test-utils": "^0.1.15", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index e0161cb5ab..85077778f6 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -25,7 +25,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/integration": "^0.5.6", "@backstage/theme": "^0.2.3", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index cfe4f2198e..8624b71d89 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -33,7 +33,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/test-utils-core": "^0.1.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/packages/theme/package.json b/packages/theme/package.json index d433be4648..3b34dc84b3 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -28,7 +28,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@material-ui/core": "^4.11.0" + "@material-ui/core": "^4.12.2" }, "devDependencies": { "@backstage/cli": "^0.7.0" diff --git a/packages/theme/src/baseTheme.ts b/packages/theme/src/baseTheme.ts index 93132d8b7a..b2d964c4db 100644 --- a/packages/theme/src/baseTheme.ts +++ b/packages/theme/src/baseTheme.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createMuiTheme } from '@material-ui/core'; +import { createTheme as createMuiTheme } from '@material-ui/core'; import { darken, lighten } from '@material-ui/core/styles/colorManipulator'; import { Overrides } from '@material-ui/core/styles/overrides'; diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 4294daea20..06297e7be0 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -37,7 +37,7 @@ "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/theme": "^0.2.8", "@material-icons/font": "^1.0.2", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/badges/package.json b/plugins/badges/package.json index 3d38bc6d92..53c3a9f639 100644 --- a/plugins/badges/package.json +++ b/plugins/badges/package.json @@ -26,7 +26,7 @@ "@backstage/errors": "^0.1.1", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json index 00eb35f055..45eaf94771 100644 --- a/plugins/bitrise/package.json +++ b/plugins/bitrise/package.json @@ -25,7 +25,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "cross-fetch": "^3.0.6", diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index d6f371bc65..c9b5022116 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -38,7 +38,7 @@ "@backstage/integration-react": "^0.1.4", "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@octokit/rest": "^18.5.3", diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index d0cb5ac947..6ae75197af 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -34,7 +34,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/integration": "^0.5.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 821e029616..356ad1b0ab 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -39,7 +39,7 @@ "@backstage/integration-react": "^0.1.4", "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index 52aae08b57..9a9c7e9b3d 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -36,7 +36,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "circleci-api": "^4.0.0", diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index ee9f8a4e0c..aa661b7789 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -35,7 +35,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "moment": "^2.27.0", diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index bd632972df..8405466cd1 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -27,7 +27,7 @@ "@backstage/errors": "^0.1.1", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@material-ui/styles": "^4.11.0", diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 7ef279f123..46e3f8c8b6 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -25,7 +25,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/errors": "^0.1.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "jsonschema": "^1.2.6", diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json index 2f6fac1479..f73850af38 100644 --- a/plugins/cost-insights/package.json +++ b/plugins/cost-insights/package.json @@ -34,7 +34,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@material-ui/styles": "^4.9.6", diff --git a/plugins/explore/package.json b/plugins/explore/package.json index 2059632c08..0ee534cf1c 100644 --- a/plugins/explore/package.json +++ b/plugins/explore/package.json @@ -36,7 +36,7 @@ "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/plugin-explore-react": "^0.0.6", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json index cc4a27a5c0..d826ba12d4 100644 --- a/plugins/fossa/package.json +++ b/plugins/fossa/package.json @@ -37,7 +37,7 @@ "@backstage/errors": "^0.1.1", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "cross-fetch": "^3.0.6", diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json index 1d04d7f1d5..1089c0f15b 100644 --- a/plugins/gcp-projects/package.json +++ b/plugins/gcp-projects/package.json @@ -33,7 +33,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json index 5598fcd6ef..488c763e55 100644 --- a/plugins/git-release-manager/package.json +++ b/plugins/git-release-manager/package.json @@ -24,7 +24,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/integration": "^0.5.6", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@octokit/rest": "^18.5.3", diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index d85d1e53fe..bc96173252 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -38,7 +38,7 @@ "@backstage/integration": "^0.5.8", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@octokit/rest": "^18.5.3", diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json index 9561083063..a93241dc42 100644 --- a/plugins/github-deployments/package.json +++ b/plugins/github-deployments/package.json @@ -28,7 +28,7 @@ "@backstage/integration-react": "^0.1.4", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@octokit/graphql": "^4.5.8", diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json index e7e45ee2a6..343c6ba569 100644 --- a/plugins/gitops-profiles/package.json +++ b/plugins/gitops-profiles/package.json @@ -34,7 +34,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 46f44cdcf4..5c99b8c201 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -34,7 +34,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "graphiql": "^1.0.0-alpha.10", diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json index 01a8e7b013..d74d8dc107 100644 --- a/plugins/ilert/package.json +++ b/plugins/ilert/package.json @@ -27,7 +27,7 @@ "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", "@date-io/luxon": "2.x", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@material-ui/pickers": "^3.3.10", diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json index 6030beee8e..69555e3f01 100644 --- a/plugins/jenkins/package.json +++ b/plugins/jenkins/package.json @@ -36,7 +36,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "luxon": "^1.25.0", diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json index a7328b0c0c..6b12cd2421 100644 --- a/plugins/kafka/package.json +++ b/plugins/kafka/package.json @@ -25,7 +25,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index ee58c6b222..a4ea3a7522 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -38,7 +38,7 @@ "@backstage/plugin-kubernetes-common": "^0.1.2", "@backstage/theme": "^0.2.8", "@kubernetes/client-node": "^0.15.0", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "js-yaml": "^4.0.0", diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index 8ceaa35d20..a0fd092134 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -37,7 +37,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@testing-library/react-hooks": "^3.4.2", diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json index e927cf6eef..7fa4c558dc 100644 --- a/plugins/newrelic/package.json +++ b/plugins/newrelic/package.json @@ -34,7 +34,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/org/package.json b/plugins/org/package.json index f721675584..2cd0a8a072 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -25,7 +25,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json index 2a5c086e50..ba21218150 100644 --- a/plugins/pagerduty/package.json +++ b/plugins/pagerduty/package.json @@ -35,7 +35,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json index c9a4ca161b..1fb1e483c6 100644 --- a/plugins/register-component/package.json +++ b/plugins/register-component/package.json @@ -35,7 +35,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json index f95bba8076..85ba3f8e21 100644 --- a/plugins/rollbar/package.json +++ b/plugins/rollbar/package.json @@ -36,7 +36,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "lodash": "^4.17.15", diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index edb2f44d94..4bcfc05353 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -40,7 +40,7 @@ "@backstage/integration-react": "^0.1.4", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@rjsf/core": "^3.0.0", diff --git a/plugins/search/package.json b/plugins/search/package.json index a6ca45497a..982a26bdd2 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -37,7 +37,7 @@ "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/search-common": "^0.1.2", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/react": "^16.9", diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json index 989a18a6d9..94fcd0d300 100644 --- a/plugins/sentry/package.json +++ b/plugins/sentry/package.json @@ -36,7 +36,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "luxon": "^1.27.0", diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json index 293d71eeb9..21cfed0354 100644 --- a/plugins/shortcuts/package.json +++ b/plugins/shortcuts/package.json @@ -23,7 +23,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@types/zen-observable": "^0.8.2", diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json index a132da5702..186cb4dd0a 100644 --- a/plugins/sonarqube/package.json +++ b/plugins/sonarqube/package.json @@ -37,7 +37,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@material-ui/styles": "^4.10.0", diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json index d779df3f97..feba99c516 100644 --- a/plugins/splunk-on-call/package.json +++ b/plugins/splunk-on-call/package.json @@ -35,7 +35,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "classnames": "^2.2.6", diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json index 305061087b..ce467581e5 100644 --- a/plugins/tech-radar/package.json +++ b/plugins/tech-radar/package.json @@ -33,7 +33,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "color": "^3.1.2", diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 2621be9cee..ce01652c09 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -40,7 +40,7 @@ "@backstage/integration-react": "^0.1.4", "@backstage/plugin-catalog-react": "^0.3.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@material-ui/styles": "^4.10.0", diff --git a/plugins/todo/package.json b/plugins/todo/package.json index ece2509882..a3850c4da5 100644 --- a/plugins/todo/package.json +++ b/plugins/todo/package.json @@ -32,7 +32,7 @@ "@backstage/errors": "^0.1.1", "@backstage/plugin-catalog-react": "^0.3.0", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index 7a450a188e..7ebb1b120f 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -33,7 +33,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index 68cb992e40..afec6a65c0 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -33,7 +33,7 @@ "@backstage/core-components": "^0.1.6", "@backstage/core-plugin-api": "^0.1.3", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json index b939c3e5bf..5b1fe61e10 100644 --- a/plugins/xcmetrics/package.json +++ b/plugins/xcmetrics/package.json @@ -24,7 +24,7 @@ "@backstage/core-plugin-api": "^0.1.3", "@backstage/errors": "^0.1.1", "@backstage/theme": "^0.2.8", - "@material-ui/core": "^4.11.0", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "luxon": "^1.27.0", diff --git a/yarn.lock b/yarn.lock index c839327ef3..52d4c7b351 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3462,14 +3462,14 @@ react-beautiful-dnd "^13.0.0" react-double-scrollbar "0.0.15" -"@material-ui/core@^4.11.0", "@material-ui/core@^4.11.3": - version "4.11.4" - resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4" - integrity sha512-oqb+lJ2Dl9HXI9orc6/aN8ZIAMkeThufA5iZELf2LQeBn2NtjVilF5D2w7e9RpntAzDb4jK5DsVhkfOvFY/8fg== +"@material-ui/core@^4.11.0", "@material-ui/core@^4.11.3", "@material-ui/core@^4.12.2": + version "4.12.2" + resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.2.tgz#59a8b19f16b8c218d912f37f5ae70473c3c82c73" + integrity sha512-Q1npB8V73IC+eV2X6as+g71MpEGQwqKHUI2iujY62npk35V8nMx/bUXAHjv5kKG1BZ8s8XUWoG6s/VkjYPjjQA== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/styles" "^4.11.4" - "@material-ui/system" "^4.11.3" + "@material-ui/system" "^4.12.1" "@material-ui/types" "5.1.0" "@material-ui/utils" "^4.11.2" "@types/react-transition-group" "^4.2.0" @@ -3543,10 +3543,10 @@ jss-plugin-vendor-prefixer "^10.5.1" prop-types "^15.7.2" -"@material-ui/system@^4.11.3": - version "4.11.3" - resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143" - integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw== +"@material-ui/system@^4.12.1": + version "4.12.1" + resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c" + integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/utils" "^4.11.2" From e7e3f1d53eaf3dfbd74d07f6b070d5b8ba0bde69 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 27 Jul 2021 14:18:04 +0200 Subject: [PATCH 5/9] chore: bump core to latest Signed-off-by: blam --- packages/core-components/package.json | 1 + .../core-components/src/components/Table/Table.tsx | 10 ++++++++-- .../CostInsightsPage/CostInsightsThemeProvider.tsx | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 9921f20ccb..4548e1003d 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -33,6 +33,7 @@ "@backstage/core-plugin-api": "^0.1.2", "@backstage/errors": "^0.1.1", "@backstage/theme": "^0.2.8", + "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", "@testing-library/react-hooks": "^3.4.2", diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx index 6eda4e01cc..7e3dc7346a 100644 --- a/packages/core-components/src/components/Table/Table.tsx +++ b/packages/core-components/src/components/Table/Table.tsx @@ -54,7 +54,6 @@ import React, { ReactNode, useCallback, useEffect, - useRef, useState, } from 'react'; import { CheckboxTreeProps } from '../CheckboxTree/CheckboxTree'; @@ -212,6 +211,7 @@ export interface TableProps } export function TableToolbar(toolbarProps: { + toolbarRef: MutableRefObject; setSearch: (value: string) => void; onSearchChanged: (value: string) => void; toggleFilters: () => void; @@ -219,6 +219,7 @@ export function TableToolbar(toolbarProps: { selectedFiltersLength: number; }) { const { + toolbarRef, setSearch, hasFilters, selectedFiltersLength, @@ -246,6 +247,7 @@ export function TableToolbar(toolbarProps: { @@ -253,7 +255,11 @@ export function TableToolbar(toolbarProps: { } return ( - + ); } diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx index e56d72cc09..7c64c41116 100644 --- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx +++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsThemeProvider.tsx @@ -15,7 +15,10 @@ */ import React, { PropsWithChildren } from 'react'; -import { createMuiTheme, ThemeProvider } from '@material-ui/core'; +import { + createTheme as createMuiTheme, + ThemeProvider, +} from '@material-ui/core'; import { BackstageTheme } from '@backstage/theme'; import { costInsightsDarkTheme, From 9d40fcb1eaada94aa0d766fbd0d05a6a1a01f69f Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 27 Jul 2021 14:27:19 +0200 Subject: [PATCH 6/9] chore: added a huge changeset for all the packages affected by the material-ui changes Signed-off-by: blam --- .changeset/lazy-colts-help.md | 56 +++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .changeset/lazy-colts-help.md diff --git a/.changeset/lazy-colts-help.md b/.changeset/lazy-colts-help.md new file mode 100644 index 0000000000..007dcf7ffd --- /dev/null +++ b/.changeset/lazy-colts-help.md @@ -0,0 +1,56 @@ +--- +'@backstage/cli': patch +'@backstage/core-app-api': patch +'@backstage/core-components': patch +'@backstage/core-plugin-api': patch +'@backstage/create-app': patch +'@backstage/dev-utils': patch +'@backstage/integration-react': patch +'@backstage/test-utils': patch +'@backstage/theme': patch +'@backstage/plugin-api-docs': patch +'@backstage/plugin-badges': patch +'@backstage/plugin-bitrise': patch +'@backstage/plugin-catalog': patch +'@backstage/plugin-catalog-import': patch +'@backstage/plugin-catalog-react': patch +'@backstage/plugin-circleci': patch +'@backstage/plugin-cloudbuild': patch +'@backstage/plugin-code-coverage': patch +'@backstage/plugin-config-schema': patch +'@backstage/plugin-cost-insights': patch +'@backstage/plugin-explore': patch +'@backstage/plugin-fossa': patch +'@backstage/plugin-gcp-projects': patch +'@backstage/plugin-git-release-manager': patch +'@backstage/plugin-github-actions': patch +'@backstage/plugin-github-deployments': patch +'@backstage/plugin-gitops-profiles': patch +'@backstage/plugin-graphiql': patch +'@backstage/plugin-ilert': patch +'@backstage/plugin-jenkins': patch +'@backstage/plugin-kafka': patch +'@backstage/plugin-kubernetes': patch +'@backstage/plugin-lighthouse': patch +'@backstage/plugin-newrelic': patch +'@backstage/plugin-org': patch +'@backstage/plugin-pagerduty': patch +'@backstage/plugin-register-component': patch +'@backstage/plugin-rollbar': patch +'@backstage/plugin-scaffolder': patch +'@backstage/plugin-search': patch +'@backstage/plugin-sentry': patch +'@backstage/plugin-shortcuts': patch +'@backstage/plugin-sonarqube': patch +'@backstage/plugin-splunk-on-call': patch +'@backstage/plugin-tech-radar': patch +'@backstage/plugin-techdocs': patch +'@backstage/plugin-todo': patch +'@backstage/plugin-user-settings': patch +'@backstage/plugin-welcome': patch +'@backstage/plugin-xcmetrics': patch +--- + +- Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke Pagination of the Table. + +- Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core` From e4161fcb04f4e5153ccd8643ddaafd6177d4c547 Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Wed, 28 Jul 2021 10:23:19 +0200 Subject: [PATCH 7/9] Update lazy-colts-help.md Signed-off-by: Ben Lambert --- .changeset/lazy-colts-help.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.changeset/lazy-colts-help.md b/.changeset/lazy-colts-help.md index 007dcf7ffd..1a932ecc19 100644 --- a/.changeset/lazy-colts-help.md +++ b/.changeset/lazy-colts-help.md @@ -54,3 +54,5 @@ - Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke Pagination of the Table. - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core` + +- For anyone not using our `Table` component and relying on `material-table` directly, please update to use `@material-table/core` and follow this migration guide https://material-table-core.com/docs/breaking-changes#onchangerowsperpage From 1f9e626047ec9c8e3d7c3494edbf987ba9c6db9b Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Wed, 28 Jul 2021 10:55:47 +0200 Subject: [PATCH 8/9] fix changeset and make core-components minor Signed-off-by: Ben Lambert --- .changeset/lazy-colts-help.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.changeset/lazy-colts-help.md b/.changeset/lazy-colts-help.md index 1a932ecc19..18bc47e046 100644 --- a/.changeset/lazy-colts-help.md +++ b/.changeset/lazy-colts-help.md @@ -1,7 +1,7 @@ --- '@backstage/cli': patch '@backstage/core-app-api': patch -'@backstage/core-components': patch +'@backstage/core-components': minor '@backstage/core-plugin-api': patch '@backstage/create-app': patch '@backstage/dev-utils': patch @@ -51,8 +51,10 @@ '@backstage/plugin-xcmetrics': patch --- -- Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke Pagination of the Table. - +- Bumping `material-ui/core` version to at least `4.12.2` as they made some breaking changes in later versions which broke `Pagination` of the `Table`. - Switching out `material-table` to `@material-table/core` for support for the later versions of `material-ui/core` +- This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components. +- `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange` +- `onChangePage` has been renamed to `onPageChange` +- Information on migraiton guide here: https://material-table-core.com/docs/breaking-changes -- For anyone not using our `Table` component and relying on `material-table` directly, please update to use `@material-table/core` and follow this migration guide https://material-table-core.com/docs/breaking-changes#onchangerowsperpage From a5864a50bf7d982cf9793f2633f9e7b32e01fa46 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 28 Jul 2021 11:55:44 +0200 Subject: [PATCH 9/9] chore: udpate changeset formatting to make linting happy Signed-off-by: blam --- .changeset/lazy-colts-help.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.changeset/lazy-colts-help.md b/.changeset/lazy-colts-help.md index 18bc47e046..202a628526 100644 --- a/.changeset/lazy-colts-help.md +++ b/.changeset/lazy-colts-help.md @@ -56,5 +56,4 @@ - This causes a minor API change to `@backstage/core-components` as the interface for `Table` re-exports the `prop` from the underlying `Table` components. - `onChangeRowsPerPage` has been renamed to `onRowsPerPageChange` - `onChangePage` has been renamed to `onPageChange` -- Information on migraiton guide here: https://material-table-core.com/docs/breaking-changes - +- Migration guide is here: https://material-table-core.com/docs/breaking-changes