From c95951736943c1f376f4c8f2a3fcde602e7a6d7a Mon Sep 17 00:00:00 2001 From: marcio1002 Date: Fri, 27 Oct 2023 17:02:24 -0300 Subject: [PATCH] fix: Correction in the search field in the user list on the admin screen --- .../administrativeTables/ClientsTable.tsx | 52 ++++++++----------- src/services/ssrApi.ts | 4 +- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/components/administrativeTables/ClientsTable.tsx b/src/components/administrativeTables/ClientsTable.tsx index 9e54441..83b808f 100644 --- a/src/components/administrativeTables/ClientsTable.tsx +++ b/src/components/administrativeTables/ClientsTable.tsx @@ -10,7 +10,7 @@ import TablePagination from '@mui/material/TablePagination' import TableRow from '@mui/material/TableRow' import TableSortLabel from '@mui/material/TableSortLabel' import { visuallyHidden } from '@mui/utils' -import { forwardRef, useDeferredValue, useEffect, useState } from 'react' +import { ChangeEvent, forwardRef, useDeferredValue, useEffect, useState } from 'react' import Image from 'next/image' @@ -145,12 +145,11 @@ function sortedClients(client, search: string) { search = sanitizeStringSearch(search) return client - .map(client => ({ - ...client, - name: sanitizeStringSearch(client.name), - client_id: sanitizeStringSearch(String(client.client_id ?? "")) - })) - .filter((client) => client.name.includes(search) || client.client_id.includes(search)) + .filter( + (client) => sanitizeStringSearch(client.name).includes(search) || + sanitizeStringSearch(String(client.client_id ?? "")).includes(search) || + sanitizeStringSearch(client.email).includes(search) + ) } function EnhancedTableHead(props: EnhancedTableProps) { @@ -224,7 +223,6 @@ export default function ClientTable({ const [openModalInativar, setOpenModalInativar] = useState(false) const [clientEdit, setClientEdit] = useState() const [logo, setLogo] = useState(false) - const [imageURLS, setImageURLs] = useState([]) const [images, setImages] = useState([] as any) const [nivelAcess, setnivelAcess] = useState(2) const [openEditUserModal, setOpenEditUserModal] = useState(false) @@ -246,6 +244,8 @@ export default function ClientTable({ .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) ) + const imageURLS = images.map((img) => URL.createObjectURL(img)) + // const handleOpen = () => setOpen(true) const handleClose = () => setOpen(false) @@ -268,6 +268,11 @@ export default function ClientTable({ return units } + function handleSearch(e: ChangeEvent) { + setSearch(e.target.value) + setPage(0); + } + const handleCloseSnack = ( event?: React.SyntheticEvent | Event, reason?: string @@ -363,15 +368,6 @@ export default function ClientTable({ onChange(selected) }, [selected]) - useEffect(() => { - if (images.length < 1) return - const newImageUrls: any = [] - images.forEach((image: any) => - newImageUrls.push(URL.createObjectURL(image)) - ) - setImageURLs(newImageUrls) - }, [images]) - return ( setSearch(e.target.value)} + onChange={handleSearch} placeholder="Pesquisar por nome:" /> @@ -587,17 +583,15 @@ export default function ClientTable({
- {imageURLS.map((imageSrc, index) => { - return ( - - ) - })} + {imageURLS.map((imageSrc, index) => ( + + ))}
diff --git a/src/services/ssrApi.ts b/src/services/ssrApi.ts index b68bb4a..8b1c9a1 100644 --- a/src/services/ssrApi.ts +++ b/src/services/ssrApi.ts @@ -18,9 +18,9 @@ export default function getAPIClient( const { '@smartAuth-token': token } = parseCookies(ctx) const api = axios.create({ - baseURL: 'https://api.energiasmart.com.br/api' + // baseURL: 'https://api.energiasmart.com.br/api' // baseURL: 'https://api.energiasmart.klupp.com.br/api' - // baseURL: 'http://api-smart.test/api' + baseURL: 'http://api-smart.test/api' }) api.interceptors.request.use((config) => {