@k-int/stripes-kint-components 2.1.0 → 2.1.1

package/CHANGELOG.md

@@ -1,4 +1,6 @@
-## 2.1.0 In progress
+## 2.2.1 2022-03-10
+* Fix -- GenerateQueryParams no longer assumes you want EITHER nsValues filters or options filters, it simply adds both to the params array
+## 2.1.0 2022-03-09
 * Fixes for ActionList
   * When no formatter is present, it no longer crashes
   * Formatting for buttons

package/es/lib/utils/generateKiwtQueryParams.js

@@ -96,7 +96,9 @@ var generateKiwtQueryParams = function generateKiwtQueryParams(options, nsValues
         }
       }
     });
-  } else if (filters) {
+  }
+
+  if (filters) {
     var filterMap = {};
     filters.split(',').forEach(function (filter) {
       var _filter$trim;
@@ -143,7 +145,9 @@ var generateKiwtQueryParams = function generateKiwtQueryParams(options, nsValues
         paramsArray.push("sort=".concat(os.path, ";").concat((_os$direction = os.direction) !== null && _os$direction !== void 0 ? _os$direction : 'asc'));
       }
     });
-  } else if (sort) {
+  }
+
+  if (sort) {
     var _sort$trim;
 
     paramsArray.push.apply(paramsArray, _toConsumableArray((_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',').map(function (sortKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"

package/src/lib/utils/generateKiwtQueryParams.js

@@ -6,14 +6,12 @@ const generateKiwtQueryParams = (options, nsValues) => {
     filterKeys = {},
     sortKeys = {},
     stats = true,
-    /* Assumption made that if a direct sort array is passed in options, it overrides the nsValues
-     * Of the form [{ path: 'this.is.some.path', direction: 'asc'/'desc', value: 'someOverrideValue'}, ...]
+    /* Of the form [{ path: 'this.is.some.path', direction: 'asc'/'desc', value: 'someOverrideValue'}, ...]
      * If only path is passed then assume asc.
      * If value is passed then we ignore path/direction and append "sort=${value}" directly
      */
     sort: optionsSort,
-     /* Assumption made that if a direct filters array is passed in options, it overrides the nsValues
-     * Of the form
+    /* Of the form
       [
         {
           path: 'this.is.some.path'
@@ -62,7 +60,9 @@ const generateKiwtQueryParams = (options, nsValues) => {
         }
       }
     });
-  } else if (filters) {
+  }
+  
+  if (filters) {
     const filterMap = {};
     filters.split(',').forEach(filter => {
       const [filterName, ...filterRest] = filter.trim()?.split('.');
@@ -94,7 +94,9 @@ const generateKiwtQueryParams = (options, nsValues) => {
         paramsArray.push(`sort=${os.path};${os.direction ?? 'asc'}`);
       }
     });
-  } else if (sort) {
+  }
+  
+  if (sort) {
     paramsArray.push(...sort.trim()?.split(',').map(sortKey => {
       const descending = sortKey.startsWith('-');
       let term = sortKey.replace('-', '');