From 8f0724132f9fb9dbbbd516461ef52302f9515e64 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 21:27:25 -0700
Subject: [PATCH 01/18] Add new quickfilters

---
 ui/app/scripts/controllers/alert/AlertListCtrl.js |  8 ++++++++
 ui/app/scripts/controllers/case/CaseListCtrl.js   | 15 +++++++++++++++
 ui/app/views/partials/alert/list/toolbar.html     |  4 ++++
 ui/app/views/partials/case/list/toolbar.html      |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js
index ba6c919b31..409d94d470 100755
--- a/ui/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/ui/app/scripts/controllers/alert/AlertListCtrl.js
@@ -501,6 +501,14 @@
                     });
             };
 
+            this.filterByNewAndUpdated = function() {
+                self.filtering.clearFilters()
+                    .then(function(){
+                        self.addFilterValue('status', 'New');
+                        self.addFilterValue('status', 'Updated');
+                    });
+            };
+
             this.filterBySeverity = function(numericSev) {
                 self.addFilterValue('severity', Severity.values[numericSev]);
             };
diff --git a/ui/app/scripts/controllers/case/CaseListCtrl.js b/ui/app/scripts/controllers/case/CaseListCtrl.js
index e058e0e345..0997c18634 100644
--- a/ui/app/scripts/controllers/case/CaseListCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseListCtrl.js
@@ -199,6 +199,21 @@
                 });
         };
 
+        this.filterMyOpenCases = function() {
+            this.uiSrv.clearFilters()
+                .then(function(){
+                    var currentUser = AuthenticationSrv.currentUser;
+                    self.uiSrv.activeFilters.owner = {
+                        value: [{
+                            text: currentUser.id,
+                            label: currentUser.name
+                        }]
+                    };
+                    self.filter();
+                    self.addFilterValue('status', 'Open');
+                });
+        };
+
         this.filterByStatus = function(status) {
             this.uiSrv.clearFilters()
                 .then(function(){
diff --git a/ui/app/views/partials/alert/list/toolbar.html b/ui/app/views/partials/alert/list/toolbar.html
index 9f8d5cd70b..e887d13cf0 100644
--- a/ui/app/views/partials/alert/list/toolbar.html
+++ b/ui/app/views/partials/alert/list/toolbar.html
@@ -42,12 +42,16 @@
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" uib-dropdown-menu>
+                    <li>
+                        <a ng-click="$vm.filterByNewAndUpdated()">New & Updated events({{alertEvents.Updated.count + alertEvents.New.count || 0}})</a>
+                    </li>
                     <li>
                         <a ng-click="$vm.filterByStatus('New')">New events ({{alertEvents.New.count || 0}})</a>
                     </li>
                     <li>
                         <a ng-click="$vm.filterByStatus('Updated')">Updated events({{alertEvents.Updated.count || 0}})</a>
                     </li>
+
                 </ul>
             </div>
 
diff --git a/ui/app/views/partials/case/list/toolbar.html b/ui/app/views/partials/case/list/toolbar.html
index a516b16b0f..b837230665 100644
--- a/ui/app/views/partials/case/list/toolbar.html
+++ b/ui/app/views/partials/case/list/toolbar.html
@@ -9,6 +9,9 @@
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" uib-dropdown-menu>
+                    <li>
+                        <a ng-click="$vm.filterMyOpenCases()">My open cases</a>
+                    </li>
                     <li>
                         <a ng-click="$vm.filterMyCases()">My cases</a>
                     </li>

From d3b2d3377bfb22a0c7c644da0a484f27692e8a22 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 21:58:47 -0700
Subject: [PATCH 02/18] First attempt of critical label

---
 thehive-backend/app/models/Alert.scala           |  2 +-
 thehive-backend/app/models/AttributeFormat.scala |  6 +++---
 thehive-backend/app/models/Case.scala            |  2 +-
 thehive-backend/app/models/CaseTemplate.scala    |  2 +-
 ui/app/scripts/services/Constants.js             |  3 ++-
 ui/app/styles/main.css                           |  2 +-
 ui/app/views/directives/severity.html            | 14 ++++++++------
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/thehive-backend/app/models/Alert.scala b/thehive-backend/app/models/Alert.scala
index d2290749d3..26a3205bb9 100644
--- a/thehive-backend/app/models/Alert.scala
+++ b/thehive-backend/app/models/Alert.scala
@@ -55,7 +55,7 @@ trait AlertAttributes {
   val caze: A[Option[String]] = optionalAttribute("case", F.stringFmt, "Id of the case, if created")
   val title: A[String] = attribute("title", F.textFmt, "Title of the alert")
   val description: A[String] = attribute("description", F.textFmt, "Description of the alert")
-  val severity: A[Long] = attribute("severity", SeverityAttributeFormat, "Severity if the alert (0-3)", 2L)
+  val severity: A[Long] = attribute("severity", SeverityAttributeFormat, "Severity if the alert (1-4)", 2L)
   val tags: A[Seq[String]] = multiAttribute("tags", F.stringFmt, "Alert tags")
   val tlp: A[Long] = attribute("tlp", TlpAttributeFormat, "TLP level", 2L)
   val artifacts: A[Seq[JsObject]] = multiAttribute("artifacts", F.objectFmt(artifactAttributes), "Artifact of the alert", O.unaudited)
diff --git a/thehive-backend/app/models/AttributeFormat.scala b/thehive-backend/app/models/AttributeFormat.scala
index fd98a30140..a6d00d0df7 100644
--- a/thehive-backend/app/models/AttributeFormat.scala
+++ b/thehive-backend/app/models/AttributeFormat.scala
@@ -11,15 +11,15 @@ import org.elastic4play.{ AttributeError, InvalidFormatAttributeError }
 
 object SeverityAttributeFormat extends NumberAttributeFormat {
 
-  def isValidValue(value: Long): Boolean = 1 <= value && value <= 3
+  def isValidValue(value: Long): Boolean = 1 <= value && value <= 4
 
   override def definition(dblists: DBLists, attribute: Attribute[Long]): Seq[AttributeDefinition] =
     Seq(AttributeDefinition(
       attribute.attributeName,
       name,
       attribute.description,
-      Seq(JsNumber(1), JsNumber(2), JsNumber(3)),
-      Seq("low", "medium", "high")))
+      Seq(JsNumber(1), JsNumber(2), JsNumber(3), JsNumber(4)),
+      Seq("low", "medium", "high", "critical")))
 
   override def checkJson(subNames: Seq[String], value: JsValue): Or[JsValue, One[InvalidFormatAttributeError]] = {
     value match {
diff --git a/thehive-backend/app/models/Case.scala b/thehive-backend/app/models/Case.scala
index 2c2b4e3c01..0e4bec16d2 100644
--- a/thehive-backend/app/models/Case.scala
+++ b/thehive-backend/app/models/Case.scala
@@ -37,7 +37,7 @@ trait CaseAttributes { _: AttributeDef ⇒
   val caseId: A[Long] = attribute("caseId", F.numberFmt, "Id of the case (auto-generated)", O.model)
   val title: A[String] = attribute("title", F.textFmt, "Title of the case")
   val description: A[String] = attribute("description", F.textFmt, "Description of the case")
-  val severity: A[Long] = attribute("severity", SeverityAttributeFormat, "Severity if the case is an incident (0-3)", 2L)
+  val severity: A[Long] = attribute("severity", SeverityAttributeFormat, "Severity if the case is an incident (0-4)", 2L)
   val owner: A[String] = attribute("owner", F.userFmt, "Owner of the case")
   val startDate: A[Date] = attribute("startDate", F.dateFmt, "Creation date", new Date)
   val endDate: A[Option[Date]] = optionalAttribute("endDate", F.dateFmt, "Resolution date")
diff --git a/thehive-backend/app/models/CaseTemplate.scala b/thehive-backend/app/models/CaseTemplate.scala
index 144aa4fc61..ead7c77da7 100644
--- a/thehive-backend/app/models/CaseTemplate.scala
+++ b/thehive-backend/app/models/CaseTemplate.scala
@@ -19,7 +19,7 @@ trait CaseTemplateAttributes { _: AttributeDef ⇒
   val templateName: A[String] = attribute("name", F.stringFmt, "Name of the template")
   val titlePrefix: A[Option[String]] = optionalAttribute("titlePrefix", F.textFmt, "Title of the case")
   val description: A[Option[String]] = optionalAttribute("description", F.textFmt, "Description of the case")
-  val severity: A[Option[Long]] = optionalAttribute("severity", SeverityAttributeFormat, "Severity if the case is an incident (0-5)")
+  val severity: A[Option[Long]] = optionalAttribute("severity", SeverityAttributeFormat, "Severity if the case is an incident (1-4)")
   val tags: A[Seq[String]] = multiAttribute("tags", F.stringFmt, "Case tags")
   val flag: A[Option[Boolean]] = optionalAttribute("flag", F.booleanFmt, "Flag of the case")
   val tlp: A[Option[Long]] = optionalAttribute("tlp", TlpAttributeFormat, "TLP level")
diff --git a/ui/app/scripts/services/Constants.js b/ui/app/scripts/services/Constants.js
index 0bae8587ac..9ae839dcb1 100644
--- a/ui/app/scripts/services/Constants.js
+++ b/ui/app/scripts/services/Constants.js
@@ -16,11 +16,12 @@
         })
         .value('Severity', {
             keys: {
+                Critical: 4,
                 High: 3,
                 Medium: 2,
                 Low: 1
             },
-            values: ['Unknown', 'Low', 'Medium', 'High']
+            values: ['Unknown', 'Low', 'Medium', 'High', 'Critical']
         })
         .value('AlertStatus', {
             values: ['New', 'Updated', 'Ignored', 'Imported']
diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css
index 2468524bab..478130e431 100644
--- a/ui/app/styles/main.css
+++ b/ui/app/styles/main.css
@@ -41,7 +41,7 @@ body {
 }
 
 .main-navbar .input-group-addon {
-    padding-left: 6px;
+    padding-left: 6px;severity
     padding-right: 6px;
 }
 
diff --git a/ui/app/views/directives/severity.html b/ui/app/views/directives/severity.html
index 193495b93a..676291951b 100644
--- a/ui/app/views/directives/severity.html
+++ b/ui/app/views/directives/severity.html
@@ -1,11 +1,13 @@
 <div ng-if="active == true">
-	<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 1]" ng-click="update(1)">L</span>
-	<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 2 || !value]" ng-click="update(2)">M</span>
-	<span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(3)">H</span>
+	<span class="label" ng-class="{ true:'label-success', false:'label-default' }[value == 1]" ng-click="update(1)">L</span>
+	<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 2 || !value]" ng-click="update(2)">M</span>
+	<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 3]" ng-click="update(3)">H</span>
+    <span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(4)">C</span>
 </div>
 <span ng-if="active != true" ng-switch="value">
-	<span ng-switch-when="1" class="label label-info">L</span>
-	<span ng-switch-when="2" class="label label-warning">M</span>
-	<span ng-switch-when="3" class="label label-danger">H</span>
+	<span ng-switch-when="1" class="label label-success">L</span>
+	<span ng-switch-when="2" class="label label-info">M</span>
+	<span ng-switch-when="3" class="label label-warning">H</span>
+    <span ng-switch-when="4" class="label label-danger">C</span>
 	<span ng-switch-default class="label label-primary">?</span>
 </span>

From 33d59ee7ac722a4b8c473abec1e6d59ab36d4ed3 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 22:24:19 -0700
Subject: [PATCH 03/18] Try to add new case status

---
 thehive-backend/app/models/Case.scala         | 2 +-
 ui/app/styles/main.css                        | 2 +-
 ui/app/views/directives/severity.html         | 4 ++--
 ui/app/views/partials/alert/list/filters.html | 2 +-
 ui/app/views/partials/case/case.list.html     | 7 ++++++-
 ui/app/views/partials/case/list/filters.html  | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/thehive-backend/app/models/Case.scala b/thehive-backend/app/models/Case.scala
index 0e4bec16d2..643cb8961e 100644
--- a/thehive-backend/app/models/Case.scala
+++ b/thehive-backend/app/models/Case.scala
@@ -20,7 +20,7 @@ import org.elastic4play.services.{ FindSrv, SequenceSrv }
 
 object CaseStatus extends Enumeration with HiveEnumeration {
   type Type = Value
-  val Open, Resolved, Deleted = Value
+  val Open, Resolved, Pending, Hold, Review, Deleted = Value
 }
 
 object CaseResolutionStatus extends Enumeration with HiveEnumeration {
diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css
index 478130e431..2468524bab 100644
--- a/ui/app/styles/main.css
+++ b/ui/app/styles/main.css
@@ -41,7 +41,7 @@ body {
 }
 
 .main-navbar .input-group-addon {
-    padding-left: 6px;severity
+    padding-left: 6px;
     padding-right: 6px;
 }
 
diff --git a/ui/app/views/directives/severity.html b/ui/app/views/directives/severity.html
index 676291951b..e4d103fe46 100644
--- a/ui/app/views/directives/severity.html
+++ b/ui/app/views/directives/severity.html
@@ -2,12 +2,12 @@
 	<span class="label" ng-class="{ true:'label-success', false:'label-default' }[value == 1]" ng-click="update(1)">L</span>
 	<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 2 || !value]" ng-click="update(2)">M</span>
 	<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 3]" ng-click="update(3)">H</span>
-    <span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(4)">C</span>
+    <span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 4]" ng-click="update(4)">!</span>
 </div>
 <span ng-if="active != true" ng-switch="value">
 	<span ng-switch-when="1" class="label label-success">L</span>
 	<span ng-switch-when="2" class="label label-info">M</span>
 	<span ng-switch-when="3" class="label label-warning">H</span>
-    <span ng-switch-when="4" class="label label-danger">C</span>
+    <span ng-switch-when="4" class="label label-danger">!</span>
 	<span ng-switch-default class="label label-primary">?</span>
 </span>
diff --git a/ui/app/views/partials/alert/list/filters.html b/ui/app/views/partials/alert/list/filters.html
index 33c873611f..8f91ead91d 100644
--- a/ui/app/views/partials/alert/list/filters.html
+++ b/ui/app/views/partials/alert/list/filters.html
@@ -89,7 +89,7 @@ <h4>Filters</h4>
                             <tags-input class="form-control form-control-wrapper"
                                 min-length="2"
                                 ng-model="$vm.filtering.activeFilters.severity.value"
-                                placeholder="ex: High, Medium, Low"
+                                placeholder="ex: Critical, High, Medium, Low"
                                 replace-spaces-with-dashes="false"
                                 add-from-autocomplete-only="true">
                                     <auto-complete load-on-focus="true" load-on-down-arrow="true" min-length="1" source="$vm.getSeverities($query)"></auto-complete>
diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html
index 652263c438..4e632b3a1f 100644
--- a/ui/app/views/partials/case/case.list.html
+++ b/ui/app/views/partials/case/case.list.html
@@ -78,11 +78,16 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.
 
                                             </span>
                                         </div>
-                                        <div class="text-success" ng-show="currentCase.status !== 'Open'">
+                                        <div class="text-success" ng-show="currentCase.status === 'Resolved'">
                                             <small>
                                                 (Closed at {{currentCase.endDate | showDate}} as <strong>{{$vm.CaseResolutionStatus[currentCase.resolutionStatus]}}</strong>)
                                             </small>
                                         </div>
+                                        <div class="text-success" ng-show="currentCase.status !== 'Open' && currentCase.status !== 'Resolved' ">
+                                            <small>
+                                                (Status: <strong>{{currentCase.status}}</strong>)
+                                            </small>
+                                        </div>
                                         <div class="text-danger" ng-if="currentCase.mergeFrom">
                         					          <small>
                                                 Merged from <a href ui-sref="app.case.details({caseId: currentCase.mergeFrom[0]})"> Case #{{currentCase.stats.mergeFrom[0].caseId}}</a> and
diff --git a/ui/app/views/partials/case/list/filters.html b/ui/app/views/partials/case/list/filters.html
index 9566871ff9..a7208c5fc6 100644
--- a/ui/app/views/partials/case/list/filters.html
+++ b/ui/app/views/partials/case/list/filters.html
@@ -71,7 +71,7 @@ <h4>Filters</h4>
                             <tags-input class="form-control form-control-wrapper"
                                 min-length="2"
                                 ng-model="$vm.uiSrv.activeFilters.severity.value"
-                                placeholder="ex: High, Medium, Low"
+                                placeholder="ex: Critical, High, Medium, Low"
                                 replace-spaces-with-dashes="false"
                                 add-from-autocomplete-only="true">
                                     <auto-complete load-on-focus="true" load-on-down-arrow="true" min-length="1" source="$vm.getSeverities($query)"></auto-complete>

From d866caa6ced075345eb2363a9ba8321fcf111c68 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 22:48:21 -0700
Subject: [PATCH 04/18] Add Hold Button

---
 ui/app/scripts/controllers/case/CaseListCtrl.js | 5 ++++-
 ui/app/scripts/controllers/case/CaseMainCtrl.js | 7 +++++++
 ui/app/views/partials/case/case.panelinfo.html  | 7 +++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/app/scripts/controllers/case/CaseListCtrl.js b/ui/app/scripts/controllers/case/CaseListCtrl.js
index 0997c18634..18ecfe45d4 100644
--- a/ui/app/scripts/controllers/case/CaseListCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseListCtrl.js
@@ -134,7 +134,10 @@
         this.getStatuses = function() {
             return $q.resolve([
                 {text: 'Open'},
-                {text: 'Resolved'}
+                {text: 'Resolved'},
+                {text: 'Hold'},
+                {text: 'Review'},
+                {text: 'Pending'}
             ]);
         };
 
diff --git a/ui/app/scripts/controllers/case/CaseMainCtrl.js b/ui/app/scripts/controllers/case/CaseMainCtrl.js
index 07fa4844fc..c8bbf695be 100644
--- a/ui/app/scripts/controllers/case/CaseMainCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseMainCtrl.js
@@ -171,6 +171,13 @@
                 }
             };
 
+            $scope.caseHold = function() {
+                $scope.updateField('status', 'Hold')
+                    .then(function() {
+                          NotificationSrv.log('The case #' + $scope.caze.caseId + ' has been set to Hold', 'success');
+                    });
+            }
+
             // update a specific case field
             $scope.updateField = function(fieldName, newValue) {
                 var data = {};
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index c7a15240bb..e0c2de4f33 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -93,6 +93,13 @@ <h3 class="box-title">
             </a>
         </span>
 
+        <span class="ml-xxs pull-right" ng-if="1">
+            <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Hold case">
+                <i class="text-muted fa fa-flag"></i>
+                Hold
+            </a>
+        </span>
+
         <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
             <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">
                 <i class="text-muted fa fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'"></i>

From ca1400f29bd3a2b9c2de40894ee04ba7b81dd794 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 22:59:45 -0700
Subject: [PATCH 05/18] All the buttons

---
 .../scripts/controllers/case/CaseMainCtrl.js   | 14 ++++++++++++++
 ui/app/views/partials/case/case.panelinfo.html | 18 ++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ui/app/scripts/controllers/case/CaseMainCtrl.js b/ui/app/scripts/controllers/case/CaseMainCtrl.js
index c8bbf695be..315815b236 100644
--- a/ui/app/scripts/controllers/case/CaseMainCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseMainCtrl.js
@@ -178,6 +178,20 @@
                     });
             }
 
+            $scope.caseReview = function() {
+                $scope.updateField('status', 'Review')
+                    .then(function() {
+                        NotificationSrv.log('The case #' + $scope.caze.caseId + ' has been set to Review', 'success');
+                    });
+            }
+
+            $scope.casePending = function() {
+                $scope.updateField('status', 'Pending')
+                    .then(function() {
+                        NotificationSrv.log('The case #' + $scope.caze.caseId + ' has been set to Pending', 'success');
+                    });
+            }
+
             // update a specific case field
             $scope.updateField = function(fieldName, newValue) {
                 var data = {};
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index e0c2de4f33..9fee63415e 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -94,8 +94,22 @@ <h3 class="box-title">
         </span>
 
         <span class="ml-xxs pull-right" ng-if="1">
-            <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Hold case">
-                <i class="text-muted fa fa-flag"></i>
+            <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
+                <i class="text-muted fa fa-exclamation-circle"></i>
+                Hold
+            </a>
+        </span>
+
+        <span class="ml-xxs pull-right" ng-if="1">
+            <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
+                <i class="text-muted fa fa-pause"></i>
+                Hold
+            </a>
+        </span>
+
+        <span class="ml-xxs pull-right"  ng-if="!caze.status !== 'Review">
+            <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
+                <i class="text-muted fa fa-user-circle"></i>
                 Hold
             </a>
         </span>

From 1330df5fe5aa06040a0f1a05bda4cfa1074cfeea Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:01:19 -0700
Subject: [PATCH 06/18] Fix all the buttons

---
 ui/app/views/partials/case/case.panelinfo.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 9fee63415e..1534be1994 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -93,21 +93,21 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="1">
+        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
             <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
                 <i class="text-muted fa fa-exclamation-circle"></i>
                 Hold
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="1">
+        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
                 <i class="text-muted fa fa-pause"></i>
                 Hold
             </a>
         </span>
 
-        <span class="ml-xxs pull-right"  ng-if="!caze.status !== 'Review">
+        <span class="ml-xxs pull-right"  ng-if="caze.status !== 'Review'">
             <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
                 <i class="text-muted fa fa-user-circle"></i>
                 Hold

From 146d6ee74965a2d513c1c026b046307c49f983c0 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:07:40 -0700
Subject: [PATCH 07/18] Updated labels

---
 ui/app/views/partials/case/case.panelinfo.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 1534be1994..36019ecb72 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -30,6 +30,9 @@ <h3 class="box-title">
                 <strong>{{CaseResolutionStatus[caze.resolutionStatus]}}</strong>
                 <span ng-show="isCaseTruePositive()"> with <strong>{{caze.impactStatus === 'NoImpact' ? 'No Impact' : 'Impact'}}</strong></span>)</span>
         </span>
+        <span ng-show="caze.status !== Open && caze.status !== Resolved" class="text-success">(
+                <span> Status <strong>{{caze.status}}</strong></span>)</span>
+        </span>
         <span class="ml-xxs text-danger" ng-show="links.length > 0">
             <i class="glyphicon glyphicon-link"></i>
             <strong>
@@ -94,7 +97,7 @@ <h3 class="box-title">
         </span>
 
         <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
-            <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
+            <a href ng-class="case.status === 'Hold' ? blue : text-muted" ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
                 <i class="text-muted fa fa-exclamation-circle"></i>
                 Hold
             </a>
@@ -103,14 +106,14 @@ <h3 class="box-title">
         <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
                 <i class="text-muted fa fa-pause"></i>
-                Hold
+                Pending
             </a>
         </span>
 
         <span class="ml-xxs pull-right"  ng-if="caze.status !== 'Review'">
             <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
                 <i class="text-muted fa fa-user-circle"></i>
-                Hold
+                Review
             </a>
         </span>
 

From f48e10881fbefbaef1bbc10d9276a2cb24df762e Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:11:27 -0700
Subject: [PATCH 08/18] Test

---
 ui/app/views/partials/case/case.panelinfo.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 36019ecb72..978e5d4d8c 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,21 +96,21 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
+        <span class="ml-xxs pull-right">
             <a href ng-class="case.status === 'Hold' ? blue : text-muted" ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
                 <i class="text-muted fa fa-exclamation-circle"></i>
                 Hold
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
+        <span class="ml-xxs pull-right" ">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
                 <i class="text-muted fa fa-pause"></i>
                 Pending
             </a>
         </span>
 
-        <span class="ml-xxs pull-right"  ng-if="caze.status !== 'Review'">
+        <span class="ml-xxs pull-right" >
             <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
                 <i class="text-muted fa fa-user-circle"></i>
                 Review

From 6b489932894b93d19362c563628ab491c641268e Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:12:20 -0700
Subject: [PATCH 09/18] Fix test

---
 ui/app/views/partials/case/case.panelinfo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 978e5d4d8c..10bf212011 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -103,7 +103,7 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ">
+        <span class="ml-xxs pull-right" >
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
                 <i class="text-muted fa fa-pause"></i>
                 Pending

From b7aea2976462bfaa7ca82bd82a923e68865529b6 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:16:57 -0700
Subject: [PATCH 10/18] More testing

---
 ui/app/views/partials/case/case.panelinfo.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 10bf212011..ae067d45fd 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,21 +96,21 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right">
-            <a href ng-class="case.status === 'Hold' ? blue : text-muted" ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
+        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
+            <a href ng-click="caseHold()" ng-class="case.status === 'Hold' ? text-blue : text-muted" uib-tooltip="Set case status to Hold">
                 <i class="text-muted fa fa-exclamation-circle"></i>
                 Hold
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" >
+        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
                 <i class="text-muted fa fa-pause"></i>
                 Pending
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" >
+        <span class="ml-xxs pull-right"  ng-if="caze.status !== 'Review'">
             <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
                 <i class="text-muted fa fa-user-circle"></i>
                 Review
@@ -135,7 +135,7 @@ <h3 class="box-title">
                 Close
             </a>
         </span>
-        <span class="ml-xxs pull-right" ng-show="isCaseClosed()">
+        <span class="ml-xxs pull-right" ng-show="case.status !== 'Open'">
             <a href ng-click="reopenCase()" class="text-success noline" uib-tooltip="Reopen case">
                 <i class="text-success fa fa-check-circle"></i>
                 Reopen

From d53df3c326793f7416270535583b8b6f99050564 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:20:34 -0700
Subject: [PATCH 11/18] Again

---
 ui/app/views/partials/case/case.panelinfo.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index ae067d45fd..93084f5ae1 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,16 +96,16 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
-            <a href ng-click="caseHold()" ng-class="case.status === 'Hold' ? text-blue : text-muted" uib-tooltip="Set case status to Hold">
-                <i class="text-muted fa fa-exclamation-circle"></i>
+        <span class="ml-xxs pull-right" ng-if="1">
+            <a href ng-click="caseHold()" ng-class="caze.status === 'Hold' ? text-blue : text-muted" uib-tooltip="Set case status to Hold">
+                <i class="text-muted fa fa-pause"></i>
                 Hold
             </a>
         </span>
 
         <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
-                <i class="text-muted fa fa-pause"></i>
+                <i class="text-muted fa fa-exclamation-circle"></i>
                 Pending
             </a>
         </span>
@@ -135,7 +135,7 @@ <h3 class="box-title">
                 Close
             </a>
         </span>
-        <span class="ml-xxs pull-right" ng-show="case.status !== 'Open'">
+        <span class="ml-xxs pull-right" ng-show="caze.status !== 'Open'">
             <a href ng-click="reopenCase()" class="text-success noline" uib-tooltip="Reopen case">
                 <i class="text-success fa fa-check-circle"></i>
                 Reopen

From 484d35e8f51c07b3ff32b585dcc69baae325bffe Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:29:00 -0700
Subject: [PATCH 12/18] Reorder and colors

---
 .../scripts/controllers/case/CaseMainCtrl.js  |  7 +++
 .../views/partials/case/case.panelinfo.html   | 48 ++++++++++++++-----
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/ui/app/scripts/controllers/case/CaseMainCtrl.js b/ui/app/scripts/controllers/case/CaseMainCtrl.js
index 315815b236..168526068f 100644
--- a/ui/app/scripts/controllers/case/CaseMainCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseMainCtrl.js
@@ -192,6 +192,13 @@
                     });
             }
 
+            $scope.caseOpenFromOtherStatus = function() {
+                $scope.updateField('status', 'Open')
+                    .then(function() {
+                        NotificationSrv.log('The case #' + $scope.caze.caseId + ' has been set to Pending', 'success');
+                    });
+            }
+
             // update a specific case field
             $scope.updateField = function(fieldName, newValue) {
                 var data = {};
diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 93084f5ae1..9d6ab27a1c 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,8 +96,28 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="1">
-            <a href ng-click="caseHold()" ng-class="caze.status === 'Hold' ? text-blue : text-muted" uib-tooltip="Set case status to Hold">
+        <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
+            <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">
+                <i class="text-muted fa fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'"></i>
+                Flag
+            </a>
+        </span>
+        <span class="ml-xxs pull-right" ng-if="caze.flag">
+            <a href ng-click="switchFlag()" class="text-yellow noline" uib-tooltip="Unflag case">
+                <i class="text-yellow fa fa-flag" ng-show="caze.flag"></i>
+                Unflag
+            </a>
+        </span>
+
+        <span class="ml-xxs pull-right" ng-if="caze.status !== 'Hold'">
+            <a href ng-click="caseHold()" class="text-muted noline" uib-tooltip="Set case status to Hold">
+                <i class="text-muted fa fa-pause" ng-class="SetHold" ng-mouseout="SetHold='text-muted'" ng-mouseover="SetHold='text-red'"></i>
+                Hold
+            </a>
+        </span>
+
+        <span class="ml-xxs pull-right" ng-if="caze.status === 'Hold'">
+            <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
                 <i class="text-muted fa fa-pause"></i>
                 Hold
             </a>
@@ -105,6 +125,13 @@ <h3 class="box-title">
 
         <span class="ml-xxs pull-right" ng-if="caze.status !== 'Pending'">
             <a href ng-click="casePending()" class="text-muted noline" uib-tooltip="Set case status to Pending">
+                <i class="text-muted fa fa-exclamation-circle" ng-class="SetPending" ng-mouseout="SetPending='text-muted'" ng-mouseover="SetPending='text-red'"></i>
+                Pending
+            </a>
+        </span>
+
+        <span class="ml-xxs pull-right" ng-if="caze.status === 'Pending'">
+            <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
                 <i class="text-muted fa fa-exclamation-circle"></i>
                 Pending
             </a>
@@ -112,23 +139,18 @@ <h3 class="box-title">
 
         <span class="ml-xxs pull-right"  ng-if="caze.status !== 'Review'">
             <a href ng-click="caseReview()" class="text-muted noline" uib-tooltip="Set case status to Review">
-                <i class="text-muted fa fa-user-circle"></i>
+                <i class="text-muted fa fa-user-circle" ng-class="SetReview" ng-mouseout="SetReview='text-muted'" ng-mouseover="SetReview='text-red'"></i>
                 Review
             </a>
         </span>
 
-        <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
-            <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">
-                <i class="text-muted fa fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'"></i>
-                Flag
-            </a>
-        </span>
-        <span class="ml-xxs pull-right" ng-if="caze.flag">
-            <a href ng-click="switchFlag()" class="text-yellow noline" uib-tooltip="Unflag case">
-                <i class="text-yellow fa fa-flag" ng-show="caze.flag"></i>
-                Unflag
+        <span class="ml-xxs pull-right"  ng-if="caze.status === 'Review'">
+            <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
+                <i class="text-muted fa fa-user-circle"></i>
+                Review
             </a>
         </span>
+
         <span class="ml-xxs pull-right" ng-hide="isCaseClosed()">
             <a href ng-click="openCloseDialog()" class="text-muted noline" uib-tooltip="Close case">
                 <i class="text-muted fa fa-check-circle-o" ng-class="CloseCase" ng-mouseout="CloseCase='text-muted glyphicon-ok-circle'" ng-mouseover="CloseCase='text-success glyphicon-ok-sign'"></i>

From 5aa8bffed27f2eb75c23abad166a628df6fc8202 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:34:16 -0700
Subject: [PATCH 13/18] Formatting Updates

---
 ui/app/views/partials/case/case.panelinfo.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 9d6ab27a1c..28b38f134e 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -30,7 +30,7 @@ <h3 class="box-title">
                 <strong>{{CaseResolutionStatus[caze.resolutionStatus]}}</strong>
                 <span ng-show="isCaseTruePositive()"> with <strong>{{caze.impactStatus === 'NoImpact' ? 'No Impact' : 'Impact'}}</strong></span>)</span>
         </span>
-        <span ng-show="caze.status !== Open && caze.status !== Resolved" class="text-success">(
+        <span ng-show="caze.status !== 'Resolved'" class="text-success">(
                 <span> Status <strong>{{caze.status}}</strong></span>)</span>
         </span>
         <span class="ml-xxs text-danger" ng-show="links.length > 0">
@@ -96,6 +96,8 @@ <h3 class="box-title">
             </a>
         </span>
 
+        <span class="mr-xxs text-primary">|</span>
+
         <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
             <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">
                 <i class="text-muted fa fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'"></i>
@@ -118,7 +120,7 @@ <h3 class="box-title">
 
         <span class="ml-xxs pull-right" ng-if="caze.status === 'Hold'">
             <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
-                <i class="text-muted fa fa-pause"></i>
+                <i class="text-red fa fa-pause"></i>
                 Hold
             </a>
         </span>
@@ -132,7 +134,7 @@ <h3 class="box-title">
 
         <span class="ml-xxs pull-right" ng-if="caze.status === 'Pending'">
             <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
-                <i class="text-muted fa fa-exclamation-circle"></i>
+                <i class="text-red fa fa-exclamation-circle"></i>
                 Pending
             </a>
         </span>
@@ -146,7 +148,7 @@ <h3 class="box-title">
 
         <span class="ml-xxs pull-right"  ng-if="caze.status === 'Review'">
             <a href ng-click="caseOpenFromOtherStatus()" class="text-red noline" uib-tooltip="Reopen Case">
-                <i class="text-muted fa fa-user-circle"></i>
+                <i class="text-red fa fa-user-circle"></i>
                 Review
             </a>
         </span>
@@ -157,7 +159,7 @@ <h3 class="box-title">
                 Close
             </a>
         </span>
-        <span class="ml-xxs pull-right" ng-show="caze.status !== 'Open'">
+        <span class="ml-xxs pull-right" ng-show="isCaseClosed()">
             <a href ng-click="reopenCase()" class="text-success noline" uib-tooltip="Reopen case">
                 <i class="text-success fa fa-check-circle"></i>
                 Reopen

From a2e5901aa3f3e10eed787ef8b8d5f25a6842aade Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:37:05 -0700
Subject: [PATCH 14/18] Pull Right

---
 ui/app/views/partials/case/case.panelinfo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index 28b38f134e..fcbd1df4e4 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,7 +96,7 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="mr-xxs text-primary">|</span>
+        <span class="mr-xxs pull-right text-primary">|</span>
 
         <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
             <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">

From 9096e0276cea4baa06cec572b2d779f301717e51 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:41:48 -0700
Subject: [PATCH 15/18] pull right

---
 ui/app/views/partials/case/case.panelinfo.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
index fcbd1df4e4..d815a9e31e 100644
--- a/ui/app/views/partials/case/case.panelinfo.html
+++ b/ui/app/views/partials/case/case.panelinfo.html
@@ -96,7 +96,9 @@ <h3 class="box-title">
             </a>
         </span>
 
-        <span class="mr-xxs pull-right text-primary">|</span>
+        <span class="ml-xxs pull-right">
+            <span class="text-primary">|</span>
+        </span>
 
         <span class="ml-xxs pull-right" ng-if="!caze.flag || caze.flag == undefined">
             <a href ng-click="switchFlag()" class="text-muted noline" uib-tooltip="Flag case">

From 5209a78e5bff13f9585bfe9ddbc2958b134e1c64 Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Thu, 14 Mar 2019 23:47:17 -0700
Subject: [PATCH 16/18] Fix bugs

---
 ui/app/styles/main.css                        | 2 +-
 ui/app/views/directives/severity.html         | 4 ++--
 ui/app/views/partials/alert/list/filters.html | 2 +-
 ui/app/views/partials/case/list/filters.html  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css
index 478130e431..2468524bab 100644
--- a/ui/app/styles/main.css
+++ b/ui/app/styles/main.css
@@ -41,7 +41,7 @@ body {
 }
 
 .main-navbar .input-group-addon {
-    padding-left: 6px;severity
+    padding-left: 6px;
     padding-right: 6px;
 }
 
diff --git a/ui/app/views/directives/severity.html b/ui/app/views/directives/severity.html
index 676291951b..a457ff6e8f 100644
--- a/ui/app/views/directives/severity.html
+++ b/ui/app/views/directives/severity.html
@@ -2,12 +2,12 @@
 	<span class="label" ng-class="{ true:'label-success', false:'label-default' }[value == 1]" ng-click="update(1)">L</span>
 	<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 2 || !value]" ng-click="update(2)">M</span>
 	<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 3]" ng-click="update(3)">H</span>
-    <span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(4)">C</span>
+    <span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 4]" ng-click="update(4)">!!</span>
 </div>
 <span ng-if="active != true" ng-switch="value">
 	<span ng-switch-when="1" class="label label-success">L</span>
 	<span ng-switch-when="2" class="label label-info">M</span>
 	<span ng-switch-when="3" class="label label-warning">H</span>
-    <span ng-switch-when="4" class="label label-danger">C</span>
+    <span ng-switch-when="4" class="label label-danger">!!</span>
 	<span ng-switch-default class="label label-primary">?</span>
 </span>
diff --git a/ui/app/views/partials/alert/list/filters.html b/ui/app/views/partials/alert/list/filters.html
index 33c873611f..8f91ead91d 100644
--- a/ui/app/views/partials/alert/list/filters.html
+++ b/ui/app/views/partials/alert/list/filters.html
@@ -89,7 +89,7 @@ <h4>Filters</h4>
                             <tags-input class="form-control form-control-wrapper"
                                 min-length="2"
                                 ng-model="$vm.filtering.activeFilters.severity.value"
-                                placeholder="ex: High, Medium, Low"
+                                placeholder="ex: Critical, High, Medium, Low"
                                 replace-spaces-with-dashes="false"
                                 add-from-autocomplete-only="true">
                                     <auto-complete load-on-focus="true" load-on-down-arrow="true" min-length="1" source="$vm.getSeverities($query)"></auto-complete>
diff --git a/ui/app/views/partials/case/list/filters.html b/ui/app/views/partials/case/list/filters.html
index 9566871ff9..a7208c5fc6 100644
--- a/ui/app/views/partials/case/list/filters.html
+++ b/ui/app/views/partials/case/list/filters.html
@@ -71,7 +71,7 @@ <h4>Filters</h4>
                             <tags-input class="form-control form-control-wrapper"
                                 min-length="2"
                                 ng-model="$vm.uiSrv.activeFilters.severity.value"
-                                placeholder="ex: High, Medium, Low"
+                                placeholder="ex: Critical, High, Medium, Low"
                                 replace-spaces-with-dashes="false"
                                 add-from-autocomplete-only="true">
                                     <auto-complete load-on-focus="true" load-on-down-arrow="true" min-length="1" source="$vm.getSeverities($query)"></auto-complete>

From e23f53b666ca7c3f013f99431f37bf4f72eff40c Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Fri, 15 Mar 2019 15:57:06 -0700
Subject: [PATCH 17/18] Fix filter autocomplete

---
 project/Dependencies.scala                    |  2 +-
 .../scripts/controllers/case/CaseListCtrl.js  | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 31aac9bee6..7040cba8cf 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -20,7 +20,7 @@ object Dependencies {
 
     val reflections = "org.reflections" % "reflections" % "0.9.11"
     val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
-    val elastic4play = "org.thehive-project" %% "elastic4play" % "1.9.0"
+    val elastic4play = "org.thehive-project" %% "elastic4play" % "1.8.0-1"
     val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19"
     val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19"
   }
diff --git a/ui/app/scripts/controllers/case/CaseListCtrl.js b/ui/app/scripts/controllers/case/CaseListCtrl.js
index 18ecfe45d4..7c96317f48 100644
--- a/ui/app/scripts/controllers/case/CaseListCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseListCtrl.js
@@ -131,14 +131,28 @@
             this.filter();
         };
 
-        this.getStatuses = function() {
-            return $q.resolve([
+        this.getStatuses = function(query) {
+            var defer = $q.defer();
+
+            $q.resolve([
                 {text: 'Open'},
                 {text: 'Resolved'},
                 {text: 'Hold'},
                 {text: 'Review'},
                 {text: 'Pending'}
-            ]);
+            ]).then(function(response) {
+                var statuses = [];
+
+                statuses = _.filter(response, function(stat) {
+                    var regex = new RegExp(query, 'gi');
+                    return regex.test(stat.text);
+                });
+
+                defer.resolve(statuses);
+            });
+
+            return defer.promise;
+
         };
 
         this.getSeverities = function(query) {

From ebcc97d674dd8f94145beed77ed6c3d8c97c401a Mon Sep 17 00:00:00 2001
From: Zachary Priddy <github@zpriddy.com>
Date: Fri, 29 Mar 2019 10:10:29 -0700
Subject: [PATCH 18/18] Add option to set case title via cortex

---
 .../cortex/services/ActionOperation.scala         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala
index d5b845ddf8..1d7ae2f4ed 100644
--- a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala
+++ b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala
@@ -73,6 +73,10 @@ case class AssignCase(owner: String, status: ActionOperationStatus.Type = Action
   override def updateStatus(newStatus: ActionOperationStatus.Type, newMessage: String): AssignCase = copy(status = newStatus, message = newMessage)
 }
 
+case class SetCaseTitle(title: String, status: ActionOperationStatus.Type = ActionOperationStatus.Waiting, message: String = "") extends ActionOperation {
+  override def updateStatus(newStatus: ActionOperationStatus.Type, newMessage: String): SetCaseTitle = copy(status = newStatus, message = newMessage)
+}
+
 object ActionOperation {
   val addTagToCaseWrites = Json.writes[AddTagToCase]
   val addTagToArtifactWrites = Json.writes[AddTagToArtifact]
@@ -84,6 +88,7 @@ object ActionOperation {
   val addTagToAlertWrites = Json.writes[AddTagToAlert]
   val addArtifactToCaseWrites = Json.writes[AddArtifactToCase]
   val assignCaseWrites = Json.writes[AssignCase]
+  val setCaseTitleWrites = Json.writes[SetCaseTitle]
   implicit val actionOperationReads: Reads[ActionOperation] = Reads[ActionOperation](json ⇒
     (json \ "type").asOpt[String].fold[JsResult[ActionOperation]](JsError("type is missing in action operation")) {
       case "AddTagToCase"     ⇒ (json \ "tag").validate[String].map(tag ⇒ AddTagToCase(tag))
@@ -109,6 +114,9 @@ object ActionOperation {
       case "AssignCase" ⇒ for {
         owner  ← (json \ "owner").validate[String]
       } yield AssignCase(owner)
+      case "SetCaseTitle" ⇒ for {
+        title  ← (json \ "title").validate[String]
+      } yield SetCaseTitle(title)
       case other ⇒ JsError(s"Unknown operation $other")
     })
   implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] {
@@ -122,6 +130,7 @@ object ActionOperation {
     case a: AddTagToAlert     ⇒ addTagToAlertWrites.writes(a)
     case a: AddArtifactToCase ⇒ addArtifactToCaseWrites.writes(a)
     case a: AssignCase        ⇒ assignCaseWrites.writes(a)
+    case a: SetCaseTitle      ⇒ setCaseTitleWrites.writes(a)
     case a                    ⇒ Json.obj("unsupported operation" → a.toString)
   }
 }
@@ -236,6 +245,12 @@ class ActionOperationSrv @Inject() (
               caze ← caseSrv.get(initialCase.id)
               _ ← caseSrv.update(caze, Fields.empty.set("owner", owner), ModifyConfig(retryOnConflict = 0, version = Some(caze.version)))
             } yield operation.updateStatus(ActionOperationStatus.Success, "")
+          case SetCaseTitle(title, _, _) ⇒
+            for {
+              initialCase ← findCaseEntity(entity)
+              caze ← caseSrv.get(initialCase.id)
+              _ ← caseSrv.update(caze, Fields.empty.set("title", title), ModifyConfig(retryOnConflict = 0, version = Some(caze.version)))
+            } yield operation.updateStatus(ActionOperationStatus.Success, "")
           case AddTagToAlert(tag, _, _) =>
             entity match {
               case initialAlert: Alert ⇒