Fix & connectors folder

client/src/containers/Items/ItemCategoriesList.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useCallback,useMemo } from 'react';
+import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { useParams } from 'react-router-dom';
 import { useQuery } from 'react-query';
 import { Alert, Intent } from '@blueprintjs/core';
@@ -13,10 +13,9 @@ import DashboardInsider from 'components/Dashboard/DashboardInsider';
 import ItemCategoriesDataTable from 'containers/Items/ItemCategoriesTable';
 import ItemsCategoryActionsBar from 'containers/Items/ItemsCategoryActionsBar';
 
-import withDialog from 'connectors/Dialog.connector';
+import withDialog from 'containers/Dialogs/withDialog';
 import withDashboardActions from 'containers/Dashboard/withDashboard';
 import withItemCategoriesActions from 'containers/Items/withItemCategoriesActions';
-
 import { compose } from 'utils';
 
 const ItemCategoryList = ({
@@ -45,11 +44,11 @@ const ItemCategoryList = ({
     id
       ? changePageTitle(formatMessage({ id: 'edit_category_details' }))
       : changePageTitle(formatMessage({ id: 'category_list' }));
-  }, [id,changePageTitle,formatMessage]);
+  }, [id, changePageTitle, formatMessage]);
 
   const fetchCategories = useQuery(
     ['items-categories-table', filter],
-    (key, query) => requestFetchItemCategories(query)
+    (key, query) => requestFetchItemCategories(query),
   );
 
   const handleFilterChanged = useCallback(() => {}, []);
@@ -59,7 +58,7 @@ const ItemCategoryList = ({
     (itemCategories) => {
       setSelectedRows(itemCategories);
     },
-    [setSelectedRows]
+    [setSelectedRows],
   );
 
   // Handle fetch data of accounts datatable.
@@ -107,7 +106,7 @@ const ItemCategoryList = ({
     (itemsCategoriesIds) => {
       setBulkDelete(itemsCategoriesIds);
     },
-    [setBulkDelete]
+    [setBulkDelete],
   );
 
   // handle confirm itemCategories bulk delete.
@@ -125,22 +124,20 @@ const ItemCategoryList = ({
       .catch((errors) => {
         setBulkDelete(false);
       });
-  }, [requestDeleteBulkItemCategories, bulkDelete,formatMessage]);
-
+  }, [requestDeleteBulkItemCategories, bulkDelete, formatMessage]);
 
   //Handel cancel itemCategories bulk delete.
-  const handleCancelBulkDelete =useCallback(()=>{
-    setBulkDelete(false)
-  },[])
-
-
-    // Calculates the data table selected rows count.
-    const selectedRowsCount = useMemo(() => Object.values(selectedRows).length, [selectedRows]);
+  const handleCancelBulkDelete = useCallback(() => {
+    setBulkDelete(false);
+  }, []);
 
+  // Calculates the data table selected rows count.
+  const selectedRowsCount = useMemo(() => Object.values(selectedRows).length, [
+    selectedRows,
+  ]);
 
   return (
     <DashboardInsider name={'item-category-list'}>
-      
       <ItemsCategoryActionsBar
         selectedRows={selectedRows}
         onFilterChanged={handleFilterChanged}
@@ -153,13 +150,12 @@ const ItemCategoryList = ({
         onSelectedRowsChange={handleSelectedRowsChange}
         onDeleteCategory={handleDeleteCategory}
         loading={tableLoading}
-        
       />
 
       <Alert
         cancelButtonText={<T id={'cancel'} />}
         confirmButtonText={<T id={'delete'} />}
-        icon='trash'
+        icon="trash"
         intent={Intent.DANGER}
         isOpen={deleteCategory}
         onCancel={handleCancelItemDelete}
@@ -174,8 +170,10 @@ const ItemCategoryList = ({
 
       <Alert
         cancelButtonText={<T id={'cancel'} />}
-        confirmButtonText={`${formatMessage({id:'delete'})} (${selectedRowsCount})`}
-        icon='trash'
+        confirmButtonText={`${formatMessage({
+          id: 'delete',
+        })} (${selectedRowsCount})`}
+        icon="trash"
         intent={Intent.DANGER}
         isOpen={bulkDelete}
         onCancel={handleCancelBulkDelete}
@@ -183,11 +181,12 @@ const ItemCategoryList = ({
       >
         <p>
           <FormattedHTMLMessage
-            id={'once_delete_these_item_categories_you_will_not_able_restore_them'}
+            id={
+              'once_delete_these_item_categories_you_will_not_able_restore_them'
+            }
           />
         </p>
       </Alert>
-
     </DashboardInsider>
   );
 };

client/src/containers/Items/ItemsActionsBar.js

@@ -17,7 +17,7 @@ import { compose } from 'utils';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 import Icon from 'components/Icon';
 import FilterDropdown from 'components/FilterDropdown';
-import withDialog from 'connectors/Dialog.connector';
+import withDialog from 'containers/Dialogs/withDialog';
 import withResourceDetail from 'containers/Resources/withResourceDetails';
 import withItems from 'containers/Items/withItems';
 import { If } from 'components';
@@ -62,7 +62,7 @@ const ItemsActionsBar = ({
   });
 
   const onClickNewCategory = useCallback(() => {
-    openDialog('item-form', {});
+    openDialog('item-category-form', {});
   }, [openDialog]);
   
   const handleBulkDelete = useCallback(() => {

client/src/containers/Items/ItemsCategoryActionsBar.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo,useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import {
   NavbarGroup,
   Button,
@@ -18,7 +18,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 import FilterDropdown from 'components/FilterDropdown';
 
 import withResourceDetail from 'containers/Resources/withResourceDetails';
-import withDialog from 'connectors/Dialog.connector';
+import withDialog from 'containers/Dialogs/withDialog';
 import withDashboard from 'containers/Dashboard/withDashboard';
 
 import { compose } from 'utils';
@@ -26,29 +26,29 @@ import { compose } from 'utils';
 const ItemsCategoryActionsBar = ({
   // #withResourceDetail
   resourceFields,
-  
+
   // #withDialog
   openDialog,
 
   // #ownProps
-  selectedRows=[],
+  selectedRows = [],
   onFilterChanged,
-  onBulkDelete
+  onBulkDelete,
 }) => {
-
   const [filterCount, setFilterCount] = useState(0);
 
   const onClickNewCategory = useCallback(() => {
     openDialog('item-category-form', {});
   }, [openDialog]);
 
-  const hasSelectedRows = useMemo(() => selectedRows.length > 0, [selectedRows]);
+  const hasSelectedRows = useMemo(() => selectedRows.length > 0, [
+    selectedRows,
+  ]);
 
   // const handleDeleteCategory = useCallback((category) => {
   //   onDeleteCategory(selectedRows);
   // }, [selectedRows, onDeleteCategory]);
 
-
   const filterDropdown = FilterDropdown({
     fields: resourceFields,
     onFilterChange: (filterConditions) => {
@@ -57,17 +57,17 @@ const ItemsCategoryActionsBar = ({
     },
   });
 
-  const handelBulkDelete =useCallback(()=>{
-    onBulkDelete && onBulkDelete(selectedRows.map(r=>r.id));
-  },[onBulkDelete,selectedRows])
+  const handelBulkDelete = useCallback(() => {
+    onBulkDelete && onBulkDelete(selectedRows.map((r) => r.id));
+  }, [onBulkDelete, selectedRows]);
 
   return (
     <DashboardActionsBar>
       <NavbarGroup>
         <Button
           className={Classes.MINIMAL}
-          icon={<Icon icon='plus' />}
-          text={<T id={'new_category'}/>}
+          icon={<Icon icon="plus" />}
+          text={<T id={'new_category'} />}
           onClick={onClickNewCategory}
         />
         <Popover
@@ -78,16 +78,22 @@ const ItemsCategoryActionsBar = ({
         >
           <Button
             className={classNames(Classes.MINIMAL, 'button--filter')}
-            text={ filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`}
-            icon={<Icon icon='filter' />}
+            text={
+              filterCount <= 0 ? (
+                <T id={'filter'} />
+              ) : (
+                `${filterCount} filters applied`
+              )
+            }
+            icon={<Icon icon="filter" />}
           />
         </Popover>
 
         <If condition={hasSelectedRows}>
           <Button
             className={Classes.MINIMAL}
-            icon={<Icon icon='trash' iconSize={15} />}
-            text={<T id={'delete'}/>}
+            icon={<Icon icon="trash" iconSize={15} />}
+            text={<T id={'delete'} />}
             intent={Intent.DANGER}
             onClick={handelBulkDelete}
           />
@@ -95,13 +101,13 @@ const ItemsCategoryActionsBar = ({
 
         <Button
           className={Classes.MINIMAL}
-          icon={<Icon icon='file-import' />}
-          text={<T id={'import'}/>}
+          icon={<Icon icon="file-import" />}
+          text={<T id={'import'} />}
         />
         <Button
           className={Classes.MINIMAL}
-          icon={<Icon icon='file-export' />}
-          text={<T id={'export'}/>}
+          icon={<Icon icon="file-export" />}
+          text={<T id={'export'} />}
         />
       </NavbarGroup>
     </DashboardActionsBar>
@@ -120,5 +126,5 @@ export default compose(
   withDashboard,
   withResourceDetail(({ resourceFields }) => ({
     resourceFields,
-  })) 
+  })),
 )(ItemsCategoryActionsBar);