From 7c8fdc226e432b2c774be8aa98fa0179917b9c4c Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Thu, 10 Dec 2020 16:50:04 +0100
Subject: [PATCH] #1454 Fix some queries in frontend

---
 .../app/scripts/controllers/case/CaseObservablesCtrl.js     | 4 ++--
 .../app/scripts/controllers/case/ObservablesStatsCtrl.js    | 6 +++---
 frontend/app/scripts/services/EntitySrv.js                  | 6 ++++++
 frontend/app/scripts/services/api/CortexSrv.js              | 2 +-
 frontend/app/scripts/services/api/TagSrv.js                 | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js b/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
index 919c1d67b3..4045348b1f 100644
--- a/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
@@ -18,7 +18,7 @@
             };
 
             this.$onInit = function() {
-                $scope.filtering = new FilteringSrv('case_artifact', 'observable.list', {
+                $scope.filtering = new FilteringSrv('observable', 'observable.list', {
                     version: 'v1',
                     defaults: {
                         showFilters: true,
@@ -68,7 +68,7 @@
                 $scope.artifacts = new PaginatedQuerySrv({
                     name: 'observables',
                     root: $scope.caseId,
-                    objectType: 'case_artifact',
+                    objectType: 'obserable',
                     version: 'v1',
                     scope: $scope,
                     sort: $scope.filtering.context.sort,
diff --git a/frontend/app/scripts/controllers/case/ObservablesStatsCtrl.js b/frontend/app/scripts/controllers/case/ObservablesStatsCtrl.js
index e48194916b..f50102984c 100644
--- a/frontend/app/scripts/controllers/case/ObservablesStatsCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservablesStatsCtrl.js
@@ -42,7 +42,7 @@
                 ], {
                     scope: $scope,
                     rootId: caseId,
-                    objectType: 'case_artifact',
+                    objectType: 'observable',
                     query: {
                         params: {
                             name: 'observables-by-tags-stats-' + caseId
@@ -69,7 +69,7 @@
                 ], {
                     scope: $scope,
                     rootId: caseId,
-                    objectType: 'case_artifact',
+                    objectType: 'observable',
                     query: {
                         params: {
                             name: 'observables-by-type-stats-' + caseId
@@ -95,7 +95,7 @@
                 ], {
                     scope: $scope,
                     rootId: caseId,
-                    objectType: 'case_artifact',
+                    objectType: 'observable',
                     query: {
                         params: {
                             name: 'observables-by-ioc-stats-' + caseId
diff --git a/frontend/app/scripts/services/EntitySrv.js b/frontend/app/scripts/services/EntitySrv.js
index f531eff88f..d20d1d97b6 100644
--- a/frontend/app/scripts/services/EntitySrv.js
+++ b/frontend/app/scripts/services/EntitySrv.js
@@ -19,6 +19,12 @@
                     caseId: entity.case.id,
                     itemId: entity.id
                 };
+            } else if (entity._type === 'observable') {
+                state.name = 'app.case.observables-item';
+                state.params = {
+                    caseId: entity.case.id,
+                    itemId: entity.id
+                };
             } else if (entity._type === 'case_artifact_job') {
                 state.name = 'app.case.observables-item';
                 state.params = {
diff --git a/frontend/app/scripts/services/api/CortexSrv.js b/frontend/app/scripts/services/api/CortexSrv.js
index 00921b0fae..9bd98f897a 100644
--- a/frontend/app/scripts/services/api/CortexSrv.js
+++ b/frontend/app/scripts/services/api/CortexSrv.js
@@ -14,7 +14,7 @@
                 streamObjectType: 'case_artifact_job',
                 filter: {
                     _parent: {
-                        _type: 'case_artifact',
+                        _type: 'observable',
                         _query: {
                             _id: observableId
                         }
diff --git a/frontend/app/scripts/services/api/TagSrv.js b/frontend/app/scripts/services/api/TagSrv.js
index d90300a3ca..ce9035f11f 100644
--- a/frontend/app/scripts/services/api/TagSrv.js
+++ b/frontend/app/scripts/services/api/TagSrv.js
@@ -41,7 +41,7 @@
                 switch(entity) {
                     case 'case':
                         return self.fromCases(query);
-                    case 'case_artifact':
+                    case 'observable':
                         return self.fromObservables(query);
                     case 'alert':
                         return self.fromAlerts(query);