Skip to content

Commit 7839e1b

Browse files
drodildrodil
committed
feat: rollback to mui4
for easier migration to bui in the future
1 parent 3247744 commit 7839e1b

46 files changed

Lines changed: 3262 additions & 846 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎plugins/toolbox/dev/index.tsx‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createDevApp } from '@backstage/dev-utils';
1+
/** import { createDevApp } from '@backstage/dev-utils';
22
import {
33
defaultTools,
44
ToolboxPage,
@@ -75,10 +75,14 @@ createDevApp()
7575
path: '/home',
7676
})
7777
.render();
78-
78+
*/
7979
// NEW FRONTEND SYSTEM
80-
/** import { createApp } from '@backstage/frontend-defaults';
80+
import { createApp } from '@backstage/frontend-defaults';
8181
import { createRoot } from 'react-dom/client';
82+
import { CatalogApiMock } from './CatalogApiMock';
83+
import { catalogApiRef } from '@backstage/plugin-catalog-react';
84+
import catalogPlugin from '@backstage/plugin-catalog/alpha';
85+
import '@backstage/ui/css/styles.css';
8286

8387
import plugin from '../src/alpha';
8488
import { createFrontendModule } from '@backstage/frontend-plugin-api';
@@ -92,16 +96,28 @@ const extraTool = ToolboxToolBlueprint.make({
9296
},
9397
});
9498

99+
const myCatalogPlugin = catalogPlugin.withOverrides({
100+
extensions: [
101+
catalogPlugin.getExtension('api:catalog').override({
102+
params: defineParams =>
103+
defineParams({
104+
api: catalogApiRef,
105+
deps: {},
106+
factory: () => new CatalogApiMock(),
107+
}),
108+
}),
109+
],
110+
});
111+
95112
const myModule = createFrontendModule({
96113
pluginId: 'toolbox',
97114
extensions: [extraTool],
98115
});
99116

100117
const app = createApp({
101-
features: [plugin, myModule],
118+
features: [plugin, myModule, myCatalogPlugin],
102119
});
103120

104121
const container = document.getElementById('root');
105122
const root = createRoot(container!);
106123
root.render(app.createRoot());
107-
*/

‎plugins/toolbox/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@
6565
"@faker-js/faker": "^8.1.0",
6666
"@json2csv/plainjs": "^7.0.6",
6767
"@material-ui/core": "^4.12.4",
68+
"@material-ui/icons": "^4.11.3",
6869
"@material-ui/lab": "^4.0.0-alpha.61",
6970
"@monaco-editor/react": "^4.5.2",
70-
"@mui/icons-material": "^5.16.7",
71-
"@mui/lab": "^5.0.0-alpha.169",
7271
"@mui/material": "^5.16.7",
7372
"asn1js": "3.0.5",
7473
"color-convert": "^2.0.1",
@@ -109,8 +108,10 @@
109108
"@backstage/cli": "backstage:^",
110109
"@backstage/dev-utils": "backstage:^",
111110
"@backstage/frontend-defaults": "backstage:^",
111+
"@backstage/plugin-catalog": "backstage:^",
112112
"@backstage/plugin-catalog-common": "backstage:^",
113113
"@backstage/plugin-home": "backstage:^",
114+
"@backstage/ui": "backstage:^",
114115
"@rjsf/core": "^3.0.0",
115116
"@testing-library/jest-dom": "^6.1.3",
116117
"@types/color-convert": "^2.0.1",

‎plugins/toolbox/src/alpha.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import { discoveryApiRef, fetchApiRef } from '@backstage/core-plugin-api';
1717
import { toolboxApiRef, ToolboxClient } from './api';
1818
import { rootRouteRef } from './routes.ts';
19-
import CardTravel from '@mui/icons-material/CardTravel';
19+
import CardTravel from '@material-ui/icons/CardTravel';
2020
import {
2121
ToolboxToolBlueprint,
2222
toolDataRef,

‎plugins/toolbox/src/components/Buttons/ClearValueButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Tooltip from '@mui/material/Tooltip';
2-
import Button from '@mui/material/Button';
3-
import Clear from '@mui/icons-material/Clear';
1+
import { Button, Tooltip } from '@material-ui/core';
2+
import Clear from '@material-ui/icons/Clear';
43
import { useToolboxTranslation } from '../../hooks';
54

65
type Props = {

‎plugins/toolbox/src/components/Buttons/CopyToClipboardButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Tooltip from '@mui/material/Tooltip';
2-
import Button from '@mui/material/Button';
3-
import FileCopy from '@mui/icons-material/FileCopy';
1+
import { Button, Tooltip } from '@material-ui/core';
2+
import FileCopy from '@material-ui/icons/FileCopy';
43
import { useToolboxTranslation } from '../../hooks';
54
import { alertApiRef, useApi } from '@backstage/core-plugin-api';
65

‎plugins/toolbox/src/components/Buttons/FavoriteButton.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { useFavoriteStorage } from '../../utils/hooks';
2-
import Tooltip from '@mui/material/Tooltip';
3-
import Button from '@mui/material/Button';
4-
import Star from '@mui/icons-material/Star';
5-
import StarOutline from '@mui/icons-material/StarOutline';
2+
import { Button, Tooltip } from '@material-ui/core';
3+
import Star from '@material-ui/icons/Star';
4+
import StarOutline from '@material-ui/icons/StarOutline';
65
import { useToolboxTranslation } from '../../hooks';
76

87
type Props = {

‎plugins/toolbox/src/components/Buttons/FileDownloadButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import GetAppIcon from '@mui/icons-material/GetApp';
2-
import Tooltip from '@mui/material/Tooltip';
3-
import Button from '@mui/material/Button';
1+
import { Button, Tooltip } from '@material-ui/core';
2+
import GetAppIcon from '@material-ui/icons/GetApp';
43
import { useToolboxTranslation } from '../../hooks';
54

65
export type FileDownloadButtonProps = {

‎plugins/toolbox/src/components/Buttons/FileUploadButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ChangeEvent } from 'react';
2-
import AttachFile from '@mui/icons-material/AttachFile';
3-
import Tooltip from '@mui/material/Tooltip';
4-
import Button from '@mui/material/Button';
2+
import { Button, Tooltip } from '@material-ui/core';
3+
import AttachFile from '@material-ui/icons/AttachFile';
54
import { useToolboxTranslation } from '../../hooks';
65

76
type Props = {

‎plugins/toolbox/src/components/Buttons/PasteFromClipboardButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Tooltip from '@mui/material/Tooltip';
2-
import Button from '@mui/material/Button';
3-
import AssignmentReturnedIcon from '@mui/icons-material/AssignmentReturned';
1+
import { Button, Tooltip } from '@material-ui/core';
2+
import AssignmentReturnedIcon from '@material-ui/icons/AssignmentReturned';
43
import { useToolboxTranslation } from '../../hooks';
54

65
type Props = {

‎plugins/toolbox/src/components/Buttons/SampleButton.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Tooltip from '@mui/material/Tooltip';
2-
import Button from '@mui/material/Button';
3-
import Input from '@mui/icons-material/Input';
1+
import { Button, Tooltip } from '@material-ui/core';
2+
import Input from '@material-ui/icons/Input';
43
import { useToolboxTranslation } from '../../hooks';
54

65
type Props = {

0 commit comments

Comments
 (0)