Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into dev/hotfix/restu

src/components/pages/finance/FinanceTable.tsx

@@ -1,4 +1,10 @@
-import { ChangeEventHandler, useMemo, useState } from 'react';
+import {
+  ChangeEventHandler,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { CellContext } from '@tanstack/react-table';
 import { useSearchParams } from 'next/navigation';
 import useSWR from 'swr';
@@ -33,6 +39,7 @@ import RequirePermission from '@/components/helper/RequirePermission';
 import { Icon } from '@iconify/react';
 import RowDropdownOptions from '@/components/table/RowDropdownOptions';
 import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+import { useUiStore } from '@/stores/ui/ui.store';
 
 const RowOptionsMenu = ({
   type = 'dropdown',
@@ -133,6 +140,9 @@ const RowOptionsMenu = ({
 };
 
 const FinanceTable = () => {
+  const { searchValue, setSearchValue, resetSearchValue } = useUiStore();
+  const previousPathRef = useRef<string | null>(null);
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -141,7 +151,7 @@ const FinanceTable = () => {
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
     initial: {
-      search: '',
+      search: searchValue,
       transactionType: '',
       bankId: '',
       customerId: '',
@@ -167,7 +177,7 @@ const FinanceTable = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const deleteModal = useModal();
   const [pendingFilters, setPendingFilters] = useState({
-    search: '',
+    search: searchValue,
     transactionType: '',
     bankId: '',
     customerId: '',
@@ -296,6 +306,7 @@ const FinanceTable = () => {
   };
   const submitFilterHandler = () => {
     updateFilter('search', pendingFilters.search);
+    setSearchValue(pendingFilters.search);
     updateFilter('transactionType', pendingFilters.transactionType);
     updateFilter('bankId', pendingFilters.bankId);
     updateFilter('customerId', pendingFilters.customerId);
@@ -324,6 +335,7 @@ const FinanceTable = () => {
     setPendingFilters(emptyFilters);
 
     updateFilter('search', '');
+    resetSearchValue();
     updateFilter('transactionType', '');
     updateFilter('bankId', '');
     updateFilter('customerId', '');
@@ -447,6 +459,26 @@ const FinanceTable = () => {
       },
     ];
   }, []);
+
+  useEffect(() => {
+    // Store current path on mount
+    previousPathRef.current = window.location.pathname;
+
+    return () => {
+      const currentPath = window.location.pathname;
+
+      // if both paths are within /finance module
+      const isCurrentPathFinance = currentPath.includes('/finance');
+      const isPreviousPathFinance =
+        previousPathRef.current?.includes('/finance');
+
+      // reset if we outside finance module entirely
+      if (isPreviousPathFinance && !isCurrentPathFinance) {
+        resetSearchValue();
+      }
+    };
+  }, [resetSearchValue]);
+
   return (
     <section className='size-full p-6 flex flex-col gap-6'>
       <div className='flex justify-end gap-2'>

src/components/pages/finance/add/FormFinanceAdd.tsx

@@ -251,7 +251,11 @@ const FormFinanceAdd = ({
               }
               required
               isClearable
-              isDisabled={!formik.values.party_type_option?.value}
+              isDisabled={
+                !formik.values.party_type_option?.value ||
+                (type === 'edit' &&
+                  formik.values.party_type_option.value == 'SUPPLIER')
+              }
             />
             <DateInput
               label='Tanggal'
@@ -423,7 +427,7 @@ const FormFinanceAdd = ({
               <Button
                 type='submit'
                 className='w-min-24'
-                disabled={formik.isSubmitting || !formik.isValid}
+                disabled={formik.isSubmitting}
               >
                 Submit
               </Button>

src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.tsx

@@ -396,7 +396,7 @@ const FormFinanceAddInitialBalance = ({
               <Button
                 type='submit'
                 className='w-min-24'
-                disabled={formik.isSubmitting || !formik.isValid}
+                disabled={formik.isSubmitting}
               >
                 Submit
               </Button>

src/components/pages/finance/add/injection/FormFinanceInjection.tsx

@@ -257,7 +257,7 @@ const FormFinanceInjection = ({
               <Button
                 type='submit'
                 className='w-min-24'
-                disabled={formik.isSubmitting || !formik.isValid}
+                disabled={formik.isSubmitting}
               >
                 Submit
               </Button>