MOSIP-36145: Removed filter and sorting for validity status column (#…

…1024) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]>
mosip · Dec 13, 2024 · 0198ec8 · 0198ec8
1 parent 0cfb4a9
commit 0198ec8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 33 deletions.
diff --git a/pmp-revamp-ui/public/i18n/ara.json b/pmp-revamp-ui/public/i18n/ara.json
@@ -571,7 +571,7 @@
         "issuedBy": "صادرة عن",
         "validFrom": "صالح من",
         "validTill": "صالح حتى",
-        "timeOfUpload": "تاريخ ووقت التحميل",
+        "timeOfUpload": "تم التحميل على",
         "validityStatus": "حالة الصلاحية",
         "action": "فعل",
         "UploadCertBtn": "تحميل الشهادة",

diff --git a/pmp-revamp-ui/public/i18n/eng.json b/pmp-revamp-ui/public/i18n/eng.json
@@ -566,7 +566,7 @@
         "issuedBy": "Issued By",
         "validFrom": "Valid From",
         "validTill": "Valid Till",
-        "timeOfUpload": "Upload Date & Time",
+        "timeOfUpload": "Uploaded On",
         "validityStatus": "Validity Status",
         "action": "Action",
         "UploadCertBtn": "Upload Certificate",

diff --git a/pmp-revamp-ui/public/i18n/fra.json b/pmp-revamp-ui/public/i18n/fra.json
@@ -571,7 +571,7 @@
         "issuedBy": "Délivré par",
         "validFrom": "Valable à partir de",
         "validTill": "Valable jusqu'à",
-        "timeOfUpload": "Date et heure de téléchargement",
+        "timeOfUpload": "Téléchargé le",
         "validityStatus": "Statut de validité",
         "action": "Action",
         "UploadCertBtn": "Télécharger le certificat",

diff --git a/pmp-revamp-ui/src/pages/admin/certificates/CertificatesFilter.js b/pmp-revamp-ui/src/pages/admin/certificates/CertificatesFilter.js
@@ -15,27 +15,18 @@ function CertificatesFilter({ onApplyFilter }) {
         { partnerDomain: 'DEVICE' },
         { partnerDomain: 'AUTH' }
     ]);
-    const [validityStatusData, setValidityStatusData] = useState([]);
-    const [validityStatusDropdownData, setValidityStatusDropdownData] = useState([
-        { validityStatus: 'expired' },
-        { validityStatus: 'valid' }
-    ]);
     const [filters, setFilters] = useState({
         certificateId: "",
         partnerDomain: "",
         issuedTo: "",
         issuedBy: "",
-        validityStatus: "",
     });
 
     useEffect(() => {
         const fetchData = async () => {
             setPartnerDomainData(
                 createDropdownData("partnerDomain", "", true, partnerDomainDropdownData, t, t("certificatesList.selectPartnerDomain"))
             );
-            setValidityStatusData(
-                createDropdownData("validityStatus", "", true, validityStatusDropdownData, t, t("certificatesList.selectValidityStatus"))
-            );
         };
         fetchData();
     }, [t]);
@@ -98,16 +89,6 @@ function CertificatesFilter({ onApplyFilter }) {
                     styleSet={styleSet}
                     id='cert_issued_by_domain_filter'
                 />
-                <DropdownComponent
-                    fieldName='validityStatus'
-                    dropdownDataList={validityStatusData}
-                    onDropDownChangeEvent={onFilterChangeEvent}
-                    fieldNameKey='certificatesList.validityStatus'
-                    placeHolderKey='certificatesList.selectValidityStatus'
-                    styleSet={styles}
-                    isPlaceHolderPresent={true}
-                    id='cert_validity_status_filter'
-                />
                 <div className={`mt-6 mr-6 ${isLoginLanguageRTL ? "mr-auto" : "ml-auto"}`}>
                     <button
                     id="apply_filter__btn"

diff --git a/pmp-revamp-ui/src/pages/admin/certificates/CertificatesList.js b/pmp-revamp-ui/src/pages/admin/certificates/CertificatesList.js
@@ -55,8 +55,7 @@ function CertificatesList({ certificateType, uploadCertificateBtnName, subTitle,
     certificateId: null,
     partnerDomain: null,
     issuedTo: null,
-    issuedBy: null,
-    validityStatus: null
+    issuedBy: null
   });
 
   const submenuRef = useRef([]);
@@ -93,11 +92,6 @@ function CertificatesList({ certificateType, uploadCertificateBtnName, subTitle,
     if (filterAttributes.partnerDomain) queryParams.append('partnerDomain', filterAttributes.partnerDomain);
     if (filterAttributes.issuedTo) queryParams.append('issuedTo', filterAttributes.issuedTo);
     if (filterAttributes.issuedBy) queryParams.append('issuedBy', filterAttributes.issuedBy);
-    // Check filters.status
-    if (filterAttributes.validityStatus !== null) {
-      if (filterAttributes.validityStatus === 'valid') queryParams.append('validityStatus', true);
-      else if (filterAttributes.validityStatus === 'expired') queryParams.append('validityStatus', false);
-    }
 
     const url = `${getPartnerManagerUrl('/partners/root-certificates', process.env.NODE_ENV)}?${queryParams.toString()}`;
     try {
@@ -250,7 +244,7 @@ function CertificatesList({ certificateType, uploadCertificateBtnName, subTitle,
                                       <th key={index} className="py-4 text-sm font-semibold text-[#6F6E6E] w-[14%]">
                                         <div className={`mx-2 flex gap-x-0 items-center ${isLoginLanguageRTL ? "text-right" : "text-left"}`}>
                                           {t(header.headerNameKey)}
-                                          {header.id !== "action" && (
+                                          {header.id !== "action" && header.id !== "validityStatus" && (
                                             <SortingIcon
                                               headerId={header.id}
                                               sortDescOrder={sortDescOrder}
@@ -292,8 +286,8 @@ function CertificatesList({ certificateType, uploadCertificateBtnName, subTitle,
                                                   <img src={viewIcon} alt="" className={``}></img>
                                               </div>
                                               <hr className="h-px bg-gray-100 border-0 mx-1" />
-                                              <div className="flex justify-between hover:bg-gray-100 px-2 py-2" tabIndex="0">
-                                                  <p id="certificate_list_view_btn" className={`max-w-28 cursor-pointer text-[#3E3E3E]`}>{t(downloadBtnName)}</p>
+                                              <div className={`flex justify-between hover:bg-gray-100 px-2 py-2 ${certificate.status === true ? 'cursor-pointer' : 'cursor-default'}`} tabIndex="0">
+                                                  <p id="certificate_list_view_btn" className={`max-w-28 ${certificate.status === true ? "text-[#3E3E3E]" : "text-[#A5A5A5]"}`}>{t(downloadBtnName)}</p>
                                                   <img src={downloadIcon} alt="" className={``}></img>
                                               </div>
                                             </div>

diff --git a/pmp-revamp-ui/src/utils/AppUtils.js b/pmp-revamp-ui/src/utils/AppUtils.js
@@ -323,7 +323,7 @@ export const createDropdownData = (fieldName, fieldDesc, isBlankEntryRequired, d
                     fieldCode: getPartnerTypeDescription(item[fieldName], t),
                     fieldValue: item[fieldName]
                 });
-            } else if (fieldName === "status" || fieldName === "certificateExpiryStatus" || fieldName === "certificateUploadStatus" || fieldName === "sbiExpiryStatus" || fieldName === "validityStatus") {
+            } else if (fieldName === "status" || fieldName === "certificateExpiryStatus" || fieldName === "certificateUploadStatus" || fieldName === "sbiExpiryStatus") {
                 dataArr.push({
                     fieldCode: getStatusCode(item[fieldName], t),
                     fieldValue: item[fieldName]