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.

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

fix(application requests): ui improvements #911

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

- **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
Expand Down
5 changes: 3 additions & 2 deletions src/assets/locales/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"admin": {
"registration-requests": {
"columns": {
"companyinfo": "Bewerbungsinformationen des Unternehmens",
"companyinfo": "Unternehmen",
"contact": "Kontakt",
"bpn": "BPN",
"age": "Alter",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/assets/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
"admin": {
"registration-requests": {
"columns": {
"companyinfo": "Company Application Info",
"companyinfo": "Company",
"contact": "Contact",
"bpn": "BPN",
"age": "Age",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)}
Expand All @@ -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>
)}
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const StatusProgress = ({
totalItems={row.applicationChecklist.length}
/>
<Typography
variant="body2"
variant="body3"
className="statusText"
sx={{ color: style.color }}
>
Expand All @@ -103,7 +103,7 @@ export const StatusProgress = ({
)}
{type && (
<Typography
variant="body2"
variant="body3"
className="cancelBtn"
onClick={(e) => {
e.stopPropagation()
Expand Down
Loading