bug fixing

Author: yadneshgharat

src/api/Apis.tsx

@@ -161,8 +161,8 @@ export async function getInOfficeInviteData(page:number=0,count:number=10) {
 }
 
 
-export async function getEmployeesData(page:number=0,count:number=10) {
-  const url = `/product/employee/data?page=${page}&count=${count}`
+export async function getEmployeesData(page:number=0,count:number=10,filter:string='') {
+  const url = `/product/employee/data?page=${page}&count=${count}&keyword=${filter}`
 
   const { data } = await apis.get(url)
 

src/features/Employees/EmployeesView.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import React, { FunctionComponent, useEffect, useState } from 'react';
 import TableWrapper from "../../components/TableWrapper";
 import { Avatar, Box, createStyles, fade, Grid, Paper, Theme } from "@material-ui/core";
 import { makeStyles } from "@material-ui/core/styles";
@@ -26,12 +26,7 @@ const useStyles = makeStyles((theme: Theme) =>
 )
 
 
-const data = {
-    name: 'Vijaya Tondon',
-    mobileNo: 9754821630,
-    email: 'Vijaytandon@gmail.com',
-    organization: 'Company Name'
-}
+
 
 //const columns = ['Visitor name', 'Mobile No.', 'Email', 'Organization']
 // designation: any,//developer,
@@ -79,6 +74,9 @@ const columns = [
 const EmployeesView: FunctionComponent<Props> = (props) => {
     const classes = useStyles()
 
+    const [filter, setfilter] = useState("")
+    const [rowPerPage, setRowPerPage] = useState(10);
+    
     const dispatch = useDispatch()
 
     const {
@@ -95,6 +93,10 @@ const EmployeesView: FunctionComponent<Props> = (props) => {
 
     }, [dispatch])
 
+    useEffect(() => {
+        debugger
+        dispatch(fetchEmployees(0, rowPerPage,filter))
+    }, [filter])
 
     if (error) {
         return (
@@ -114,7 +116,7 @@ const EmployeesView: FunctionComponent<Props> = (props) => {
         isLoading: isLoadingEmployee,
         pagination: true,
         pageChange: (page: number, count: number) => {
-            dispatch(fetchEmployees(page, count))
+            dispatch(fetchEmployees(page, count,filter))
         },
         totalCount: pageCount,
         //@ts-ignore
@@ -132,7 +134,7 @@ const EmployeesView: FunctionComponent<Props> = (props) => {
             <Paper className={classes.paper}>
 
                 <Box display="flex" justifyContent="space-between" style={{ paddingTop: '37px', paddingLeft: '30px', paddingBottom: '25.5px'}} >
-                <SearchInput /*style={{ margin: '0 23px 30px', paddingTop: '37px' }}*/ placeholder="Search Employees by name, email or mobile" width={500} />
+                <SearchInput onChange={(e: any) => { setfilter(e.target.value ) }} value={filter}/*style={{ margin: '0 23px 30px', paddingTop: '37px' }}*/ placeholder="Search Employees by name" width={500} />
                  {/* <SelectInput value="Action" /> */}
                     <CustomMenuItem to='/employee/add'>
                         <CustomButton style={{ width: '150px', fontSize: '12px', height: '39px', padding: 0 }}>

src/features/Employees/employeeSlice.ts

@@ -107,11 +107,12 @@ export default employees.reducer
 
 export const fetchEmployees = (
     page?: number
-    , count?: number
+    , count?: number,
+    filter?:string
 ): AppThunk => async dispatch => {
     try {
         dispatch(getEmployeesStart())
-        const employees = await getEmployeesData(page,count)
+        const employees = await getEmployeesData(page,count,filter)
 
         dispatch(getEmployeesSuccess(employees))
     } catch (err) {

src/features/Invites/InviteView.tsx

@@ -264,7 +264,7 @@ const InviteView: FunctionComponent<Props> = (props) => {
                                 label: classes.label, // class name, e.g. `classes-nesting-label-x`
                             }} variant="contained" style={{ marginTop: '33px', marginLeft: '27px', height: '40px'}}>In Office</Button> */}
                     <SelectInput style={{ marginLeft: '27px' }} onChange={(e: any) => { debugger; handleFilterChange({ purpose: e.target.value }) }} menuOptions={purpose.map(item => ({ title: item }))} defaultValue="All Purpose" value={filter.purpose} />
-                    <SelectInput style={{ marginLeft: '27px' }} onChange={(e: any) => { debugger; handleFilterChange({ site: e.target.value }) }} menuOptions={sites.map(item => ({ title: item.sitename }))} defaultValue="All Sites" value={filter.site} />
+                    {/* <SelectInput style={{ marginLeft: '27px' }} onChange={(e: any) => { debugger; handleFilterChange({ site: e.target.value }) }} menuOptions={sites.map(item => ({ title: item.sitename }))} defaultValue="All Sites" value={filter.site} /> */}
                     <Button onClick={() => {  handleFilterChange({ site: "", purpose: "", visitor: "" }) }}
                         classes={{
                             root: classes.buttonRoot, // class name, e.g. `classes-nesting-root-x`

src/features/Settings/DevicesView.tsx

@@ -117,8 +117,8 @@ const DevicesView: FunctionComponent<Props> = (props) => {
                 <Box display="flex" justifyContent="space-between" style={{ paddingTop: '37.5px', paddingBottom: '24px' }}>
                     <SearchInput style={{ marginLeft: '28.5px', height: '39px' }} placeholder="Search Devices" width={400} />
                     <Box display="flex">
-                        <SelectInput style={{ marginRight: '26px', width: '122px', height: '39px' }} value = {""} defaultValue="All Sites" menuOptions={[]} />
-                        <SelectInput style={{ marginRight: '26px', width: '122px', height: '39px' }} value = {""} defaultValue="All Status" menuOptions={[]} />
+                        {/* <SelectInput style={{ marginRight: '26px', width: '122px', height: '39px' }} value = {""} defaultValue="All Sites" menuOptions={[]} /> */}
+                        {/* <SelectInput style={{ marginRight: '26px', width: '122px', height: '39px' }} value = {""} defaultValue="All Status" menuOptions={[]} /> */}
                         <CustomMenuItem to='/devices/device'>
                             <CustomButton style={{ marginRight: '63px', width: '116px', fontSize: '12px', height: '39px', padding: 0, marginTop: '2px' }}>
                                 Add Device