#12 Update wording in case details pane and add boolean updatable input

TheHive-Project · Jun 23, 2017 · e42c3e9 · e42c3e9
1 parent 4465dde
commit e42c3e9
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 9 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -187,6 +187,7 @@
     <script src="scripts/directives/task-progress.js"></script>
     <script src="scripts/directives/tlp.js"></script>
     <script src="scripts/directives/updatable.js"></script>
+    <script src="scripts/directives/updatableBoolean.js"></script>
     <script src="scripts/directives/updatableDataDropdown.js"></script>
     <script src="scripts/directives/updatableDate.js"></script>
     <script src="scripts/directives/updatableSimpleText.js"></script>

diff --git a/ui/app/scripts/directives/updatableBoolean.js b/ui/app/scripts/directives/updatableBoolean.js
@@ -0,0 +1,20 @@
+(function() {
+    'use strict';
+    angular.module('theHiveDirectives')
+        .directive('updatableBoolean', function(UtilsSrv) {
+            return {
+                'restrict': 'E',
+                'link': UtilsSrv.updatableLink,
+                'templateUrl': 'views/directives/updatable-boolean.html',
+                'scope': {
+                    'inputType': '@',
+                    'value': '=?',
+                    'onUpdate': '&',
+                    'active': '=?',
+                    'placeholder': '@',
+                    'trueText': '@?',
+                    'falseText': '@?'
+                }
+            };
+        });
+})();
diff --git a/ui/app/scripts/services/CaseTabsSrv.js b/ui/app/scripts/services/CaseTabsSrv.js
@@ -6,7 +6,7 @@
             'details': {
                 name: 'details',
                 active: true,
-                label: 'Summary',
+                label: 'Details',
                 state: 'app.case.details'
             },
             'tasks': {

diff --git a/ui/app/views/directives/updatable-boolean.html b/ui/app/views/directives/updatable-boolean.html
@@ -0,0 +1,25 @@
+<span ng-hide="updatable.updating" ng-init="active = false" ng-mouseenter="active = true" ng-mouseleave="active = false">
+	<span ng-if="value!==null && value !==''" style="vertical-align: top; white-space: pre-wrap" class="updatable-value">{{value ? trueText || 'True' : falseText || 'False'}}</span>
+	<span ng-if="value === null || value === undefined" style="vertical-align: top;" class="updatable-value text-warning"><em>Not Specified</em></span>
+	<small ng-show="active">
+		<a href class="clickable" tooltip-popup-delay='500' uib-tooltip="edit">
+			<i class="glyphicon glyphicon-pencil" ng-click="edit()"></i>
+		</a>
+	</small>
+	<span ng-hide="active">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+</span>
+<span ng-show="updatable.updating" ng-init="updatable.dropdownOpen=false">
+	<form ng-submit="update()">
+		<div class="input-group input-group-sm">
+			<select class="form-control input-sm" ng-model="value" ng-options="v for v in [true, false]" ng-change="update()"></select>
+			<span class="input-group-btn">
+				<button class="btn btn-sm btn-default" type="submit">
+					<i class="text-success glyphicon glyphicon-ok"></i>
+				</button>
+				<button class="btn btn-sm btn-default" type="button" ng-click="cancel()">
+					<i class="text-danger glyphicon glyphicon-remove"></i>
+				</button>
+            </span>
+		</div>
+	</form>
+</span>
diff --git a/ui/app/views/directives/updatable-simple-text.html b/ui/app/views/directives/updatable-simple-text.html
@@ -13,6 +13,9 @@
 		<div class="input-group input-group-sm">
 			<input type="{{inputType || 'text'}}" class="form-control input-sm" placeholder="{{placeholder}}" ng-model="value" autofocus="autofocus">
 			<span class="input-group-btn">
+				<button class="btn btn-sm btn-default" type="submit">
+					<i class="text-success glyphicon glyphicon-ok"></i>
+				</button>
 				<button class="btn btn-sm btn-default" type="button" ng-click="cancel()">
 					<i class="text-danger glyphicon glyphicon-remove"></i>
 				</button>

diff --git a/ui/app/views/partials/case/case.details.html b/ui/app/views/partials/case/case.details.html
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-md-7">
-        <h4 class="vpad10 text-primary">Basic information</h4>
+        <h4 class="vpad10 text-primary">Summary</h4>
         <dl class="dl-horizontal clear">
             <dt class="pull-left">Severity</dt>
             <dd>

diff --git a/ui/app/views/partials/case/details/custom.fields.html b/ui/app/views/partials/case/details/custom.fields.html
@@ -1,11 +1,9 @@
 <div class="case-custom-fields" ng-controller="CaseCustomFieldsCtrl">
     <h4 class="vpad10 text-primary">
-        Custom fields
+        Additional information
         <span uib-dropdown class="pull-right" ng-show="customFieldsAvailable">
             <a href class="dropdown-toggle" uib-dropdown-toggle>
                 <i class="fa fa-plus"></i>
-                Add Custom field
-                <span class="caret"></span>
             </a>
             <ul class="dropdown-menu" uib-dropdown-menu>
                 <li ng-repeat="(key, value) in allCustomFields">
@@ -16,7 +14,7 @@ <h4 class="vpad10 text-primary">
     </h4>
 
     <div ng-if="!orderedFields || orderedFields.length === 0">
-        <em>No custom fields need to be set</em>
+        <em>No aditional information have been specified</em>
     </div>
 
     <dl class="dl-horizontal clear"
@@ -38,6 +36,13 @@ <h4 class="vpad10 text-primary">
                 on-update="updateField(getCustomFieldName(fieldDef), newValue)"
                 value="customFieldValue"></updatable-simple-text>
 
+            <updatable-boolean ng-switch-when="boolean"
+                input-type="number"
+                on-update="updateField(getCustomFieldName(fieldDef), newValue)"
+                value="customFieldValue"></updatable-boolean>
+
+
+
             <span ng-switch-default>Not Editable</span>
         </dd>
     </dl>

diff --git a/ui/app/views/partials/case/details/metrics.html b/ui/app/views/partials/case/details/metrics.html
@@ -4,8 +4,6 @@ <h4 class="vpad10 text-primary">
         <span uib-dropdown class="pull-right" ng-show="metricsAvailable">
             <a href class="dropdown-toggle" uib-dropdown-toggle>
                 <i class="fa fa-plus"></i>
-                Add metric
-                <span class="caret"></span>
             </a>
             <ul class="dropdown-menu" uib-dropdown-menu>
                 <li ng-repeat="(key, value) in allMetrics">
@@ -16,7 +14,7 @@ <h4 class="vpad10 text-primary">
     </h4>
 
     <div ng-if="hasNoMetrics(caze)">
-        <em>No metrics need to be set</em>
+        <em>No metrics have been set</em>
     </div>
 
     <dl class="dl-horizontal clear" ng-repeat="(k,v) in caze.metrics">