From bb8032404325a5458448437ee58b110b6c3b94f8 Mon Sep 17 00:00:00 2001 From: alnavarrop99 Date: Sun, 7 Apr 2024 21:47:45 -0400 Subject: [PATCH 1/2] fix: ts error to build --- src/components/ui/calendar.tsx | 4 +-- src/pages/_layout/client.tsx | 26 +++++++++---------- src/pages/_layout/client/$clientId/update.tsx | 2 +- .../_layout/credit_/$creditId_/update.tsx | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx index b065f8e..2dfc2f4 100644 --- a/src/components/ui/calendar.tsx +++ b/src/components/ui/calendar.tsx @@ -52,8 +52,8 @@ function Calendar({ ...classNames, }} components={{ - IconLeft: ({ ...props }) => , - IconRight: ({ ...props }) => , + IconLeft: (props) => , + IconRight: (props) => , }} {...props} /> diff --git a/src/pages/_layout/client.tsx b/src/pages/_layout/client.tsx index e8592d4..46c9058 100644 --- a/src/pages/_layout/client.tsx +++ b/src/pages/_layout/client.tsx @@ -246,11 +246,7 @@ export function Clients({ column.toggleVisibility(!!value) } > - { - text.dropdown.items?.[ - getMenuItem(column.id as TMenuItems) - ] - } + {getMenuItem(column.id)} ))} @@ -352,6 +348,7 @@ export function Clients({ Clients.displayname = 'ClientsList' +/* eslint-disable-next-line */ type TMenuItems = | 'numero_de_identificacion' | 'telefono' @@ -360,17 +357,18 @@ type TMenuItems = | 'fullName' | 'apellidos' | 'referencia' -const getMenuItem = (name: TMenuItems) => { + +const getMenuItem = (name: string) => { const data = { - numero_de_identificacion: 'id' as keyof TClientTable, - telefono: 'telephone' as keyof TClientTable, - celular: 'phone' as keyof TClientTable, - direccion: 'direction' as keyof TClientTable, - fullName: 'firstName' as keyof TClientTable, - apellidos: 'lastName' as keyof TClientTable, - referencia: 'ref' as keyof TClientTable, + numero_de_identificacion: text.dropdown.items?.id, + telefono: text.dropdown.items?.telephone, + celular: text.dropdown.items?.phone, + direccion: text.dropdown.items?.direction, + fullName: text.dropdown.items?.firstName, + apellidos: text.dropdown.items?.lastName, + referencia: text.dropdown.items?.ref, } - return data?.[name] ?? 'fullName' + return data?.[name as TMenuItems] ?? 'fullName' } const text = { diff --git a/src/pages/_layout/client/$clientId/update.tsx b/src/pages/_layout/client/$clientId/update.tsx index c2213bc..1185529 100644 --- a/src/pages/_layout/client/$clientId/update.tsx +++ b/src/pages/_layout/client/$clientId/update.tsx @@ -6,7 +6,7 @@ import { Separator } from '@/components/ui/separator' import { toast } from '@/components/ui/use-toast' import { DialogDescription } from '@radix-ui/react-dialog' import { Navigate, createFileRoute } from '@tanstack/react-router' -import { useContext, useEffect, useMemo, useRef, useState } from 'react' +import { useContext, useMemo, useRef, useState } from 'react' import clsx from 'clsx' import { ToastAction } from '@radix-ui/react-toast' import { Switch } from '@/components/ui/switch' diff --git a/src/pages/_layout/credit_/$creditId_/update.tsx b/src/pages/_layout/credit_/$creditId_/update.tsx index 263db91..98145ca 100644 --- a/src/pages/_layout/credit_/$creditId_/update.tsx +++ b/src/pages/_layout/credit_/$creditId_/update.tsx @@ -23,7 +23,7 @@ import { TPAYMENT_GET, TPAYMENT_GET_BASE } from '@/api/payment' import { listFrecuencys } from '@/lib/type/frecuency' import { TCLIENT_GET_BASE, getClientsList } from '@/api/clients' import { getUsersList } from '@/api/users' -import { X as Close, Cross } from 'lucide-react' +import { Cross } from 'lucide-react' export const Route = createFileRoute('/_layout/credit/$creditId/update')({ component: UpdateCreditById, From dffa1e211d8155373f08ab06fd9d811741203ed4 Mon Sep 17 00:00:00 2001 From: alnavarrop99 Date: Sun, 7 Apr 2024 22:02:31 -0400 Subject: [PATCH 2/2] fix: msw and env config --- src/main.tsx | 2 +- src/pages/_layout/credit.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.tsx b/src/main.tsx index 5728c3c..b12c330 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -5,7 +5,7 @@ import { createBrowserHistory, createRouter, RouterProvider } from '@tanstack/re import { routeTree } from './routeTree.gen' async function enableMocking() { - if (!+import.meta.env.VITE_MSW){ + if (!+import.meta.env.VITE_MSW || !import.meta.env.DEV){ return; } const { worker } = await import('@/mocks/config'); diff --git a/src/pages/_layout/credit.tsx b/src/pages/_layout/credit.tsx index e907087..5c25eb4 100644 --- a/src/pages/_layout/credit.tsx +++ b/src/pages/_layout/credit.tsx @@ -31,7 +31,7 @@ export const Route = createFileRoute('/_layout/credit')({ component: Credits, loader: async () => { // TODO: this is a temporal function to getFilter - if(+import.meta.env.VITE_MSW) return (await getCreditsFilter()()); + if(!!+import.meta.env.VITE_MSW && import.meta.env.DEV) return (await getCreditsFilter()()); const list = await getCreditsList() const data: TCREDIT_GET_FILTER_ALL = await Promise.all( list?.map>( async ({ id: creditId, owner_id, frecuencia_del_credito_id }) => { const { nombres, apellidos } = await getClientById({ params: { clientId: "" + owner_id } })