From 75549a3f12bd6eafb6fc1bfaa28cdff5b8540640 Mon Sep 17 00:00:00 2001 From: SwethaKrish4 <110164892+SwethaKrish4@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:54:42 +0530 Subject: [PATCH] MOSIP-38031: Added policyId column in policy list and changes in view page subtitle (#1076) * MOSIP-38031: Changes in view page subtitle Signed-off-by: Swetha K * MOSIP-38031: Changes in view page subtitle Signed-off-by: Swetha K --------- Signed-off-by: Swetha K Co-authored-by: Swetha K --- pmp-revamp-ui/public/i18n/ara.json | 2 ++ pmp-revamp-ui/public/i18n/eng.json | 2 ++ pmp-revamp-ui/public/i18n/fra.json | 2 ++ .../ViewAdminApiKeyDetails.js | 4 ++-- .../ViewAdminOidcClientDetails.js | 10 +--------- .../admin/certificates/ViewCertificateDetails.js | 4 ++-- .../ViewAdminDeviceDetails.js | 4 ++-- .../deviceProviderServices/ViewAdminSbiDetails.js | 4 ++-- .../ftmProviderServices/ViewAdminFtmChipDetails.js | 5 ++--- .../src/pages/admin/partners/ViewPartnerDetails.js | 4 ++-- .../src/pages/admin/policyManager/ViewPolicy.js | 4 ++-- .../admin/policyManager/ViewPolicyGroupDetails.js | 4 ++-- .../policyRequests/ViewPolicyRequestDetails.js | 4 ++-- .../authenticationServices/ViewApiKeyDetails.js | 4 ++-- .../authenticationServices/ViewOidcClientDetails.js | 10 +--------- .../deviceProviderServices/ViewDeviceDetails.js | 4 ++-- .../ftmProviderServices/ViewFtmChipDetails.js | 4 ++-- .../src/pages/partner/policies/PoliciesFilter.js | 13 +++++++++++++ .../src/pages/partner/policies/PoliciesList.js | 4 +++- .../src/pages/partner/policies/ViewPolicyDetails.js | 4 ++-- 20 files changed, 50 insertions(+), 46 deletions(-) diff --git a/pmp-revamp-ui/public/i18n/ara.json b/pmp-revamp-ui/public/i18n/ara.json index 3a5e08d2b..07d3375cf 100644 --- a/pmp-revamp-ui/public/i18n/ara.json +++ b/pmp-revamp-ui/public/i18n/ara.json @@ -176,6 +176,7 @@ "partnerType": "نوع الشريك", "partnerId": "معرف الشريك", "policyGroupName": "مجموعة السياسات", + "policyId":"معرف السياسة", "policyName": "اسم السياسة", "createdDate": "تاريخ الإنشاء", "status": "حالة", @@ -187,6 +188,7 @@ "selectPolicyGroup": "حدد مجموعة السياسات", "selectPolicyName": "حدد اسم السياسة", "selectStatus": "حدد الحالة", + "selectPolicyId": "حدد معرف السياسة", "errorInPoliciesList": "هناك بعض الخطأ في جلب السياسات. حاول مرة أخرى في وقت لاحق!" }, "viewPolicyDetails": { diff --git a/pmp-revamp-ui/public/i18n/eng.json b/pmp-revamp-ui/public/i18n/eng.json index 19ff0fc67..0f9254d70 100644 --- a/pmp-revamp-ui/public/i18n/eng.json +++ b/pmp-revamp-ui/public/i18n/eng.json @@ -176,6 +176,7 @@ "partnerId": "Partner ID", "partnerType": "Partner Type", "policyGroupName": "Policy Group", + "policyId":"Policy ID", "policyName": "Policy Name", "createdDate": "Created Date", "status": "Status", @@ -186,6 +187,7 @@ "selectPolicyGroup": "Select Policy Group", "selectPolicyName": "Select Policy Name", "selectStatus": "Select Status", + "selectPolicyId": "Select Policy ID", "errorInPoliciesList": "There is some error in fetching the policies. Try again later!" }, "viewPolicyDetails": { diff --git a/pmp-revamp-ui/public/i18n/fra.json b/pmp-revamp-ui/public/i18n/fra.json index fcd79de55..c7b510349 100644 --- a/pmp-revamp-ui/public/i18n/fra.json +++ b/pmp-revamp-ui/public/i18n/fra.json @@ -176,6 +176,7 @@ "partnerId": "ID partenaire", "partnerType": "Type de partenaire", "policyGroupName": "Groupe de politiques", + "policyId":"ID de la politique", "policyName": "Nom de la politique", "createdDate": "Date de création", "status": "Statut", @@ -186,6 +187,7 @@ "selectPartnerType": "Sélectionnez le type de partenaire", "selectPolicyGroup": "Sélectionnez un groupe de stratégies", "selectPolicyName": "Sélectionnez le nom de la stratégie", + "selectPolicyId": "Sélectionner l'ID de la politique", "selectStatus": "Sélectionnez le statut", "errorInPoliciesList": "Une erreur s'est produite lors de la récupération des politiques. Réessayez plus tard!" }, diff --git a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js index 7c94f28e0..27d64e6b6 100644 --- a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js +++ b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminApiKeyDetails.js @@ -72,8 +72,8 @@ function ViewAdminApiKeyDetails() {
-

- {t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel} +

+ {t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel}

diff --git a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js index 5f0c71314..e66fa37ae 100644 --- a/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js +++ b/pmp-revamp-ui/src/pages/admin/authenticationServices/ViewAdminOidcClientDetails.js @@ -104,7 +104,7 @@ function ViewAdminOidcClientDetails() {
-

{t('authenticationServices.oidcClientName')}: {selectedClientData.clientNameEng}

+

{t('authenticationServices.oidcClientName')}: {selectedClientData.clientNameEng}

{getStatusCode(selectedClientData.status, t)} @@ -207,14 +207,6 @@ function ViewAdminOidcClientDetails() {
-
-

- {t("authenticationServices.oidcClientName")} -

-

- {selectedClientData.clientNameEng} -

-

{t("viewOidcClientDetails.publicKey")} diff --git a/pmp-revamp-ui/src/pages/admin/certificates/ViewCertificateDetails.js b/pmp-revamp-ui/src/pages/admin/certificates/ViewCertificateDetails.js index ee99190a9..e157e1726 100644 --- a/pmp-revamp-ui/src/pages/admin/certificates/ViewCertificateDetails.js +++ b/pmp-revamp-ui/src/pages/admin/certificates/ViewCertificateDetails.js @@ -82,8 +82,8 @@ function ViewCertificateDetails() {

-

- {t('certificatesList.certificateId')}: {viewCertDetails.certId} +

+ {t('certificatesList.certificateId')}: {viewCertDetails.certId}

diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminDeviceDetails.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminDeviceDetails.js index f2d79fe72..bab90eddd 100644 --- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminDeviceDetails.js +++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminDeviceDetails.js @@ -60,8 +60,8 @@ function ViewAdminDeviceDetails() {
-

- {t('devicesList.deviceId')}: {deviceDetails.deviceId} +

+ {t('devicesList.deviceId')}: {deviceDetails.deviceId}

diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js index 3b7847052..69a7d8bff 100644 --- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js +++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js @@ -58,8 +58,8 @@ function ViewAdminSbiDetails() {
-

- {t('sbiList.sbiId')}: {sbiDetails.sbiId} +

+ {t('sbiList.sbiId')}: {sbiDetails.sbiId}

diff --git a/pmp-revamp-ui/src/pages/admin/ftmProviderServices/ViewAdminFtmChipDetails.js b/pmp-revamp-ui/src/pages/admin/ftmProviderServices/ViewAdminFtmChipDetails.js index 9aa1012bf..ac7dade3d 100644 --- a/pmp-revamp-ui/src/pages/admin/ftmProviderServices/ViewAdminFtmChipDetails.js +++ b/pmp-revamp-ui/src/pages/admin/ftmProviderServices/ViewAdminFtmChipDetails.js @@ -12,7 +12,6 @@ import somethingWentWrongIcon from '../../../svg/something_went_wrong_icon.svg'; import fileUpload from '../../../svg/file_upload_icon.svg'; import file from '../../../svg/file_icon.svg'; import { HttpService } from '../../../services/HttpService'; -import FtmList from '../../partner/ftmProviderServices/FtmList'; function ViewAdminFtmChipDetails() { const { t } = useTranslation(); @@ -111,8 +110,8 @@ function ViewAdminFtmChipDetails() {
-

- {t('ftmList.ftmId')}: {ftmDetails.ftmId} +

+ {t('ftmList.ftmId')}: {ftmDetails.ftmId}

diff --git a/pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js b/pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js index 3394e042e..3cb3fac0c 100644 --- a/pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js +++ b/pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js @@ -165,8 +165,8 @@ function ViewPartnerDetails() {
-

- {t('partnerList.partnerId')}: {partnerDetails.partnerId} +

+ {t('partnerList.partnerId')}: {partnerDetails.partnerId}

diff --git a/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js b/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js index d9445b394..0cccdaa3b 100644 --- a/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js +++ b/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js @@ -116,8 +116,8 @@ function ViewPolicy() {
-

- {t('policiesList.policyId')}: {viewDetails.policyId} +

+ {t('policiesList.policyId')}: {viewDetails.policyId}

diff --git a/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicyGroupDetails.js b/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicyGroupDetails.js index 17c2e69f9..2b6a0a6a6 100644 --- a/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicyGroupDetails.js +++ b/pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicyGroupDetails.js @@ -51,8 +51,8 @@ function ViewPolicyGroupDetails() {
-

- {t('policyGroupList.policyGroupId')}: {policyGroupDetails.id} +

+ {t('policyGroupList.policyGroupId')}: {policyGroupDetails.id}

diff --git a/pmp-revamp-ui/src/pages/admin/policyRequests/ViewPolicyRequestDetails.js b/pmp-revamp-ui/src/pages/admin/policyRequests/ViewPolicyRequestDetails.js index cffb8571c..959e41704 100644 --- a/pmp-revamp-ui/src/pages/admin/policyRequests/ViewPolicyRequestDetails.js +++ b/pmp-revamp-ui/src/pages/admin/policyRequests/ViewPolicyRequestDetails.js @@ -42,8 +42,8 @@ function ViewPolicyRequestDetails() {
-

- {t('partnerList.partnerId')}: {policyRequestDetails.partnerId} +

+ {t('partnerList.partnerId')}: {policyRequestDetails.partnerId}

diff --git a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewApiKeyDetails.js b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewApiKeyDetails.js index 20705b5ad..e0a28fa6b 100644 --- a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewApiKeyDetails.js +++ b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewApiKeyDetails.js @@ -40,8 +40,8 @@ function ViewApiKeyDetails() {
-

- {t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel} +

+ {t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel}

diff --git a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js index a8b74a906..2b4902087 100644 --- a/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js +++ b/pmp-revamp-ui/src/pages/partner/authenticationServices/ViewOidcClientDetails.js @@ -49,7 +49,7 @@ function ViewOidcClientDetails() {
-

{t('authenticationServices.oidcClientName')}: {oidcClientDetails.clientNameEng}

+

{t('authenticationServices.oidcClientName')}: {oidcClientDetails.clientNameEng}

{getStatusCode(oidcClientDetails.status, t)} @@ -144,14 +144,6 @@ function ViewOidcClientDetails() {
-
-

- {t("authenticationServices.oidcClientName")} -

-

- {oidcClientDetails.clientNameEng} -

-

{t("viewOidcClientDetails.publicKey")} diff --git a/pmp-revamp-ui/src/pages/partner/deviceProviderServices/ViewDeviceDetails.js b/pmp-revamp-ui/src/pages/partner/deviceProviderServices/ViewDeviceDetails.js index 612cb8b4c..765836665 100644 --- a/pmp-revamp-ui/src/pages/partner/deviceProviderServices/ViewDeviceDetails.js +++ b/pmp-revamp-ui/src/pages/partner/deviceProviderServices/ViewDeviceDetails.js @@ -64,8 +64,8 @@ function ViewDeviceDetails() {

-

- {t('devicesList.deviceId')}: {deviceDetails.deviceId} +

+ {t('devicesList.deviceId')}: {deviceDetails.deviceId}

diff --git a/pmp-revamp-ui/src/pages/partner/ftmProviderServices/ViewFtmChipDetails.js b/pmp-revamp-ui/src/pages/partner/ftmProviderServices/ViewFtmChipDetails.js index 9d33b55c1..b9d391714 100644 --- a/pmp-revamp-ui/src/pages/partner/ftmProviderServices/ViewFtmChipDetails.js +++ b/pmp-revamp-ui/src/pages/partner/ftmProviderServices/ViewFtmChipDetails.js @@ -160,8 +160,8 @@ function ViewFtmChipDetails() {
-

- {t('ftmList.ftmId')}: {ftmDetails.ftmId} +

+ {t('ftmList.ftmId')}: {ftmDetails.ftmId}

diff --git a/pmp-revamp-ui/src/pages/partner/policies/PoliciesFilter.js b/pmp-revamp-ui/src/pages/partner/policies/PoliciesFilter.js index 68feb35b7..64a4bd0cc 100644 --- a/pmp-revamp-ui/src/pages/partner/policies/PoliciesFilter.js +++ b/pmp-revamp-ui/src/pages/partner/policies/PoliciesFilter.js @@ -9,6 +9,7 @@ function PoliciesFilter({ filteredPoliciesList, onFilterChange }) { const [partnerIdData, setPartnerIdData] = useState([]); const [partnerTypeData, setPartnerTypeData] = useState([]); const [policyGroupNameData, setPolicyGroupNameData] = useState([]); + const [policyIdData, setPolicyIdData] = useState([]); const [policyNameData, setPolicyNameData] = useState([]); const [statusData, setStatusData] = useState([]); @@ -17,6 +18,7 @@ function PoliciesFilter({ filteredPoliciesList, onFilterChange }) { setPartnerIdData(createDropdownData('partnerId', '', true, filteredPoliciesList, t, t('policies.selectPartnerId'))); setPartnerTypeData(createDropdownData('partnerType', '', true, filteredPoliciesList, t, t('policies.selectPartnerType'))); setPolicyGroupNameData(createDropdownData('policyGroupName', '', true, filteredPoliciesList, t, t('policies.selectPolicyGroup'))); + setPolicyIdData(createDropdownData('policyId', '', true, filteredPoliciesList, t, t('policies.selectPolicyId'))); setPolicyNameData(createDropdownData('policyName', '', true, filteredPoliciesList, t, t('policies.selectPolicyName'))); setStatusData(createDropdownData('status', '', true, filteredPoliciesList, t, t('policies.selectStatus'))); }; @@ -68,6 +70,17 @@ function PoliciesFilter({ filteredPoliciesList, onFilterChange }) { id='policy_group_filter' > + + showViewPolicyDetails(partner)} className="px-2">{partner.partnerId} showViewPolicyDetails(partner)} className="px-2">{getPartnerTypeDescription(partner.partnerType, t)} showViewPolicyDetails(partner)} className="px-2">{partner.policyGroupName} + showViewPolicyDetails(partner)} className="px-2">{partner.policyId} showViewPolicyDetails(partner)} className="px-2">{partner.policyName} showViewPolicyDetails(partner)} className="px-2">{formatDate(partner.createdDateTime, 'date', true)} showViewPolicyDetails(partner)} className=""> diff --git a/pmp-revamp-ui/src/pages/partner/policies/ViewPolicyDetails.js b/pmp-revamp-ui/src/pages/partner/policies/ViewPolicyDetails.js index 150a70bca..a14b40ff6 100644 --- a/pmp-revamp-ui/src/pages/partner/policies/ViewPolicyDetails.js +++ b/pmp-revamp-ui/src/pages/partner/policies/ViewPolicyDetails.js @@ -42,7 +42,7 @@ function ViewPolicyDetails() {
-

{t('viewPolicyDetails.policyName')}: {policyDetails.policyName}

+

{t('policies.policyId')}: {policyDetails.policyId}

-
+

{t("viewPolicyDetails.partnerId")}