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

client/src/store/dashboard/dashboard.actions.js

@@ -13,7 +13,7 @@ export function openDialog(name, payload) {
     name: name,
     payload: payload,
   };
-};
+}
 
 export function closeDialog(name, payload) {
   return {
@@ -24,7 +24,7 @@ export function closeDialog(name, payload) {
 }
 
 export function openAlert(name, payload) {
-  return  {
+  return {
     type: t.OPEN_ALERT,
     name,
     payload,
@@ -32,9 +32,24 @@ export function openAlert(name, payload) {
 }
 
 export function closeAlert(name, payload) {
-  return  {
+  return {
     type: t.CLOSE_ALERT,
     name,
     payload,
   };
-}
+}
+
+export function openDrawer(name, payload) {
+  return {
+    type: t.OPEN_DRAWER,
+    name,
+    payload,
+  };
+}
+export function closeDrawer(name, payload) {
+  return {
+    type: t.CLOSE_DRAWER,
+    name,
+    payload,
+  };
+}

client/src/store/dashboard/dashboard.reducer.js

@@ -1,7 +1,7 @@
 import t from 'store/types';
 import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist'
-import storage from 'redux-persist/lib/storage' // defaults to localStorage for web
+import { persistReducer } from 'redux-persist';
+import storage from 'redux-persist/lib/storage'; // defaults to localStorage for web
 
 const initialState = {
   pageTitle: '',
@@ -12,6 +12,7 @@ const initialState = {
   previousSidebarExpended: null,
   dialogs: {},
   alerts: {},
+  drawers: {},
   topbarEditViewId: null,
   requestsLoading: 0,
   backLink: false,
@@ -61,10 +62,19 @@ const reducerInstance = createReducer(initialState, {
       isOpen: false,
     };
   },
-
-  [t.CLOSE_ALL_DIALOGS]: (state, action) => {
-    
+  [t.OPEN_DRAWER]: (state, action) => {
+    state.drawers[action.name] = {
+      isOpen: true,
+      payload: action.payload || {},
+    };
   },
+  [t.CLOSE_DRAWER]: (state, action) => {
+    state.drawers[action.name] = {
+      ...state.drawers[action.name],
+      isOpen: false,
+    };
+  },
+  [t.CLOSE_ALL_DIALOGS]: (state, action) => {},
 
   [t.SET_TOPBAR_EDIT_VIEW]: (state, action) => {
     state.topbarEditViewId = action.id;
@@ -102,27 +112,31 @@ const reducerInstance = createReducer(initialState, {
   [t.SET_DASHBOARD_BACK_LINK]: (state, action) => {
     const { backLink } = action.payload;
     state.backLink = backLink;
-  }
+  },
 });
 
-export default persistReducer({
-  key: 'bigcapital:dashboard',
-  blacklist: [
-    'pageTitle',
-    'pageSubtitle',
-    'pageHint',
-    'preferencesPageTitle',
-    'topbarEditViewId',
-    'backLink'
-  ],
-  storage,
-}, reducerInstance);
+export default persistReducer(
+  {
+    key: 'bigcapital:dashboard',
+    blacklist: [
+      'pageTitle',
+      'pageSubtitle',
+      'pageHint',
+      'preferencesPageTitle',
+      'topbarEditViewId',
+      'backLink',
+    ],
+    storage,
+  },
+  reducerInstance,
+);
 
 export const getDialogPayload = (state, dialogName) => {
   return typeof state.dashboard.dialogs[dialogName] !== 'undefined'
-    ? state.dashboard.dialogs[dialogName].payload : {};
+    ? state.dashboard.dialogs[dialogName].payload
+    : {};
 };
 
 export const getDialogActiveStatus = (state, dialogName) => {
   return true;
-};
+};

client/src/store/dashboard/dashboard.selectors.js

@@ -1,33 +1,40 @@
-import { createSelector } from "@reduxjs/toolkit";
+import { createSelector } from '@reduxjs/toolkit';
 
-const dialogByNameSelector = (state, props) => state.dashboard.dialogs?.[props.dialogName];
+const dialogByNameSelector = (state, props) =>
+  state.dashboard.dialogs?.[props.dialogName];
 
-export const isDialogOpenFactory = () => createSelector(
-  dialogByNameSelector,
-  (dialog) => {
+export const isDialogOpenFactory = () =>
+  createSelector(dialogByNameSelector, (dialog) => {
     return dialog && dialog.isOpen;
-  },
-);
+  });
 
-export const getDialogPayloadFactory = () => createSelector(
-  dialogByNameSelector,
-  (dialog) => {
+export const getDialogPayloadFactory = () =>
+  createSelector(dialogByNameSelector, (dialog) => {
     return { ...dialog?.payload };
-  },
-);
+  });
 
-const alertByNameSelector = (state, props) => state.dashboard.alerts?.[props.name];
+const alertByNameSelector = (state, props) =>
+  state.dashboard.alerts?.[props.name];
 
-export const isAlertOpenFactory = () => createSelector(
-  alertByNameSelector,
-  (alert) => {
+export const isAlertOpenFactory = () =>
+  createSelector(alertByNameSelector, (alert) => {
     return alert && alert.isOpen;
-  },
-);
+  });
 
-export const getAlertPayloadFactory = () => createSelector(
-  alertByNameSelector,
-  (alert) => {
+export const getAlertPayloadFactory = () =>
+  createSelector(alertByNameSelector, (alert) => {
     return { ...alert?.payload };
-  },
-);
+  });
+
+const drawerByNameSelector = (state, props) =>
+  state.dashboard.drawers?.[props.name];
+
+export const isDrawerOpenFactory = () =>
+  createSelector(drawerByNameSelector, (drawer) => {
+    return drawer && drawer.isOpen;
+  });
+
+export const getDrawerPayloadFactory = () =>
+  createSelector(drawerByNameSelector, (drawer) => {
+    return { ...drawer?.payload };
+  });

client/src/store/dashboard/dashboard.types.js

@@ -1,4 +1,3 @@
-
 export default {
   OPEN_DIALOG: 'OPEN_DIALOG',
   CLOSE_DIALOG: 'CLOSE_DIALOG',
@@ -6,6 +5,8 @@ export default {
   CLOSE_ALERT: 'CLOSE_ALERT',
   CLOSE_ALL_DIALOGS: 'CLOSE_ALL_DIALOGS',
   CLOSE_ALL_ALERTS: 'CLOSE_ALL_ALERTS',
+  OPEN_DRAWER: 'OPEN_DRAWER',
+  CLOSE_DRAWER: 'CLOSE_DRAWER',
   CHANGE_DASHBOARD_PAGE_TITLE: 'CHANGE_DASHBOARD_PAGE_TITLE',
   CHANGE_DASHBOARD_PAGE_HINT: 'CHANGE_DASHBOARD_PAGE_HINT',
   CHANGE_PREFERENCES_PAGE_TITLE: 'CHANGE_PREFERENCES_PAGE_TITLE',
@@ -18,5 +19,5 @@ export default {
   SIDEBAR_SHRINK: 'SIDEBAR_SHRINK',
   RESET_SIDEBAR_PREVIOUS_EXPAND: 'RESET_SIDEBAR_PREVIOUS_EXPAND',
   RECORD_SIDEBAR_PREVIOUS_EXPAND: 'RECORD_SIDEBAR_PREVIOUS_EXPAND',
-  SET_DASHBOARD_BACK_LINK: 'SET_DASHBOARD_BACK_LINK'
-};
+  SET_DASHBOARD_BACK_LINK: 'SET_DASHBOARD_BACK_LINK',
+};