fix type

src/pages/formBuilder/AttributeValues.tsx

@@ -11,10 +11,10 @@ import { extractErrorMessage } from '@/config/func'
 const FormBuilderValues: FC = () => {
 
     const { id } = useParams()
-    const { data, refetch } = useGetFieldValues(Number(id))
+    const { data, refetch } = useGetFieldValues(id!)
     const { mutate: deleteValue, isPending } = useDeleteFieldValue()
 
-    const handleDelete = (id: number) => {
+    const handleDelete = (id: string) => {
         deleteValue(id, {
             onSuccess: () => {
                 refetch()
@@ -31,7 +31,7 @@ const FormBuilderValues: FC = () => {
                 <h1 className='text-lg font-light'>مقادیر</h1>
 
                 <CreateValue
-                    id={Number(id)}
+                    id={id!}
                     refetch={refetch}
                 />
             </div>

src/pages/formBuilder/Create.tsx

@@ -33,7 +33,7 @@ const FormBuilderCreate: FC = () => {
             name: Yup.string().required('این فیلد اجباری می باشد')
         }),
         onSubmit: (values) => {
-            createField({ id: Number(id), params: values }, {
+            createField({ id: id!, params: values }, {
                 onSuccess: () => {
                     toast.success('با موفقیت ذخیره شد')
                     navigate(Paths.formBuilder.list + `${id}/${type} `)

src/pages/formBuilder/List.tsx

@@ -13,9 +13,9 @@ const FormBuilderList: FC = () => {
 
     const { id, type } = useParams()
     const { mutate: deleteField, isPending } = useDeleteField()
-    const { data, refetch } = useGetFields(Number(id))
+    const { data, refetch } = useGetFields(id ?? '')
 
-    const handleDelete = (id: number) => {
+    const handleDelete = (id: string) => {
         deleteField(id, {
             onSuccess: () => {
                 refetch()

src/pages/formBuilder/Update.tsx

@@ -17,7 +17,7 @@ const FormBuilderUpdate: FC = () => {
 
     const { id } = useParams()
     const navigate = useNavigate()
-    const { data, refetch } = useGetFieldDetail(Number(id))
+    const { data, refetch } = useGetFieldDetail(id!)
     const { mutate: createField, isPending } = useUpdateField()
 
     const formik = useFormik<CreateFieldType>({
@@ -33,7 +33,7 @@ const FormBuilderUpdate: FC = () => {
             name: Yup.string().required('این فیلد اجباری می باشد')
         }),
         onSubmit: (values) => {
-            createField({ id: Number(id), params: values }, {
+            createField({ id: id!, params: values }, {
                 onSuccess: () => {
                     toast.success('با موفقیت ذخیره شد')
                     refetch()

src/pages/formBuilder/components/CreateValue.tsx

@@ -11,7 +11,7 @@ import { extractErrorMessage } from '@/config/func'
 import { toast } from 'react-toastify'
 
 type Props = {
-    id: number,
+    id: string,
     refetch: () => void,
 }
 

src/pages/formBuilder/components/UpdateValue.tsx

@@ -11,7 +11,7 @@ import { extractErrorMessage } from '@/config/func'
 import { toast } from 'react-toastify'
 
 type Props = {
-    id: number,
+    id: string,
     refetch: () => void,
 }
 

src/pages/formBuilder/hooks/useFormBuilderData.ts

@@ -6,7 +6,7 @@ export const useCreateField = () => {
   const queryClient = new QueryClient();
 
   return useMutation({
-    mutationFn: ({ id, params }: { id: number; params: CreateFieldType }) =>
+    mutationFn: ({ id, params }: { id: string; params: CreateFieldType }) =>
       api.createField(id, params),
     onSuccess: (_, params) => {
       queryClient.refetchQueries({
@@ -16,7 +16,7 @@ export const useCreateField = () => {
   });
 };
 
-export const useGetFields = (id: number) => {
+export const useGetFields = (id: string) => {
   return useQuery({
     queryKey: ["product-Fields", id],
     queryFn: () => api.getFields(id),
@@ -24,7 +24,7 @@ export const useGetFields = (id: number) => {
   });
 };
 
-export const useGetFieldDetail = (id: number) => {
+export const useGetFieldDetail = (id: string) => {
   return useQuery({
     queryKey: ["product-Field", id],
     queryFn: () => api.getFieldDetail(id),
@@ -35,7 +35,7 @@ export const useGetFieldDetail = (id: number) => {
 export const useUpdateField = () => {
   const queryClient = new QueryClient();
   return useMutation({
-    mutationFn: ({ id, params }: { id: number; params: CreateFieldType }) =>
+    mutationFn: ({ id, params }: { id: string; params: CreateFieldType }) =>
       api.updateField(id, params),
     onSuccess: () => {
       queryClient.invalidateQueries({
@@ -47,11 +47,11 @@ export const useUpdateField = () => {
 
 export const useDeleteField = () => {
   return useMutation({
-    mutationFn: (id: number) => api.deleteFields(id),
+    mutationFn: (id: string) => api.deleteFields(id),
   });
 };
 
-export const useGetFieldValues = (id: number) => {
+export const useGetFieldValues = (id: string) => {
   return useQuery({
     queryKey: ["attrbute-values", id],
     queryFn: () => api.getFieldValues(id),
@@ -65,7 +65,7 @@ export const useCreateFieldValue = () => {
       id,
       params,
     }: {
-      id: number;
+      id: string;
       params: CreateFieldValueType;
     }) => api.createFieldValues(id, params),
   });
@@ -77,13 +77,13 @@ export const useUpdateFieldValue = () => {
       id,
       params,
     }: {
-      id: number;
+      id: string;
       params: CreateFieldValueType;
     }) => api.updateFieldValues(id, params),
   });
 };
 
-export const useGetFieldValueDetail = (id: number, enabled: boolean) => {
+export const useGetFieldValueDetail = (id: string, enabled: boolean) => {
   return useQuery({
     queryKey: ["attrbute-values-detail", id],
     queryFn: () => api.getFieldValueDetail(id),
@@ -93,11 +93,11 @@ export const useGetFieldValueDetail = (id: number, enabled: boolean) => {
 
 export const useDeleteFieldValue = () => {
   return useMutation({
-    mutationFn: (id: number) => api.deleteFieldValue(id),
+    mutationFn: (id: string) => api.deleteFieldValue(id),
   });
 };
 
-export const useGetEntityField = (entityId: number) => {
+export const useGetEntityField = (entityId: string) => {
   return useQuery({
     queryKey: ["entity-field", entityId],
     queryFn: () => api.getEntityField(entityId),

src/pages/formBuilder/service/FormBuilderService.ts

@@ -9,76 +9,76 @@ import type {
   GetEnitityFieldResponseType,
 } from "../types/Types";
 
-export const createField = async (id: number, params: CreateFieldType) => {
+export const createField = async (id: string, params: CreateFieldType) => {
   const { data } = await axios.post(`/admin/entity/${id}/field`, params);
   return data;
 };
 
-export const getFields = async (id: number) => {
+export const getFields = async (id: string) => {
   const { data } = await axios.get<FieldResponseType>(
-    `/admin/entity/${id}/field`
+    `/admin/entity/${id}/field`,
   );
   return data;
 };
 
-export const getFieldDetail = async (id: number) => {
+export const getFieldDetail = async (id: string) => {
   const { data } = await axios.get<FieldDetailResponseType>(
-    `/admin/entity/field/${id}`
+    `/admin/entity/field/${id}`,
   );
   return data;
 };
 
-export const updateField = async (id: number, params: CreateFieldType) => {
+export const updateField = async (id: string, params: CreateFieldType) => {
   const { data } = await axios.patch(`/admin/entity/field/${id}`, params);
   return data;
 };
 
-export const deleteFields = async (id: number) => {
+export const deleteFields = async (id: string) => {
   const { data } = await axios.delete(`/admin/entity/field/${id}`);
   return data;
 };
 
-export const getFieldValues = async (id: number) => {
+export const getFieldValues = async (id: string) => {
   const { data } = await axios.get<FieldValuesResponseType>(
-    `/admin/entity/field/${id}/option`
+    `/admin/entity/field/${id}/option`,
   );
   return data;
 };
 
 export const createFieldValues = async (
-  id: number,
+  id: string,
-  params: CreateFieldValueType
+  params: CreateFieldValueType,
 ) => {
   const { data } = await axios.post(`/admin/entity/field/${id}/option`, params);
   return data;
 };
 
 export const updateFieldValues = async (
-  id: number,
+  id: string,
-  params: CreateFieldValueType
+  params: CreateFieldValueType,
 ) => {
   const { data } = await axios.patch(
     `/admin/entity/field/option/${id}`,
-    params
+    params,
   );
   return data;
 };
 
-export const getFieldValueDetail = async (id: number) => {
+export const getFieldValueDetail = async (id: string) => {
   const { data } = await axios.get<FieldValueDetailResponseType>(
-    `/admin/entity/field/option/${id}`
+    `/admin/entity/field/option/${id}`,
   );
   return data;
 };
 
-export const deleteFieldValue = async (id: number) => {
+export const deleteFieldValue = async (id: string) => {
   const { data } = await axios.delete(`/admin/entity/field/option/${id}`);
   return data;
 };
 
-export const getEntityField = async (entityId: number) => {
+export const getEntityField = async (entityId: string) => {
   const { data } = await axios.get<GetEnitityFieldResponseType>(
-    `/admin/entity/${entityId}/field`
+    `/admin/entity/${entityId}/field`,
   );
   return data;
 };

src/pages/formBuilder/types/Types.ts

@@ -13,11 +13,11 @@ export type CreateFieldType = {
 
 export interface FieldType extends RowDataType {
     createdAt: string,
-    id: number,
+    id: string,
     isRequired: boolean,
     name: string,
     order: number,
-    product: number,
+    product: string,
     type: FieldTypeEnum,
     multiple: boolean,
     entityType:string, // 'product' | 'print'
@@ -33,7 +33,7 @@ export type CreateFieldValueType = {
 
 export type FieldValueType = {
     createdAt: string,
-    id: number,
+    id: string,
     order: number,
     value: string,
 }

src/pages/order/components/OrderItem.tsx

@@ -13,7 +13,7 @@ type Props = {
 const OrderItem: FC<Props> = ({ item, estimatedDays }) => {
 
     const { id } = useParams()
-    const { data: fields } = useGetEntityField(item.product?.id)
+    const { data: fields } = useGetEntityField(String(item.product?.id ?? ''))
 
 
     return (
@@ -67,7 +67,7 @@ const OrderItem: FC<Props> = ({ item, estimatedDays }) => {
             </div>
             {
                 fields?.data?.map((field) => {
-                    const value = item.attributes?.find((o => Number(o.attributeId) === Number(field.id)))
+                    const value = item.attributes?.find((o) => String(o.attributeId) === String(field.id))
 
 
                     return (

src/pages/order/hooks/useOrderData.ts

@@ -90,7 +90,7 @@ export const useGetAttributes = (id?: number) => {
   });
 };
 
-export const useGetOrderItem = (id?: number) => {
+export const useGetOrderItem = (id?: string) => {
   return useQuery({
     queryKey: ["order-item", id],
     queryFn: () => api.getOrderItem(id),

src/pages/order/service/OrderService.ts

@@ -26,7 +26,9 @@ export const getOrdersInvoiced = async (page: number = 1) => {
 };
 
 export const getRequests = async () => {
-  const { data } = await axios.get<OrderListResponseType>(`/admin/orders/request`);
+  const { data } = await axios.get<OrderListResponseType>(
+    `/admin/orders/request`,
+  );
   return data;
 };
 
@@ -77,7 +79,7 @@ export const getAttributes = async (productId?: number) => {
   return data;
 };
 
-export const getOrderItem = async (itemId?: number) => {
+export const getOrderItem = async (itemId?: string) => {
   const { data } = await axios.get<OrderItemResponseType>(
     `/admin/orders/item/${itemId}`,
   );

src/pages/order/types/Types.ts

@@ -42,7 +42,7 @@ export interface OrderItem {
   printAttachments: null;
   printAttributes?: {
     value: string;
-    fieldId: number;
+    fieldId: string;
   }[];
   confirmedAt: string | null;
   createdAt: string;
@@ -166,7 +166,7 @@ export type OrderItemType = {
   discount: number;
   printAttributes?: {
     value: string;
-    fieldId: number;
+    fieldId: string;
   }[];
 };
 export type TicketsResponseType = BaseResponse<TicketType[]>;

src/pages/print/Form.tsx

@@ -14,7 +14,7 @@ const PrintForm: FC = () => {
 
     const navigate = useNavigate()
     const { itemId, orderId } = useParams()
-    const { data: item } = useGetOrderItem(+itemId!)
+    const { data: item } = useGetOrderItem(itemId!)
     const { isPending, mutate } = useCreatePrintForm()
     const { data } = useGetSections()
 
@@ -24,7 +24,7 @@ const PrintForm: FC = () => {
             printAttributes: []
         },
         onSubmit: (values) => {
-            mutate({ itemId: +itemId!, orderId: orderId!, params: values }, {
+            mutate({ itemId: itemId!, orderId: orderId!, params: values }, {
                 onSuccess: () => {
                     toast('با موفقیت ذخیره شد', 'success')
                     navigate(-1)

src/pages/print/components/ManageForms.tsx

@@ -20,7 +20,7 @@ const ManageForms: FC<Props> = (props) => {
 
     const { attributes, formik } = props
 
-    const handleChange = (attributeId: number, value: string) => {
+    const handleChange = (attributeId: string, value: string) => {
         const attribute = formik.values.printAttributes
         const index: number = attribute.findIndex(o => o.fieldId === attributeId)
         if (index > -1) {
@@ -28,7 +28,7 @@ const ManageForms: FC<Props> = (props) => {
         } else {
             attribute.push({ fieldId: attributeId, value: value })
         }
-        formik.setFieldValue('attributes', attribute)
+        formik.setFieldValue('printAttributes', attribute)
     }
 
 

src/pages/print/hooks/usePrintData.ts

@@ -64,7 +64,7 @@ export const useCreatePrintForm = () => {
       params,
     }: {
       orderId: string;
-      itemId: number;
+      itemId: string;
       params: CreatePrintFormType;
     }) => api.createPrintForm(orderId, itemId, params),
     // onSuccess: (_, params) => {

src/pages/print/service/PrintService.ts

@@ -23,7 +23,7 @@ export const updateSection = async (id: number, params: CreateSectionType) => {
 
 export const getSectionDetail = async (id: number) => {
   const { data } = await axios.get<SectionDetailResponseType>(
-    `/admin/section/${id}`
+    `/admin/section/${id}`,
   );
   return data;
 };
@@ -35,12 +35,12 @@ export const deleteSection = async (id: number) => {
 
 export const createPrintForm = async (
   orderId: string,
-  itemId: number,
+  itemId: string,
-  params: CreatePrintFormType
+  params: CreatePrintFormType,
 ) => {
   const { data } = await axios.patch(
     `/admin/orders/${orderId}/item/${itemId}/print`,
-    params
+    params,
   );
   return data;
 };

src/pages/print/types/Types.ts

@@ -18,7 +18,7 @@ export type SectionsResponseType = BaseResponse<SectionItemType[]>;
 export type SectionDetailResponseType = BaseResponse<SectionItemType>;
 
 export type PrintAttributesType = {
-  fieldId: number;
+  fieldId: string;
   value: string;
 };
 

src/pages/requests/components/RequestItem.tsx

@@ -8,7 +8,7 @@ type Props = {
 }
 
 const RequestItem: FC<Props> = ({ item }) => {
-    const { data: fields } = useGetEntityField(Number(item.product?.id))
+    const { data: fields } = useGetEntityField(String(item.product?.id ?? ''))
 
     const handleOpenAttachment = (url: string) => {
         window.open(url, '_blank')
@@ -58,7 +58,7 @@ const RequestItem: FC<Props> = ({ item }) => {
                     <div className='font-bold mb-5 mt-7'>ویژگی ها</div>
                     {
                         fields.data.map((field) => {
-                            const value = item.attributes?.find((o) => Number(o.attributeId) === Number(field.id))
+                            const value = item.attributes?.find((o) => String(o.attributeId) === String(field.id))
                             return (
                                 <div className='flex gap-3 items-center mt-3' key={field.id}>
                                     <div className='text-sm text-gray-500'>{field.name}:</div>