From 5b32d8fe7db9dff4da70d82dac7333938348a620 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Mon, 2 Nov 2020 17:16:50 +0200
Subject: [PATCH] Fix disabled button with AccountSelect

---
 client/src/components/AccountsSelectList.js           |  1 +
 client/src/components/AccountsTypesSelect.js          | 11 ++++++-----
 client/src/components/ListSelect.js                   |  9 +++++++--
 .../containers/Dialogs/AccountFormDialogContent.js    |  2 +-
 client/src/store/accounts/accounts.actions.js         |  4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/client/src/components/AccountsSelectList.js b/client/src/components/AccountsSelectList.js
index 0a70fa140..68e079184 100644
--- a/client/src/components/AccountsSelectList.js
+++ b/client/src/components/AccountsSelectList.js
@@ -76,6 +76,7 @@ export default function AccountsSelectList({
       popoverProps={{ minimal: true }}
       filterable={true}
       onItemSelect={onAccountSelect}
+      disabled={disabled}
     >
       <Button
         disabled={disabled}
diff --git a/client/src/components/AccountsTypesSelect.js b/client/src/components/AccountsTypesSelect.js
index ef80c0f3e..2563dbfe0 100644
--- a/client/src/components/AccountsTypesSelect.js
+++ b/client/src/components/AccountsTypesSelect.js
@@ -1,13 +1,12 @@
 import React, { useCallback } from 'react';
-import {
-  ListSelect,
-} from 'components';
+import { ListSelect } from 'components';
 
 export default function AccountsTypesSelect({
   accountsTypes,
   selectedTypeId,
   defaultSelectText = 'Select account type',
   onTypeSelected,
+  disabled = false,
   ...restProps
 }) {
   // Filters accounts types items.
@@ -28,7 +27,8 @@ export default function AccountsTypesSelect({
   };
 
   const items = accountsTypes.map((type) => ({
-    id: type.id, label: type.label,
+    id: type.id,
+    label: type.label,
   }));
 
   return (
@@ -40,7 +40,8 @@ export default function AccountsTypesSelect({
       defaultText={defaultSelectText}
       onItemSelect={handleItemSelected}
       itemPredicate={filterAccountTypeItems}
+      disabled={disabled}
       {...restProps}
     />
   );
-}
\ No newline at end of file
+}
diff --git a/client/src/components/ListSelect.js b/client/src/components/ListSelect.js
index 6142c3688..4a9bbfca4 100644
--- a/client/src/components/ListSelect.js
+++ b/client/src/components/ListSelect.js
@@ -15,7 +15,7 @@ export default function ListSelect({
 
   initialSelectedItem,
   onItemSelect,
-
+  disabled = false,
   ...selectProps
 }) {
   const selectedItemObj = useMemo(
@@ -24,7 +24,10 @@ export default function ListSelect({
   );
 
   const selectedInitialItem = useMemo(
-    () => selectProps.items.find((i) => i[selectedItemProp] === initialSelectedItem),
+    () =>
+      selectProps.items.find(
+        (i) => i[selectedItemProp] === initialSelectedItem,
+      ),
     [initialSelectedItem],
   );
 
@@ -65,10 +68,12 @@ export default function ListSelect({
       onItemSelect={handleItemSelect}
       {...selectProps}
       noResults={noResults}
+      disabled={disabled}
     >
       <Button
         text={currentItem ? currentItem[labelProp] : defaultText}
         loading={isLoading}
+        disabled={disabled}
         {...buttonProps}
       />
     </Select>
diff --git a/client/src/containers/Dialogs/AccountFormDialogContent.js b/client/src/containers/Dialogs/AccountFormDialogContent.js
index a1a620ac5..d00d7defe 100644
--- a/client/src/containers/Dialogs/AccountFormDialogContent.js
+++ b/client/src/containers/Dialogs/AccountFormDialogContent.js
@@ -282,7 +282,7 @@ function AccountFormDialogContent({
               selectedTypeId={values.account_type_id}
               defaultSelectText={<T id={'select_account_type'} />}
               onTypeSelected={onChangeAccountType}
-              buttonProps={{ disabled: action === 'edit' }}
+              disabled={action === 'edit'}
               popoverProps={{ minimal: true }}
             />
           </FormGroup>
diff --git a/client/src/store/accounts/accounts.actions.js b/client/src/store/accounts/accounts.actions.js
index 5a33e89a6..0661ae77e 100644
--- a/client/src/store/accounts/accounts.actions.js
+++ b/client/src/store/accounts/accounts.actions.js
@@ -149,11 +149,11 @@ export const editAccount = (id, form) => {
 };
 
 export const activateAccount = ({ id }) => {
-  return (dispatch) => ApiService.post(`accounts/${id}/active`);
+  return (dispatch) => ApiService.post(`accounts/${id}/activate`);
 };
 
 export const inactiveAccount = ({ id }) => {
-  return (dispatch) => ApiService.post(`accounts/${id}/inactive`);
+  return (dispatch) => ApiService.post(`accounts/${id}/inactivate`);
 };
 
 export const bulkActivateAccounts = ({ ids }) => {