From c17af934c399e2f0c5d68ac98217e664c8c87df3 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Tue, 9 Mar 2021 19:51:27 +0100
Subject: [PATCH] #1766 Fix the procedure related flow items

---
 .../controllers/case/CaseProceduresCtrl.js    |  3 +-
 .../app/views/directives/entity-link.html     | 64 ++++++++++---------
 .../app/views/directives/flow/procedure.html  |  3 +-
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/frontend/app/scripts/controllers/case/CaseProceduresCtrl.js b/frontend/app/scripts/controllers/case/CaseProceduresCtrl.js
index 1624b4aaac..b602acf285 100644
--- a/frontend/app/scripts/controllers/case/CaseProceduresCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseProceduresCtrl.js
@@ -67,11 +67,10 @@
             data[field] = procedure[field];
 
             ProcedureSrv.update(procedure._id, data)
-                .then(function(response) {
+                .then(function(/*response*/) {
                     if(reload) {
                         self.load();
                     }
-                    console.log(response);
                 }).catch(function(err) {
                     NotificationSrv.error('ProcedureCtrl', err.data, err.status);
                 });
diff --git a/frontend/app/views/directives/entity-link.html b/frontend/app/views/directives/entity-link.html
index a3e9f6cb19..748cdaa916 100644
--- a/frontend/app/views/directives/entity-link.html
+++ b/frontend/app/views/directives/entity-link.html
@@ -1,50 +1,54 @@
 <span ng-if="value._type == 'case'">
-	<a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
-		<i class="glyphicon glyphicon-folder-open"></i>
-		&nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
-	</a>
+    <a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
+        <i class="glyphicon glyphicon-folder-open"></i>
+        &nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
+    </a>
 </span>
 <span ng-if="value._type == 'Case'">
-	<a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
-		<i class="glyphicon glyphicon-folder-open"></i>
-		&nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
-	</a>
+    <a class="text-muted wrap"href ng-click="openLink(entityUrl(value))">
+        <i class="glyphicon glyphicon-folder-open"></i>
+        &nbsp;#{{value.caseId || value.number}} - {{value.title}}&nbsp;
+    </a>
 </span>
 <span ng-if="value._type == 'case_task'">
-	<entity-link value="value.case" target="target"></entity-link>
-	<a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
-		<i class=" glyphicon glyphicon-tasks"></i>
-		&nbsp;{{value.title}}
-	</a>
+    <entity-link value="value.case" target="target"></entity-link>
+    <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
+        <i class=" glyphicon glyphicon-tasks"></i>
+        &nbsp;{{value.title}}
+    </a>
 </span>
 <span ng-if="value._type == 'Task'">
-	<entity-link value="value.extraData.case" target="target"></entity-link>
-	<a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
-		<i class=" glyphicon glyphicon-tasks"></i>
-		&nbsp;{{value.title}}
-	</a>
+    <entity-link value="value.extraData.case" target="target"></entity-link>
+    <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
+        <i class=" glyphicon glyphicon-tasks"></i>
+        &nbsp;{{value.title}}
+    </a>
 </span>
 <span ng-if="value._type == 'case_task_log'">
-	<entity-link value="value.case_task" target="target"></entity-link>
-	<i class="text-muted wrap" class="glyphicon glyphicon-comment"></i>
+    <entity-link value="value.case_task" target="target"></entity-link>
+    <i class="text-muted wrap" class="glyphicon glyphicon-comment"></i>
 </span>
 <span ng-if="value._type == 'case_artifact'">
-	<entity-link value="value.case" target="target"></entity-link>
-	<a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
-		<i class="glyphicon glyphicon-pushpin"></i>
-		&nbsp;{{value.data | ellipsis:100}}{{value.attachment.name}}
-	</a>
+    <entity-link value="value.case" target="target"></entity-link>
+    <a class="text-muted wrap" href ng-click="openLink(entityUrl(value))">
+        <i class="glyphicon glyphicon-pushpin"></i>
+        &nbsp;{{value.data | ellipsis:100}}{{value.attachment.name}}
+    </a>
 </span>
 <span ng-if="value._type == 'case_artifact_job'">
-	<entity-link value="value.case_artifact" target="target"></entity-link>
+    <entity-link value="value.case_artifact" target="target"></entity-link>
 </span>
 
 <span ng-if="value._type == 'case_artifact_job_log'">
-	<entity-link value="value.case_artifact_job" target="target"></entity-link>
-	<i class="text-muted wrap" class=" glyphicon glyphicon-plus"></i>
+    <entity-link value="value.case_artifact_job" target="target"></entity-link>
+    <i class="text-muted wrap" class=" glyphicon glyphicon-plus"></i>
+</span>
+
+<span ng-if="value._type == 'Procedure'">
+    <entity-link value="value.case" target="target"></entity-link>
 </span>
 
 <span ng-if="value._type == 'analyzer'">
-	<i class="text-muted wrap" class=" glyphicon glyphicon-cog"></i>
-	ANALYZER / TODO
+    <i class="text-muted wrap" class=" glyphicon glyphicon-cog"></i>
+    ANALYZER / TODO
 </span>
diff --git a/frontend/app/views/directives/flow/procedure.html b/frontend/app/views/directives/flow/procedure.html
index 73da560992..3fd1b95d0f 100644
--- a/frontend/app/views/directives/flow/procedure.html
+++ b/frontend/app/views/directives/flow/procedure.html
@@ -1,7 +1,6 @@
 <div class="flow-task" ng-switch="base.operation">
-    <!-- <pre>{{base | json}}</pre> -->
     <div class="flow-item-title">
-        <i class="glyphicon glyphicon-knight"></i>{{tactics[base.details.tactic].label}} - {{base.details.patternId}}
+        <i class="glyphicon glyphicon-knight"></i>{{tactics[base.object.tactic].label}} - {{base.object.pattern.patternId}}: {{base.object.pattern.name}}
     </div>
     <div class="flow-item-updates" ng-switch-when="Creation">
         <div>