Merge pull request #18 from chaitanyakole/filter_fixes

[fix]Text corrections, Adding a cohort ID filter in the user list, Showing correct list in filter.
tekdi · Jan 6, 2025 · b2af1ec · b2af1ec
2 parents c31b03b + 32ff04d
commit b2af1ec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -218,7 +218,7 @@
     "SEARCH_COHORT": "Search Cohort",
     "DELETE_SUCCESSFULLY": "Cohort Deleted Successfully",
     "ALL_STATES": "All States",
-    "COHORT_MEMBER": "Cohort Member",
+    "COHORT_MEMBER": "Cohort",
     "ADD_NEW_COHORT_ADMIN": "Add New Cohort Admin"
   },
   "COURSE_PLANNER": {
@@ -448,7 +448,7 @@
     "SEARCH": "Search Tenant",
     "ROLE_ASSIGNED": "Role Created Successfully",
     "ROLE_ASSIGNED_fAILED": "Role Assigned Failed",
-    "TENANT_MEMBER": "Tenant Member",
+    "TENANT_MEMBER": "Tenant",
     "ALL_TENANTS": "All Tenants",
     "ADD_NEW_TENANT_ADMIN": "Add New Tenant Admin",
     "TENANT_ADMIN_CREATE": "Tenant Admin Created Successfully",

diff --git a/src/components/FormControl.tsx b/src/components/FormControl.tsx
@@ -56,7 +56,7 @@ const MultipleSelectCheckmarks: React.FC<MultipleSelectCheckmarksProps> = ({
     let selectedNames = typeof value === "string" ? value.split(",") : value;
 
     if (selectedNames.includes("all")) {
-      selectedNames = defaultValue ? [defaultValue] : [];
+      selectedNames = defaultValue ? [defaultValue] : ["All"];
     }
 
     const selectedCodes = selectedNames.map(

diff --git a/src/components/UserTable.tsx b/src/components/UserTable.tsx
@@ -299,15 +299,18 @@ const UserTable: React.FC<UserTableProps> = ({
       try {
         const result = await getTenantLists(filters);
         setListOfTenants(result);
+        const tenantId = filters?.tenantId
+          ? filters?.tenantId
+          : result?.[0]?.tenantId;
         let data = {
           limit: 0,
           offset: 0,
           filters: {
-            tenantId: result?.[0]?.tenantId,
+            tenantId: tenantId,
             // cohortId: cohortId,
           },
         };
-        if (filters?.tenantId) {
+        if (tenantId) {
           const cohortList = await getCohortList(data);
           setListOfCohorts(cohortList?.results);
         }
@@ -319,7 +322,7 @@ const UserTable: React.FC<UserTableProps> = ({
     if (filters) {
       fetchData();
     }
-  }, [filters]);
+  }, [filters, selectedCohort]);
 
   const handleChange = (event: SelectChangeEvent<typeof pageSize>) => {
     setPageSize(event.target.value);

diff --git a/src/pages/cohortAdminSchema.json b/src/pages/cohortAdminSchema.json
@@ -3,7 +3,7 @@
   "required": ["name", "username", "password"],
   "properties": {
     "name": {
-      "title": "Cohort Name",
+      "title": "Cohort Admin Name",
       "type": "string",
       "fieldId": null,
       "validation": [],

diff --git a/src/pages/tenantAdminSchema.json b/src/pages/tenantAdminSchema.json
@@ -5,7 +5,7 @@
   "required": ["name", "username", "password", "role"],
   "properties": {
     "name": {
-      "title": "Full Name",
+      "title": "Tenant Admin Name",
       "fieldId": null,
       "type": "string",
       "validation": []