Merge pull request #1011 from AI4Bharat/Rahul-539

Added search feature based on active status in user details tab in admin
AI4Bharat · Jul 3, 2024 · d33763b · d33763b
2 parents f224de1 + 7b23c67
commit d33763b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/ui/pages/container/Admin/EditProfile.jsx b/src/ui/pages/container/Admin/EditProfile.jsx
@@ -230,7 +230,7 @@ const EditProfile = (props) => {
             </Select>
           </FormControl>
         </Grid>
-        <Grid item xs={12} sm={12} md={6} lg={6} xl={6} sx={{ mb: 2 }}>
+        {/* <Grid item xs={12} sm={12} md={6} lg={6} xl={6} sx={{ mb: 2 }}>
           <FormControl sx={{ m: 1, minWidth: 210 }}>
             <InputLabel id="demo-simple-select-helper-label">Active_status</InputLabel>
             <Select
@@ -248,7 +248,7 @@ const EditProfile = (props) => {
               <MenuItem value={false}>Not Active</MenuItem>
             </Select>
           </FormControl>
-        </Grid>
+        </Grid> */}
       </Grid>
 
       <Grid sx={{ textAlignLast: "end" }}>

diff --git a/src/ui/pages/container/Admin/UserDetail.jsx b/src/ui/pages/container/Admin/UserDetail.jsx
@@ -165,11 +165,16 @@ const UserDetail = (props) => {
         el.first_name?.toLowerCase().includes(SearchUserDetail?.toLowerCase())
       ) {
         return el;
-      }else if(
-        el.is_active?.toString()
-        ?.toLowerCase()
-        .includes(SearchUserDetail?.toLowerCase())
-      ){
+      // }else if(
+      //   el.is_active?.toString()
+      //   ?.toLowerCase()
+      //   .includes(SearchUserDetail?.toLowerCase())
+      // ){
+      //   return el;
+      }else if (
+        SearchUserDetail.toLowerCase() === "active" && el.is_active ||
+        SearchUserDetail.toLowerCase() === "inactive" && !el.is_active
+      ) {
         return el;
       } else if (
         el.last_name?.toLowerCase().includes(SearchUserDetail?.toLowerCase())
@@ -434,5 +439,4 @@ const UserDetail = (props) => {
     </div>
   );
 };
-
-export default UserDetail;
+export default UserDetail;