@k-int/stripes-kint-components 3.2.0 → 3.2.1

package/src/lib/utils/README.md

@@ -31,7 +31,6 @@ Name | Type | Description | default | required
 --- | --- | --- | --- | ---
 options | object | An object with keys: `searchKey`, `filterKeys`, `sortKeys` and `stats`, which maps the incoming nsValues objects to a KIWT query. You can also pass arbitrary `key`/`value` pairs to append `key==value` onto the query. | | ✓ |
 nsValues | object | An object containing the actual query parameters to become the mapped KIWT query | | ✓ |
-encode | boolean | A boolean prop which determines if each query param chunk will be encoded using encodeURIComponent or not | true | ✕ |
 
 ## generateKiwtQueryParams
 A util function for generating an array of "KIWT" (K-Int Web-Toolkit) style backend query parameters from a SASQ query object
@@ -69,5 +68,4 @@ import { generateKiwtQueryParams } from '@k-int/stripes-kint-components'
 Name | Type | Description | default | required
 --- | --- | --- | --- | ---
 options | object | An object with keys: `searchKey`, `filterKeys`, `sortKeys` and `stats`, which maps the incoming nsValues objects to an KIWT query array. You can also pass arbitrary `key`/`value` pairs to append `key==value` onto the query. | | ✓ |
-nsValues | object | An object containing the actual query parameters to become the mapped KIWT query | | ✓ |
-encode | boolean | A boolean prop which determines if each query param chunk will be encoded using encodeURIComponent or not | true | ✕ |
+nsValues | object | An object containing the actual query parameters to become the mapped KIWT query | | ✓ |

package/src/lib/utils/generateKiwtQuery.js

@@ -1,8 +1,8 @@
 import generateKiwtQueryParams from './generateKiwtQueryParams';
 
-const generateKiwtQuery = (options, nsValues, encode = true) => {
-  const paramsArray = generateKiwtQueryParams(options, nsValues, encode);
-  return paramsArray.length ? '?' + paramsArray.join('&') : '';
+const generateKiwtQuery = (options, nsValues) => {
+  const paramsArray = generateKiwtQueryParams(options, nsValues);
+  return paramsArray.length ? '?' + paramsArray.map(p => encodeURI(p)).join('&') : '';
 };
 
 export default generateKiwtQuery;

package/src/lib/utils/generateKiwtQueryParams.js

@@ -1,4 +1,4 @@
-const generateKiwtQueryParams = (options, nsValues, encode = true) => {
+const generateKiwtQueryParams = (options, nsValues) => {
   const { qindex, query, filters, sort } = nsValues;
   const {
     searchKey = '',
@@ -33,20 +33,11 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
     ...rest
   } = options;
 
-  const conditionalEncodeURIComponent = (str) => {
-    if (encode) {
-      return encodeURIComponent(str);
-    }
-
-    return str;
-  };
-
-
   const paramsArray = [];
 
   if (query) {
-    paramsArray.push(...(qindex || searchKey).split(',')?.map(m => `match=${conditionalEncodeURIComponent(m)}`));
-    paramsArray.push(`term=${conditionalEncodeURIComponent(query)}`);
+    paramsArray.push(...(qindex || searchKey).split(',')?.map(m => `match=${m}`));
+    paramsArray.push(`term=${query}`);
   }
 
   if (optionsFilters) {
@@ -61,14 +52,12 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
             innerFilters.push(opfv);
           }
         });
-
-        paramsArray.push(`filters=${conditionalEncodeURIComponent(innerFilters.join('||'))}`);
+        paramsArray.push(`filters=${innerFilters.join('||')}`);
       } else if (opf?.value) { // If no value OR values, then ignore
         if (opf.path) {
-          const filterString = `${opf.path}${opf.comparator ?? '=='}${opf.value}`;
-          paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString)}`);
+          paramsArray.push(`filters=${opf.path}${opf.comparator ?? '=='}${opf.value}`);
         } else {
-          paramsArray.push(`filters=${conditionalEncodeURIComponent(opf.value)}`);
+          paramsArray.push(`filters=${opf.value}`);
         }
       }
     });
@@ -95,13 +84,13 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
           return `${filterName}==${fceValue ?? v}`;
         }).join('||');
 
-        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString)}`);
+        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=${conditionalEncodeURIComponent(f)}`));
+        paramsArray.push(...filterValues?.map(f => `filters=${f}`));
       } else {
         const filterString = filterValues.map(v => `${filterKey}==${v}`).join('||');
-        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString)}`);
+        paramsArray.push(`filters=${filterString}`);
       }
     });
   }
@@ -109,10 +98,9 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
   if (optionsSort && optionsSort.length > 0) {
     optionsSort.forEach(os => {
       if (os.value) {
-        paramsArray.push(`sort=${conditionalEncodeURIComponent(os.value)}`);
+        paramsArray.push(`sort=${os.value}`);
       } else if (os.path) { // If no path then ignore
-        const sortString = `${os.path};${os.direction ?? 'asc'}`;
-        paramsArray.push(`sort=${conditionalEncodeURIComponent(sortString)}`);
+        paramsArray.push(`sort=${os.path};${os.direction ?? 'asc'}`);
       }
     });
   }
@@ -126,9 +114,7 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
         term = term.replace(term, sortKeys[term]);
       }
 
-      const sortString = `${term};${descending ? 'desc' : 'asc'}`;
-
-      return `sort=${conditionalEncodeURIComponent(sortString)}`;
+      return `sort=${term};${descending ? 'desc' : 'asc'}`;
     }));
   }
 
@@ -137,7 +123,7 @@ const generateKiwtQueryParams = (options, nsValues, encode = true) => {
   }
 
   for (const [key, value] of Object.entries(rest)) {
-    paramsArray.push(`${key}=${conditionalEncodeURIComponent(value)}`);
+    paramsArray.push(`${key}=${value}`);
   }
 
   return paramsArray;

package/yarn-error.log

@@ -0,0 +1,147 @@
+Arguments: 
+  /home/ethan/.nvm/versions/node/v16.17.0/bin/node /usr/share/yarn/bin/yarn.js install --ignore-scripts
+
+PATH: 
+  /home/ethan/.rd/bin:/home/ethan/.nvm/versions/node/v16.17.0/bin:/home/ethan/.sdkman/candidates/java/current/bin:/home/ethan/.sdkman/candidates/groovy/current/bin:/home/ethan/.sdkman/candidates/grails/current/bin:/home/ethan/.sdkman/candidates/gradle/current/bin:/home/ethan/.rd/bin:/home/ethan/.yarn/bin:/home/ethan/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  16.17.0
+
+Platform: 
+  linux x64
+
+Trace: 
+  Error: https://repository.folio.org/repository/npm-folio/@folio%2fstripes-erm-testing: Package '@folio/stripes-erm-testing' not found
+      at Request.params.callback [as _callback] (/usr/share/yarn/lib/cli.js:66145:18)
+      at Request.self.callback (/usr/share/yarn/lib/cli.js:140890:22)
+      at Request.emit (node:events:513:28)
+      at Request.<anonymous> (/usr/share/yarn/lib/cli.js:141862:10)
+      at Request.emit (node:events:513:28)
+      at IncomingMessage.<anonymous> (/usr/share/yarn/lib/cli.js:141784:12)
+      at Object.onceWrapper (node:events:627:28)
+      at IncomingMessage.emit (node:events:525:35)
+      at endReadableNT (node:internal/streams/readable:1358:12)
+      at processTicksAndRejections (node:internal/process/task_queues:83:21)
+
+npm manifest: 
+  {
+    "name": "@k-int/stripes-kint-components",
+    "version": "3.1.0",
+    "description": "Stripes Component library for K-Int specific applications",
+    "sideEffects": [
+      "*.css"
+    ],
+    "license": "Apache-2.0",
+    "engines": {
+      "node": ">=10.0.0"
+    },
+    "scripts": {
+      "lint": "eslint src",
+      "test": "yarn run test:jest",
+      "test:jest": "jest --ci --coverage",
+      "build:es": "rm -rf ./es && babel --extensions .js --ignore ./src/**/tests/**/* ./src --out-dir es",
+      "build": "yarn build:es",
+      "clean": "rm -rf ./node_modules ./*/node_modules ./yarn.lock && yarn install",
+      "clean-build": "yarn clean && yarn build",
+      "prepare": "yarn build"
+    },
+    "dependencies": {
+      "@rehooks/local-storage": "2.4.0",
+      "compose-function": "^3.0.3",
+      "react-resize-detector": "^7.1.2",
+      "zustand": "^4.0.0"
+    },
+    "devDependencies": {
+      "@babel/cli": "^7.18.10",
+      "@babel/core": "^7.18.6",
+      "@babel/eslint-parser": "^7.15.0",
+      "@babel/plugin-proposal-class-properties": "^7.12.1",
+      "@babel/plugin-proposal-decorators": "^7.12.1",
+      "@babel/plugin-proposal-function-sent": "^7.18.6",
+      "@babel/plugin-proposal-throw-expressions": "^7.18.6",
+      "@babel/plugin-syntax-import-meta": "^7.10.4",
+      "@babel/plugin-transform-runtime": "^7.12.1",
+      "@babel/preset-env": "^7.18.9",
+      "@babel/preset-flow": "^7.18.6",
+      "@babel/preset-react": "^7.18.6",
+      "@babel/preset-typescript": "^7.18.6",
+      "@folio/eslint-config-stripes": "^6.1.0",
+      "@folio/stripes": "^7.2.0",
+      "@folio/stripes-cli": "^2.6.0",
+      "@folio/stripes-erm-testing": "^1.0.0",
+      "@folio/stripes-testing": "^4.2.0",
+      "@formatjs/cli": "^4.2.31",
+      "@interactors/html": "^1.0.0-rc1.2",
+      "@testing-library/dom": "^8.16.0",
+      "@testing-library/jest-dom": "^5.16.4",
+      "@testing-library/react": "^12.1.5",
+      "@testing-library/user-event": "^14.3.0",
+      "babel-eslint": "^10.1.0",
+      "babel-jest": "^28.1.3",
+      "babel-plugin-const-enum": "^1.0.1",
+      "babel-plugin-module-resolver": "^4.0.0",
+      "babel-plugin-require-context-hook": "^1.0.0",
+      "babel-plugin-transform-async-to-promises": "^0.8.15",
+      "babel-polyfill": "^6.26.0",
+      "classnames": ">=2.2.6",
+      "core-js": "^3.6.1",
+      "eslint": "^7.32.0",
+      "eslint-plugin-import": "^2.26.0",
+      "eslint-plugin-jest": "^26.6.0",
+      "eslint-plugin-jest-dom": "^4.0.2",
+      "eslint-plugin-testing-library": "^5.5.1",
+      "graphql": "^16.0.0",
+      "identity-obj-proxy": "^3.0.0",
+      "jest": "^28.1.0",
+      "jest-css-modules": "^2.1.0",
+      "jest-css-modules-transform": "^4.0.0",
+      "jest-environment-jsdom": "^28.1.2",
+      "jest-junit": "^13.2.0",
+      "jest-webpack": "^0.5.1",
+      "moment": "^2.29.4",
+      "prop-types-extra": ">=1.1.0",
+      "react": "^17.0.2",
+      "react-dom": "^17.0.2",
+      "react-intl": "^5.8.1",
+      "react-query": "^3.6.0",
+      "react-redux": "^7.0.0",
+      "react-router": "^5.2.0",
+      "react-router-dom": "^5.2.0",
+      "redux": "^4.0.0",
+      "redux-observable": "^1.2.0",
+      "regenerator-runtime": "^0.13.3",
+      "rxjs": "^6.6.3",
+      "sinon": "^14.0.0",
+      "typescript": "^2.8.0"
+    },
+    "peerDependencies": {
+      "@folio/stripes": ">=7.0.3",
+      "final-form": ">=4.18.4",
+      "final-form-arrays": ">=3.0.1",
+      "lodash": ">=4.17.0",
+      "prop-types": ">=15.6.0",
+      "query-string": ">=6.6.0",
+      "react": "*",
+      "react-final-form": ">=6.3.0",
+      "react-final-form-arrays": ">=3.1.0",
+      "react-intl": ">=5.8.1",
+      "react-query": ">=3.9.0",
+      "react-router-dom": ">=5.2.0"
+    },
+    "main": "src/index.js",
+    "module": "es/index.js",
+    "repository": {
+      "type": "git",
+      "url": "git@gitlab.com:knowledge-integration/folio/stripes-kint-components.git"
+    },
+    "author": "knowledgeintegration"
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile