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.

Sign up for GitHub

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

feat(retrigger-processes): align endurl mapping keys with backend #1268

Merged
merged 5 commits into from
Oct 24, 2024
Merged

feat(retrigger-processes): align endurl mapping keys with backend #1268

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c7f141
fix(application request): fixed endurl issue in the retriggering of c…
manojava-gk Oct 23, 2024
8fabe89
fix(chor): add pr details
manojava-gk Oct 23, 2024
1066b77
fix(chor): update dependency file
manojava-gk Oct 23, 2024
3ce8222
fix(chor): move notes to the unlreased section
manojava-gk Oct 23, 2024
7ba0e13
Merge branch 'main' into fix/issues-1266-clearinghouse
manojava-gk Oct 24, 2024
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
- aligned notification page search field color with other pages [#1178](https://github.com/eclipse-tractusx/portal-frontend/issues/1178)
- **Home**
- disabled My Apps button for users without permission [#1165](https://github.com/eclipse-tractusx/portal-frontend/issues/1165)
- **Application Request**
- fixed endurl issue in the retriggering of clearing house step [#1268] (https://github.com/eclipse-tractusx/portal-frontend/pull/1268)
evegufy marked this conversation as resolved.
Show resolved Hide resolved

## 2.3.0-alpha.2

Expand Down
4 changes: 2 additions & 2 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,9 @@ npm/npmjs/-/qs/6.13.0, BSD-3-Clause, approved, clearlydefined
npm/npmjs/-/querystringify/2.2.0, MIT, approved, clearlydefined
npm/npmjs/-/queue-microtask/1.2.3, MIT, approved, clearlydefined
npm/npmjs/-/react-dom/18.3.1, MIT, approved, clearlydefined
npm/npmjs/-/react-dropzone/14.2.3, MIT, approved, clearlydefined
npm/npmjs/-/react-dropzone/14.2.3, MIT, approved, #16858
npm/npmjs/-/react-fast-compare/3.2.2, MIT, approved, clearlydefined
npm/npmjs/-/react-hook-form/7.53.0, MIT, approved, clearlydefined
npm/npmjs/-/react-hook-form/7.53.0, MIT, approved, #16857
npm/npmjs/-/react-i18next/14.1.3, MIT AND Apache-2.0, approved, #13870
npm/npmjs/-/react-is/16.13.1, MIT, approved, clearlydefined
npm/npmjs/-/react-is/17.0.2, MIT, approved, clearlydefined
Expand Down
12 changes: 4 additions & 8 deletions src/components/shared/basic/ProgressVerificationButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,10 @@ export const ProgressVerificationButton = ({

const getButtonTitle = () => {
if (
(props.retriggerableProcessSteps &&
props.retriggerableProcessSteps.indexOf(
RetriggerableProcessSteps.TRIGGER_OVERRIDE_CLEARING_HOUSE
) > -1) ??
(props.retriggerableProcessSteps &&
props.retriggerableProcessSteps.indexOf(
RetriggerableProcessSteps.OVERRIDE_BUSINESS_PARTNER_NUMBER
) > -1)
props.retriggerableProcessSteps &&
props.retriggerableProcessSteps.indexOf(
RetriggerableProcessSteps.MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE
) > -1
) {
return t('content.checklistOverlay.buttonOverwrite')
}
Expand Down
13 changes: 8 additions & 5 deletions src/features/admin/applicationRequestApiSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,28 @@ export const EndUrlMap: Map = {
RETRIGGER_IDENTITY_WALLET: 'trigger-identity-wallet',
RETRIGGER_CREATE_DIM_WALLET: 'retrigger-create-dim-wallet',
RETRIGGER_CLEARING_HOUSE: 'retrigger-clearinghouse',
TRIGGER_OVERRIDE_CLEARING_HOUSE: 'override-clearinghouse',
MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE: 'override-clearinghouse',
RETRIGGER_SELF_DESCRIPTION_LP: 'trigger-self-description',
RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH:
'trigger-bpn?processTypeId=RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH',
RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL:
'trigger-bpn?processTypeId=RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL',
OVERRIDE_BUSINESS_PARTNER_NUMBER:
'trigger-bpn?processTypeId=OVERRIDE_BUSINESS_PARTNER_NUMBER',
RETRIGGER_TRANSMIT_DID_BPN: 'retrigger-transmit-bpn-did',
RETRIGGER_REQUEST_BPN_CREDENTIAL: 'retrigger-bpn-credential',
RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL: 'retrigger-membership-credential',
}

export enum RetriggerableProcessSteps {
RETRIGGER_IDENTITY_WALLET = 'RETRIGGER_IDENTITY_WALLET',
RETRIGGER_CREATE_DIM_WALLET = 'RETRIGGER_CREATE_DIM_WALLET',
RETRIGGER_CLEARING_HOUSE = 'RETRIGGER_CLEARING_HOUSE',
TRIGGER_OVERRIDE_CLEARING_HOUSE = 'TRIGGER_OVERRIDE_CLEARING_HOUSE',
MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE = 'MANUAL_TRIGGER_OVERRIDE_CLEARING_HOUSE',
RETRIGGER_SELF_DESCRIPTION_LP = 'RETRIGGER_SELF_DESCRIPTION_LP',
RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH = 'RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH',
RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL = 'RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL',
OVERRIDE_BUSINESS_PARTNER_NUMBER = 'OVERRIDE_BUSINESS_PARTNER_NUMBER',
RETRIGGER_TRANSMIT_DID_BPN = 'RETRIGGER_TRANSMIT_DID_BPN',
RETRIGGER_REQUEST_BPN_CREDENTIAL = 'RETRIGGER_REQUEST_BPN_CREDENTIAL',
RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL = 'RETRIGGER_REQUEST_MEMBERSHIP_CREDENTIAL',
}

export type ProgressButtonsType = {
Expand Down
Loading