fix(application requests): UI improvements (#911)

eclipse-tractusx · Jul 16, 2024 · f1e39be · f1e39be
1 parent d0ae56e
commit f1e39be
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,9 @@
   - Show appropriate error information to the user along with refetch button
 - **User Management**:
   - Fix disable button state when deselect all checkboxes [#923](https://github.com/eclipse-tractusx/portal-frontend/pull/923)
-
+- **Application Requests**:
+  - UI Improvements [#911](https://github.com/eclipse-tractusx/portal-frontend/pull/911)
+
 ## 2.1.0-RC1
 
 ### Change

diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
@@ -165,7 +165,7 @@
     "admin": {
       "registration-requests": {
         "columns": {
-          "companyinfo": "Bewerbungsinformationen des Unternehmens",
+          "companyinfo": "Unternehmen",
           "contact": "Kontakt",
           "bpn": "BPN",
           "age": "Alter",
@@ -204,7 +204,8 @@
           "appProvider": "App Anbieter",
           "onboardingProvider": "Onboarding Service Anbieter",
           "serviceProvider": "Service Anbieter",
-          "noinfo": "no data available",
+          "noinfo": "Keine Daten verfügbar",
+          "noRolesAvailable": "Keine Rollen verfügbar",
           "commercialRegisterNumber": "Handelsregisternummer",
           "vatId": "VAT ID",
           "leiCode": "LEI Code",

diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
@@ -164,7 +164,7 @@
     "admin": {
       "registration-requests": {
         "columns": {
-          "companyinfo": "Company Application Info",
+          "companyinfo": "Company",
           "contact": "Contact",
           "bpn": "BPN",
           "age": "Age",
@@ -203,7 +203,8 @@
           "appProvider": "App Provider",
           "onboardingProvider": "Onboarding Service Provider",
           "serviceProvider": "Service Provider",
-          "noinfo": "no data available",
+          "noinfo": "No data available",
+          "noRolesAvailable": "No roles available",
           "commercialRegisterNumber": "Commercial Register Number",
           "vatId": "VAT ID",
           "leiCode": "LEI Code",

diff --git a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx
@@ -222,12 +222,7 @@ const CompanyDetailOverlay = ({
               )}
             </>
           ) : (
-            <Typography
-              sx={{
-                padding: '20px',
-              }}
-              variant="body1"
-            >
+            <Typography sx={{ padding: '20px' }} variant="body3">
               {t('content.admin.registration-requests.overlay.noinfo')}
             </Typography>
           )}
@@ -241,17 +236,25 @@ const CompanyDetailOverlay = ({
       key: '',
       value: (
         <>
-          {selectedCompany?.companyRoles?.map(
-            (role: { companyRole: string }) => (
-              <StatusTag
-                key={role.companyRole}
-                color="label"
-                label={getLocaleStr(role.companyRole)}
-                sx={{
-                  marginRight: '8px',
-                }}
-              />
+          {selectedCompany?.companyRoles?.length > 0 ? (
+            selectedCompany?.companyRoles?.map(
+              (role: { companyRole: string }) => (
+                <StatusTag
+                  key={role.companyRole}
+                  color="label"
+                  label={getLocaleStr(role.companyRole)}
+                  sx={{
+                    marginRight: '8px',
+                  }}
+                />
+              )
             )
+          ) : (
+            <Typography sx={{ padding: '20px' }} variant="body3">
+              {t(
+                'content.admin.registration-requests.overlay.noRolesAvailable'
+              )}
+            </Typography>
           )}
         </>
       ),

diff --git a/src/components/pages/Admin/components/RegistrationRequests/components/RequestList/index.tsx b/src/components/pages/Admin/components/RegistrationRequests/components/RequestList/index.tsx
@@ -123,6 +123,11 @@ export const RequestList = ({
   return (
     <section id="registration-section-id">
       <PageLoadingTable<ApplicationRequest, FetchHookArgsType>
+        sx={{
+          '.MuiDataGrid-cell': {
+            alignContent: 'center !important',
+          },
+        }}
         autoFocus={false}
         searchExpr={searchExpr}
         rowHeight={90}

diff --git a/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx b/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx
@@ -77,7 +77,7 @@ export const StatusProgress = ({
           totalItems={row.applicationChecklist.length}
         />
         <Typography
-          variant="body2"
+          variant="body3"
           className="statusText"
           sx={{ color: style.color }}
         >
@@ -103,7 +103,7 @@ export const StatusProgress = ({
         )}
         {type && (
           <Typography
-            variant="body2"
+            variant="body3"
             className="cancelBtn"
             onClick={(e) => {
               e.stopPropagation()