| showViewPartnerDetails(partner)} className="px-2 break-all">{partner.partnerID} | + className={`border-t border-[#E5EBFA] cursor-pointer text-[0.8rem] text-[#191919] font-semibold break-words ${partner.isActive === false ? "text-[#969696]" : "text-[#191919]"}`}> +showViewPartnerDetails(partner)} className="px-2 break-all">{partner.partnerId} | showViewPartnerDetails(partner)} className="px-2 break-all">{partner.partnerType} | showViewPartnerDetails(partner)} className="px-2 break-all">{partner.orgName} | -showViewPartnerDetails(partner)} className="px-2 break-all">{partner.emailID} | -showViewPartnerDetails(partner)} className="px-2 break-all">{partner.policyGroup} | -showViewPartnerDetails(partner)} className={`px-3 break-all ${partner.certUploadStatus === 'notUploaded' && "text-[#BE1818]"}`}> - {getStatusCode(partner.certUploadStatus, t)} + | showViewPartnerDetails(partner)} className="px-2 break-all">{partner.policyGroupName ? partner.policyGroupName : "-"} | +showViewPartnerDetails(partner)} className="px-2 break-all">{partner.emailAddress} | +showViewPartnerDetails(partner)} className={`px-3 break-all ${partner.certificateUploadStatus === 'not_uploaded' && "text-[#BE1818]"}`}> + {getStatusCode(partner.certificateUploadStatus, t)} | showViewPartnerDetails(partner)} className="break-all">
-
- {getStatusCode(partner.status, t)}
+
+ {partner.isActive ? t('statusCodes.activated'): t('statusCodes.deactivated')}
|
@@ -432,7 +323,7 @@ function PartnersList() {
{t("partnerList.view")}
- showDeactivatePartner(partner)} className={`py-1.5 px-4 ${isLoginLanguageRTL ? "pl-10" : "pr-10"} ${partner.status === "approved" ? "text-crimson-red cursor-pointer" : "text-[#A5A5A5] cursor-auto"} hover:bg-gray-100`} + showDeactivatePartner(partner)} className={`py-1.5 px-4 ${isLoginLanguageRTL ? "pl-10" : "pr-10"} ${partner.isActive === true ? "text-crimson-red cursor-pointer" : "text-[#A5A5A5] cursor-auto"} hover:bg-gray-100`} tabIndex="0" onKeyPress={(e) => onPressEnterKey(e, () => showDeactivatePartner(partner))} > {t("partnerList.deActivate")} @@ -447,12 +338,15 @@ function PartnersList() { |
onPressEnterKey(e,onResetFilter)}
diff --git a/pmp-reactjs-ui/src/pages/common/Pagination.js b/pmp-reactjs-ui/src/pages/common/Pagination.js
index 1fc61fbd..a3716419 100644
--- a/pmp-reactjs-ui/src/pages/common/Pagination.js
+++ b/pmp-reactjs-ui/src/pages/common/Pagination.js
@@ -6,10 +6,11 @@ import { isLangRTL, handleMouseClickForDropdown, onPressEnterKey } from '../../u
import { AiFillLeftCircle, AiFillRightCircle } from "react-icons/ai"; // icons form react-icons
import { IconContext } from "react-icons"; // for customizing icons
-function Pagination({ dataList, selectedRecordsPerPage, setSelectedRecordsPerPage, setFirstIndex}) {
+function Pagination({ dataListLength, selectedRecordsPerPage, setSelectedRecordsPerPage, setFirstIndex, isServerSideFilter=false, getPaginationValues}) {
const { t } = useTranslation();
const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode);
const [isItemsPerPageOpen, setIsItemsPerPageOpen] = useState(false);
+ const [selectedPage, setSelectedPage] = useState(0);
const itemsPerPageOptions = [8, 16, 24, 32];
const itemsCountSelectionRef = useRef(null);
@@ -17,8 +18,15 @@ function Pagination({ dataList, selectedRecordsPerPage, setSelectedRecordsPerPag
handleMouseClickForDropdown(itemsCountSelectionRef, () => setIsItemsPerPageOpen(false));
}, [itemsCountSelectionRef]);
+ useEffect(() =>{
+ if(isServerSideFilter) {
+ getPaginationValues(selectedRecordsPerPage, selectedPage);
+ }
+ }, [selectedPage, selectedRecordsPerPage]);
+
const handlePageChange = (event) => {
- const newIndex = (event.selected * selectedRecordsPerPage) % dataList.length;
+ setSelectedPage(event.selected);
+ const newIndex = (event.selected * selectedRecordsPerPage) % dataListLength;
setFirstIndex(newIndex);
};
const changeItemsPerPage = (num) => {
@@ -35,7 +43,7 @@ function Pagination({ dataList, selectedRecordsPerPage, setSelectedRecordsPerPag
pageClassName={"page-item"}
activeClassName={"active"}
onPageChange={(event) => handlePageChange(event)}
- pageCount={Math.ceil(dataList.length / selectedRecordsPerPage)}
+ pageCount={Math.ceil(dataListLength / selectedRecordsPerPage)}
breakLabel="..."
previousLabel={
{filter &&