From 8bd5cb0f3ff64cd8f2e71ace00c2dbb8e156af7d Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Mon, 30 Sep 2024 12:57:22 +0530 Subject: [PATCH 01/10] MOSIP-36013 Added ids for authentication partner pages Signed-off-by: MadhuMosip --- .../authenticationServices/ApiKeysFilter.js | 15 +++++++---- .../authenticationServices/ApiKeysList.js | 12 ++++----- .../CreateOidcClient.js | 26 +++++++++++-------- .../authenticationServices/GenerateApiKey.js | 14 +++++----- .../ViewApiKeyDetails.js | 2 +- 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysFilter.js b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysFilter.js index 7dcde498d..8bdc376e7 100644 --- a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysFilter.js +++ b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysFilter.js @@ -41,7 +41,8 @@ function ApiKeysFilter({ filteredApiKeysList, onFilterChange }) { fieldNameKey='oidcClientsList.partnerId' placeHolderKey='oidcClientsList.selectPartnerId' styleSet={styles} - isPlaceHolderPresent={true}> + isPlaceHolderPresent={true} + id='api_key_partner_id'> + isPlaceHolderPresent={true} + id='api_key_policy_group'> + isPlaceHolderPresent={true} + id='api_key_policy_name'> + isPlaceHolderPresent={true} + id='api_key_name'> + isPlaceHolderPresent={true} + id='api_key_status'> diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js index cca7a5955..c896e2050 100644 --- a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js +++ b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js @@ -176,7 +176,7 @@ function ApiKeysList() {
{apiKeysList.length > 0 ? - @@ -214,7 +214,7 @@ function ApiKeysList() {
{activeApiKey && - () @@ -255,7 +255,7 @@ function ApiKeysList() { { tableRows.map((apiKey, index, currentArray) => { return ( - + showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.partnerId} showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.policyGroupName} showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.policyName} @@ -269,15 +269,15 @@ function ApiKeysList() {
submenuRef.current[index] = el}> -

setViewApiKeyId(index === viewApiKeyId ? null : index)} className={`font-semibold mb-0.5 cursor-pointer text-[#1447B2]`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => setViewApiKeyId(index === viewApiKeyId ? null : index))}> +

setViewApiKeyId(index === viewApiKeyId ? null : index)} className={`font-semibold mb-0.5 cursor-pointer text-[#1447B2]`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => setViewApiKeyId(index === viewApiKeyId ? null : index))}> ...

{viewApiKeyId === index && (
-

onClickView(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickView(apiKey))}> +

onClickView(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickView(apiKey))}> {t('oidcClientsList.view')}

-

onClickDeactivate(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 ${apiKey.status === "ACTIVE" ? 'text-crimson-red cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickDeactivate(apiKey))}> +

onClickDeactivate(apiKey)} className={`${isLoginLanguageRTL ? "pl-10" : "pr-10"} py-2 px-4 ${apiKey.status === "ACTIVE" ? 'text-crimson-red cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onClickDeactivate(apiKey))}> {t('oidcClientsList.deActivate')}

{showDeactivatePopup && ( diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js b/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js index c1bd9388b..430f126d8 100644 --- a/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js +++ b/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js @@ -398,7 +398,8 @@ function CreateOidcClient() { selectedDropdownValue={partnerId} styleSet={styles} addInfoIcon={true} - infoKey='createOidcClient.partnerIdTooltip'> + infoKey='createOidcClient.partnerIdTooltip' + id='create_oidc_partner_id'>
@@ -435,7 +436,8 @@ function CreateOidcClient() { styleSet={styles} addInfoIcon={true} disabled={!partnerId} - infoKey={t('createOidcClient.policyNameToolTip')} /> + infoKey={t('createOidcClient.policyNameToolTip')} + id='create_oidc_policy_name'/>
@@ -443,7 +445,7 @@ function CreateOidcClient() { onChangeOidcClientName(e.target.value)} maxLength={256} className="h-10 px-2 py-3 border border-[#707070] rounded-md text-md text-dark-blue bg-white leading-tight focus:outline-none focus:shadow-outline overflow-x-auto whitespace-nowrap no-scrollbar" - placeholder={t('createOidcClient.enterNameForOidcClient')} /> + placeholder={t('createOidcClient.enterNameForOidcClient')} id="create_oidc_client_name"/>
@@ -452,7 +454,7 @@ function CreateOidcClient() {

{t('createOidcClient.publicKey')}*

- @@ -462,7 +464,7 @@ function CreateOidcClient() {
- handleLogoUrlChange(e.target.value)} + handleLogoUrlChange(e.target.value)} className="h-10 px-2 py-3 border border-[#707070] rounded-md text-md text-dark-blue bg-white leading-tight focus:outline-none focus:shadow-outline overflow-x-auto whitespace-nowrap no-scrollbar" placeholder={t('createOidcClient.logoUrlPlaceHolder')} /> {invalidLogoUrl && {invalidLogoUrl}} @@ -481,8 +483,9 @@ function CreateOidcClient() { onChange={(e) => onChangeRedirectUrl(index, e.target.value)} placeholder={t('createOidcClient.redirectUrlPlaceHolder')} className="w-[85%] focus:outline-none" + id={"create_oidc_redirect_url" + (index + 1)} /> -
onDeleteRedirectUrl(index)} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onDeleteRedirectUrl(index))}> +
onDeleteRedirectUrl(index)} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => onDeleteRedirectUrl(index))}> 1 ? '#1447b2' : '#969696'} className={`w-[18px] h-5 mr-1 ${redirectUrls.length > 1 ? 'cursor-pointer' : ''}`}> {invalidRedirectUrl}} {redirectUrls.length < 5 && ( -

onPressEnterKey(e, addNewRedirectUrl)}> +

onPressEnterKey(e, addNewRedirectUrl)}> + {t('createOidcClient.addNew')}

@@ -510,7 +513,8 @@ function CreateOidcClient() { onDropDownChangeEvent={handleGrantTypesChange} fieldNameKey='createOidcClient.grantTypes*' selectedDropdownValue={grantTypes} - styleSet={styles}> + styleSet={styles} + id='create_oidc_grant_type'>
@@ -519,10 +523,10 @@ function CreateOidcClient() {
- +
- - + +
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js b/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js index b99613729..85a748c5f 100644 --- a/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js +++ b/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js @@ -244,7 +244,8 @@ function GenerateApiKey() { selectedDropdownValue={partnerId} styleSet={styles} addInfoIcon={true} - infoKey='createOidcClient.partnerIdTooltip'> + infoKey='createOidcClient.partnerIdTooltip' + id='generate_partner_id'>
@@ -281,7 +282,8 @@ function GenerateApiKey() { styleSet={styles} addInfoIcon={true} disabled={!partnerId} - infoKey={t('createOidcClient.policyNameToolTip')} /> + infoKey={t('createOidcClient.policyNameToolTip')} + id='generate_policy_name'/>
@@ -290,7 +292,7 @@ function GenerateApiKey() { onChangeNameLabel(e.target.value)} maxLength={36} className="h-10 px-2 py-3 border border-[#707070] rounded-md text-md text-dark-blue bg-white leading-tight focus:outline-none focus:shadow-outline overflow-x-auto whitespace-nowrap no-scrollbar" - placeholder={t('generateApiKey.enterNameForApiKey')} /> + placeholder={t('generateApiKey.enterNameForApiKey')} id="generate_api_key_name"/>
@@ -299,10 +301,10 @@ function GenerateApiKey() {
- +
- - + + {(showPopup && !errorMsg) && ( diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js b/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js index db02c7300..e8f18533c 100644 --- a/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js +++ b/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js @@ -123,7 +123,7 @@ function ViewApiKeyDetails() {
-
From abddd1ed9ea52ba87f34e099ddf56dd1d715719d Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 15:02:36 +0530 Subject: [PATCH 03/10] created partner admin root trust certificate tabular view Signed-off-by: MadhuMosip --- pmp-reactjs-ui/public/i18n/ara.json | 19 + pmp-reactjs-ui/public/i18n/eng.json | 19 + pmp-reactjs-ui/public/i18n/fra.json | 19 + pmp-reactjs-ui/src/AppRoutes.js | 5 + .../pages/common/fields/DropdownComponent.js | 2 +- .../fields/DropdownWithSearchComponent.js | 2 +- .../partnerAdmin/RootTrustCertificateList.js | 718 ++++++++++++++++++ .../src/pages/partnerAdmin/RootTrustFilter.js | 72 ++ 8 files changed, 854 insertions(+), 2 deletions(-) create mode 100644 pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js create mode 100644 pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js diff --git a/pmp-reactjs-ui/public/i18n/ara.json b/pmp-reactjs-ui/public/i18n/ara.json index 441ae8562..74f5535dd 100644 --- a/pmp-reactjs-ui/public/i18n/ara.json +++ b/pmp-reactjs-ui/public/i18n/ara.json @@ -500,6 +500,25 @@ "uploadFtmCertificate": "تحميل شهادة شريحة FTM", "certificateFormatMsg": "يُسمح فقط بصيغة الشهادة .cer أو .pem الموقعة من قبل هيئة الشهادات المعتمدة للتحميل" }, + "rootTrustCertificate":{ + "rootTrustCertTitle": "تحميل شهادة جذر الثقة", + "organisation": "منظمة", + "partnerDomain": "مجال الشريك", + "issuedTo": "صدر ل", + "issuedBy": "صادرة عن", + "validFrom": "صالح من", + "validTill": "صالح حتى", + "timeOfUpload": "وقت التحميل", + "status": "حالة", + "action": "فعل", + "UploadCertBtn": "تحميل الشهادة", + "listOfCertificates": "قائمة شهادات جذر الثقة", + "selectOrganisation": "حدد المنظمة", + "selectPartnerDomain": "حدد مجال الشريك", + "selectStatus": "حدد الحالة", + "deActivate": "إلغاء التنشيط", + "view": "منظر" + }, "deactivateFtmPopup": { "headerMsg": "هل تريد إلغاء تنشيط شريحة FTM؟ ", "description": "عند النقر فوق تأكيد، سيتم إلغاء تنشيط تفاصيل شريحة FTM الخاصة بك." diff --git a/pmp-reactjs-ui/public/i18n/eng.json b/pmp-reactjs-ui/public/i18n/eng.json index 508aa7733..6371f93fd 100644 --- a/pmp-reactjs-ui/public/i18n/eng.json +++ b/pmp-reactjs-ui/public/i18n/eng.json @@ -495,6 +495,25 @@ "uploadFtmCertificate": "Upload FTM Chip Certificate", "certificateFormatMsg": "Only .cer or .pem certificate formats signed by authorised Certificate Authority are allowed for upload" }, + "rootTrustCertificate":{ + "rootTrustCertTitle": "Upload Root of Trust Certificate", + "organisation": "Organisation", + "partnerDomain": "Partner Domain", + "issuedTo": "Issued To", + "issuedBy": "Issued By", + "validFrom": "Valid From", + "validTill": "Valid Till", + "timeOfUpload": "Time of Upload", + "status": "Status", + "action": "Action", + "UploadCertBtn": "Upload Certificate", + "listOfCertificates": "List of Root of Trust certificates", + "selectOrganisation": "Select Organisation", + "selectPartnerDomain": "Select Partner Domain", + "selectStatus": "Select Status", + "deActivate": "Deactivate", + "view": "View" + }, "deactivateFtmPopup": { "headerMsg": "Do you want to deactivate FTM Chip ", "description": "On clicking Confirm, your FTM Chip details will be deactivated." diff --git a/pmp-reactjs-ui/public/i18n/fra.json b/pmp-reactjs-ui/public/i18n/fra.json index 5b5a8d38b..0f38fd180 100644 --- a/pmp-reactjs-ui/public/i18n/fra.json +++ b/pmp-reactjs-ui/public/i18n/fra.json @@ -500,6 +500,25 @@ "uploadFtmCertificate": "Télécharger le certificat de la puce FTM", "certificateFormatMsg": "Seuls les certificats au format .cer ou .pem signés par une autorité de certification autorisée sont autorisés pour le téléchargement." }, + "rootTrustCertificate":{ + "rootTrustCertTitle": "Télécharger le certificat racine de confiance", + "organisation": "Organisation", + "partnerDomain": "Domaine partenaire", + "issuedTo": "Délivré à", + "issuedBy": "Délivré par", + "validFrom": "Valable à partir de", + "validTill": "Valable jusqu'à", + "timeOfUpload": "Heure de téléchargement", + "status": "Statut", + "action": "Action", + "UploadCertBtn": "Télécharger le certificat", + "listOfCertificates": "Liste des certificats Root of Trust", + "selectOrganisation": "Sélectionnez une organisation", + "selectPartnerDomain": "Sélectionnez un domaine partenaire", + "selectStatus": "Sélectionnez le statut", + "deActivate": "Désactiver", + "view": "Voir" + }, "deactivateFtmPopup": { "headerMsg": "Voulez-vous désactiver la puce FTM ", "description": "En cliquant sur Confirmer, les détails de votre puce FTM seront désactivés." diff --git a/pmp-reactjs-ui/src/AppRoutes.js b/pmp-reactjs-ui/src/AppRoutes.js index cc70ba921..4da2a6b33 100644 --- a/pmp-reactjs-ui/src/AppRoutes.js +++ b/pmp-reactjs-ui/src/AppRoutes.js @@ -23,6 +23,7 @@ import DevicesList from './pages/deviceProviderServices/DevicesList.js'; import FtmList from './pages/ftmProviderServices/FtmList.js'; import AddFtm from './pages/ftmProviderServices/AddFtm.js'; import ViewFtmChipDetails from './pages/ftmProviderServices/ViewFtmChipDetails.js'; +import RootTrustCertificate from './pages/partnerAdmin/RootTrustCertificateList.js'; function AppRoutes() { @@ -124,6 +125,10 @@ function AppRoutes() { path: 'ftmChipProviderServices/manageFtmChipCertificate', element: }, + { + path: 'rootTrustCertificateList', + element: + }, { path: 'runtimeError', element: , diff --git a/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js b/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js index 0a7dc8c59..3d23ddc3c 100644 --- a/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js +++ b/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js @@ -71,7 +71,7 @@ function DropdownComponent({ fieldName, dropdownDataList, onDropDownChangeEvent, {dropdownDataList.map((dropdownItem, index) => { return (
- + ) : null} +
+
+ {certificateData.length === 0 ? ( +
+
+
+
+ {t("rootTrustCertificate.organisation")} +
+
{t("rootTrustCertificate.partnerDomain")}
+
{t("rootTrustCertificate.issuedTo")}
+
{t("rootTrustCertificate.issuedBy")}
+
{t("rootTrustCertificate.validFrom")}
+
{t("rootTrustCertificate.validTill")}
+
{t("rootTrustCertificate.timeOfUpload")}
+
{t("rootTrustCertificate.status")}
+
+ {t("rootTrustCertificate.action")} +
+
+
+ +
+ +
+
+ + +
+
+
+ ) : ( + <> +
+ +
+ {filter && ( + + )} + +
+ + + + {tableHeaders.map((header, index) => { + return ( + + ); + })} + + + + {tableRows.map((certificate, index) => { + return ( + + + + + + + + + + + + ); + })} + +
+
+ {t(header.headerNameKey)} + {header.id !== "action" && ( + + )} +
+
+ showCertificateDetails(certificate) + } + className="px-2" + > + {certificate.orgName} + + showCertificateDetails(certificate) + } + className="px-2" + > + {certificate.partnerDomain} + + showCertificateDetails(certificate) + } + className="px-2" + > + {certificate.issuedTo} + + showCertificateDetails(certificate) + } + className="px-2" + > + {certificate.issuedBy} + + showCertificateDetails(certificate) + } + className="px-2" + > + {formatDate( + certificate.validFrom, + "date", + false + )} + + showCertificateDetails(certificate) + } + className="px-2" + > + {formatDate( + certificate.validTill, + "date", + false + )} + + showCertificateDetails(certificate) + } + className="px-2" + > + {formatDate( + certificate.timeOfUpload, + "date", + false + )} + + showCertificateDetails(certificate) + } + className="" + > +
+ {getStatusCode(certificate.status, t)} +
+ 		+
+ (submenuRef.current[index] = el) + } + > +

+ setViewCertificateId( + index === viewCertificateId + ? null + : index + ) + } + className={`font-semibold mb-0.5 cursor-pointer text-center`} + tabIndex="0" + onKeyPress={(e) => + onPressEnterKey(e, () => + setViewCertificateId( + index === viewCertificateId + ? null + : index + ) + ) + } + > + ... +

+ {viewCertificateId === index && ( +
+

+ showCertificateDetails(certificate) + } + className={`py-1.5 px-4 cursor-pointer text-[#3E3E3E] hover:bg-gray-100 ${ + isLoginLanguageRTL + ? "pl-10" + : "pr-10" + }`} + tabIndex="0" + onKeyPress={(e) => + onPressEnterKey(e, () => + showCertificateDetails( + certificate + ) + ) + } + > + {t("rootTrustCertificate.view")} +

+
+

+ showDeactivateCertificate(certificate) + } + className={`py-1.5 px-4 ${ + isLoginLanguageRTL + ? "pl-10" + : "pr-10" + } ${ + certificate.status === "approved" + ? "text-crimson-red cursor-pointer" + : "text-[#A5A5A5] cursor-auto" + } hover:bg-gray-100`} + tabIndex="0" + onKeyPress={(e) => + onPressEnterKey(e, () => + showDeactivateCertificate( + certificate + ) + ) + } + > + {t("rootTrustCertificate.deActivate")} +

+ {/* {showDeactivatePopup && ( + + )} */} +
+ //
+ // showCertificateDetails(certificate) + // } + // tabIndex="0" + // onKeyPress={(e) => + // onPressEnterKey(e, () => + // showCertificateDetails(certificate) + // ) + // } + // className={`absolute border bg-white text-xs font-semibold rounded-md shadow-md w-fit p-2 z-20 items-center ${ + // isLoginLanguageRTL + // ? "mr-16 left-[5.5rem] max-[800px]:left-20 max-[400px]:left-8 text-right" + // : "text-left" + // }`} + // > + //

+ // {t("policies.view")} + //

+ //
+ )} +
+
+
+
+ + + )} +
+
+ + )} +
+ ); +} + +export default RootTrustCertificateList; diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js new file mode 100644 index 000000000..29c7dedbe --- /dev/null +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js @@ -0,0 +1,72 @@ + +import { useState, useEffect } from 'react'; +import DropdownComponent from '../common/fields/DropdownComponent.js'; +import { useTranslation } from 'react-i18next'; +import { createDropdownData } from '../../utils/AppUtils.js'; + +function RootTrustFilter({ filteredCertificateData, onFilterChange }) { + const { t } = useTranslation(); + const [organisationNameData, setOrganisationNameData] = useState([]); + const [partnerDomainData, setPartnerDomainData] = useState([]); + const [statusData, setStatusData] = useState([]); + + useEffect(() => { + const fetchData = async () => { + setOrganisationNameData(createDropdownData('orgName', '', true, filteredCertificateData, t, t('rootTrustCertificate.selectOrganisation'))); + setPartnerDomainData(createDropdownData('partnerDomain', '', true, filteredCertificateData, t, t('rootTrustCertificate.selectPartnerDomain'))); + setStatusData(createDropdownData('status', '', true, filteredCertificateData, t, t('rootTrustCertificate.selectStatus'))); + }; + fetchData(); + }, [t]); + + + const onFilterChangeEvent = (fieldName, selectedFilter) => { + onFilterChange(fieldName, selectedFilter); + } + + const styles = { + dropdownButton: "!text-[#343434] min-w-72" + } + + return ( + <> +
+ + + + + + +
+ + ); +} + +export default RootTrustFilter; \ No newline at end of file From db340c823629177ac1d145725d705d388a8f057d Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 15:23:02 +0530 Subject: [PATCH 04/10] added new changes Signed-off-by: MadhuMosip --- .../ftmProviderServices/ViewFtmChipDetails.js | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pmp-reactjs-ui/src/pages/ftmProviderServices/ViewFtmChipDetails.js b/pmp-reactjs-ui/src/pages/ftmProviderServices/ViewFtmChipDetails.js index 502b61162..d9bf179d8 100644 --- a/pmp-reactjs-ui/src/pages/ftmProviderServices/ViewFtmChipDetails.js +++ b/pmp-reactjs-ui/src/pages/ftmProviderServices/ViewFtmChipDetails.js @@ -287,18 +287,17 @@ function ViewFtmChipDetails() { )} {ftmDetails.isManageFtmCertificate && (
- {ftmDetails.isCertificateAvailable && ( - < DownloadCertificateButton - downloadDropdownRef={dropdownRef} - setShowDropDown={() => setShowDropDownOptions(!showDropDownOptions)} - showDropDown={showDropDownOptions} - onClickFirstOption={getOriginalCertificate} - onClickSecondOption={getMosipSignedCertificate} - requiredData={{ ...ftmDetails, disableSecondOption: ftmDetails.status !== 'approved' }} - styleSet={mangeFtmDownloadButtonStyle} - id='download_btn' - /> - )} + < DownloadCertificateButton + disableBtn={ftmDetails.isCertificateAvailable ? false : true} + downloadDropdownRef={dropdownRef} + setShowDropDown={() => setShowDropDownOptions(!showDropDownOptions)} + showDropDown={showDropDownOptions} + onClickFirstOption={getOriginalCertificate} + onClickSecondOption={getMosipSignedCertificate} + requiredData={{ ...ftmDetails, disableSecondOption: ftmDetails.status !== 'approved' }} + styleSet={mangeFtmDownloadButtonStyle} + id='download_btn' + /> From fc20ace2fdb1e1db097a6db932f788f9353d7e6f Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 16:17:28 +0530 Subject: [PATCH 05/10] Removed commented code and changed root trust filter file name Signed-off-by: MadhuMosip --- .../partnerAdmin/RootTrustCertificateList.js | 380 +++++++----------- ...lter.js => RootTrustCertiifcatesFilter.js} | 4 +- 2 files changed, 156 insertions(+), 228 deletions(-) rename pmp-reactjs-ui/src/pages/partnerAdmin/{RootTrustFilter.js => RootTrustCertiifcatesFilter.js} (95%) diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js index 44a391205..6cc86f14a 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js @@ -1,13 +1,9 @@ import { useState, useEffect, useRef } from "react"; -// import { useNavigate } from "react-router-dom"; import { useTranslation } from "react-i18next"; import { getUserProfile } from "../../services/UserProfileService"; import { isLangRTL, onPressEnterKey } from "../../utils/AppUtils"; import { - // getPartnerManagerUrl, formatDate, - // handleServiceErrors, - // getPartnerTypeDescription, getStatusCode, handleMouseClickForDropdown, toggleSortAscOrder, @@ -19,15 +15,13 @@ import ErrorMessage from "../common/ErrorMessage"; import Title from "../common/Title"; import rectangleGrid from "../../svg/rectangle_grid.svg"; import FilterButtons from "../common/FilterButtons"; -import RootTrustFilter from "./RootTrustFilter"; +import RootTrustCertiifcatesFilter from "./RootTrustCertiifcatesFilter"; import SortingIcon from "../common/SortingIcon"; import Pagination from "../common/Pagination"; -// import DeactivatePopup from "../common/DeactivatePopup"; function RootTrustCertificateList() { const { t } = useTranslation(); const [filter, setFilter] = useState(false); - // const navigate = useNavigate(); const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode); const [errorCode, setErrorCode] = useState(""); const [errorMsg, setErrorMsg] = useState(""); @@ -35,7 +29,7 @@ function RootTrustCertificateList() { const [certificateData, setCertificateData] = useState([]); const [filteredCertificateData, setFilteredCertificateData] = useState([]); const [order, setOrder] = useState("ASC"); - const [activeSortAsc, setActiveSortAsc] = useState("createdDateTime"); + const [activeSortAsc, setActiveSortAsc] = useState("certificateUploadDateTime"); const [activeSortDesc, setActiveSortDesc] = useState(""); const [firstIndex, setFirstIndex] = useState(0); const [isDescending, setIsDescending] = useState(false); @@ -47,8 +41,6 @@ function RootTrustCertificateList() { }; const [filterQuery, setFilterQuery] = useState({ ...defaultFilterQuery }); const submenuRef = useRef([]); - // const [showDeactivatePopup, setShowDeactivatePopup] = useState(false); - // const [deactivateRequest, setDeactivateRequest] = useState({}); useEffect(() => { handleMouseClickForDropdown(submenuRef, () => setViewCertificateId(-1)); @@ -64,181 +56,165 @@ function RootTrustCertificateList() { { id: "issuedBy", headerNameKey: "rootTrustCertificate.issuedBy" }, { id: "validFrom", headerNameKey: "rootTrustCertificate.validFrom" }, { id: "validTill", headerNameKey: "rootTrustCertificate.validTill" }, - { id: "timeOfUpload", headerNameKey: "rootTrustCertificate.timeOfUpload" }, + { id: "certificateUploadDateTime", headerNameKey: "rootTrustCertificate.timeOfUpload" }, { id: "status", headerNameKey: "rootTrustCertificate.status" }, { id: "action", headerNameKey: "rootTrustCertificate.action" }, ]; - const trustCertDummyData = [ - { - orgName: "P23423049", - partnerDomain: "DEVICE_V1", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423045", - partnerDomain: "DEVICE_V2", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "rejected", - }, - { - orgName: "P23423045", - partnerDomain: "DEVICE_V3", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P234230456", - partnerDomain: "DEVICE_V4", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "InProgress", - }, - { - orgName: "P23423034", - partnerDomain: "DEVICE_V5", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423064", - partnerDomain: "DEVICE_V6", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "rejected", - }, - { - orgName: "P23423064", - partnerDomain: "DEVICE_V7", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423045", - partnerDomain: "DEVICE_V8", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423065", - partnerDomain: "DEVICE_V9", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "InProgress", - }, - { - orgName: "P23423076", - partnerDomain: "DEVICE_V10", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423026", - partnerDomain: "DEVICE_V11", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "rejected", - }, - { - orgName: "P23423029", - partnerDomain: "DEVICE_V12", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423029", - partnerDomain: "DEVICE_V13", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "approved", - }, - { - orgName: "P23423029", - partnerDomain: "DEVICE_V14", - issuedTo: "MOSIP", - issuedBy: "Mosip", - validFrom: "2024-09-13T04:25:39.046+00:00", - validTill: "2024-09-13T04:25:39.046+00:00", - timeOfUpload: "2025-09-13T04:25:39.046+00:00", - status: "InProgress", - }, - ]; - useEffect(() => { const fetchData = async () => { try { setDataLoaded(false); - // const response = await HttpService.get(getPartnerManagerUrl('/partners/policy-requests', process.env.NODE_ENV)); - // if (response) { - // const responseData = response.data; - // if (responseData && responseData.response) { - // const resData = responseData.response; - // const sortedData = resData.sort((a, b) => new Date(b.createdDateTime) - new Date(a.createdDateTime)); - // setPoliciesList(sortedData); - // setFilteredPoliciesList(sortedData); - // } else { - // handleServiceErrors(responseData, setErrorCode, setErrorMsg); - // } - // } else { - // setErrorMsg(t('policies.errorInPoliciesList')); - // } + + const trustCertDummyData = [ + { + orgName: "P23423049", + partnerDomain: "DEVICE_V1", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423045", + partnerDomain: "DEVICE_V2", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "rejected", + }, + { + orgName: "P23423045", + partnerDomain: "DEVICE_V3", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P234230456", + partnerDomain: "DEVICE_V4", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "InProgress", + }, + { + orgName: "P23423034", + partnerDomain: "DEVICE_V5", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423064", + partnerDomain: "DEVICE_V6", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "rejected", + }, + { + orgName: "P23423064", + partnerDomain: "DEVICE_V7", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423045", + partnerDomain: "DEVICE_V8", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423065", + partnerDomain: "DEVICE_V9", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "InProgress", + }, + { + orgName: "P23423076", + partnerDomain: "DEVICE_V10", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423026", + partnerDomain: "DEVICE_V11", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "rejected", + }, + { + orgName: "P23423029", + partnerDomain: "DEVICE_V12", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423029", + partnerDomain: "DEVICE_V13", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "approved", + }, + { + orgName: "P23423029", + partnerDomain: "DEVICE_V14", + issuedTo: "MOSIP", + issuedBy: "Mosip", + validFrom: "2024-09-13T04:25:39.046+00:00", + validTill: "2024-09-13T04:25:39.046+00:00", + timeOfUpload: "2025-09-13T04:25:39.046+00:00", + status: "InProgress", + }, + ]; const sortedData = trustCertDummyData.sort( - (a, b) => new Date(b.createdDateTime) - new Date(a.createdDateTime) + (a, b) => new Date(b.certificateUploadDateTime) - new Date(a.certificateUploadDateTime) ); setCertificateData(sortedData); setFilteredCertificateData(sortedData); - setInterval(() => { - setDataLoaded(true); - }, 1000); + setDataLoaded(true); } catch (err) { console.error("Error fetching data:", err); setErrorMsg(err); @@ -248,7 +224,6 @@ function RootTrustCertificateList() { }, []); const showUploadCertificate = () => { - // navigate("/partnermanagement/policies/requestPolicy"); }; const showCertificateDetails = (selectedCertificateData) => { @@ -256,7 +231,6 @@ function RootTrustCertificateList() { "selectedCertificateData", JSON.stringify(selectedCertificateData) ); - // navigate("/partnermanagement/policies/viewPolicyDetails"); }; const cancelErrorMsg = () => { @@ -265,7 +239,7 @@ function RootTrustCertificateList() { //This part is related to Sorting const sortAscOrder = (header) => { - const isDateCol = header === "createdDateTime" ? true : false; + const isDateCol = header === "certificateUploadDateTime" ? true : false; toggleSortAscOrder( header, isDateCol, @@ -283,7 +257,7 @@ function RootTrustCertificateList() { }; const sortDescOrder = (header) => { - const isDateCol = header === "createdDateTime" ? true : false; + const isDateCol = header === "certificateUploadDateTime" ? true : false; toggleSortDescOrder( header, isDateCol, @@ -338,19 +312,6 @@ function RootTrustCertificateList() { const showDeactivateCertificate = (selectedClientdata) => { if (selectedClientdata.status === "ACTIVE") { - // const request = createRequest({ - // logoUri: selectedClientdata.logoUri, - // redirectUris: selectedClientdata.redirectUris, - // status: "INACTIVE", - // grantTypes: selectedClientdata.grantTypes, - // clientName: selectedClientdata.clientName, - // clientAuthMethods: selectedClientdata.clientAuthMethods, - // clientNameLangMap: { - // eng: selectedClientdata.clientName, - // }, - // }); - // setDeactivateRequest(request); - // setShowDeactivatePopup(true); document.body.style.overflow = "hidden"; } }; @@ -439,10 +400,10 @@ function RootTrustCertificateList() { >
{filter && ( - + > )}
@@ -609,7 +570,7 @@ function RootTrustCertificateList() { }`} >

showCertificateDetails(certificate) } @@ -631,7 +592,7 @@ function RootTrustCertificateList() {

showDeactivateCertificate(certificate) } @@ -655,40 +616,7 @@ function RootTrustCertificateList() { > {t("rootTrustCertificate.deActivate")}

- {/* {showDeactivatePopup && ( - - )} */}
- //
- // showCertificateDetails(certificate) - // } - // tabIndex="0" - // onKeyPress={(e) => - // onPressEnterKey(e, () => - // showCertificateDetails(certificate) - // ) - // } - // className={`absolute border bg-white text-xs font-semibold rounded-md shadow-md w-fit p-2 z-20 items-center ${ - // isLoginLanguageRTL - // ? "mr-16 left-[5.5rem] max-[800px]:left-20 max-[400px]:left-8 text-right" - // : "text-left" - // }`} - // > - //

- // {t("policies.view")} - //

- //
)}
diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js similarity index 95% rename from pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js rename to pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js index 29c7dedbe..e66b82a8d 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustFilter.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js @@ -4,7 +4,7 @@ import DropdownComponent from '../common/fields/DropdownComponent.js'; import { useTranslation } from 'react-i18next'; import { createDropdownData } from '../../utils/AppUtils.js'; -function RootTrustFilter({ filteredCertificateData, onFilterChange }) { +function RootTrustCertiifcatesFilter({ filteredCertificateData, onFilterChange }) { const { t } = useTranslation(); const [organisationNameData, setOrganisationNameData] = useState([]); const [partnerDomainData, setPartnerDomainData] = useState([]); @@ -69,4 +69,4 @@ function RootTrustFilter({ filteredCertificateData, onFilterChange }) { ); } -export default RootTrustFilter; \ No newline at end of file +export default RootTrustCertiifcatesFilter; \ No newline at end of file From a6c483d2f1dd6e82d948390d3aab49dd398d4487 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 16:24:38 +0530 Subject: [PATCH 06/10] changed root trust filter file name Signed-off-by: MadhuMosip --- .../src/pages/partnerAdmin/RootTrustCertificateList.js | 2 +- ...stCertiifcatesFilter.js => RootTrustCertificatesFilter.js} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename pmp-reactjs-ui/src/pages/partnerAdmin/{RootTrustCertiifcatesFilter.js => RootTrustCertificatesFilter.js} (96%) diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js index 6cc86f14a..3c58062ca 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js @@ -15,7 +15,7 @@ import ErrorMessage from "../common/ErrorMessage"; import Title from "../common/Title"; import rectangleGrid from "../../svg/rectangle_grid.svg"; import FilterButtons from "../common/FilterButtons"; -import RootTrustCertiifcatesFilter from "./RootTrustCertiifcatesFilter"; +import RootTrustCertificatesFilter from "./RootTrustCertificatesFilter"; import SortingIcon from "../common/SortingIcon"; import Pagination from "../common/Pagination"; diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificatesFilter.js similarity index 96% rename from pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js rename to pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificatesFilter.js index e66b82a8d..87680af82 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertiifcatesFilter.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificatesFilter.js @@ -4,7 +4,7 @@ import DropdownComponent from '../common/fields/DropdownComponent.js'; import { useTranslation } from 'react-i18next'; import { createDropdownData } from '../../utils/AppUtils.js'; -function RootTrustCertiifcatesFilter({ filteredCertificateData, onFilterChange }) { +function RootTrustCertificatesFilter({ filteredCertificateData, onFilterChange }) { const { t } = useTranslation(); const [organisationNameData, setOrganisationNameData] = useState([]); const [partnerDomainData, setPartnerDomainData] = useState([]); @@ -69,4 +69,4 @@ function RootTrustCertiifcatesFilter({ filteredCertificateData, onFilterChange } ); } -export default RootTrustCertiifcatesFilter; \ No newline at end of file +export default RootTrustCertificatesFilter; \ No newline at end of file From 48ffd38e630fc2aca71c0f4d2f844b80c2cf1f20 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 16:30:27 +0530 Subject: [PATCH 07/10] changed certificateUploadDateTime key name to timeOfUpload Signed-off-by: MadhuMosip --- .../pages/partnerAdmin/RootTrustCertificateList.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js index 3c58062ca..abfd69d3b 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js @@ -29,7 +29,7 @@ function RootTrustCertificateList() { const [certificateData, setCertificateData] = useState([]); const [filteredCertificateData, setFilteredCertificateData] = useState([]); const [order, setOrder] = useState("ASC"); - const [activeSortAsc, setActiveSortAsc] = useState("certificateUploadDateTime"); + const [activeSortAsc, setActiveSortAsc] = useState("time"); const [activeSortDesc, setActiveSortDesc] = useState(""); const [firstIndex, setFirstIndex] = useState(0); const [isDescending, setIsDescending] = useState(false); @@ -56,7 +56,7 @@ function RootTrustCertificateList() { { id: "issuedBy", headerNameKey: "rootTrustCertificate.issuedBy" }, { id: "validFrom", headerNameKey: "rootTrustCertificate.validFrom" }, { id: "validTill", headerNameKey: "rootTrustCertificate.validTill" }, - { id: "certificateUploadDateTime", headerNameKey: "rootTrustCertificate.timeOfUpload" }, + { id: "timeOfUpload", headerNameKey: "rootTrustCertificate.timeOfUpload" }, { id: "status", headerNameKey: "rootTrustCertificate.status" }, { id: "action", headerNameKey: "rootTrustCertificate.action" }, ]; @@ -210,7 +210,7 @@ function RootTrustCertificateList() { ]; const sortedData = trustCertDummyData.sort( - (a, b) => new Date(b.certificateUploadDateTime) - new Date(a.certificateUploadDateTime) + (a, b) => new Date(b.timeOfUpload) - new Date(a.timeOfUpload) ); setCertificateData(sortedData); setFilteredCertificateData(sortedData); @@ -239,7 +239,7 @@ function RootTrustCertificateList() { //This part is related to Sorting const sortAscOrder = (header) => { - const isDateCol = header === "certificateUploadDateTime" ? true : false; + const isDateCol = header === "timeOfUpload" ? true : false; toggleSortAscOrder( header, isDateCol, @@ -257,7 +257,7 @@ function RootTrustCertificateList() { }; const sortDescOrder = (header) => { - const isDateCol = header === "certificateUploadDateTime" ? true : false; + const isDateCol = header === "timeOfUpload" ? true : false; toggleSortDescOrder( header, isDateCol, @@ -400,10 +400,10 @@ function RootTrustCertificateList() { >
{filter && ( - + > )}
From 65678017ce680369608288fca7fa506e177778a2 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 16:34:29 +0530 Subject: [PATCH 08/10] changed default sort key name Signed-off-by: MadhuMosip --- .../src/pages/partnerAdmin/RootTrustCertificateList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js index abfd69d3b..22a1cc03a 100644 --- a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js +++ b/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js @@ -29,7 +29,7 @@ function RootTrustCertificateList() { const [certificateData, setCertificateData] = useState([]); const [filteredCertificateData, setFilteredCertificateData] = useState([]); const [order, setOrder] = useState("ASC"); - const [activeSortAsc, setActiveSortAsc] = useState("time"); + const [activeSortAsc, setActiveSortAsc] = useState("timeOfUpload"); const [activeSortDesc, setActiveSortDesc] = useState(""); const [firstIndex, setFirstIndex] = useState(0); const [isDescending, setIsDescending] = useState(false); From e511650984b6284a24e4df639735eec2c1e48fa4 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 16:44:50 +0530 Subject: [PATCH 09/10] Moved root certificate files to certificate folder Signed-off-by: MadhuMosip --- pmp-reactjs-ui/src/AppRoutes.js | 2 +- .../{partnerAdmin => certificates}/RootTrustCertificateList.js | 0 .../RootTrustCertificatesFilter.js | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename pmp-reactjs-ui/src/pages/{partnerAdmin => certificates}/RootTrustCertificateList.js (100%) rename pmp-reactjs-ui/src/pages/{partnerAdmin => certificates}/RootTrustCertificatesFilter.js (100%) diff --git a/pmp-reactjs-ui/src/AppRoutes.js b/pmp-reactjs-ui/src/AppRoutes.js index 4da2a6b33..dabc55c9a 100644 --- a/pmp-reactjs-ui/src/AppRoutes.js +++ b/pmp-reactjs-ui/src/AppRoutes.js @@ -23,7 +23,7 @@ import DevicesList from './pages/deviceProviderServices/DevicesList.js'; import FtmList from './pages/ftmProviderServices/FtmList.js'; import AddFtm from './pages/ftmProviderServices/AddFtm.js'; import ViewFtmChipDetails from './pages/ftmProviderServices/ViewFtmChipDetails.js'; -import RootTrustCertificate from './pages/partnerAdmin/RootTrustCertificateList.js'; +import RootTrustCertificate from './pages/certificates/RootTrustCertificateList.js'; function AppRoutes() { diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/certificates/RootTrustCertificateList.js similarity index 100% rename from pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificateList.js rename to pmp-reactjs-ui/src/pages/certificates/RootTrustCertificateList.js diff --git a/pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificatesFilter.js b/pmp-reactjs-ui/src/pages/certificates/RootTrustCertificatesFilter.js similarity index 100% rename from pmp-reactjs-ui/src/pages/partnerAdmin/RootTrustCertificatesFilter.js rename to pmp-reactjs-ui/src/pages/certificates/RootTrustCertificatesFilter.js From bae46ffbd010fdc55a99fbfb23a2d85f35a565f2 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Thu, 3 Oct 2024 17:50:30 +0530 Subject: [PATCH 10/10] chnaged root trust certificate list name in appRoutes Signed-off-by: MadhuMosip --- pmp-reactjs-ui/src/AppRoutes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmp-reactjs-ui/src/AppRoutes.js b/pmp-reactjs-ui/src/AppRoutes.js index dabc55c9a..866111c36 100644 --- a/pmp-reactjs-ui/src/AppRoutes.js +++ b/pmp-reactjs-ui/src/AppRoutes.js @@ -23,7 +23,7 @@ import DevicesList from './pages/deviceProviderServices/DevicesList.js'; import FtmList from './pages/ftmProviderServices/FtmList.js'; import AddFtm from './pages/ftmProviderServices/AddFtm.js'; import ViewFtmChipDetails from './pages/ftmProviderServices/ViewFtmChipDetails.js'; -import RootTrustCertificate from './pages/certificates/RootTrustCertificateList.js'; +import RootTrustCertificateList from './pages/certificates/RootTrustCertificateList.js'; function AppRoutes() { @@ -127,7 +127,7 @@ function AppRoutes() { }, { path: 'rootTrustCertificateList', - element: + element: }, { path: 'runtimeError',