Merge branch 'master' of https://github.com/abouolia/Ratteb

client/src/containers/Items/ItemsViewsTabs.js

@@ -40,6 +40,9 @@ function ItemsViewsTabs({
   useEffect(() => {
     setTopbarEditView(customViewId);
     changePageSubtitle(customViewId && viewItem ? viewItem.name : '');
+    addItemsTableQueries({
+      custom_view_id: customViewId || null,
+    });
   }, [customViewId]);
 
   const handleClickNewView = () => {};

client/src/containers/Sales/Receipt/ReceiptActionsBar.js

@@ -37,12 +37,12 @@ function ReceiptActionsBar({
   receiptview,
   //#withReceiptActions
   addReceiptsTableQueries,
+  changeReceiptView,
 
   //#OWn Props
   onFilterChanged,
   selectedRows = [],
 }) {
-  const { path } = useRouteMatch();
   const history = useHistory();
   const [filterCount, setFilterCount] = useState(0);
   const { formatMessage } = useIntl();
@@ -51,6 +51,17 @@ function ReceiptActionsBar({
     history.push('/receipts/new');
   }, [history]);
 
+  const hasSelectedRows = useMemo(() => selectedRows.length > 0, [
+    selectedRows,
+  ]);
+
+  const handleTabChange = (viewId) => {
+    changeReceiptView(viewId.id || -1);
+    addReceiptsTableQueries({
+      custom_view_id: viewId.id || null,
+    });
+  };
+
   // const filterDropdown = FilterDropdown({
   //   initialCondition: {
   //     fieldKey: '',
@@ -66,16 +77,13 @@ function ReceiptActionsBar({
   //   },
   // });
 
-  const hasSelectedRows = useMemo(() => selectedRows.length > 0, [
-    selectedRows,
-  ]);
-
   return (
     <DashboardActionsBar>
       <NavbarGroup>
         <DashboardActionViewsList
-          resourceName={'sales_receipts'}
+          resourceName={'receipts'}
           views={receiptview}
+          onChange={handleTabChange}
         />
 
         <NavbarDivider />

client/src/containers/Sales/Receipt/ReceiptList.js

@@ -43,19 +43,15 @@ function ReceiptList({
   const [closeReceipt, setCloseReceipt] = useState(false);
   const [selectedRows, setSelectedRows] = useState([]);
 
-  const fetchReceipts = useQuery(['receipts-table', receiptTableQuery], () =>
-    requestFetchReceiptsTable(),
+  const fetchReceipts = useQuery(
+    ['receipts-table', receiptTableQuery],
+    (key, query) => requestFetchReceiptsTable({ ...query }),
   );
 
-  // const fetchResourceViews = useQuery(
-  //   ['resource-views', 'sales_receipts'],
-  //   (key, resourceName) => requestFetchResourceViews(resourceName),
-  // );
-
-  // const fetchResourceFields = useQuery(
-  //   ['resource-fields', 'sales_receipts'],
-  //   (key, resourceName) => requestFetchResourceFields(resourceName),
-  // );
+  const fetchResourceViews = useQuery(
+    ['resource-views', 'sale_receipt'],
+    (key, resourceName) => requestFetchResourceViews(resourceName),
+  );
 
   useEffect(() => {
     changePageTitle(formatMessage({ id: 'receipt_list' }));
@@ -150,7 +146,7 @@ function ReceiptList({
   return (
     <DashboardInsider
       name={'sales_receipts'}
-      // loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching}
+      loading={fetchResourceViews.isFetching}
     >
       <DashboardPageContent>
         <ReceiptActionsBar

client/src/containers/Sales/Receipt/ReceiptViewTabs.js

@@ -15,6 +15,9 @@ import withViewDetails from 'containers/Views/withViewDetails';
 
 import { compose } from 'utils';
 
+/**
+ * Receipt views tabs.
+ */
 function ReceiptViewTabs({
   //#withReceipts
   receiptview,
@@ -37,55 +40,39 @@ function ReceiptViewTabs({
   const { custom_view_id: customViewId = null } = useParams();
 
   useEffect(() => {
-    changeReceiptView(customViewId || -1);
     setTopbarEditView(customViewId);
     changePageSubtitle(customViewId && viewItem ? viewItem.name : '');
+    // changeReceiptView(customViewId || -1);
+    // addReceiptsTableQueries({
+    //   custom_view_id: customViewId || null,
+    // });
+  }, [customViewId, addReceiptsTableQueries]);
 
-    addReceiptsTableQueries({
-      custom_view_id: customViewId,
-    });
-    return () => {
-      setTopbarEditView(null);
-      changePageSubtitle('');
-      changeReceiptView(null);
-    };
-  }, [customViewId, addReceiptsTableQueries, changeReceiptView]);
-
-  useUpdateEffect(() => {
-    onViewChanged && onViewChanged(customViewId);
-  }, [customViewId]);
-
-  const debounceChangeHistory = useRef(
-    debounce((toUrl) => {
-      history.push(toUrl);
-    }, 250),
-  );
-
-  const handleTabsChange = (viewId) => {
-    const toPath = viewId ? `${viewId}/custom_view` : '';
-    debounceChangeHistory.current(`/receipts/${toPath}`);
-    setTopbarEditView(viewId);
-  };
   const tabs = receiptview.map((view) => ({
     ...pick(view, ['name', 'id']),
   }));
 
+  const handleTabsChange = (viewId) => {
+    changeReceiptView(viewId || -1);
+    addReceiptsTableQueries({
+      custom_view_id: viewId || null,
+    });
+    setTopbarEditView(viewId);
+  };
+
   // Handle click a new view tab.
   const handleClickNewView = () => {
     setTopbarEditView(null);
     history.push('/custom_views/receipts/new');
   };
 
-  console.log(receiptview, 'receiptview');
-
   return (
     <Navbar className={'navbar--dashboard-views'}>
       <NavbarGroup align={Alignment.LEFT}>
         <DashboardViewsTabs
           initialViewId={customViewId}
-          baseUrl={'/receipts'}
           tabs={tabs}
-          onNewViewTabClick={handleClickNewView}
+          resourceName={'receipts'}
           onChange={handleTabsChange}
         />
       </NavbarGroup>

client/src/containers/Sales/Receipt/withReceipts.js

@@ -18,7 +18,7 @@ export default (mapState) => {
 
     const mapped = {
       receiptsCurrentPage: getReceiptsItems(state, props, tableQuery),
-      receiptview: getResourceViews(state, props, 'sales_receipts'),
+      receiptview: getResourceViews(state, props, 'sale_receipt'),
       receiptItems: state.salesReceipts.items,
       receiptTableQuery: tableQuery,
       receiptsPagination: getReceiptPaginationMeta(state, props, tableQuery),

client/src/store/receipt/receipt.actions.js

@@ -87,7 +87,8 @@ export const fetchReceiptsTable = ({ query = {} }) => {
             payload: {
               sales_receipts: response.data.sale_receipts,
               pagination: response.data.pagination,
-              customViewId: response.data.customViewId || -1,
+              customViewId:
+                response.data?.filter_meta?.view?.custom_view_id || -1,
             },
           });
           dispatch({
@@ -100,7 +101,8 @@ export const fetchReceiptsTable = ({ query = {} }) => {
             type: t.RECEIPTS_PAGINATION_SET,
             payload: {
               pagination: response.data.pagination,
-              customViewId: response.data.customViewId || -1,
+              customViewId:
+                response.data?.filter_meta?.view?.custom_view_id || -1,
             },
           });
           dispatch({
@@ -119,4 +121,4 @@ export const fetchReceiptsTable = ({ query = {} }) => {
 
 export const closeReceipt = ({ id }) => {
   return (dispatch) => ApiService.post(`sales/receipts/${id}/close`);
-};
+};