From e61b5e935e37f84f8fa4d4c26cfd9ac7859a4f6a Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Tue, 5 May 2020 17:05:37 +0200
Subject: [PATCH] #1307 Update custom fields admin section

---
 .../admin/AdminCustomFieldDialogCtrl.js       | 19 +++----
 .../admin/AdminCustomFieldsCtrl.js            | 20 +++----
 .../scripts/services/api/CustomFieldsSrv.js   | 18 ++-----
 .../partials/admin/custom-field-dialog.html   | 52 +++++++++----------
 4 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/frontend/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js b/frontend/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js
index a0a8172d9e..62f3ed4021 100644
--- a/frontend/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js
+++ b/frontend/app/scripts/controllers/admin/AdminCustomFieldDialogCtrl.js
@@ -7,7 +7,7 @@
             types: [
                 'string', 'integer', 'boolean', 'date', 'float'
             ],
-            namePattern: '^[a-zA-Z]{1}[a-zA-Z0-9_-]*'
+            reference: '^[a-zA-Z]{1}[a-zA-Z0-9_-]*'
         };
 
         self.customField = customField;
@@ -48,18 +48,13 @@
                 return;
             }
 
-            var postData = _.pick(self.customField, 'name', 'displayName', 'description', 'type', 'mandatory');
+            var postData = _.pick(self.customField, 'name', 'reference', 'description', 'type', 'mandatory');
             postData.options = buildOptionsCollection(self.customField.options);
 
             if (self.customField.id) {
                 CustomFieldsSrv.update(self.customField.id, postData)
                     .then(onSuccess)
                     .catch(onFailure);
-                // ListSrv.update({
-                //     'itemId': self.customField.id
-                // }, {
-                //     'value': postData
-                // }, onSuccess, onFailure);
             } else {
 
                 CustomFieldsSrv.create(postData)
@@ -88,8 +83,8 @@
         };
 
         self.clearUniqueNameError = function(form) {
-            form.name.$setValidity('unique', true);
-            form.name.$setPristine();
+            form.reference.$setValidity('unique', true);
+            form.reference.$setPristine();
         };
 
         self.cancel = function() {
@@ -97,13 +92,13 @@
         };
 
         self.onNamechanged = function(form) {
-            if (self.customField.id || !self.customField.displayName) {
+            if (self.customField.id || !self.customField.name) {
                 return;
             }
 
-            var name = s.trim(s.slugify(self.customField.displayName));
+            var reference = s.trim(s.slugify(self.customField.name));
 
-            self.customField.name = name;
+            self.customField.reference = reference;
 
             self.clearUniqueNameError(form);
         };
diff --git a/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js b/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
index a3f6befe96..92c7cfbe19 100644
--- a/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
+++ b/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
@@ -51,15 +51,17 @@
                     size: 'lg',
                     resolve: {
                         customField: function() {
-                            return customField.id ? {
-                                  id: customField.id,
-                                  name: customField.reference,
-                                  displayName: customField.name,
-                                  description: customField.description,
-                                  type: customField.type,
-                                  options: customField.options,
-                                  mandatory: customField.mandatory
-                            } : {};
+                            // return customField.id ? {
+                            //       id: customField.id,
+                            //       name: customField.reference,
+                            //       displayName: customField.name,
+                            //       description: customField.description,
+                            //       type: customField.type,
+                            //       options: customField.options,
+                            //       mandatory: customField.mandatory
+                            // } : {};
+
+                            return customField.id ? angular.copy(customField, {}) : {};
                         }
                     }
                 });
diff --git a/frontend/app/scripts/services/api/CustomFieldsSrv.js b/frontend/app/scripts/services/api/CustomFieldsSrv.js
index fa49a9ca37..8e3940606c 100644
--- a/frontend/app/scripts/services/api/CustomFieldsSrv.js
+++ b/frontend/app/scripts/services/api/CustomFieldsSrv.js
@@ -6,18 +6,6 @@
 
             this.cache = null;
 
-            this._convert = function(field) {
-                return {
-                    reference: field.name,
-                    name: field.displayName,
-                    description: field.description,
-                    options: field.options,
-                    type: field.type,
-                    mandatory: field.mandatory
-                };
-            };
-
-
             this.removeField = function(field) {
                 return $http.delete('./api/customField/' + field.reference);
             };
@@ -31,11 +19,13 @@
             };
 
             this.create = function(field) {
-                return $http.post('./api/customField', self._convert(field));
+                //return $http.post('./api/customField', self._convert(field));
+                return $http.post('./api/customField', field);
             };
 
             this.update = function(id, field) {
-                return $http.patch('./api/customField/'+id, self._convert(field));
+                //return $http.patch('./api/customField/'+id, self._convert(field));
+                return $http.patch('./api/customField/'+id, field);
             };
 
             this.remove = function(id) {
diff --git a/frontend/app/views/partials/admin/custom-field-dialog.html b/frontend/app/views/partials/admin/custom-field-dialog.html
index 3effb3a909..b97d1eea68 100644
--- a/frontend/app/views/partials/admin/custom-field-dialog.html
+++ b/frontend/app/views/partials/admin/custom-field-dialog.html
@@ -3,56 +3,56 @@
         <h3 class="modal-title">{{$vm.customField.id ? 'Update' : 'Add'}} custom field</h3>
     </div>
     <div class="modal-body">
-        <div class="form-group" ng-class="{ 'has-error' : fieldsForm.displayName.$invalid && !fieldsForm.displayName.$pristine }">
-            <label class="col-sm-2 control-label">
-                Display Name
+        <div class="form-group" ng-class="{ 'has-error' : fieldsForm.name.$invalid && !fieldsForm.name.$pristine }">
+            <label class="col-sm-3 control-label">
+                Name
                 <i class="fa fa-asterisk text-danger"></i>
             </label>
-            <div class="col-sm-10">
-                <input class="form-control" name="displayName"
-                    placeholder="Field's title, Ex: CVSS, Threat actor, Business risk"
-                    ng-model="$vm.customField.displayName"
+            <div class="col-sm-9">
+                <input class="form-control" name="name"
+                    placeholder="Field's display name, Ex: CVSS, Threat actor, Business risk"
+                    ng-model="$vm.customField.name"
                     ng-keyup="$vm.onNamechanged(fieldsForm)"
                     required type="text">
-                <p class="help-block" ng-show="fieldsForm.displayName.$invalid && !fieldsForm.displayName.$pristine">This field is required.</p>
+                <p class="help-block" ng-show="fieldsForm.name.$invalid && !fieldsForm.name.$pristine">This field is required.</p>
             </div>
         </div>
 
-        <div class="form-group" ng-class="{ 'has-error' : fieldsForm.name.$invalid && fieldsForm.name.$dirty }">
-            <label class="col-sm-2 control-label">
-                Name
+        <div class="form-group" ng-class="{ 'has-error' : fieldsForm.reference.$invalid && fieldsForm.reference.$dirty }">
+            <label class="col-sm-3 control-label">
+                Internal Reference
                 <i class="fa fa-asterisk text-danger"></i>
             </label>
-            <div class="col-sm-10">
-                <input class="form-control" name="name" type="text"
+            <div class="col-sm-9">
+                <input class="form-control" name="reference" type="text"
                     placeholder="Internal name, Ex: cvss, threatActor, businessRisk"
-                    ng-model="$vm.customField.name"
+                    ng-model="$vm.customField.reference"
                     ng-keyup="$vm.clearUniqueNameError(fieldsForm)"
-                    ng-pattern="$vm.config.namePattern"
+                    ng-pattern="$vm.config.referencePattern"
                     ng-readonly="!!$vm.customField.id"
                     required>
-                <p class="help-block" ng-show="fieldsForm.name.$error.unique">There is already a field with this name. It should be unique.</p>
-                <p class="help-block" ng-show="fieldsForm.name.$error.required && fieldsForm.name.$dirty">This field is required.</p>
-                <p class="help-block" ng-show="fieldsForm.name.$error.pattern && fieldsForm.name.$dirty">This field is should satisfy the following pattern: {{$vm.config.namePattern}}</p>
+                <p class="help-block" ng-show="fieldsForm.reference.$error.unique">There is already a field with this reference. It should be unique.</p>
+                <p class="help-block" ng-show="fieldsForm.reference.$error.required && fieldsForm.reference.$dirty">This field is required.</p>
+                <p class="help-block" ng-show="fieldsForm.reference.$error.pattern && fieldsForm.reference.$dirty">This field is should satisfy the following pattern: {{$vm.config.referencePattern}}</p>
             </div>
         </div>
 
         <div class="form-group" ng-class="{ 'has-error' : fieldsForm.description.$invalid && !fieldsForm.description.$pristine }">
-            <label class="col-sm-2 control-label">
+            <label class="col-sm-3 control-label">
                 Description
                 <i class="fa fa-asterisk text-danger"></i>
             </label>
-            <div class="col-sm-10">
+            <div class="col-sm-9">
                 <input class="form-control" name="description" ng-model="$vm.customField.description" placeholder="A brief description of the custom field" required type="text">
                 <p class="help-block" ng-show="fieldsForm.description.$invalid && !fieldsForm.description.$pristine">This field is required.</p>
             </div>
         </div>
         <div class="form-group" ng-class="{ 'has-error' : fieldsForm.type.$invalid && !fieldsForm.type.$pristine }">
-            <label class="col-sm-2 control-label">
+            <label class="col-sm-3 control-label">
                 Type
                 <i class="fa fa-asterisk text-danger"></i>
             </label>
-            <div class="col-sm-10">
+            <div class="col-sm-9">
                 <select class="form-control" name="type" ng-model="$vm.customField.type"
                     ng-options="fieldType for fieldType in $vm.config.types"
                     placeholder="Field's type" required></select>
@@ -61,17 +61,17 @@ <h3 class="modal-title">{{$vm.customField.id ? 'Update' : 'Add'}} custom field</
         </div>
 
         <div class="form-group" ng-show="$vm.customField.type === 'string' || $vm.customField.type === 'integer'  || $vm.customField.type === 'float'">
-            <label class="col-sm-2 control-label">
+            <label class="col-sm-3 control-label">
                 Possible values
             </label>
-            <div class="col-sm-10">
+            <div class="col-sm-9">
                 <textarea class="form-control" name="options" ng-model="$vm.customField.options" rows="5" placeholder="Possible values, one per line" type="text"></textarea>
             </div>
         </div>
 
         <div class="form-group">
-            <label class="col-sm-2 control-label">&nbsp;</label>
-            <div class="col-sm-10">
+            <label class="col-sm-3 control-label">&nbsp;</label>
+            <div class="col-sm-9">
                 <div class="checkbox">
                     <label>
                         <input name="mandatory" type="checkbox" ng-model="$vm.customField.mandatory"> Is mandatory