Merge branch 'fix/marketing' into 'development'

[FIX/FE] Fixing Edit Product Sales Order per Row

See merge request mbugroup/lti-web-client!217

src/components/pages/marketing/detail/MarketingDetail.tsx

@@ -89,7 +89,6 @@ const MarketingDetail = ({
     deleteModal.closeModal();
     router.push('/marketing');
     toast.success(res?.message as string);
-    refresh?.();
     setIsLoading(false);
   };
 

src/components/pages/marketing/form/MarketingForm.tsx

@@ -507,7 +507,7 @@ const MarketingForm = ({
     addSOModal.openModal();
   }, [addSOModal]);
   const handleAddSubmitSO = useCallback(
-    async (values: SalesOrderProductFormValues) => {
+    async (values: SalesOrderProductFormValues, id?: number) => {
       const currentProducts = formik.values.sales_order;
 
       const newValues = {
@@ -515,18 +515,12 @@ const MarketingForm = ({
         id: values.id ?? Date.now(),
       };
 
-      const existingIndex = currentProducts.findIndex(
-        (item) =>
-          item.kandang_id === newValues.kandang_id &&
-          item.product_warehouse_id === newValues.product_warehouse_id
-      );
-
       let updatedProducts = [];
 
-      if (existingIndex !== -1) {
+      if (id) {
         // Overwrite
-        updatedProducts = currentProducts.map((item, index) =>
+        updatedProducts = currentProducts.map((item) =>
-          index === existingIndex ? newValues : item
+          item.id === id ? newValues : item
         );
       } else {
         // Add new item

src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx

@@ -39,7 +39,10 @@ const SalesOrderProductForm = ({
   initialValues?: SalesOrderProductFormValues;
   exisitingValues?: SalesOrderProductFormValues[];
   modalRef?: RefObject<HTMLDialogElement | null>;
-  onSubmitForm?: (value: SalesOrderProductFormValues) => Promise<void>;
+  onSubmitForm?: (
+    value: SalesOrderProductFormValues,
+    id?: number
+  ) => Promise<void>;
 }) => {
   const [formErrorMessage, setFormErrorMessage] = useState('');
   const [currentInput, setCurrentInput] = useState<string>('');
@@ -76,7 +79,7 @@ const SalesOrderProductForm = ({
     validationSchema: SalesOrderProductSchema,
     onSubmit: async (values) => {
       setFormErrorMessage('');
-      onSubmitForm?.(values);
+      onSubmitForm?.(values, initialValues?.id);
       handleResetForm();
     },
     validateOnBlur: true,
@@ -414,7 +417,9 @@ const SalesOrderProductForm = ({
           />
         </div>
 
-        <AlertErrorList formErrorList={formErrorList} onClose={close} />
+        <div className='mt-4'>
+          <AlertErrorList formErrorList={formErrorList} onClose={close} />
+        </div>
 
         <div className='flex flex-row justify-end gap-3 mt-4'>
           <Button type='reset' color='warning' onClick={handleResetForm}>