From 636d12d43f44f8613789e930eb077d7f82ca089e Mon Sep 17 00:00:00 2001 From: Alex <33497058+bexsoft@users.noreply.github.com> Date: Thu, 31 Aug 2023 09:27:29 -0600 Subject: [PATCH] Replaced LinearProgress as loader in favor of ProgressBar from mds (#3020) Signed-off-by: Benjamin Perez --- .../Console/Account/ChangePasswordModal.tsx | 13 ++++++++++--- .../Console/Account/ChangeUserPasswordModal.tsx | 12 +++++++++--- .../Buckets/BucketDetails/AddLifecycleModal.tsx | 6 +++--- .../BucketDetails/EditLifecycleConfiguration.tsx | 4 ++-- .../BucketDetails/EnableBucketEncryption.tsx | 5 +++-- .../Console/Buckets/BucketDetails/EnableQuota.tsx | 4 ++-- .../Buckets/BucketDetails/SetRetentionConfig.tsx | 14 +++++++++++--- .../Buckets/ListBuckets/AddBucket/AddBucket.tsx | 5 +++-- .../ListBuckets/AddBucket/BucketNamingRules.tsx | 6 +++--- .../Console/Buckets/ListBuckets/ListBuckets.tsx | 5 +++-- .../Objects/ListObjects/RewindEnable.tsx | 6 +++--- .../Objects/ObjectDetails/ShareFile.tsx | 6 ++---- .../Objects/ObjectDetails/VersionsNavigator.tsx | 5 +++-- .../Objects/Preview/PreviewFileContent.tsx | 5 +++-- .../Console/Common/GenericWizard/WizardPage.tsx | 5 ++--- .../Console/Common/TableWrapper/TableWrapper.tsx | 5 ++--- portal-ui/src/screens/Console/Console.tsx | 3 ++- .../src/screens/Console/Dashboard/Dashboard.tsx | 5 +++-- .../Console/Dashboard/Prometheus/PrDashboard.tsx | 5 +++-- .../CustomForms/ResetConfigurationModal.tsx | 6 +++--- .../EventDestinations/ListEventDestinations.tsx | 5 +++-- .../WebhookSettings/AddEndpointModal.tsx | 6 +++--- .../WebhookSettings/EditWebhookEndpoint.tsx | 6 +++--- .../src/screens/Console/Groups/AddGroupScreen.tsx | 5 +++-- portal-ui/src/screens/Console/Groups/Groups.tsx | 5 +++-- .../src/screens/Console/Groups/UsersSelectors.tsx | 6 +++--- portal-ui/src/screens/Console/License/License.tsx | 6 +++--- .../screens/Console/ObjectBrowser/OBBucketList.tsx | 5 +++-- .../src/screens/Console/Policies/PolicyDetails.tsx | 4 ++-- .../screens/Console/Policies/PolicySelectors.tsx | 6 +++--- .../src/screens/Console/Policies/SetPolicy.tsx | 6 +++--- .../Console/Support/CallHomeConfirmation.tsx | 8 ++++---- .../src/screens/Console/Users/AddUserScreen.tsx | 5 +++-- .../src/screens/Console/Users/BulkAddToGroup.tsx | 13 ++++++++++--- .../src/screens/Console/Users/ChangeUserGroups.tsx | 13 ++++++++++--- .../src/screens/Console/Users/GroupsSelectors.tsx | 6 +++--- portal-ui/src/screens/Console/Users/ListUsers.tsx | 5 +++-- .../src/screens/Console/Users/SetUserPolicies.tsx | 6 +++--- portal-ui/src/screens/LoginPage/StrategyForm.tsx | 5 +++-- 39 files changed, 146 insertions(+), 100 deletions(-) diff --git a/portal-ui/src/screens/Console/Account/ChangePasswordModal.tsx b/portal-ui/src/screens/Console/Account/ChangePasswordModal.tsx index 7fba79403..93f91f5d5 100644 --- a/portal-ui/src/screens/Console/Account/ChangePasswordModal.tsx +++ b/portal-ui/src/screens/Console/Account/ChangePasswordModal.tsx @@ -15,9 +15,16 @@ // along with this program. If not, see . import React, { useState } from "react"; -import { Button, ChangePasswordIcon, InputBox, Grid, FormLayout } from "mds"; +import { + Button, + ChangePasswordIcon, + InputBox, + Grid, + FormLayout, + ProgressBar, +} from "mds"; import ModalWrapper from "../Common/ModalWrapper/ModalWrapper"; -import { LinearProgress } from "@mui/material"; + import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary"; import { setModalErrorSnackMessage } from "../../../systemSlice"; import { useAppDispatch } from "../../../store"; @@ -167,7 +174,7 @@ const ChangePassword = ({ open, closeModal }: IChangePasswordProps) => { {loading && ( - + )} diff --git a/portal-ui/src/screens/Console/Account/ChangeUserPasswordModal.tsx b/portal-ui/src/screens/Console/Account/ChangeUserPasswordModal.tsx index 60773fd63..64df0b80b 100644 --- a/portal-ui/src/screens/Console/Account/ChangeUserPasswordModal.tsx +++ b/portal-ui/src/screens/Console/Account/ChangeUserPasswordModal.tsx @@ -15,8 +15,14 @@ // along with this program. If not, see . import React, { useState } from "react"; -import { Box, Button, ChangePasswordIcon, FormLayout, InputBox } from "mds"; -import { LinearProgress } from "@mui/material"; +import { + Box, + Button, + ChangePasswordIcon, + FormLayout, + InputBox, + ProgressBar, +} from "mds"; import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary"; import { setModalErrorSnackMessage } from "../../../systemSlice"; import { useAppDispatch } from "../../../store"; @@ -138,7 +144,7 @@ const ChangeUserPassword = ({ {loading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx index 19b57272d..83d031435 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx @@ -24,6 +24,7 @@ import { RadioGroup, Select, Grid, + ProgressBar, } from "mds"; import { useSelector } from "react-redux"; import { api } from "api"; @@ -33,7 +34,6 @@ import { Accordion, AccordionDetails, AccordionSummary, - LinearProgress, Typography, } from "@mui/material"; import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary"; @@ -198,7 +198,7 @@ const AddLifecycleModal = ({ {loadingTiers && ( - + )} @@ -362,7 +362,7 @@ const AddLifecycleModal = ({ {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx index 4eea30d2c..9b6d6c4f6 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx @@ -22,6 +22,7 @@ import { Grid, InputBox, LifecycleConfigIcon, + ProgressBar, RadioGroup, Select, Switch, @@ -30,7 +31,6 @@ import { Accordion, AccordionDetails, AccordionSummary, - LinearProgress, Typography, } from "@mui/material"; import { api } from "api"; @@ -525,7 +525,7 @@ const EditLifecycleConfiguration = ({ {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx index 91adf25e8..3878691a3 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx @@ -15,7 +15,7 @@ // along with this program. If not, see . import React, { Fragment, useEffect, useState } from "react"; -import { LinearProgress } from "@mui/material"; + import { AddIcon, Box, @@ -23,6 +23,7 @@ import { Button, FormLayout, Grid, + ProgressBar, Select, } from "mds"; import { @@ -241,7 +242,7 @@ const EnableBucketEncryption = ({ {loading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableQuota.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableQuota.tsx index 55d46888d..e014f8668 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableQuota.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableQuota.tsx @@ -22,6 +22,7 @@ import { InputBox, Switch, Grid, + ProgressBar, } from "mds"; import { calculateBytes, @@ -38,7 +39,6 @@ import { useAppDispatch } from "../../../../store"; import { BucketQuota } from "api/consoleApi"; import { api } from "api"; import { errorToHandler } from "api/errors"; -import { LinearProgress } from "@mui/material"; interface IEnableQuotaProps { open: boolean; @@ -187,7 +187,7 @@ const EnableQuota = ({ {loading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/SetRetentionConfig.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/SetRetentionConfig.tsx index 5310636f3..250d95338 100644 --- a/portal-ui/src/screens/Console/Buckets/BucketDetails/SetRetentionConfig.tsx +++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/SetRetentionConfig.tsx @@ -15,11 +15,19 @@ // along with this program. If not, see . import React, { useEffect, useState } from "react"; -import { Button, Loader, Grid, FormLayout, RadioGroup, InputBox } from "mds"; +import { + Button, + Loader, + Grid, + FormLayout, + RadioGroup, + InputBox, + ProgressBar, +} from "mds"; import { api } from "api"; import { ObjectRetentionMode, ObjectRetentionUnit } from "api/consoleApi"; import { errorToHandler } from "api/errors"; -import { LinearProgress } from "@mui/material"; + import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary"; import { setModalErrorSnackMessage } from "../../../../systemSlice"; import { useAppDispatch } from "../../../../store"; @@ -177,7 +185,7 @@ const SetRetentionConfig = ({ {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx index 6faacc8f8..eb2a8a1ae 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx @@ -17,7 +17,7 @@ import React, { Fragment, useEffect, useState } from "react"; import styled from "styled-components"; import get from "lodash/get"; -import { LinearProgress } from "@mui/material"; + import { useNavigate } from "react-router-dom"; import { BackLink, @@ -33,6 +33,7 @@ import { RadioGroup, Switch, SectionTitle, + ProgressBar, } from "mds"; import { k8sScalarUnitsExcluding } from "../../../../../common/utils"; import { AppState, useAppDispatch } from "../../../../../store"; @@ -557,7 +558,7 @@ const AddBucket = () => { {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/BucketNamingRules.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/BucketNamingRules.tsx index f4317425c..237543c6a 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/BucketNamingRules.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/BucketNamingRules.tsx @@ -15,8 +15,8 @@ // along with this program. If not, see . import React, { Fragment, useState } from "react"; -import { Grid, ExpandOptionsButton } from "mds"; -import { LinearProgress } from "@mui/material"; +import { Grid, ExpandOptionsButton, ProgressBar } from "mds"; + import { AppState } from "../../../../../store"; import { useSelector } from "react-redux"; import ValidRule from "./ValidRule"; @@ -129,7 +129,7 @@ const BucketNamingRules = ({ errorList }: { errorList: boolean[] }) => { {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx index 0b34e677a..f3258cf4b 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx @@ -29,8 +29,9 @@ import { SelectMultipleIcon, Grid, breakPoints, + ProgressBar, } from "mds"; -import { LinearProgress } from "@mui/material"; + import { actionsTray } from "../../Common/FormComponents/common/styleLibrary"; import { SecureComponent } from "../../../../common/SecureComponent"; import { @@ -371,7 +372,7 @@ const ListBuckets = () => { - {loading && } + {loading && } {!loading && ( {rewindEnabling && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ShareFile.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ShareFile.tsx index eef1981ab..cd53da670 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ShareFile.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ShareFile.tsx @@ -16,10 +16,8 @@ import React, { Fragment, useEffect, useState } from "react"; import { useSelector } from "react-redux"; -import { Button, CopyIcon, ReadBox, ShareIcon, Grid } from "mds"; +import { Button, CopyIcon, ReadBox, ShareIcon, Grid, ProgressBar } from "mds"; import CopyToClipboard from "react-copy-to-clipboard"; -import LinearProgress from "@mui/material/LinearProgress"; - import ModalWrapper from "../../../../Common/ModalWrapper/ModalWrapper"; import DaysSelector from "../../../../Common/FormComponents/DaysSelector/DaysSelector"; import { encodeURLString } from "../../../../../../common/utils"; @@ -161,7 +159,7 @@ const ShareFile = ({ > {isLoadingVersion && ( - + )} {!isLoadingVersion && ( diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx index 0a328d42b..499a9c350 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx @@ -20,7 +20,7 @@ import { useSelector } from "react-redux"; import { withStyles } from "@mui/styles"; import { Theme } from "@mui/material/styles"; import createStyles from "@mui/styles/createStyles"; -import { LinearProgress } from "@mui/material"; + import Grid from "@mui/material/Grid"; import ShareFile from "./ShareFile"; import { @@ -45,6 +45,7 @@ import { SelectMultipleIcon, VersionsIcon, ScreenTitle, + ProgressBar, } from "mds"; import FileVersionItem from "./FileVersionItem"; import PreviewFileModal from "../Preview/PreviewFileModal"; @@ -424,7 +425,7 @@ const VersionsNavigator = ({ {!actualInfo && ( - + )} diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx index 608563358..5ad675439 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx @@ -17,7 +17,7 @@ import React, { Fragment, useCallback, useEffect, useState } from "react"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; -import { Grid, LinearProgress } from "@mui/material"; +import { Grid } from "@mui/material"; import { BucketObjectItem } from "../ListObjects/types"; import { AllowedPreviews, previewObjectType } from "../utils"; import { encodeURLString } from "../../../../../../common/utils"; @@ -25,6 +25,7 @@ import clsx from "clsx"; import WarningMessage from "../../../../Common/WarningMessage/WarningMessage"; import { api } from "../../../../../../api"; import get from "lodash/get"; +import { ProgressBar } from "mds"; const styles = () => createStyles({ @@ -130,7 +131,7 @@ const PreviewFile = ({ {objectType !== "none" && loading && ( - + )} {isMetaDataLoaded ? ( diff --git a/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx b/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx index c5082fbf6..c7951889a 100644 --- a/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx +++ b/portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx @@ -16,11 +16,10 @@ import React from "react"; import { Theme } from "@mui/material/styles"; -import { Button } from "mds"; +import { Button, ProgressBar } from "mds"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; import { IWizardButton, IWizardPage } from "./types"; -import { LinearProgress } from "@mui/material"; const styles = (theme: Theme) => createStyles({ @@ -97,7 +96,7 @@ const WizardPage = ({ {loadingStep && (
- +
)}
- + )} diff --git a/portal-ui/src/screens/Console/Console.tsx b/portal-ui/src/screens/Console/Console.tsx index fb7d30077..2665453b9 100644 --- a/portal-ui/src/screens/Console/Console.tsx +++ b/portal-ui/src/screens/Console/Console.tsx @@ -26,7 +26,7 @@ import { Button, MainContainer } from "mds"; import debounce from "lodash/debounce"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; -import { LinearProgress } from "@mui/material"; + import Snackbar from "@mui/material/Snackbar"; import { Navigate, Route, Routes, useLocation } from "react-router-dom"; import { useSelector } from "react-redux"; @@ -54,6 +54,7 @@ import { import { selFeatures, selSession } from "./consoleSlice"; import { api } from "api"; import MenuWrapper from "./Menu/MenuWrapper"; +import { LinearProgress } from "@mui/material"; const Trace = React.lazy(() => import("./Trace/Trace")); const Heal = React.lazy(() => import("./Heal/Heal")); diff --git a/portal-ui/src/screens/Console/Dashboard/Dashboard.tsx b/portal-ui/src/screens/Console/Dashboard/Dashboard.tsx index ea9699b38..3673d6bac 100644 --- a/portal-ui/src/screens/Console/Dashboard/Dashboard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/Dashboard.tsx @@ -21,7 +21,7 @@ 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 { LinearProgress } from "@mui/material"; + import { AppState, useAppDispatch } from "../../../store"; import { getUsageAsync } from "./dashboardThunks"; import { useSelector } from "react-redux"; @@ -29,6 +29,7 @@ import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper"; import { selFeatures } from "../consoleSlice"; import HelpMenu from "../HelpMenu"; import { setHelpName } from "../../../systemSlice"; +import { ProgressBar } from "mds"; interface IDashboardSimple { classes: any; @@ -73,7 +74,7 @@ const Dashboard = ({ classes }: IDashboardSimple) => { {loading ? ( - + ) : ( diff --git a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx index 6f12769b1..e0c5bf035 100644 --- a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx @@ -20,7 +20,7 @@ import Grid from "@mui/material/Grid"; import { Theme } from "@mui/material/styles"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; -import { Box, LinearProgress } from "@mui/material"; +import { Box } from "@mui/material"; import { actionsTray } from "../../Common/FormComponents/common/styleLibrary"; import { IDashboardPanel } from "./types"; import { panelsConfiguration } from "./utils"; @@ -46,6 +46,7 @@ import { Button, HelpBox, PageLayout, + ProgressBar, PrometheusErrorIcon, SyncIcon, } from "mds"; @@ -341,7 +342,7 @@ const PrDashboard = ({ apiPrefix = "admin", usage }: IPrDashboard) => { index={usage?.advancedMetricsStatus === "not configured" ? 0 : 3} value={curTab} > - {(!usage || loadingUsage) && } + {(!usage || loadingUsage) && } {usage && !loadingUsage && } diff --git a/portal-ui/src/screens/Console/EventDestinations/CustomForms/ResetConfigurationModal.tsx b/portal-ui/src/screens/Console/EventDestinations/CustomForms/ResetConfigurationModal.tsx index 3f5e62112..f45e6ae2c 100644 --- a/portal-ui/src/screens/Console/EventDestinations/CustomForms/ResetConfigurationModal.tsx +++ b/portal-ui/src/screens/Console/EventDestinations/CustomForms/ResetConfigurationModal.tsx @@ -18,8 +18,8 @@ import React, { Fragment, useEffect, useState } from "react"; import { api } from "api"; import { errorToHandler } from "api/errors"; import ConfirmDialog from "../../Common/ModalWrapper/ConfirmDialog"; -import { LinearProgress } from "@mui/material"; -import { ConfirmDeleteIcon } from "mds"; + +import { ConfirmDeleteIcon, ProgressBar } from "mds"; import { setErrorSnackMessage } from "../../../../systemSlice"; import { useAppDispatch } from "../../../../store"; @@ -69,7 +69,7 @@ const ResetConfigurationModal = ({ }} confirmationContent={ - {resetLoading && } + {resetLoading && } Are you sure you want to restore these configurations to default values? diff --git a/portal-ui/src/screens/Console/EventDestinations/ListEventDestinations.tsx b/portal-ui/src/screens/Console/EventDestinations/ListEventDestinations.tsx index 692a79d90..28a425c37 100644 --- a/portal-ui/src/screens/Console/EventDestinations/ListEventDestinations.tsx +++ b/portal-ui/src/screens/Console/EventDestinations/ListEventDestinations.tsx @@ -24,13 +24,14 @@ import { HelpBox, LambdaIcon, PageLayout, + ProgressBar, RefreshIcon, } from "mds"; import { useNavigate } from "react-router-dom"; import { Theme } from "@mui/material/styles"; import createStyles from "@mui/styles/createStyles"; import withStyles from "@mui/styles/withStyles"; -import { LinearProgress } from "@mui/material"; + import { red } from "@mui/material/colors"; import FiberManualRecordIcon from "@mui/icons-material/FiberManualRecord"; import { TransformedEndpointItem } from "./types"; @@ -220,7 +221,7 @@ const ListEventDestinations = ({ classes }: IListNotificationEndpoints) => {
- {isLoading && } + {isLoading && } {!isLoading && ( {records.length > 0 && ( diff --git a/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx b/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx index 876b51fcd..2d01be004 100644 --- a/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx +++ b/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx @@ -15,7 +15,7 @@ // along with this program. If not, see . import React, { Fragment, useState } from "react"; -import { Button, FormLayout, Grid, InputBox } from "mds"; +import { Button, FormLayout, Grid, InputBox, ProgressBar } from "mds"; import { api } from "api"; import { errorToHandler } from "api/errors"; import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper"; @@ -29,7 +29,7 @@ import { setSnackBarMessage, } from "../../../../systemSlice"; import { useAppDispatch } from "../../../../store"; -import { LinearProgress } from "@mui/material"; + import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary"; interface IEndpointModal { @@ -206,7 +206,7 @@ const AddEndpointModal = ({ open, type, onCloseEndpoint }: IEndpointModal) => { marginBottom: 10, }} > - + )} diff --git a/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx b/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx index a270ae180..b86a1d5d5 100644 --- a/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx +++ b/portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx @@ -15,7 +15,7 @@ // along with this program. If not, see . import React, { Fragment, useEffect, useState } from "react"; -import { Button, ConsoleIcon, Grid, Tooltip } from "mds"; +import { Button, ConsoleIcon, Grid, ProgressBar, Tooltip } from "mds"; import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper"; import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper"; import { Webhook } from "@mui/icons-material"; @@ -29,7 +29,7 @@ import { setSnackBarMessage, } from "../../../../systemSlice"; import { useAppDispatch } from "../../../../store"; -import { LinearProgress } from "@mui/material"; + import { IConfigurationSys } from "../../Configurations/types"; import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper"; import PredefinedList from "../../Common/FormComponents/PredefinedList/PredefinedList"; @@ -339,7 +339,7 @@ const EditEndpointModal = ({ marginBottom: 10, }} > - + )} { {saving && ( - + )} diff --git a/portal-ui/src/screens/Console/Groups/Groups.tsx b/portal-ui/src/screens/Console/Groups/Groups.tsx index 0bb946f14..28b8b4d2d 100644 --- a/portal-ui/src/screens/Console/Groups/Groups.tsx +++ b/portal-ui/src/screens/Console/Groups/Groups.tsx @@ -28,8 +28,9 @@ import { DataTable, Grid, Box, + ProgressBar, } from "mds"; -import { LinearProgress } from "@mui/material"; + import { api } from "api"; import { stringSort } from "../../../utils/sortFunctions"; import { actionsTray } from "../Common/FormComponents/common/styleLibrary"; @@ -299,7 +300,7 @@ const Groups = () => { - {loading && } + {loading && } {!loading && ( {records.length > 0 && ( diff --git a/portal-ui/src/screens/Console/Groups/UsersSelectors.tsx b/portal-ui/src/screens/Console/Groups/UsersSelectors.tsx index 35ee23ef5..df3436f1f 100644 --- a/portal-ui/src/screens/Console/Groups/UsersSelectors.tsx +++ b/portal-ui/src/screens/Console/Groups/UsersSelectors.tsx @@ -18,8 +18,8 @@ import React, { useCallback, useEffect, useState, Fragment } from "react"; import get from "lodash/get"; import { api } from "api"; import { errorToHandler } from "api/errors"; -import { Box, DataTable, Grid } from "mds"; -import { LinearProgress } from "@mui/material"; +import { Box, DataTable, Grid, ProgressBar } from "mds"; + import { usersSort } from "../../../utils/sortFunctions"; import { setModalErrorSnackMessage } from "../../../systemSlice"; import { useAppDispatch } from "../../../store"; @@ -101,7 +101,7 @@ const UsersSelectors = ({ return ( - {loading && } + {loading && } {records?.length > 0 ? ( diff --git a/portal-ui/src/screens/Console/License/License.tsx b/portal-ui/src/screens/Console/License/License.tsx index ee112520a..7aca57719 100644 --- a/portal-ui/src/screens/Console/License/License.tsx +++ b/portal-ui/src/screens/Console/License/License.tsx @@ -15,11 +15,11 @@ // along with this program. If not, see . import React, { Fragment, useCallback, useEffect, useState } from "react"; -import { LinearProgress } from "@mui/material"; + import Grid from "@mui/material/Grid"; import { SubnetInfo } from "./types"; import api from "../../../common/api"; -import { ArrowIcon, Button, PageLayout } from "mds"; +import { ArrowIcon, Button, PageLayout, ProgressBar } from "mds"; import { IAM_PAGES } from "../../../common/SecureComponent/permissions"; import LicensePlans from "./LicensePlans"; import { useNavigate } from "react-router-dom"; @@ -117,7 +117,7 @@ const License = () => { if (loadingLicenseInfo) { return ( - + ); } diff --git a/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx b/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx index a6d129b80..c7c9c496b 100644 --- a/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx +++ b/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx @@ -24,10 +24,11 @@ import { DataTable, HelpBox, PageLayout, + ProgressBar, RefreshIcon, } from "mds"; import createStyles from "@mui/styles/createStyles"; -import { LinearProgress } from "@mui/material"; + import Grid from "@mui/material/Grid"; import { actionsTray, @@ -190,7 +191,7 @@ const OBListBuckets = () => { - {loading && } + {loading && } {!loading && ( { {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx index b9975d4c1..f1a90a2ba 100644 --- a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx +++ b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx @@ -15,8 +15,8 @@ // along with this program. If not, see . import React, { Fragment, useCallback, useEffect, useState } from "react"; -import { LinearProgress } from "@mui/material"; -import { Box, DataTable, Grid } from "mds"; + +import { Box, DataTable, Grid, ProgressBar } from "mds"; import { policySort } from "../../../utils/sortFunctions"; import { ErrorResponseHandler } from "../../../common/types"; import SearchBox from "../Common/SearchBox"; @@ -95,7 +95,7 @@ const PolicySelectors = ({ noTitle = false }: ISelectPolicyProps) => { return ( - {loading && } + {loading && } {records.length > 0 ? ( diff --git a/portal-ui/src/screens/Console/Policies/SetPolicy.tsx b/portal-ui/src/screens/Console/Policies/SetPolicy.tsx index 5eb64ea37..1e483056b 100644 --- a/portal-ui/src/screens/Console/Policies/SetPolicy.tsx +++ b/portal-ui/src/screens/Console/Policies/SetPolicy.tsx @@ -17,8 +17,8 @@ import React, { Fragment, useEffect, useState } from "react"; import get from "lodash/get"; import { useSelector } from "react-redux"; -import { Button, FormLayout, ReadBox, Grid } from "mds"; -import { LinearProgress } from "@mui/material"; +import { Button, FormLayout, ReadBox, Grid, ProgressBar } from "mds"; + import { ErrorResponseHandler } from "../../../common/types"; import { encodeURLString } from "../../../common/utils"; import { setModalErrorSnackMessage } from "../../../systemSlice"; @@ -170,7 +170,7 @@ const SetPolicy = ({ {loading && ( - + )} diff --git a/portal-ui/src/screens/Console/Support/CallHomeConfirmation.tsx b/portal-ui/src/screens/Console/Support/CallHomeConfirmation.tsx index a52a71547..914ee79f7 100644 --- a/portal-ui/src/screens/Console/Support/CallHomeConfirmation.tsx +++ b/portal-ui/src/screens/Console/Support/CallHomeConfirmation.tsx @@ -15,8 +15,8 @@ // along with this program. If not, see . import React, { Fragment, useState } from "react"; -import { Button, CallHomeMenuIcon, CircleIcon, Grid } from "mds"; -import { LinearProgress } from "@mui/material"; +import { Button, CallHomeMenuIcon, CircleIcon, Grid, ProgressBar } from "mds"; + import api from "../../../common/api"; import { ICallHomeResponse } from "./types"; import { ErrorResponseHandler } from "../../../common/types"; @@ -85,7 +85,7 @@ const CallHomeConfirmation = ({ marginBottom: 10, }} > - + )} - + )} { /> {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Users/BulkAddToGroup.tsx b/portal-ui/src/screens/Console/Users/BulkAddToGroup.tsx index d3f8a3cdd..538945d95 100644 --- a/portal-ui/src/screens/Console/Users/BulkAddToGroup.tsx +++ b/portal-ui/src/screens/Console/Users/BulkAddToGroup.tsx @@ -15,8 +15,15 @@ // along with this program. If not, see . import React, { useEffect, useState } from "react"; -import { AddMembersToGroupIcon, Button, FormLayout, Grid, ReadBox } from "mds"; -import { LinearProgress } from "@mui/material"; +import { + AddMembersToGroupIcon, + Button, + FormLayout, + Grid, + ProgressBar, + ReadBox, +} from "mds"; + import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary"; import { ErrorResponseHandler } from "../../../common/types"; import api from "../../../common/api"; @@ -148,7 +155,7 @@ const BulkAddToGroup = ({ {saving && ( - + )} diff --git a/portal-ui/src/screens/Console/Users/ChangeUserGroups.tsx b/portal-ui/src/screens/Console/Users/ChangeUserGroups.tsx index d5cf4f3c8..d6d02572c 100644 --- a/portal-ui/src/screens/Console/Users/ChangeUserGroups.tsx +++ b/portal-ui/src/screens/Console/Users/ChangeUserGroups.tsx @@ -15,8 +15,15 @@ // along with this program. If not, see . import React, { useCallback, useEffect, useState, Fragment } from "react"; -import { LinearProgress } from "@mui/material"; -import { AddMembersToGroupIcon, Button, FormLayout, Grid, Box } from "mds"; + +import { + AddMembersToGroupIcon, + Button, + FormLayout, + Grid, + Box, + ProgressBar, +} from "mds"; import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary"; import { ErrorResponseHandler } from "../../../common/types"; import { encodeURLString } from "../../../common/utils"; @@ -170,7 +177,7 @@ const ChangeUserGroups = ({ {addLoading && ( - + )} diff --git a/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx b/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx index 98fa9e2e1..36c468e42 100644 --- a/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx +++ b/portal-ui/src/screens/Console/Users/GroupsSelectors.tsx @@ -16,8 +16,8 @@ import React, { useCallback, useEffect, useState, Fragment } from "react"; import get from "lodash/get"; -import { LinearProgress } from "@mui/material"; -import { Box, DataTable, Grid } from "mds"; + +import { Box, DataTable, Grid, ProgressBar } from "mds"; import { stringSort } from "../../../utils/sortFunctions"; import { GroupsList } from "../Groups/types"; import { ErrorResponseHandler } from "../../../common/types"; @@ -97,7 +97,7 @@ const GroupsSelectors = ({ return ( - {loading && } + {loading && } {records !== null && records.length > 0 ? ( diff --git a/portal-ui/src/screens/Console/Users/ListUsers.tsx b/portal-ui/src/screens/Console/Users/ListUsers.tsx index 7401e1ad4..90edf3cab 100644 --- a/portal-ui/src/screens/Console/Users/ListUsers.tsx +++ b/portal-ui/src/screens/Console/Users/ListUsers.tsx @@ -26,8 +26,9 @@ import { UsersIcon, DataTable, Grid, + ProgressBar, } from "mds"; -import { LinearProgress } from "@mui/material"; + import { User, UsersList } from "./types"; import { usersSort } from "../../../utils/sortFunctions"; import { actionsTray } from "../Common/FormComponents/common/styleLibrary"; @@ -324,7 +325,7 @@ const ListUsers = () => { - {loading && } + {loading && } {!loading && ( {records.length > 0 && ( diff --git a/portal-ui/src/screens/Console/Users/SetUserPolicies.tsx b/portal-ui/src/screens/Console/Users/SetUserPolicies.tsx index 84463a4c0..9bdd0efef 100644 --- a/portal-ui/src/screens/Console/Users/SetUserPolicies.tsx +++ b/portal-ui/src/screens/Console/Users/SetUserPolicies.tsx @@ -15,8 +15,8 @@ // along with this program. If not, see . import React, { useEffect, useState } from "react"; -import { Box, Button, FormLayout, IAMPoliciesIcon } from "mds"; -import { LinearProgress } from "@mui/material"; +import { Box, Button, FormLayout, IAMPoliciesIcon, ProgressBar } from "mds"; + import { useSelector } from "react-redux"; import Grid from "@mui/material/Grid"; import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary"; @@ -122,7 +122,7 @@ const SetUserPolicies = ({ {loading && ( - + )} diff --git a/portal-ui/src/screens/LoginPage/StrategyForm.tsx b/portal-ui/src/screens/LoginPage/StrategyForm.tsx index 7eb2c055f..764bcec24 100644 --- a/portal-ui/src/screens/LoginPage/StrategyForm.tsx +++ b/portal-ui/src/screens/LoginPage/StrategyForm.tsx @@ -24,6 +24,7 @@ import { LockFilledIcon, LogoutIcon, PasswordKeyIcon, + ProgressBar, Select, UserFilledIcon, } from "mds"; @@ -34,7 +35,7 @@ import { setSTS, setUseSTS, } from "./loginSlice"; -import { LinearProgress } from "@mui/material"; + import { AppState, useAppDispatch } from "../../store"; import { useSelector } from "react-redux"; import { doLoginAsync } from "./loginThunks"; @@ -254,7 +255,7 @@ const StrategyForm = ({ redirectRules }: { redirectRules: RedirectRule[] }) => { height: 10, }} > - {loginSending && } + {loginSending && } )}