Skip to content

Commit ec77a03

Browse files
bexsoftbexsoft
authored
Replace missing icons from mui (#3101)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent 8dbad84 commit ec77a03

File tree

13 files changed

+67
-64
lines changed

13 files changed

+67
-64
lines changed

‎portal-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"local-storage-fallback": "^4.1.1",
1818
"lodash": "^4.17.21",
1919
"luxon": "^3.4.3",
20-
"mds": "https://github.com/minio/mds.git#v0.9.6",
20+
"mds": "https://github.com/minio/mds.git#v0.10.0",
2121
"react": "^18.1.0",
2222
"react-component-export-image": "^1.0.6",
2323
"react-copy-to-clipboard": "^5.0.2",

‎portal-ui/src/screens/Console/Buckets/ListBuckets/BulkLifecycleModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import React, { Fragment, useEffect, useState } from "react";
1818
import {
1919
Box,
20+
CheckCircleIcon,
2021
FormLayout,
2122
Grid,
2223
InputBox,
@@ -25,10 +26,9 @@ import {
2526
Select,
2627
Switch,
2728
Tooltip,
29+
WarnIcon,
2830
} from "mds";
2931
import get from "lodash/get";
30-
import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
31-
import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
3232
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
3333
import GenericWizard from "../../Common/GenericWizard/GenericWizard";
3434
import QueryMultiSelector from "../../Common/FormComponents/QueryMultiSelector/QueryMultiSelector";
@@ -117,7 +117,7 @@ const AddBulkReplicationModal = ({
117117
color: "#42C91A",
118118
}}
119119
>
120-
<CheckCircleOutlineIcon />
120+
<CheckCircleIcon />
121121
</Box>
122122
);
123123
case "n/a":
@@ -132,7 +132,7 @@ const AddBulkReplicationModal = ({
132132
}}
133133
>
134134
<Tooltip tooltip={errString} placement="top">
135-
<ErrorOutlineIcon />
135+
<WarnIcon />
136136
</Tooltip>
137137
</Box>
138138
);

‎portal-ui/src/screens/Console/Buckets/ListBuckets/BulkReplicationModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
import React, { Fragment, useEffect, useState } from "react";
1818
import {
1919
Box,
20+
CheckCircleIcon,
2021
FormLayout,
2122
Grid,
2223
InputBox,
2324
ReadBox,
2425
Select,
2526
Switch,
2627
Tooltip,
28+
WarnIcon,
2729
} from "mds";
2830
import get from "lodash/get";
29-
import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
30-
import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
3131
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
3232
import GenericWizard from "../../Common/GenericWizard/GenericWizard";
3333
import { getBytes, k8sScalarUnitsExcluding } from "../../../../common/utils";
@@ -208,7 +208,7 @@ const AddBulkReplicationModal = ({
208208
color: "#42C91A",
209209
}}
210210
>
211-
<CheckCircleOutlineIcon />
211+
<CheckCircleIcon />
212212
</Box>
213213
);
214214
case "n/a":
@@ -222,7 +222,7 @@ const AddBulkReplicationModal = ({
222222
}}
223223
>
224224
<Tooltip tooltip={errString} placement="top">
225-
<ErrorOutlineIcon />
225+
<WarnIcon />
226226
</Tooltip>
227227
</Box>
228228
);

‎portal-ui/src/screens/Console/Common/FormComponents/DateRangeSelector/DateRangeSelector.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

1717
import React from "react";
18-
import { Button, OpenListIcon, SyncIcon, Grid, Box, breakPoints } from "mds";
18+
import {
19+
Button,
20+
OpenListIcon,
21+
SyncIcon,
22+
Grid,
23+
Box,
24+
breakPoints,
25+
TimeIcon,
26+
} from "mds";
1927
import { DateTime } from "luxon";
20-
21-
import ScheduleIcon from "@mui/icons-material/Schedule";
22-
import WatchLaterIcon from "@mui/icons-material/WatchLater";
2328
import DateTimePickerWrapper from "../DateTimePickerWrapper/DateTimePickerWrapper";
2429

2530
interface IDateRangeSelector {
@@ -154,7 +159,7 @@ const DateRangeSelector = ({
154159
},
155160
}}
156161
>
157-
<ScheduleIcon className="min-icon" />
162+
<TimeIcon />
158163
</Box>
159164
<Box
160165
sx={{
@@ -197,7 +202,7 @@ const DateRangeSelector = ({
197202
},
198203
}}
199204
>
200-
<WatchLaterIcon className="min-icon" />
205+
<TimeIcon />
201206
</Box>
202207
<Box
203208
sx={{

‎portal-ui/src/screens/Console/Configurations/utils.tsx

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@
1414
// You should have received a copy of the GNU Affero General Public License
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
import React from "react";
17-
import PublicIcon from "@mui/icons-material/Public";
18-
import CompressIcon from "@mui/icons-material/Compress";
19-
import CodeIcon from "@mui/icons-material/Code";
20-
import LocalHospitalIcon from "@mui/icons-material/LocalHospital";
21-
import FindReplaceIcon from "@mui/icons-material/FindReplace";
22-
import VpnKeyIcon from "@mui/icons-material/VpnKey";
23-
import PendingActionsIcon from "@mui/icons-material/PendingActions";
24-
import CallToActionIcon from "@mui/icons-material/CallToAction";
2517
import { IElement, IElementValue, IOverrideEnv, OverrideValue } from "./types";
26-
import { LogsIcon } from "mds";
18+
import {
19+
CodeIcon,
20+
CompressIcon,
21+
ConsoleIcon,
22+
FindReplaceIcon,
23+
FirstAidIcon,
24+
KeyIcon,
25+
LogsIcon,
26+
PendingItemsIcon,
27+
PublicIcon,
28+
} from "mds";
2729

2830
export const configurationElements: IElement[] = [
2931
{
@@ -42,7 +44,7 @@ export const configurationElements: IElement[] = [
4244
configuration_label: "API",
4345
},
4446
{
45-
icon: <LocalHospitalIcon />,
47+
icon: <FirstAidIcon />,
4648
configuration_id: "heal",
4749
configuration_label: "Heal",
4850
},
@@ -52,29 +54,22 @@ export const configurationElements: IElement[] = [
5254
configuration_label: "Scanner",
5355
},
5456
{
55-
icon: <VpnKeyIcon />,
57+
icon: <KeyIcon />,
5658
configuration_id: "etcd",
5759
configuration_label: "Etcd",
5860
},
5961
{
60-
icon: <CallToActionIcon />,
62+
icon: <ConsoleIcon />,
6163
configuration_id: "logger_webhook",
6264
configuration_label: "Logger Webhook",
6365
},
6466
{
65-
icon: <PendingActionsIcon />,
67+
icon: <PendingItemsIcon />,
6668
configuration_id: "audit_webhook",
6769
configuration_label: "Audit Webhook",
6870
},
6971
{
70-
icon: (
71-
<LogsIcon
72-
className={
73-
"MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiTab-iconWrapper css-i4bv87-MuiSvgIcon-root"
74-
}
75-
style={{ width: 24, height: 24 }}
76-
/>
77-
),
72+
icon: <LogsIcon />,
7873
configuration_id: "audit_kafka",
7974
configuration_label: "Audit Kafka",
8075
},

‎portal-ui/src/screens/Console/Dashboard/Prometheus/Widgets/ExpandGraphLink.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

1717
import React from "react";
18-
import { Box } from "mds";
19-
import ZoomOutMapIcon from "@mui/icons-material/ZoomOutMap";
18+
import { Box, ExpandIcon } from "mds";
2019

2120
import { IDashboardPanel } from "../types";
2221

@@ -59,7 +58,7 @@ const ExpandGraphLink = ({ panelItem }: { panelItem: IDashboardPanel }) => {
5958
}}
6059
className={"zoom-graph-icon"}
6160
>
62-
<ZoomOutMapIcon />
61+
<ExpandIcon />
6362
</button>
6463
</Box>
6564
);

‎portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

1717
import React, { Fragment, useState } from "react";
18-
import { Button, FormLayout, Grid, InputBox, ProgressBar } from "mds";
18+
import {
19+
Button,
20+
ConsoleIcon,
21+
FormLayout,
22+
Grid,
23+
InputBox,
24+
PendingItemsIcon,
25+
ProgressBar,
26+
WebhookIcon,
27+
} from "mds";
1928
import { api } from "api";
2029
import { errorToHandler } from "api/errors";
2130
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
22-
import { Webhook } from "@mui/icons-material";
23-
import CallToActionIcon from "@mui/icons-material/CallToAction";
24-
import PendingActionsIcon from "@mui/icons-material/PendingActions";
2531
import {
2632
configurationIsLoading,
2733
setErrorSnackMessage,
@@ -126,16 +132,16 @@ const AddEndpointModal = ({ open, type, onCloseEndpoint }: IEndpointModal) => {
126132
};
127133

128134
let title = "Add new Webhook";
129-
let icon = <Webhook />;
135+
let icon = <WebhookIcon />;
130136

131137
switch (type) {
132138
case "logger_webhook":
133139
title = "New Logger Webhook";
134-
icon = <CallToActionIcon />;
140+
icon = <ConsoleIcon />;
135141
break;
136142
case "audit_webhook":
137143
title = "New Audit Webhook";
138-
icon = <PendingActionsIcon />;
144+
icon = <PendingItemsIcon />;
139145
break;
140146
}
141147

‎portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@ import {
2121
FormLayout,
2222
Grid,
2323
InputBox,
24+
PendingItemsIcon,
2425
ProgressBar,
2526
ReadBox,
2627
Switch,
2728
Tooltip,
29+
WebhookIcon,
2830
} from "mds";
2931
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
30-
import { Webhook } from "@mui/icons-material";
3132
import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary";
32-
import CallToActionIcon from "@mui/icons-material/CallToAction";
33-
import PendingActionsIcon from "@mui/icons-material/PendingActions";
3433
import {
3534
configurationIsLoading,
3635
setErrorSnackMessage,
@@ -182,16 +181,16 @@ const EditEndpointModal = ({
182181
const overrideValues = overrideFields(hasOverride);
183182

184183
let title = "Edit Webhook";
185-
let icon = <Webhook />;
184+
let icon = <WebhookIcon />;
186185

187186
switch (type) {
188187
case "logger_webhook":
189188
title = `Edit ${defaultWH ? " the Default " : ""}Logger Webhook`;
190-
icon = <CallToActionIcon />;
189+
icon = <ConsoleIcon />;
191190
break;
192191
case "audit_webhook":
193192
title = `Edit ${defaultWH ? " the Default " : ""}Audit Webhook`;
194-
icon = <PendingActionsIcon />;
193+
icon = <PendingItemsIcon />;
195194
break;
196195
}
197196

‎portal-ui/src/screens/Console/IDP/utils.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
// You should have received a copy of the GNU Affero General Public License
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
import LoginIcon from "@mui/icons-material/Login";
18-
import { LockIcon } from "mds";
17+
import { LockIcon, LoginIcon } from "mds";
1918

2019
export const ldapHelpBoxContents = [
2120
{

‎portal-ui/src/screens/Console/License/LicensePlans.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
import React, { Fragment, useEffect, useState } from "react";
1818
import clsx from "clsx";
19-
import CheckCircleIcon from "@mui/icons-material/CheckCircle";
2019
import {
2120
AGPLV3Logo,
2221
Box,
2322
breakPoints,
2423
Button,
24+
CheckCircleIcon,
2525
ConsoleEnterprise,
2626
ConsoleStandard,
2727
LicenseDocIcon,

0 commit comments

Comments
 (0)