Merge branch 'main' into SBRP-111-remove-redundant-code

SMUGitGeeks · Nov 7, 2023 · 7c58dbc · 7c58dbc
2 parents a0027e7 + 9c6d15a
commit 7c58dbc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/client/src/components/pages/RoleListing.tsx b/client/src/components/pages/RoleListing.tsx
@@ -57,7 +57,9 @@ const RoleListing = ({
 
     // RoleList component ====================================================
     useEffect(() => {
-        getRoleListings(user);
+        if (roleListings.length === 0 || (filters.role.length === 0 && filters.department.length === 0 && filters.location.length === 0)) {
+            getRoleListings(user);
+        }
         if (roles.length === 0) {
             getRoles();
         }
@@ -67,7 +69,7 @@ const RoleListing = ({
 
     setTimeout(() => {
         setDataLoaded(true);
-    }, roleListings.length === 0 ? 3000 : 200);
+    }, 3000);
 
     const date = new Date();