Merge pull request #13 from chaitanyakole/bug_fixes

Search and sorting hide, remove roles and credeantials removed
tekdi · Dec 25, 2024 · e7221f4 · e7221f4
2 parents f5e429a + 57f06b0
commit e7221f4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 52 deletions.
diff --git a/src/components/HeaderComponent.tsx b/src/components/HeaderComponent.tsx
@@ -98,6 +98,7 @@ const HeaderComponent = ({
   tenantDefaultValue,
   isTenantShow,
   isCohortShow,
+  showSearch = true,
 }: any) => {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
@@ -664,15 +665,18 @@ const HeaderComponent = ({
             display: "flex",
             flexDirection: isMobile || isMediumScreen ? "column" : "row",
             gap: isMobile || isMediumScreen ? "8px" : "5%",
-            marginTop: "20px",
+            marginTop: showSearch ? "20px" : "10px",
+            p: showSearch ? "1%" : "1%",
           }}
         >
-          <Box sx={{ flex: 1, paddingLeft: "16px", paddingRight: "16px" }}>
-            <SearchBar
-              onSearch={handleSearch}
-              placeholder={searchPlaceHolder}
-            />
-          </Box>
+          {showSearch && (
+            <Box sx={{ flex: 1, paddingLeft: "16px", paddingRight: "16px" }}>
+              <SearchBar
+                onSearch={handleSearch}
+                placeholder={searchPlaceHolder}
+              />
+            </Box>
+          )}
           {showAddNew && (
             <Box
               display={"flex"}

diff --git a/src/pages/cohortSchema.json b/src/pages/cohortSchema.json
@@ -9,18 +9,6 @@
       "validation": [],
       "description": "Enter the cohort name."
     },
-    "username": {
-      "title": "Username",
-      "fieldId": null,
-      "type": "string",
-      "validation": []
-    },
-    "password": {
-      "title": "Password",
-      "fieldId": null,
-      "type": "string",
-      "validation": []
-    },
     "type": {
       "title": "Type",
       "type": "string",
@@ -42,19 +30,6 @@
       "readOnly": true,
       "validation": [],
       "description": "The current status of the cohort, this field is read-only."
-    },
-
-    "role": {
-      "title": "Role",
-      "type": "string",
-      "oneOf": [
-        {
-          "title": "Learner",
-          "const": "learner"
-        }
-      ],
-      "validation": []
     }
-  },
-  "dependencies": {}
+  }
 }
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -141,8 +141,6 @@ const LoginPage = () => {
 
         const userInfo = response?.userData;
         setAdminInfo(userInfo);
-        const tenantId = userInfo?.tenantData?.[0]?.tenantId;
-        localStorage.setItem("tenantId", tenantId);
         //set user info in zustand store
         if (typeof window !== "undefined" && window.localStorage) {
           localStorage.setItem("adminInfo", JSON.stringify(userInfo));

diff --git a/src/pages/tenant.tsx b/src/pages/tenant.tsx
@@ -251,11 +251,11 @@ const Tenant: React.FC = () => {
       "ui:help":
         "Password must be at least 8 characters long, with at least one letter and one number.",
     },
-    role: {
-      "ui:widget": "select",
-      "ui:placeholder": "Select a role",
-      // "ui:help": "Select a role.",
-    },
+    // role: {
+    //   "ui:widget": "select",
+    //   "ui:placeholder": "Select a role",
+    //   // "ui:help": "Select a role.",
+    // },
     status: {
       "ui:widget": "CustomRadioWidget",
       "ui:options": {
@@ -403,7 +403,7 @@ const Tenant: React.FC = () => {
 
   useEffect(() => {
     fetchTenantList();
-  }, [openAddNewCohort]);
+  }, [openAddNewCohort, filters]);
 
   // const getFormData = async () => {
   //   try {
@@ -761,7 +761,6 @@ const Tenant: React.FC = () => {
     newValue: any
   ) => {
     setStatusValue(newValue);
-
     setSelectedFilter(newValue);
     setPageSize(Numbers.TEN);
     setPageLimit(Numbers.TEN);
@@ -1261,11 +1260,12 @@ const Tenant: React.FC = () => {
     handleSearch: handleSearch,
     showAddNew: adminRole == true ? true : false,
     // showAddNew: true,
+    showSearch: false,
     statusArchived: true,
     handleAddUserClick: handleAddUserClick,
     statusValue: statusValue,
     setStatusValue: setStatusValue,
-    showSort: true,
+    showSort: false,
     selectedBlockCode: selectedBlockCode,
     setSelectedBlockCode: setSelectedBlockCode,
     selectedDistrictCode: selectedDistrictCode,

diff --git a/src/services/CohortService/cohortService.ts b/src/services/CohortService/cohortService.ts
@@ -1,6 +1,8 @@
 import { CohortMemberList } from "@/utils/Interfaces";
 import { deleteApi, get, patch, post, put } from "../RestClient";
 import config  from "@/utils/urlConstants.json";
+import axios from 'axios';
+
 export interface cohortListFilter {
   type: string;
   status: string[];
@@ -251,26 +253,34 @@ data:any
     let apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/${config.URLS.ROLES_LIST}`;
 
     try {
-      const response = await post(apiUrl, data);
-      console.log({response});
-
+      const response = await post(apiUrl, data);      
       return response?.data;
     } catch (error) {
       console.error("Error in Getting cohort List Details", error);
       return error;
     }
   };
-  export const userCreate = async (data: cohortListData,userTenantId:string): Promise<any> => {
-    let apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/${config.URLS.USER_CREATE}`;
+
+  export const userCreate = async (data: cohortListData, userTenantId: string): Promise<any> => {
+    const apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/${config.URLS.USER_CREATE}`;
 
     try {
-      const response = await post(apiUrl, data);
-      return response?.data;
+      const token=localStorage.getItem('token')
+      const headers = {
+        'Authorization': `Bearer ${token}`,
+        'Content-Type':'application/json',
+        'tenantid': userTenantId ,
+      };
+
+      const response = await axios.post(apiUrl, data, { headers });
+      console.log({response});
+      return response?.data;  
     } catch (error) {
-      console.error("Error in Getting cohort List Details", error);
-      return error;
+      console.error('Error in Creating User:', error);
+      return error ; 
     }
   };
+
 
   export const deleteUser = async (
     userId: string