Merge branch 'bug_18693/filter_for_name_for_generic_methods_in_techni…

…que_editor_doesn_t_filter_pr' into branches/rudder/6.2
Normation · Nov 25, 2020 · 6018982 · 6018982
2 parents ef7bfae + d1270c4
commit 6018982
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/...ources/rudder/rudder-web/src/main/webapp/secure/configurationManager/techniqueEditor.html b/...ources/rudder/rudder-web/src/main/webapp/secure/configurationManager/techniqueEditor.html
@@ -740,7 +740,7 @@ <h1>Generic Methods</h1>
 
         <div class="header-filter">
           <div class="input-group">
-            <input class="form-control" type="text" placeholder="Filter" ng-model="searchText.name">
+            <input class="form-control" type="text" placeholder="Filter" ng-model="filter.text">
             <div class="input-group-btn">
               <button type="button" class="btn btn-outline-secondary btn-toggle-filters" ng-click="ui.showMethodsFilter=!ui.showMethodsFilter"><i class="ion ion-android-options"></i></button>
             </div>
@@ -771,6 +771,9 @@ <h1>Generic Methods</h1>
       <div class="sidebar-body">
 
         <div class="generic-methods-container">
+          <div class="empty" ng-if="!checkFilterAllCategories()">
+            No method matches the filters.
+          </div>
           <div id="methods-list-container">
             <ul class="list-unstyled" ng-repeat="(kind,methods) in methodsByCategory" ng-if="checkFilterCategory(methods)">
               <h5 id={{kind}}>{{capitaliseFirstLetter(kind)}}</h5>

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-technique-editor.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-technique-editor.css
@@ -161,7 +161,10 @@ body > .ng-toast {
 .alert.alert-dismissible pre {
   white-space: normal;
 }
-
+.rudder-template textarea.form-control{
+  min-height: unset;
+  line-height: 1.5;
+}
 /* ===== TECHNIQUES & METHODS ===== */
 .show-methods .col-techniques,
 .show-techniques .col-methods{
@@ -273,11 +276,12 @@ body > .ng-toast {
   padding: 0;
   margin: 0;
 }
-.techniques-list-container > ul .empty{
+.sidebar-body .empty{
   padding: 15px;
   border-bottom: 1px solid #e5E5E5;
   font-style: italic;
   color: #999;
+  height: fit-content;
 }
 .techniques-list-container > ul > li {
   border-bottom: 1px solid #e5e5e5;
@@ -984,7 +988,10 @@ button.btn.clipboard:hover {
 .main-footer .btn{
   margin-right: 15px;
 }
-
+.generic-methods-container .empty ~ div,
+.generic-methods-container .empty ~ ul{
+  display: none !important;
+}
 /* =====  METHOD  ===== */
 ul.list-unstyled > li{
   margin-bottom: 10px;

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/techeditor/js/ncf.js b/webapp/sources/rudder/rudder-web/src/main/webapp/techeditor/js/ncf.js
@@ -932,6 +932,14 @@ $scope.onImportFileChange = function (fileEl) {
     }
     return agentTypeFilter && deprecatedFilter && nameFilter;
   }
+  $scope.checkFilterAllCategories = function(){
+    for (var x in $scope.methodsByCategory){
+      if($scope.checkFilterCategory($scope.methodsByCategory[x])){
+        return true;
+      }
+    }
+    return false;
+  }
 
   $scope.checkMethodCallAgentSupport = function(methodName, agent){
     var gKey = Object.keys($scope.generic_methods).find(function(method){return $scope.generic_methods[method].bundle_name === methodName});