diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b2ce1178..3edbe6366 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,9 @@ - **Service Subscriptions** - rename 'Configure' button to 'Activate' button [#1150](https://github.com/eclipse-tractusx/portal-frontend/pull/1150) + +- **Header** + - moved company roles into enum [#1213](https://github.com/eclipse-tractusx/portal-frontend/pull/1213) - **Application Request** - add separate end points for downloading company credential document and registration document [#1229](https://github.com/eclipse-tractusx/portal-frontend/pull/1229) - **Business Partner Invitation** @@ -35,6 +38,7 @@ ### Bugfixes - **Company Subscriptions** + - fixed wrong hyperlink and role requirement for technical user details in company subscription details [#1220](https://github.com/eclipse-tractusx/portal-frontend/pull/1220) ### Bugfixes diff --git a/src/components/shared/frame/Header/index.tsx b/src/components/shared/frame/Header/index.tsx index 559ead291..365ef2753 100644 --- a/src/components/shared/frame/Header/index.tsx +++ b/src/components/shared/frame/Header/index.tsx @@ -49,7 +49,10 @@ import RegistrationReviewOverlay from './RegistrationReviewOverlay' import './Header.scss' import RegistrationReviewContent from './RegistrationReviewOverlay/RegistrationReviewContent' import RegistrationDeclinedOverlay from './RegistrationDeclinedOverlay' -import { useFetchOwnCompanyDetailsQuery } from 'features/admin/userApiSlice' +import { + CompanyRoleEnum, + useFetchOwnCompanyDetailsQuery, +} from 'features/admin/userApiSlice' import { PAGES } from 'types/Constants' export const Header = ({ @@ -80,13 +83,17 @@ export const Header = ({ useEffect(() => { if (!(companyData && companyDetails)) return setSubmittedOverlayOpen( - !companyDetails?.companyRole.includes('OPERATOR') && + !companyDetails?.companyRole.includes(CompanyRoleEnum.OPERATOR) && companyData?.applicationStatus === ApplicationStatus.SUBMITTED ) }, [companyData, companyDetails]) useEffect(() => { - if (companyDetails?.companyRole.includes('ONBOARDING_SERVICE_PROVIDER')) { + if ( + companyDetails?.companyRole.includes( + CompanyRoleEnum.ONBOARDING_SERVICE_PROVIDER + ) + ) { setPages(user) } else { setPages( diff --git a/src/features/admin/userApiSlice.ts b/src/features/admin/userApiSlice.ts index ac8860bae..49fad955f 100644 --- a/src/features/admin/userApiSlice.ts +++ b/src/features/admin/userApiSlice.ts @@ -85,6 +85,8 @@ export type AdminData = { export enum CompanyRoleEnum { APP_PROVIDER = 'APP_PROVIDER', SERVICE_PROVIDER = 'SERVICE_PROVIDER', + ONBOARDING_SERVICE_PROVIDER = 'ONBOARDING_SERVICE_PROVIDER', + OPERATOR = 'OPERATOR', } export interface CompanyDetails {