Merge pull request #392 from Bonymol-aot/FWF-4135/UI-issues

Resolved UI issues in roles and table
AOT-Technologies · Jan 1, 2025 · 8ef7068 · 8ef7068
2 parents bd6c552 + 09a4d3c
commit 8ef7068
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx
@@ -64,9 +64,13 @@ const Roles = React.memo((props: any) => {
   const [permission, setPermission] = React.useState([]);
 
   const filterList = (filterTerm, List) => {
-    let roleList = removingTenantId(List,tenantId);
+    let roleList = removingTenantId(List, tenantId);
+
+    // Escape backslashes and square brackets in filterTerm for safe regex use
+    const escapedFilterTerm = filterTerm.replace(/([\\[])/g, '\\$1');
+
     let newRoleList = roleList.filter((role) => {
-      return role.name.toLowerCase().search(filterTerm.toLowerCase()) !== -1;
+      return role.name.toLowerCase().search(escapedFilterTerm.toLowerCase()) !== -1;
     });
     return newRoleList;
   };

diff --git a/forms-flow-admin/src/index.scss b/forms-flow-admin/src/index.scss
@@ -11,10 +11,6 @@ bottom: 0;
     color: #0072ed !important;
 }
 
-.react-bootstrap-table table {
-    min-height: 60vh;
-  }
-
-  .react-bootstrap-table{
-    min-height: 65vh;
-  }
+
+
+
diff --git a/forms-flow-theme/scss/_table.scss b/forms-flow-theme/scss/_table.scss
@@ -95,6 +95,12 @@ $status-radius: 50%;
   }
 }
 
+.custom-table th,
+.custom-table td {
+  vertical-align: middle;
+}
+
+
 .width-40 {
   width: 25rem !important;
   max-width: 40% !important;