Fixes #9798: UI to display tags #1421

RaphaelGauthier · 2017-01-04T16:40:54Z

https://www.rudder-project.org/redmine/issues/9798

RaphaelGauthier · 2017-01-04T16:43:24Z

Commit modified

VinceMacBuche · 2017-01-06T10:14:55Z

rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala

@@ -640,6 +716,8 @@ class RuleGrid(
    val t5 = System.currentTimeMillis
    TimingDebugLogger.trace(s"Rule grid: transforming into data: get rule data: callback: ${t5-t4}ms")

+    val tags = """[{"key":"environment","value":"production"},{"key":"customer","value":"Acme prod"}]"""


You should use the tag stored in the Rule object

VinceMacBuche · 2017-01-06T10:15:17Z

rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala

@@ -218,7 +218,7 @@ object DisplayDirectiveTree extends Loggable {
      }
      val htmlId = s"jsTree-${directive.id.value}"
      override val attrs = (
-                  ("data-jstree" -> """{ "type" : "directive" }""") ::


You should use the Tags stored in the directive object

VinceMacBuche · 2017-01-06T10:16:26Z

rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js

@@ -385,6 +393,7 @@ function createRuleTable(gridId, data, needCheckbox, needActions, needCompliance

  // Choose which columns should be included
  var columns = [];
+  columns.push(tags);


If you had pushed them at the end you would'nt have to change the filter column ;) but since it's done, it's ok!!

I will remember it ;)

VinceMacBuche · 2017-01-06T10:18:52Z

rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js

@@ -523,6 +539,7 @@ function createRuleComplianceTable(gridId, data, contextPath, refresh) {
    , "oLanguage": {
        "sSearch": ""
      }
+    , "columnDefs": [{ "visible": false, "targets": 0 }]


It's in reporting table, is it hiding the first column ?

Oh, I think I just forgot to delete this line!

VinceMacBuche · 2017-01-06T10:20:42Z

rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html

+  </style>
+  <link media="screen" href="/style/rudder/rudder-tags.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="/javascript/rudder/angular/filters.js"></script>
+  <script>


Can you put it in a file (directive.js or directive-filter.js)

VinceMacBuche · 2017-01-06T10:22:37Z

Apart the small comments it seems ok !

VinceMacBuche · 2017-01-06T10:26:08Z

rudder-web/src/main/webapp/javascript/rudder/angular/tags.js

@@ -0,0 +1,51 @@
+var app = angular.module('tags', []);
+var xxxx;


This var should be remmoved, or renamed :)

RaphaelGauthier · 2017-01-06T11:11:14Z

Commit modified

RaphaelGauthier · 2017-01-06T11:11:35Z

PR rebased

RaphaelGauthier · 2017-01-09T11:29:08Z

Commit modified

VinceMacBuche · 2017-01-09T15:13:12Z

rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala

@@ -165,6 +165,7 @@ class RuleGrid(
  def asyncDisplayAllRules(onlyRules: Option[Set[RuleId]], showComplianceColumns: Boolean, showRecentChanges: Boolean) =  {
    AnonFunc(SHtml.ajaxCall(JsNull, (s) => {

+      val defaultTag = Tags(Set(Tag(TagName("env"),TagValue("prod"))))


Can you remove the default tags ?

VinceMacBuche · 2017-01-09T15:14:37Z

rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala

          """
        <div id={htmlId_rulesGridZone}>
          <span class="error" id="ruleTableError">{errorProperty.getOrElse("")}</span>
          <div id={htmlId_modalReportsPopup} class="nodisplay">
            <div id={htmlId_reportsPopup} ></div>
          </div>
+          <div id="showFiltersRules" ng-controller="filterTagRuleCtrl" class="filters tw-bs" ng-cloak="">


Can you put all of this in an html file and include it here ?

VinceMacBuche · 2017-01-09T15:27:19Z

rudder-web/src/main/scala/com/normation/rudder/web/components/TagsEditForm.scala

+
+  var listTags = tags
+  def cfTagsConfiguration(controllerID:String) =
+    <div class="row form-group" ng-controller={{controllerID}} ng-cloak="" >


Would be better if html was in an html file and only modifying the ng-controller attribute using lift css selector (like we do for directive inputs"

RaphaelGauthier · 2017-01-09T17:18:07Z

Commit modified

VinceMacBuche · 2017-01-09T23:09:44Z

rudder-web/src/main/webapp/javascript/rudder/angular/filters.js

+}
+
+// PLUGIN JSTREE : SEARCH-TAG
+$.jstree.plugins.searchtag = function (options, parent) {


That Plugin should be in a separate file

Added into common layout before tree.js

VinceMacBuche · 2017-01-09T23:10:15Z

rudder-web/src/main/webapp/javascript/rudder/angular/filters.js

@@ -0,0 +1,533 @@
+var app = angular.module('filters', []);


You need to add the license to the top of the fule

VinceMacBuche · 2017-01-09T23:10:35Z

rudder-web/src/main/webapp/javascript/rudder/angular/tags.js

@@ -0,0 +1,68 @@
+var app = angular.module('tags', []);


Need license too

VinceMacBuche · 2017-01-09T23:11:30Z

rudder-web/src/main/webapp/javascript/rudder/angular/tags.js

+app.controller('tagsRuleCtrl', function ($scope, $http, $location, $timeout) {
+  $scope.scopeFilter;
+
+  $scope.init = function(treeId, tags){


Why do you need treeid ? ( I saw it as a constant )

VinceMacBuche · 2017-01-09T23:14:06Z

rudder-web/src/main/webapp/javascript/rudder/angular/tags.js

+    }
+    var temp;
+    for (key in jsonTags){
+      temp = {'key':key, 'value':jsonTags[key]};


Temp should be declared here

VinceMacBuche · 2017-01-09T23:15:53Z

rudder-web/src/main/webapp/javascript/rudder/directive.js

@@ -0,0 +1,15 @@
+$(document).ready(function(){


Need license

VinceMacBuche · 2017-01-10T09:25:24Z

We will treat those remarks in a new PR

Normation-Quality-Assistant · 2017-01-10T09:26:44Z

OK, merging this PR

RaphaelGauthier force-pushed the ust_9798/ui_to_display_tags branch from 65773e2 to 4cbe842 Compare January 4, 2017 16:43

VinceMacBuche reviewed Jan 6, 2017

View reviewed changes

RaphaelGauthier force-pushed the ust_9798/ui_to_display_tags branch from 4cbe842 to c620ecc Compare January 6, 2017 11:11

RaphaelGauthier force-pushed the ust_9798/ui_to_display_tags branch from c620ecc to 41826a3 Compare January 6, 2017 11:11

RaphaelGauthier force-pushed the ust_9798/ui_to_display_tags branch from 41826a3 to 7babfe3 Compare January 9, 2017 11:29

VinceMacBuche reviewed Jan 9, 2017

View reviewed changes

Fixes #9798: UI to display tags

9f0d717

RaphaelGauthier force-pushed the ust_9798/ui_to_display_tags branch from 7babfe3 to 9f0d717 Compare January 9, 2017 17:18

VinceMacBuche requested changes Jan 10, 2017

View reviewed changes

VinceMacBuche added the Ready for merge label Jan 10, 2017

Normation-Quality-Assistant merged commit 9f0d717 into Normation:branches/rudder/4.1 Jan 10, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #9798: UI to display tags #1421

Fixes #9798: UI to display tags #1421

RaphaelGauthier commented Jan 4, 2017

RaphaelGauthier commented Jan 4, 2017

VinceMacBuche Jan 6, 2017

VinceMacBuche Jan 6, 2017

VinceMacBuche Jan 6, 2017

RaphaelGauthier Jan 6, 2017

VinceMacBuche Jan 6, 2017

RaphaelGauthier Jan 6, 2017

VinceMacBuche Jan 6, 2017

VinceMacBuche commented Jan 6, 2017

VinceMacBuche Jan 6, 2017

RaphaelGauthier commented Jan 6, 2017

RaphaelGauthier commented Jan 6, 2017

RaphaelGauthier commented Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

RaphaelGauthier commented Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche Jan 9, 2017

VinceMacBuche commented Jan 10, 2017

Normation-Quality-Assistant commented Jan 10, 2017

		@@ -0,0 +1,51 @@
		var app = angular.module('tags', []);
		var xxxx;

Fixes #9798: UI to display tags #1421

Fixes #9798: UI to display tags #1421

Conversation

RaphaelGauthier commented Jan 4, 2017

RaphaelGauthier commented Jan 4, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VinceMacBuche commented Jan 6, 2017

Choose a reason for hiding this comment

RaphaelGauthier commented Jan 6, 2017

RaphaelGauthier commented Jan 6, 2017

RaphaelGauthier commented Jan 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RaphaelGauthier commented Jan 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VinceMacBuche commented Jan 10, 2017

Normation-Quality-Assistant commented Jan 10, 2017