diff --git a/client/src/app/quotes/components/QuoteResume.tsx b/client/src/app/quotes/components/QuoteResume.tsx index 1603172..6661585 100644 --- a/client/src/app/quotes/components/QuoteResume.tsx +++ b/client/src/app/quotes/components/QuoteResume.tsx @@ -29,6 +29,9 @@ import { TabsContent, TabsList, TabsTrigger, + Tooltip, + TooltipContent, + TooltipTrigger, } from "@/ui"; import { useToast } from "@/ui/use-toast"; import { t } from "i18next"; @@ -39,8 +42,8 @@ import { DownloadQuoteDialog } from "./DownloadQuoteDialog"; import { QuoteStatusEditor } from "./editors"; type QuoteResumeProps = { - quoteId: string; - className: string; + quoteId?: string; + className?: string; }; export const QuoteResume = ({ quoteId, className }: QuoteResumeProps) => { @@ -52,7 +55,7 @@ export const QuoteResume = ({ quoteId, className }: QuoteResumeProps) => { const { mutate: setStatusMutation } = useSetStatus(quoteId); const { download, ...downloadProps } = useDownloader(); - const handleOnChangeStatus = (quoteId: string, newStatus: string) => { + const handleOnChangeStatus = (_: string, newStatus: string) => { setStatusMutation( { newStatus }, @@ -104,6 +107,7 @@ export const QuoteResume = ({ quoteId, className }: QuoteResumeProps) => { {`${t("quotes.list.preview.quote")} #${data.reference}`} + - - - - - + + {t("quotes.list.preview.download_quote")} + + + + + + + + {t("common.more")} + - Edit + + + {t("quotes.list.preview.download_quote")} + Export Trash diff --git a/client/src/app/quotes/components/QuotesDataTable.tsx b/client/src/app/quotes/components/QuotesDataTable.tsx index 8eee8c7..66a7413 100644 --- a/client/src/app/quotes/components/QuotesDataTable.tsx +++ b/client/src/app/quotes/components/QuotesDataTable.tsx @@ -17,9 +17,6 @@ import { DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger, - ResizableHandle, - ResizablePanel, - ResizablePanelGroup, Tooltip, TooltipContent, TooltipTrigger, @@ -271,13 +268,8 @@ export const QuotesDataTable = ({ return ( <> - - +
+
- - {preview && } +
+ {preview && ( - +
{/**/} - +
)} - +
); diff --git a/client/src/app/quotes/components/editors/QuoteStatusEditor.tsx b/client/src/app/quotes/components/editors/QuoteStatusEditor.tsx index b2cca68..ba83899 100644 --- a/client/src/app/quotes/components/editors/QuoteStatusEditor.tsx +++ b/client/src/app/quotes/components/editors/QuoteStatusEditor.tsx @@ -59,7 +59,9 @@ export const QuoteStatusEditor = ({ diff --git a/client/src/app/quotes/hooks/useQuotes.tsx b/client/src/app/quotes/hooks/useQuotes.tsx index 308caa7..b97d050 100644 --- a/client/src/app/quotes/hooks/useQuotes.tsx +++ b/client/src/app/quotes/hooks/useQuotes.tsx @@ -151,7 +151,7 @@ export const useQuotes = () => { }); }, - useSetStatus: (id: string) => { + useSetStatus: (id?: string) => { const queryClient = useQueryClient(); return useMutation({ diff --git a/client/src/components/DataTable/DataTableToolbar/DataTableToolbar.tsx b/client/src/components/DataTable/DataTableToolbar/DataTableToolbar.tsx index 748e0e4..5a8d881 100644 --- a/client/src/components/DataTable/DataTableToolbar/DataTableToolbar.tsx +++ b/client/src/components/DataTable/DataTableToolbar/DataTableToolbar.tsx @@ -38,13 +38,17 @@ export function DataTableToolbar({ placeholder={t("common.filter_placeholder")} value={globalFilter} onChange={(event) => setGlobalFilter(String(event.target.value))} - className={cn("h-8", fullWidthFilter ? "w-full" : "w-3/12 lg:w-6/12")} + className={cn("h-8 w-full transition-all")} /> {isFiltered && ( - )} diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 5e3d395..b1d850d 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -14,6 +14,7 @@ "upload": "Upload", "continue": "Continue", "close": "Close", + "more": "More", "add": "Add", "sort_asc": "Asc", "sort_asc_description": "In ascending order. Click to sort descending order.", @@ -29,7 +30,7 @@ "go_to_next_page": "Go to next page", "go_to_last_page": "Go to last page", "filter_placeholder": "Type here to filter...", - "reset_filter": "Remove the results filter", + "reset_filter": "Reset filter", "error": "Error", "actions": "Actions", "open_menu": "Open menu", @@ -198,6 +199,7 @@ "toast_article_added": "Catalog item added:" }, "quote_status_editor": { + "remove the res": "Change quote status", "title": "Change quote status", "status": { "draft": { diff --git a/client/src/locales/es.json b/client/src/locales/es.json index a5bc749..8d52cfa 100644 --- a/client/src/locales/es.json +++ b/client/src/locales/es.json @@ -14,6 +14,7 @@ "upload": "Cargar", "continue": "Continuar", "close": "Cerrar", + "more": "More", "add": "Añadir", "sort_asc": "Asc", "sort_asc_description": "En order ascendente. Click para ordenar descendentemente.", @@ -194,6 +195,7 @@ "toast_article_added": "Artículo del catálogo añadido:" }, "quote_status_editor": { + "trigger_button": "Cambiar el estado", "title": "Cambiar el estado de la cotización", "status": { "draft": {