Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove references to consortia envs #451

Merged
merged 5 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div id="app"></div>
<!-- Do NOT change 'ENV' without changing 'custom_env_vars_anchor' in scripts/inject-dynamic-env.sh as well -->
<script>
const ENV = {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"}
const ENV = {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"}
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion scripts/inject-dynamic-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/assets/locales/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "/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": "/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"
Expand Down
2 changes: 1 addition & 1 deletion src/assets/locales/de/notification.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "/documentation/?path=user%2F06.+Notifications"
}
}
4 changes: 2 additions & 2 deletions src/assets/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "/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": "/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"
Expand Down
2 changes: 1 addition & 1 deletion src/assets/locales/en/notification.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "/documentation/?path=user%2F06.+Notifications"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/components/overlays/AddMultipleUser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof store.dispatch>()
Expand Down
2 changes: 1 addition & 1 deletion src/components/overlays/AddTechnicalUser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const AddTechnicalUser = () => {
/>
<DialogContent>
<Link
to="/documentation/?path=docs%2F03.+User+Management%2F03.+Technical+User"
to="/documentation/?path=user%2F03.+User+Management%2F03.+Technical+User"
target="_blank"
>
<Typography variant="body2" className="helpText">
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/AppOverview/AddRolesOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/EdcConnector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
<PageSnackbar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ export default function AppPage() {
isValid={isValid && selectedPrivacyPolicies.length > 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'
}
/>
<PageSnackbar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default function BetaTest() {
sx={{ mr: 1 }}
onClick={() =>
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'
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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={
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
Expand Down Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
/>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/types/Patterns.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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?
],
Expand All @@ -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: [
'',
Expand Down
Loading