From 5ae2c1854ca2639fdfb06807125069821f3b53ee Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 26 Jan 2024 15:31:12 +0100 Subject: [PATCH 1/5] chore: remove consortia dev env from default env settings for portal-backend, centralidp, bpdm, semantics and miw --- public/index.html | 2 +- scripts/inject-dynamic-env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 4e1df8813..97a5814fe 100644 --- a/public/index.html +++ b/public/index.html @@ -30,7 +30,7 @@
diff --git a/scripts/inject-dynamic-env.sh b/scripts/inject-dynamic-env.sh index 92cf0c55b..23524b3c5 100644 --- a/scripts/inject-dynamic-env.sh +++ b/scripts/inject-dynamic-env.sh @@ -20,7 +20,7 @@ ############################################################### custom_env_vars='{PORTAL_ASSETS_URL:"'$PORTAL_ASSETS_URL'",PORTAL_BACKEND_URL:"'$PORTAL_BACKEND_URL'",CENTRALIDP_URL:"'$CENTRALIDP_URL'",BPDM_API_URL:"'$BPDM_API_URL'",SEMANTICS_URL:"'$SEMANTICS_URL'",MANAGED_IDENTITY_WALLETS_NEW_URL:"'$MANAGED_IDENTITY_WALLETS_NEW_URL'"}' -custom_env_vars_anchor='{PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.dev.demo.catena-x.net",CENTRALIDP_URL:"https://centralidp.dev.demo.catena-x.net/auth",BPDM_API_URL:"https://business-partners.dev.demo.catena-x.net/pool/api",SEMANTICS_URL:"https://semantics.dev.demo.catena-x.net",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.dev.demo.catena-x.net"}' +custom_env_vars_anchor='{PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",BPDM_API_URL:"https://business-partners.example.org/pool/api",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org"}' index_html_reference=`cat /usr/share/nginx/html/index.html.reference` index_html=${index_html_reference//$custom_env_vars_anchor/$custom_env_vars} echo "$index_html" > /usr/share/nginx/html/index.html From 84193d203146aff867493d749ccf883a140fa3ba Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 26 Jan 2024 17:05:23 +0100 Subject: [PATCH 2/5] chore: change docs links to new directory structure introduced with https://github.com/eclipse-tractusx/portal-assets/pull/226 --- src/assets/locales/de/main.json | 4 ++-- src/assets/locales/de/notification.json | 2 +- src/assets/locales/en/main.json | 4 ++-- src/assets/locales/en/notification.json | 2 +- src/components/overlays/ActivateServiceSubscription/index.tsx | 2 +- src/components/overlays/AddMultipleUser/index.tsx | 2 +- src/components/overlays/AddTechnicalUser/index.tsx | 2 +- src/components/pages/AppOverview/AddRolesOverlay.tsx | 2 +- .../AppSubscription/ActivateSubscriptionOverlay/index.tsx | 4 ++-- src/components/pages/EdcConnector/index.tsx | 2 +- .../shared/basic/ReleaseProcess/AppMarketCard/index.tsx | 2 +- src/components/shared/basic/ReleaseProcess/AppPage/index.tsx | 2 +- src/components/shared/basic/ReleaseProcess/BetaTest/index.tsx | 2 +- .../shared/basic/ReleaseProcess/ContractAndConsent/index.tsx | 2 +- .../shared/basic/ReleaseProcess/OfferCard/index.tsx | 2 +- .../basic/ReleaseProcess/OfferContractAndConsent/index.tsx | 2 +- .../shared/basic/ReleaseProcess/OfferPage/index.tsx | 2 +- .../basic/ReleaseProcess/OfferTechnicalIntegration/index.tsx | 2 +- .../basic/ReleaseProcess/OfferValidateAndPublish/index.tsx | 2 +- .../basic/ReleaseProcess/TechnicalIntegration/index.tsx | 4 ++-- .../shared/basic/ReleaseProcess/ValidateAndPublish/index.tsx | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index ef2f61f62..1ba519014 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -522,9 +522,9 @@ "title": "Below you can find the relevant details regarding all those values", "centralAuth": "* central auth url: https:{{env}}/realms/CX-Central/protocol/openid-connect/token", "clientId": "* client id: client id of your existing or newly created tech user - details how to: ", - "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=docs%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "clientSecret": "* client secret: client id of your existing or newly created tech user - details how to: ", - "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=docs%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "authorityBpn": "* authority bpn: {{bpn}}", "miwUrl": "* miw url: https:{{managedIdentityWalletApiBase}}", "clickhere": "click here" diff --git a/src/assets/locales/de/notification.json b/src/assets/locales/de/notification.json index 74b3453eb..f2c7bd6c2 100644 --- a/src/assets/locales/de/notification.json +++ b/src/assets/locales/de/notification.json @@ -158,6 +158,6 @@ "title": "Notifications", "subtitle": "Hier erhalten Sie relevante Neuigkeiten zu Catena-X, veröffentlichten Apps und Diensten sowie den von Ihnen genutzten Apps und Diensten. Darüber hinaus werden Änderungen an Ihrem Benutzerkonto, z. B. neu zugewiesene oder entzogene Rollen, geteilt.", "linkText": "Help", - "link": "https://portal.dev.demo.catena-x.net/documentation/?path=docs%2F06.+Notifications" + "link": "https://portal.dev.demo.catena-x.net/documentation/?path=user%2F06.+Notifications" } } diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 32b230eeb..635cc6c57 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -523,9 +523,9 @@ "title": "Below you can find the relevant details regarding all those values", "centralAuth": "* central auth url: https:{{env}}/realms/CX-Central/protocol/openid-connect/token", "clientId": "* client id: client id of your existing or newly created tech user - details how to: ", - "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=docs%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "clientSecret": "* client secret: client id of your existing or newly created tech user - details how to: ", - "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=docs%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "authorityBpn": "* authority bpn: {{bpn}}", "miwUrl": "* miw url: https:{{managedIdentityWalletApiBase}}", "clickhere": "click here" diff --git a/src/assets/locales/en/notification.json b/src/assets/locales/en/notification.json index 55ccd2796..1e032e494 100644 --- a/src/assets/locales/en/notification.json +++ b/src/assets/locales/en/notification.json @@ -158,6 +158,6 @@ "title": "Notifications", "subtitle": "Here you will receive relevant news about Catena-X, published apps and services and the apps and services you use. In addition, changes to your user account, e.g. newly assigned or revoked roles.", "linkText": "Help", - "link": "https://portal.dev.demo.catena-x.net/documentation/?path=docs%2F06.+Notifications" + "link": "https://portal.dev.demo.catena-x.net/documentation/?path=user%2F06.+Notifications" } } diff --git a/src/components/overlays/ActivateServiceSubscription/index.tsx b/src/components/overlays/ActivateServiceSubscription/index.tsx index fccb08344..616e813b7 100644 --- a/src/components/overlays/ActivateServiceSubscription/index.tsx +++ b/src/components/overlays/ActivateServiceSubscription/index.tsx @@ -42,7 +42,7 @@ import { import { Link } from 'react-router-dom' const ProfileHelpURL = - '/documentation/?path=docs%2F05.+Service%28s%29%2F03.+Service+Subscription%2F01.+Service+Subscription.md' + '/documentation/?path=user%2F05.+Service%28s%29%2F03.+Service+Subscription%2F01.+Service+Subscription.md' export default function ActivateserviceSubscription({ offerId, diff --git a/src/components/overlays/AddMultipleUser/index.tsx b/src/components/overlays/AddMultipleUser/index.tsx index e5df429c4..a9e03eaa7 100644 --- a/src/components/overlays/AddMultipleUser/index.tsx +++ b/src/components/overlays/AddMultipleUser/index.tsx @@ -68,7 +68,7 @@ import { error } from 'services/NotifyService' import ArrowForwardIcon from '@mui/icons-material/ArrowForward' const HelpPageURL = - '/documentation/?path=docs%2F03.+User+Management%2F01.+User+Account%2F04.+Create+new+user+account+%28bulk%29.md' + '/documentation/?path=user%2F03.+User+Management%2F01.+User+Account%2F04.+Create+new+user+account+%28bulk%29.md' export default function AddMultipleUser() { const dispatch = useDispatch() diff --git a/src/components/overlays/AddTechnicalUser/index.tsx b/src/components/overlays/AddTechnicalUser/index.tsx index 36a350c4f..61f44c540 100644 --- a/src/components/overlays/AddTechnicalUser/index.tsx +++ b/src/components/overlays/AddTechnicalUser/index.tsx @@ -168,7 +168,7 @@ export const AddTechnicalUser = () => { /> diff --git a/src/components/pages/AppOverview/AddRolesOverlay.tsx b/src/components/pages/AppOverview/AddRolesOverlay.tsx index b488e4bc5..b225ee67e 100644 --- a/src/components/pages/AppOverview/AddRolesOverlay.tsx +++ b/src/components/pages/AppOverview/AddRolesOverlay.tsx @@ -215,7 +215,7 @@ const AddRolesOverlay = ({ variant="contained" onClick={() => window.open( - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process%2F04.Technical+Integration.md', + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process%2F04.+Technical+Integration.md', '_blank', 'noopener' ) diff --git a/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx b/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx index 4b89c99f4..10cab86c8 100644 --- a/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx +++ b/src/components/pages/AppSubscription/ActivateSubscriptionOverlay/index.tsx @@ -48,9 +48,9 @@ import { Link } from 'react-router-dom' import { closeOverlay } from 'features/control/overlay' const TentantHelpURL = - '/documentation/?path=docs%2F04.App%28s%29%2F05.+App-Subscription%2F04.+Subscription+Activation%28App+Provider%29.md' + '/documentation/?path=user%2F04.App%28s%29%2F05.+App-Subscription%2F04.+Subscription+Activation%28App+Provider%29.md' const ProfileHelpURL = - '/documentation/?path=docs%2F04.App%28s%29%2F05.+App-Subscription%2F04.+Subscription+Activation%28App+Provider%29.md' + '/documentation/?path=user%2F04.App%28s%29%2F05.+App-Subscription%2F04.+Subscription+Activation%28App+Provider%29.md' interface ActivateSubscriptionProps { openDialog: boolean diff --git a/src/components/pages/EdcConnector/index.tsx b/src/components/pages/EdcConnector/index.tsx index f897c10a0..ece82d531 100644 --- a/src/components/pages/EdcConnector/index.tsx +++ b/src/components/pages/EdcConnector/index.tsx @@ -244,7 +244,7 @@ const EdcConnector = () => { const onHelpButtonClicked = () => { const url = - '/documentation/?path=docs%2F02.+Technical+Integration%2F01.+Connector+Registration%2F02.+Connector+Registration.md' + '/documentation/?path=user%2F02.+Technical+Integration%2F01.+Connector+Registration%2F02.+Connector+Registration.md' window.open(url, '_blank') } diff --git a/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx b/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx index 1f2927963..1f15cc734 100644 --- a/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx @@ -854,7 +854,7 @@ export default function AppMarketCard() { isValid={isValid} loader={loading} helpUrl={ - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process' + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process' } /> 0} loader={loading} helpUrl={ - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process' + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process' } /> window.open( - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process', + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process', '_blank' ) } diff --git a/src/components/shared/basic/ReleaseProcess/ContractAndConsent/index.tsx b/src/components/shared/basic/ReleaseProcess/ContractAndConsent/index.tsx index 67d9b025e..770dbbf4c 100644 --- a/src/components/shared/basic/ReleaseProcess/ContractAndConsent/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/ContractAndConsent/index.tsx @@ -95,7 +95,7 @@ export default function ContractAndConsent() { getDocumentById={getDocumentById} fetchFrameDocumentById={fetchFrameDocumentById} helpUrl={ - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process' + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process' } /> diff --git a/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx index ea53ff70a..77529464d 100644 --- a/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx @@ -542,7 +542,7 @@ export default function OfferCard() { isValid={isValid} loader={loading} helpUrl={ - '/documentation/?path=docs%2F05.+Service%28s%29%2F02.+Service+Release+Process' + '/documentation/?path=user%2F05.+Service%28s%29%2F02.+Service+Release+Process' } /> diff --git a/src/components/shared/basic/ReleaseProcess/OfferContractAndConsent/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferContractAndConsent/index.tsx index 1745da97a..5d0b3349b 100644 --- a/src/components/shared/basic/ReleaseProcess/OfferContractAndConsent/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/OfferContractAndConsent/index.tsx @@ -79,7 +79,7 @@ export default function OfferContractAndConsent() { getDocumentById={getDocumentById} fetchFrameDocumentById={fetchFrameDocumentById} helpUrl={ - '/documentation/?path=docs%2F05.+Service%28s%29%2F02.+Service+Release+Process' + '/documentation/?path=user%2F05.+Service%28s%29%2F02.+Service+Release+Process' } imageFieldLabel={ <> diff --git a/src/components/shared/basic/ReleaseProcess/OfferPage/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferPage/index.tsx index 40ed74684..8b630e127 100644 --- a/src/components/shared/basic/ReleaseProcess/OfferPage/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/OfferPage/index.tsx @@ -420,7 +420,7 @@ export default function OfferPage({ isValid={isValid} loader={loading} helpUrl={ - '/documentation/?path=docs%2F05.+Service%28s%29%2F02.+Service+Release+Process' + '/documentation/?path=user%2F05.+Service%28s%29%2F02.+Service+Release+Process' } /> diff --git a/src/components/shared/basic/ReleaseProcess/OfferTechnicalIntegration/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferTechnicalIntegration/index.tsx index d7f2b9fcc..4805cc4e8 100644 --- a/src/components/shared/basic/ReleaseProcess/OfferTechnicalIntegration/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/OfferTechnicalIntegration/index.tsx @@ -206,7 +206,7 @@ export default function OfferTechnicalIntegration() { isValid={serviceTechUserProfiles?.length > 0} loader={loading} helpUrl={ - '/documentation/?path=docs%2F05.+Service%28s%29%2F02.+Service+Release+Process' + '/documentation/?path=user%2F05.+Service%28s%29%2F02.+Service+Release+Process' } /> diff --git a/src/components/shared/basic/ReleaseProcess/OfferValidateAndPublish/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferValidateAndPublish/index.tsx index f8a9c7c16..5671c193b 100644 --- a/src/components/shared/basic/ReleaseProcess/OfferValidateAndPublish/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/OfferValidateAndPublish/index.tsx @@ -98,7 +98,7 @@ export default function OfferValidateAndPublish({ values={defaultValues} serviceTypes={getServiceTypes()} helpUrl={ - '/documentation/?path=docs%2F05.+Service%28s%29%2F02.+Service+Release+Process' + '/documentation/?path=user%2F05.+Service%28s%29%2F02.+Service+Release+Process' } conformityDocument={t('step4.conformityDocument')} /> diff --git a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx index 47fccda4b..005b97906 100644 --- a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx @@ -396,7 +396,7 @@ export default function TechnicalIntegration() { color="secondary" onClick={() => window.open( - 'https://portal.dev.demo.catena-x.net/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process%2F04.Technical+Integration.md', + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process%2F04.+Technical+Integration.md', '_blank', 'noopener' ) @@ -673,7 +673,7 @@ export default function TechnicalIntegration() { description: t('content.apprelease.appReleaseForm.error.message'), }} helpUrl={ - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process' + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process' } isValid={data && data?.length > 0 && techUserProfiles?.length > 0} loader={loading} diff --git a/src/components/shared/basic/ReleaseProcess/ValidateAndPublish/index.tsx b/src/components/shared/basic/ReleaseProcess/ValidateAndPublish/index.tsx index 9bd63d14c..6c7338271 100644 --- a/src/components/shared/basic/ReleaseProcess/ValidateAndPublish/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/ValidateAndPublish/index.tsx @@ -126,7 +126,7 @@ export default function ValidateAndPublish({ values={defaultValues} rolesData={data} helpUrl={ - '/documentation/?path=docs%2F04.+App%28s%29%2F02.+App+Release+Process' + '/documentation/?path=user%2F04.+App%28s%29%2F02.+App+Release+Process' } /> From bb4239e8fb36b9752742b03e72403efd92d5f37c Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 29 Jan 2024 12:46:05 +0100 Subject: [PATCH 3/5] chore: remove references for dev and int consortia env in code --- src/assets/locales/de/main.json | 4 ++-- src/assets/locales/de/notification.json | 2 +- src/assets/locales/en/main.json | 4 ++-- src/assets/locales/en/notification.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 1ba519014..4ed233fad 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -522,9 +522,9 @@ "title": "Below you can find the relevant details regarding all those values", "centralAuth": "* central auth url: https:{{env}}/realms/CX-Central/protocol/openid-connect/token", "clientId": "* client id: client id of your existing or newly created tech user - details how to: ", - "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientIdLink": "/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "clientSecret": "* client secret: client id of your existing or newly created tech user - details how to: ", - "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientSecretLink": "/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "authorityBpn": "* authority bpn: {{bpn}}", "miwUrl": "* miw url: https:{{managedIdentityWalletApiBase}}", "clickhere": "click here" diff --git a/src/assets/locales/de/notification.json b/src/assets/locales/de/notification.json index f2c7bd6c2..2d6aeeae9 100644 --- a/src/assets/locales/de/notification.json +++ b/src/assets/locales/de/notification.json @@ -158,6 +158,6 @@ "title": "Notifications", "subtitle": "Hier erhalten Sie relevante Neuigkeiten zu Catena-X, veröffentlichten Apps und Diensten sowie den von Ihnen genutzten Apps und Diensten. Darüber hinaus werden Änderungen an Ihrem Benutzerkonto, z. B. neu zugewiesene oder entzogene Rollen, geteilt.", "linkText": "Help", - "link": "https://portal.dev.demo.catena-x.net/documentation/?path=user%2F06.+Notifications" + "link": "/documentation/?path=user%2F06.+Notifications" } } diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 635cc6c57..27604f2a3 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -523,9 +523,9 @@ "title": "Below you can find the relevant details regarding all those values", "centralAuth": "* central auth url: https:{{env}}/realms/CX-Central/protocol/openid-connect/token", "clientId": "* client id: client id of your existing or newly created tech user - details how to: ", - "clientIdLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientIdLink": "/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "clientSecret": "* client secret: client id of your existing or newly created tech user - details how to: ", - "clientSecretLink": "https://portal.int.demo.catena-x.net/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", + "clientSecretLink": "/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User%2F02.+Create+Technical+User.md", "authorityBpn": "* authority bpn: {{bpn}}", "miwUrl": "* miw url: https:{{managedIdentityWalletApiBase}}", "clickhere": "click here" diff --git a/src/assets/locales/en/notification.json b/src/assets/locales/en/notification.json index 1e032e494..67044f331 100644 --- a/src/assets/locales/en/notification.json +++ b/src/assets/locales/en/notification.json @@ -158,6 +158,6 @@ "title": "Notifications", "subtitle": "Here you will receive relevant news about Catena-X, published apps and services and the apps and services you use. In addition, changes to your user account, e.g. newly assigned or revoked roles.", "linkText": "Help", - "link": "https://portal.dev.demo.catena-x.net/documentation/?path=user%2F06.+Notifications" + "link": "/documentation/?path=user%2F06.+Notifications" } } From d10a4e83f3fc54dac33c4782da502ba8b2dd5416 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 29 Jan 2024 13:19:47 +0100 Subject: [PATCH 4/5] chore: remove references to consortia from test --- src/types/Patterns.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/types/Patterns.test.ts b/src/types/Patterns.test.ts index af2d183f3..9396f2625 100644 --- a/src/types/Patterns.test.ts +++ b/src/types/Patterns.test.ts @@ -72,7 +72,7 @@ const TESTDATA = { 'www.bmw.de', 'BMW.COM', '4chan.org', - 'portal.dev.demo.catena-x.net', + 'portal.env.example.catena-x.net', 'www.5555.site', //valid? '1.2.3', //valid? ], @@ -97,8 +97,8 @@ const TESTDATA = { 'https://www.bmw.com/index.html', 'https://hostname.domain:12345', 'https://hostname.domain:12345/endwith/slash/', - 'https://portal.dev.demo.catena-x.net/assets/swagger/index.html', - 'https://portal.dev.demo.catena-x.net/assets/swagger/index.html?param=13&arg=value', + 'https://portal.env.example.catena-x.net/assets/swagger/index.html', + 'https://portal.env.example.catena-x.net/assets/swagger/index.html?param=13&arg=value', ], invalid: [ '', From 758ddd872d3317164cd16eac9c56a45f132f0e4b Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 29 Jan 2024 15:12:36 +0100 Subject: [PATCH 5/5] chore: update pr template --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6c7aaf31e..542f515b6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -14,7 +14,7 @@ Link to Github issue. Please delete options that are not relevant. -- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/portal-assets/blob/main/developer/Technical%20Documentation/Dev%20Process/How%20to%20contribute.md#commit-and-pr-guidelines) +- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/portal-assets/blob/main/docs/developer/Technical%20Documentation/Dev%20Process/How%20to%20contribute.md#commit-and-pr-guidelines) - [ ] I have performed [IP checks](https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04#checking-libraries-using-the-eclipse-dash-license-tool) for added or updated 3rd party libraries - [ ] I have created and linked IP issues or requested their creation by a committer - [ ] I have performed a self-review of my own code