diff --git a/CHANGELOG.md b/CHANGELOG.md index 751c6ee8d..056dfbd78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ - Fix consistency issue in overlays where form input is used - Company Wallet - Use appropriate path to display logo on cards +- Refactor + - Remove unnecessary import of Typography, Dialog and Circular Progress from mui and use those from shared-components - Connector Management - fetch details using api, added permissions and fixed error messages - App Release Process diff --git a/DEPENDENCIES b/DEPENDENCIES index 5931d5d06..7a6c02930 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -599,7 +599,7 @@ npm/npmjs/@babel/template/7.24.0, MIT, approved, clearlydefined npm/npmjs/@babel/traverse/7.24.1, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #13926 npm/npmjs/@babel/types/7.24.0, MIT, approved, clearlydefined npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined -npm/npmjs/@catena-x/portal-shared-components/3.0.16, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247 +npm/npmjs/@catena-x/portal-shared-components/3.0.17, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247 npm/npmjs/@cspotcode/source-map-support/0.8.1, MIT, approved, clearlydefined npm/npmjs/@date-io/core/3.0.0, MIT, approved, clearlydefined npm/npmjs/@date-io/date-fns/3.0.0, MIT, approved, #14023 diff --git a/package.json b/package.json index 7dedc58e6..96dd393e8 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ] }, "dependencies": { - "@catena-x/portal-shared-components": "^3.0.16", + "@catena-x/portal-shared-components": "^3.0.17", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.0", "@hookform/error-message": "^2.0.1", diff --git a/src/components/overlays/UpdateCertificate/index.tsx b/src/components/overlays/UpdateCertificate/index.tsx index 818f08f21..ee9684532 100644 --- a/src/components/overlays/UpdateCertificate/index.tsx +++ b/src/components/overlays/UpdateCertificate/index.tsx @@ -32,8 +32,9 @@ import { Typography, SelectList, Tooltips, + Dialog, } from '@catena-x/portal-shared-components' -import { Box, Dialog } from '@mui/material' +import { Box } from '@mui/material' import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' import PendingOutlinedIcon from '@mui/icons-material/PendingOutlined' import { OVERLAYS } from 'types/Constants' diff --git a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx index fc64b33d3..e95c003d7 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx +++ b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx @@ -33,8 +33,9 @@ import { DropPreviewFile, UploadStatus, DialogActions, + CircleProgress, } from '@catena-x/portal-shared-components' -import { Box, useTheme, CircularProgress } from '@mui/material' +import { Box, useTheme } from '@mui/material' import { useSelector } from 'react-redux' import { adminRegistrationSelector } from 'features/admin/registration/slice' import { @@ -320,8 +321,10 @@ const CompanyDetailOverlay = ({ padding: '30px', }} > - (
- {t('content.appstore.appOverviewSection.title')} diff --git a/src/components/pages/AppOverview/index.tsx b/src/components/pages/AppOverview/index.tsx index c7c70a671..9096908ae 100644 --- a/src/components/pages/AppOverview/index.tsx +++ b/src/components/pages/AppOverview/index.tsx @@ -30,8 +30,9 @@ import { Cards, PageSnackbar, ErrorBar, + CircleProgress, } from '@catena-x/portal-shared-components' -import { useTheme, CircularProgress, Box } from '@mui/material' +import { useTheme, Box } from '@mui/material' import { appCardStatus, appCardRecentlyApps, @@ -269,7 +270,9 @@ export default function AppOverview() {
{isFetching ? (
- {isLoading ? (
- +
) : (
{ > {ti('action.delete')} {deleteLoading && ( - { > {idp.enabled ? ti('action.disable') : ti('action.enable')} {disableLoading && ( - {isLoading ? (
- { const Loading = ( - + ) diff --git a/src/components/pages/SemanticHub/ModelImportDialog.tsx b/src/components/pages/SemanticHub/ModelImportDialog.tsx index 59765dfde..bf414b686 100644 --- a/src/components/pages/SemanticHub/ModelImportDialog.tsx +++ b/src/components/pages/SemanticHub/ModelImportDialog.tsx @@ -27,6 +27,7 @@ import { Typography, Input, theme, + CircleProgress, } from '@catena-x/portal-shared-components' import { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' @@ -41,7 +42,6 @@ import { FormControl, Select, type SelectChangeEvent, - CircularProgress, } from '@mui/material' import type { AppDispatch } from 'features/store' @@ -126,7 +126,9 @@ const ModelImportDialog = ({ show, onClose }: ModelDetailDialogProps) => { {error && {error}} {uploading && ( - ) : (
- {!services ? (
- {isFetching ? (
- {isLoading ? (
- ) : (
- {isFetching ? (
- ) : (
- -