From a7ec4f8d3daadbb84df7034d90e0569692ea5ba0 Mon Sep 17 00:00:00 2001
From: Jonathan Niles <jonathanwniles@gmail.com>
Date: Thu, 17 Sep 2020 20:10:14 +0100
Subject: [PATCH] fix(accounts): references proper use of $state

Corrects for the old method of using $stateParams to using the new
$transition$.params('to').  It also corrects the onEnter() state
definitions for the account_reference module.
---
 .../account_reference.modal.html              |  6 ++---
 .../account_reference.modal.js                | 25 ++++++++++---------
 .../account_reference.routes.js               | 14 +++++------
 .../account_reference/search.modal.html       |  2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/client/src/modules/account_reference/account_reference.modal.html b/client/src/modules/account_reference/account_reference.modal.html
index 6aca24ccae..05c178bc03 100644
--- a/client/src/modules/account_reference/account_reference.modal.html
+++ b/client/src/modules/account_reference/account_reference.modal.html
@@ -3,11 +3,11 @@
     <ol class="headercrumb">
       <li class="static" translate>TREE.ACCOUNT_REFERENCE_MANAGEMENT</li>
 
-      <li ng-if="AccountReferenceModalCtrl.isCreating" class="title">
+      <li ng-if="AccountReferenceModalCtrl.isCreateState" class="title">
         <span translate>ACCOUNT.REFERENCE.ADD_REFERENCE</span>
         <label class="badge badge-warning" translate>FORM.LABELS.CREATE</label>
       </li>
-      <li ng-if="!AccountReferenceModalCtrl.isCreating" class="title">
+      <li ng-if="!AccountReferenceModalCtrl.isCreateState" class="title">
         <span translate>ACCOUNT.REFERENCE.UPDATE_REFERENCE</span>
         <label class="badge badge-warning" translate>FORM.LABELS.UPDATE</label>
       </li>
@@ -129,7 +129,7 @@
   </div>
 
   <div class="modal-footer">
-    <p id="account-reference-same" ng-if="AccountReferenceForm.$submitted && AccountReferenceForm.$pristine && !AccountReferenceModalCtrl.isCreating" class="text-warning">
+    <p id="account-reference-same" ng-if="AccountReferenceForm.$submitted && AccountReferenceForm.$pristine && !AccountReferenceModalCtrl.isCreateState" class="text-warning">
       <i class="fa fa-warning"></i> <span translate>ACCOUNT.RECORD_SAME</span>
     </p>
 
diff --git a/client/src/modules/account_reference/account_reference.modal.js b/client/src/modules/account_reference/account_reference.modal.js
index 8ab1692f92..28aa7b6a72 100644
--- a/client/src/modules/account_reference/account_reference.modal.js
+++ b/client/src/modules/account_reference/account_reference.modal.js
@@ -3,15 +3,17 @@ angular.module('bhima.controllers')
 
 AccountReferenceModalController.$inject = [
   '$state', 'AccountService', 'AccountReferenceService',
-  'NotifyService', 'appcache', 'FormatTreeDataService',
+  'NotifyService', 'appcache', 'FormatTreeDataService', 'params',
 ];
 
-function AccountReferenceModalController($state, Accounts, AccountReferences, Notify, AppCache, FormatTreeData) {
+function AccountReferenceModalController($state, Accounts, AccountReferences, Notify, AppCache, FormatTreeData, params) {
   const vm = this;
   const cache = AppCache('AccountReferenceModal');
 
   vm.accountReference = {};
-  vm.stateParams = {};
+
+  // check if we are in the create state
+  vm.isCreateState = params.isCreateState;
 
   // exposed methods
   vm.submit = submit;
@@ -19,16 +21,15 @@ function AccountReferenceModalController($state, Accounts, AccountReferences, No
   vm.clear = clear;
   vm.onSelectAccountReferenceType = onSelectAccountReferenceType;
 
-  if ($state.params.creating || $state.params.id) {
-    cache.stateParams = $state.params;
-    vm.stateParams = cache.stateParams;
+  if (vm.isCreateState || params.id) {
+    cache.stateParams = params;
+    vm.params = cache.stateParams;
   } else {
-    vm.stateParams = cache.stateParams;
+    vm.params = cache.stateParams;
   }
-  vm.isCreating = vm.stateParams.creating;
 
-  if (!vm.isCreating) {
-    AccountReferences.read(vm.stateParams.id)
+  if (!vm.isCreateState) {
+    AccountReferences.read(vm.params.id)
       .then(reference => {
         vm.accountReference = reference;
       })
@@ -65,13 +66,13 @@ function AccountReferenceModalController($state, Accounts, AccountReferences, No
 
     if (accountReferenceForm.$pristine) { return null; }
 
-    const promise = (vm.isCreating)
+    const promise = (vm.isCreateState)
       ? AccountReferences.create(vm.accountReference)
       : AccountReferences.update(vm.accountReference.id, vm.accountReference);
 
     return promise
       .then(() => {
-        const translateKey = (vm.isCreating) ? 'ACCOUNT.REFERENCE.CREATED' : 'ACCOUNT.REFERENCE.UPDATED';
+        const translateKey = (vm.isCreateState) ? 'ACCOUNT.REFERENCE.CREATED' : 'ACCOUNT.REFERENCE.UPDATED';
         Notify.success(translateKey);
         $state.go('account_reference.list', null, { reload : true });
       })
diff --git a/client/src/modules/account_reference/account_reference.routes.js b/client/src/modules/account_reference/account_reference.routes.js
index f6fec88167..bf537612f4 100644
--- a/client/src/modules/account_reference/account_reference.routes.js
+++ b/client/src/modules/account_reference/account_reference.routes.js
@@ -11,13 +11,12 @@ angular.module('bhima.routes')
           filters : [],
         },
       })
-
       .state('account_reference.create', {
         url : '/create',
         params : {
-          creating : { value : true },
+          isCreateState : { value : true },
         },
-        onEnter : ['$uibModal', accountReferenceModal],
+        onEnter : ['$uibModal', '$transition$', accountReferenceModal],
         onExit : ['$uibModalStack', closeModal],
       })
       .state('account_reference.list', {
@@ -31,18 +30,17 @@ angular.module('bhima.routes')
         params : {
           id : null,
         },
-        onEnter : ['$uibModal', accountReferenceModal],
+        onEnter : ['$uibModal', '$transition$', accountReferenceModal],
         onExit : ['$uibModalStack', closeModal],
       });
   }]);
 
-function accountReferenceModal($modal) {
+function accountReferenceModal($modal, $transition) {
   $modal.open({
-    keyboard : false,
-    backdrop : 'static',
     templateUrl : 'modules/account_reference/account_reference.modal.html',
     controller : 'AccountReferenceModalController as AccountReferenceModalCtrl',
-  });
+    resolve : { params : () => $transition.params('to') },
+  }).result.catch(angular.noop);
 }
 
 function closeModal(ModalStack) {
diff --git a/client/src/modules/account_reference/search.modal.html b/client/src/modules/account_reference/search.modal.html
index 7f3eea6668..513cd7257c 100644
--- a/client/src/modules/account_reference/search.modal.html
+++ b/client/src/modules/account_reference/search.modal.html
@@ -43,7 +43,7 @@
           </ui-select-choices>
         </ui-select>
       </div>
- 
+
       <div class="form-group">
         <div class="checkbox">
           <label class="control-label">