Skip to content

Commit

Permalink
feat(header): move company roles into enum (#1213)
Browse files Browse the repository at this point in the history
  • Loading branch information
lavanya-bmw authored Oct 16, 2024
1 parent 870a5f6 commit 361aea0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand All @@ -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
Expand Down
13 changes: 10 additions & 3 deletions src/components/shared/frame/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ({
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions src/features/admin/userApiSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 361aea0

Please sign in to comment.