MOSIP-36311: Integrated server side pagination and sorting with v3 en… (

#850) * MOSIP-36311: Added separate state variables for sorting and pagination Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36311: Added separate state variables for sorting and pagination Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36311: Added separate state variables for sorting and pagination Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]>
mosip · Oct 21, 2024 · fb4cc16 · fb4cc16
1 parent 9c00644
commit fb4cc16
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 227 deletions.
diff --git a/pmp-reactjs-ui/public/i18n/ara.json b/pmp-reactjs-ui/public/i18n/ara.json
@@ -567,7 +567,8 @@
         "selectPartnerType": "حدد نوع الشريك",
         "selectEmailAddress": "حدد عنوان البريد الإلكتروني",
         "selectPolicyGroup": "حدد مجموعة السياسات",
-        "selectStatus": "حدد الحالة"
+        "selectStatus": "حدد الحالة",
+       "errorInPartnersList": "أثناء جلب تفاصيل الشركاء، واجهنا خطأً."
     },
     "viewPartnerDetails": {
         "viewPartnerDetails": "عرض تفاصيل الشريك",

diff --git a/pmp-reactjs-ui/public/i18n/eng.json b/pmp-reactjs-ui/public/i18n/eng.json
@@ -563,7 +563,8 @@
         "selectPartnerType": "Select Partner Type",
         "selectEmailAddress": "Select Email Address",
         "selectPolicyGroup": "Select Policy Group",
-        "selectStatus": "Select Status"
+        "selectStatus": "Select Status",
+       "errorInPartnersList": "While fetching partners details, we have encountered with an error."
     },
     "viewPartnerDetails": {
         "viewPartnerDetails": "View Partner Details",

diff --git a/pmp-reactjs-ui/public/i18n/fra.json b/pmp-reactjs-ui/public/i18n/fra.json
@@ -567,7 +567,8 @@
         "selectPartnerType":"Sélectionnez le type de partenaire",
         "selectEmailAddress": "Sélectionnez l'adresse e-mail",
         "selectPolicyGroup":"Sélectionnez un groupe de stratégies",
-        "selectStatus":"Sélectionnez le statut"
+        "selectStatus":"Sélectionnez le statut",
+       "errorInPartnersList": "Lors de la récupération des détails des partenaires, nous avons rencontré une erreur."
      },
      "viewPartnerDetails": {
          "viewPartnerDetails": "Afficher les détails du partenaire",

diff --git a/pmp-reactjs-ui/src/nav/SideNav.js b/pmp-reactjs-ui/src/nav/SideNav.js
@@ -36,6 +36,8 @@ function SideNav({ open, policyRequiredPartnerTypes, partnerType }) {
             setActiveIcon('ftmChipProviderServices');
         } else if (selectedPath.includes('rootTrustCertificateList')) {
             setActiveIcon("rootOfTrustCertificate");
+        } else if (selectedPath.includes('partnersList')) {
+            setActiveIcon("partner");
         }
         else {
             setActiveIcon("home");
@@ -90,7 +92,7 @@ function SideNav({ open, policyRequiredPartnerTypes, partnerType }) {
         navigate('/partnermanagement/admin/certificates/rootTrustCertificateList');
     };
     const showPartner = () => {
-        setActiveIcon("partner");
+        navigate('/partnermanagement/admin/partnersList');
     };
     const showAdminPolicies = () => {
         setActiveIcon("admin_policies");

diff --git a/pmp-reactjs-ui/src/pages/admin/certificates/RootTrustCertificateList.js b/pmp-reactjs-ui/src/pages/admin/certificates/RootTrustCertificateList.js
@@ -248,7 +248,7 @@ function RootTrustCertificateList() {
                   <div className="bg-[#FCFCFC] w-full mt-1 rounded-t-xl shadow-lg pt-3">
                     <FilterButtons
                       listTitle="rootTrustCertificate.listOfCertificates"
-                      dataList={filteredCertificateData}
+                      dataListLength={filteredCertificateData.length}
                       filter={filter}
                       onResetFilter={onResetFilter}
                       setFilter={setFilter}
@@ -478,7 +478,7 @@ function RootTrustCertificateList() {
                     </div>
                   </div>
                   <Pagination
-                    dataList={filteredCertificateData}
+                    dataListLength={filteredCertificateData.length}
                     selectedRecordsPerPage={selectedRecordsPerPage}
                     setSelectedRecordsPerPage={setSelectedRecordsPerPage}
                     setFirstIndex={setFirstIndex}