Merge pull request #8558 from rundeck/RUN-1346

RUN-1346: remove db storage for "node filters"
rundeck · Nov 6, 2023 · 6c402d4 · 6c402d4
2 parents dac4bef + 3aa4f96
commit 6c402d4
Show file tree

Hide file tree

Showing 67 changed files with 712 additions and 2,603 deletions.
diff --git a/rundeck-data-model/src/main/java/org/rundeck/app/data/model/v1/user/RdUser.java b/rundeck-data-model/src/main/java/org/rundeck/app/data/model/v1/user/RdUser.java
@@ -17,8 +17,5 @@ public interface RdUser {
     Date getLastLogout();
     String getLastSessionId();
     String getLastLoggedHostName();
-    Object getJobfilters();
-    Object getNodefilters();
-    Object getReportfilters();
 
 }
diff --git a/rundeckapp/grails-app/assets/javascripts/framework/adhoc.js b/rundeckapp/grails-app/assets/javascripts/framework/adhoc.js
@@ -68,7 +68,7 @@ function runFormSubmit(elem) {
     if (running || !$F('runFormExec')) {
         return false;
     }
-    if (!nodeFilter.filter() && !nodeFilter.filterName()) {
+    if (!nodeFilter.filter() ) {
         //no node filter
         return false;
     }
@@ -290,13 +290,6 @@ function init() {
 
     adhocCommand = new AdhocCommand({commandString:pageParams.runCommand}, nodeFilter);
 
-    //show selected named filter
-    nodeFilter.filterName.subscribe(function (val) {
-        if (val) {
-            jQuery('a[data-node-filter-name]').removeClass('active');
-            jQuery('a[data-node-filter-name=\'' + val + '\']').addClass('active');
-        }
-    });
     nodeFilter.total.subscribe(function(val){
         if (val && val != "0" && !running) {
             adhocCommand.canRun(true);

diff --git a/rundeckapp/grails-app/assets/javascripts/framework/nodes.js b/rundeckapp/grails-app/assets/javascripts/framework/nodes.js
@@ -41,7 +41,7 @@ var pageParams={};
  * @param elem
  */
 function expandResultNodes(page,elem){
-    loadNodeFilter(null,nodeFilter.filter(),nodeFilter.filterAll(),elem,page);
+    loadNodeFilter(nodeFilter.filter(),nodeFilter.filterAll(),elem,page);
 }
 /**
  * load either filter string or saved filter
@@ -51,37 +51,29 @@ function expandResultNodes(page,elem){
  * @param elem target element
  * @param page number to load
  */
-function loadNodeFilter(filterName, filterString,filterAll,elem,page) {
+function loadNodeFilter( filterString,filterAll,elem,page) {
     jQuery('.nodefilterlink').removeClass('active');
     if (!page) {
         page = 0;
     }
     if (!elem) {
         elem = 'nodelist';
     }
-    if(!filterName&&!filterString&&null==filterAll){
-        filterName=nodeFilter.filterName();
+    if(!filterString&&null==filterAll){
         filterString=nodeFilter.filter();
         filterAll=nodeFilter.filterAll();
     }
-    if(!filterName && !filterString){
+    if(!filterString){
         //if blank input and no filtername selected, do nothing
         return;
     }
     nodespage = page;
     var view = page == 0 ? 'table' : 'tableContent';
-    var data = filterName? {filterName: filterName} : {filter: filterString};
+    var data =  {filter: filterString};
     data.nodeExcludePrecedence='true';
-    if(filterName){
-        jQuery('a[data-node-filter-name=\''+filterName+'\']').addClass('active');
-        jQuery('.hiddenNodeFilter').val(filterString);
-        jQuery('.hiddenNodeFilterName').val(filterName);
-    }else{
-        jQuery('.hiddenNodeFilter').val(filterString );
-        jQuery('.hiddenNodeFilterName').val('');
-    }
+    jQuery('.hiddenNodeFilter').val(filterString );
+    jQuery('.hiddenNodeFilterName').val('');
     nodeFilter.filterAll(filterAll);
-    nodeFilter.filterName(filterName);
     nodeFilter.filter(filterString);
     nodeFilter.loading(true);
     _updateMatchedNodes(data,elem,pageParams.project,false,{view:view,expanddetail:true,inlinepaging:true,
@@ -169,7 +161,7 @@ var nodeSummary;
  */
 function pageLoad(){
     var pagestate;
-    if(filterParams.filterName || filterParams.filter|| filterParams.filterAll ){
+    if( filterParams.filter|| filterParams.filterAll ){
         nodeFilter.setPageParams(filterParams);
         nodeFilter.updateMatchedNodes();
         pagestate=nodeFilter.getPageParams();
@@ -208,13 +200,6 @@ function init() {
             nodeSummary:nodeSummary
         }));
     ko.applyBindings(nodeFilter);
-    //show selected named filter
-    nodeFilter.filterName.subscribe(function (val) {
-        if (val) {
-            jQuery('a[data-node-filter-name]').removeClass('active');
-            jQuery('a[data-node-filter-name=\'' + val + '\']').addClass('active');
-        }
-    });
     nodeFilter.loading.subscribe(function(val){
         //select filter results tab whenever loading output
         jQuery('#tab_link_result > a').tab('show');

diff --git a/rundeckapp/grails-app/assets/javascripts/jobFiltersKO.js b/rundeckapp/grails-app/assets/javascripts/jobFiltersKO.js
diff --git a/rundeckapp/grails-app/assets/javascripts/menu/jobs.js b/rundeckapp/grails-app/assets/javascripts/menu/jobs.js
@@ -20,7 +20,6 @@
 //= require knockout-foreachprop
 //= require nodeFiltersKO
 //= require executionOptions
-//= require jobFiltersKO
 //= require knockout-onenter
 //= require knockout-node-filter-link
 //= require menu/job-remote-options