From b0fbe7dea73a904a8947c199c606a5636f539e93 Mon Sep 17 00:00:00 2001 From: Donkie Date: Sun, 17 Dec 2023 20:36:13 +0100 Subject: [PATCH] Formatted some client files --- client/src/pages/filaments/create.tsx | 14 ++++++--- client/src/pages/filaments/show.tsx | 19 +++++++----- client/src/pages/spools/create.tsx | 44 +++++++++++++-------------- client/src/pages/vendors/create.tsx | 14 ++++++--- client/src/utils/overrides.css | 2 +- client/src/utils/saveload.ts | 12 ++++---- 6 files changed, 58 insertions(+), 47 deletions(-) diff --git a/client/src/pages/filaments/create.tsx b/client/src/pages/filaments/create.tsx index dac6bb0..4ce1813 100644 --- a/client/src/pages/filaments/create.tsx +++ b/client/src/pages/filaments/create.tsx @@ -14,7 +14,7 @@ interface CreateOrCloneProps { export const FilamentCreate: React.FC = (props) => { const t = useTranslate(); - const { form, formProps, saveButtonProps, formLoading, onFinish, redirect } = useForm(); + const { form, formProps, formLoading, onFinish, redirect } = useForm(); if (props.mode === "clone" && formProps.initialValues) { // Fix the vendor_id @@ -24,10 +24,10 @@ export const FilamentCreate: React.FC { - let values = await form.validateFields(); + const values = await form.validateFields(); await onFinish(values); redirect(redirectTo, (values as IFilament).id); - } + }; const { selectProps } = useSelect({ resource: "vendor", @@ -40,8 +40,12 @@ export const FilamentCreate: React.FC ( <> - - + + )} > diff --git a/client/src/pages/filaments/show.tsx b/client/src/pages/filaments/show.tsx index 73f29fb..7536e07 100644 --- a/client/src/pages/filaments/show.tsx +++ b/client/src/pages/filaments/show.tsx @@ -7,7 +7,6 @@ import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { IFilament } from "./model"; import { enrichText } from "../../utils/parsing"; -import { IVendor } from "../vendors/model"; import { useNavigate } from "react-router-dom"; dayjs.extend(utc); @@ -34,19 +33,22 @@ export const FilamentShow: React.FC = () => { const gotoVendor = (): undefined => { const URL = `/vendor/show/${record?.vendor?.id}`; navigate(URL); - } + }; const gotoSpools = (): undefined => { - const URL = `/spool#filters=[{"field":"filament.id","operator":"in","value":[${record?.id}]}]` + const URL = `/spool#filters=[{"field":"filament.id","operator":"in","value":[${record?.id}]}]`; navigate(URL); - } + }; return ( {t("filament.fields.id")} {t("filament.fields.vendor")} - {t("filament.fields.registered")} @@ -118,10 +120,13 @@ export const FilamentShow: React.FC = () => { {t("filament.fields.comment")} {t("filament.fields.spools")} - - + ); }; diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx index c905e28..f9c41f7 100644 --- a/client/src/pages/spools/create.tsx +++ b/client/src/pages/spools/create.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useState } from "react"; import { IResourceComponentsProps, useTranslate } from "@refinedev/core"; import { Create, useForm, useSelect } from "@refinedev/antd"; import { Form, Input, DatePicker, Select, InputNumber, Radio, Divider, Button } from "antd"; @@ -9,7 +9,7 @@ import { ISpool } from "./model"; import { numberFormatter, numberParser } from "../../utils/parsing"; import { useSpoolmanLocations } from "../../components/otherModels"; import { MinusOutlined, PlusOutlined } from "@ant-design/icons"; -import '../../utils/overrides.css' +import "../../utils/overrides.css"; interface CreateOrCloneProps { mode: "create" | "clone"; @@ -20,7 +20,7 @@ export const SpoolCreate: React.FC({ redirect: false, - warnWhenUnsavedChanges: false + warnWhenUnsavedChanges: false, }); if (props.mode === "clone" && formProps.initialValues) { @@ -34,16 +34,16 @@ export const SpoolCreate: React.FC { - let values = await form.validateFields(); + const values = await form.validateFields(); if (quantity > 1) { - let submit = Array(quantity).fill(values); + const submit = Array(quantity).fill(values); // queue multiple creates this way for now Refine doesn't seem to map Arrays to createMany or multiple creates like it says it does - submit.forEach(async r => await onFinish(r)); + submit.forEach(async (r) => await onFinish(r)); } else { await onFinish(values); } redirect(redirectTo, (values as ISpool).id); - } + }; const { queryResult } = useSelect({ resource: "filament", @@ -120,11 +120,11 @@ export const SpoolCreate: React.FC { setQuantity(quantity + 1); - } + }; const decrementQty = () => { setQuantity(quantity - 1); - } + }; return ( ( <> -
+
- - +
- - + + - ) - } + )} >
- + ); }; diff --git a/client/src/pages/vendors/create.tsx b/client/src/pages/vendors/create.tsx index 37caf9f..4ea110a 100644 --- a/client/src/pages/vendors/create.tsx +++ b/client/src/pages/vendors/create.tsx @@ -12,13 +12,13 @@ interface CreateOrCloneProps { export const VendorCreate: React.FC = (props) => { const t = useTranslate(); - const { form, formProps, saveButtonProps, formLoading, onFinish, redirect } = useForm(); + const { form, formProps, formLoading, onFinish, redirect } = useForm(); const handleSubmit = async (redirectTo: "list" | "edit" | "create") => { - let values = await form.validateFields(); + const values = await form.validateFields(); await onFinish(values); redirect(redirectTo, (values as IVendor).id); - } + }; return ( ( <> - - + + )} > diff --git a/client/src/utils/overrides.css b/client/src/utils/overrides.css index 8d6ba51..f353989 100644 --- a/client/src/utils/overrides.css +++ b/client/src/utils/overrides.css @@ -1,3 +1,3 @@ #qty-input { - text-align: center !important; + text-align: center !important; } diff --git a/client/src/utils/saveload.ts b/client/src/utils/saveload.ts index 28184b6..33ad477 100644 --- a/client/src/utils/saveload.ts +++ b/client/src/utils/saveload.ts @@ -18,18 +18,18 @@ export function useInitialTableState(tableId: string): TableState { const savedSorters = hasHashProperty("sorters") ? getHashProperty("sorters") : isLocalStorageAvailable - ? localStorage.getItem(`${tableId}-sorters`) - : null; + ? localStorage.getItem(`${tableId}-sorters`) + : null; const savedFilters = hasHashProperty("filters") ? getHashProperty("filters") : isLocalStorageAvailable - ? localStorage.getItem(`${tableId}-filters`) - : null; + ? localStorage.getItem(`${tableId}-filters`) + : null; const savedPagination = hasHashProperty("pagination") ? getHashProperty("pagination") : isLocalStorageAvailable - ? localStorage.getItem(`${tableId}-pagination`) - : null; + ? localStorage.getItem(`${tableId}-pagination`) + : null; const savedShowColumns = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-showColumns`) : null; const sorters = savedSorters ? JSON.parse(savedSorters) : [{ field: "id", order: "asc" }];