From 5dfb938d9a75690d78684d867abde92d51550df6 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Fri, 22 May 2020 15:52:04 +0200
Subject: [PATCH] #1288 Use observable datatypes dedicated API when dealing
 with datatypes

---
 .../controllers/admin/AdminCustomFieldsCtrl.js  |  2 +-
 .../controllers/case/ObservableCreationCtrl.js  | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js b/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
index 3ad0fab645..403141daeb 100644
--- a/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
+++ b/frontend/app/scripts/controllers/admin/AdminCustomFieldsCtrl.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AdminCustomFieldsCtrl',
-        function($scope, $uibModal, ListSrv, CustomFieldsSrv, NotificationSrv, ModalUtilsSrv) {
+        function($scope, $uibModal, CustomFieldsSrv, NotificationSrv, ModalUtilsSrv) {
             var self = this;
 
             self.reference = {
diff --git a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
index a72e88dfc6..0aa20047b3 100644
--- a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
@@ -5,7 +5,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('ObservableCreationCtrl',
-        function($scope, $stateParams, $uibModalInstance, clipboard, CaseArtifactSrv, ListSrv, NotificationSrv, TagSrv, params) {
+        function($scope, $stateParams, $uibModalInstance, clipboard, CaseArtifactSrv, ObservableTypeSrv, NotificationSrv, TagSrv, params) {
 
             $scope.activeTlp = 'active';
             $scope.pendingAsync = false;
@@ -29,13 +29,14 @@
             });
 
             $scope.getDataTypeList = function() {
-                ListSrv.query({
-                    listId: 'list_artifactDataType'
-                }, function(data) {
-                    $scope.types = _.filter(_.values(data), _.isString).sort();
-                }, function(response) {
-                    NotificationSrv.error('ObservableCreationCtrl', response.data, response.status);
-                });
+
+                ObservableTypeSrv.list()
+                    .then(function(response) {
+                        $scope.types = _.pluck(response.data, 'name').sort();
+                    })
+                    .catch(function(err) {
+                        NotificationSrv.error('ObservableCreationCtrl', err.data, err.status);
+                    });
             };
             $scope.getDataTypeList();
             $scope.updateTlp = function(tlp) {