From 24e4449d834a58ee976411672b68396b5efb1b16 Mon Sep 17 00:00:00 2001 From: lavanya-bmw <106523828+lavanya-bmw@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:39:00 +0530 Subject: [PATCH 1/9] feat(page headers): standardize page headers (#864) --- CHANGELOG.md | 2 + src/assets/locales/de/main.json | 5 +- src/assets/locales/en/main.json | 5 +- src/components/pages/AboutPage/index.tsx | 5 +- src/components/pages/AppOverview/AddRoles.tsx | 5 +- .../pages/AppOverview/ChangeDescription.tsx | 5 +- .../pages/AppOverview/ChangeDocuments.tsx | 5 +- .../pages/AppOverview/ChangeImage.tsx | 5 +- .../pages/AppOverview/Deactivate.tsx | 5 +- src/components/pages/AppOverview/index.tsx | 5 +- src/components/pages/AppOverviewNew/index.tsx | 5 +- .../pages/AppUserManagement/index.tsx | 7 +-- .../pages/CompanyRoleUpdate/index.tsx | 5 +- src/components/pages/CookiePolicy/index.tsx | 62 ++++++++++--------- .../ConfigurationDetailsOverlay.tsx | 38 ++++++------ .../EdcConnector/ConnectorDetailsOverlay.tsx | 2 +- src/components/pages/Imprint/index.tsx | 5 +- .../pages/InviteBusinessPartner/index.tsx | 5 +- src/components/pages/PartnerNetwork/index.tsx | 2 +- src/components/pages/SemanticHub/index.tsx | 19 ++++-- .../components/ServiceDeactivate.tsx | 9 +-- .../components/ServiceDetails.tsx | 5 +- .../components/ServiceListOverview.tsx | 5 +- .../pages/UsecaseParticipation/index.tsx | 5 +- src/components/pages/UserDetail/index.tsx | 5 +- .../shared/basic/ReleaseProcess/index.tsx | 5 +- .../shared/frame/StageHeader/index.tsx | 38 ------------ .../shared/templates/AdminBoard/index.tsx | 5 +- src/components/styles/_stage.scss | 20 ------ src/features/connector/connectorApiSlice.ts | 7 ++- 30 files changed, 102 insertions(+), 199 deletions(-) delete mode 100644 src/components/shared/frame/StageHeader/index.tsx diff --git a/CHANGELOG.md b/CHANGELOG.md index 316747a23..7ff507274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ - Create and Edit address/site feature introduced - App marketplace - Add more and collapse button to category view +- Page headers + - harmonization and standardization of page headers ## 2.0.0 diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index b0dc9979a..c07fc68d4 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -612,10 +612,7 @@ }, "configurationDetails": { "title": "So konfigurieren Sie Ihren Connector", - "description1": "Diese Beschreibung enthält Schritt-für-Schritt-Anleitungen zur Konfiguration Ihres Connectors.", - "description2": "Bitte befolgen Sie die nachstehenden Anweisungen, um die erforderlichen Konfigurationswerte festzulegen.", - "description3": "Stellen Sie sicher, dass Sie für jede Konfigurationseinstellung die richtigen Werte eingeben.", - "description4": "Sobald Sie diese Werte festgelegt haben, ist Ihr Connector ordnungsgemäß konfiguriert und einsatzbereit.", + "description": "Diese Beschreibung enthält Schritt-für-Schritt-Anleitungen zur Konfiguration Ihres Connectors.
Bitte befolgen Sie die nachstehenden Anweisungen, um die erforderlichen Konfigurationswerte festzulegen.
Stellen Sie sicher, dass Sie für jede Konfigurationseinstellung die richtigen Werte eingeben.
Sobald Sie diese Werte festgelegt haben, ist Ihr Connector ordnungsgemäß konfiguriert und einsatzbereit.", "learnMore": "Lern mehr", "clientId": "Client-ID Ihres technischen Benutzers", "secret": "Geheimnis", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 08f674269..9945f7ed0 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -611,10 +611,7 @@ }, "configurationDetails": { "title": "How to Configure Your Connector", - "description1": "This description provides step-by-step instructions on how to configure your connector.", - "description2": "Please follow the instructions below to set the necessary configuration values.", - "description3": "Ensure that you enter the correct values for each configuration setting.", - "description4": "Once you have set these values, your connector will be properly configured and ready to use.", + "description": "This description provides step-by-step instructions on how to configure your connector.
Please follow the instructions below to set the necessary configuration values.
Ensure that you enter the correct values for each configuration setting.
Once you have set these values, your connector will be properly configured and ready to use.", "learnMore": "learn more", "clientId": "Client ID of your technical user", "secret": "Secret", diff --git a/src/components/pages/AboutPage/index.tsx b/src/components/pages/AboutPage/index.tsx index 857adc2fa..6b31c196e 100644 --- a/src/components/pages/AboutPage/index.tsx +++ b/src/components/pages/AboutPage/index.tsx @@ -19,16 +19,13 @@ import { AboutCard, PageHeader } from '@catena-x/portal-shared-components' import legalJson from '../../../assets/notice/legal-notice.json' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { useTranslation } from 'react-i18next' export default function AboutPage() { const { t } = useTranslation() return (
- - - +
- - - +
{app?.[0]?.title} diff --git a/src/components/pages/AppOverview/ChangeDescription.tsx b/src/components/pages/AppOverview/ChangeDescription.tsx index 45b0ab084..b762c828f 100644 --- a/src/components/pages/AppOverview/ChangeDescription.tsx +++ b/src/components/pages/AppOverview/ChangeDescription.tsx @@ -17,7 +17,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { Typography, PageHeader, @@ -144,9 +143,7 @@ export default function ChangeDescription() { return (
- - - +
{app?.[0]?.title} diff --git a/src/components/pages/AppOverview/ChangeDocuments.tsx b/src/components/pages/AppOverview/ChangeDocuments.tsx index b761200ad..2b869e5d6 100644 --- a/src/components/pages/AppOverview/ChangeDocuments.tsx +++ b/src/components/pages/AppOverview/ChangeDocuments.tsx @@ -17,7 +17,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { Typography, PageHeader, @@ -231,9 +230,7 @@ export default function ChangeDocuments() { return (
- - - +
diff --git a/src/components/pages/AppOverview/ChangeImage.tsx b/src/components/pages/AppOverview/ChangeImage.tsx index f8dc2537e..456d75ae3 100644 --- a/src/components/pages/AppOverview/ChangeImage.tsx +++ b/src/components/pages/AppOverview/ChangeImage.tsx @@ -18,7 +18,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { Typography, PageHeader, @@ -137,9 +136,7 @@ export default function ChangeImage() { return (
- - - +
{app?.[0]?.title} diff --git a/src/components/pages/AppOverview/Deactivate.tsx b/src/components/pages/AppOverview/Deactivate.tsx index 2876f8cb3..8500a474e 100644 --- a/src/components/pages/AppOverview/Deactivate.tsx +++ b/src/components/pages/AppOverview/Deactivate.tsx @@ -18,7 +18,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { Typography, PageHeader, @@ -67,9 +66,7 @@ export default function Deactivate() { return (
- - - +
{app?.[0]?.title} diff --git a/src/components/pages/AppOverview/index.tsx b/src/components/pages/AppOverview/index.tsx index 9096908ae..da4fa5c67 100644 --- a/src/components/pages/AppOverview/index.tsx +++ b/src/components/pages/AppOverview/index.tsx @@ -20,7 +20,6 @@ import { useCallback, useMemo, useState, useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { PageHeader, Typography, @@ -210,9 +209,7 @@ export default function AppOverview() { title={t('content.appoverview.headerTitle')} topPage={true} headerHeight={200} - > - - + /> {recentlyChangedApps && recentlyChangedApps.length > 0 ? (
diff --git a/src/components/pages/AppOverviewNew/index.tsx b/src/components/pages/AppOverviewNew/index.tsx index 0f321b851..83a71cbb8 100644 --- a/src/components/pages/AppOverviewNew/index.tsx +++ b/src/components/pages/AppOverviewNew/index.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { useTranslation } from 'react-i18next' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { ErrorBar, PageHeader } from '@catena-x/portal-shared-components' import { type AppMarketplaceApp } from 'features/apps/types' import { useFetchProvidedAppsQuery } from 'features/apps/apiSlice' @@ -37,9 +36,7 @@ export default function AppOverviewNew() { title={t('content.appoverview.headerTitle')} topPage={true} headerHeight={200} - > - - + />
{data && data.content?.length > 0 ? ( - - + headerHeight={200} + /> - - + />
diff --git a/src/components/pages/CookiePolicy/index.tsx b/src/components/pages/CookiePolicy/index.tsx index fcb131c16..e621e776a 100644 --- a/src/components/pages/CookiePolicy/index.tsx +++ b/src/components/pages/CookiePolicy/index.tsx @@ -19,41 +19,43 @@ ********************************************************************************/ import { useTranslation } from 'react-i18next' -import { Typography } from '@catena-x/portal-shared-components' +import { PageHeader, Typography } from '@catena-x/portal-shared-components' export default function CookiePolicy() { const { t } = useTranslation('footer', { keyPrefix: 'cookies' }) return (
- {t('title')} -
- {t('what')} -
- {t('purposes.why')} -
    - {[0, 1, 2, 3, 4].map((n) => ( -
  • {t(`purposes.reason.${n}`)}
  • - ))} -
-
- {t('types.message')} -
    - {['strict', 'function', 'target'].map((type) => ( -
  • - {t(`types.${type}`)} - - - - - - - - -
    XXXXXXXXX
    -
  • - ))} -
-
+ +
+
+ {t('what')} +
+ {t('purposes.why')} +
    + {[0, 1, 2, 3, 4].map((n) => ( +
  • {t(`purposes.reason.${n}`)}
  • + ))} +
+
+ {t('types.message')} +
    + {['strict', 'function', 'target'].map((type) => ( +
  • + {t(`types.${type}`)} + + + + + + + + +
    XXXXXXXXX
    +
  • + ))} +
+
+
) } diff --git a/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx index 949668d71..5d089c898 100644 --- a/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx +++ b/src/components/pages/EdcConnector/ConfigurationDetailsOverlay.tsx @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useTranslation } from 'react-i18next' +import { Trans, useTranslation } from 'react-i18next' import { Button, Dialog, @@ -47,6 +47,11 @@ const ConfigurationDetailsOverlay = ({ const { t } = useTranslation() const { data, isFetching } = useFetchDecentralIdentityUrlsQuery() + const handleIconDisplay = (value: string | undefined) => { + if (value) return true + else return false + } + const tableData: TableType = { head: [ 'trusted_issuer:', @@ -71,13 +76,13 @@ const ConfigurationDetailsOverlay = ({ copy: [ [ { - icon: true, + icon: handleIconDisplay(data?.trusted_issuer), copyValue: data?.trusted_issuer ?? '', }, ], [ { - icon: true, + icon: handleIconDisplay(data?.decentralIdentityManagementAuthUrl), copyValue: data?.decentralIdentityManagementAuthUrl ?? '', }, ], @@ -93,25 +98,25 @@ const ConfigurationDetailsOverlay = ({ ], [ { - icon: true, + icon: handleIconDisplay(data?.decentralIdentityManagementServiceUrl), copyValue: data?.decentralIdentityManagementServiceUrl ?? '', }, ], [ { - icon: true, + icon: handleIconDisplay(data?.participant_id), copyValue: data?.participant_id ?? '', }, ], [ { - icon: true, + icon: handleIconDisplay(data?.iatp_id), copyValue: data?.iatp_id ?? '', }, ], [ { - icon: true, + icon: handleIconDisplay(data?.did_resolver), copyValue: data?.did_resolver ?? '', }, ], @@ -132,22 +137,15 @@ const ConfigurationDetailsOverlay = ({ - - {t('content.edcconnector.configurationDetails.description1')} - - - {t('content.edcconnector.configurationDetails.description2')} - - - {t('content.edcconnector.configurationDetails.description3')} - - - {t('content.edcconnector.configurationDetails.description4')} - + + + {t('content.edcconnector.configurationDetails.description')} + + } closeWithIcon={true} diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx index 034e28d6f..7a22919f7 100644 --- a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx +++ b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx @@ -118,7 +118,7 @@ const ConnectorDetailsOverlay = ({ value: fetchConnectorDetails?.technicalUser === null ? t('content.edcconnector.details.noTechnicalUserAvailable') - : fetchConnectorDetails?.technicalUser, + : fetchConnectorDetails?.technicalUser?.name, }, { key: t('content.edcconnector.details.SdRegistration'), diff --git a/src/components/pages/Imprint/index.tsx b/src/components/pages/Imprint/index.tsx index 980a8b019..bff0f175f 100644 --- a/src/components/pages/Imprint/index.tsx +++ b/src/components/pages/Imprint/index.tsx @@ -18,15 +18,14 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import StageHeader from 'components/shared/frame/StageHeader' -import { Typography } from '@catena-x/portal-shared-components' +import { PageHeader, Typography } from '@catena-x/portal-shared-components' import { useTranslation } from 'react-i18next' export default function Imprint() { const { t } = useTranslation('footer', { keyPrefix: 'imprint' }) return (
- +
{t('directors')} Oliver Ganser ({t('ceo')}) diff --git a/src/components/pages/InviteBusinessPartner/index.tsx b/src/components/pages/InviteBusinessPartner/index.tsx index 29165c598..97fb97e86 100644 --- a/src/components/pages/InviteBusinessPartner/index.tsx +++ b/src/components/pages/InviteBusinessPartner/index.tsx @@ -31,7 +31,6 @@ import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' import CloseIcon from '@mui/icons-material/Close' import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline' import type { InviteData } from 'features/admin/registration/types' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { InviteForm } from 'components/overlays/InviteForm' @@ -164,9 +163,7 @@ export default function InviteBusinessPartner() { title={t('content.invite.headerTitle')} topPage={true} headerHeight={200} - > - - + />
{t('content.invite.subHeaderTitle')} diff --git a/src/components/pages/PartnerNetwork/index.tsx b/src/components/pages/PartnerNetwork/index.tsx index a9c61a6ce..3bc0ff62b 100644 --- a/src/components/pages/PartnerNetwork/index.tsx +++ b/src/components/pages/PartnerNetwork/index.tsx @@ -88,7 +88,7 @@ const PartnerNetwork = () => { title={t('content.partnernetwork.headertitle')} topPage={false} headerHeight={200} - > + />
diff --git a/src/components/pages/SemanticHub/index.tsx b/src/components/pages/SemanticHub/index.tsx index 11abfe258..c7ac20138 100644 --- a/src/components/pages/SemanticHub/index.tsx +++ b/src/components/pages/SemanticHub/index.tsx @@ -18,15 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import StageHeader from 'components/shared/frame/StageHeader' import { Button, + PageHeader, PageSnackbar, Typography, } from '@catena-x/portal-shared-components' import { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Grid } from '@mui/material' +import { Box, Grid } from '@mui/material' import ModelDetailDialog from './ModelDetailDialog' import ModelTable from './ModelTable' import { useDispatch, useSelector } from 'react-redux' @@ -120,7 +120,13 @@ export default function SemanticHub() { return ( <> - + + +
@@ -144,7 +150,12 @@ export default function SemanticHub() { {'alt - - - +
{service?.[0]?.title} diff --git a/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx b/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx index 7ec45c44b..ce082a542 100644 --- a/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx +++ b/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx @@ -33,7 +33,6 @@ import { } from 'features/serviceManagement/apiSlice' import { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { Divider } from '@mui/material' import ArticleOutlinedIcon from '@mui/icons-material/ArticleOutlined' import { useParams } from 'react-router-dom' @@ -85,9 +84,7 @@ export default function ServiceDetails() { title={t('servicedetails.headerTitle')} topPage={true} headerHeight={200} - > - - + />
{fetchServiceStatus && ( <> diff --git a/src/components/pages/ServiceReleaseProcess/components/ServiceListOverview.tsx b/src/components/pages/ServiceReleaseProcess/components/ServiceListOverview.tsx index bc539b05a..96f392969 100644 --- a/src/components/pages/ServiceReleaseProcess/components/ServiceListOverview.tsx +++ b/src/components/pages/ServiceReleaseProcess/components/ServiceListOverview.tsx @@ -20,7 +20,6 @@ import { useState, useEffect, useCallback, useMemo } from 'react' import { useTranslation } from 'react-i18next' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { PageHeader, ViewSelector, @@ -202,9 +201,7 @@ export default function ServiceListOverview() { title={t('serviceoverview.headerTitle')} topPage={true} headerHeight={200} - > - - + />
diff --git a/src/components/pages/UsecaseParticipation/index.tsx b/src/components/pages/UsecaseParticipation/index.tsx index b8e89b3a4..eccd6e3d3 100644 --- a/src/components/pages/UsecaseParticipation/index.tsx +++ b/src/components/pages/UsecaseParticipation/index.tsx @@ -37,7 +37,6 @@ import LaunchIcon from '@mui/icons-material/Launch' import uniqueId from 'lodash/uniqueId' import { show } from 'features/control/overlay' import { OVERLAYS } from 'types/Constants' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { useFetchUsecaseQuery, type UsecaseResponse, @@ -146,9 +145,7 @@ export default function UsecaseParticipation() { title={t('content.usecaseParticipation.headerTitle')} topPage={true} headerHeight={200} - > - - + />
diff --git a/src/components/pages/UserDetail/index.tsx b/src/components/pages/UserDetail/index.tsx index 31314cbc1..e11ad8745 100644 --- a/src/components/pages/UserDetail/index.tsx +++ b/src/components/pages/UserDetail/index.tsx @@ -33,7 +33,6 @@ import { useTranslation } from 'react-i18next' import { useDispatch } from 'react-redux' import { useParams } from 'react-router-dom' import { UserDetailInfo } from 'components/shared/basic/UserDetailInfo' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import { useFetchUserDetailsQuery } from 'features/admin/userApiSlice' import { OVERLAYS } from 'types/Constants' import { show } from 'features/control/overlay' @@ -68,9 +67,7 @@ export default function UserDetail() { title={t('content.account.userAccount')} topPage={false} headerHeight={200} - > - - + />
{ return (
- - - +
diff --git a/src/components/shared/frame/StageHeader/index.tsx b/src/components/shared/frame/StageHeader/index.tsx deleted file mode 100644 index 5c1637a34..000000000 --- a/src/components/shared/frame/StageHeader/index.tsx +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 BMW Group AG - * Copyright (c) 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -import { getAssetBase } from 'services/EnvironmentService' -import SubHeaderTitle from '../SubHeaderTitle' - -export default function StageHeader({ title }: { title: string }) { - return ( -
-
- -
- Header Background -
- ) -} diff --git a/src/components/shared/templates/AdminBoard/index.tsx b/src/components/shared/templates/AdminBoard/index.tsx index 72f6c697e..cddb13d8f 100644 --- a/src/components/shared/templates/AdminBoard/index.tsx +++ b/src/components/shared/templates/AdminBoard/index.tsx @@ -31,7 +31,6 @@ import { CircleProgress, } from '@catena-x/portal-shared-components' import './AdminBoard.scss' -import { PageBreadcrumb } from 'components/shared/frame/PageBreadcrumb/PageBreadcrumb' import AdminBoardElements from './AdminBoardElements' import { currentSuccessType } from 'features/adminBoard/slice' import type { @@ -399,9 +398,7 @@ export default function CommonAdminBoard({ return (
- - - +
Date: Mon, 10 Jun 2024 15:32:07 +0530 Subject: [PATCH 2/9] fix(scroll to top): use scroll to top button component (#868) --- CHANGELOG.md | 1 + DEPENDENCIES | 2 +- package.json | 2 +- src/components/shared/frame/Footer/index.tsx | 16 +++++----------- yarn.lock | 8 ++++---- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ff507274..a1c3c1fdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Add more and collapse button to category view - Page headers - harmonization and standardization of page headers +- Use scroll to top button from shared components ## 2.0.0 diff --git a/DEPENDENCIES b/DEPENDENCIES index 7a6c02930..10be9703e 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.17, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247 +npm/npmjs/@catena-x/portal-shared-components/3.0.21, 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 96dd393e8..597e98ce7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ] }, "dependencies": { - "@catena-x/portal-shared-components": "^3.0.17", + "@catena-x/portal-shared-components": "^3.0.21", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.0", "@hookform/error-message": "^2.0.1", diff --git a/src/components/shared/frame/Footer/index.tsx b/src/components/shared/frame/Footer/index.tsx index b69c43163..0a5c1425a 100644 --- a/src/components/shared/frame/Footer/index.tsx +++ b/src/components/shared/frame/Footer/index.tsx @@ -19,8 +19,10 @@ ********************************************************************************/ import { useEffect, useState } from 'react' -import { Navigation, IconButton } from '@catena-x/portal-shared-components' -import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' +import { + Navigation, + ScrollToTopButton, +} from '@catena-x/portal-shared-components' import { useTranslation } from 'react-i18next' import { NavLink, useLocation } from 'react-router-dom' import './Footer.scss' @@ -83,15 +85,7 @@ export const Footer = ({ pages }: { pages: string[] }) => { return (
- {showScrollToTop && ( - - - - )} + {showScrollToTop && } Date: Fri, 14 Jun 2024 06:35:15 +0200 Subject: [PATCH 3/9] chore: improve pre commit hook and prettier checks (#874) --- .github/dependabot.yml | 40 +++++++++---------- .github/workflows/build.yml | 15 ++++--- .github/workflows/checks.yml | 5 ++- .github/workflows/codeql.yml | 8 ++-- .github/workflows/dependencies.yaml | 2 - .github/workflows/kics.yml | 9 ++--- .github/workflows/pullRequest-lint.yaml | 6 +-- .../workflows/release-release_candidate.yml | 19 ++++----- .github/workflows/release.yml | 19 ++++----- .github/workflows/release_candidate.yml | 12 +++--- .github/workflows/trivy-dev.yml | 30 +++++++------- .github/workflows/trivy.yml | 30 +++++++------- .husky/pre-commit | 6 +-- CHANGELOG.md | 1 + package.json | 16 ++++++-- src/utils/multiMapBy.test.ts | 1 + 16 files changed, 114 insertions(+), 105 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 487500a0f..d6c2cfba5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,49 +21,47 @@ version: 2 updates: # NPM - - - package-ecosystem: "npm" + - package-ecosystem: 'npm' target-branch: dev directory: / labels: - - "dependabot" - - "dependencies" + - 'dependabot' + - 'dependencies' schedule: - interval: "weekly" + interval: 'weekly' # restrict to patch updates (due to the big amount of dependencies) ignore: - - dependency-name: "*" - update-types: ["version-update:semver-major", "version-update:semver-minor"] + - dependency-name: '*' + update-types: + ['version-update:semver-major', 'version-update:semver-minor'] groups: production-dependencies: - dependency-type: "production" + dependency-type: 'production' development-dependencies: - dependency-type: "development" + dependency-type: 'development' # Github Actions - - - package-ecosystem: "github-actions" + - package-ecosystem: 'github-actions' target-branch: dev directory: / labels: - - "dependabot" - - "github-actions" + - 'dependabot' + - 'github-actions' schedule: - interval: "weekly" + interval: 'weekly' groups: dependencies: - dependency-type: "production" + dependency-type: 'production' # Docker - - - package-ecosystem: "docker" + - package-ecosystem: 'docker' target-branch: dev directory: ./.conf/ labels: - - "dependabot" - - "docker" + - 'dependabot' + - 'docker' schedule: - interval: "weekly" + interval: 'weekly' groups: dependencies: - dependency-type: "production" + dependency-type: 'production' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03f76f514..7efca6f10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,12 +28,12 @@ on: workflow_dispatch: env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' # variables needed for scripts/legal-notice.sh - SERVER_URL: "${{ github.server_url }}" - REPOSITORY: "${{ github.repository }}" - REF_NAME: "${{ github.ref_name }}" + SERVER_URL: '${{ github.server_url }}' + REPOSITORY: '${{ github.repository }}' + REF_NAME: '${{ github.ref_name }}' jobs: build-and-push-image: @@ -54,6 +54,9 @@ jobs: - name: Install Dependencies run: yarn + - name: Prettier Checks + run: yarn pretty:check + - name: Linter Checks run: yarn lint @@ -103,7 +106,7 @@ jobs: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - readme-filepath: ".conf/docker-notice-portal.md" + readme-filepath: '.conf/docker-notice-portal.md' auth-and-dispatch: needs: build-and-push-image diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c329c7715..37b54afec 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -42,7 +42,10 @@ jobs: - name: Install Dependencies run: yarn - - name: linter checks + - name: Prettier Checks + run: yarn pretty:check + + - name: Linter checks run: yarn lint - name: Unit Tests diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e963c198f..31046b433 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -29,7 +29,7 @@ # supported CodeQL languages. # -name: "CodeQL" +name: 'CodeQL' on: push: @@ -42,7 +42,7 @@ on: - 'src/**' - 'public/**' schedule: - - cron: "0 0 * * *" + - cron: '0 0 * * *' workflow_dispatch: jobs: @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - language: ["javascript"] + language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ] # Use only 'java' to analyze code written in Java, Kotlin or both # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both @@ -104,4 +104,4 @@ jobs: - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v2.227 with: - category: "/language:${{matrix.language}}" + category: '/language:${{matrix.language}}' diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 035af3a44..3155c3482 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -28,11 +28,9 @@ on: jobs: check-dependencies: - runs-on: ubuntu-latest steps: - - name: Set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 8294c03f2..cc005910e 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -name: "KICS" +name: 'KICS' on: push: @@ -29,7 +29,7 @@ on: # - "**/*.md" # - "**/*.txt" schedule: - - cron: "0 0 * * *" + - cron: '0 0 * * *' workflow_dispatch: jobs: @@ -48,7 +48,7 @@ jobs: uses: checkmarx/kics-github-action@d1b692d84c536f4e8696954ce7aab6818f95f5bc # v2.0.0 with: # Scanning directory . - path: "." + path: '.' # Fail on HIGH severity results fail_on: high # when provided with a directory on output_path @@ -57,7 +57,7 @@ jobs: # - results-dir/results.json # - results-dir/results.sarif output_path: kicsResults/ - output_formats: "json,sarif" + output_formats: 'json,sarif' # If you want KICS to ignore the results and return exit status code 0 unless a KICS engine error happens # ignore_on_exit: results # GITHUB_TOKEN enables this github action to access github API and post comments in a pull request @@ -70,4 +70,3 @@ jobs: uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 with: sarif_file: kicsResults/results.sarif - diff --git a/.github/workflows/pullRequest-lint.yaml b/.github/workflows/pullRequest-lint.yaml index f52da4e18..ad251299f 100644 --- a/.github/workflows/pullRequest-lint.yaml +++ b/.github/workflows/pullRequest-lint.yaml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 # ############################################################################# -name: "Lint PullRequest" +name: 'Lint PullRequest' on: pull_request_target: @@ -44,11 +44,11 @@ jobs: header: pr-title-lint-error message: | Hey there and thank you for opening this pull request! 👋🏼 - + We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted. Details: - + ``` ${{ steps.lint_pr_title.outputs.error_message }} ``` diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index 0550e7db4..2bb68643f 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -28,12 +28,12 @@ on: workflow_dispatch: env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" - REF_NAME: "${{ github.ref_name }}" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' + REF_NAME: '${{ github.ref_name }}' # variables needed for scripts/legal-notice.sh - SERVER_URL: "${{ github.server_url }}" - REPOSITORY: "${{ github.repository }}" + SERVER_URL: '${{ github.server_url }}' + REPOSITORY: '${{ github.repository }}' jobs: build-and-push-release: @@ -99,9 +99,10 @@ jobs: id: meta uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: - images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - # Automatically prepare image tags; - # semver patter will generate tags like these for example :v1 :v1.2 v1.2.3 + images: + ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} + # Automatically prepare image tags; + # semver patter will generate tags like these for example :v1 :v1.2 v1.2.3 tags: | type=raw,value=latest type=raw,value=${{ env.REF_NAME }} @@ -127,7 +128,7 @@ jobs: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - readme-filepath: ".conf/docker-notice-portal.md" + readme-filepath: '.conf/docker-notice-portal.md' auth-and-dispatch: needs: build-and-push-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf676b8ea..9662f95a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,12 +29,12 @@ on: workflow_dispatch: env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" - REF_NAME: "${{ github.ref_name }}" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' + REF_NAME: '${{ github.ref_name }}' # variables needed for scripts/legal-notice.sh - SERVER_URL: "${{ github.server_url }}" - REPOSITORY: "${{ github.repository }}" + SERVER_URL: '${{ github.server_url }}' + REPOSITORY: '${{ github.repository }}' jobs: build-and-push-release: @@ -100,9 +100,10 @@ jobs: id: meta uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: - images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - # Automatically prepare image tags; - # semver patter will generate tags like these for example :v1 :v1.2 v1.2.3 + images: + ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} + # Automatically prepare image tags; + # semver patter will generate tags like these for example :v1 :v1.2 v1.2.3 tags: | type=raw,value=latest type=raw,value=${{ env.REF_NAME }} @@ -128,7 +129,7 @@ jobs: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - readme-filepath: ".conf/docker-notice-portal.md" + readme-filepath: '.conf/docker-notice-portal.md' auth-and-dispatch: needs: build-and-push-release diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index 1f4aeff7c..e9b71775b 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -28,12 +28,12 @@ on: workflow_dispatch: env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' # variables needed for scripts/legal-notice.sh - SERVER_URL: "${{ github.server_url }}" - REPOSITORY: "${{ github.repository }}" - REF_NAME: "${{ github.ref_name }}" + SERVER_URL: '${{ github.server_url }}' + REPOSITORY: '${{ github.repository }}' + REF_NAME: '${{ github.ref_name }}' jobs: build-and-push-image: @@ -103,7 +103,7 @@ jobs: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} - readme-filepath: ".conf/docker-notice-portal.md" + readme-filepath: '.conf/docker-notice-portal.md' auth-and-dispatch: needs: build-and-push-image diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-dev.yml index 7332f6629..0d64b1aa9 100644 --- a/.github/workflows/trivy-dev.yml +++ b/.github/workflows/trivy-dev.yml @@ -20,11 +20,11 @@ # Depending on the location of your Docker container # you need to change the path to the specific Docker registry. # -name: "Trivy Dev" +name: 'Trivy Dev' on: push: - branches: [ dev ] + branches: [dev] # pull_request: # The branches below must be a subset of the branches above # branches: [ main ] @@ -33,13 +33,13 @@ on: # - "**/*.txt" schedule: # Once a day - - cron: "0 0 * * *" + - cron: '0 0 * * *' workflow_dispatch: # Trigger manually env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' jobs: analyze-config: @@ -56,17 +56,17 @@ jobs: - name: Run Trivy vulnerability scanner in repo mode uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 with: - scan-type: "config" + scan-type: 'config' hide-progress: false - format: "sarif" - output: "trivy-results1.sarif" - vuln-type: "os,library" + format: 'sarif' + output: 'trivy-results1.sarif' + vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 if: always() with: - sarif_file: "trivy-results1.sarif" + sarif_file: 'trivy-results1.sarif' analyze-portal-frontend: runs-on: ubuntu-latest @@ -89,13 +89,13 @@ jobs: uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 with: # Path to Docker image - image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:dev" - format: "sarif" - output: "trivy-results2.sarif" - vuln-type: "os,library" + image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:dev' + format: 'sarif' + output: 'trivy-results2.sarif' + vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab if: always() uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 with: - sarif_file: "trivy-results2.sarif" + sarif_file: 'trivy-results2.sarif' diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index f76179a27..305d85800 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -20,11 +20,11 @@ # Depending on the location of your Docker container # you need to change the path to the specific Docker registry. # -name: "Trivy Stable" +name: 'Trivy Stable' on: push: - branches: [ main ] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [ main ] @@ -33,13 +33,13 @@ on: # - "**/*.txt" schedule: # Once a day - - cron: "0 0 * * *" + - cron: '0 0 * * *' workflow_dispatch: # Trigger manually env: - IMAGE_NAMESPACE: "tractusx" - IMAGE_NAME: "portal-frontend" + IMAGE_NAMESPACE: 'tractusx' + IMAGE_NAME: 'portal-frontend' jobs: analyze-config: @@ -56,17 +56,17 @@ jobs: - name: Run Trivy vulnerability scanner in repo mode uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 with: - scan-type: "config" + scan-type: 'config' hide-progress: false - format: "sarif" - output: "trivy-results1.sarif" - vuln-type: "os,library" + format: 'sarif' + output: 'trivy-results1.sarif' + vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 if: always() with: - sarif_file: "trivy-results1.sarif" + sarif_file: 'trivy-results1.sarif' analyze-portal-frontend: runs-on: ubuntu-latest @@ -89,13 +89,13 @@ jobs: uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 with: # Path to Docker image - image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest" - format: "sarif" - output: "trivy-results2.sarif" - vuln-type: "os,library" + image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest' + format: 'sarif' + output: 'trivy-results2.sarif' + vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab if: always() uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 with: - sarif_file: "trivy-results2.sarif" + sarif_file: 'trivy-results2.sarif' diff --git a/.husky/pre-commit b/.husky/pre-commit index 80a0720a5..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,5 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npm run pretty -npm run lint --fix +npx lint-staged diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c3c1fdf..dccacc6d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Company Application Registraion Detail Overlay - UI improvements - Add correct registration application checklist items +- Fixed incorrect usage of pre-commit hook ### Feature diff --git a/package.json b/package.json index 597e98ce7..dfeb9b311 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,16 @@ "last 1 safari version" ] }, - "lint:staged": { - "**/*.{js,jsx,ts,tsx}": [ - "yarn test:ci" + "lint-staged": { + "*.{js,jsx,ts,tsx}": [ + "prettier --write --ignore-unknown", + "eslint --quiet --fix" + ], + "*.{json,css,sass,scss,xml,yml,yaml,md}": [ + "prettier --write --ignore-unknown" + ], + "*.test.{js,jsx,ts,tsx}": [ + "jest" ] }, "dependencies": { @@ -99,7 +106,8 @@ }, "scripts": { "prepare": "husky", - "pretty": "prettier --write \"**/*.{ts,tsx,js,jsx,json,css,sass,scss,xml,md}\"", + "pretty": "prettier --write \"**/*.{ts,tsx,js,jsx,json,css,sass,scss,xml,yml,yaml,md}\"", + "pretty:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,css,sass,scss,xml,yml,yaml,md}\"", "lint": "eslint \"./src/**/*.{ts,tsx,js,jsx}\" --report-unused-disable-directives --max-warnings 0", "start": "vite --host --port 3001", "build": "yarn build:copy-legal-info && tsc && vite build", diff --git a/src/utils/multiMapBy.test.ts b/src/utils/multiMapBy.test.ts index e8990f8e7..534c6a2da 100644 --- a/src/utils/multiMapBy.test.ts +++ b/src/utils/multiMapBy.test.ts @@ -125,6 +125,7 @@ describe('multiMapBy', () => { expect(ourTypeMap).toStrictEqual(lodashTypeMap) } + { const ourTypeMap = multiMapBy(mixedArray, (item) => typeof item) const lodashTypeMap = groupBy(mixedArray, (item) => typeof item) From 16e4aa667c1bd876a4f6de220201d48d9b54e013 Mon Sep 17 00:00:00 2001 From: lavanya-bmw <106523828+lavanya-bmw@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:44:22 +0530 Subject: [PATCH 4/9] feat(page headers): standardize page headers (#880) --- CHANGELOG.md | 2 +- DEPENDENCIES | 36 +++++------ src/assets/locales/de/main.json | 2 - src/assets/locales/en/main.json | 2 - src/components/pages/CompanyData/index.tsx | 15 ----- .../pages/CompanyRoleUpdate/index.tsx | 6 -- .../EdcConnector/ConnectorDetailsOverlay.tsx | 12 +++- .../pages/IDPDetail/IDPDetailContent.tsx | 63 ------------------- src/components/pages/IDPDetail/index.tsx | 36 ----------- src/components/pages/IDPDetail/style.scss | 38 ----------- .../pages/InviteBusinessPartner/index.tsx | 6 -- src/components/pages/Organization/index.tsx | 13 ---- .../pages/UsecaseParticipation/index.tsx | 6 -- src/types/Config.tsx | 16 ----- src/types/Constants.ts | 1 - 15 files changed, 28 insertions(+), 226 deletions(-) delete mode 100644 src/components/pages/IDPDetail/IDPDetailContent.tsx delete mode 100644 src/components/pages/IDPDetail/index.tsx delete mode 100644 src/components/pages/IDPDetail/style.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index dccacc6d5..d4f1c3282 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ - App marketplace - Add more and collapse button to category view - Page headers - - harmonization and standardization of page headers + - harmonization and standardization of page headers, added consistent headers and removed unused code - Use scroll to top button from shared components ## 2.0.0 diff --git a/DEPENDENCIES b/DEPENDENCIES index 10be9703e..b11d3dce8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -4,7 +4,7 @@ npm/npmjs/-/acorn-jsx/5.3.2, MIT, approved, clearlydefined npm/npmjs/-/acorn-walk/8.3.2, MIT, approved, #11942 npm/npmjs/-/acorn/8.11.3, MIT, approved, clearlydefined npm/npmjs/-/agent-base/6.0.2, MIT, approved, clearlydefined -npm/npmjs/-/ajv/6.12.6, MIT, approved, #979 +npm/npmjs/-/ajv/6.12.6, MIT, approved, #15286 npm/npmjs/-/ansi-escapes/4.3.2, MIT, approved, clearlydefined npm/npmjs/-/ansi-regex/5.0.1, MIT, approved, clearlydefined npm/npmjs/-/ansi-styles/3.2.1, MIT, approved, clearlydefined @@ -59,7 +59,7 @@ npm/npmjs/-/chalk/2.4.2, MIT, approved, clearlydefined npm/npmjs/-/chalk/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/chalk/4.1.2, MIT, approved, clearlydefined npm/npmjs/-/char-regex/1.0.2, MIT, approved, clearlydefined -npm/npmjs/-/chokidar/3.6.0, MIT, approved, #13197 +npm/npmjs/-/chokidar/3.6.0, MIT, approved, #15400 npm/npmjs/-/ci-info/3.9.0, MIT, approved, clearlydefined npm/npmjs/-/cjs-module-lexer/1.2.3, MIT, approved, #9069 npm/npmjs/-/classnames/2.5.1, MIT, approved, clearlydefined @@ -106,7 +106,7 @@ npm/npmjs/-/detect-newline/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/diff-sequences/29.6.3, MIT, approved, clearlydefined npm/npmjs/-/diff/4.0.2, BSD-3-Clause, approved, #2728 npm/npmjs/-/dir-glob/3.0.1, MIT, approved, clearlydefined -npm/npmjs/-/doctrine/2.1.0, Apache-2.0 AND BSD-2-Clause, approved, #1987 +npm/npmjs/-/doctrine/2.1.0, Apache-2.0 AND BSD-2-Clause, approved, #15247 npm/npmjs/-/doctrine/3.0.0, Apache-2.0 AND BSD-2-Clause, approved, CQ22628 npm/npmjs/-/dom-accessibility-api/0.5.16, MIT, approved, clearlydefined npm/npmjs/-/dom-accessibility-api/0.6.3, MIT, approved, clearlydefined @@ -140,7 +140,7 @@ npm/npmjs/-/eslint-config-love/43.1.0, MIT, approved, #13906 npm/npmjs/-/eslint-config-prettier/9.1.0, MIT, approved, #11979 npm/npmjs/-/eslint-config-standard/17.1.0, MIT, approved, clearlydefined npm/npmjs/-/eslint-import-resolver-node/0.3.9, MIT, approved, #9923 -npm/npmjs/-/eslint-module-utils/2.8.1, MIT, approved, #8209 +npm/npmjs/-/eslint-module-utils/2.8.1, MIT, approved, #15235 npm/npmjs/-/eslint-plugin-es-x/7.5.0, MIT, approved, #11867 npm/npmjs/-/eslint-plugin-import/2.29.1, MIT, approved, #11187 npm/npmjs/-/eslint-plugin-n/16.6.2, MIT, approved, #12657 @@ -148,9 +148,9 @@ npm/npmjs/-/eslint-plugin-promise/6.1.1, ISC, approved, clearlydefined npm/npmjs/-/eslint-plugin-react-hooks/4.6.0, MIT, approved, clearlydefined npm/npmjs/-/eslint-plugin-react/7.34.1, MIT, approved, #13825 npm/npmjs/-/eslint-scope/7.2.2, BSD-2-Clause, approved, #9916 -npm/npmjs/-/eslint-visitor-keys/3.4.3, Apache-2.0, approved, #7729 -npm/npmjs/-/eslint/8.57.0, MIT AND ISC AND OFL-1.1 AND CC-BY-SA-2.0, approved, #13450 -npm/npmjs/-/espree/9.6.1, BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause, approved, #9308 +npm/npmjs/-/eslint-visitor-keys/3.4.3, Apache-2.0, approved, #15274 +npm/npmjs/-/eslint/8.57.0, MIT AND ISC AND OFL-1.1 AND CC-BY-SA-2.0, approved, #15317 +npm/npmjs/-/espree/9.6.1, BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause AND BSD-3-Clause AND MIT AND (BSD-2-Clause AND MIT) AND (BSD-3-Clause AND LGPL-2.0-or-later AND MIT) AND LGPL-2.1-or-later, approved, #15293 npm/npmjs/-/esprima/4.0.1, BSD-2-Clause, approved, #995 npm/npmjs/-/esquery/1.5.0, BSD-3-Clause, approved, #7469 npm/npmjs/-/esrecurse/4.3.0, BSD-2-Clause, approved, clearlydefined @@ -163,7 +163,7 @@ npm/npmjs/-/expect/29.7.0, MIT, approved, clearlydefined npm/npmjs/-/fast-deep-equal/3.1.3, MIT, approved, clearlydefined npm/npmjs/-/fast-glob/3.3.2, MIT, approved, #9307 npm/npmjs/-/fast-json-stable-stringify/2.1.0, MIT, approved, clearlydefined -npm/npmjs/-/fast-levenshtein/2.0.6, MIT, approved, #2428 +npm/npmjs/-/fast-levenshtein/2.0.6, MIT, approved, #15236 npm/npmjs/-/fastq/1.17.1, ISC, approved, clearlydefined npm/npmjs/-/fb-watchman/2.0.2, MIT AND Apache-2.0, approved, #5379 npm/npmjs/-/file-entry-cache/6.0.1, MIT, approved, clearlydefined @@ -178,7 +178,7 @@ npm/npmjs/-/follow-redirects/1.15.6, MIT, approved, #10782 npm/npmjs/-/for-each/0.3.3, MIT, approved, clearlydefined npm/npmjs/-/form-data/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/fs.realpath/1.0.0, ISC, approved, clearlydefined -npm/npmjs/-/fsevents/2.3.3, MIT, approved, #2967 +npm/npmjs/-/fsevents/2.3.3, MIT, approved, #15309 npm/npmjs/-/function-bind/1.1.2, MIT, approved, #11063 npm/npmjs/-/function.prototype.name/1.1.6, MIT, approved, #10255 npm/npmjs/-/functions-have-names/1.2.3, MIT, approved, clearlydefined @@ -314,8 +314,8 @@ npm/npmjs/-/json-parse-even-better-errors/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/json-schema-traverse/0.4.1, MIT, approved, clearlydefined npm/npmjs/-/json-stable-stringify-without-jsonify/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/json2mq/0.2.0, MIT, approved, clearlydefined -npm/npmjs/-/json5/1.0.2, MIT, approved, CQ22351 -npm/npmjs/-/json5/2.2.3, MIT, approved, #2126 +npm/npmjs/-/json5/1.0.2, MIT, approved, #15256 +npm/npmjs/-/json5/2.2.3, MIT, approved, #15226 npm/npmjs/-/jsx-ast-utils/3.3.5, MIT, approved, #9209 npm/npmjs/-/jwt-decode/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/keycloak-js/23.0.7, Apache-2.0 AND MIT AND EPL-1.0 AND LicenseRef-scancode-oasis-ws-security-spec AND W3C AND LicenseRef-scancode-ws-policy-specification AND W3C AND W3C-19980720 AND (AFL-2.1 OR LGPL-2.0-only) AND (Apache-2.0 AND MIT) AND (Apache-2.0 AND MIT), approved, #11737 @@ -366,7 +366,7 @@ npm/npmjs/-/object-assign/4.1.1, MIT, approved, clearlydefined npm/npmjs/-/object-inspect/1.13.1, MIT, approved, #11078 npm/npmjs/-/object-is/1.1.6, MIT, approved, clearlydefined npm/npmjs/-/object-keys/1.1.1, MIT, approved, clearlydefined -npm/npmjs/-/object.assign/4.1.5, MIT, approved, #3232 +npm/npmjs/-/object.assign/4.1.5, MIT, approved, #15306 npm/npmjs/-/object.entries/1.1.8, MIT, approved, #4671 npm/npmjs/-/object.fromentries/2.0.8, MIT, approved, #4600 npm/npmjs/-/object.groupby/1.0.3, MIT, approved, #10360 @@ -425,7 +425,7 @@ npm/npmjs/-/react-router/6.22.3, MIT, approved, clearlydefined npm/npmjs/-/react-slick/0.30.2, MIT, approved, #14009 npm/npmjs/-/react-transition-group/4.4.5, BSD-3-Clause, approved, CQ22955 npm/npmjs/-/react/18.2.0, MIT, approved, clearlydefined -npm/npmjs/-/readdirp/3.6.0, MIT, approved, #2977 +npm/npmjs/-/readdirp/3.6.0, MIT, approved, #15328 npm/npmjs/-/redent/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/redux-thunk/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/redux/4.2.1, CC0-1.0 AND MIT, approved, #7046 @@ -444,7 +444,7 @@ npm/npmjs/-/resolve-from/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve-from/5.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve-pkg-maps/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve.exports/2.0.2, MIT, approved, clearlydefined -npm/npmjs/-/resolve/1.22.8, MIT AND ISC, approved, #2409 +npm/npmjs/-/resolve/1.22.8, MIT AND ISC, approved, #15315 npm/npmjs/-/resolve/2.0.0-next.5, MIT AND ISC, approved, #3078 npm/npmjs/-/reusify/1.0.4, MIT, approved, clearlydefined npm/npmjs/-/rimraf/3.0.2, ISC, approved, clearlydefined @@ -468,7 +468,7 @@ npm/npmjs/-/sisteransi/1.0.5, MIT, approved, clearlydefined npm/npmjs/-/slash/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/slick-carousel/1.8.1, MIT, approved, #2986 npm/npmjs/-/snake-case/3.0.4, MIT, approved, clearlydefined -npm/npmjs/-/source-map-js/1.2.0, BSD-3-Clause, approved, #13911 +npm/npmjs/-/source-map-js/1.2.0, BSD-3-Clause, approved, #15272 npm/npmjs/-/source-map-support/0.5.13, MIT, approved, clearlydefined npm/npmjs/-/source-map/0.5.7, BSD-3-Clause, approved, #2400 npm/npmjs/-/source-map/0.6.1, BSD-3-Clause, approved, #2417 @@ -528,7 +528,7 @@ npm/npmjs/-/v8-compile-cache-lib/3.0.1, MIT, approved, clearlydefined npm/npmjs/-/v8-to-istanbul/9.2.0, ISC, approved, clearlydefined npm/npmjs/-/vite-plugin-svgr/4.2.0, MIT, approved, clearlydefined npm/npmjs/-/vite-tsconfig-paths/4.3.2, MIT, approved, clearlydefined -npm/npmjs/-/vite/5.2.11, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #13953 +npm/npmjs/-/vite/5.2.11, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #15411 npm/npmjs/-/void-elements/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/w3c-xmlserializer/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/walker/1.0.8, Apache-2.0, approved, clearlydefined @@ -617,7 +617,7 @@ npm/npmjs/@emotion/use-insertion-effect-with-fallbacks/1.0.1, MIT, approved, #84 npm/npmjs/@emotion/utils/1.2.1, MIT, approved, #8415 npm/npmjs/@emotion/weak-memoize/0.3.1, MIT, approved, #8402 npm/npmjs/@esbuild/aix-ppc64/0.20.2, MIT, approved, clearlydefined -npm/npmjs/@esbuild/android-arm/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #13952 +npm/npmjs/@esbuild/android-arm/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #15302 npm/npmjs/@esbuild/android-arm64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/android-x64/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #13954 npm/npmjs/@esbuild/darwin-arm64/0.20.2, MIT, approved, clearlydefined @@ -639,7 +639,7 @@ npm/npmjs/@esbuild/sunos-x64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-arm64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-ia32/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-x64/0.20.2, MIT, approved, clearlydefined -npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #8032 +npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #15285 npm/npmjs/@eslint-community/regexpp/4.10.0, MIT, approved, clearlydefined npm/npmjs/@eslint/eslintrc/2.1.4, MIT, approved, #9908 npm/npmjs/@eslint/js/8.57.0, MIT, approved, clearlydefined diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index c07fc68d4..cc044e382 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1770,7 +1770,6 @@ "tab2": "Role Comparison" }, "companyRolesUpdate": { - "headerTitle": "Roles", "heading": "Change Company Role", "description": "Below you can manage the roles your company takes in Catena-X.", "step1": "You can change your current role by deselecting it and selecting another role.", @@ -1809,7 +1808,6 @@ } }, "usecaseParticipation": { - "headerTitle": "Use Case Participation Overview", "heading": "Use Case Participation", "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the usecase participatiance is relevant for data provider and data consumer.", "step1": "You can view your current signed use case participation", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 9945f7ed0..274124d3d 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1737,7 +1737,6 @@ "tab2": "Role Comparison" }, "companyRolesUpdate": { - "headerTitle": "Roles", "heading": "Change Company Role", "description": "Below you can manage the roles your company takes in Catena-X.", "step1": "You can change your current role by selecting and deselecting the resepctive available roles.", @@ -1776,7 +1775,6 @@ } }, "usecaseParticipation": { - "headerTitle": "Use Case Participation Overview", "heading": "Use Case Participation", "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the usecase participatiance is relevant for data provider and data consumer.", "step1": "You can view your current signed use case participation", diff --git a/src/components/pages/CompanyData/index.tsx b/src/components/pages/CompanyData/index.tsx index 094bbddcb..8088f3180 100644 --- a/src/components/pages/CompanyData/index.tsx +++ b/src/components/pages/CompanyData/index.tsx @@ -17,18 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useTranslation } from 'react-i18next' -import { useNavigate } from 'react-router-dom' -import { Box } from '@mui/material' -import { BackButton } from '@catena-x/portal-shared-components' import { CompanyAddressList } from './components/CompanyAddressList' import { useState } from 'react' import MyCompanyInfoComponent from '../Organization/MyCompanyInfoComponent' import EditForm from './components/EditForm' export default function CompanyData() { - const navigate = useNavigate() - const { t } = useTranslation() const [showOverlay, setShowOverlay] = useState({ address: false, site: false, @@ -45,15 +39,6 @@ export default function CompanyData() { return (
- - { - navigate('/') - }} - /> -
diff --git a/src/components/pages/CompanyRoleUpdate/index.tsx b/src/components/pages/CompanyRoleUpdate/index.tsx index 3fece7f6a..73c0c04bc 100644 --- a/src/components/pages/CompanyRoleUpdate/index.tsx +++ b/src/components/pages/CompanyRoleUpdate/index.tsx @@ -29,7 +29,6 @@ import { OVERLAYS } from 'types/Constants' import { Button, Checkbox, - PageHeader, PageSnackbar, Typography, } from '@catena-x/portal-shared-components' @@ -106,11 +105,6 @@ export default function CompanyRoles() { return (
-
diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx index 7a22919f7..525262a2a 100644 --- a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx +++ b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx @@ -116,9 +116,15 @@ const ConnectorDetailsOverlay = ({ { key: t('content.edcconnector.details.technicalUser'), value: - fetchConnectorDetails?.technicalUser === null - ? t('content.edcconnector.details.noTechnicalUserAvailable') - : fetchConnectorDetails?.technicalUser?.name, + fetchConnectorDetails?.technicalUser === null ? ( + t('content.edcconnector.details.noTechnicalUserAvailable') + ) : ( + + {fetchConnectorDetails?.technicalUser?.name} + + ), }, { key: t('content.edcconnector.details.SdRegistration'), diff --git a/src/components/pages/IDPDetail/IDPDetailContent.tsx b/src/components/pages/IDPDetail/IDPDetailContent.tsx deleted file mode 100644 index f0283eace..000000000 --- a/src/components/pages/IDPDetail/IDPDetailContent.tsx +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 BMW Group AG - * Copyright (c) 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -import { UpdateIDPContent } from 'components/overlays/UpdateIDP/UpdateIDPContent' -import { - Button, - DialogActions, - IconButton, - Typography, -} from '@catena-x/portal-shared-components' -import type { IdentityProvider } from 'features/admin/idpApiSlice' -import CloseIcon from '@mui/icons-material/Close' -import Box from '@mui/material/Box' -import { t } from 'i18next' -import './style.scss' - -export const IDPDetailContent = ({ - idp, - onClose, -}: { - idp: IdentityProvider - onClose?: () => void -}) => { - return ( -
- {onClose && ( - - - - - - )} -
- {t('content.idpdetail.title')} -
-
- -
- - - -
- ) -} diff --git a/src/components/pages/IDPDetail/index.tsx b/src/components/pages/IDPDetail/index.tsx deleted file mode 100644 index 239324e79..000000000 --- a/src/components/pages/IDPDetail/index.tsx +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 BMW Group AG - * Copyright (c) 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ -import { useParams } from 'react-router-dom' -import { PAGES } from 'types/Constants' -import PageHeaderWithCrumbs from 'components/shared/frame/PageHeaderWithCrumbs' -import { IDPDetailContent } from './IDPDetailContent' -import { Empty } from 'components/shared/basic/Empty' -import { useFetchIDPDetailQuery } from 'features/admin/idpApiSlice' - -export default function IDPDetail() { - const { idpId } = useParams() - const { data } = useFetchIDPDetailQuery(idpId ?? '') - return ( -
- -
{data ? : }
-
- ) -} diff --git a/src/components/pages/IDPDetail/style.scss b/src/components/pages/IDPDetail/style.scss deleted file mode 100644 index 741ab4e65..000000000 --- a/src/components/pages/IDPDetail/style.scss +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 BMW Group AG - * Copyright (c) 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -.idp-detail-content { - padding: 8px 16px 16px; - border: 1px solid #ccc; - margin-top: 10px; - margin-bottom: 20px; - border-radius: 10px; - - .idp-detail-content-header { - width: 100%; - text-align: center; - padding: 40px; - } - - .idp-detail-content-main { - width: 100%; - padding: 40px 120px; - } -} diff --git a/src/components/pages/InviteBusinessPartner/index.tsx b/src/components/pages/InviteBusinessPartner/index.tsx index 97fb97e86..bc84bf225 100644 --- a/src/components/pages/InviteBusinessPartner/index.tsx +++ b/src/components/pages/InviteBusinessPartner/index.tsx @@ -24,7 +24,6 @@ import { Dialog, DialogContent, IconButton, - PageHeader, Typography, } from '@catena-x/portal-shared-components' import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' @@ -159,11 +158,6 @@ export default function InviteBusinessPartner() { -
{t('content.invite.subHeaderTitle')} diff --git a/src/components/pages/Organization/index.tsx b/src/components/pages/Organization/index.tsx index f85d50211..469e388c3 100644 --- a/src/components/pages/Organization/index.tsx +++ b/src/components/pages/Organization/index.tsx @@ -19,13 +19,10 @@ ********************************************************************************/ import { useTranslation } from 'react-i18next' -import { useNavigate } from 'react-router-dom' -import { Box } from '@mui/material' import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined' import { Button, Typography, - BackButton, ContentCard, } from '@catena-x/portal-shared-components' import { useFetchCertificatesQuery } from 'features/companyCertification/companyCertificateApiSlice' @@ -34,7 +31,6 @@ import { FilterType, SortType } from '../CompanyCertificates' import MyCompanyInfoComponent from './MyCompanyInfoComponent' export default function Organization() { - const navigate = useNavigate() const { t } = useTranslation() const certificates = useFetchCertificatesQuery({ @@ -45,15 +41,6 @@ export default function Organization() { return (
- - { - navigate('/') - }} - /> -
diff --git a/src/components/pages/UsecaseParticipation/index.tsx b/src/components/pages/UsecaseParticipation/index.tsx index eccd6e3d3..398bb07a1 100644 --- a/src/components/pages/UsecaseParticipation/index.tsx +++ b/src/components/pages/UsecaseParticipation/index.tsx @@ -27,7 +27,6 @@ import { Chip, CircleProgress, CustomAccordion, - PageHeader, StatusTag, Tooltips, Typography, @@ -141,11 +140,6 @@ export default function UsecaseParticipation() { return (
-
diff --git a/src/types/Config.tsx b/src/types/Config.tsx index fdd466398..83ddfec0c 100644 --- a/src/types/Config.tsx +++ b/src/types/Config.tsx @@ -55,7 +55,6 @@ import { ACTIONS, HINTS, OVERLAYS, PAGES, ROLES } from './Constants' import type { IAction, IOverlay, IPage } from './MainTypes' import AppUserManagement from 'components/pages/AppUserManagement' import IDPManagement from 'components/pages/IDPManagement' -import IDPDetail from 'components/pages/IDPDetail' import AppReleaseProcessForm from 'components/pages/AppReleaseProcess/components' import CompanyRoles from 'components/pages/CompanyRoles' import UseCase from 'components/pages/UseCase' @@ -370,21 +369,6 @@ export const ALL_PAGES: IPage[] = [ role: ROLES.IDP_VIEW, element: , }, - { - name: PAGES.IDP_DETAIL, - role: ROLES.IDP_VIEW, - isRoute: true, - element: ( - } - > - } /> - - ), - }, - { name: PAGES.INVITE, role: ROLES.INVITE_NEW_PARTNER, diff --git a/src/types/Constants.ts b/src/types/Constants.ts index 1e8dc7fc2..daeb9924d 100644 --- a/src/types/Constants.ts +++ b/src/types/Constants.ts @@ -50,7 +50,6 @@ export enum PAGES { TECHUSER_MANAGEMENT = 'technicaluser', TECHUSER_DETAILS = 'techuserdetails', IDP_MANAGEMENT = 'idpmanagement', - IDP_DETAIL = 'idpdetail', APPLICATION_REQUESTS = 'applicationrequests', APP_USER_MANAGEMENT = 'appusermanagement', INVITE = 'invite', From f034debdc57879b79d728d9059842c8eb5fb73c0 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 21 Jun 2024 15:43:06 +0200 Subject: [PATCH 5/9] chore(TRG-7): change in licensing and legal docs (#881) https://github.com/eclipse-tractusx/portal-frontend/issues/861 --- CONTRIBUTING.md | 26 ++++++++++++++++++++-- LICENSES/CC-BY-4.0.txt => LICENSE_non-code | 4 ++-- NOTICE.md | 13 ++++++++--- 3 files changed, 36 insertions(+), 7 deletions(-) rename LICENSES/CC-BY-4.0.txt => LICENSE_non-code (99%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc5c97409..879c398af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,19 @@ Catena-X alliance focusing on parts traceability. - https://projects.eclipse.org/projects/automotive.tractusx +## Project licenses + +The Tractus-X project uses the following licenses: + +- Apache-2.0 for code +- CC-BY-4.0 for non-code + +## Terms of Use + +This repository is subject to the Terms of Use of the Eclipse Foundation + +- https://www.eclipse.org/legal/termsofuse.php + ## Developer resources Information regarding source code management, builds, coding standards, and @@ -23,9 +36,18 @@ more. - https://projects.eclipse.org/projects/automotive.tractusx/developer -The project maintains the source code repositories in the following GitHub organization: +Getting started: + +- https://eclipse-tractusx.github.io/docs/developer + +The project maintains the source code repositories -- https://github.com/eclipse-tractusx/ +- https://github.com/eclipse-tractusx/portal-frontend +- https://github.com/eclipse-tractusx/portal-frontend-registration +- https://github.com/eclipse-tractusx/portal-shared-components +- https://github.com/eclipse-tractusx/portal-backend +- https://github.com/eclipse-tractusx/portal-assets +- https://github.com/eclipse-tractusx/portal-iam ## Eclipse Development Process diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSE_non-code similarity index 99% rename from LICENSES/CC-BY-4.0.txt rename to LICENSE_non-code index 4ea99c213..52665ed2a 100644 --- a/LICENSES/CC-BY-4.0.txt +++ b/LICENSE_non-code @@ -1,4 +1,4 @@ -Attribution 4.0 International +Creative Commons Attribution 4.0 International ======================================================================= @@ -392,4 +392,4 @@ understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. -Creative Commons may be contacted at creativecommons.org. +Creative Commons may be contacted at creativecommons.org. \ No newline at end of file diff --git a/NOTICE.md b/NOTICE.md index 79ab19850..0b2989a9a 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -12,12 +12,19 @@ source code repository logs. ## Declared Project Licenses -This program and the accompanying materials are made available under the terms -of the Apache License, Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0. +The Tractus-X project uses the following licenses: +- Apache-2.0 for code +- CC-BY-4.0 for non-code + +Apache-2.0: +This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0. SPDX-License-Identifier: Apache-2.0 +CC-BY-4.0: +The materials in this repository are made available under the terms of the Creative Commons Attribution 4.0 International License, which is available at https://spdx.org/licenses/CC-BY-4.0.html. +SPDX-License-Identifier: CC-BY-4.0 + ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: From edab8047a3d27b425c21fca6fdf43436e27952a6 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 21 Jun 2024 15:45:53 +0200 Subject: [PATCH 6/9] chore(dev-flow): maintain latest changes in main branch (#882) get rid of the dev branch https://github.com/eclipse-tractusx/portal/issues/243 --- .github/dependabot.yml | 3 --- .github/workflows/build.yml | 6 +++--- .github/workflows/dependencies.yaml | 2 +- .github/workflows/kics.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/{trivy-dev.yml => trivy-main.yml} | 6 +++--- 6 files changed, 9 insertions(+), 12 deletions(-) rename .github/workflows/{trivy-dev.yml => trivy-main.yml} (98%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d6c2cfba5..506b1e29e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,7 +22,6 @@ version: 2 updates: # NPM - package-ecosystem: 'npm' - target-branch: dev directory: / labels: - 'dependabot' @@ -42,7 +41,6 @@ updates: # Github Actions - package-ecosystem: 'github-actions' - target-branch: dev directory: / labels: - 'dependabot' @@ -55,7 +53,6 @@ updates: # Docker - package-ecosystem: 'docker' - target-branch: dev directory: ./.conf/ labels: - 'dependabot' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7efca6f10..c9d54e513 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ name: build on: push: branches: - - 'dev' + - 'main' workflow_dispatch: env: @@ -85,7 +85,7 @@ jobs: with: images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=dev + type=raw,value=main type=raw,value=${{ github.sha }} - name: Build and push Docker image @@ -130,5 +130,5 @@ jobs: --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ - --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \ + --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \ --fail diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 3155c3482..62f0faba1 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -21,7 +21,7 @@ name: Check Dependencies on: push: - branches: [main, dev] + branches: [main] pull_request: types: [opened, synchronize, reopened] workflow_dispatch: diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index cc005910e..5d959db8a 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -21,7 +21,7 @@ name: 'KICS' on: push: - branches: [main, dev] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [main, master] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9662f95a2..669ce9015 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -173,7 +173,7 @@ jobs: if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then echo "branch=release-candidate" >> $GITHUB_OUTPUT else - echo "branch=dev" >> $GITHUB_OUTPUT + echo "branch=main" >> $GITHUB_OUTPUT fi if: steps.hf-check.outputs.hf == 'false' diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-main.yml similarity index 98% rename from .github/workflows/trivy-dev.yml rename to .github/workflows/trivy-main.yml index 0d64b1aa9..c6a3955cc 100644 --- a/.github/workflows/trivy-dev.yml +++ b/.github/workflows/trivy-main.yml @@ -20,11 +20,11 @@ # Depending on the location of your Docker container # you need to change the path to the specific Docker registry. # -name: 'Trivy Dev' +name: 'Trivy Main' on: push: - branches: [dev] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [ main ] @@ -89,7 +89,7 @@ jobs: uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 with: # Path to Docker image - image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:dev' + image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:main' format: 'sarif' output: 'trivy-results2.sarif' vuln-type: 'os,library' From 6e674b4791b37dfd5d471052a25e8ef61679563a Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:39:18 +0530 Subject: [PATCH 7/9] fix(constants): use consistent camel case for all the pages (#895) --- CHANGELOG.md | 1 + src/assets/locales/de/main.json | 100 +++++----- src/assets/locales/de/notification.json | 14 +- src/assets/locales/de/servicerelease.json | 2 +- src/assets/locales/en/main.json | 100 +++++----- src/assets/locales/en/notification.json | 14 +- src/assets/locales/en/servicerelease.json | 2 +- .../overlays/AddUser/AddUserDeny.tsx | 2 +- .../AppOverViewConfirm/AppDetailsOverlay.tsx | 4 +- .../overlays/AppOverViewConfirm/index.tsx | 6 +- .../overlays/DeleteTechnicalUser/index.tsx | 4 +- src/components/overlays/EditUsecase/index.tsx | 2 +- .../AppDetail/AppDetailContentDetails.tsx | 2 +- .../AppDetailHeader/AppDetailHeader.scss | 2 +- .../components/AppDetailHeader/index.tsx | 6 +- src/components/pages/AppOverview/AddRoles.tsx | 2 +- .../pages/AppOverview/AddRolesOverlay.tsx | 2 +- .../pages/AppOverview/AppOverViewDetails.tsx | 6 +- .../pages/AppOverview/AppOverview.scss | 2 +- .../pages/AppOverview/AppOverviewList.tsx | 24 +-- .../pages/AppOverview/ChangeDescription.tsx | 4 +- .../pages/AppOverview/ChangeDocuments.tsx | 2 +- .../pages/AppOverview/ChangeImage.tsx | 4 +- .../pages/AppOverview/Deactivate.tsx | 6 +- src/components/pages/AppOverview/index.tsx | 20 +- src/components/pages/AppOverviewNew/index.tsx | 2 +- .../AppReleaseProcess/components/index.tsx | 2 +- .../pages/AppReleaseProcess/index.tsx | 2 +- .../AppSubscriptionDetailOverlay/index.tsx | 2 +- src/components/pages/CompanyRoles/index.tsx | 16 +- .../ComapnyWalletSubNavigationHeader.tsx | 4 +- src/components/pages/DataManagement/index.tsx | 2 +- .../EdcConnector/ConnectorDetailsOverlay.tsx | 2 +- .../Home/components/AppStoreSection/index.tsx | 4 +- src/components/pages/IDPManagement/index.tsx | 2 +- .../NotificationCenter/NotificationItem.tsx | 13 +- .../pages/OSPConsent/CompanyDetails.tsx | 2 +- src/components/pages/OSPConsent/style.scss | 2 +- .../pages/ServiceAdminBoard/index.tsx | 2 +- .../pages/ServiceAdminBoardDetail/index.tsx | 4 +- .../RecommendedServices.tsx | 2 +- .../ServiceMarketplace/ServicesElements.tsx | 2 +- .../components/ServiceDeactivate.tsx | 14 +- .../components/ServiceDetail.scss | 2 +- .../components/ServiceDetails.tsx | 2 +- .../components/ServiceListOverview.tsx | 30 +-- .../components/index.tsx | 2 +- .../pages/ServiceReleaseProcess/index.tsx | 4 +- .../TechnicalUserDetailsContent.tsx | 2 +- .../pages/TechnicalUserDetails/index.tsx | 4 +- .../TechnicalUserTable.tsx | 2 +- .../pages/TechnicalUserManagement/index.tsx | 4 +- .../UsecaseParticipation.scss | 12 +- .../pages/UsecaseParticipation/index.tsx | 14 +- .../pages/UserManagement/AppArea/index.tsx | 2 +- .../StageSubNavigation/StageSubNavigation.tsx | 2 +- .../ReleaseProcess/AppMarketCard/index.tsx | 2 +- .../basic/ReleaseProcess/ReleaseProcess.scss | 2 +- .../shared/basic/ReleaseProcess/index.tsx | 2 +- src/components/shared/frame/Footer/index.tsx | 8 +- .../AdminBoard/AdminBoardElements.tsx | 4 +- src/services/AccessService.tsx | 4 +- src/types/Config.tsx | 76 +++---- src/types/Constants.ts | 186 +++++++++--------- yarn.lock | 2 +- 65 files changed, 392 insertions(+), 388 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f1c3282..269ae7e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - UI improvements - Add correct registration application checklist items - Fixed incorrect usage of pre-commit hook +- Fix consistency issue in constants file. Use camel case for all page paths. Update corresponding usage in other files ### Feature diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index cc044e382..32a25e446 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -6,21 +6,21 @@ "swagger": "Swagger OpenAPI Definition", "storybook": "Storybook Shared Component Library", "marketplace": "Marketplace", - "appmarketplace": "App Marketplace", - "servicemarketplace": "Service Marketplace", + "appMarketplace": "App Marketplace", + "serviceMarketplace": "Service Marketplace", "appdetails": "App Details", - "datamanagement": "Datenmanagement", + "dataManagement": "Datenmanagement", "semantichub": "Semantische Modelle", "connector": "Konnektor", - "partnernetwork": "Partner Network", + "partnerNetwork": "Partner Network", "account": "Mein CX Account", "organization": "Meine Company", "notifications": "Benachrichtigungen", - "usermanagement": "Benutzerverwaltung", - "idpmanagement": "Identitätsprovider (IDP)", - "technicalsetup": "Technische Integration", - "connectormanagement": "Connector-Management", - "applicationrequests": "Beitrittsanträge", + "userManagement": "Benutzerverwaltung", + "idpManagement": "Identitätsprovider (IDP)", + "technicalSetup": "Technische Integration", + "connectorManagement": "Connector-Management", + "applicationRequests": "Beitrittsanträge", "admin": "Verwaltung", "developer": "Entwicklung", "invite": "Einladung CX Teilnehmer", @@ -30,51 +30,51 @@ "imprint": "Impressum", "privacy": "Privatsphäre", "terms": "Nutzungsbedingungen", - "cookiepolicy": "Cookies", + "cookiePolicy": "Cookies", "3rdpartylicenses": "Drittanbieterlizenzen", "logout": "Abmelden", - "notfound": "Seite nicht gefunden", - "appmanagement": "App Management", - "appoverview": "App-Übersicht", + "notFound": "Seite nicht gefunden", + "appManagement": "App Management", + "appOverview": "App-Übersicht", "deactivate": "Deactivate", - "appreleaseprocess": "App Release Process", - "appsubscription": "App Subscription MGT", + "appReleaseProcess": "App Release Process", + "appSubscription": "App Subscription MGT", "adminboard": "Admin Board", - "appusermanagement": "App Benutzer Verwaltung", + "appUserManagement": "App Benutzer Verwaltung", "userdetails": "Benutzer Details", - "technicaluser": "Technische Benutzer Verwaltung", - "techuserdetails": "Technischer Benutzer Details", - "companyroles": "Company Roles", - "companyrolesparticipant": "Participant", - "companyrolesappprovider": "App Provider", - "companyrolesserviceprovider": "Service Provider", - "companyrolesconformitybody": "Conformity Body", - "companyrolesonboardingserviceprovider": "Onboarding Service Provider", - "usecase": "Use Case", - "usecasetraceablity": "Traceablity", - "servicemanagement": "Service Management", - "serviceoverview": "Service Overview", - "servicereleaseprocess": "Service Release Process", - "serviceadminboard": "Admin Board", - "servicesubscription": "Service Subscription Mgt", - "servicedetail": "Service Details", - "company-role": "Config - Company Role", - "usecase-participation": "Config - Use Case Participation", - "certificate-credential": "Config - Certificates", + "technicalUserManagement": "Technische Benutzer Verwaltung", + "techUserDetails": "Technischer Benutzer Details", + "companyRoles": "Company Roles", + "companyRolesParticipant": "Participant", + "companyRolesAppProvider": "App Provider", + "companyRolesServiceProvider": "Service Provider", + "companyRolesConformityBody": "Conformity Body", + "companyRolesOnboardingServiceProvider": "Onboarding Service Provider", + "useCase": "Use Case", + "useCaseTraceablity": "Traceablity", + "serviceManagement": "Service Management", + "serviceOverview": "Service Overview", + "serviceReleaseProcess": "Service Release Process", + "serviceAdminBoard": "Admin Board", + "serviceSubscription": "Service Subscription Mgt", + "serviceDetail": "Service Details", + "companyRole": "Config - Company Role", + "useCaseParticipation": "Config - Use Case Participation", + "certificateCredential": "Config - Certificates", "about": "About", - "dataspace": "Data Space", - "admin-credential": "Credential Requests", + "dataSpace": "Data Space", + "adminCredential": "Credential Requests", "companyCertificate": "Company Certificates", "companyWallet": "Company Wallet", - "company-subscriptions": "Firmenabonnements", + "companySubscriptions": "Firmenabonnements", "mycompany": "My Company", "mynotifications": "My Notifications", - "company_data": "Company Data" + "companyData": "Company Data" }, "overlays": { "invite": "Neuen Geschäftspartner einladen", - "add_user": "Neuen Benutzer hinzufügen", - "add_techuser": "Neuen technischen Benutzer hinzufügen", + "addUser": "Neuen Benutzer hinzufügen", + "addTechuser": "Neuen technischen Benutzer hinzufügen", "idp_delete_info_title": "Löschung des Identitätsanbieters.", "idp_delete_info_intro": "Bitte beachten Sie, dass alle Benutzer, die nicht auf das neue iDP migriert werden, unwiderruflich gelöscht werden.", "idp_delete_success_title": "Identitätsanbieter {{name}} wurde erfolgreich gelöscht.", @@ -258,13 +258,13 @@ "title": "Catena-X", "subtitle": "das Tor zum digitalen Automotive-Netzwerk", "buttonName": "Meine Apps", - "navigation": "/appmanagement" + "navigation": "/appManagement" }, "slider2": { "title": "Use Case Introduction", "subtitle": "Lernen Sie die unterstützten Anwendungsfälle, zugehörigen semantischen Modelle und Apps kennen, um Ihre anwendungsfallgesteuerte Onboarding-Reise zu beginnen.", "buttonName": "Use Case Introduction", - "navigation": "/usecase" + "navigation": "/useCase" }, "slider3": { "title": "Marktplätze", @@ -460,7 +460,7 @@ "showAll": "zeige alles" } }, - "appoverview": { + "appOverview": { "headerTitle": "Meine Applikationen", "title": "App-Übersicht", "inputPlaceholder": "Suchen Sie nach Apps", @@ -549,7 +549,7 @@ "deleteIconTooltip": "Mindestens ein Dokument ist obligatorisch. Laden Sie ein neues Dokument hoch, bevor Sie das Bild entfernen können.", "uploadButtonTooltip": "Maximale Anzahl zulässiger Dokumente erreicht. Bitte löschen Sie ein Dokument, bevor Sie ein neues hochladen." }, - "appreleaseprocess": { + "appReleaseProcess": { "message": "App Release Process Message" }, "connector": { @@ -656,12 +656,12 @@ "company": { "title": "Connector registrieren", "intro": "Um mit Ihrem Connector innerhalb des Datenraums kommunizieren zu können, muss der Connector-Endpunkt registriert werden. Für den Connector ist zwingend ein technischer Benutzer erforderlich. Dieser Benutzer wird verwendet, um die Kommunikation zwischen Ihrem Connector und dem Firmen-Wallet (Identitätsmanagement) zu ermöglichen. Wenn der technische Benutzer noch nicht erstellt wurde, erstellen Sie bitte zuerst den technischen Benutzer und fahren Sie anschließend mit der Connector-Registrierung fort. Beachten Sie, dass die technische Benutzererstellung ein asynchroner Prozess ist und bis zu 5 Minuten dauern kann.", - "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen aktiver Teilnehmer ist. Unternehmensrollen können vom Unternehmensadministrator /company-role geändert werden" + "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen aktiver Teilnehmer ist. Unternehmensrollen können vom Unternehmensadministrator /companyRole geändert werden" }, "managed": { "title": "Register Managed Connector", "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above.", - "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen App-Anbieter oder Dienstanbieter ist. Unternehmensrollen können vom Unternehmensadministrator /company-role geändert werden" + "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen App-Anbieter oder Dienstanbieter ist. Unternehmensrollen können vom Unternehmensadministrator /companyRole geändert werden" }, "companyconnectorlabel": "Verbinden Sie den Unternehmenskonnektor", "connectorasaservice": "Connector-as-a-service", @@ -1142,7 +1142,7 @@ "further": "Wenn Sie denken, dass hier etwas sein sollte kontaktieren Sie bitte Ihren Administrator." }, "appdetail": { - "usecase": "Use Case", + "useCase": "Use Case", "language": "Verfügbare App Sprachen", "subscribe": "Abonnieren", "subscribed": "Abonniert", @@ -1545,7 +1545,7 @@ } }, "adminboardDetail": { - "usecase": "Use Case", + "useCase": "Use Case", "language": "Language", "price": "Price", "longDescriptionTitleEN": "[Long Description - EN] ", @@ -1809,7 +1809,7 @@ }, "usecaseParticipation": { "heading": "Use Case Participation", - "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the usecase participatiance is relevant for data provider and data consumer.", + "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the useCase participatiance is relevant for data provider and data consumer.", "step1": "You can view your current signed use case participation", "step2": "You can sign additional use cases by selecting the document download, signing the document and upload the same", "note": "Please note: ", diff --git a/src/assets/locales/de/notification.json b/src/assets/locales/de/notification.json index c5ed5d754..e9fc8600a 100644 --- a/src/assets/locales/de/notification.json +++ b/src/assets/locales/de/notification.json @@ -94,24 +94,24 @@ } }, "link": { - "appmarketplace": "Zum App Marketplace", + "appMarketplace": "Zum App Marketplace", "technicalsetup": "Zur Connector Registrierung", "home": "Zur Startseite", "app": "Zur App", "user": "Zum Benutzer", - "usecase": "Zu den Use Case", + "useCase": "Zu den Use Case", "serviceprovider": "Go to service provider", "appmanagementboard": "App Management Board öffnen", "servicemanagementboard": "Service Management Board öffnen", - "appoverview": "Get there", + "appOverview": "Get there", "appsubscription": "Get there", "adminboard": "Get there", "technicaluser": "Get there", - "companyrolesserviceprovider": "Get there", + "companyRolesServiceProvider": "Get there", "usermanagement": "Get there", - "servicesubscription": "Get there", - "serviceadminboard": "Get there", - "role-details": "Open Role Matrix", + "serviceSubscription": "Get there", + "serviceAdminBoard": "Get there", + "roleDetails": "Open Role Matrix", "servicemarketplace": "Get there" }, "due": "fällig", diff --git a/src/assets/locales/de/servicerelease.json b/src/assets/locales/de/servicerelease.json index 27b8561e2..e7810fd66 100644 --- a/src/assets/locales/de/servicerelease.json +++ b/src/assets/locales/de/servicerelease.json @@ -119,7 +119,7 @@ "conformityDocumentsDescription": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", "documentsDescription": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." }, - "serviceoverview": { + "serviceOverview": { "filter": { "all": "Alle", "active": "Aktiv", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 274124d3d..42a4c81e4 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -6,21 +6,21 @@ "swagger": "Swagger OpenAPI Definition", "storybook": "Storybook Shared Component Library", "marketplace": "Marketplace", - "appmarketplace": "App Marketplace", - "servicemarketplace": "Service Marketplace", + "appMarketplace": "App Marketplace", + "serviceMarketplace": "Service Marketplace", "appdetails": "App Details", - "datamanagement": "Data Management", + "dataManagement": "Data Management", "semantichub": "Semantic Hub", - "partnernetwork": "Partner Network", + "partnerNetwork": "Partner Network", "connector": "Connector", "account": "My CX Account", "organization": "My Company", "notifications": "Notifications", - "usermanagement": "User Management", - "idpmanagement": "Identity Provider Config", - "technicalsetup": "Technical Integration", - "connectormanagement": "Connector Management", - "applicationrequests": "Application Requests", + "userManagement": "User Management", + "idpManagement": "Identity Provider Config", + "technicalSetup": "Technical Integration", + "connectorManagement": "Connector Management", + "applicationRequests": "Application Requests", "admin": "Administration", "developer": "Development", "invite": "Invite Business Partner", @@ -30,50 +30,50 @@ "imprint": "Imprint", "privacy": "Privacy", "terms": "Terms of Service", - "cookiepolicy": "Cookies", + "cookiePolicy": "Cookies", "logout": "Sign Out", - "notfound": "Page not found", - "appmanagement": "App Management", - "appoverview": "App Overview", + "notFound": "Page not found", + "appManagement": "App Management", + "appOverview": "App Overview", "deactivate": "Deactivate", - "appreleaseprocess": "App Release Process", - "appsubscription": "App Subscription MGT", + "appReleaseProcess": "App Release Process", + "appSubscription": "App Subscription MGT", "adminboard": "Admin Board", - "appusermanagement": "App User Management", + "appUserManagement": "App User Management", "userdetails": "User Details", - "technicaluser": "Technical User Management", - "techuserdetails": "Technical User Details", - "companyroles": "Company Roles", - "companyrolesparticipant": "Participant", - "companyrolesappprovider": "App Provider", - "companyrolesserviceprovider": "Service Provider", - "companyrolesconformitybody": "Conformity Body", - "companyrolesonboardingserviceprovider": "Onboarding Service Provider", - "usecase": "Use Case", - "usecasetraceablity": "Traceablity", - "servicemanagement": "Service Management", - "serviceoverview": "Service Overview", - "servicereleaseprocess": "Service Release Process", - "serviceadminboard": "Admin Board", - "servicesubscription": "Service Subscription Mgt", - "servicedetail": "Service Details", - "company-role": "Config - Company Role", - "usecase-participation": "Config - Use Case Participation", - "certificate-credential": "Config - Certificates", + "technicalUserManagement": "Technical User Management", + "techUserDetails": "Technical User Details", + "companyRoles": "Company Roles", + "companyRolesParticipant": "Participant", + "companyRolesAppProvider": "App Provider", + "companyRolesServiceProvider": "Service Provider", + "companyRolesConformityBody": "Conformity Body", + "companyRolesOnboardingServiceProvider": "Onboarding Service Provider", + "useCase": "Use Case", + "useCaseTraceablity": "Traceablity", + "serviceManagement": "Service Management", + "serviceOverview": "Service Overview", + "serviceReleaseProcess": "Service Release Process", + "serviceAdminBoard": "Admin Board", + "serviceSubscription": "Service Subscription Mgt", + "serviceDetail": "Service Details", + "companyRole": "Config - Company Role", + "useCaseParticipation": "Config - Use Case Participation", + "certificateCredential": "Config - Certificates", "about": "About", - "dataspace": "Data Space", - "admin-credential": "Credential Requests", + "dataSpace": "Data Space", + "adminCredential": "Credential Requests", "companyCertificate": "Company Certificates", "companyWallet": "Company Wallet", - "company-subscriptions": "Company Subscriptions", + "companySubscriptions": "Company Subscriptions", "mycompany": "My Company", "mynotifications": "My Notifications", - "company_data": "Company Data" + "companyData": "Company Data" }, "overlays": { "invite": "Invite new Business Partner", - "add_user": "Add new user", - "add_techuser": "Add new technical user", + "addUser": "Add new user", + "addTechuser": "Add new technical user", "idp_delete_info_title": "Deletion of the identity provider.", "idp_delete_info_intro": "Please note, all users which are not migrated to the new iDP wii get irreversible deleted.", "idp_delete_success_title": "Identity provider {{name}} was successfully deleted.", @@ -257,13 +257,13 @@ "title": "Catena-X", "subtitle": "the gateway to the automotive digital network", "buttonName": "My Apps", - "navigation": "/appmanagement" + "navigation": "/appManagement" }, "slider2": { "title": "Use Case Introduction", "subtitle": "Get to know the supported use cases, related semantic models and apps to start your use case driven onboarding journey.", "buttonName": "Use Case Introduction", - "navigation": "/usecase" + "navigation": "/useCase" }, "slider3": { "title": "Marketplaces", @@ -459,7 +459,7 @@ "datamanagement": { "message": "Contents of Data Management" }, - "appoverview": { + "appOverview": { "headerTitle": "My Apps", "title": "App Overview", "inputPlaceholder": "Search for Apps", @@ -548,7 +548,7 @@ "deleteIconTooltip": "At least one document is mandatory. Upload a new document before being able to remove the image.", "uploadButtonTooltip": "Maximum number of allowed documents reached. Please delete one document before uploading a new one." }, - "appreleaseprocess": { + "appReleaseProcess": { "message": "App Release Process Message" }, "connector": { @@ -660,12 +660,12 @@ "company": { "title": "Register Connector", "intro": "To be able to communicate with your connector inside the dataspace, the connector endpoint needs to get registered. For the connector, a technical user is mandatorily needed. This user is used to enable the communication between your connector and the company wallet (identity management). If the technical user is not created already, please create the technical user first and proceed with the connector registration afterwards. Note, the technical user creation is a asynchrony process and might take up to 5 minutes.", - "disableDescription": "This option is only available if your company is Active Participant. Company roles can get changed by the company admin /company-role" + "disableDescription": "This option is only available if your company is Active Participant. Company roles can get changed by the company admin /companyRole" }, "managed": { "title": "Register Managed Connector", "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above.", - "disableDescription": "This option is only available if your company is App Provider or Service Provider. Company roles can get changed by the company admin /company-role" + "disableDescription": "This option is only available if your company is App Provider or Service Provider. Company roles can get changed by the company admin /companyRole" }, "companyconnectorlabel": "Connect company connector", "connectorasaservice": "Connector-as-a-service", @@ -1108,7 +1108,7 @@ "further": "If you think there should be content please contact your administrator." }, "appdetail": { - "usecase": "Use Case", + "useCase": "Use Case", "language": "Language", "subscribe": "Subscribe", "subscribed": "Subscribed", @@ -1512,7 +1512,7 @@ } }, "adminboardDetail": { - "usecase": "Use Case", + "useCase": "Use Case", "language": "Language", "price": "Price", "longDescriptionTitleEN": "[Long Description - EN] ", @@ -1776,7 +1776,7 @@ }, "usecaseParticipation": { "heading": "Use Case Participation", - "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the usecase participatiance is relevant for data provider and data consumer.", + "description": "Below you can manage your use case participation in Catena-X.
Please note - the selection of the useCase participatiance is relevant for data provider and data consumer.", "step1": "You can view your current signed use case participation", "step2": "You can sign additional use cases by selecting the document download, signing the document and upload the same", "note": "Please note: ", diff --git a/src/assets/locales/en/notification.json b/src/assets/locales/en/notification.json index 6d8db35f2..23c467580 100644 --- a/src/assets/locales/en/notification.json +++ b/src/assets/locales/en/notification.json @@ -94,24 +94,24 @@ } }, "link": { - "appmarketplace": "Go to app marketplace", + "appMarketplace": "Go to app marketplace", "technicalsetup": "Go to connector configuration", "home": "Go to home page", "app": "Go to app", "user": "Go to user", - "usecase": "Go to Use Case", + "useCase": "Go to Use Case", "serviceprovider": "Go to service provider", "appmanagementboard": "Get there", "servicemanagementboard": "Get there", - "appoverview": "Get there", + "appOverview": "Get there", "appsubscription": "Get there", "adminboard": "Get there", "technicaluser": "Get there", - "companyrolesserviceprovider": "Get there", + "companyRolesServiceProvider": "Get there", "usermanagement": "Get there", - "servicesubscription": "Get there", - "serviceadminboard": "Get there", - "role-details": "Open Role Matrix", + "serviceSubscription": "Get there", + "serviceAdminBoard": "Get there", + "roleDetails": "Open Role Matrix", "servicemarketplace": "Get there" }, "due": "due", diff --git a/src/assets/locales/en/servicerelease.json b/src/assets/locales/en/servicerelease.json index 648d0abb7..cbd9b1577 100644 --- a/src/assets/locales/en/servicerelease.json +++ b/src/assets/locales/en/servicerelease.json @@ -119,7 +119,7 @@ "conformityDocumentsDescription": "To publish your service on the marketplace, a number of Catena-X specific agreements need to get signed by you. Please have a look at the mentioned agreements and agree to them via the checklist approval.", "documentsDescription": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." }, - "serviceoverview": { + "serviceOverview": { "headerTitle": "Service Overview - Own managed service offers", "inputPlaceholder": "Search for services", "filter": { diff --git a/src/components/overlays/AddUser/AddUserDeny.tsx b/src/components/overlays/AddUser/AddUserDeny.tsx index 8d59e7725..ae35e7d5e 100644 --- a/src/components/overlays/AddUser/AddUserDeny.tsx +++ b/src/components/overlays/AddUser/AddUserDeny.tsx @@ -79,7 +79,7 @@ export const AddUserDeny = ({ idps }: { idps: IdentityProvider[] }) => { }} sx={{ textTransform: 'none' }} > - {t('pages.idpmanagement')} + {t('pages.idpManagement')} diff --git a/src/components/overlays/AppOverViewConfirm/AppDetailsOverlay.tsx b/src/components/overlays/AppOverViewConfirm/AppDetailsOverlay.tsx index 873cd31dd..7463e4a79 100644 --- a/src/components/overlays/AppOverViewConfirm/AppDetailsOverlay.tsx +++ b/src/components/overlays/AppOverViewConfirm/AppDetailsOverlay.tsx @@ -44,7 +44,7 @@ export default function AppDetailsOverlay({ <> dispatch(closeOverlay()), }} @@ -64,7 +64,7 @@ export default function AppDetailsOverlay({ }} variant="h5" > - {t('content.appoverview.details.description').replace( + {t('content.appOverview.details.description').replace( '{appName}', title )} diff --git a/src/components/overlays/AppOverViewConfirm/index.tsx b/src/components/overlays/AppOverViewConfirm/index.tsx index bf25c90ea..bd2c6d7ae 100644 --- a/src/components/overlays/AppOverViewConfirm/index.tsx +++ b/src/components/overlays/AppOverViewConfirm/index.tsx @@ -51,7 +51,7 @@ export default function AppOverViewConfirm({ {title && ( - {t('content.appoverview.confirmModal.description').replace( + {t('content.appOverview.confirmModal.description').replace( '{appName}', title )} @@ -97,7 +97,7 @@ export default function AppOverViewConfirm({ variant="contained" onClick={() => { close() - navigate(`/${PAGES.APPRELEASEPROCESS}/form`) + navigate(`/${PAGES.APP_RELEASE_PROCESS}/form`) }} > {`${t('global.actions.yes')}`} diff --git a/src/components/overlays/DeleteTechnicalUser/index.tsx b/src/components/overlays/DeleteTechnicalUser/index.tsx index cc5fc4e55..30fd7b9d7 100644 --- a/src/components/overlays/DeleteTechnicalUser/index.tsx +++ b/src/components/overlays/DeleteTechnicalUser/index.tsx @@ -52,7 +52,7 @@ export const DeleteTechnicalUser = ({ id }: { id: string }) => { dispatch(closeOverlay()) dispatch(updateData(UPDATES.TECHUSER_LIST)) dispatch(setNotification(notification)) - navigate(`/${PAGES.TECHUSER_MANAGEMENT}`) + navigate(`/${PAGES.TECH_USER_MANAGEMENT}`) } const deleteUserError = (err: unknown) => { @@ -65,7 +65,7 @@ export const DeleteTechnicalUser = ({ id }: { id: string }) => { } dispatch(closeOverlay()) dispatch(setNotification(notification)) - navigate(`/${PAGES.TECHUSER_MANAGEMENT}`) + navigate(`/${PAGES.TECH_USER_MANAGEMENT}`) } const handleRemove = async () => { diff --git a/src/components/overlays/EditUsecase/index.tsx b/src/components/overlays/EditUsecase/index.tsx index 6d5a8e2cf..b613c2eaf 100644 --- a/src/components/overlays/EditUsecase/index.tsx +++ b/src/components/overlays/EditUsecase/index.tsx @@ -36,8 +36,8 @@ import { OVERLAYS } from 'types/Constants' import { closeOverlay, show } from 'features/control/overlay' import type { store } from 'features/store' import { Dropzone } from '../../shared/basic/Dropzone' -import { useAddUsecaseMutation } from 'features/usecase/usecaseApiSlice' import './style.scss' +import { useAddUsecaseMutation } from 'features/usecase/usecaseApiSlice' export default function EditUsecase({ id: verifiedCredentialTypeId, diff --git a/src/components/pages/AppDetail/AppDetailContentDetails.tsx b/src/components/pages/AppDetail/AppDetailContentDetails.tsx index 044eca11b..001e9075e 100644 --- a/src/components/pages/AppDetail/AppDetailContentDetails.tsx +++ b/src/components/pages/AppDetail/AppDetailContentDetails.tsx @@ -95,7 +95,7 @@ export default function AppDetailContentDetails({ onBackButtonClick={() => { nav === 'marketplace' ? navigate(`/${PAGES.APP_MARKETPLACE}`) - : navigate(`/${PAGES.APPOVERVIEW}`) + : navigate(`/${PAGES.APP_OVERVIEW}`) }} /> diff --git a/src/components/pages/AppDetail/components/AppDetailHeader/AppDetailHeader.scss b/src/components/pages/AppDetail/components/AppDetailHeader/AppDetailHeader.scss index b9f70a22b..2621876fe 100644 --- a/src/components/pages/AppDetail/components/AppDetailHeader/AppDetailHeader.scss +++ b/src/components/pages/AppDetail/components/AppDetailHeader/AppDetailHeader.scss @@ -49,7 +49,7 @@ font-size: 14px; } } - .usecase { + .useCase { display: flex; } ul { diff --git a/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx b/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx index c5d11f74a..f5c585162 100644 --- a/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx +++ b/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx @@ -192,9 +192,9 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) { {item.price} -
+
- {t('content.appdetail.usecase')}: + {t('content.appdetail.useCase')}: {item.useCases.map((useCase: UseCaseType) => ( @@ -202,7 +202,7 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) { ))}
-
+
{t('content.appdetail.language')}: diff --git a/src/components/pages/AppOverview/AddRoles.tsx b/src/components/pages/AppOverview/AddRoles.tsx index 9ef2a9cd0..2cb62b6cf 100644 --- a/src/components/pages/AppOverview/AddRoles.tsx +++ b/src/components/pages/AppOverview/AddRoles.tsx @@ -205,7 +205,7 @@ export default function AddRoles() {
) diff --git a/src/components/pages/AppOverview/ChangeDescription.tsx b/src/components/pages/AppOverview/ChangeDescription.tsx index b762c828f..976cdaacf 100644 --- a/src/components/pages/AppOverview/ChangeDescription.tsx +++ b/src/components/pages/AppOverview/ChangeDescription.tsx @@ -109,7 +109,7 @@ export default function ChangeDescription() { await saveDescription(saveData) .unwrap() .then(() => { - navigate(`/${PAGES.APPOVERVIEW}`, { + navigate(`/${PAGES.APP_OVERVIEW}`, { state: 'change-description-success', }) success(t('content.changeDescription.successMsg')) @@ -319,7 +319,7 @@ export default function ChangeDescription() {
) diff --git a/src/components/pages/IDPManagement/index.tsx b/src/components/pages/IDPManagement/index.tsx index fa9b4cdc0..7f71e40d7 100644 --- a/src/components/pages/IDPManagement/index.tsx +++ b/src/components/pages/IDPManagement/index.tsx @@ -38,7 +38,7 @@ export default function IDPManagement() {
- {t('idpmanagement.title')} + {t('idpManagement.title')} diff --git a/src/components/pages/NotificationCenter/NotificationItem.tsx b/src/components/pages/NotificationCenter/NotificationItem.tsx index df18b13ae..60bd90892 100644 --- a/src/components/pages/NotificationCenter/NotificationItem.tsx +++ b/src/components/pages/NotificationCenter/NotificationItem.tsx @@ -184,7 +184,7 @@ const NotificationConfig = ({ item }: { item: CXNotificationContent }) => { ) case NotificationType.APP_SUBSCRIPTION_REQUEST: return ( - + ) case NotificationType.APP_RELEASE_REQUEST: return @@ -193,24 +193,27 @@ const NotificationConfig = ({ item }: { item: CXNotificationContent }) => { ) case NotificationType.APP_RELEASE_REJECTION: - return + return case NotificationType.TECHNICAL_USER_CREATION: return ( ) case NotificationType.SERVICE_REQUEST: return ( ) case NotificationType.SERVICE_RELEASE_REQUEST: return ( - + ) case NotificationType.ROLE_UPDATE_APP_OFFER: return diff --git a/src/components/pages/OSPConsent/CompanyDetails.tsx b/src/components/pages/OSPConsent/CompanyDetails.tsx index 0962334c5..c5348b7cd 100644 --- a/src/components/pages/OSPConsent/CompanyDetails.tsx +++ b/src/components/pages/OSPConsent/CompanyDetails.tsx @@ -239,7 +239,7 @@ export const CompanyDetails = ({
{allConsentData?.companyRoles.map((role) => (
diff --git a/src/components/pages/OSPConsent/style.scss b/src/components/pages/OSPConsent/style.scss index 8a90f7e9d..b3c88e56f 100644 --- a/src/components/pages/OSPConsent/style.scss +++ b/src/components/pages/OSPConsent/style.scss @@ -81,7 +81,7 @@ margin: 30px 0 50px; .rolesList { - .company-role-section { + .companyRole-section { margin-bottom: 20px; .role-checkbox-row { diff --git a/src/components/pages/ServiceAdminBoard/index.tsx b/src/components/pages/ServiceAdminBoard/index.tsx index c6848d8a6..a10e70a5e 100644 --- a/src/components/pages/ServiceAdminBoard/index.tsx +++ b/src/components/pages/ServiceAdminBoard/index.tsx @@ -39,7 +39,7 @@ export default function ServiceAdminBoard() { }} fetchQuery={useFetchInReviewServicesQuery} isDynamicSearchEnabled={true} - type={PAGES.SERVICEADMINBOARD_DETAIL} + type={PAGES.SERVICE_ADMIN_BOARD_DETAIL} successApproveMsg={t('adminBoard.successApproveMsg')} errorApproveMsg={t('adminBoard.errorApproveMsg')} successDeclineMsg={t('adminBoard.successDeclineMsg')} diff --git a/src/components/pages/ServiceAdminBoardDetail/index.tsx b/src/components/pages/ServiceAdminBoardDetail/index.tsx index 5731be743..356680a28 100644 --- a/src/components/pages/ServiceAdminBoardDetail/index.tsx +++ b/src/components/pages/ServiceAdminBoardDetail/index.tsx @@ -122,7 +122,7 @@ export default function ServiceAdminBoardDetail() { color="secondary" size="small" onClick={() => { - navigate(`/${PAGES.SERVICEADMINBOARD}`) + navigate(`/${PAGES.SERVICE_ADMIN_BOARD}`) }} > {t('adminboardDetail.action.back')} @@ -284,7 +284,7 @@ export default function ServiceAdminBoardDetail() { color="secondary" size="small" onClick={() => { - navigate('/serviceadminboard') + navigate('/serviceAdminBoard') }} > {t('adminboardDetail.backToBoard')} diff --git a/src/components/pages/ServiceMarketplace/RecommendedServices.tsx b/src/components/pages/ServiceMarketplace/RecommendedServices.tsx index 3ba358825..ace4c3c83 100644 --- a/src/components/pages/ServiceMarketplace/RecommendedServices.tsx +++ b/src/components/pages/ServiceMarketplace/RecommendedServices.tsx @@ -53,7 +53,7 @@ export default function RecommendedServices({ }, []) const handleClick = (id: string) => { - navigate(`/servicemarketplacedetail/${id}`) + navigate(`/serviceMarketplaceDetail/${id}`) } if (services && services.length === 0) { diff --git a/src/components/pages/ServiceMarketplace/ServicesElements.tsx b/src/components/pages/ServiceMarketplace/ServicesElements.tsx index 0a93d7f08..ce48f2e15 100644 --- a/src/components/pages/ServiceMarketplace/ServicesElements.tsx +++ b/src/components/pages/ServiceMarketplace/ServicesElements.tsx @@ -50,7 +50,7 @@ export default function ServicesElements({ }, []) const handleClick = (id: string) => { - navigate(`/servicemarketplacedetail/${id}`) + navigate(`/serviceMarketplaceDetail/${id}`) } return ( diff --git a/src/components/pages/ServiceReleaseProcess/components/ServiceDeactivate.tsx b/src/components/pages/ServiceReleaseProcess/components/ServiceDeactivate.tsx index 4f9cf337c..1789e6cef 100644 --- a/src/components/pages/ServiceReleaseProcess/components/ServiceDeactivate.tsx +++ b/src/components/pages/ServiceReleaseProcess/components/ServiceDeactivate.tsx @@ -58,12 +58,12 @@ export default function ServiceDeactivate() { await deactivateService(service[0].id) .unwrap() .then(() => { - navigate(`/${PAGES.SERVICEOVERVIEW}`, { + navigate(`/${PAGES.SERVICE_OVERVIEW}`, { state: ServiceDeactivateEnum.SERVICE_DEACTIVATE_SUCCESS, }) }) .catch(() => { - navigate(`/${PAGES.SERVICEOVERVIEW}`, { + navigate(`/${PAGES.SERVICE_OVERVIEW}`, { state: ServiceDeactivateEnum.SERVICE_DEACTIVATE_ERROR, }) }) @@ -81,10 +81,10 @@ export default function ServiceDeactivate() { {service?.[0]?.title} - {t('serviceoverview.serviceDeactivate.headerTitle')} + {t('serviceOverview.serviceDeactivate.headerTitle')} - {t('serviceoverview.serviceDeactivate.description')} + {t('serviceOverview.serviceDeactivate.description')}
@@ -110,7 +110,7 @@ export default function ServiceDeactivate() { { e.target.checked ? setChecked(true) : setChecked(false) @@ -130,7 +130,7 @@ export default function ServiceDeactivate() { size="small" color="secondary" onClick={() => { - navigate('/serviceoverview') + navigate('/serviceOverview') }} > {t('global.actions.cancel')} @@ -139,7 +139,7 @@ export default function ServiceDeactivate() { tooltipPlacement="bottom-start" tooltipText={ !checked - ? t('serviceoverview.serviceDeactivate.checkboxErrorMsg') + ? t('serviceOverview.serviceDeactivate.checkboxErrorMsg') : '' } children={ diff --git a/src/components/pages/ServiceReleaseProcess/components/ServiceDetail.scss b/src/components/pages/ServiceReleaseProcess/components/ServiceDetail.scss index 68672884c..facf62b98 100644 --- a/src/components/pages/ServiceReleaseProcess/components/ServiceDetail.scss +++ b/src/components/pages/ServiceReleaseProcess/components/ServiceDetail.scss @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -.servicedetail-main { +.serviceDetail-main { background-color: #eee; margin-left: auto; margin-right: auto; diff --git a/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx b/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx index ce082a542..19063b0bd 100644 --- a/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx +++ b/src/components/pages/ServiceReleaseProcess/components/ServiceDetails.tsx @@ -88,7 +88,7 @@ export default function ServiceDetails() {
{fetchServiceStatus && ( <> -
+
{ - navigate(`/${PAGES.SERVICERELEASEPROCESS}/form`) + navigate(`/${PAGES.SERVICE_RELEASE_PROCESS}/form`) dispatch(setServiceId('')) dispatch(setServiceReleaseActiveStep()) dispatch(setServiceStatus(initialState.serviceStatusData)) @@ -198,7 +198,7 @@ export default function ServiceListOverview() { return (
@@ -218,7 +218,7 @@ export default function ServiceListOverview() { onChange={(e) => { onSearch(e.target.value) }} - placeholder={t('serviceoverview.inputPlaceholder')} + placeholder={t('serviceOverview.inputPlaceholder')} />
@@ -258,7 +258,7 @@ export default function ServiceListOverview() { imageSize={'small'} imageLoader={fetchImageWithToken} showAddNewCard={false} - newButtonText={t('serviceoverview.addbtn')} + newButtonText={t('serviceOverview.addbtn')} onNewCardButton={onNewServiceCardClick} onCardClick={(item: CardItems) => { // TODO: workaround - fix CardItems type @@ -268,7 +268,7 @@ export default function ServiceListOverview() { cardItem.status === ProvidedServiceStatusEnum.CREATED ) { dispatch(setServiceId(item.id ?? '')) - navigate(`/${PAGES.SERVICERELEASEPROCESS}/form`) + navigate(`/${PAGES.SERVICE_RELEASE_PROCESS}/form`) } else { navigate(`/${PAGES.SERVICE_DETAIL}/${item.id}`) } @@ -281,12 +281,12 @@ export default function ServiceListOverview() { id: string | undefined ) => { sortMenu === ServiceSubMenuItems.DEACTIVATE && - navigate(`/${PAGES.SERVICEDEACTIVATE}/${id}`, { + navigate(`/${PAGES.SERVICE_DEACTIVATE}/${id}`, { state: items, }) return undefined }} - tooltipText={t('serviceoverview.submenuNotAvailable')} + tooltipText={t('serviceOverview.submenuNotAvailable')} />
) : ( @@ -318,8 +318,8 @@ export default function ServiceListOverview() { } description={ state === ServiceDeactivateEnum.SERVICE_DEACTIVATE_SUCCESS - ? t('serviceoverview.serviceDeactivate.successMsg') - : t('serviceoverview.serviceDeactivate.errorMsg') + ? t('serviceOverview.serviceDeactivate.successMsg') + : t('serviceOverview.serviceDeactivate.errorMsg') } showIcon={true} autoClose={true} diff --git a/src/components/pages/ServiceReleaseProcess/components/index.tsx b/src/components/pages/ServiceReleaseProcess/components/index.tsx index 00357a482..f32180f31 100644 --- a/src/components/pages/ServiceReleaseProcess/components/index.tsx +++ b/src/components/pages/ServiceReleaseProcess/components/index.tsx @@ -37,7 +37,7 @@ export default function ServiceReleaseProcessForm() { const dispatch = useDispatch() const onServiceOverviewClick = () => { - navigate('/serviceoverview') + navigate('/serviceOverview') dispatch(setServiceReleaseActiveStep()) } const serviceStatusData = useSelector(serviceStatusDataSelector) diff --git a/src/components/pages/ServiceReleaseProcess/index.tsx b/src/components/pages/ServiceReleaseProcess/index.tsx index b2281b999..39233c032 100644 --- a/src/components/pages/ServiceReleaseProcess/index.tsx +++ b/src/components/pages/ServiceReleaseProcess/index.tsx @@ -69,14 +69,14 @@ export default function ServiceReleaseProcess() { ] const onStartServiceClick = () => { - navigate(`/${PAGES.SERVICERELEASEPROCESS}/form`) + navigate(`/${PAGES.SERVICE_RELEASE_PROCESS}/form`) dispatch(setServiceReleaseActiveStep()) dispatch(setServiceId('')) dispatch(setServiceStatus(initialState.serviceStatusData)) } const onOverviewServiceButton = () => { - navigate('/serviceoverview') + navigate('/serviceOverview') } const requeredButtons = [ diff --git a/src/components/pages/TechnicalUserDetails/TechnicalUserDetailsContent.tsx b/src/components/pages/TechnicalUserDetails/TechnicalUserDetailsContent.tsx index ef22ea71d..ce8978b9a 100644 --- a/src/components/pages/TechnicalUserDetails/TechnicalUserDetailsContent.tsx +++ b/src/components/pages/TechnicalUserDetails/TechnicalUserDetailsContent.tsx @@ -115,7 +115,7 @@ export default function TechnicalUserDetailsContent({ variant="outlined" startIcon={} onClick={() => - dispatch(show(OVERLAYS.DELETE_TECHUSER, newData.serviceAccountId)) + dispatch(show(OVERLAYS.DELETE_TECH_USER, newData.serviceAccountId)) } > {t('content.usermanagement.technicalUser.delete')} diff --git a/src/components/pages/TechnicalUserDetails/index.tsx b/src/components/pages/TechnicalUserDetails/index.tsx index 88ee8f7dd..4b96d3a0f 100644 --- a/src/components/pages/TechnicalUserDetails/index.tsx +++ b/src/components/pages/TechnicalUserDetails/index.tsx @@ -33,8 +33,8 @@ export default function TechnicalUserDetails() { {data ? : } diff --git a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx index 767cdc71d..49b7bcd6f 100644 --- a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx +++ b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx @@ -155,7 +155,7 @@ export const TechnicalUserTable = () => { //dispatch(show(OVERLAYS.TECHUSER, row.serviceAccountId)) { navigate( - `/${PAGES.TECHUSER_DETAILS}/${row.serviceAccountId}` + `/${PAGES.TECH_USER_DETAILS}/${row.serviceAccountId}` ) } } diff --git a/src/components/pages/TechnicalUserManagement/index.tsx b/src/components/pages/TechnicalUserManagement/index.tsx index 7ec7a9b1a..06735fd0a 100644 --- a/src/components/pages/TechnicalUserManagement/index.tsx +++ b/src/components/pages/TechnicalUserManagement/index.tsx @@ -45,7 +45,7 @@ export default function TechnicalUserManagement() { return (
@@ -65,7 +65,7 @@ export default function TechnicalUserManagement() { diff --git a/src/components/pages/UsecaseParticipation/UsecaseParticipation.scss b/src/components/pages/UsecaseParticipation/UsecaseParticipation.scss index d1c34fe23..64f98c3c3 100644 --- a/src/components/pages/UsecaseParticipation/UsecaseParticipation.scss +++ b/src/components/pages/UsecaseParticipation/UsecaseParticipation.scss @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -.usecase-participation { - .usecase-main { +.useCaseParticipation { + .useCase-main { margin-top: 72px; } .container { @@ -67,7 +67,7 @@ border-bottom: 1px solid #dcdcdc; padding: 30px; } - .usecase-list-main { + .useCase-list-main { max-width: 850px; width: 100%; margin: 0 auto 50px; @@ -82,12 +82,12 @@ border: 0; border-top: 1px solid #dcdcdc; } - .usecase-list { + .useCase-list { margin-bottom: 30px; - .usecase-list-item { + .useCase-list-item { margin-bottom: 20px; display: flex; - .usecase-detail { + .useCase-detail { display: flex; width: 80%; svg { diff --git a/src/components/pages/UsecaseParticipation/index.tsx b/src/components/pages/UsecaseParticipation/index.tsx index 398bb07a1..bc8f10b27 100644 --- a/src/components/pages/UsecaseParticipation/index.tsx +++ b/src/components/pages/UsecaseParticipation/index.tsx @@ -139,8 +139,8 @@ export default function UsecaseParticipation() { } return ( -
-
+
+
{t('content.usecaseParticipation.heading')} @@ -176,7 +176,7 @@ export default function UsecaseParticipation() { {t('content.usecaseParticipation.noteDetail')}
-
+
    {isLoading ? (
    @@ -194,14 +194,14 @@ export default function UsecaseParticipation() { ) : ( data?.map((item) => { return ( -
    -
  • -
    +
    +
  • +
    {item.useCase} diff --git a/src/components/pages/UserManagement/AppArea/index.tsx b/src/components/pages/UserManagement/AppArea/index.tsx index fb94b12f1..db0c79c14 100644 --- a/src/components/pages/UserManagement/AppArea/index.tsx +++ b/src/components/pages/UserManagement/AppArea/index.tsx @@ -61,7 +61,7 @@ export const AppArea = () => { expandOnHover={false} filledBackground={true} onClick={() => { - navigate(`/appusermanagement/${item.offerId}`) + navigate(`/appUserManagement/${item.offerId}`) }} /> ) diff --git a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx index e9a0faa86..7d3cc8db8 100644 --- a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx +++ b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx @@ -46,7 +46,7 @@ export const StageSubNavigation = () => { { - navigate('/technicaluser') + navigate('/technicalUserManagement') }} link1Label={t('navigation.subNavigation.link1Label')} onLink1Click={() => { diff --git a/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx b/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx index 27673a300..efee886a8 100644 --- a/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx @@ -834,7 +834,7 @@ export default function AppMarketCard() { setAppCardSnackbar(false) }} onBackIconClick={() => { - navigate('/appmanagement') + navigate('/appManagement') }} // Add an ESLint exception until there is a solution // eslint-disable-next-line diff --git a/src/components/shared/basic/ReleaseProcess/ReleaseProcess.scss b/src/components/shared/basic/ReleaseProcess/ReleaseProcess.scss index 0110b3197..565e799bb 100644 --- a/src/components/shared/basic/ReleaseProcess/ReleaseProcess.scss +++ b/src/components/shared/basic/ReleaseProcess/ReleaseProcess.scss @@ -22,7 +22,7 @@ margin: 0 auto; } -.appoverview-main { +.appOverview-main { .desc-section { text-align: center; margin-top: 112px; diff --git a/src/components/shared/basic/ReleaseProcess/index.tsx b/src/components/shared/basic/ReleaseProcess/index.tsx index 7a36be410..bd2d051cb 100644 --- a/src/components/shared/basic/ReleaseProcess/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/index.tsx @@ -79,7 +79,7 @@ export const ReleaseProcess = ({ registerButton, }: ReleaseProcessProps) => { return ( -
    +
    diff --git a/src/components/shared/frame/Footer/index.tsx b/src/components/shared/frame/Footer/index.tsx index 0a5c1425a..73229eff9 100644 --- a/src/components/shared/frame/Footer/index.tsx +++ b/src/components/shared/frame/Footer/index.tsx @@ -44,9 +44,9 @@ export const Footer = ({ pages }: { pages: string[] }) => { }) } const isAppOverviewPage = [ - PAGES.APPOVERVIEW, + PAGES.APP_OVERVIEW, PAGES.APP_MANAGEMENT, - PAGES.APPRELEASEPROCESS, + PAGES.APP_RELEASE_PROCESS, PAGES.SERVICE_MARKETPLACE, ].find((e) => location.pathname.split('/').includes(e)) @@ -54,8 +54,8 @@ export const Footer = ({ pages }: { pages: string[] }) => { location.pathname.split('/').includes(e) ) - const isAppReleaseProcessForm = [`${PAGES.APPRELEASEPROCESS}/form`].find(() => - location.pathname.split('/').includes('form') + const isAppReleaseProcessForm = [`${PAGES.APP_RELEASE_PROCESS}/form`].find( + () => location.pathname.split('/').includes('form') ) const [showScrollToTop, setShowScrollToTop] = useState(false) diff --git a/src/components/shared/templates/AdminBoard/AdminBoardElements.tsx b/src/components/shared/templates/AdminBoard/AdminBoardElements.tsx index 6203cdd61..e0f8df3ea 100644 --- a/src/components/shared/templates/AdminBoard/AdminBoardElements.tsx +++ b/src/components/shared/templates/AdminBoard/AdminBoardElements.tsx @@ -93,7 +93,7 @@ export default function AdminBoardElements({ const handleApprove = async (appId: string) => { setActionApprove(true) - if (type === PAGES.SERVICEADMINBOARD_DETAIL) { + if (type === PAGES.SERVICE_ADMIN_BOARD_DETAIL) { await approveServiceRequest(appId) .unwrap() .then(() => { @@ -140,7 +140,7 @@ export default function AdminBoardElements({ items={apps} onDelete={(appId: string) => { setActionApprove(false) - if (type === PAGES.SERVICEADMINBOARD_DETAIL) { + if (type === PAGES.SERVICE_ADMIN_BOARD_DETAIL) { dispatch(show(OVERLAYS.SERVICE_DECLINE_ADMINBOARD, appId)) } else { dispatch(show(OVERLAYS.APP_DECLINE_ADMINBOARD, appId)) diff --git a/src/services/AccessService.tsx b/src/services/AccessService.tsx index 86d5bfd42..7fb032325 100644 --- a/src/services/AccessService.tsx +++ b/src/services/AccessService.tsx @@ -133,9 +133,9 @@ export const getOverlay = (overlay: OverlayState) => { return case OVERLAYS.USER: return - case OVERLAYS.ADD_TECHUSER: + case OVERLAYS.ADD_TECH_USER: return - case OVERLAYS.DELETE_TECHUSER: + case OVERLAYS.DELETE_TECH_USER: return case OVERLAYS.ADD_APP_USER_ROLES: return diff --git a/src/types/Config.tsx b/src/types/Config.tsx index 83ddfec0c..387b73f24 100644 --- a/src/types/Config.tsx +++ b/src/types/Config.tsx @@ -214,37 +214,37 @@ export const ALL_PAGES: IPage[] = [ element: , }, { - name: PAGES.APPOVERVIEW, + name: PAGES.APP_OVERVIEW, role: ROLES.APPOVERVIEW_VIEW, element: , }, { - name: PAGES.APPOVERVIEW_NEW, + name: PAGES.APP_OVERVIEW_NEW, role: ROLES.APPOVERVIEW_VIEW, element: , }, { - name: PAGES.SERVICEOVERVIEW, + name: PAGES.SERVICE_OVERVIEW, role: ROLES.SERVICEOVERVIEW_VIEW, element: , }, { - name: PAGES.APPRELEASEPROCESS, + name: PAGES.APP_RELEASE_PROCESS, role: ROLES.APPOVERVIEW_VIEW, element: , }, { - name: PAGES.SERVICERELEASEPROCESS, + name: PAGES.SERVICE_RELEASE_PROCESS, role: ROLES.VIEW_SERVICE_RELEASE, element: , }, { - name: PAGES.APPSUBSCRIPTION, + name: PAGES.APP_SUBSCRIPTION, role: ROLES.APP_MANAGEMENT, element: , }, { - name: PAGES.SERVICESUBSCRIPTION, + name: PAGES.SERVICE_SUBSCRIPTION, role: ROLES.SERVICE_SUBSCRIPTION_MANAGEMENT, element: , }, @@ -254,7 +254,7 @@ export const ALL_PAGES: IPage[] = [ element: , }, { - name: PAGES.SERVICEADMINBOARD, + name: PAGES.SERVICE_ADMIN_BOARD, role: ROLES.APPROVE_SERVICE_RELEASE || ROLES.DECLINE_SERVICE_RELEASE, element: , }, @@ -274,13 +274,13 @@ export const ALL_PAGES: IPage[] = [ ), }, { - name: PAGES.SERVICEADMINBOARD_DETAIL, + name: PAGES.SERVICE_ADMIN_BOARD_DETAIL, role: ROLES.APPROVE_SERVICE_RELEASE || ROLES.DECLINE_SERVICE_RELEASE, isRoute: true, element: ( } > @@ -294,8 +294,8 @@ export const ALL_PAGES: IPage[] = [ role: ROLES.APPOVERVIEW_VIEW, element: ( } /> ), @@ -306,8 +306,8 @@ export const ALL_PAGES: IPage[] = [ role: ROLES.VIEW_SERVICE_RELEASE, element: ( } /> ), @@ -332,18 +332,18 @@ export const ALL_PAGES: IPage[] = [ ), }, { - name: PAGES.TECHUSER_MANAGEMENT, - role: ROLES.TECHUSER_VIEW, + name: PAGES.TECH_USER_MANAGEMENT, + role: ROLES.TECH_USER_VIEW, element: , }, { - name: PAGES.TECHUSER_DETAILS, - role: ROLES.TECHUSER_VIEW, + name: PAGES.TECH_USER_DETAILS, + role: ROLES.TECH_USER_VIEW, isRoute: true, element: ( } > } /> @@ -420,12 +420,12 @@ export const ALL_PAGES: IPage[] = [ ), }, { - name: PAGES.SERVICEDEACTIVATE, + name: PAGES.SERVICE_DEACTIVATE, isRoute: true, element: ( } > } /> @@ -491,9 +491,9 @@ export const ALL_PAGES: IPage[] = [ } + element={} > - } /> + } /> ), }, @@ -537,7 +537,7 @@ export const ALL_PAGES: IPage[] = [ element: , }, { - name: PAGES.ONBOARDING_SERVICEPROVIDER, + name: PAGES.ONBOARDING_SERVICE_PROVIDER, role: ROLES.IDP_VIEW, element: , }, @@ -595,12 +595,12 @@ export const ALL_OVERLAYS: IOverlay[] = [ role: ROLES.USERMANAGEMENT_ADD, }, { - name: OVERLAYS.ADD_TECHUSER, - role: ROLES.TECHUSER_ADD, + name: OVERLAYS.ADD_TECH_USER, + role: ROLES.TECH_USER_ADD, }, { - name: OVERLAYS.DELETE_TECHUSER, - role: ROLES.TECHUSER_DELETE, + name: OVERLAYS.DELETE_TECH_USER, + role: ROLES.TECH_USER_DELETE, }, { name: OVERLAYS.ADD_APP_USER_ROLES, @@ -769,22 +769,22 @@ export const mainMenuFullTree = [ { name: PAGES.APP_MANAGEMENT, children: [ - { name: PAGES.APPOVERVIEW, hint: HINTS.NEW }, - { name: PAGES.APPRELEASEPROCESS }, - { name: PAGES.APPSUBSCRIPTION, hint: HINTS.NEW }, + { name: PAGES.APP_OVERVIEW, hint: HINTS.NEW }, + { name: PAGES.APP_RELEASE_PROCESS }, + { name: PAGES.APP_SUBSCRIPTION, hint: HINTS.NEW }, { name: PAGES.ADMINBOARD, hint: HINTS.NEW }, ], }, { name: PAGES.SERVICE_MANAGEMENT, children: [ - { name: PAGES.SERVICEOVERVIEW, hint: HINTS.NEW }, - { name: PAGES.SERVICERELEASEPROCESS, hint: HINTS.NEW }, + { name: PAGES.SERVICE_OVERVIEW, hint: HINTS.NEW }, + { name: PAGES.SERVICE_RELEASE_PROCESS, hint: HINTS.NEW }, { - name: PAGES.SERVICESUBSCRIPTION, + name: PAGES.SERVICE_SUBSCRIPTION, hint: HINTS.NEW, }, - { name: PAGES.SERVICEADMINBOARD, hint: HINTS.NEW }, + { name: PAGES.SERVICE_ADMIN_BOARD, hint: HINTS.NEW }, ], }, ] diff --git a/src/types/Constants.ts b/src/types/Constants.ts index daeb9924d..3e4888a2f 100644 --- a/src/types/Constants.ts +++ b/src/types/Constants.ts @@ -28,30 +28,30 @@ export enum PAGES { REGISTRATION = 'registration', SWAGGER = 'swagger', STORYBOOK = 'storybook', - APPSUBSCRIPTION = 'appsubscription', + APP_SUBSCRIPTION = 'appSubscription', ADMINBOARD = 'adminboard', - ADMINBOARD_DETAIL = 'adminboarddetail', + ADMINBOARD_DETAIL = 'adminboardDetail', MARKETPLACE = 'marketplace', - APP_MARKETPLACE = 'appmarketplace', - SERVICE_MARKETPLACE = 'servicemarketplace', - SERVICE_MARKETPLACE_DETAIL = 'servicemarketplacedetail', + APP_MARKETPLACE = 'appMarketplace', + SERVICE_MARKETPLACE = 'serviceMarketplace', + SERVICE_MARKETPLACE_DETAIL = 'serviceMarketplaceDetail', APP_DETAIL = 'appdetail', - DATA_MANAGEMENT = 'datamanagement', + DATA_MANAGEMENT = 'dataManagement', SEMANTICHUB = 'semantichub', CONNECTOR = 'connector', ACCOUNT = 'account', USER_DETAILS = 'userdetails', NOTIFICATIONS = 'notifications', ORGANIZATION = 'organization', - PARTNER_NETWORK = 'partnernetwork', - USER_MANAGEMENT = 'usermanagement', - TECHNICAL_SETUP = 'technicalsetup', - CONNECTOR_MANAGEMENT = 'connectormanagement', - TECHUSER_MANAGEMENT = 'technicaluser', - TECHUSER_DETAILS = 'techuserdetails', - IDP_MANAGEMENT = 'idpmanagement', - APPLICATION_REQUESTS = 'applicationrequests', - APP_USER_MANAGEMENT = 'appusermanagement', + PARTNER_NETWORK = 'partnerNetwork', + USER_MANAGEMENT = 'userManagement', + TECHNICAL_SETUP = 'technicalSetup', + CONNECTOR_MANAGEMENT = 'connectorManagement', + TECH_USER_MANAGEMENT = 'technicalUserManagement', + TECH_USER_DETAILS = 'techUserDetails', + IDP_MANAGEMENT = 'idpManagement', + APPLICATION_REQUESTS = 'applicationRequests', + APP_USER_MANAGEMENT = 'appUserManagement', INVITE = 'invite', ADMINISTRATION = 'admin', HELP = 'help', @@ -60,101 +60,101 @@ export enum PAGES { IMPRINT = 'imprint', PRIVACY = 'privacy', TERMS = 'terms', - COOKIE_POLICY = 'cookiepolicy', + COOKIE_POLICY = 'cookiePolicy', SETTINGS = 'settings', DEVELOPER = 'developer', TEST = 'test', LOGOUT = 'logout', ERROR = 'error', - APP_MANAGEMENT = 'appmanagement', - APPOVERVIEW = 'appoverview', - APPOVERVIEW_NEW = 'appoverview-new', + APP_MANAGEMENT = 'appManagement', + APP_OVERVIEW = 'appOverview', + APP_OVERVIEW_NEW = 'appoverviewNew', DEACTIVATE = 'deactivate', - CHANGE_IMAGE = 'changeimage', - CHANGE_DESCRIPTION = 'changedescription', - ADD_ROLES = 'addroles', - CHANGE_DOCUMENTS = 'changedocuments', + CHANGE_IMAGE = 'changeImage', + CHANGE_DESCRIPTION = 'changeDescription', + ADD_ROLES = 'addRoles', + CHANGE_DOCUMENTS = 'changeDocuments', VIEW_DETAILS = 'viewDetails', - APPRELEASEPROCESS = 'appreleaseprocess', - APP_RELEASE_PROCESS_FORM = 'appreleaseprocess_form', - INTRODUCTION = 'companyroles', - INTRODUCTION_PARTICIPANT = 'companyrolesparticipant', - INTRODUCTION_APP_PROVIDER = 'companyrolesappprovider', - INTRODUCTION_SERVICE_PROVIDER = 'companyrolesserviceprovider', - INTRODUCTION_CONFORMITY_BODY = 'companyrolesconformitybody', - INTRODUCTION_OSP_BODY = 'companyrolesonboardingserviceprovider', - USE_CASE = 'usecase', - USE_CASE_TRACABILITY = 'usecasetraceablity', - SERVICE_MANAGEMENT = 'servicemanagement', - SERVICEOVERVIEW = 'serviceoverview', - SERVICEDEACTIVATE = 'servicedeactivate', - SERVICERELEASEPROCESS = 'servicereleaseprocess', - SERVICEADMINBOARD = 'serviceadminboard', - SERVICEADMINBOARD_DETAIL = 'serviceadminboarddetail', - SERVICESUBSCRIPTION = 'servicesubscription', - SERVICE_RELEASE_PROCESS_FORM = 'servicereleaseprocess_form', - ROLE_DETAILS = 'role-details', - SERVICE_DETAIL = 'servicedetail', - COMPANY_ROLE = 'company-role', - USECASE_PARTICIPATION = 'usecase-participation', + APP_RELEASE_PROCESS = 'appReleaseProcess', + APP_RELEASE_PROCESS_FORM = 'appReleaseProcessForm', + INTRODUCTION = 'companyRoles', + INTRODUCTION_PARTICIPANT = 'companyRolesParticipant', + INTRODUCTION_APP_PROVIDER = 'companyRolesAppProvider', + INTRODUCTION_SERVICE_PROVIDER = 'companyRolesServiceProvider', + INTRODUCTION_CONFORMITY_BODY = 'companyRolesConformityBody', + INTRODUCTION_OSP_BODY = 'companyRolesOnboardingServiceProvider', + USE_CASE = 'useCase', + USE_CASE_TRACABILITY = 'useCaseTraceablity', + SERVICE_MANAGEMENT = 'serviceManagement', + SERVICE_OVERVIEW = 'serviceOverview', + SERVICE_DEACTIVATE = 'serviceDeactivate', + SERVICE_RELEASE_PROCESS = 'serviceReleaseProcess', + SERVICE_ADMIN_BOARD = 'serviceAdminBoard', + SERVICE_ADMIN_BOARD_DETAIL = 'serviceAdminBoardDetail', + SERVICE_SUBSCRIPTION = 'serviceSubscription', + SERVICE_RELEASE_PROCESS_FORM = 'serviceReleaseProcessForm', + ROLE_DETAILS = 'roleDetails', + SERVICE_DETAIL = 'serviceDetail', + COMPANY_ROLE = 'companyRole', + USECASE_PARTICIPATION = 'useCaseParticipation', ABOUTPAGE = 'about', - CERTIFICATE_CREDENTIAL = 'certificate-credential', - DATA_SPACE = 'dataspace', - ADMIN_CREDENTIAL = 'admin-credential', - ONBOARDING_SERVICEPROVIDER = 'onboarding-serviceprovider', + CERTIFICATE_CREDENTIAL = 'certificateCredential', + DATA_SPACE = 'dataSpace', + ADMIN_CREDENTIAL = 'adminCredential', + ONBOARDING_SERVICE_PROVIDER = 'onboardingServiceProvider', COMPANY_CERTIFICATE = 'companyCertificate', COMPANY_WALLET = 'companyWallet', DECLINE = 'decline', - CONSENT_OSP = 'consent_osp', - COMPANY_SUBSCRIPTIONS = 'company-subscriptions', - COMPANY_SUBSCRIPTIONS_DETAIL = 'company-subscriptions-detail', - COMPANY_DATA = 'company_data', + CONSENT_OSP = 'consentOsp', + COMPANY_SUBSCRIPTIONS = 'companySubscriptions', + COMPANY_SUBSCRIPTIONS_DETAIL = 'companySubscriptionsDetail', + COMPANY_DATA = 'companyData', } export enum OVERLAYS { - NOT_FOUND = 'notfound', + NOT_FOUND = 'notFound', NONE = 'none', - ADD_USER = 'add_user', - ADD_MULTIPLE_USER = 'add_multiple_user', - ADD_APP_USER_ROLES = 'add_app_user_roles', - EDIT_APP_USER_ROLES = 'edit_app_user_roles', + ADD_USER = 'addUser', + ADD_MULTIPLE_USER = 'addMultipleUser', + ADD_APP_USER_ROLES = 'addAppUserRoles', + EDIT_APP_USER_ROLES = 'editAppUserRoles', USER = 'user', - ADD_TECHUSER = 'add_techuser', - DELETE_TECHUSER = 'delete_techuser', + ADD_TECH_USER = 'addTechUser', + DELETE_TECH_USER = 'deleteTechUser', NEWS = 'news', - ADD_BPN = 'add_bpn', - ADD_SUBSCRIPTION = 'add_subscription', + ADD_BPN = 'addBpn', + ADD_SUBSCRIPTION = 'addSubscription', INVITE = 'invite', PARTNER = 'partner', APP = 'app', - SERVICE_REQUEST = 'service_request', - APPMARKETPLACE_REQUEST = 'appmarketplace_request', - ADD_IDP = 'add_idp', - UPDATE_IDP = 'update_idp', - UPDATE_IDP_SUCCESS = 'update_idp_success', - ENABLE_IDP = 'enable_idp', - DISABLE_IDP = 'disable_idp', - DISABLE_MANAGED_IDP = 'disable_managed_idp', - DELETE_MANAGED_IDP = 'delete_managed_idp', - ADDUSERS_IDP = 'addusers_idp', - IDP_DETAILS = 'idp_details', - IDP_CONFIRM = 'idp_confirm', - ENABLE_IDP_SUCCESS = 'enable_idp_success', - REGISTER_OSP = 'register_osp', - REGISTER_NEXT_OSP = 'register_next_osp', - CONSENT_OSP = 'consent_osp', - APP_OVERVIEW_CONFIRM = 'app_overview_confirm', - APP_DETAILS_OVERLAY = 'app_details_overlay', - CONFIRM_USER_ACTION = 'confirm_user_action', - ADD_SERVICE_PROVIDER = 'add_service_provider', - APP_DECLINE_ADMINBOARD = 'app_decline_adminboard', - EDIT_PORTAL_ROLES = 'edit_portal_roles', - SERVICE_DECLINE_ADMINBOARD = 'decline_service_release', - UPDATE_COMPANY_ROLE = 'update_company_role', - EDIT_USECASE = 'edit_usecase', - UPDATE_CERTIFICATE = 'update_certificate', - COMPANY_CERTIFICATE_DETAILS = 'company_certificate_details', - COMPANY_CERTIFICATE_CONFIRM_DELETE = 'company_certificate_confirm_delete', + SERVICE_REQUEST = 'serviceRequest', + APPMARKETPLACE_REQUEST = 'appmarketplaceRequest', + ADD_IDP = 'addIdp', + UPDATE_IDP = 'updateIdp', + UPDATE_IDP_SUCCESS = 'updateIdpSuccess', + ENABLE_IDP = 'enableIdp', + DISABLE_IDP = 'disableIdp', + DISABLE_MANAGED_IDP = 'disableManagedIdp', + DELETE_MANAGED_IDP = 'deleteManagedIdp', + ADDUSERS_IDP = 'addUsersIdp', + IDP_DETAILS = 'idpDetails', + IDP_CONFIRM = 'idpConfirm', + ENABLE_IDP_SUCCESS = 'enableIdpSuccess', + REGISTER_OSP = 'registerOsp', + REGISTER_NEXT_OSP = 'registerNextOsp', + CONSENT_OSP = 'consentOsp', + APP_OVERVIEW_CONFIRM = 'appOverviewConfirm', + APP_DETAILS_OVERLAY = 'appDetailsOverlay', + CONFIRM_USER_ACTION = 'confirmUserAction', + ADD_SERVICE_PROVIDER = 'addServiceProvider', + APP_DECLINE_ADMINBOARD = 'appDeclineAdminboard', + EDIT_PORTAL_ROLES = 'editPortalRoles', + SERVICE_DECLINE_ADMINBOARD = 'declineServiceRelease', + UPDATE_COMPANY_ROLE = 'updateCompanyRole', + EDIT_USECASE = 'editUsecase', + UPDATE_CERTIFICATE = 'updateCertificate', + COMPANY_CERTIFICATE_DETAILS = 'companyCertificateDetails', + COMPANY_CERTIFICATE_CONFIRM_DELETE = 'companyCertificateConfirmDelete', } export enum ACTIONS { @@ -193,9 +193,9 @@ export enum ROLES { USERMANAGEMENT_VIEW = 'view_user_management', USERMANAGEMENT_ADD = 'add_user_account', USERMANAGEMENT_DELETE = 'delete_user_account', - TECHUSER_VIEW = 'view_tech_user_management', - TECHUSER_ADD = 'add_tech_user_management', - TECHUSER_DELETE = 'delete_tech_user_management', + TECH_USER_VIEW = 'view_tech_user_management', + TECH_USER_ADD = 'add_tech_user_management', + TECH_USER_DELETE = 'delete_tech_user_management', IDP_VIEW = 'view_idp', IDP_ADD = 'add_idp', IDP_DELETE = 'delete_idp', diff --git a/yarn.lock b/yarn.lock index 3d7217421..67f71462a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6034,4 +6034,4 @@ yn@3.1.1: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file From 8e5f9ca8589d571928a1e0a1a1ef7e5ec4acd7d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 17:38:29 +0200 Subject: [PATCH 8/9] build(deps): bump the dependencies group across 1 directory with 8 updates (#908) Bumps the dependencies group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `4.1.6` | `4.1.7` | | [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) | `3.3.0` | `3.4.0` | | [docker/build-push-action](https://github.com/docker/build-push-action) | `5.3.0` | `6.3.0` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.25.6` | `3.25.11` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `4.3.3` | `4.3.4` | | [checkmarx/kics-github-action](https://github.com/checkmarx/kics-github-action) | `2.0.0` | `2.1.1` | | [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) | `5.5.2` | `5.5.3` | | [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) | `0.21.0` | `0.23.0` | Updates `actions/checkout` from 4.1.6 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332) Updates `docker/setup-buildx-action` from 3.3.0 to 3.4.0 - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/d70bba72b1f3fd22344832f00baa16ece964efeb...4fd812986e6c8c2a69e18311145f9371337f27d4) Updates `docker/build-push-action` from 5.3.0 to 6.3.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/2cdde995de11925a030ce8070c3d77a52ffcf1c0...1a162644f9a7e87d8f4b053101d1d9a712edc18c) Updates `github/codeql-action` from 3.25.6 to 3.25.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...b611370bb5703a7efb587f9d136a52ea24c5c38c) Updates `actions/upload-artifact` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b) Updates `checkmarx/kics-github-action` from 2.0.0 to 2.1.1 - [Release notes](https://github.com/checkmarx/kics-github-action/releases) - [Commits](https://github.com/checkmarx/kics-github-action/compare/d1b692d84c536f4e8696954ce7aab6818f95f5bc...252e73959bd4809a14863cbfbb42d7a90d5a4860) Updates `amannn/action-semantic-pull-request` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/amannn/action-semantic-pull-request/releases) - [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/main/CHANGELOG.md) - [Commits](https://github.com/amannn/action-semantic-pull-request/compare/cfb60706e18bc85e8aec535e3c577abe8f70378e...0723387faaf9b38adef4775cd42cfd5155ed6017) Updates `aquasecurity/trivy-action` from 0.21.0 to 0.23.0 - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](https://github.com/aquasecurity/trivy-action/compare/fd25fed6972e341ff0007ddb61f77e88103953c2...7c2007bcb556501da015201bcba5aa14069b74e2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: checkmarx/kics-github-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: amannn/action-semantic-pull-request dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 6 +++--- .github/workflows/checks.yml | 4 ++-- .github/workflows/codeql.yml | 8 ++++---- .github/workflows/dependencies.yaml | 4 ++-- .github/workflows/kics.yml | 6 +++--- .github/workflows/pullRequest-lint.yaml | 2 +- .github/workflows/release-release_candidate.yml | 6 +++--- .github/workflows/release.yml | 8 ++++---- .github/workflows/release_candidate.yml | 6 +++--- .github/workflows/trivy-main.yml | 12 ++++++------ .github/workflows/trivy.yml | 12 ++++++------ 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9d54e513..949dfca27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 @@ -70,7 +70,7 @@ jobs: run: yarn test:ci - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -89,7 +89,7 @@ jobs: type=raw,value=${{ github.sha }} - name: Build and push Docker image - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: context: . file: .conf/Dockerfile.prebuilt diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 37b54afec..ef9f70af8 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -31,10 +31,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: node-version: 20 registry-url: https://registry.npmjs.org/ diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 31046b433..2aa6d64d2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -71,11 +71,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v2.227 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -89,7 +89,7 @@ jobs: # Automates dependency installation for Python, Ruby, and JavaScript, optimizing the CodeQL analysis setup. # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # v2.227 + uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -102,6 +102,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v2.227 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227 with: category: '/language:${{matrix.language}}' diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 62f0faba1..14c53e9e5 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -38,7 +38,7 @@ jobs: java-version: '17' - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Generate Dependencies file run: java -jar ./scripts/download/org.eclipse.dash.licenses-1.1.1.jar yarn.lock -project automotive.tractusx -summary DEPENDENCIES || true @@ -65,7 +65,7 @@ jobs: if: steps.dependencies-changed.outputs.changed == 'true' - name: Upload DEPENDENCIES file - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: path: DEPENDENCIES if: steps.dependencies-changed.outputs.changed == 'true' diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 5d959db8a..2cbdea938 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -42,10 +42,10 @@ jobs: security-events: write steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: KICS scan - uses: checkmarx/kics-github-action@d1b692d84c536f4e8696954ce7aab6818f95f5bc # v2.0.0 + uses: checkmarx/kics-github-action@252e73959bd4809a14863cbfbb42d7a90d5a4860 # v2.1.1 with: # Scanning directory . path: '.' @@ -67,6 +67,6 @@ jobs: # Upload findings to GitHub Advanced Security Dashboard - name: Upload SARIF file for GitHub Advanced Security Dashboard if: always() - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: sarif_file: kicsResults/results.sarif diff --git a/.github/workflows/pullRequest-lint.yaml b/.github/workflows/pullRequest-lint.yaml index ad251299f..af0a3c3ae 100644 --- a/.github/workflows/pullRequest-lint.yaml +++ b/.github/workflows/pullRequest-lint.yaml @@ -31,7 +31,7 @@ jobs: name: Validate PR title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # v5.5.2 + - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3 id: lint_pr_title env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index 2bb68643f..8d8ea0a5f 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 @@ -86,7 +86,7 @@ jobs: run: yarn test:ci - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -111,7 +111,7 @@ jobs: type=semver,pattern=v{{major}}.{{minor}} - name: Build and push Docker image - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: context: . file: .conf/Dockerfile.prebuilt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 669ce9015..d9be363cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 @@ -87,7 +87,7 @@ jobs: run: yarn test:ci - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -112,7 +112,7 @@ jobs: type=semver,pattern=v{{major}}.{{minor}} - name: Build and push Docker image - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: context: . file: .conf/Dockerfile.prebuilt @@ -140,7 +140,7 @@ jobs: run: echo "RELEASE_VERSION=${{ env.REF_NAME }}" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Check for hotfix version id: hf-check diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index e9b71775b..a3804dde7 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Node uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 @@ -67,7 +67,7 @@ jobs: run: yarn test:ci - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -86,7 +86,7 @@ jobs: type=raw,value=${{ github.sha }} - name: Build and push Docker image - uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: context: . file: .conf/Dockerfile.prebuilt diff --git a/.github/workflows/trivy-main.yml b/.github/workflows/trivy-main.yml index c6a3955cc..5b55d3abf 100644 --- a/.github/workflows/trivy-main.yml +++ b/.github/workflows/trivy-main.yml @@ -51,10 +51,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 + uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0 with: scan-type: 'config' hide-progress: false @@ -63,7 +63,7 @@ jobs: vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 if: always() with: sarif_file: 'trivy-results1.sarif' @@ -77,7 +77,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # It's also possible to scan your private registry with Trivy's built-in image scan. # All you have to do is set ENV vars. @@ -86,7 +86,7 @@ jobs: # For public images, no ENV vars must be set. - name: Run Trivy vulnerability scanner if: always() - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 + uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0 with: # Path to Docker image image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:main' @@ -96,6 +96,6 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab if: always() - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: sarif_file: 'trivy-results2.sarif' diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 305d85800..d80163843 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -51,10 +51,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 + uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0 with: scan-type: 'config' hide-progress: false @@ -63,7 +63,7 @@ jobs: vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 if: always() with: sarif_file: 'trivy-results1.sarif' @@ -77,7 +77,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # It's also possible to scan your private registry with Trivy's built-in image scan. # All you have to do is set ENV vars. @@ -86,7 +86,7 @@ jobs: # For public images, no ENV vars must be set. - name: Run Trivy vulnerability scanner if: always() - uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0 + uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0 with: # Path to Docker image image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest' @@ -96,6 +96,6 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab if: always() - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: sarif_file: 'trivy-results2.sarif' From 8c6da7a47864e63b9f0454dca90614b497a3691b Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:51:33 +0530 Subject: [PATCH 9/9] fix(read me): enhance cread me file and add coding guidelines (#916) --- README.md | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/README.md b/README.md index 940045976..13d07e386 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,82 @@ yarn start Note: if you'd like to run the complete frontend application, follow the `Run frontend on localhost.md` guide available within the technical documentation of [portal-assets](https://github.com/eclipse-tractusx/portal-assets). +## Coding guidelines + +### Naming conventions for custom components + +Folder, File and component name to be in Camel Case\ +Scss files to be in Camel Case\ +RTK folders and files to be in small case + +### Import Components + +Always use components from [portal-shared-components library](https://github.com/eclipse-tractusx/portal-shared-components)\ +Do not import components directly from mui + +### Allowed imports from mui + +Box, useMediaQuery + +### Guidelines for consistent styling and theming + +Do not use useTheme from mui\ +Use theme from the [portal-shared-components library](https://github.com/eclipse-tractusx/portal-shared-components)\ +Use custom class names to override default or mui styles\ +Use appropriate `Typography` for the text and do not override font family of it + +### Create new text locale file + +Create a new file in the respective `language` folder with the module name in `assets/locales`\ +Use small cases for the `json` file\ + +ex: notifications.json + +### Add new text values in locale file + +Keys inside `json` file should be in Camel Case\ + +ex: notificationTitle + +### Read text values from locale file + +Import `useTranslation` from `react-i18next`\ +Declare translation object using the specific module\ + +``` +const { t } = useTranslation('notification') +``` + +Empty in the usetransation() will pull the data from `main.json` file + +``` +const { t } = useTranslation() +``` + +Usage ex: + +``` +t('header.title') +``` + +### Code formatting and linting + +Before committing your changes, + +s1. Remove all the disabled linter rules from `.eslintrc.json` and run `yarn lint` on your newly created file or folder to see the results 2. Disable linter rules is allowd only for the exceptional cases. Code comments with proper reason is mandatory + +### Handling of API responses and error states + +1. All the api call has to be addressed with a throbber in the UI +2. Empty response to be shown with a proper message to the user +3. API error has to be shown in a component with appropriate action\ + a. Error code 4xx needs to show error component with message\ + b. Error code 5xx should allow user to refetch the api once again. + +### State Managment + +URL path names to be in Camel Case + ## Known Issues and Limitations See [Known Knowns](/CHANGELOG.md#known-knowns).