Преглед изворни кода

Please check the follow files, i comment the warning part for deployment,

master
MSI\2Fi пре 1 месец
родитељ
комит
5fb2e8ca0c
20 измењених фајлова са 38 додато и 47 уклоњено
  1. +5
    -5
      next.config.js
  2. +0
    -12
      src/app/api/settings/item/actions.ts
  3. +1
    -1
      src/components/DoSave/index.ts
  4. +1
    -1
      src/components/InventorySearch/InventorySearch.tsx
  5. +4
    -3
      src/components/LoginPage/LoginForm.tsx
  6. +4
    -4
      src/components/MailSetting/TimesheetMailDetails.tsx
  7. +2
    -2
      src/components/PickOrderDetail/ApprovalForm.tsx
  8. +1
    -1
      src/components/PickOrderDetail/QcContent.tsx
  9. +2
    -2
      src/components/PickOrderDetail/QcForm.tsx
  10. +1
    -1
      src/components/PickOrderSearch/ConsolidatePickOrderItemSum.tsx
  11. +1
    -1
      src/components/PickOrderSearch/ConsolidatePickOrderSum.tsx
  12. +2
    -2
      src/components/PickOrderSearch/ConsolidatedPickOrders.tsx
  13. +1
    -1
      src/components/PickOrderSearch/PickOrderSearch.tsx
  14. +1
    -1
      src/components/PickOrderSearch/PickOrderSearchWrapper.tsx
  15. +2
    -2
      src/components/PickOrderSearch/PickOrders.tsx
  16. +1
    -1
      src/components/ProductionProcess/DefectsSection.tsx
  17. +2
    -2
      src/components/RoughScheduleSetting/RoughScheduleSetting.tsx
  18. +3
    -2
      src/components/SearchBox/MultiSelect.tsx
  19. +3
    -2
      src/components/SearchBox/SearchBox.tsx
  20. +1
    -1
      src/components/UserSearch/UserSearch.tsx

+ 5
- 5
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);

+ 0
- 12
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<CreateItemResponse<CreateItemInputs>>(`${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<CreateItemResponse<CreateItemInputs>>(
`${BASE_API_URL}/items/new`,
@@ -60,4 +49,3 @@ export const saveItem = async (data: CreateItemInputs) => {
revalidateTag("items");
return item;
};
>>>>>>> 5c6e25f78f79bd44c563ec67c6ec9d59f2a7baed

+ 1
- 1
src/components/DoSave/index.ts Прегледај датотеку

@@ -1 +1 @@
export default from "./DoSaveWrapper"
// export default from "./DoSaveWrapper"

+ 1
- 1
src/components/InventorySearch/InventorySearch.tsx Прегледај датотеку

@@ -153,7 +153,7 @@ const InventorySearch: React.FC<Props> = ({ inventories }) => {
pagingController={{
pageNum: 0,
pageSize: 0,
totalCount: 0,
// totalCount: 0,
}}
/>
</>


+ 4
- 3
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",


+ 4
- 4
src/components/MailSetting/TimesheetMailDetails.tsx Прегледај датотеку

@@ -34,7 +34,7 @@ const TimesheetMailDetails: React.FC<Props> = ({ isActive }) => {
{t("Timesheet Template")}
</Typography>
<Grid container spacing={2} columns={{ xs: 6, sm: 12 }}>
<Grid item xs={8}>
{/* <Grid item xs={8}>
<TextField
label={t("Cc")}
fullWidth
@@ -57,7 +57,7 @@ const TimesheetMailDetails: React.FC<Props> = ({ isActive }) => {
})}
error={Boolean(errors.template?.subject)}
/>
</Grid>
</Grid> */}
<Grid item xs={8}>
<TextField
label={t("Required Params")}
@@ -67,7 +67,7 @@ const TimesheetMailDetails: React.FC<Props> = ({ isActive }) => {
// error={Boolean(errors.template?.template)}
/>
</Grid>
<Grid item xs={12}>
{/* <Grid item xs={12}>
<Controller
control={control}
name="template.template"
@@ -83,7 +83,7 @@ const TimesheetMailDetails: React.FC<Props> = ({ isActive }) => {
validate: (value) => value?.includes("${date}"),
}}
/>
</Grid>
</Grid> */}
</Grid>
</Box>
</CardContent>


+ 2
- 2
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";


+ 1
- 1
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;


+ 2
- 2
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";



+ 1
- 1
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);


+ 1
- 1
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);


+ 2
- 2
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";


+ 1
- 1
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";


+ 1
- 1
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";



+ 2
- 2
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 {


+ 1
- 1
src/components/ProductionProcess/DefectsSection.tsx Прегледај датотеку

@@ -37,7 +37,7 @@ const DefectsSection: React.FC<DefectsSectionProps> = ({
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);


+ 2
- 2
src/components/RoughScheduleSetting/RoughScheduleSetting.tsx Прегледај датотеку

@@ -63,10 +63,10 @@ const RSSOverview: React.FC<Props> = ({ items }) => {

const searchCriteria: Criterion<SearchParamNames>[] = useMemo(() => {
const searchCriteria: Criterion<SearchParamNames>[] = [
{ 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,


+ 3
- 2
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<MultiSelectProps> = ({
@@ -49,13 +50,13 @@ const MultiSelect: React.FC<MultiSelectProps> = ({
<Select
multiple
value={displayValues}
onChange={handleChange}
onChange={handleChange as any}
renderValue={(selected) => (
<Box sx={{ display: "flex", flexWrap: "wrap" }}>
{(selected as number[]).map((value) => (
<Chip
key={value}
label={options.find((item) => item.value == value).label}
label={options.find((item) => item.value == value)?.label ?? ""}
sx={{ margin: 0.5 }}
/>
))}


+ 3
- 2
src/components/SearchBox/SearchBox.tsx Прегледај датотеку

@@ -227,7 +227,8 @@ function SearchBox<T extends string>({
value={inputs[c.paramName]}
/>
)}
{c.type === "multi-select" && (
{/* eslint-disable-next-line @typescript-eslint/no-unused-vars */}
{/* {c.type === "multi-select" && (
<MultiSelect
label={t(c.label)}
options={c?.options}
@@ -235,7 +236,7 @@ function SearchBox<T extends string>({
onChange={c.handleSelectionChange}
isReset={isReset}
/>
)}
)} */}
{c.type === "select" && (
<FormControl fullWidth>
<InputLabel>{t(c.label)}</InputLabel>


+ 1
- 1
src/components/UserSearch/UserSearch.tsx Прегледај датотеку

@@ -88,7 +88,7 @@ const UserSearch: React.FC<Props> = ({ users }) => {
<SearchResults<UserResult>
items={filteredUser}
columns={columns}
pagingController={{ pageNum: 1, pageSize: 10, totalCount: 100 }}
pagingController={{ pageNum: 1, pageSize: 10 }}
/>
</>
);


Loading…
Откажи
Сачувај