From 2b0d76b9c662af159076dbc841894c7c2c394c8f Mon Sep 17 00:00:00 2001 From: nidhigarg-bmw <101316912+nidhigarg-bmw@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:40:51 +0530 Subject: [PATCH 1/7] fix(credential request): ui improvements (#866) --- CHANGELOG.md | 2 + src/assets/locales/de/main.json | 2 + src/assets/locales/en/main.json | 2 + .../AdminCredential/AdminCredential.scss | 6 ++ .../AdminCredentialElements.tsx | 57 +++++++++---------- 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 316747a23..4f9e76398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ - Company Application Registraion Detail Overlay - UI improvements - Add correct registration application checklist items +- Credential Request + - UI Improvements ### Feature diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index b0dc9979a..d0437a70c 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1852,6 +1852,8 @@ "companyInfo": "Company Info", "certificate": "Zertifikat", "document": "Dokumente", + "status": "Status", + "action": "Aktion", "type": { "TRACEABILITY_FRAMEWORK": "Traceability", "PCF_FRAMEWORK": "PCF Framework", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 08f674269..48e100f08 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1928,6 +1928,8 @@ "companyInfo": "Company Info", "certificate": "Certificate", "document": "Document", + "status": "Status", + "action": "Action", "type": { "TRACEABILITY_FRAMEWORK": "Traceability", "PCF_FRAMEWORK": "PCF Framework", diff --git a/src/components/pages/AdminCredential/AdminCredential.scss b/src/components/pages/AdminCredential/AdminCredential.scss index 6203652e2..045d5c564 100644 --- a/src/components/pages/AdminCredential/AdminCredential.scss +++ b/src/components/pages/AdminCredential/AdminCredential.scss @@ -52,6 +52,12 @@ transform: translateX(-50%); } + .recommended-main { + .MuiDataGrid-cell { + font-size: 14px; + } + } + .documenticon-main { position: relative; display: flex; diff --git a/src/components/pages/AdminCredential/AdminCredentialElements.tsx b/src/components/pages/AdminCredential/AdminCredentialElements.tsx index 6b13a2774..0ca5926ed 100644 --- a/src/components/pages/AdminCredential/AdminCredentialElements.tsx +++ b/src/components/pages/AdminCredential/AdminCredentialElements.tsx @@ -223,6 +223,28 @@ export default function AdminCredentialElements() { ) + } else if ( + UserService.hasRole(ROLES.REVOKE_CREDENTIALS_ISSUER) && + row.participantStatus === StatusEnum.ACTIVE + ) { + return ( + { + setOpenRevokeOverlay(true) + setCredentialData(row) + }} + /> + } + /> + ) } } @@ -275,7 +297,7 @@ export default function AdminCredentialElements() { }, { field: 'credentialDetailId', - headerName: '', + headerName: t('content.adminCertificate.table.status'), flex: 2, renderCell: ({ row }: { row: CredentialData }) => ( renderApproveDeclineBtn(row), }, - { - field: '', - headerName: '', - flex: 1, - renderCell: ({ row }: { row: CredentialData }) => ( - <> - {UserService.hasRole(ROLES.REVOKE_CREDENTIALS_ISSUER) && - row.participantStatus === StatusEnum.ACTIVE && ( - { - setOpenRevokeOverlay(true) - setCredentialData(row) - }} - /> - } - /> - )} - - ), - }, ] const handleRevokeConfirm = async (credentialId: string) => { @@ -430,6 +424,7 @@ export default function AdminCredentialElements() { onSortClick={(value) => { setSortOption(value) }} + disableColumnSelector={true} /> From 27eef3257a84318d08eda63d15910725c8ad8524 Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:57:47 +0530 Subject: [PATCH 2/7] feat: use scroll to top component from shared components (#872) --- DEPENDENCIES | 2 +- package.json | 2 +- src/components/shared/frame/Footer/index.tsx | 16 +++++----------- yarn.lock | 8 ++++---- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 7a6c02930..10be9703e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -599,7 +599,7 @@ npm/npmjs/@babel/template/7.24.0, MIT, approved, clearlydefined npm/npmjs/@babel/traverse/7.24.1, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #13926 npm/npmjs/@babel/types/7.24.0, MIT, approved, clearlydefined npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined -npm/npmjs/@catena-x/portal-shared-components/3.0.17, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247 +npm/npmjs/@catena-x/portal-shared-components/3.0.21, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247 npm/npmjs/@cspotcode/source-map-support/0.8.1, MIT, approved, clearlydefined npm/npmjs/@date-io/core/3.0.0, MIT, approved, clearlydefined npm/npmjs/@date-io/date-fns/3.0.0, MIT, approved, #14023 diff --git a/package.json b/package.json index 96dd393e8..597e98ce7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ] }, "dependencies": { - "@catena-x/portal-shared-components": "^3.0.17", + "@catena-x/portal-shared-components": "^3.0.21", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.0", "@hookform/error-message": "^2.0.1", diff --git a/src/components/shared/frame/Footer/index.tsx b/src/components/shared/frame/Footer/index.tsx index b69c43163..0a5c1425a 100644 --- a/src/components/shared/frame/Footer/index.tsx +++ b/src/components/shared/frame/Footer/index.tsx @@ -19,8 +19,10 @@ ********************************************************************************/ import { useEffect, useState } from 'react' -import { Navigation, IconButton } from '@catena-x/portal-shared-components' -import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' +import { + Navigation, + ScrollToTopButton, +} from '@catena-x/portal-shared-components' import { useTranslation } from 'react-i18next' import { NavLink, useLocation } from 'react-router-dom' import './Footer.scss' @@ -83,15 +85,7 @@ export const Footer = ({ pages }: { pages: string[] }) => { return (