diff --git a/operatorapi/operator_tenants.go b/operatorapi/operator_tenants.go index 45a40bcc4..2459ad5d7 100644 --- a/operatorapi/operator_tenants.go +++ b/operatorapi/operator_tenants.go @@ -943,6 +943,11 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre }, } + _, err = clientSet.CoreV1().Secrets(ns).Create(ctx, &instanceSecret, metav1.CreateOptions{}) + if err != nil { + return nil, prepareError(err) + } + // Enable/Disable console object browser for MinIO tenant (default is on) enabledConsole := "on" if tenantReq.EnableConsole != nil && !*tenantReq.EnableConsole { @@ -952,11 +957,6 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre tenantConfigurationENV["MINIO_ROOT_USER"] = accessKey tenantConfigurationENV["MINIO_ROOT_PASSWORD"] = secretKey - _, err = clientSet.CoreV1().Secrets(ns).Create(ctx, &instanceSecret, metav1.CreateOptions{}) - if err != nil { - return nil, prepareError(err) - } - // delete secrets created if an error occurred during tenant creation, defer func() { if mError != nil { diff --git a/portal-ui/src/common/HelpBox.tsx b/portal-ui/src/common/HelpBox.tsx index 7b646b55d..bffd8af1a 100644 --- a/portal-ui/src/common/HelpBox.tsx +++ b/portal-ui/src/common/HelpBox.tsx @@ -39,8 +39,8 @@ const styles = (theme: Theme) => marginBottom: 20, display: "flex", alignItems: "center", - "& .MuiSvgIcon-root": { - fontSize: "2.5rem", + "& .min-icon": { + width: "2.5rem", marginRight: ".8rem", }, }, diff --git a/portal-ui/src/icons/AccountIcon.tsx b/portal-ui/src/icons/AccountIcon.tsx index 5f6823341..81d665df9 100644 --- a/portal-ui/src/icons/AccountIcon.tsx +++ b/portal-ui/src/icons/AccountIcon.tsx @@ -15,80 +15,84 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const AccountIcon = (props: SvgIconProps) => { +const AccountIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/AddFolderIcon.tsx b/portal-ui/src/icons/AddFolderIcon.tsx index 7efd30604..d754d2190 100644 --- a/portal-ui/src/icons/AddFolderIcon.tsx +++ b/portal-ui/src/icons/AddFolderIcon.tsx @@ -15,31 +15,35 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const AddFolderIcon = (props: SvgIconProps) => { +const AddFolderIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/AddIcon.tsx b/portal-ui/src/icons/AddIcon.tsx index 68c883fff..c71782b27 100644 --- a/portal-ui/src/icons/AddIcon.tsx +++ b/portal-ui/src/icons/AddIcon.tsx @@ -15,15 +15,23 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const AddIcon = (props: SvgIconProps) => { +const AddIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/AllBucketsIcon.tsx b/portal-ui/src/icons/AllBucketsIcon.tsx index 8605f682a..8f4308a70 100644 --- a/portal-ui/src/icons/AllBucketsIcon.tsx +++ b/portal-ui/src/icons/AllBucketsIcon.tsx @@ -14,12 +14,17 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const AllBucketsIcon = () => { +const AllBucketsIcon = (props: SVGProps) => { return ( - + { /> - + ); }; diff --git a/portal-ui/src/icons/ArrowRightIcon.tsx b/portal-ui/src/icons/ArrowRightIcon.tsx index cda310f23..b49ed3e01 100644 --- a/portal-ui/src/icons/ArrowRightIcon.tsx +++ b/portal-ui/src/icons/ArrowRightIcon.tsx @@ -15,15 +15,19 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ArrowRightIcon = (props: SvgIconProps) => { +const ArrowRightIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/BucketsIcon.tsx b/portal-ui/src/icons/BucketsIcon.tsx index 35d99d50c..e9488bef1 100644 --- a/portal-ui/src/icons/BucketsIcon.tsx +++ b/portal-ui/src/icons/BucketsIcon.tsx @@ -15,26 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const BucketsIcon = (props: SvgIconProps) => { +const BucketsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/CalendarIcon.tsx b/portal-ui/src/icons/CalendarIcon.tsx index 9e58da5c7..7755a5139 100644 --- a/portal-ui/src/icons/CalendarIcon.tsx +++ b/portal-ui/src/icons/CalendarIcon.tsx @@ -15,54 +15,58 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const CalendarIcon = (props: SvgIconProps) => { +const CalendarIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/CircleIcon.tsx b/portal-ui/src/icons/CircleIcon.tsx index 966a23ba2..240df15bb 100644 --- a/portal-ui/src/icons/CircleIcon.tsx +++ b/portal-ui/src/icons/CircleIcon.tsx @@ -15,15 +15,19 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const circleIcon = (props: SvgIconProps) => { +const circleIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/ClustersIcon.tsx b/portal-ui/src/icons/ClustersIcon.tsx index d44b9add2..9b2f07b6b 100644 --- a/portal-ui/src/icons/ClustersIcon.tsx +++ b/portal-ui/src/icons/ClustersIcon.tsx @@ -14,29 +14,23 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -interface IClusterIcon { - width?: number; -} - -const ClustersIcon = ({ width = 24 }: IClusterIcon) => { +const ClustersIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/ComputerLineIcon.tsx b/portal-ui/src/icons/ComputerLineIcon.tsx index 028a8640d..1b3ff2460 100644 --- a/portal-ui/src/icons/ComputerLineIcon.tsx +++ b/portal-ui/src/icons/ComputerLineIcon.tsx @@ -14,38 +14,32 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -interface IClusterIcon { - width?: number; -} - -const ComputerLineIcon = ({ width = 24 }: IClusterIcon) => { +const ComputerLineIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/ConfigurationsListIcon.tsx b/portal-ui/src/icons/ConfigurationsListIcon.tsx index cda3351d0..515d6824c 100644 --- a/portal-ui/src/icons/ConfigurationsListIcon.tsx +++ b/portal-ui/src/icons/ConfigurationsListIcon.tsx @@ -14,27 +14,30 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const ConfigurationsListIcon = () => { +const ConfigurationsListIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/ConsoleIcon.tsx b/portal-ui/src/icons/ConsoleIcon.tsx index 8020210a5..fdedfc60a 100644 --- a/portal-ui/src/icons/ConsoleIcon.tsx +++ b/portal-ui/src/icons/ConsoleIcon.tsx @@ -14,21 +14,25 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const ConsoleIcon = () => { +import React, { SVGProps } from "react"; + +const ConsoleIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/ConsoleLogo.tsx b/portal-ui/src/icons/ConsoleLogo.tsx index 32b37660f..592757e8a 100644 --- a/portal-ui/src/icons/ConsoleLogo.tsx +++ b/portal-ui/src/icons/ConsoleLogo.tsx @@ -14,11 +14,17 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; +import React, { SVGProps } from "react"; -const ConsoleLogo = () => { +const ConsoleLogo = (props: SVGProps) => { return ( - + . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const CopyIcon = () => { +const CopyIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/CreateIcon.tsx b/portal-ui/src/icons/CreateIcon.tsx index d73070a27..2717c36bd 100644 --- a/portal-ui/src/icons/CreateIcon.tsx +++ b/portal-ui/src/icons/CreateIcon.tsx @@ -14,33 +14,32 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -interface ICreateIcon { - width?: number; -} - -const CreateIcon = ({ width = 24 }: ICreateIcon) => { +const CreateIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/DashboardIcon.tsx b/portal-ui/src/icons/DashboardIcon.tsx index 41fdaa06b..781955f1d 100644 --- a/portal-ui/src/icons/DashboardIcon.tsx +++ b/portal-ui/src/icons/DashboardIcon.tsx @@ -15,48 +15,49 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DashboardIcon = (props: SvgIconProps) => { +const DashboardIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/DeleteIcon.tsx b/portal-ui/src/icons/DeleteIcon.tsx index 647a17916..29bca987c 100644 --- a/portal-ui/src/icons/DeleteIcon.tsx +++ b/portal-ui/src/icons/DeleteIcon.tsx @@ -14,23 +14,26 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import React, { SVGProps } from "react"; -const DeleteIcon = (props: SvgIconProps) => { +const DeleteIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/DiagnosticIcon.tsx b/portal-ui/src/icons/DiagnosticIcon.tsx index 57843aa70..531dad476 100644 --- a/portal-ui/src/icons/DiagnosticIcon.tsx +++ b/portal-ui/src/icons/DiagnosticIcon.tsx @@ -15,26 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DiagnosticIcon = (props: SvgIconProps) => { +const DiagnosticIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/DiagnosticsIcon.tsx b/portal-ui/src/icons/DiagnosticsIcon.tsx index 938979319..25f130797 100644 --- a/portal-ui/src/icons/DiagnosticsIcon.tsx +++ b/portal-ui/src/icons/DiagnosticsIcon.tsx @@ -14,21 +14,23 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -import { IIcon } from "./props"; +import React, { SVGProps } from "react"; -const DiagnosticsIcon = ({ width = 24 }: IIcon) => { +const DiagnosticsIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/DocumentationIcon.tsx b/portal-ui/src/icons/DocumentationIcon.tsx index c3d04478d..d48ce7a25 100644 --- a/portal-ui/src/icons/DocumentationIcon.tsx +++ b/portal-ui/src/icons/DocumentationIcon.tsx @@ -15,52 +15,56 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DocumentationIcon = (props: SvgIconProps) => { +const DocumentationIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + ); }; diff --git a/portal-ui/src/icons/DownloadIcon.tsx b/portal-ui/src/icons/DownloadIcon.tsx index 6025899b0..e25cebc26 100644 --- a/portal-ui/src/icons/DownloadIcon.tsx +++ b/portal-ui/src/icons/DownloadIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DownloadIcon = (props: SvgIconProps) => { +const DownloadIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/DownloadStatIcon.tsx b/portal-ui/src/icons/DownloadStatIcon.tsx index 5cca8014d..e195c2993 100644 --- a/portal-ui/src/icons/DownloadStatIcon.tsx +++ b/portal-ui/src/icons/DownloadStatIcon.tsx @@ -15,31 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DownloadStatIcon = (props: SvgIconProps) => { +const DownloadStatIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/DrivesIcon.tsx b/portal-ui/src/icons/DrivesIcon.tsx index 3e8d67010..42f4dd185 100644 --- a/portal-ui/src/icons/DrivesIcon.tsx +++ b/portal-ui/src/icons/DrivesIcon.tsx @@ -15,39 +15,43 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const drivesIcon = (props: SvgIconProps) => { +const drivesIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/EditIcon.tsx b/portal-ui/src/icons/EditIcon.tsx index 15fa17266..b47dff1f1 100644 --- a/portal-ui/src/icons/EditIcon.tsx +++ b/portal-ui/src/icons/EditIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const EditIcon = (props: SvgIconProps) => { +const EditIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/EgressIcon.tsx b/portal-ui/src/icons/EgressIcon.tsx index 6d7bd8c59..f20ea83d8 100644 --- a/portal-ui/src/icons/EgressIcon.tsx +++ b/portal-ui/src/icons/EgressIcon.tsx @@ -14,11 +14,17 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const EgressIcon = () => { +import React, { SVGProps } from "react"; + +const EgressIcon = (props: SVGProps) => { return ( - + { transform="translate(9.871 5.307)" /> - + ); }; diff --git a/portal-ui/src/icons/FileBookIcon.tsx b/portal-ui/src/icons/FileBookIcon.tsx index 8ff95b0aa..6be667f13 100644 --- a/portal-ui/src/icons/FileBookIcon.tsx +++ b/portal-ui/src/icons/FileBookIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileBookIcon = (props: SvgIconProps) => { +const FileBookIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileCloudIcon.tsx b/portal-ui/src/icons/FileCloudIcon.tsx index 5f8c8daeb..40a285ec3 100644 --- a/portal-ui/src/icons/FileCloudIcon.tsx +++ b/portal-ui/src/icons/FileCloudIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileCloudIcon = (props: SvgIconProps) => { +const FileCloudIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileCodeIcon.tsx b/portal-ui/src/icons/FileCodeIcon.tsx index 3808b1e2c..60c209e95 100644 --- a/portal-ui/src/icons/FileCodeIcon.tsx +++ b/portal-ui/src/icons/FileCodeIcon.tsx @@ -15,30 +15,34 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileCodeIcon = (props: SvgIconProps) => { +const FileCodeIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/FileConfigIcon.tsx b/portal-ui/src/icons/FileConfigIcon.tsx index 562912bbb..a57fed596 100644 --- a/portal-ui/src/icons/FileConfigIcon.tsx +++ b/portal-ui/src/icons/FileConfigIcon.tsx @@ -15,26 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileConfigIcon = (props: SvgIconProps) => { +const FileConfigIcon = (props: SVGProps) => { return ( - - - - - - - + + + + + ); }; diff --git a/portal-ui/src/icons/FileDbIcon.tsx b/portal-ui/src/icons/FileDbIcon.tsx index 74fb6970d..650669fa4 100644 --- a/portal-ui/src/icons/FileDbIcon.tsx +++ b/portal-ui/src/icons/FileDbIcon.tsx @@ -15,30 +15,34 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileDbIcon = (props: SvgIconProps) => { +const FileDbIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/FileFontIcon.tsx b/portal-ui/src/icons/FileFontIcon.tsx index 2e0186f2a..c71c06d32 100644 --- a/portal-ui/src/icons/FileFontIcon.tsx +++ b/portal-ui/src/icons/FileFontIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileFontIcon = (props: SvgIconProps) => { +const FileFontIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileImageIcon.tsx b/portal-ui/src/icons/FileImageIcon.tsx index a7622b933..5fc087ac1 100644 --- a/portal-ui/src/icons/FileImageIcon.tsx +++ b/portal-ui/src/icons/FileImageIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileImageIcon = (props: SvgIconProps) => { +const FileImageIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileLinkIcon.tsx b/portal-ui/src/icons/FileLinkIcon.tsx index 6c0c3825a..353dd2ba0 100644 --- a/portal-ui/src/icons/FileLinkIcon.tsx +++ b/portal-ui/src/icons/FileLinkIcon.tsx @@ -15,28 +15,32 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileLinkIcon = (props: SvgIconProps) => { +const FileLinkIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/FileLockIcon.tsx b/portal-ui/src/icons/FileLockIcon.tsx index d12b32f3b..58dd6b191 100644 --- a/portal-ui/src/icons/FileLockIcon.tsx +++ b/portal-ui/src/icons/FileLockIcon.tsx @@ -15,26 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileLockIcon = (props: SvgIconProps) => { +const FileLockIcon = (props: SVGProps) => { return ( - - - - - - - + + + + + ); }; diff --git a/portal-ui/src/icons/FileMissingIcon.tsx b/portal-ui/src/icons/FileMissingIcon.tsx index b5e94e85f..3a140824f 100644 --- a/portal-ui/src/icons/FileMissingIcon.tsx +++ b/portal-ui/src/icons/FileMissingIcon.tsx @@ -15,30 +15,34 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileMissingIcon = (props: SvgIconProps) => { +const FileMissingIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/FileMusicIcon.tsx b/portal-ui/src/icons/FileMusicIcon.tsx index 34892ac86..18cdba27b 100644 --- a/portal-ui/src/icons/FileMusicIcon.tsx +++ b/portal-ui/src/icons/FileMusicIcon.tsx @@ -15,24 +15,28 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileMusicIcon = (props: SvgIconProps) => { +const FileMusicIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/FilePdfIcon.tsx b/portal-ui/src/icons/FilePdfIcon.tsx index a4434cc1d..3820c2a81 100644 --- a/portal-ui/src/icons/FilePdfIcon.tsx +++ b/portal-ui/src/icons/FilePdfIcon.tsx @@ -15,26 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FilePdfIcon = (props: SvgIconProps) => { +const FilePdfIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FilePptIcon.tsx b/portal-ui/src/icons/FilePptIcon.tsx index c03c1a5cd..7119bde8b 100644 --- a/portal-ui/src/icons/FilePptIcon.tsx +++ b/portal-ui/src/icons/FilePptIcon.tsx @@ -15,26 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FilePptIcon = (props: SvgIconProps) => { +const FilePptIcon = (props: SVGProps) => { return ( - - - - - - - + + + + + ); }; diff --git a/portal-ui/src/icons/FileTxtIcon.tsx b/portal-ui/src/icons/FileTxtIcon.tsx index ba2d571b7..2b3c84701 100644 --- a/portal-ui/src/icons/FileTxtIcon.tsx +++ b/portal-ui/src/icons/FileTxtIcon.tsx @@ -15,38 +15,42 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileTxtIcon = (props: SvgIconProps) => { +const FileTxtIcon = (props: SVGProps) => { return ( - - - - - - - - - - + + + + + + + + ); }; diff --git a/portal-ui/src/icons/FileVideoIcon.tsx b/portal-ui/src/icons/FileVideoIcon.tsx index 56a2cef8b..1c884546c 100644 --- a/portal-ui/src/icons/FileVideoIcon.tsx +++ b/portal-ui/src/icons/FileVideoIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileVideoIcon = (props: SvgIconProps) => { +const FileVideoIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileWorldIcon.tsx b/portal-ui/src/icons/FileWorldIcon.tsx index 2537b0b6c..4f534093b 100644 --- a/portal-ui/src/icons/FileWorldIcon.tsx +++ b/portal-ui/src/icons/FileWorldIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileWorldIcon = (props: SvgIconProps) => { +const FileWorldIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileXlsIcon.tsx b/portal-ui/src/icons/FileXlsIcon.tsx index 615b7b61a..9492929c7 100644 --- a/portal-ui/src/icons/FileXlsIcon.tsx +++ b/portal-ui/src/icons/FileXlsIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileXlsIcon = (props: SvgIconProps) => { +const FileXlsIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/FileZipIcon.tsx b/portal-ui/src/icons/FileZipIcon.tsx index fd3c06983..5284fafcb 100644 --- a/portal-ui/src/icons/FileZipIcon.tsx +++ b/portal-ui/src/icons/FileZipIcon.tsx @@ -1,29 +1,33 @@ import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FileZipIcon = (props: SvgIconProps) => { +const FileZipIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/FolderIcon.tsx b/portal-ui/src/icons/FolderIcon.tsx index 75ecba9ff..edfef80b6 100644 --- a/portal-ui/src/icons/FolderIcon.tsx +++ b/portal-ui/src/icons/FolderIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const FolderIcon = (props: SvgIconProps) => { +const FolderIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/GroupsIcon.tsx b/portal-ui/src/icons/GroupsIcon.tsx index c75b7f6cd..407a25e97 100644 --- a/portal-ui/src/icons/GroupsIcon.tsx +++ b/portal-ui/src/icons/GroupsIcon.tsx @@ -15,83 +15,87 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const GroupsIcon = (props: SvgIconProps) => { +const GroupsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/HealIcon.tsx b/portal-ui/src/icons/HealIcon.tsx index 1ff39f04a..47fcfdba5 100644 --- a/portal-ui/src/icons/HealIcon.tsx +++ b/portal-ui/src/icons/HealIcon.tsx @@ -15,27 +15,31 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const HealIcon = (props: SvgIconProps) => { +const HealIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/HelpIcon.tsx b/portal-ui/src/icons/HelpIcon.tsx index bad8c36fa..6a33b6176 100644 --- a/portal-ui/src/icons/HelpIcon.tsx +++ b/portal-ui/src/icons/HelpIcon.tsx @@ -14,11 +14,17 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const HelpIcon = (props: any) => { +import React, { SVGProps } from "react"; + +const HelpIcon = (props: SVGProps) => { return ( - + { d="M356.21,352.42v-1.86h.52c1.23,0,1.92-.45,1.92-1.29s-.68-1.18-1.89-1.18a8.07,8.07,0,0,0-.93.06l-.1-1.25a9.13,9.13,0,0,1,1.08-.08c2,0,3.19.94,3.19,2.4s-.93,2.24-2.64,2.46l-.05.74Zm1.56,1.8a1,1,0,1,1-1-1A1,1,0,0,1,357.77,354.22Z" transform="translate(-351.14 -345.03)" /> - + ); }; diff --git a/portal-ui/src/icons/HistoryIcon.tsx b/portal-ui/src/icons/HistoryIcon.tsx index 1b5fe715d..9d94df77a 100644 --- a/portal-ui/src/icons/HistoryIcon.tsx +++ b/portal-ui/src/icons/HistoryIcon.tsx @@ -15,39 +15,43 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const HistoryIcon = (props: SvgIconProps) => { +const HistoryIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + + + + + - - - - - - + + ); }; diff --git a/portal-ui/src/icons/IAMPoliciesIcon.tsx b/portal-ui/src/icons/IAMPoliciesIcon.tsx index b62551d8e..6ecd1179e 100644 --- a/portal-ui/src/icons/IAMPoliciesIcon.tsx +++ b/portal-ui/src/icons/IAMPoliciesIcon.tsx @@ -15,37 +15,41 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const IAMPoliciesIcon = (props: SvgIconProps) => { +const IAMPoliciesIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - + + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/JSONIcon.tsx b/portal-ui/src/icons/JSONIcon.tsx index 2a0c698ba..e962eb208 100644 --- a/portal-ui/src/icons/JSONIcon.tsx +++ b/portal-ui/src/icons/JSONIcon.tsx @@ -15,58 +15,62 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const JSONIcon = (props: SvgIconProps) => { +const JSONIcon = (props: SVGProps) => { return ( - - - - - + + + + + + + + + - - - - - - - - - - - + + + - - + + ); }; diff --git a/portal-ui/src/icons/LambdaIcon.tsx b/portal-ui/src/icons/LambdaIcon.tsx index 605f3f381..ff34b8aec 100644 --- a/portal-ui/src/icons/LambdaIcon.tsx +++ b/portal-ui/src/icons/LambdaIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const LambdaIcon = (props: SvgIconProps) => { +const LambdaIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/LambdaNotificationsIcon.tsx b/portal-ui/src/icons/LambdaNotificationsIcon.tsx index 442037c1f..ea76a2986 100644 --- a/portal-ui/src/icons/LambdaNotificationsIcon.tsx +++ b/portal-ui/src/icons/LambdaNotificationsIcon.tsx @@ -14,18 +14,22 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const LambdaNotificationsIcon = () => { +import React, { SVGProps } from "react"; + +const LambdaNotificationsIcon = (props: SVGProps) => { return ( - - - + - - + /> + ); }; diff --git a/portal-ui/src/icons/LicenseIcon.tsx b/portal-ui/src/icons/LicenseIcon.tsx index 3ecdd3b66..1ec75dfbd 100644 --- a/portal-ui/src/icons/LicenseIcon.tsx +++ b/portal-ui/src/icons/LicenseIcon.tsx @@ -15,52 +15,56 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const LicenseIcon = (props: SvgIconProps) => { +const LicenseIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/LockIcon.tsx b/portal-ui/src/icons/LockIcon.tsx index 493a2c7eb..1705b4074 100644 --- a/portal-ui/src/icons/LockIcon.tsx +++ b/portal-ui/src/icons/LockIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const LockIcon = (props: SvgIconProps) => { +const LockIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/LogoutIcon.tsx b/portal-ui/src/icons/LogoutIcon.tsx index 262edba7d..7d0da4387 100644 --- a/portal-ui/src/icons/LogoutIcon.tsx +++ b/portal-ui/src/icons/LogoutIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const LogoutIcon = (props: SvgIconProps) => { +const LogoutIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/LogsIcon.tsx b/portal-ui/src/icons/LogsIcon.tsx index 4f4ea6d36..070d321d6 100644 --- a/portal-ui/src/icons/LogsIcon.tsx +++ b/portal-ui/src/icons/LogsIcon.tsx @@ -15,37 +15,41 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const LogsIcon = (props: SvgIconProps) => { +const LogsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - + + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/MirroringIcon.tsx b/portal-ui/src/icons/MirroringIcon.tsx index d29a6199e..6e9c8cf7f 100644 --- a/portal-ui/src/icons/MirroringIcon.tsx +++ b/portal-ui/src/icons/MirroringIcon.tsx @@ -14,19 +14,23 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const MirroringIcon = () => { +import React, { SVGProps } from "react"; + +const MirroringIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/MultipleBucketsIcon.tsx b/portal-ui/src/icons/MultipleBucketsIcon.tsx index e148fe8ef..04578710c 100644 --- a/portal-ui/src/icons/MultipleBucketsIcon.tsx +++ b/portal-ui/src/icons/MultipleBucketsIcon.tsx @@ -15,34 +15,34 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const MultipleBucketsIcon = (props: SvgIconProps) => { +const MultipleBucketsIcon = (props: SVGProps) => { return ( - - - - - - + + + - - + + + ); }; diff --git a/portal-ui/src/icons/NewAccountIcon.tsx b/portal-ui/src/icons/NewAccountIcon.tsx index a1096e18c..a518c191d 100644 --- a/portal-ui/src/icons/NewAccountIcon.tsx +++ b/portal-ui/src/icons/NewAccountIcon.tsx @@ -14,67 +14,68 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const NewAccountIcon = () => { +import React, { SVGProps } from "react"; + +const NewAccountIcon = (props: SVGProps) => { return ( - - - - - - - - - - + + + + + + + + ); }; diff --git a/portal-ui/src/icons/NextArrowIcon.tsx b/portal-ui/src/icons/NextArrowIcon.tsx index 47a28be04..1c9599cc5 100644 --- a/portal-ui/src/icons/NextArrowIcon.tsx +++ b/portal-ui/src/icons/NextArrowIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const NextArrowIcon = (props: SvgIconProps) => { +const NextArrowIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/ObjectBrowserFolderIcon.tsx b/portal-ui/src/icons/ObjectBrowserFolderIcon.tsx index 57beb7f54..8684e48fb 100644 --- a/portal-ui/src/icons/ObjectBrowserFolderIcon.tsx +++ b/portal-ui/src/icons/ObjectBrowserFolderIcon.tsx @@ -15,49 +15,53 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ObjectBrowserFolderIcon = (props: SvgIconProps) => { +const ObjectBrowserFolderIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + ); }; diff --git a/portal-ui/src/icons/ObjectBrowserIcon.tsx b/portal-ui/src/icons/ObjectBrowserIcon.tsx index 518645c6f..3f5a97f66 100644 --- a/portal-ui/src/icons/ObjectBrowserIcon.tsx +++ b/portal-ui/src/icons/ObjectBrowserIcon.tsx @@ -15,45 +15,49 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ObjectBrowserIcon = (props: SvgIconProps) => { +const ObjectBrowserIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/OpenListIcon.tsx b/portal-ui/src/icons/OpenListIcon.tsx index dc5489e45..5ea164a1b 100644 --- a/portal-ui/src/icons/OpenListIcon.tsx +++ b/portal-ui/src/icons/OpenListIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const OpenListIcon = (props: SvgIconProps) => { +const OpenListIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/OperatorLogo.tsx b/portal-ui/src/icons/OperatorLogo.tsx index c8cedb0b7..8c7b211e9 100644 --- a/portal-ui/src/icons/OperatorLogo.tsx +++ b/portal-ui/src/icons/OperatorLogo.tsx @@ -14,18 +14,16 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; +import React, { SVGProps } from "react"; -interface IOperatorLogo { - width?: number; -} - -const OperatorLogo = ({ width = 120 }: IOperatorLogo) => { +const OperatorLogo = (props: SVGProps) => { return ( diff --git a/portal-ui/src/icons/PermissionIcon.tsx b/portal-ui/src/icons/PermissionIcon.tsx index 8cddeed04..082a94e4e 100644 --- a/portal-ui/src/icons/PermissionIcon.tsx +++ b/portal-ui/src/icons/PermissionIcon.tsx @@ -14,23 +14,27 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const PermissionIcon = () => { +import React, { SVGProps } from "react"; + +const PermissionIcon = (props: SVGProps) => { return ( - - - ic_permissions - - - - + + ic_permissions + + + - - + + ); }; diff --git a/portal-ui/src/icons/PreviewIcon.tsx b/portal-ui/src/icons/PreviewIcon.tsx index 04df15c45..50797b4a2 100644 --- a/portal-ui/src/icons/PreviewIcon.tsx +++ b/portal-ui/src/icons/PreviewIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const PreviewIcon = (props: SvgIconProps) => { +const PreviewIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/PrometheusIcon.tsx b/portal-ui/src/icons/PrometheusIcon.tsx index 09e621da0..544200c12 100644 --- a/portal-ui/src/icons/PrometheusIcon.tsx +++ b/portal-ui/src/icons/PrometheusIcon.tsx @@ -15,20 +15,24 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const PrometheusIcon = (props: SvgIconProps) => { +const PrometheusIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/RecoverIcon.tsx b/portal-ui/src/icons/RecoverIcon.tsx index 4fd4b8378..1c1329a26 100644 --- a/portal-ui/src/icons/RecoverIcon.tsx +++ b/portal-ui/src/icons/RecoverIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const RecoverIcon = (props: SvgIconProps) => { +const RecoverIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/RedoIcon.tsx b/portal-ui/src/icons/RedoIcon.tsx index 49188120f..66faf9eb0 100644 --- a/portal-ui/src/icons/RedoIcon.tsx +++ b/portal-ui/src/icons/RedoIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const RedoIcon = (props: SvgIconProps) => { +const RedoIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/RefreshIcon.tsx b/portal-ui/src/icons/RefreshIcon.tsx index 13fb8133b..05c41f28c 100644 --- a/portal-ui/src/icons/RefreshIcon.tsx +++ b/portal-ui/src/icons/RefreshIcon.tsx @@ -14,16 +14,19 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import React, { SVGProps } from "react"; -const RefreshIcon = (props: SvgIconProps) => { +const RefreshIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/RemoveIcon.tsx b/portal-ui/src/icons/RemoveIcon.tsx index d3cb44576..bd7f8e2af 100644 --- a/portal-ui/src/icons/RemoveIcon.tsx +++ b/portal-ui/src/icons/RemoveIcon.tsx @@ -14,18 +14,23 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const RemoveIcon = () => { +const RemoveIcon = (props: SVGProps) => { return ( - + - + ); }; diff --git a/portal-ui/src/icons/ReportedUsageIcon.tsx b/portal-ui/src/icons/ReportedUsageIcon.tsx index 8f0f7e3d9..feed42d00 100644 --- a/portal-ui/src/icons/ReportedUsageIcon.tsx +++ b/portal-ui/src/icons/ReportedUsageIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ReportedUsageIcon = (props: SvgIconProps) => { +const ReportedUsageIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/SearchIcon.tsx b/portal-ui/src/icons/SearchIcon.tsx index 016eb02a7..83eb552ab 100644 --- a/portal-ui/src/icons/SearchIcon.tsx +++ b/portal-ui/src/icons/SearchIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const SearchIcon = (props: SvgIconProps) => { +const SearchIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/SelectMultipleIcon.tsx b/portal-ui/src/icons/SelectMultipleIcon.tsx index b1c75eacc..65383bdc3 100644 --- a/portal-ui/src/icons/SelectMultipleIcon.tsx +++ b/portal-ui/src/icons/SelectMultipleIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const SelectMultipleIcon = (props: SvgIconProps) => { +const SelectMultipleIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/ServersIcon.tsx b/portal-ui/src/icons/ServersIcon.tsx index 67b06b2a8..007cd833c 100644 --- a/portal-ui/src/icons/ServersIcon.tsx +++ b/portal-ui/src/icons/ServersIcon.tsx @@ -15,32 +15,36 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const serversIcon = (props: SvgIconProps) => { +const serversIcon = (props: SVGProps) => { return ( - - - - - - - + + + + + ); }; diff --git a/portal-ui/src/icons/ServiceAccountIcon.tsx b/portal-ui/src/icons/ServiceAccountIcon.tsx index c9d5f5110..484f3ac28 100644 --- a/portal-ui/src/icons/ServiceAccountIcon.tsx +++ b/portal-ui/src/icons/ServiceAccountIcon.tsx @@ -14,23 +14,27 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const ServiceAccountIcon = () => { +import React, { SVGProps } from "react"; + +const ServiceAccountIcon = (props: SVGProps) => { return ( - - - ic_service-accounts - - - - + + ic_service-accounts + + + - - + + ); }; diff --git a/portal-ui/src/icons/ServiceAccountsIcon.tsx b/portal-ui/src/icons/ServiceAccountsIcon.tsx index 6eec4d84f..1b6ced885 100644 --- a/portal-ui/src/icons/ServiceAccountsIcon.tsx +++ b/portal-ui/src/icons/ServiceAccountsIcon.tsx @@ -14,26 +14,29 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const ServiceAccountsIcon = () => { +const ServiceAccountsIcon = (props: SVGProps) => { return ( - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/SettingsIcon.tsx b/portal-ui/src/icons/SettingsIcon.tsx index 9fdab28d2..3ae68b06c 100644 --- a/portal-ui/src/icons/SettingsIcon.tsx +++ b/portal-ui/src/icons/SettingsIcon.tsx @@ -15,29 +15,33 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const SettingsIcon = (props: SvgIconProps) => { +const SettingsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/ShareIcon.tsx b/portal-ui/src/icons/ShareIcon.tsx index edddb02a3..69ba910bf 100644 --- a/portal-ui/src/icons/ShareIcon.tsx +++ b/portal-ui/src/icons/ShareIcon.tsx @@ -15,22 +15,26 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ShareIcon = (props: SvgIconProps) => { +const ShareIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/SpeedtestIcon.tsx b/portal-ui/src/icons/SpeedtestIcon.tsx index 23c07fa69..85a731753 100644 --- a/portal-ui/src/icons/SpeedtestIcon.tsx +++ b/portal-ui/src/icons/SpeedtestIcon.tsx @@ -15,94 +15,98 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const SpeedtestIcon = (props: SvgIconProps) => { +const SpeedtestIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/StorageIcon.tsx b/portal-ui/src/icons/StorageIcon.tsx index a61e3b76d..4f7db3734 100644 --- a/portal-ui/src/icons/StorageIcon.tsx +++ b/portal-ui/src/icons/StorageIcon.tsx @@ -15,56 +15,60 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const StorageIcon = (props: SvgIconProps) => { +const StorageIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/SyncIcon.tsx b/portal-ui/src/icons/SyncIcon.tsx index 548ff83f1..eab4f896f 100644 --- a/portal-ui/src/icons/SyncIcon.tsx +++ b/portal-ui/src/icons/SyncIcon.tsx @@ -14,21 +14,25 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; -const SyncIcon = () => { +import React, { SVGProps } from "react"; + +const SyncIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/TenantsIcon.tsx b/portal-ui/src/icons/TenantsIcon.tsx index 0ca27bd5d..888476cd5 100644 --- a/portal-ui/src/icons/TenantsIcon.tsx +++ b/portal-ui/src/icons/TenantsIcon.tsx @@ -15,29 +15,33 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const TenantsIcon = (props: SvgIconProps) => { +const TenantsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/TenantsOutlineIcon.tsx b/portal-ui/src/icons/TenantsOutlineIcon.tsx index 5cdf88d93..6d6a0a1f4 100644 --- a/portal-ui/src/icons/TenantsOutlineIcon.tsx +++ b/portal-ui/src/icons/TenantsOutlineIcon.tsx @@ -15,22 +15,23 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const TenantsOutlineIcon = (props: SvgIconProps) => { +const TenantsOutlineIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/TiersIcon.tsx b/portal-ui/src/icons/TiersIcon.tsx index 8890ace9a..51ce53c7a 100644 --- a/portal-ui/src/icons/TiersIcon.tsx +++ b/portal-ui/src/icons/TiersIcon.tsx @@ -15,18 +15,22 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const TiersIcon = (props: SvgIconProps) => { +const TiersIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/ToolsIcon.tsx b/portal-ui/src/icons/ToolsIcon.tsx index 4922ee8bd..87105c081 100644 --- a/portal-ui/src/icons/ToolsIcon.tsx +++ b/portal-ui/src/icons/ToolsIcon.tsx @@ -15,30 +15,32 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const ToolsIcon = (props: SvgIconProps) => { +const ToolsIcon = (props: SVGProps) => { return ( - - - - - - - - - - - + + + + + + + ); }; diff --git a/portal-ui/src/icons/TotalObjectsIcon.tsx b/portal-ui/src/icons/TotalObjectsIcon.tsx index 0c8322524..5354899bd 100644 --- a/portal-ui/src/icons/TotalObjectsIcon.tsx +++ b/portal-ui/src/icons/TotalObjectsIcon.tsx @@ -15,20 +15,24 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const totalObjectsIcon = (props: SvgIconProps) => { +const totalObjectsIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/TraceIcon.tsx b/portal-ui/src/icons/TraceIcon.tsx index b6a35d435..89f4bef38 100644 --- a/portal-ui/src/icons/TraceIcon.tsx +++ b/portal-ui/src/icons/TraceIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const TraceIcon = (props: SvgIconProps) => { +const TraceIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/TrashIcon.tsx b/portal-ui/src/icons/TrashIcon.tsx index 2c7cebd93..5faa26dc8 100644 --- a/portal-ui/src/icons/TrashIcon.tsx +++ b/portal-ui/src/icons/TrashIcon.tsx @@ -15,33 +15,38 @@ // along with this program. If not, see . import * as React from "react"; +import { SVGProps } from "react"; -const TrashIcon = () => { +const TrashIcon = (props: SVGProps) => { return ( - + + diff --git a/portal-ui/src/icons/UploadFile.tsx b/portal-ui/src/icons/UploadFile.tsx index 36868ac02..53c707bfd 100644 --- a/portal-ui/src/icons/UploadFile.tsx +++ b/portal-ui/src/icons/UploadFile.tsx @@ -14,29 +14,28 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -interface IUploadFile { - width?: number; -} - -const UploadFile = ({ width = 24 }: IUploadFile) => { +const UploadFile = (props: SVGProps) => { return ( - - - - - - - - + + + + + + ); }; diff --git a/portal-ui/src/icons/UploadIcon.tsx b/portal-ui/src/icons/UploadIcon.tsx index 7f67d17b1..0ad060340 100644 --- a/portal-ui/src/icons/UploadIcon.tsx +++ b/portal-ui/src/icons/UploadIcon.tsx @@ -15,25 +15,29 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const UploadIcon = (props: SvgIconProps) => { +const UploadIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/UploadStatIcon.tsx b/portal-ui/src/icons/UploadStatIcon.tsx index fea9a81ec..000b04106 100644 --- a/portal-ui/src/icons/UploadStatIcon.tsx +++ b/portal-ui/src/icons/UploadStatIcon.tsx @@ -15,31 +15,30 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const DownloadStatIcon = (props: SvgIconProps) => { +const DownloadStatIcon = (props: SVGProps) => { return ( - - - - - - - - + + + + + + - - + + ); }; diff --git a/portal-ui/src/icons/UptimeIcon.tsx b/portal-ui/src/icons/UptimeIcon.tsx index af7840f51..5f76d8bdf 100644 --- a/portal-ui/src/icons/UptimeIcon.tsx +++ b/portal-ui/src/icons/UptimeIcon.tsx @@ -15,23 +15,27 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const UptimeIcon = (props: SvgIconProps) => { +const UptimeIcon = (props: SVGProps) => { return ( - - - - - - + + + + ); }; diff --git a/portal-ui/src/icons/UsersIcon.tsx b/portal-ui/src/icons/UsersIcon.tsx index e697cfb33..f0476e670 100644 --- a/portal-ui/src/icons/UsersIcon.tsx +++ b/portal-ui/src/icons/UsersIcon.tsx @@ -15,29 +15,33 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const UsersIcon = (props: SvgIconProps) => { +const UsersIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/VersionIcon.tsx b/portal-ui/src/icons/VersionIcon.tsx index e54841d33..b21d287c4 100644 --- a/portal-ui/src/icons/VersionIcon.tsx +++ b/portal-ui/src/icons/VersionIcon.tsx @@ -15,15 +15,19 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const VersionIcon = (props: SvgIconProps) => { +const VersionIcon = (props: SVGProps) => { return ( - - - - - + + + ); }; diff --git a/portal-ui/src/icons/WarnIcon.tsx b/portal-ui/src/icons/WarnIcon.tsx index 5695ca6ec..e9b24b37a 100644 --- a/portal-ui/src/icons/WarnIcon.tsx +++ b/portal-ui/src/icons/WarnIcon.tsx @@ -15,10 +15,16 @@ // along with this program. If not, see . import * as React from "react"; +import { SVGProps } from "react"; -const WarnIcon = () => { +const WarnIcon = (props: SVGProps) => { return ( - + . -import React from "react"; -import { SvgIcon } from "@mui/material"; +import React, { SVGProps } from "react"; -const WarpIcon = () => { +const WarpIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - + + + + + + + + + + + ); }; diff --git a/portal-ui/src/icons/WatchIcon.tsx b/portal-ui/src/icons/WatchIcon.tsx index 6fd633965..edf023893 100644 --- a/portal-ui/src/icons/WatchIcon.tsx +++ b/portal-ui/src/icons/WatchIcon.tsx @@ -15,68 +15,72 @@ // along with this program. If not, see . import * as React from "react"; -import { SvgIcon, SvgIconProps } from "@mui/material"; +import { SVGProps } from "react"; -const WatchIcon = (props: SvgIconProps) => { +const WatchIcon = (props: SVGProps) => { return ( - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + ); }; diff --git a/portal-ui/src/index.tsx b/portal-ui/src/index.tsx index b6e7d585c..11a3ce998 100644 --- a/portal-ui/src/index.tsx +++ b/portal-ui/src/index.tsx @@ -41,6 +41,16 @@ declare module "@mui/styles/defaultTheme" { const GlobalCss = withStyles({ // @global is handled by jss-plugin-global. "@global": { + ".min-icon": { + // height: 26, + width: 26, + }, + ".MuiButton-endIcon": { + "& .min-icon": { + // height: 26, + width: 16, + }, + }, // You should target [class*="MuiButton-root"] instead if you nest themes. ".MuiButton-root": { height: 38, diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx index 7415b440d..8649f7650 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketDetails.tsx @@ -131,7 +131,7 @@ const styles = (theme: Theme) => }, capitalizeFirst: { textTransform: "capitalize", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx index c5a3b92e2..fede9adc6 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx @@ -104,7 +104,7 @@ const styles = (theme: Theme) => }, capitalizeFirst: { textTransform: "capitalize", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/BucketListItem.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/BucketListItem.tsx index aa1b43edb..13e82a66a 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/BucketListItem.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/BucketListItem.tsx @@ -43,7 +43,7 @@ const styles = (theme: Theme) => color: theme.palette.primary.main, border: "#E5E5E5 1px solid", borderRadius: 2, - "& .MuiSvgIcon-root": { + "& .min-icon": { height: 14, width: 14, marginRight: 4, @@ -62,7 +62,7 @@ const styles = (theme: Theme) => "& .MuiTypography-root": { fontSize: 19, fontWeight: "bold", - "& .MuiSvgIcon-root": { + "& .min-icon": { position: "relative", top: 4, marginRight: 4, @@ -104,7 +104,7 @@ const styles = (theme: Theme) => fontSize: 12, fontWeight: "normal", "& .MuiButton-endIcon": { - "& .MuiSvgIcon-root": { + "& .min-icon": { fontSize: 18, }, }, @@ -114,9 +114,17 @@ const styles = (theme: Theme) => marginTop: 10, marginBottom: 4, }, + metric: { + "& .min-icon": { + color: "#000000", + width: 13, + marginRight: 5, + }, + }, metricLabel: { fontSize: 14, fontWeight: "bold", + color: "#000000", }, metricText: { fontSize: 24, @@ -132,10 +140,9 @@ const styles = (theme: Theme) => fontSize: 22, }, bucketIcon: { - "& .MuiSvgIcon-root": { + "& .min-icon": { height: 48, width: 48, - fontSize: 48, }, }, }); @@ -261,7 +268,7 @@ const BucketListItem = ({ - + Usage
@@ -269,7 +276,7 @@ const BucketListItem = ({ {usageUnit}
- + Objects
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx index 78478192b..3c71e32d2 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx @@ -116,7 +116,7 @@ const styles = (theme: Theme) => }, "& .MuiInputBase-root": { "& .MuiInputAdornment-root": { - "& .MuiSvgIcon-root": { + "& .min-icon": { color: theme.palette.grey["400"], height: 14, }, diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx index 505e0f585..e8abb00ca 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx @@ -63,7 +63,7 @@ import { import { BucketInfo, BucketVersioning } from "../../../types"; import { ErrorResponseHandler } from "../../../../../../common/types"; import RewindEnable from "./RewindEnable"; -import DeleteIcon from "@mui/icons-material/Delete"; + import DeleteMultipleObjects from "./DeleteMultipleObjects"; import PreviewFileModal from "../Preview/PreviewFileModal"; import { baseUrl } from "../../../../../../history"; @@ -76,7 +76,13 @@ import FolderIcon from "../../../../../../icons/FolderIcon"; import RefreshIcon from "../../../../../../icons/RefreshIcon"; import SearchIcon from "../../../../../../icons/SearchIcon"; import UploadIcon from "../../../../../../icons/UploadIcon"; +import ShareFile from "../ObjectDetails/ShareFile"; +import { setBucketDetailsLoad, setBucketInfo } from "../../../actions"; +import { AppState } from "../../../../../../store"; +import PageLayout from "../../../../Common/Layout/PageLayout"; +import BoxIconButton from "../../../../Common/BoxIconButton/BoxIconButton"; import { + DeleteIcon, FileBookIcon, FileCodeIcon, FileConfigIcon, @@ -93,12 +99,7 @@ import { FileXlsIcon, FileZipIcon, } from "../../../../../../icons"; -import ShareFile from "../ObjectDetails/ShareFile"; import { IAM_SCOPES } from "../../../../../../common/SecureComponent/permissions"; -import { setBucketDetailsLoad, setBucketInfo } from "../../../actions"; -import { AppState } from "../../../../../../store"; -import PageLayout from "../../../../Common/Layout/PageLayout"; -import BoxIconButton from "../../../../Common/BoxIconButton/BoxIconButton"; import SecureComponent, { hasPermission, } from "../../../../../../common/SecureComponent/SecureComponent"; @@ -142,7 +143,7 @@ const styles = (theme: Theme) => fileName: { display: "flex", alignItems: "center", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, marginRight: 4, diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx index 92104210f..e0e44956d 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx @@ -122,6 +122,9 @@ const styles = (theme: Theme) => }, propertiesIcon: { marginLeft: 5, + "& .min-icon": { + height: 12, + }, }, actionsIconContainer: { marginLeft: 12, @@ -129,7 +132,7 @@ const styles = (theme: Theme) => actionsIcon: { height: 16, width: 16, - "& .MuiSvgIcon-root": { + "& .min-icon": { height: 16, }, }, @@ -149,7 +152,7 @@ const styles = (theme: Theme) => "&.MuiChip-sizeSmall": { height: 18, }, - "& .MuiSvgIcon-root": { + "& .min-icon": { height: 10, width: 10, }, @@ -179,7 +182,7 @@ const styles = (theme: Theme) => }, capitalizeFirst: { textTransform: "capitalize", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, diff --git a/portal-ui/src/screens/Console/Common/BoxButton/BoxButton.tsx b/portal-ui/src/screens/Console/Common/BoxButton/BoxButton.tsx index 84bfcf768..afeb5794c 100644 --- a/portal-ui/src/screens/Console/Common/BoxButton/BoxButton.tsx +++ b/portal-ui/src/screens/Console/Common/BoxButton/BoxButton.tsx @@ -31,8 +31,8 @@ const styles = (theme: Theme) => color: "#696969", borderStyle: "solid", borderRadius: 3, - "& .MuiSvgIcon-root": { - fontSize: 20, + "& .min-icon": { + width: 20, }, "& .MuiTouchRipple-root span": { backgroundColor: theme.palette.primary.main, diff --git a/portal-ui/src/screens/Console/Common/BoxIconButton/BoxIconButton.tsx b/portal-ui/src/screens/Console/Common/BoxIconButton/BoxIconButton.tsx index 47f7aa0d3..0f69af4b9 100644 --- a/portal-ui/src/screens/Console/Common/BoxIconButton/BoxIconButton.tsx +++ b/portal-ui/src/screens/Console/Common/BoxIconButton/BoxIconButton.tsx @@ -31,8 +31,9 @@ const styles = (theme: Theme) => color: "#696969", borderStyle: "solid", borderRadius: 3, - "& .MuiSvgIcon-root": { - fontSize: 20, + "& .min-icon": { + // height: 20, + width: 20, }, "& .MuiTouchRipple-root span": { backgroundColor: theme.palette.primary.main, diff --git a/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialItem.tsx b/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialItem.tsx index 4d44a1fa3..c5a43c45d 100644 --- a/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialItem.tsx +++ b/portal-ui/src/screens/Console/Common/CredentialsPrompt/CredentialItem.tsx @@ -44,8 +44,9 @@ const styles = (theme: Theme) => }, }, }, - "& .MuiButtonBase-root .MuiSvgIcon-root": { - fontSize: ".8rem", + "& .MuiButtonBase-root .min-icon": { + width: ".8rem", + height: ".8rem", }, }, inputLabel: { diff --git a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts index 7fc6e67a7..dafccbe0c 100644 --- a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts +++ b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts @@ -277,7 +277,7 @@ export const searchField = { "&:hover": { borderColor: "#000", }, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, @@ -929,7 +929,7 @@ export const commonDashboardInfocard = { "& strong": { marginRight: 4, }, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 20, height: 20, }, @@ -958,7 +958,7 @@ export const commonDashboardInfocard = { height: 10, bottom: 2, marginRight: 10, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 5, height: 5, }, @@ -968,7 +968,7 @@ export const commonDashboardInfocard = { display: "flex" as const, alignItems: "center" as const, marginTop: -3, - "& .MuiSvgIcon-root": { + "& .min-icon": { marginTop: 5, width: 10, height: 10, @@ -996,7 +996,7 @@ export const commonDashboardInfocard = { alignItems: "center" as const, lineHeight: 1, fontWeight: "bold" as const, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 10, height: 10, marginTop: -5, @@ -1091,6 +1091,10 @@ export const tableStyles: any = { "&:hover": { backgroundColor: "#E2E2E2", }, + "& .min-icon": { + width: 13, + margin: 3, + }, }, }, }; @@ -1134,7 +1138,7 @@ export const deleteDialogStyles = { left: 30, position: "relative", }, - "& .MuiSvgIcon-root": { + "& .min-icon": { height: 16, width: 16, }, diff --git a/portal-ui/src/screens/Console/Common/IconsScreen.tsx b/portal-ui/src/screens/Console/Common/IconsScreen.tsx new file mode 100644 index 000000000..18a51fa0f --- /dev/null +++ b/portal-ui/src/screens/Console/Common/IconsScreen.tsx @@ -0,0 +1,724 @@ +// This file is part of MinIO Console Server +// Copyright (c) 2021 MinIO, Inc. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +import React from "react"; +import { containerForHeader } from "../Common/FormComponents/common/styleLibrary"; +import { Theme } from "@mui/material/styles"; +import createStyles from "@mui/styles/createStyles"; +import withStyles from "@mui/styles/withStyles"; +import { Grid } from "@mui/material"; +import { + AccountIcon, + AddFolderIcon, + AddIcon, + AllBucketsIcon, + ArrowRightIcon, + BackSettingsIcon, + BucketsIcon, + CalendarIcon, + CircleIcon, + ClustersIcon, + ComputerLineIcon, + ConfigurationsListIcon, + ConsoleIcon, + ConsoleLogo, + CopyIcon, + CreateIcon, + DashboardIcon, + DeleteIcon, + DiagnosticIcon, + DiagnosticsIcon, + DocumentationIcon, + DownloadIcon, + DownloadStatIcon, + DrivesIcon, + EditIcon, + EgressIcon, + FileBookIcon, + FileCloudIcon, + FileCodeIcon, + FileConfigIcon, + FileDbIcon, + FileFontIcon, + FileImageIcon, + FileLinkIcon, + FileLockIcon, + FileMissingIcon, + FileMusicIcon, + FilePdfIcon, + FilePptIcon, + FileTxtIcon, + FileVideoIcon, + FileWorldIcon, + FileXlsIcon, + FileZipIcon, + FolderIcon, + GroupsIcon, + HealIcon, + HelpIcon, + HistoryIcon, + IAMPoliciesIcon, + JSONIcon, + LambdaIcon, + LambdaNotificationsIcon, + LicenseIcon, + LockIcon, + LogoutIcon, + LogsIcon, + MirroringIcon, + NextArrowIcon, + ObjectBrowser1Icon, + ObjectBrowserFolderIcon, + ObjectBrowserIcon, + OpenListIcon, + OperatorLogo, + PermissionIcon, + PreviewIcon, + PrometheusIcon, + RecoverIcon, + RedoIcon, + RefreshIcon, + RemoveIcon, + ReportedUsageIcon, + SearchIcon, + SelectMultipleIcon, + ServersIcon, + ServiceAccountIcon, + ServiceAccountsIcon, + SettingsIcon, + ShareIcon, + StorageIcon, + SyncIcon, + TenantsIcon, + TenantsOutlineIcon, + TiersIcon, + ToolsIcon, + TotalObjectsIcon, + TraceIcon, + TrashIcon, + UploadFile, + UploadIcon, + UploadStatIcon, + UptimeIcon, + UsersIcon, + VersionIcon, + WarpIcon, + WatchIcon, +} from "../../../icons"; +import WarnIcon from "../../../icons/WarnIcon"; + +interface IIconsScreenSimple { + classes: any; +} + +const styles = (theme: Theme) => + createStyles({ + ...containerForHeader(theme.spacing(4)), + root: { + fontSize: 12, + }, + }); + +const IconsScreen = ({ classes }: IIconsScreenSimple) => { + return ( +
+ + + +
+ StorageIcon + + + + +
+ RefreshIcon + + + + +
+ ShareIcon + + + + +
+ FolderIcon + + + + +
+ EditIcon + + + + +
+ SearchIcon + + + + +
+ ObjectBrowserFolderIcon + + + + +
+ RedoIcon + + + + +
+ DashboardIcon + + + + +
+ ClustersIcon + + + + +
+ MirroringIcon + + + + +
+ ServiceAccountIcon + + + + +
+ ConfigurationsListIcon + + + + +
+ WatchIcon + + + + +
+ HealIcon + + + + +
+ OperatorLogo + + + + +
+ DeleteIcon + + + + +
+ ReportedUsageIcon + + + + +
+ PermissionIcon + + + + +
+ AccountIcon + + + + +
+ DiagnosticIcon + + + + +
+ TenantsOutlineIcon + + + + +
+ HelpIcon + + + + +
+ DiagnosticsIcon + + + + +
+ ObjectBrowser1Icon + + + + +
+ WarpIcon + + + + +
+ CopyIcon + + + + +
+ ConsoleLogo + + + + +
+ TraceIcon + + + + +
+ AddIcon + + + + +
+ LambdaNotificationsIcon + + + + +
+ BackSettingsIcon + + + + +
+ LicenseIcon + + + + +
+ RemoveIcon + + + + +
+ AddFolderIcon + + + + +
+ IAMPoliciesIcon + + + + +
+ UsersIcon + + + + +
+ EgressIcon + + + + +
+ DocumentationIcon + + + + +
+ TrashIcon + + + + +
+ DownloadIcon + + + + +
+ AllBucketsIcon + + + + +
+ SelectMultipleIcon + + + + +
+ GroupsIcon + + + + +
+ TenantsIcon + + + + +
+ UploadFile + + + + +
+ CreateIcon + + + + +
+ SyncIcon + + + + +
+ LogoutIcon + + + + +
+ HistoryIcon + + + + +
+ BucketsIcon + + + + +
+ ObjectBrowserIcon + + + + +
+ SettingsIcon + + + + +
+ UploadIcon + + + + +
+ ServiceAccountsIcon + + + + +
+ LogsIcon + + + + +
+ ConsoleIcon + + + + +
+ ServersIcon + + + + +
+ DrivesIcon + + + + +
+ TotalObjectsIcon + + + + +
+ CircleIcon + + + + +
+ PreviewIcon + + + + +
+ LockIcon + + + + +
+ VersionIcon + + + + +
+ FileLockIcon + + + + +
+ FileXlsIcon + + + + +
+ FileZipIcon + + + + +
+ FileCloudIcon + + + + +
+ FileMusicIcon + + + + +
+ FileConfigIcon + + + + +
+ FilePdfIcon + + + + +
+ FileFontIcon + + + + +
+ FileLinkIcon + + + + +
+ FileImageIcon + + + + +
+ FileWorldIcon + + + + +
+ FileBookIcon + + + + +
+ FileMissingIcon + + + + +
+ FileCodeIcon + + + + +
+ FilePptIcon + + + + +
+ FileDbIcon + + + + +
+ FileTxtIcon + + + + +
+ FileVideoIcon + + + + +
+ ArrowRightIcon + + + + +
+ CalendarIcon + + + + +
+ UptimeIcon + + + + +
+ LambdaIcon + + + + +
+ TiersIcon + + + + +
+ OpenListIcon + + + + +
+ ToolsIcon + + + + +
+ RecoverIcon + + + + +
+ PrometheusIcon + + + + +
+ NextArrowIcon + + + + +
+ DownloadStatIcon + + + + +
+ UploadStatIcon + + + + +
+ ComputerLineIcon + + + + +
+ JSONIcon + + + +
+ WarnIcon + + +
+ ); +}; + +export default withStyles(styles)(IconsScreen); diff --git a/portal-ui/src/screens/Console/Common/PageHeader/PageHeader.tsx b/portal-ui/src/screens/Console/Common/PageHeader/PageHeader.tsx index 7fcbd9f9a..978dce979 100644 --- a/portal-ui/src/screens/Console/Common/PageHeader/PageHeader.tsx +++ b/portal-ui/src/screens/Console/Common/PageHeader/PageHeader.tsx @@ -39,7 +39,9 @@ const styles = (theme: Theme) => logo: { marginLeft: 34, fill: theme.palette.primary.main, - width: 120, + "& .min-icon": { + width: 120, + }, }, }); diff --git a/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx b/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx index 7db3c443b..dd850b8c1 100644 --- a/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx +++ b/portal-ui/src/screens/Console/Common/ScreenTitle/ScreenTitle.tsx @@ -34,9 +34,9 @@ const styles = (theme: Theme) => headerBarIcon: { marginRight: ".7rem", color: theme.palette.primary.main, - "& .MuiSvgIcon-root": { - width: "100%", - height: "100%", + "& .min-icon": { + width: 44, + height: 44, }, }, headerBarSubheader: { diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx index aeb3e20e6..1974c889f 100644 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx +++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx @@ -269,7 +269,7 @@ const styles = () => }, ".optionsAlignment": { textAlign: "center", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, diff --git a/portal-ui/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx b/portal-ui/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx index 20b84eaa2..91062ec15 100644 --- a/portal-ui/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx +++ b/portal-ui/src/screens/Console/Common/VerticalTabs/VerticalTabs.tsx @@ -1,10 +1,9 @@ import React from "react"; import { Box, Tab, TabProps } from "@mui/material"; -import { TabPanel, TabContext, TabList } from "@mui/lab"; +import { TabContext, TabList, TabPanel } from "@mui/lab"; import withStyles from "@mui/styles/withStyles"; -import { Theme } from "@mui/material/styles"; +import { Theme, useTheme } from "@mui/material/styles"; import createStyles from "@mui/styles/createStyles"; -import { useTheme } from "@mui/material/styles"; import useMediaQuery from "@mui/material/useMediaQuery"; export type TabItemProps = { @@ -40,7 +39,7 @@ const styles = (theme: Theme) => alignItems: "center", justifyContent: "flex-start", borderBottom: "1px solid #EAEAEA", - "& .MuiSvgIcon-root": { + "& .min-icon": { marginRight: ".3rem", marginBottom: 0, height: ".8rem", diff --git a/portal-ui/src/screens/Console/Console.tsx b/portal-ui/src/screens/Console/Console.tsx index 60e603632..14ffbd8ac 100644 --- a/portal-ui/src/screens/Console/Console.tsx +++ b/portal-ui/src/screens/Console/Console.tsx @@ -67,6 +67,7 @@ import ErrorLogs from "./Logs/ErrorLogs/ErrorLogs"; import LogsSearchMain from "./Logs/LogSearch/LogsSearchMain"; import GroupsDetails from "./Groups/GroupsDetails"; import Speedtest from "./Speedtest/Speedtest"; +import IconsScreen from "./Common/IconsScreen"; const drawerWidth = 245; @@ -512,6 +513,9 @@ const Console = ({ )} /> ))} + + + {allowedRoutes.length > 0 ? ( ) : null} diff --git a/portal-ui/src/screens/Console/License/License.tsx b/portal-ui/src/screens/Console/License/License.tsx index 9eddc5a22..f3e309d07 100644 --- a/portal-ui/src/screens/Console/License/License.tsx +++ b/portal-ui/src/screens/Console/License/License.tsx @@ -336,8 +336,9 @@ const styles = (theme: Theme) => fontSize: 16, fontWeight: "bold", marginBottom: 20, - "& .MuiSvgIcon-root": { - fontSize: 44, + "& .min-icon": { + width: 44, + height: 44, marginRight: 15, }, }, diff --git a/portal-ui/src/screens/Console/Menu/Menu.tsx b/portal-ui/src/screens/Console/Menu/Menu.tsx index 45b51337b..a15e413f0 100644 --- a/portal-ui/src/screens/Console/Menu/Menu.tsx +++ b/portal-ui/src/screens/Console/Menu/Menu.tsx @@ -109,7 +109,7 @@ const styles = (theme: Theme) => backgroundBlendMode: "multiply", background: "transparent linear-gradient(90deg, rgba(0, 0, 0, 0.14) 0%, #00000000 100%) 0% 0% no-repeat padding-box", - "& .MuiSvgIcon-root": { + "& .min-icon": { color: "white", }, "& .MuiTypography-root": { @@ -117,10 +117,10 @@ const styles = (theme: Theme) => fontWeight: "bold", }, }, - "& .MuiSvgIcon-root": { - fontSize: 16, - color: "rgba(255, 255, 255, 0.8)", - maxWidth: 16, + "& .min-icon": { + width: 16, + height: 16, + fill: "rgba(255, 255, 255, 0.8)", }, "& .MuiListItemIcon-root": { minWidth: 36, @@ -263,7 +263,11 @@ const styles = (theme: Theme) => }, logoIconClosed: { color: "white", - marginLeft: 11, + "& .min-icon": { + marginLeft: 11, + width: 24, + fill: "rgba(255, 255, 255, 0.8)", + }, }, }); @@ -577,7 +581,9 @@ const Menu = ({ > {page.icon && ( - {page.icon} +
+ {page.icon} +
)} {page.name && } diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx b/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx index 1b9fec4d1..5e55f3370 100644 --- a/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx +++ b/portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx @@ -74,7 +74,7 @@ const styles = (theme: Theme) => }, "& .MuiInputBase-root": { "& .MuiInputAdornment-root": { - "& .MuiSvgIcon-root": { + "& .min-icon": { color: theme.palette.grey["400"], height: 14, }, diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx b/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx index 687a59d79..cf3951b35 100644 --- a/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx +++ b/portal-ui/src/screens/Console/Tenants/ListTenants/TenantListItem.tsx @@ -34,7 +34,7 @@ const styles = (theme: Theme) => createStyles({ redState: { color: theme.palette.error.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, float: "left", @@ -43,7 +43,7 @@ const styles = (theme: Theme) => }, yellowState: { color: theme.palette.warning.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, float: "left", @@ -52,7 +52,7 @@ const styles = (theme: Theme) => }, greenState: { color: theme.palette.success.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, float: "left", @@ -61,7 +61,7 @@ const styles = (theme: Theme) => }, greyState: { color: "grey", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, float: "left", @@ -216,6 +216,7 @@ const TenantListItem = ({ tenant, classes }: ITenantListItem) => {
+
{
-
diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx index 49a8c339a..0d3aa9e4a 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx @@ -91,28 +91,28 @@ const styles = (theme: Theme) => }, redState: { color: theme.palette.error.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, }, yellowState: { color: theme.palette.warning.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, }, greenState: { color: theme.palette.success.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, }, greyState: { color: "grey", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, }, @@ -122,7 +122,7 @@ const styles = (theme: Theme) => fontSize: 10, left: 26, height: 10, - bottom: 16, + top: 4, }, ...containerForHeader(theme.spacing(4)), }); @@ -301,7 +301,6 @@ const TenantDetails = ({ -
{tenantInfo && tenantInfo.status && ( )}
+ } title={match.params["tenantName"]} diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx index c3796fcca..ae2f36c11 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSecurity.tsx @@ -342,7 +342,7 @@ const TenantSecurity = ({ const checked = targetD.checked; setEnableAutoCert(checked); }} - label={"Manage Inter-Node Certificates Automatically"} + label={"TLS"} description={ "The internode certificates will be generated and managed by MinIO Operator" } diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx index 4d3a0ccff..053c17cd4 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantSummary.tsx @@ -57,7 +57,7 @@ const styles = (theme: Theme) => ...tenantDetailsStyles, redState: { color: theme.palette.error.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, marginRight: 4, @@ -65,7 +65,7 @@ const styles = (theme: Theme) => }, yellowState: { color: theme.palette.warning.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, marginRight: 4, @@ -73,7 +73,7 @@ const styles = (theme: Theme) => }, greenState: { color: theme.palette.success.main, - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, marginRight: 4, @@ -81,7 +81,7 @@ const styles = (theme: Theme) => }, greyState: { color: "grey", - "& .MuiSvgIcon-root": { + "& .min-icon": { width: 16, height: 16, marginRight: 4, diff --git a/portal-ui/src/screens/Console/Users/UserDetails.tsx b/portal-ui/src/screens/Console/Users/UserDetails.tsx index a2d1e34ef..778f9776c 100644 --- a/portal-ui/src/screens/Console/Users/UserDetails.tsx +++ b/portal-ui/src/screens/Console/Users/UserDetails.tsx @@ -22,16 +22,22 @@ import { Theme } from "@mui/material/styles"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; import { Button, Grid } from "@mui/material"; -import { AddIcon, IAMPoliciesIcon, TrashIcon, UsersIcon } from "../../../icons"; +import { + AddIcon, + IAMPoliciesIcon, + LockIcon, + TrashIcon, + UsersIcon, +} from "../../../icons"; import { setErrorSnackMessage, setModalErrorSnackMessage, } from "../../../actions"; import { - tableStyles, actionsTray, containerForHeader, searchField, + tableStyles, } from "../Common/FormComponents/common/styleLibrary"; import { IPolicyItem } from "./types"; import { ErrorResponseHandler } from "../../../common/types"; @@ -44,7 +50,6 @@ import history from "../../../history"; import UserServiceAccountsPanel from "./UserServiceAccountsPanel"; import ChangeUserPasswordModal from "../Account/ChangeUserPasswordModal"; import DeleteUserString from "./DeleteUserString"; -import LockIcon from "@mui/icons-material/Lock"; import ScreenTitle from "../Common/ScreenTitle/ScreenTitle"; import BoxIconButton from "../Common/BoxIconButton/BoxIconButton"; import PanelTitle from "../Common/PanelTitle/PanelTitle"; diff --git a/portal-ui/src/theme/main.ts b/portal-ui/src/theme/main.ts index dc995f005..c84421268 100644 --- a/portal-ui/src/theme/main.ts +++ b/portal-ui/src/theme/main.ts @@ -77,7 +77,7 @@ const theme = createTheme({ fontSize: 14, fontWeight: 600, boxShadow: "none", - "& .MuiSvgIcon-root": { + "& .min-icon": { maxHeight: 18, }, "&.MuiButton-contained.Mui-disabled": {