mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced LinearProgress as loader in favor of ProgressBar from mds (#3020)

Browse Source 
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
This commit is contained in:
Alex
2023-08-31 09:27:29 -06:00
committed by GitHub
parent 5e9383de95
commit 636d12d43f
39 changed files with 146 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
portal-ui/src/screens/Console/Account/ChangePasswordModal.tsx
View File

@@ -15,9 +15,16 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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) => {
</Grid>
{loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</Grid>

12
portal-ui/src/screens/Console/Account/ChangeUserPasswordModal.tsx
View File

@@ -15,8 +15,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Box>
{loading && (
<Box>
<LinearProgress />
<ProgressBar />
</Box>
)}
</FormLayout>

6
portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx
View File

@@ -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 && (
<Grid container>
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
</Grid>
)}
@@ -362,7 +362,7 @@ const AddLifecycleModal = ({
</Grid>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</FormLayout>

4
portal-ui/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx
View File

@@ -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 = ({
</Grid>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</FormLayout>

5
portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx
View File

@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Grid>
{loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</FormLayout>

4
portal-ui/src/screens/Console/Buckets/BucketDetails/EnableQuota.tsx
View File

@@ -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 = ({
</Grid>
{loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</FormLayout>

14
portal-ui/src/screens/Console/Buckets/BucketDetails/SetRetentionConfig.tsx
View File

@@ -15,11 +15,19 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Grid>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</FormLayout>

5
portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx
View File

@@ -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 = () => {
</Grid>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</form>

6
portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/BucketNamingRules.tsx
View File

@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</Fragment>

5
portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
View File

@@ -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 = () => {
</Grid>
</Grid>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{!loading && (
<Grid
item

6
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/RewindEnable.tsx
View File

@@ -16,8 +16,8 @@
import React, { useEffect, useState } from "react";
import { useSelector } from "react-redux";
import { LinearProgress } from "@mui/material";
import { Button, Grid, Switch } from "mds";
import { Button, Grid, ProgressBar, Switch } from "mds";
import ModalWrapper from "../../../../Common/ModalWrapper/ModalWrapper";
import DateTimePickerWrapper from "../../../../Common/FormComponents/DateTimePickerWrapper/DateTimePickerWrapper";
import { AppState, useAppDispatch } from "../../../../../../store";
@@ -134,7 +134,7 @@ const RewindEnable = ({
</Grid>
{rewindEnabling && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</Grid>

6
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ShareFile.tsx
View File

@@ -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 && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
{!isLoadingVersion && (

5
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx
View File

@@ -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 = ({
<Grid container className={classes.versionsContainer}>
{!actualInfo && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}

5
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx
View File

@@ -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 = ({
<Fragment>
{objectType !== "none" && loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
{isMetaDataLoaded ? (

5
portal-ui/src/screens/Console/Common/GenericWizard/WizardPage.tsx
View File

@@ -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 = ({
</div>
{loadingStep && (
<div>
<LinearProgress />
<ProgressBar />
</div>
)}
<div

5
portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx
View File

@@ -18,7 +18,6 @@ import {
Checkbox,
Grid,
IconButton,
LinearProgress,
Paper,
Popover,
Typography,
@@ -39,7 +38,7 @@ import {
radioIcons,
TableRowPredefStyles,
} from "../FormComponents/common/styleLibrary";
import { Loader } from "mds";
import { Loader, ProgressBar } from "mds";
import TooltipWrapper from "../TooltipWrapper/TooltipWrapper";
//Interfaces for table Items
@@ -588,7 +587,7 @@ const TableWrapper = ({
{loadingMessage}
</Grid>
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
</Grid>
)}

3
portal-ui/src/screens/Console/Console.tsx
View File

@@ -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"));

5
portal-ui/src/screens/Console/Dashboard/Dashboard.tsx
View File

@@ -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 ? (
<Grid container>
<Grid item xs={12} className={classes.container}>
<LinearProgress />
<ProgressBar />
</Grid>
</Grid>
) : (

5
portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx
View File

@@ -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) && <LinearProgress />}
{(!usage || loadingUsage) && <ProgressBar />}
{usage && !loadingUsage && <BasicDashboard usage={usage} />}
</TabPanel>
</Grid>

6
portal-ui/src/screens/Console/EventDestinations/CustomForms/ResetConfigurationModal.tsx
View File

@@ -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={
<Fragment>
{resetLoading && <LinearProgress />}
{resetLoading && <ProgressBar />}
<Fragment>
Are you sure you want to restore these configurations to default
values?

5
portal-ui/src/screens/Console/EventDestinations/ListEventDestinations.tsx
View File

@@ -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) => {
</TooltipWrapper>
</div>
</Grid>
{isLoading && <LinearProgress />}
{isLoading && <ProgressBar />}
{!isLoading && (
<Fragment>
{records.length > 0 && (

6
portal-ui/src/screens/Console/EventDestinations/WebhookSettings/AddEndpointModal.tsx
View File

@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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,
}}
>
<LinearProgress />
<ProgressBar />
</Grid>
)}
<Grid item xs={12} sx={modalStyleUtils.modalButtonBar}>

6
portal-ui/src/screens/Console/EventDestinations/WebhookSettings/EditWebhookEndpoint.tsx
View File

@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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,
}}
>
<LinearProgress />
<ProgressBar />
</Grid>
)}
<Grid

5
portal-ui/src/screens/Console/Groups/AddGroupScreen.tsx
View File

@@ -17,7 +17,7 @@
import React, { Fragment, useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
import { LinearProgress } from "@mui/material";
import {
BackLink,
Button,
@@ -26,6 +26,7 @@ import {
Grid,
InputBox,
PageLayout,
ProgressBar,
} from "mds";
import { api } from "api";
import { errorToHandler } from "api/errors";
@@ -140,7 +141,7 @@ const AddGroupScreen = () => {
</Grid>
{saving && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</form>

5
portal-ui/src/screens/Console/Groups/Groups.tsx
View File

@@ -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 = () => {
</SecureComponent>
</Box>
</Grid>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{!loading && (
<Fragment>
{records.length > 0 && (

6
portal-ui/src/screens/Console/Groups/UsersSelectors.tsx
View File

@@ -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 (
<Grid item xs={12} className={"inputItem"}>
<Box>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{records?.length > 0 ? (
<Fragment>
<Grid item xs={12} className={"inputItem"}>

6
portal-ui/src/screens/Console/License/License.tsx
View File

@@ -15,11 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
);
}

5
portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx
View File

@@ -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 = () => {
</Grid>
</Grid>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{!loading && (
<Grid
item

4
portal-ui/src/screens/Console/Policies/PolicyDetails.tsx
View File

@@ -25,6 +25,7 @@ import {
Grid,
IAMPoliciesIcon,
PageLayout,
ProgressBar,
RefreshIcon,
ScreenTitle,
SectionTitle,
@@ -32,7 +33,6 @@ import {
TrashIcon,
} from "mds";
import { actionsTray } from "../Common/FormComponents/common/styleLibrary";
import { LinearProgress } from "@mui/material";
import { ErrorResponseHandler } from "../../../common/types";
import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
@@ -605,7 +605,7 @@ const PolicyDetails = () => {
</Grid>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</Grid>

6
portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
View File

@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 (
<Grid item xs={12} className={"inputItem"}>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{records.length > 0 ? (
<Fragment>
<Grid item xs={12} className={"inputItem"}>

6
portal-ui/src/screens/Console/Policies/SetPolicy.tsx
View File

@@ -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 = ({
</Grid>
{loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</ModalWrapper>

8
portal-ui/src/screens/Console/Support/CallHomeConfirmation.tsx
View File

@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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,
}}
>
<LinearProgress />
<ProgressBar />
</Grid>
)}
<Grid
@@ -163,7 +163,7 @@ const CallHomeConfirmation = ({
marginBottom: 10,
}}
>
<LinearProgress />
<ProgressBar />
</Grid>
)}
<Grid

5
portal-ui/src/screens/Console/Users/AddUserScreen.tsx
View File

@@ -22,10 +22,11 @@ import {
FormLayout,
Grid,
PageLayout,
ProgressBar,
} from "mds";
import { createUserAsync, resetFormAsync } from "./thunk/AddUsersThunk";
import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
import { LinearProgress } from "@mui/material";
import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
import { useNavigate } from "react-router-dom";
import { setErrorSnackMessage, setHelpName } from "../../../systemSlice";
@@ -126,7 +127,7 @@ const AddUser = () => {
/>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}

13
portal-ui/src/screens/Console/Users/BulkAddToGroup.tsx
View File

@@ -15,8 +15,15 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Grid>
{saving && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</form>

13
portal-ui/src/screens/Console/Users/ChangeUserGroups.tsx
View File

@@ -15,8 +15,15 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Box>
{addLoading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</form>

6
portal-ui/src/screens/Console/Users/GroupsSelectors.tsx
View File

@@ -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 (
<Grid item xs={12} className={"inputItem"}>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{records !== null && records.length > 0 ? (
<Fragment>
<Grid item xs={12} className={"inputItem"}>

5
portal-ui/src/screens/Console/Users/ListUsers.tsx
View File

@@ -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 = () => {
</SecureComponent>
</Grid>
{loading && <LinearProgress />}
{loading && <ProgressBar />}
{!loading && (
<Fragment>
{records.length > 0 && (

6
portal-ui/src/screens/Console/Users/SetUserPolicies.tsx
View File

@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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 = ({
</Box>
{loading && (
<Grid item xs={12}>
<LinearProgress />
<ProgressBar />
</Grid>
)}
</ModalWrapper>

5
portal-ui/src/screens/LoginPage/StrategyForm.tsx
View File

@@ -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 && <LinearProgress />}
{loginSending && <ProgressBar />}
</Grid>
</Fragment>
)}