[MOSIP:33827,MOSIP:33809,MOSIP:33796,MOSIP:33716]-UI bugs. (#460)

Signed-off-by: sudeep <[email protected]> Signed-off-by: Sudeep7353 <[email protected]>
mosip · Jun 14, 2024 · 9f28c0e · 9f28c0e
1 parent af48d7f
commit 9f28c0e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 17 deletions.
diff --git a/pmp-reactjs-ui/public/i18n/ara.json b/pmp-reactjs-ui/public/i18n/ara.json
@@ -368,11 +368,11 @@
         "KER-PCM-006": "لم يتم العثور على شهادات CA الجذر/CA المتوسطة.",
         "KER-PCM-008": "اسم المنظمة الشريكة غير متطابق",
         "KER-PCM-015": "الشهادة الموقعة ذاتيًا غير مسموح بها كشريك.",
-        "KER-PCM-004": "تواريخ الشهادة غير صالحة.",
+        "KER-PCM-004": "تاريخ انتهاء صلاحية الشهادة التي تم تحميلها أقل من سنة واحدة. الرجاء تحميل شهادة صالحة مرة أخرى.",
         "KER-KMS-013": "خطأ في تحليل الشهادة. تم تجاوز التجاوز، البايتات = 917",
         "PMS_AUT_001": "لم يتم العثور على جهاز تسجيل رمز النوع الفرعي للجهاز المسجل في قائمة أنواع USB",
         "PMS_PV_005": "معلمة إدخال غير صالحة - رمز الخطأ في بيانات السياسة",
-        "PMS_PRT_053": "التعيين موجود لسياسة وشريك محددين وهو في حالة تقدم.",
+        "PMS_PRT_053": "هذه السياسة معلقة بالفعل للموافقة عليها مقابل معرف الشريك الخاص بك.",
         "PMS_AUT_028": "تم رفض تفاصيل الجهاز الخاصة بمعرف $ID. لا يمكن استخدام نفس التفاصيل لرسم الخرائط.",
         "PMS_CERTIFICATE_ERROR_001": "حدث خطأ أثناء جلب شهادات الشريك.",
         "PMS_CERTIFICATE_ERROR_002": "معرف المستخدم غير موجود.",

diff --git a/pmp-reactjs-ui/public/i18n/eng.json b/pmp-reactjs-ui/public/i18n/eng.json
@@ -400,11 +400,11 @@
         "PMS_POL_059": "There are no active policy groups.",
         "KER-PCM-006": "Root CA/Intermediate CA Certificates not found.",
         "KER-PCM-015": "Self Signed Certificate not allowed as partner.",
-        "KER-PCM-004": "Certificate Dates are not valid.",
+        "KER-PCM-004": "Expiry date of uploaded certificate is less than 1 year. Please upload valid certificate again.",
         "KER-KMS-013": "Certificate Parsing Error.signed overrun, bytes = 917",
         "PMS_AUT_001": "Reg Device Sub Type Code not found in the list of Reg Device Sub Types",
         "PMS_PV_005": "Invalid input parameter - errorCode in policy data",
-        "PMS_PRT_053": "Mapping exists for given policy and partner and is in InProgress state.",
+        "PMS_PRT_053": "This policy is already pending for approval against your partner ID.",
         "PMS_AUT_028": "Device details for id $ID are rejected. Can't use same details for mapping.",
         "PMS_CERTIFICATE_ERROR_001": "Error while fetching partner certificates.",
         "PMS_CERTIFICATE_ERROR_002": "User Id does not exists.",

diff --git a/pmp-reactjs-ui/public/i18n/fra.json b/pmp-reactjs-ui/public/i18n/fra.json
@@ -369,11 +369,11 @@
         "PMS_POL_059": "Il n’existe aucun groupe de stratégies actif.",
         "KER-PCM-006": "Certificats d'autorité de certification racine/autorité de certification intermédiaire introuvables.",
         "KER-PCM-015": "Certificat auto-signé non autorisé en tant que partenaire.",
-        "KER-PCM-004": "Les dates des certificats ne sont pas valides.",
+        "KER-PCM-004": "La date d'expiration du certificat téléchargé est inférieure à 1 an. Veuillez télécharger à nouveau un certificat valide.",
         "KER-KMS-013": "Erreur d'analyse du certificat. dépassement de signature, octets = 917",
         "PMS_AUT_001": "Code de sous-type de périphérique Reg introuvable dans la liste des sous-types de périphérique Reg",
         "PMS_PV_005": "Paramètre d'entrée non valide - errorCode dans les données de stratégie",
-        "PMS_PRT_053": "Le mappage existe pour une politique et un partenaire donnés et est en cours.",
+        "PMS_PRT_053": "Cette politique est déjà en attente d'approbation par rapport à votre identifiant de partenaire.",
         "PMS_AUT_028": "Les détails de l'appareil pour l'identifiant $ID sont rejetés. Impossible d'utiliser les mêmes détails pour le mappage.",
         "PMS_CERTIFICATE_ERROR_001": "Erreur lors de la récupération des certificats partenaires.",
         "PMS_CERTIFICATE_ERROR_002": "L'ID utilisateur n'existe pas.",

diff --git a/pmp-reactjs-ui/src/nav/HeaderNav.js b/pmp-reactjs-ui/src/nav/HeaderNav.js
@@ -25,7 +25,7 @@ function HeaderNav({ open, setOpen }) {
     };
 
     return (
-        <nav className="sticky top-0 z-40 bg-white flex justify-between w-full h-16 font-inter 
+        <nav className="sticky top-0 z-50 bg-white flex justify-between w-full h-16 font-inter 
             shadow-[rgba(0,0,0,0.13)_5px_2px_8px_0px] ">
             <div className={`flex gap-x-4 h-16 items-center shadow-sm`}>
                 {!open && (

diff --git a/pmp-reactjs-ui/src/nav/SideNav.js b/pmp-reactjs-ui/src/nav/SideNav.js
@@ -54,7 +54,7 @@ function SideNav({ open }) {
         setActiveIcon("authenticationServices");
     };
     return (
-        <div className="flex font-inter bg-white h-screen z-30">
+        <div className="flex font-inter bg-white h-screen z-40">
             <div className={`h-full ${open ? "absolute inset-y-16 w-64" : "absolute inset-y-16 w-20"} 
             flex-col duration-500`}>
                 <ul className="pt-3 h-full space-y-5 bg-[#FCFCFC] shadow-[rgba(0,0,0,0.13)_5px_2px_8px_-2px]">

diff --git a/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js b/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js
@@ -231,14 +231,14 @@ function UploadCertificate({ closePopup, partnerData }) {
                                 )}
                                 {uploadSuccess && successMsg && (
                                     <div className="absolute inset-0 flex justify-center">
-                                        <div className="bg-fruit-salad w-full h-[50px] flex items-center justify-between p-4">
+                                        <div className="bg-fruit-salad md:w-[25rem] w-full min-h-[3.2rem] h-fit flex items-center justify-between p-4">
                                             <SuccessMessage successMsg={successMsg} clickOnCancel={cancelSuccessMsg}></SuccessMessage>
                                         </div>
                                     </div>
                                 )}
                                 {uploadFailure && errorMsg && (
-                                    <div className="absolute inset-0 flex justify-center w-full">
-                                        <div className="bg-moderate-red w-full h-[50px] flex items-center justify-between p-4 overflow-y-auto">
+                                    <div className="absolute inset-0 flex justify-center">
+                                        <div className="bg-moderate-red md:w-[25rem] w-full min-h-[3.2rem] h-fit flex items-center justify-between p-3 overflow-y-auto">
                                             <ErrorMessage errorCode={errorCode} errorMessage={errorMsg} clickOnCancel={cancelErrorMsg}></ErrorMessage>
                                         </div>
                                     </div>

diff --git a/pmp-reactjs-ui/src/pages/common/ErrorMessage.js b/pmp-reactjs-ui/src/pages/common/ErrorMessage.js
@@ -22,7 +22,7 @@ function ErrorMessage({ errorCode, errorMessage, clickOnCancel }) {
     return (
         <>
             <div className="h-full mr-8">
-                <p className=" text-sm font-bold text-white break-words font-inter pb-1">
+                <p className=" text-sm font-bold text-white break-words font-inter">
                     {errorMsg}
                 </p>
             </div>

diff --git a/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js b/pmp-reactjs-ui/src/pages/common/fields/DropdownComponent.js
@@ -69,7 +69,7 @@ function DropdownComponent({ fieldName, dropdownDataList, onDropDownChangeEvent,
                     </svg>
                 </button>
                 {isDropdownOpen && (
-                    <div className={`absolute z-50 top-10 left-0 w-full ${(styleSet && styleSet.selectionBox) ? styleSet.selectionBox : ''}`}>
+                    <div className={`absolute z-30 top-10 left-0 w-full ${(styleSet && styleSet.selectionBox) ? styleSet.selectionBox : ''}`}>
                         <div className="z-10 border border-gray-400 scroll-auto bg-white rounded-md shadow-lg w-full dark:bg-gray-700 cursor-pointer">
                             {dropdownDataList.length === 0 && (
                                 <div className="min-h-3 p-4">

diff --git a/pmp-reactjs-ui/src/pages/common/fields/DropdownWithSearchComponent.js b/pmp-reactjs-ui/src/pages/common/fields/DropdownWithSearchComponent.js
@@ -74,7 +74,7 @@ function DropdownWithSearchComponent({ fieldName, dropdownDataList, onDropDownCh
                     </svg>
                 </button>
                 {isDropdownOpen && (
-                    <div className={`absolute z-50 top-10 left-0 w-full ${(styleSet && styleSet.selectionBox) ? styleSet.selectionBox : ''}`}>
+                    <div className={`absolute z-30 top-10 left-0 w-full ${(styleSet && styleSet.selectionBox) ? styleSet.selectionBox : ''}`}>
                         <div className="z-10 border border-gray-400 bg-white rounded-md shadow-lg w-full cursor-pointer">
                             <div className="p-2 border-b border-gray-200 shadow-sm relative">
                                 <span className="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">

diff --git a/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js b/pmp-reactjs-ui/src/pages/dashboard/SelectPolicyPopup.js
@@ -173,10 +173,15 @@ function SelectPolicyPopup() {
                         </div>
                         <div className="border-[#E5EBFA] border-t mx-2"></div>
                         <div className="p-5 flex justify-between relative">
-                            <p className="text-[#333333] text-sm font-medium ml-2">{t('selectPolicyPopup.logoutMsg')} 
+                            <p className="text-[#333333] text-sm font-medium ml-2">{t('selectPolicyPopup.logoutMsg')}
                                 <span className="text-tory-blue font-semibold cursor-pointer" onClick={logout}> {t('commons.logout')}</span>
                             </p>
-                            <button className="w-40 h-12 border-[#1447B2] border bg-tory-blue rounded-lg text-white text-sm font-semibold relative z-60" onClick={clickOnSubmit}>
+                            <button
+                                className={`w-40 h-12 border-[#1447B2] border rounded-lg text-white text-sm font-semibold relative z-60 
+                                ${selectedPolicyGroup ? 'bg-tory-blue cursor-pointer' : 'bg-gray-400 cursor-not-allowed opacity-55'}`}
+                                onClick={clickOnSubmit}
+                                disabled={!selectedPolicyGroup}
+                            >
                                 {t('selectPolicyPopup.submit')}
                             </button>
                         </div>

diff --git a/pmp-reactjs-ui/src/pages/policies/Policies.js b/pmp-reactjs-ui/src/pages/policies/Policies.js
@@ -373,7 +373,7 @@ function Policies() {
                                   <td onClick={() => showViewPolicyDetails(partner)} className="px-2">{getPartnerTypeDescription(partner.partnerType, t)}</td>
                                   <td onClick={() => showViewPolicyDetails(partner)} className="px-2">{partner.policyGroupName}</td>
                                   <td onClick={() => showViewPolicyDetails(partner)} className="px-2">{partner.policyName}</td>
-                                  <td onClick={() => showViewPolicyDetails(partner)} className="px-2">{formatDate(partner.createDate, 'dateTime')}</td>
+                                  <td onClick={() => showViewPolicyDetails(partner)} className="px-2">{formatDate(partner.createDate, 'date')}</td>
                                   <td onClick={() => showViewPolicyDetails(partner)} className="">
                                     <div className={`${bgOfStatus(partner.status)} flex w-fit py-1.5 px-2 m-3 text-xs font-medium rounded-md`}>
                                       {getStatusCode(partner.status, t)}