From 91760aeefdc7f66441257378c2ca6c46d1ef1640 Mon Sep 17 00:00:00 2001
From: mbayopanda <mbayopanda@gmail.com>
Date: Wed, 5 Aug 2020 10:10:17 +0100
Subject: [PATCH] refactor tag modal for creation and update

---
 client/src/i18n/en/tag.json                   |  1 +
 client/src/i18n/fr/tag.json                   |  1 +
 .../components/bhTagSelect/bhTagSelect.html   |  6 ++--
 .../js/components/bhTagSelect/bhTagSelect.js  | 12 ++++++--
 client/src/js/services/TagService.js          | 22 ---------------
 client/src/modules/tags/modal/createUpdate.js |  4 +--
 client/src/modules/tags/tags.ctrl.js          | 10 ++-----
 client/src/modules/tags/tags.service.js       | 28 +++++++++++++++----
 8 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 client/src/js/services/TagService.js

diff --git a/client/src/i18n/en/tag.json b/client/src/i18n/en/tag.json
index a3b9f79608..f0e478815c 100644
--- a/client/src/i18n/en/tag.json
+++ b/client/src/i18n/en/tag.json
@@ -2,6 +2,7 @@
   "TAG":{
     "TITLE":"Tag",
     "LABEL":"Tag",
+    "TAGS":"Tags",
     "ADD":"Add Tag",
     "EDIT":"Edit Tag",
     "DELETE":"Delete Tag",
diff --git a/client/src/i18n/fr/tag.json b/client/src/i18n/fr/tag.json
index 51310892bf..7d783f99bc 100644
--- a/client/src/i18n/fr/tag.json
+++ b/client/src/i18n/fr/tag.json
@@ -2,6 +2,7 @@
   "TAG":{
     "TITLE":"Etiquette",
     "LABEL":"Etiquette",
+    "TAGS":"Etiquettes",
     "ADD":"Ajouter étiquette",
     "EDIT":"Editer étiquette",
     "DELETE":"Supprimer étiquette",
diff --git a/client/src/js/components/bhTagSelect/bhTagSelect.html b/client/src/js/components/bhTagSelect/bhTagSelect.html
index 5d41de346a..d270d66451 100644
--- a/client/src/js/components/bhTagSelect/bhTagSelect.html
+++ b/client/src/js/components/bhTagSelect/bhTagSelect.html
@@ -3,11 +3,13 @@
     class="form-group"
     ng-class="{ 'has-error' : TagForm.$submitted && TagForm.tagUuids.$invalid }">
 
-    <label class="control-label" translate>
-      {{ $ctrl.label }}
+    <label class="control-label">
+      <span translate>{{ $ctrl.label }}</span>&nbsp;
+      <a style="cursor: pointer;" ng-click="$ctrl.createUpdateTagsModal()" translate>TAG.ADD</a>
     </label>
     
     <ng-transclude></ng-transclude>
+
     <ui-select 
       name="tagUuids" 
       ng-model="$ctrl.tagUuids"
diff --git a/client/src/js/components/bhTagSelect/bhTagSelect.js b/client/src/js/components/bhTagSelect/bhTagSelect.js
index a53a568fa9..36f3d7fd86 100644
--- a/client/src/js/components/bhTagSelect/bhTagSelect.js
+++ b/client/src/js/components/bhTagSelect/bhTagSelect.js
@@ -11,16 +11,22 @@ angular.module('bhima.components')
     },
   });
 
-TagSelectController.$inject = ['TagService', 'NotifyService'];
+TagSelectController.$inject = ['$rootScope', 'TagService', 'NotifyService'];
 
 /**
  * Tag selection component
  */
-function TagSelectController(Tags, Notify) {
+function TagSelectController($rootScope, Tags, Notify) {
   const $ctrl = this;
 
+  $ctrl.createUpdateTagsModal = Tags.createUpdateTagsModal;
+
+  $rootScope.$on('TAGS_CHANGED', () => {
+    loadTags();
+  });
+
   $ctrl.$onInit = function onInit() {
-    $ctrl.label = $ctrl.label || 'TAG.LABEL';
+    $ctrl.label = $ctrl.label || 'TAG.TAGS';
     $ctrl.tagUuids = $ctrl.tagUuids || [];
     loadTags();
   };
diff --git a/client/src/js/services/TagService.js b/client/src/js/services/TagService.js
deleted file mode 100644
index 3cccae818e..0000000000
--- a/client/src/js/services/TagService.js
+++ /dev/null
@@ -1,22 +0,0 @@
-angular.module('bhima.services')
-  .service('TagService', TagService);
-
-TagService.$inject = ['PrototypeApiService', 'util'];
-
-/**
- * @class TagService
- * @extends PrototypeApiService
- *
- * @description
- * Encapsulates common requests to the /tags/ URL.
- */
-function TagService(Api, util) {
-  const baseUrl = '/tags/';
-  const service = new Api(baseUrl);
-  service.types = new Api(baseUrl.concat('types/'));
-
-  const tagKeys = ['uuid', 'name', 'color'];
-  service.clean = tag => util.maskObjectFromKeys(tag, tagKeys);
-
-  return service;
-}
diff --git a/client/src/modules/tags/modal/createUpdate.js b/client/src/modules/tags/modal/createUpdate.js
index 773cbc23a5..1da2e6f8c4 100644
--- a/client/src/modules/tags/modal/createUpdate.js
+++ b/client/src/modules/tags/modal/createUpdate.js
@@ -2,12 +2,12 @@ angular.module('bhima.controllers')
   .controller('TagsModalController', TagsModalController);
 
 TagsModalController.$inject = [
-  'data', '$state', 'TagsService', 'NotifyService',
+  'data', 'TagService', 'NotifyService',
   '$uibModalInstance', '$rootScope', 'ColorService',
 ];
 
 function TagsModalController(
-  data, $state, TagsService, Notify, Instance, $rootScope, Colors,
+  data, TagsService, Notify, Instance, $rootScope, Colors,
 ) {
   const vm = this;
   vm.colors = Colors.list.map(e => {
diff --git a/client/src/modules/tags/tags.ctrl.js b/client/src/modules/tags/tags.ctrl.js
index f9cb006383..819bb1971a 100644
--- a/client/src/modules/tags/tags.ctrl.js
+++ b/client/src/modules/tags/tags.ctrl.js
@@ -2,7 +2,7 @@ angular.module('bhima.controllers')
   .controller('TagsController', TagsController);
 
 TagsController.$inject = [
-  '$uibModal', 'TagsService', 'ModalService',
+  '$uibModal', 'TagService', 'ModalService',
   'NotifyService', 'uiGridConstants', '$rootScope',
 ];
 
@@ -11,13 +11,7 @@ function TagsController($uibModal, Tags, Modal, Notify, uiGridConstants, $rootSc
 
   vm.canEditTags = false;
 
-  vm.createUpdateTagsModal = (tag) => {
-    $uibModal.open({
-      templateUrl : 'modules/tags/modal/createUpdate.html',
-      controller : 'TagsModalController as ModalCtrl',
-      resolve : { data : () => tag },
-    });
-  };
+  vm.createUpdateTagsModal = Tags.createUpdateTagsModal;
 
   vm.remove = function remove(uuid) {
     const message = 'FORM.DIALOGS.CONFIRM_ACTION';
diff --git a/client/src/modules/tags/tags.service.js b/client/src/modules/tags/tags.service.js
index 8e5bd82b37..13f0fc3339 100644
--- a/client/src/modules/tags/tags.service.js
+++ b/client/src/modules/tags/tags.service.js
@@ -1,14 +1,30 @@
 angular.module('bhima.services')
-  .service('TagsService', TagsService);
+  .service('TagService', TagService);
 
-TagsService.$inject = ['PrototypeApiService'];
+TagService.$inject = ['PrototypeApiService', 'util', '$uibModal'];
 
 /**
- * Tags Service
+ * @class TagService
+ * @extends PrototypeApiService
  *
- * A service wrapper for the /tags HTTP endpoint.
+ * @description
+ * Encapsulates common requests to the /tags/ URL.
  */
-function TagsService(Api) {
-  const service = new Api('/tags/');
+function TagService(Api, util, $uibModal) {
+  const baseUrl = '/tags/';
+  const service = new Api(baseUrl);
+  service.types = new Api(baseUrl.concat('types/'));
+
+  const tagKeys = ['uuid', 'name', 'color'];
+  service.clean = tag => util.maskObjectFromKeys(tag, tagKeys);
+
+  service.createUpdateTagsModal = (tag) => {
+    $uibModal.open({
+      templateUrl : 'modules/tags/modal/createUpdate.html',
+      controller : 'TagsModalController as ModalCtrl',
+      resolve : { data : () => tag },
+    });
+  };
+
   return service;
 }