#1670 modify UpdatableTagList component to include tag colour

TheHive-Project · Jan 28, 2021 · 2b1af7c · 2b1af7c
1 parent a87cdea
commit 2b1af7c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/frontend/app/index.html b/frontend/app/index.html
@@ -53,6 +53,7 @@
     <link rel="stylesheet" href="styles/custom-fields.css"/>
     <link rel="stylesheet" href="styles/directives/page-sizer.css"/>
     <link rel="stylesheet" href="styles/directives/user.css"/>
+    <link rel="stylesheet" href="styles/components/tag.css"/>
     <!-- endbuild -->
 
     <style>

diff --git a/frontend/app/scripts/components/common/tag.component.js b/frontend/app/scripts/components/common/tag.component.js
@@ -5,15 +5,25 @@
         .component('tag', {
             controller: function() {
                 this.$onInit = function() {
-                    this.tag = _.without([
-                        this.value.namespace,
-                        ':',
-                        this.value.predicate,
-                        this.value.value ? ("=\"" + this.value.value + "\"") : null
-                    ], null).join('');
+                    if(!this.value) {
+                        return;
+                    }                    
+                    if(_.isString(this.value)) {
+                        this.tag = this.value;
+                        this.bgColor = '#3c8dbc';
+                    } else {
+                        this.tag = _.without([
+                            this.value.namespace,
+                            ':',
+                            this.value.predicate,
+                            this.value.value ? ("=\"" + this.value.value + "\"") : null
+                        ], null).join('');
+                        this.bgColor = this.value.colour || '#3c8dbc';
+                    }
                 };
             },
             controllerAs: '$ctrl',
+            replace: true,
             templateUrl: 'views/components/common/tag.component.html',
             bindings: {
                 value: '<'

diff --git a/frontend/app/styles/components/tag.css b/frontend/app/styles/components/tag.css
@@ -0,0 +1,6 @@
+.label.label-tag {
+    border-left-width: 8px;
+    border-left-style: solid;
+    /* border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px; */
+}
diff --git a/frontend/app/views/components/common/tag.component.html b/frontend/app/views/components/common/tag.component.html
@@ -1 +1 @@
-<span class="label label-default label-lg">{{$ctrl.tag}}</span>
+<span class="label label-tag label-default label-lg" style="">{{$ctrl.tag}}</span>
diff --git a/frontend/app/views/directives/updatable-tag-list.html b/frontend/app/views/directives/updatable-tag-list.html
@@ -3,7 +3,9 @@
         ng-class="{'tags-list flexwrap': value.length > 0}">
         <span class="updatable-value text-warning" ng-show="!value || value.length === 0"><em>Not Specified</em></span>
 
-        <span ng-repeat="tag in value" class="label label-primary mb-xxxs mr-xxxs">{{tag.text}}</span>
+        <!-- <span ng-repeat="tag in value" class="label label-primary mb-xxxs mr-xxxs">{{tag.text}}</span> -->
+        <!-- <span ng-repeat="tag in value" class="label label-primary mb-xxxs mr-xxxs">{{tag.text}}</span> -->
+        <tag class=" mb-xxxs mr-xxxs" ng-repeat="tag in value" value="tag.text"></tag>
 
         <small class="updatable-input-icon" ng-class="{'lg': value.length > 0}">
             <i class="glyphicon glyphicon-pencil"></i>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<span class="label label-default label-lg">{{$ctrl.tag}}</span>
		<span class="label label-tag label-default label-lg" style="">{{$ctrl.tag}}</span>