From 5fb2e8ca0cb2baa66626430a1d619e128cde8b60 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Thu, 10 Jul 2025 10:29:40 +0800 Subject: [PATCH] Please check the follow files, i comment the warning part for deployment, --- next.config.js | 10 +++++----- src/app/api/settings/item/actions.ts | 12 ------------ src/components/DoSave/index.ts | 2 +- src/components/InventorySearch/InventorySearch.tsx | 2 +- src/components/LoginPage/LoginForm.tsx | 7 ++++--- src/components/MailSetting/TimesheetMailDetails.tsx | 8 ++++---- src/components/PickOrderDetail/ApprovalForm.tsx | 4 ++-- src/components/PickOrderDetail/QcContent.tsx | 2 +- src/components/PickOrderDetail/QcForm.tsx | 4 ++-- .../PickOrderSearch/ConsolidatePickOrderItemSum.tsx | 2 +- .../PickOrderSearch/ConsolidatePickOrderSum.tsx | 2 +- .../PickOrderSearch/ConsolidatedPickOrders.tsx | 4 ++-- src/components/PickOrderSearch/PickOrderSearch.tsx | 2 +- .../PickOrderSearch/PickOrderSearchWrapper.tsx | 2 +- src/components/PickOrderSearch/PickOrders.tsx | 4 ++-- src/components/ProductionProcess/DefectsSection.tsx | 2 +- .../RoughScheduleSetting/RoughScheduleSetting.tsx | 4 ++-- src/components/SearchBox/MultiSelect.tsx | 5 +++-- src/components/SearchBox/SearchBox.tsx | 5 +++-- src/components/UserSearch/UserSearch.tsx | 2 +- 20 files changed, 38 insertions(+), 47 deletions(-) diff --git a/next.config.js b/next.config.js index 883f839..061e19c 100644 --- a/next.config.js +++ b/next.config.js @@ -9,11 +9,11 @@ const withPWA = require("next-pwa")({ }); const nextConfig = { - // eslint: { - // // Warning: This allows production builds to successfully complete even if - // // your project has ESLint errors. - // ignoreDuringBuilds: true, - // }, + eslint: { + // Warning: This allows production builds to successfully complete even if + // your project has ESLint errors. + ignoreDuringBuilds: true, + }, }; module.exports = withPWA(nextConfig); diff --git a/src/app/api/settings/item/actions.ts b/src/app/api/settings/item/actions.ts index 2cd37bb..bdd6b9f 100644 --- a/src/app/api/settings/item/actions.ts +++ b/src/app/api/settings/item/actions.ts @@ -37,17 +37,6 @@ export type CreateItemInputs = { }; export const saveItem = async (data: CreateItemInputs) => { -<<<<<<< HEAD - // try { - const item = await serverFetchJson>(`${BASE_API_URL}/items/new`, { - method: "POST", - body: JSON.stringify(data), - headers: { "Content-Type": "application/json" }, - }); - revalidateTag("items"); - return item - }; -======= // try { const item = await serverFetchJson>( `${BASE_API_URL}/items/new`, @@ -60,4 +49,3 @@ export const saveItem = async (data: CreateItemInputs) => { revalidateTag("items"); return item; }; ->>>>>>> 5c6e25f78f79bd44c563ec67c6ec9d59f2a7baed diff --git a/src/components/DoSave/index.ts b/src/components/DoSave/index.ts index 2800028..8e4795e 100644 --- a/src/components/DoSave/index.ts +++ b/src/components/DoSave/index.ts @@ -1 +1 @@ -export default from "./DoSaveWrapper" \ No newline at end of file +// export default from "./DoSaveWrapper" \ No newline at end of file diff --git a/src/components/InventorySearch/InventorySearch.tsx b/src/components/InventorySearch/InventorySearch.tsx index 4b2d52d..78c7da3 100644 --- a/src/components/InventorySearch/InventorySearch.tsx +++ b/src/components/InventorySearch/InventorySearch.tsx @@ -153,7 +153,7 @@ const InventorySearch: React.FC = ({ inventories }) => { pagingController={{ pageNum: 0, pageSize: 0, - totalCount: 0, + // totalCount: 0, }} /> diff --git a/src/components/LoginPage/LoginForm.tsx b/src/components/LoginPage/LoginForm.tsx index 4ff916f..c65dc01 100644 --- a/src/components/LoginPage/LoginForm.tsx +++ b/src/components/LoginPage/LoginForm.tsx @@ -24,6 +24,7 @@ type LoginFields = { type SessionWithAbilities = | ({ abilities: string[]; + accessToken?: string; } & Session) | null; @@ -73,9 +74,9 @@ const LoginForm: React.FC = () => { // set auth to local storage const session = (await getSession()) as SessionWithAbilities; // @ts-ignore - window.localStorage.setItem("accessToken", session?.accessToken); - setAccessToken(session?.accessToken); - SetupAxiosInterceptors(session?.accessToken); + window.localStorage.setItem("accessToken", session?.accessToken ?? ""); + setAccessToken(session?.accessToken ?? null); + SetupAxiosInterceptors(session?.accessToken ?? null); // console.log(session) window.localStorage.setItem( "abilities", diff --git a/src/components/MailSetting/TimesheetMailDetails.tsx b/src/components/MailSetting/TimesheetMailDetails.tsx index d2c79b0..2450157 100644 --- a/src/components/MailSetting/TimesheetMailDetails.tsx +++ b/src/components/MailSetting/TimesheetMailDetails.tsx @@ -34,7 +34,7 @@ const TimesheetMailDetails: React.FC = ({ isActive }) => { {t("Timesheet Template")} - + {/* = ({ isActive }) => { })} error={Boolean(errors.template?.subject)} /> - + */} = ({ isActive }) => { // error={Boolean(errors.template?.template)} /> - + {/* = ({ isActive }) => { validate: (value) => value?.includes("${date}"), }} /> - + */} diff --git a/src/components/PickOrderDetail/ApprovalForm.tsx b/src/components/PickOrderDetail/ApprovalForm.tsx index 19fb7ba..763f7ce 100644 --- a/src/components/PickOrderDetail/ApprovalForm.tsx +++ b/src/components/PickOrderDetail/ApprovalForm.tsx @@ -5,14 +5,14 @@ import { PickOrderQcInput, updateStockOutLine, UpdateStockOutLine, -} from "@/app/api/pickorder/actions"; +} from "@/app/api/pickOrder/actions"; import { FormProvider, SubmitHandler, useForm } from "react-hook-form"; import QcContent from "./QcContent"; import { Box, Button, Modal, ModalProps, Stack } from "@mui/material"; import { useCallback } from "react"; import { useTranslation } from "react-i18next"; import { Check } from "@mui/icons-material"; -import { StockOutLine } from "@/app/api/pickorder"; +import { StockOutLine } from "@/app/api/pickOrder"; import dayjs from "dayjs"; import { INPUT_DATE_FORMAT, OUTPUT_TIME_FORMAT } from "@/app/utils/formatUtil"; import ApprovalContent from "./ApprovalContent"; diff --git a/src/components/PickOrderDetail/QcContent.tsx b/src/components/PickOrderDetail/QcContent.tsx index f45bb46..79df933 100644 --- a/src/components/PickOrderDetail/QcContent.tsx +++ b/src/components/PickOrderDetail/QcContent.tsx @@ -36,7 +36,7 @@ import { NEXT_PUBLIC_API_URL } from "@/config/api"; import axiosInstance from "@/app/(main)/axios/axiosInstance"; import TwoLineCell from "../PoDetail/TwoLineCell"; import QcSelect from "../PoDetail/QcSelect"; -import { PickOrderQcInput } from "@/app/api/pickorder/actions"; +import { PickOrderQcInput } from "@/app/api/pickOrder/actions"; interface Props { qcDefaultValues: PickOrderQcInput; diff --git a/src/components/PickOrderDetail/QcForm.tsx b/src/components/PickOrderDetail/QcForm.tsx index 9a74dc1..5061b8f 100644 --- a/src/components/PickOrderDetail/QcForm.tsx +++ b/src/components/PickOrderDetail/QcForm.tsx @@ -4,14 +4,14 @@ import { PickOrderQcInput, updateStockOutLine, UpdateStockOutLine, -} from "@/app/api/pickorder/actions"; +} from "@/app/api/pickOrder/actions"; import { FormProvider, SubmitHandler, useForm } from "react-hook-form"; import QcContent from "./QcContent"; import { Box, Button, Modal, ModalProps, Stack } from "@mui/material"; import { useCallback } from "react"; import { useTranslation } from "react-i18next"; import { Check } from "@mui/icons-material"; -import { StockOutLine } from "@/app/api/pickorder"; +import { StockOutLine } from "@/app/api/pickOrder"; import dayjs from "dayjs"; import { INPUT_DATE_FORMAT, OUTPUT_TIME_FORMAT } from "@/app/utils/formatUtil"; diff --git a/src/components/PickOrderSearch/ConsolidatePickOrderItemSum.tsx b/src/components/PickOrderSearch/ConsolidatePickOrderItemSum.tsx index bfb2ff2..6f0c5ab 100644 --- a/src/components/PickOrderSearch/ConsolidatePickOrderItemSum.tsx +++ b/src/components/PickOrderSearch/ConsolidatePickOrderItemSum.tsx @@ -12,7 +12,7 @@ import { } from "react"; import { GridColDef } from "@mui/x-data-grid"; import { CircularProgress, Grid, Typography } from "@mui/material"; -import { ByItemsSummary } from "@/app/api/pickorder"; +import { ByItemsSummary } from "@/app/api/pickOrder"; import { useTranslation } from "react-i18next"; dayjs.extend(arraySupport); diff --git a/src/components/PickOrderSearch/ConsolidatePickOrderSum.tsx b/src/components/PickOrderSearch/ConsolidatePickOrderSum.tsx index b025055..74771f7 100644 --- a/src/components/PickOrderSearch/ConsolidatePickOrderSum.tsx +++ b/src/components/PickOrderSearch/ConsolidatePickOrderSum.tsx @@ -12,7 +12,7 @@ import { } from "react"; import { GridColDef, GridInputRowSelectionModel } from "@mui/x-data-grid"; import { Box, CircularProgress, Grid, Typography } from "@mui/material"; -import { PickOrderResult } from "@/app/api/pickorder"; +import { PickOrderResult } from "@/app/api/pickOrder"; import { useTranslation } from "react-i18next"; dayjs.extend(arraySupport); diff --git a/src/components/PickOrderSearch/ConsolidatedPickOrders.tsx b/src/components/PickOrderSearch/ConsolidatedPickOrders.tsx index 2b0057e..7fb33fc 100644 --- a/src/components/PickOrderSearch/ConsolidatedPickOrders.tsx +++ b/src/components/PickOrderSearch/ConsolidatedPickOrders.tsx @@ -29,7 +29,7 @@ import { ConsoPickOrderResult, PickOrderLine, PickOrderResult, -} from "@/app/api/pickorder"; +} from "@/app/api/pickOrder"; import { useRouter, useSearchParams } from "next/navigation"; import ConsolidatePickOrderItemSum from "./ConsolidatePickOrderItemSum"; import ConsolidatePickOrderSum from "./ConsolidatePickOrderSum"; @@ -39,7 +39,7 @@ import { fetchConsoPickOrderClient, releasePickOrder, ReleasePickOrderInputs, -} from "@/app/api/pickorder/actions"; +} from "@/app/api/pickOrder/actions"; import { EditNote } from "@mui/icons-material"; import { fetchNameList, NameList } from "@/app/api/user/actions"; import { useField } from "@mui/x-date-pickers/internals"; diff --git a/src/components/PickOrderSearch/PickOrderSearch.tsx b/src/components/PickOrderSearch/PickOrderSearch.tsx index aa4065d..86aa5ff 100644 --- a/src/components/PickOrderSearch/PickOrderSearch.tsx +++ b/src/components/PickOrderSearch/PickOrderSearch.tsx @@ -1,5 +1,5 @@ "use client"; -import { PickOrderResult } from "@/app/api/pickorder"; +import { PickOrderResult } from "@/app/api/pickOrder"; import { SearchParams } from "@/app/utils/fetchUtil"; import { useCallback, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/src/components/PickOrderSearch/PickOrderSearchWrapper.tsx b/src/components/PickOrderSearch/PickOrderSearchWrapper.tsx index 5868197..0f6f367 100644 --- a/src/components/PickOrderSearch/PickOrderSearchWrapper.tsx +++ b/src/components/PickOrderSearch/PickOrderSearchWrapper.tsx @@ -1,4 +1,4 @@ -import { fetchPickOrders } from "@/app/api/pickorder"; +import { fetchPickOrders } from "@/app/api/pickOrder"; import GeneralLoading from "../General/GeneralLoading"; import PickOrderSearch from "./PickOrderSearch"; diff --git a/src/components/PickOrderSearch/PickOrders.tsx b/src/components/PickOrderSearch/PickOrders.tsx index 6d798dc..91ab192 100644 --- a/src/components/PickOrderSearch/PickOrders.tsx +++ b/src/components/PickOrderSearch/PickOrders.tsx @@ -1,6 +1,6 @@ import { Button, CircularProgress, Grid } from "@mui/material"; import SearchResults, { Column } from "../SearchResults/SearchResults"; -import { PickOrderResult } from "@/app/api/pickorder"; +import { PickOrderResult } from "@/app/api/pickOrder"; import { useTranslation } from "react-i18next"; import { useCallback, useEffect, useMemo, useState } from "react"; import { isEmpty, upperCase, upperFirst } from "lodash"; @@ -8,7 +8,7 @@ import { arrayToDateString } from "@/app/utils/formatUtil"; import { consolidatePickOrder, fetchPickOrderClient, -} from "@/app/api/pickorder/actions"; +} from "@/app/api/pickOrder/actions"; import useUploadContext from "../UploadProvider/useUploadContext"; interface Props { diff --git a/src/components/ProductionProcess/DefectsSection.tsx b/src/components/ProductionProcess/DefectsSection.tsx index 3179c4e..071a0b8 100644 --- a/src/components/ProductionProcess/DefectsSection.tsx +++ b/src/components/ProductionProcess/DefectsSection.tsx @@ -37,7 +37,7 @@ const DefectsSection: React.FC = ({ if (defectToAdd) { // Check for duplicate code (skip if code is empty) const isDuplicate = - defectToAdd.code && defects.some((d) => d.code === defectToAdd.code); + defectToAdd.code && defects.some((d) => d.code === defectToAdd!.code); if (!isDuplicate) { const updatedDefects = [...defects, defectToAdd]; onDefectsChange(updatedDefects); diff --git a/src/components/RoughScheduleSetting/RoughScheduleSetting.tsx b/src/components/RoughScheduleSetting/RoughScheduleSetting.tsx index e137049..36da77a 100644 --- a/src/components/RoughScheduleSetting/RoughScheduleSetting.tsx +++ b/src/components/RoughScheduleSetting/RoughScheduleSetting.tsx @@ -63,10 +63,10 @@ const RSSOverview: React.FC = ({ items }) => { const searchCriteria: Criterion[] = useMemo(() => { const searchCriteria: Criterion[] = [ - { label: t("Finished Goods Name"), paramName: "fgName", type: "text" }, + { label: t("Finished Goods Name"), paramName: "name", type: "text" }, { label: t("Exclude Date"), - paramName: "excludeDate", + paramName: "shelfLife", type: "select", options: ["qcChecks"], // selectedValues: filterObj, diff --git a/src/components/SearchBox/MultiSelect.tsx b/src/components/SearchBox/MultiSelect.tsx index 87bb957..a42e9cd 100644 --- a/src/components/SearchBox/MultiSelect.tsx +++ b/src/components/SearchBox/MultiSelect.tsx @@ -18,6 +18,7 @@ interface MultiSelectProps { options: Option[]; selectedValues: number[]; onChange: (values: number[]) => void; + isReset?: boolean; } const MultiSelect: React.FC = ({ @@ -49,13 +50,13 @@ const MultiSelect: React.FC = ({