From e8f329e29e5821ee3f9997af5736f33119fbcba6 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@live.com>
Date: Thu, 3 Dec 2020 13:25:33 +0200
Subject: [PATCH] fix: input focus style in authentication pages.

---
 .../containers/Accounts/AccountsDataTable.js  |  1 +
 client/src/style/objects/form.scss            | 21 ++++++++++---------
 client/src/style/pages/authentication.scss    |  1 -
 .../src/services/Accounts/AccountsService.ts  |  3 +++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/client/src/containers/Accounts/AccountsDataTable.js b/client/src/containers/Accounts/AccountsDataTable.js
index 3f38a18f2..bb6e3bbbb 100644
--- a/client/src/containers/Accounts/AccountsDataTable.js
+++ b/client/src/containers/Accounts/AccountsDataTable.js
@@ -228,6 +228,7 @@ function AccountsDataTable({
         rowClassNames={rowClassNames}
         expandColumnSpace={1}
         autoResetExpanded={false}
+        autoResetSortBy={false}
         selectionColumnWidth={50}
       />
     </div>
diff --git a/client/src/style/objects/form.scss b/client/src/style/objects/form.scss
index edfa7c1ce..0455fe7d4 100644
--- a/client/src/style/objects/form.scss
+++ b/client/src/style/objects/form.scss
@@ -48,11 +48,21 @@ label.bp3-label{
     box-shadow: 0 0 0 1px #116cd0; 
     border-color: #116cd0;
   }
-
   &.bp3-disabled,
   &:disabled{
     background: #e9ecef;
   }
+
+  .bp3-form-group.bp3-intent-danger &{
+    box-shadow: 0 0 0 transparent;
+    border-color: #db3737;
+
+    &:focus,
+    &.bp3-active{
+      box-shadow: 0 0 0 1px #db3737; 
+      border-color: #db3737;
+    }
+  }
 }
 
 .#{$ns}-form-group{
@@ -66,15 +76,6 @@ label.bp3-label{
         inset 0 0 0 1px rgba(16, 22, 26, 0.15),
         inset 0 1px 1px rgba(16, 22, 26, 0.2);
     }
-
-    .bp3-input{
-      border-color: rgb(219, 55, 55);
-      box-shadow: 0 0 0 0 transparent;
-
-      &:focus{
-        box-shadow: 0 0 0 0.2rem rgba(219, 55, 55, 0.25);
-      }
-    }
   }
 
   .#{$ns}-label{
diff --git a/client/src/style/pages/authentication.scss b/client/src/style/pages/authentication.scss
index 226474cf0..f41f4aa06 100644
--- a/client/src/style/pages/authentication.scss
+++ b/client/src/style/pages/authentication.scss
@@ -76,7 +76,6 @@
 
   .bp3-input {
     min-height: 40px;
-    border: 1px solid #ced4da;
   }
   .bp3-form-group {
     margin-bottom: 25px;
diff --git a/server/src/services/Accounts/AccountsService.ts b/server/src/services/Accounts/AccountsService.ts
index be1064566..dabb50960 100644
--- a/server/src/services/Accounts/AccountsService.ts
+++ b/server/src/services/Accounts/AccountsService.ts
@@ -183,6 +183,9 @@ export default class AccountsService {
         tenantId, accountDTO.parentAccountId
       );
       this.throwErrorIfParentHasDiffType(accountDTO, parentAccount);
+
+      // Inherit active status from parent account.
+      accountDTO.active = parentAccount.active;
     }
     const account = await accountRepository.insert({
       ...accountDTO,