From e2685e91abcdc78457dc0ecf56f134de877cb609 Mon Sep 17 00:00:00 2001 From: Novak Zaballa <41410593+novakzaballa@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:20:09 -0400 Subject: [PATCH] feat: Announcement per page accept an id list on the params key (#4280) --- frontend/web/components/AnnouncementPerPage.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/web/components/AnnouncementPerPage.tsx b/frontend/web/components/AnnouncementPerPage.tsx index 9c1ebd87043f..a6edc9460928 100644 --- a/frontend/web/components/AnnouncementPerPage.tsx +++ b/frontend/web/components/AnnouncementPerPage.tsx @@ -51,13 +51,18 @@ const AnnouncementPerPage: FC = ({ pathname }) => { obj1: AnnouncementPerPageValueType['params'], obj2: AnnouncementPerPageValueType['params'], ) => { - return Object.keys(obj1).every((key) => { - return `${obj1[key]}` === `${obj2[key]}` + return Object.keys(obj2).every((key) => { + if (Array.isArray(obj2[key])) { + return obj2[key].some((item) => { + return `${item}` === `${obj1[key]}` + }) + } else { + return `${obj1[key]}` === `${obj2[key]}` + } }) } - const annParamsMatch = objectsMatch(annParams, matchParams) const matchParamsMatch = objectsMatch(matchParams, annParams) - if (annParamsMatch || matchParamsMatch) { + if (matchParamsMatch) { return true }