From 3b642540f189eb5daf62f69b806675ef13329c6c Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Wed, 16 Feb 2022 16:56:35 +0200
Subject: [PATCH] fix: multi-select branches error.

---
 src/components/FMultiSelect/BranchesMultiSelect.js | 14 ++++----------
 .../BalanceSheet/BalanceSheetHeader.js             |  3 +--
 .../BalanceSheetHeaderDimensionsPanel.js           |  8 +-------
 .../FinancialStatements/BalanceSheet/utils.js      |  2 ++
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/components/FMultiSelect/BranchesMultiSelect.js b/src/components/FMultiSelect/BranchesMultiSelect.js
index 60110e399..34b92e8b6 100644
--- a/src/components/FMultiSelect/BranchesMultiSelect.js
+++ b/src/components/FMultiSelect/BranchesMultiSelect.js
@@ -50,17 +50,11 @@ const branchItemRenderer = (
 const branchSelectProps = {
   itemPredicate: branchItemPredicate,
   itemRenderer: branchItemRenderer,
-  valueAccessor: 'id',
-  labelAccessor: 'name',
-  tagRenderer: 'name',
+  valueAccessor: (item) => item.id,
+  labelAccessor: (item) => item.label,
+  tagRenderer: (item) => item.name,
 };
 
 export function BranchesMultiSelect({ branches, ...rest }) {
-  return (
-    <FMultiSelect
-      items={branches}
-      {...branchSelectProps}
-      {...rest}
-    />
-  );
+  return <FMultiSelect items={branches} {...branchSelectProps} {...rest} />;
 }
diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js
index f92c7917f..addc26e63 100644
--- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js
+++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js
@@ -41,7 +41,6 @@ function BalanceSheetHeader({
       ...pageFilter,
       fromDate: moment(pageFilter.fromDate).toDate(),
       toDate: moment(pageFilter.toDate).toDate(),
-      branches_id: [],
     },
     defaultValues,
   );
@@ -89,7 +88,7 @@ function BalanceSheetHeader({
             />
             <Tab
               id="dimensions"
-              title={<T id={'dimensions'} />}
+              title={'dimensions'}
               panel={<BalanceSheetHeaderDimensionsPanel />}
             />
           </Tabs>
diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js
index 32bb0d96c..5c162f62e 100644
--- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js
+++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderDimensionsPanel.js
@@ -14,10 +14,8 @@ function BalanceSheetHeaderDimensionsPanel() {
   return (
     <div>
       <BranchesMultiSelect
-        name={'branches_id'}
+        name={'branchesIds'}
         branches={branches}
-        input={BranchMulitSelectButton}
-        // onItemSelect={}
         popoverProps={{ minimal: true }}
       />
     </div>
@@ -25,7 +23,3 @@ function BalanceSheetHeaderDimensionsPanel() {
 }
 
 export default BalanceSheetHeaderDimensionsPanel;
-
-function BranchMulitSelectButton() {
-  return <Button text={'Button'} minimal={true} />;
-}
diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js
index 262aecf0a..a9d2f1892 100644
--- a/src/containers/FinancialStatements/BalanceSheet/utils.js
+++ b/src/containers/FinancialStatements/BalanceSheet/utils.js
@@ -29,6 +29,8 @@ export const getDefaultBalanceSheetQuery = () => ({
   // Percentage columns.
   percentageOfColumn: false,
   percentageOfRow: false,
+
+  branchesIds: [],
 });
 
 /**