[NEP-12629] Fix default filters URLs with old format for SavedSearches.

rdytech · Mar 1, 2022 · d194b8c · d194b8c
1 parent 828327a
commit d194b8c
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 93 deletions.
diff --git a/dist/react-filterbar.js b/dist/react-filterbar.js
@@ -17138,40 +17138,12 @@ function setupConfiguration(configuration) {
     var activeFilters = JSON.parse(url.query(true).q);
     configuration.filterBarConfiguration.activeFilters = [];
 
-    var _iterator = _createForOfIteratorHelper(activeFilters),
-        _step;
-
-    try {
-      var _loop = function _loop() {
-        groupFilters = _step.value;
-        var _groupFilters = [];
-        groupFilters.map(function (filter) {
-          var configFilter = configuration.filterBarConfiguration.filters[filter.uid];
-
-          if (configFilter) {
-            configFilter.filterUid = filter.uid;
-            configFilter.uid = filter.uid;
-            configFilter.value = filter.value;
-
-            if (filter.operator) {
-              configFilter.operator = filter.operator;
-            }
-          }
-
-          _groupFilters.push(configFilter);
-        });
-        configuration.filterBarConfiguration.activeFilters.push(_groupFilters);
-      };
-
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var groupFilters;
-
-        _loop();
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    if (Array.isArray(activeFilters[0])) {
+      // Case 1: Filters with new format
+      configuration.filterBarConfiguration.activeFilters = parseQueryVersion2(activeFilters, configuration);
+    } else {
+      // Case 2: Filters with old format
+      configuration.filterBarConfiguration.activeFilters = parseQueryVersion1(activeFilters, configuration);
     }
   }
 
@@ -17187,6 +17159,74 @@ function setupConfiguration(configuration) {
   return configuration;
 }
 
+function parseQueryVersion1(activeFilters, configuration) {
+  var _groupFilters = [];
+
+  var _iterator = _createForOfIteratorHelper(activeFilters),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var filter = _step.value;
+      var configFilter = parseAndGetFilter(filter, configuration);
+
+      _groupFilters.push(configFilter);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return [_groupFilters];
+}
+
+function parseQueryVersion2(activeFilters, configuration) {
+  var results = [];
+
+  var _iterator2 = _createForOfIteratorHelper(activeFilters),
+      _step2;
+
+  try {
+    var _loop = function _loop() {
+      var groupFilters = _step2.value;
+      var _groupFilters = [];
+      groupFilters.map(function (filter) {
+        var configFilter = parseAndGetFilter(filter, configuration);
+
+        _groupFilters.push(configFilter);
+      });
+      results.push(_groupFilters);
+    };
+
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  return results;
+}
+
+function parseAndGetFilter(filter, configuration) {
+  var configFilter = configuration.filterBarConfiguration.filters[filter.uid];
+
+  if (configFilter) {
+    configFilter.filterUid = filter.uid;
+    configFilter.uid = filter.uid;
+    configFilter.value = filter.value;
+
+    if (filter.operator) {
+      configFilter.operator = filter.operator;
+    }
+  }
+
+  return configFilter;
+}
+
 document.addEventListener("DOMContentLoaded", function () {
   var configuration = {},
       filterableTableNode = document.getElementsByClassName("react-filterable-table")[0];

diff --git a/dist/react-filterbar.min.js b/dist/react-filterbar.min.js
diff --git a/example/public/js/react-filterbar.js b/example/public/js/react-filterbar.js
diff --git a/example/server.rb b/example/server.rb
@@ -81,7 +81,16 @@ def loop_over_queries(queries, haystack)
   end
 
   def search(needle, haystack)
-    field, type, value = needle.first.values_at(*%w(field type value))
+    field, type, value = nil
+
+    if needle.is_a? Array
+      # Case 1:  Filters with new format
+      field, type, value = needle.first.values_at(*%w(field type value))
+    else
+      # Case 2:  Filters with old format
+      field, type, value = needle.values_at(*%w(field type value))
+    end
+
     value ||= ""
     case type.to_sym
     when :date

diff --git a/src/app.js b/src/app.js
@@ -50,23 +50,13 @@ function setupConfiguration(configuration) {
   if (url.query(true).q !== "") {
     const activeFilters = JSON.parse(url.query(true).q);
     configuration.filterBarConfiguration.activeFilters = [];
-    for (var groupFilters of activeFilters) {
-      const _groupFilters = []
-      groupFilters.map(function(filter) {
-        var configFilter = configuration.filterBarConfiguration.filters[filter.uid];
-
-        if (configFilter) {
-          configFilter.filterUid = filter.uid;
-          configFilter.uid = filter.uid;
-          configFilter.value = filter.value;
-
-          if (filter.operator) {
-            configFilter.operator = filter.operator;
-          }
-        }
-        _groupFilters.push(configFilter);
-      });
-      configuration.filterBarConfiguration.activeFilters.push(_groupFilters);
+
+    if (Array.isArray(activeFilters[0])) {
+      // Case 1: Filters with new format
+      configuration.filterBarConfiguration.activeFilters = parseQueryVersion2(activeFilters, configuration);
+    } else {
+      // Case 2: Filters with old format
+      configuration.filterBarConfiguration.activeFilters = parseQueryVersion1(activeFilters, configuration);
     }
   }
 
@@ -81,6 +71,48 @@ function setupConfiguration(configuration) {
   return configuration;
 }
 
+function parseQueryVersion1(activeFilters, configuration) {
+  const _groupFilters = [];
+
+  for (const filter of activeFilters) {
+    const configFilter = parseAndGetFilter(filter, configuration)
+    _groupFilters.push(configFilter);
+  }
+
+  return [_groupFilters];
+}
+
+function parseQueryVersion2(activeFilters, configuration) {
+  const results = [];
+
+  for (const groupFilters of activeFilters) {
+    const _groupFilters = []
+    groupFilters.map(function(filter) {
+      const configFilter = parseAndGetFilter(filter, configuration)
+      _groupFilters.push(configFilter);
+    });
+    results.push(_groupFilters);
+  }
+
+  return results;
+}
+
+function parseAndGetFilter(filter, configuration) {
+  const configFilter = configuration.filterBarConfiguration.filters[filter.uid];
+
+  if (configFilter) {
+    configFilter.filterUid = filter.uid;
+    configFilter.uid = filter.uid;
+    configFilter.value = filter.value;
+
+    if (filter.operator) {
+      configFilter.operator = filter.operator;
+    }
+  }
+
+  return configFilter;
+}
+
 document.addEventListener("DOMContentLoaded", function(){
   var configuration = {},
       filterableTableNode = document.getElementsByClassName("react-filterable-table")[0];