diff --git a/CHANGELOG.md b/CHANGELOG.md index 473c78708..c9322f3a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +### Feature + +- Customer Detail Data Overlay + - implement new UI design for customer detail data overlay + ## 2.2.0-RC1 ### Change diff --git a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx index 3834eda6f..7e5e695f9 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx +++ b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx @@ -71,7 +71,7 @@ export const getTitle = ( status: getStatus(), }} > - + {t('content.admin.registration-requests.overlay.tab2SubTitle')} @@ -85,7 +85,7 @@ export const getIntro = ( selectedCompany: CompanyDetail, t: typeof i18next.t ) => { - if (activeTab === 1) { + if (activeTab === 2) { return ( 0 ? ( <> {company.documents.map( - (contract: { documentId: string; documentType: string }) => ( + (contract: { + documentId: string + documentType: string + documentSize?: number + }) => ( - { - void downloadDocument( - contract.documentId, - contract.documentType - ) - }} - enableDeleteIcon={false} - /> +
+ { + void downloadDocument( + contract.documentId, + contract.documentType + ) + }} + enableDeleteIcon={false} + /> +
) )} @@ -244,7 +250,7 @@ const CompanyDetailOverlay = ({ color="label" label={getLocaleStr(role.companyRole)} sx={{ - marginRight: '8px', + marginRight: '10px', }} /> ) @@ -303,12 +309,16 @@ const CompanyDetailOverlay = ({ id={`simple-tab-${activeTab}`} aria-controls={`simple-tabpanel-${activeTab}`} /> +
+ {' '} +
+
+ <> + {selectedRequest && !activeTab && ( + + )} + @@ -346,34 +366,53 @@ const CompanyDetailOverlay = ({ ) : ( - - + + {t( 'content.admin.registration-requests.overlay.companydatatitle' )} - items={companyData} - /> + + {companyData?.map((detail) => ( +
+ + {detail.key} + +
+ + {detail.value} + +
+ ))}
- - + + {t('content.admin.registration-requests.overlay.docs')} + + +
+ {documentData?.map((detail) => ( +
{detail.value}
+ ))} +
+
+ + + {t('content.admin.registration-requests.overlay.roles')} + +
{companyRoleData?.[0]?.value}
- + {selectedRequest && (
void + isProgressOnly?: boolean } export const StatusProgress = ({ @@ -46,6 +47,7 @@ export const StatusProgress = ({ trans, type = true, onConfirmationCancel, + isProgressOnly = false, }: StatusProgressProps) => { const t = trans const groupedItems = _.chain(application.applicationChecklist) @@ -64,26 +66,36 @@ export const StatusProgress = ({ statusText: string ) => { return ( -
- - - {statusText} - -
+ <> + {isProgressOnly ? ( + + ) : ( +
+ + + {statusText} + +
+ )} + ) } diff --git a/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/style.scss b/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/style.scss index c2caa0221..d3f8c84de 100644 --- a/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/style.scss +++ b/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/style.scss @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/src/features/admin/applicationRequestApiSlice.ts b/src/features/admin/applicationRequestApiSlice.ts index d2ac89e52..93964b2af 100644 --- a/src/features/admin/applicationRequestApiSlice.ts +++ b/src/features/admin/applicationRequestApiSlice.ts @@ -43,6 +43,7 @@ export enum AppFilterType { export interface DocumentMapper { documentType: string documentId: string + documentSize?: number } export interface ApplicationChecklistType {