feat: WIP advanced filter.

client/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.js

@@ -3,24 +3,25 @@ import Icon from 'components/Icon';
 import {
   Button,
   Classes,
-  Popover,
   NavbarDivider,
   NavbarGroup,
-  PopoverInteractionKind,
-  Position,
   Intent,
   Alignment,
 } from '@blueprintjs/core';
 
-import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
-import { FormattedMessage as T } from 'components';
-import intl from 'react-intl-universal';
+import {
+  AdvancedFilterPopover,
+  DashboardFilterButton,
+  FormattedMessage as T,
+} from 'components';
 
 import { If, DashboardActionViewsList } from 'components';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 
 import withReceiptsActions from './withReceiptsActions';
+import withReceipts from './withReceipts';
+
 import { useReceiptsListContext } from './ReceiptsListProvider';
 import { useRefreshReceipts } from 'hooks/query/receipts';
 import { compose } from 'utils';
@@ -31,13 +32,14 @@ import { compose } from 'utils';
 function ReceiptActionsBar({
   // #withReceiptsActions
   setReceiptsTableState,
+
+  // #withReceipts
+  receiptsFilterConditions,
 }) {
   const history = useHistory();
 
-  const [filterCount, setFilterCount] = useState(0);
-
   // Sale receipts list context.
-  const { receiptsViews } = useReceiptsListContext();
+  const { receiptsViews, fields } = useReceiptsListContext();
 
   // Handle new receipt button click.
   const onClickNewReceipt = () => {
@@ -54,9 +56,9 @@ function ReceiptActionsBar({
   };
 
   // Handle click a refresh sale estimates
-  const handleRefreshBtnClick = () => {
-    refresh();
-  };
+  const handleRefreshBtnClick = () => { refresh(); };
+
+  console.log(receiptsFilterConditions, fields, 'XXX');
 
   return (
     <DashboardActionsBar>
@@ -74,24 +76,21 @@ function ReceiptActionsBar({
           text={<T id={'new_receipt'} />}
           onClick={onClickNewReceipt}
         />
-        <Popover
-          minimal={true}
-          // content={filterDropdown}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
+        <AdvancedFilterPopover
+          advancedFilterProps={{
+            conditions: receiptsFilterConditions,
+            defaultFieldKey: 'reference_no',
+            fields: fields,
+            onFilterChange: (filterConditions) => {
+              setReceiptsTableState({ filterRoles: filterConditions });
+            },
+          }}
         >
-          <Button
-            className={classNames(Classes.MINIMAL, 'button--filter')}
-            text={
-              filterCount <= 0 ? (
-                <T id={'filter'} />
-              ) : (
-                `${filterCount} ${intl.get('filters_applied')}`
-              )
-            }
-            icon={<Icon icon={'filter-16'} iconSize={16} />}
+          <DashboardFilterButton
+            conditionsCount={receiptsFilterConditions.length}
           />
-        </Popover>
+        </AdvancedFilterPopover>
+
         <If condition={false}>
           <Button
             className={Classes.MINIMAL}
@@ -128,4 +127,9 @@ function ReceiptActionsBar({
   );
 }
 
-export default compose(withReceiptsActions)(ReceiptActionsBar);
+export default compose(
+  withReceiptsActions,
+  withReceipts(({ receiptTableState }) => ({
+    receiptsFilterConditions: receiptTableState.filterRoles,
+  })),
+)(ReceiptActionsBar);

client/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsList.js

@@ -9,6 +9,7 @@ import ReceiptsAlerts from '../ReceiptsAlerts';
 import ReceiptsTable from './ReceiptsTable';
 
 import withReceipts from './withReceipts';
+import withReceiptsActions from './withReceiptsActions';
 
 import { ReceiptsListProvider } from './ReceiptsListProvider';
 import { transformTableStateToQuery, compose } from 'utils';
@@ -19,7 +20,22 @@ import { transformTableStateToQuery, compose } from 'utils';
 function ReceiptsList({
   // #withReceipts
   receiptTableState,
+
+  // #withReceiptsActions
+  setReceiptsTableState,
 }) {
+  // Resets the receipts table state once the page unmount.
+  React.useEffect(
+    () => () => {
+      setReceiptsTableState({
+        filterRoles: [],
+        viewSlug: '',
+        pageIndex: 0,
+      });
+    },
+    [setReceiptsTableState],
+  );
+
   return (
     <ReceiptsListProvider query={transformTableStateToQuery(receiptTableState)}>
       <DashboardPageContent>
@@ -43,4 +59,5 @@ export default compose(
   withReceipts(({ receiptTableState }) => ({
     receiptTableState,
   })),
+  withReceiptsActions,
 )(ReceiptsList);

client/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsListProvider.js

@@ -1,29 +1,30 @@
 import React, { createContext } from 'react';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
-import { useResourceViews, useReceipts } from 'hooks/query';
-import { isTableEmptyStatus } from 'utils';
+
+import { useResourceMeta, useResourceViews, useReceipts } from 'hooks/query';
+import { isTableEmptyStatus, getFieldsFromResourceMeta } from 'utils';
 
 const ReceiptsListContext = createContext();
 
 // Receipts list provider.
 function ReceiptsListProvider({ query, ...props }) {
   // Fetch receipts resource views and fields.
-  const { data: receiptsViews, isLoading: isViewsLoading } = useResourceViews(
-    'sale_receipt',
-  );
+  const { data: receiptsViews, isLoading: isViewsLoading } =
+    useResourceViews('sale_receipt');
 
   // Fetches the sale receipts resource fields.
-  // const {
-  //   data: receiptsFields,
-  //   isFetching: isFieldsLoading,
-  // } = useResourceFields('sale_receipt');
+  const {
+    data: resourceMeta,
+    isFetching: isResourceFetching,
+    isLoading: isResourceLoading,
+  } = useResourceMeta('sale_receipt');
 
   const {
     data: { receipts, pagination, filterMeta },
     isLoading: isReceiptsLoading,
     isFetching: isReceiptsFetching,
   } = useReceipts(query, { keepPreviousData: true });
-  
+
   // Detarmines the datatable empty status.
   const isEmptyStatus =
     isTableEmptyStatus({
@@ -35,20 +36,22 @@ function ReceiptsListProvider({ query, ...props }) {
   const provider = {
     receipts,
     pagination,
-    // receiptsFields,
+
     receiptsViews,
     isViewsLoading,
-    // isFieldsLoading,
+
+    resourceMeta,
+    fields: getFieldsFromResourceMeta(resourceMeta.fields),
+    isResourceFetching,
+    isResourceLoading,
+
     isReceiptsLoading,
     isReceiptsFetching,
-    isEmptyStatus
+    isEmptyStatus,
   };
 
   return (
-    <DashboardInsider
-      loading={isViewsLoading}
-      name={'sales_receipts'}
-    >
+    <DashboardInsider loading={isViewsLoading} name={'sales_receipts'}>
       <ReceiptsListContext.Provider value={provider} {...props} />
     </DashboardInsider>
   );