From cd1aad00d3f67e02f9f3cf942ce6df00442674c1 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Mon, 19 Oct 2020 16:28:01 +0200
Subject: [PATCH] #1541 Use API v1 in case merge dialog

---
 .../controllers/case/CaseMergeModalCtrl.js    | 27 ++++++++++++-------
 .../app/views/partials/case/case.merge.html   |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/frontend/app/scripts/controllers/case/CaseMergeModalCtrl.js b/frontend/app/scripts/controllers/case/CaseMergeModalCtrl.js
index 71e40d61e9..fc55e1b2e1 100644
--- a/frontend/app/scripts/controllers/case/CaseMergeModalCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseMergeModalCtrl.js
@@ -4,7 +4,7 @@
     angular.module('theHiveControllers')
         .controller('CaseMergeModalCtrl', CaseMergeModalCtrl);
 
-    function CaseMergeModalCtrl($state, $uibModalInstance, $q, SearchSrv, CaseSrv, UserSrv, NotificationSrv, source, title, prompt) {
+    function CaseMergeModalCtrl($state, $uibModalInstance, $q, QuerySrv, SearchSrv, CaseSrv, UserSrv, NotificationSrv, source, title, prompt) {
         var me = this;
 
         this.source = source;
@@ -13,32 +13,41 @@
         this.prompt = prompt;
         this.search = {
             type: 'title',
-            placeholder: 'Search by case title',
+            placeholder: 'Search by case title. "Ex: Malware*"',
             minInputLength: 1,
             input: null,
             cases: []
         };
         this.getUserInfo = UserSrv.getCache;
 
-        this.getCaseByTitle = function(type, input) {
+        this.getCaseList = function(type, input) {
             var defer = $q.defer();
 
-            var query = (type === 'title') ? {
-                _like: {title: input}
+            var filter = (type === 'title') ? {
+                _like: {
+                    title: input
+                }
             } : {
-                caseId: Number.parseInt(input)
+                _field: 'number',
+                _value: Number.parseInt(input)
             };
 
-            SearchSrv(function(data /*, total*/ ) {
+            QuerySrv.call('v1',
+                [{_name: 'listCase'}],
+                {
+                    filter:filter,
+                    name: 'get-case-for-merge'
+                }
+            ).then(function(data) {
                 defer.resolve(data);
-            }, query, 'case', 'all');
+            });
 
             return defer.promise;
         };
 
         this.format = function(caze) {
             if (caze) {
-                return '#' + caze.caseId + ' - ' + caze.title;
+                return '#' + caze.number + ' - ' + caze.title;
             }
             return null;
         };
diff --git a/frontend/app/views/partials/case/case.merge.html b/frontend/app/views/partials/case/case.merge.html
index d019a8072b..14b625697b 100644
--- a/frontend/app/views/partials/case/case.merge.html
+++ b/frontend/app/views/partials/case/case.merge.html
@@ -14,7 +14,7 @@ <h3 class="modal-title">{{dialog.title | ellipsis:50}}</h3>
         <input type="{{dialog.search.type === 'number' ? 'number' : 'text'}}"
             placeholder="{{dialog.search.placeholder}}"
             ng-model="dialog.search.input"
-            uib-typeahead="caze as dialog.format(caze) for caze in dialog.getCaseByTitle(dialog.search.type, $viewValue)"
+            uib-typeahead="caze as dialog.format(caze) for caze in dialog.getCaseList(dialog.search.type, $viewValue)"
             typeahead-wait-ms="500"
             typeahead-min-length="dialog.search.minInputLength"
             typeahead-on-select="dialog.onSelect($item)"