Skip to content

Commit

Permalink
MOSIP-38031: Added policyId column in policy list and changes in view…
Browse files Browse the repository at this point in the history
… page subtitle (#1076)

* MOSIP-38031: Changes in view page subtitle

Signed-off-by: Swetha K <[email protected]>

* MOSIP-38031: Changes in view page subtitle

Signed-off-by: Swetha K <[email protected]>

---------

Signed-off-by: Swetha K <[email protected]>
Co-authored-by: Swetha K <[email protected]>
  • Loading branch information
SwethaKrish4 and Swetha K authored Jan 9, 2025
1 parent 63c60ce commit 75549a3
Show file tree
Hide file tree
Showing 20 changed files with 50 additions and 46 deletions.
2 changes: 2 additions & 0 deletions pmp-revamp-ui/public/i18n/ara.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"partnerType": "نوع الشريك",
"partnerId": "معرف الشريك",
"policyGroupName": "مجموعة السياسات",
"policyId":"معرف السياسة",
"policyName": "اسم السياسة",
"createdDate": "تاريخ الإنشاء",
"status": "حالة",
Expand All @@ -187,6 +188,7 @@
"selectPolicyGroup": "حدد مجموعة السياسات",
"selectPolicyName": "حدد اسم السياسة",
"selectStatus": "حدد الحالة",
"selectPolicyId": "حدد معرف السياسة",
"errorInPoliciesList": "هناك بعض الخطأ في جلب السياسات. حاول مرة أخرى في وقت لاحق!"
},
"viewPolicyDetails": {
Expand Down
2 changes: 2 additions & 0 deletions pmp-revamp-ui/public/i18n/eng.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"partnerId": "Partner ID",
"partnerType": "Partner Type",
"policyGroupName": "Policy Group",
"policyId":"Policy ID",
"policyName": "Policy Name",
"createdDate": "Created Date",
"status": "Status",
Expand All @@ -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": {
Expand Down
2 changes: 2 additions & 0 deletions pmp-revamp-ui/public/i18n/fra.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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!"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ function ViewAdminApiKeyDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel}
<p className="text-lg text-dark-blue mb-2">
{t('apiKeysList.apiKeyName')}: <span className="font-semibold">{apiKeyDetails.apiKeyLabel}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(apiKeyDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function ViewAdminOidcClientDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">{t('authenticationServices.oidcClientName')}: {selectedClientData.clientNameEng}</p>
<p className="text-lg text-dark-blue mb-2">{t('authenticationServices.oidcClientName')}: <span className="font-semibold">{selectedClientData.clientNameEng}</span></p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(oidcClientDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
{getStatusCode(selectedClientData.status, t)}
Expand Down Expand Up @@ -207,14 +207,6 @@ function ViewAdminOidcClientDetails() {
</div>
<hr className="h-px w-full bg-gray-200 border-0" />
<div className="space-y-6">
<div className="my-4">
<p id='oidc_client_details_oidc_client_name_label' className="font-[600] text-suva-gray text-sm">
{t("authenticationServices.oidcClientName")}
</p>
<p id='oidc_client_details_client_name_context' className="font-[600] text-vulcan text-md">
{selectedClientData.clientNameEng}
</p>
</div>
<div className="my-3 space-y-2 break-all">
<p id='oidc_client_details_public_key_label' className="font-[600] text-suva-gray text-sm">
{t("viewOidcClientDetails.publicKey")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ function ViewCertificateDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2 break-all">
{t('certificatesList.certificateId')}: {viewCertDetails.certId}
<p className="text-lg text-dark-blue mb-2 break-all">
{t('certificatesList.certificateId')}: <span className="font-semibold">{viewCertDetails.certId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`font-semibold text-sm text-dark-blue`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ function ViewAdminDeviceDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-md shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('devicesList.deviceId')}: {deviceDetails.deviceId}
<p className="text-lg text-dark-blue mb-2">
{t('devicesList.deviceId')}: <span className="font-semibold">{deviceDetails.deviceId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(deviceDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ function ViewAdminSbiDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-md shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('sbiList.sbiId')}: {sbiDetails.sbiId}
<p className="text-lg text-dark-blue mb-2">
{t('sbiList.sbiId')}: <span className="font-semibold">{sbiDetails.sbiId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(sbiDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -111,8 +110,8 @@ function ViewAdminFtmChipDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('ftmList.ftmId')}: {ftmDetails.ftmId}
<p className="text-lg text-dark-blue mb-2">
{t('ftmList.ftmId')}: <span className="font-semibold">{ftmDetails.ftmId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(ftmDetails.status, t)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
4 changes: 2 additions & 2 deletions pmp-revamp-ui/src/pages/admin/partners/ViewPartnerDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ function ViewPartnerDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('partnerList.partnerId')}: {partnerDetails.partnerId}
<p className="text-lg text-dark-blue mb-2">
{t('partnerList.partnerId')}: <span className="font-semibold">{partnerDetails.partnerId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${partnerDetails.isActive ? 'bg-[#D1FADF] text-[#155E3E]' : 'bg-[#EAECF0] text-[#525252]'} flex w-fit py-1 px-5 text-xs rounded-md my-2 font-semibold`}>
Expand Down
4 changes: 2 additions & 2 deletions pmp-revamp-ui/src/pages/admin/policyManager/ViewPolicy.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ function ViewPolicy() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2 break-all">
{t('policiesList.policyId')}: {viewDetails.policyId}
<p className="text-lg text-dark-blue mb-2 break-all">
{t('policiesList.policyId')}: <span className="font-semibold">{viewDetails.policyId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(getPolicyStatus(viewDetails), t)} flex w-fit py-1 px-5 text-xs rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ function ViewPolicyGroupDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2 break-all">
{t('policyGroupList.policyGroupId')}: {policyGroupDetails.id}
<p className="text-lg text-dark-blue mb-2 break-all">
{t('policyGroupList.policyGroupId')}: <span className="font-semibold">{policyGroupDetails.id}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(policyGroupDetails.isActive ? 'ACTIVE' : 'INACTIVE', t)} flex w-fit py-1 px-5 text-xs rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function ViewPolicyRequestDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-md shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col py-3">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('partnerList.partnerId')}: {policyRequestDetails.partnerId}
<p className="text-lg text-dark-blue mb-2">
{t('partnerList.partnerId')}: <span className="font-semibold">{policyRequestDetails.partnerId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(policyRequestDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function ViewApiKeyDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('apiKeysList.apiKeyName')}: {apiKeyDetails.apiKeyLabel}
<p className="text-lg text-dark-blue mb-2">
{t('apiKeysList.apiKeyName')}: <span className="font-semibold">{apiKeyDetails.apiKeyLabel}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(apiKeyDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function ViewOidcClientDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">{t('authenticationServices.oidcClientName')}: {oidcClientDetails.clientNameEng}</p>
<p className="text-lg text-dark-blue mb-2">{t('authenticationServices.oidcClientName')}: <span className="font-semibold">{oidcClientDetails.clientNameEng}</span></p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(oidcClientDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
{getStatusCode(oidcClientDetails.status, t)}
Expand Down Expand Up @@ -144,14 +144,6 @@ function ViewOidcClientDetails() {
</div>
<hr className="h-px w-full bg-gray-200 border-0" />
<div className="space-y-6">
<div className="my-4">
<p id='oidc_client_details_oidc_client_name_label' className="font-[600] text-suva-gray text-xs">
{t("authenticationServices.oidcClientName")}
</p>
<p id='oidc_client_details_client_name_context' className="font-[600] text-vulcan text-sm">
{oidcClientDetails.clientNameEng}
</p>
</div>
<div className="my-3 space-y-2 break-all">
<p id='oidc_client_details_public_key_label' className="font-[600] text-suva-gray text-xs">
{t("viewOidcClientDetails.publicKey")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ function ViewDeviceDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('devicesList.deviceId')}: {deviceDetails.deviceId}
<p className="text-lg text-dark-blue mb-2">
{t('devicesList.deviceId')}: <span className="font-semibold">{deviceDetails.deviceId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(deviceDetails.status, t)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ function ViewFtmChipDetails() {
<div className="bg-snow-white h-fit mt-1 rounded-t-xl shadow-lg font-inter">
<div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
<div className="flex-col">
<p className="font-semibold text-lg text-dark-blue mb-2">
{t('ftmList.ftmId')}: {ftmDetails.ftmId}
<p className="text-lg text-dark-blue mb-2">
{t('ftmList.ftmId')}: <span className="font-semibold">{ftmDetails.ftmId}</span>
</p>
<div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
<div className={`${bgOfStatus(ftmDetails.status, t)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
Expand Down
Loading

0 comments on commit 75549a3

Please sign in to comment.