@k-int/stripes-kint-components 2.4.0 → 2.4.1

package/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.4.1 2022-04-26
+  * Added FilterConfig support to generateKiwtQueryParams
 ## 2.4.0 2022-04-21
   * Custom Property component fixes
   * Fix to actionAssigner callback pattern

package/es/lib/utils/generateKiwtQueryParams.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["searchKey", "filterKeys", "sortKeys", "stats", "sort", "filters"];
+var _excluded = ["searchKey", "filterConfig", "filterKeys", "sortKeys", "stats", "sort", "filters"];
 
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -49,6 +49,8 @@ var generateKiwtQueryParams = function generateKiwtQueryParams(options, nsValues
 
   var _options$searchKey = options.searchKey,
       searchKey = _options$searchKey === void 0 ? '' : _options$searchKey,
+      _options$filterConfig = options.filterConfig,
+      filterConfig = _options$filterConfig === void 0 ? [] : _options$filterConfig,
       _options$filterKeys = options.filterKeys,
       filterKeys = _options$filterKeys === void 0 ? {} : _options$filterKeys,
       _options$sortKeys = options.sortKeys,
@@ -118,18 +120,33 @@ var generateKiwtQueryParams = function generateKiwtQueryParams(options, nsValues
           filterName = _ref2[0],
           filterValues = _ref2[1];
 
+      var filterConfigEntry = filterConfig.find(function (conf) {
+        return conf.name === filterName;
+      });
       var filterKey = filterKeys[filterName];
 
-      if (!filterKey) {
+      if (filterConfigEntry) {
+        // We have a direct mapping instruction, use it
+        var filterString = filterValues.map(function (v) {
+          var _filterConfigEntry$va, _filterConfigEntry$va2;
+
+          var fceValue = filterConfigEntry === null || filterConfigEntry === void 0 ? void 0 : (_filterConfigEntry$va = filterConfigEntry.values) === null || _filterConfigEntry$va === void 0 ? void 0 : (_filterConfigEntry$va2 = _filterConfigEntry$va.find(function (fce) {
+            return fce.name === v;
+          })) === null || _filterConfigEntry$va2 === void 0 ? void 0 : _filterConfigEntry$va2.value;
+          return "".concat(filterName, "==").concat(fceValue !== null && fceValue !== void 0 ? fceValue : v);
+        }).join('||');
+        paramsArray.push("filters=".concat(filterString));
+      } else if (!filterKey) {
         // These filters have no key mapping so we just pass the values to the backend as-is.
         paramsArray.push.apply(paramsArray, _toConsumableArray(filterValues === null || filterValues === void 0 ? void 0 : filterValues.map(function (f) {
           return "filters=".concat(f);
         })));
       } else {
-        var filterString = filterValues.map(function (v) {
+        var _filterString = filterValues.map(function (v) {
           return "".concat(filterKey, "==").concat(v);
         }).join('||');
-        paramsArray.push("filters=".concat(filterString));
+
+        paramsArray.push("filters=".concat(_filterString));
       }
     });
   }

package/package.json

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

package/src/lib/utils/generateKiwtQueryParams.js

@@ -2,6 +2,7 @@ const generateKiwtQueryParams = (options, nsValues) => {
   const { qindex, query, filters, sort } = nsValues;
   const {
     searchKey = '',
+    filterConfig = [],
     /* Assumtion made that if no filterKey is provided then the given filterValues for that key are standalaone, ie require no comparator or key */
     filterKeys = {},
     sortKeys = {},
@@ -74,9 +75,17 @@ const generateKiwtQueryParams = (options, nsValues) => {
 
     // We now have a filterMap of shape { status: ['active', 'cancelled'], type: ['local'] }
     Object.entries(filterMap).forEach(([filterName, filterValues]) => {
+      const filterConfigEntry = filterConfig.find(conf => conf.name === filterName);
       const filterKey = filterKeys[filterName];
+      if (filterConfigEntry) {
+        // We have a direct mapping instruction, use it
+        const filterString = filterValues.map(v => {
+          const fceValue = filterConfigEntry?.values?.find(fce => fce.name === v)?.value;
+          return `${filterName}==${fceValue ?? v}`;
+        }).join('||');
 
-      if (!filterKey) {
+        paramsArray.push(`filters=${filterString}`);
+      } else if (!filterKey) {
         // These filters have no key mapping so we just pass the values to the backend as-is.
         paramsArray.push(...filterValues?.map(f => `filters=${f}`));
       } else {