Merge pull request #1948 from GluuFederation/admin-ui-issue-1947

fix(admin-ui): filter is not working on pagination in client active token list.
GluuFederation · Dec 31, 2024 · ebbe93d · ebbe93d
2 parents c581a8d + c4a18de
commit ebbe93d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientActiveTokens.js b/admin-ui/plugins/auth-server/components/Clients/ClientActiveTokens.js
@@ -61,7 +61,17 @@ function ClientActiveTokens({ client }) {
   const onPageChangeClick = (page) => {
     let startCount = page * limit;
     setPageNumber(page);
-    getTokens(parseInt(startCount), limit, `clnId=${client.inum}`);
+    let conditionquery = `clnId=${client.inum}`;
+    if (pattern.dateAfter && pattern.dateBefore) {
+      conditionquery += `,${searchFilter}>${dayjs(pattern.dateAfter).format(
+        "YYYY-MM-DD"
+      )}`;
+      conditionquery += `,${searchFilter}<${dayjs(pattern.dateBefore).format(
+        "YYYY-MM-DD"
+      )}`;
+    }
+
+    getTokens(parseInt(startCount), limit, `${conditionquery}`);
   };
 
   const onRowCountChangeClick = (count) => {