@k-int/stripes-kint-components 5.6.1 → 5.7.1

package/es/lib/utils/generateKiwtQueryParams.js

@@ -17,40 +17,36 @@ const conditionalEncodeURIComponent = function (str) {
 const buildFilterOptionBlock = function (opf) {
   let isNested = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  if (opf !== null && opf !== void 0 && opf.groupValues) {
+  if (opf?.groupValues) {
     const groupValues = opf.groupValues;
 
     // Small utility function to add negation and brackets to the options block where necessary
-    const negationAndNesting = str => "".concat(groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '!' : '').concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '(' : '').concat(str).concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? ')' : '');
+    const negationAndNesting = str => `${groupValues?.NOT ? '!' : ''}${isNested || groupValues?.NOT ? '(' : ''}${str}${isNested || groupValues?.NOT ? ')' : ''}`;
 
     // First check whether groupValues is ANDed or ORed together
-    if (groupValues !== null && groupValues !== void 0 && groupValues.AND && Array.isArray(groupValues.AND) || groupValues !== null && groupValues !== void 0 && groupValues.OR && Array.isArray(groupValues.OR)) {
-      var _groupValues$OR;
+    if (groupValues?.AND && Array.isArray(groupValues.AND) || groupValues?.OR && Array.isArray(groupValues.OR)) {
       // AND takes precedence
       if (groupValues.AND) {
-        var _groupValues$AND;
-        return negationAndNesting(groupValues === null || groupValues === void 0 || (_groupValues$AND = groupValues.AND) === null || _groupValues$AND === void 0 || (_groupValues$AND = _groupValues$AND.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$AND === void 0 ? void 0 : _groupValues$AND.join('&&'));
+        return negationAndNesting(groupValues?.AND?.map(gvo => buildFilterOptionBlock(gvo, true, encode))?.join('&&'));
       }
-      return negationAndNesting(groupValues === null || groupValues === void 0 || (_groupValues$OR = groupValues.OR) === null || _groupValues$OR === void 0 || (_groupValues$OR = _groupValues$OR.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$OR === void 0 ? void 0 : _groupValues$OR.join('||'));
+      return negationAndNesting(groupValues?.OR?.map(gvo => buildFilterOptionBlock(gvo, true, encode))?.join('||'));
     }
     // If neither valid OR nor AND exist, ignore the block
-  } else if (opf !== null && opf !== void 0 && opf.values) {
+  } else if (opf?.values) {
     // Build the values filter block
     const innerFilters = [];
     opf.values.forEach(opfv => {
       if (opf.path) {
-        var _opf$comparator;
-        innerFilters.push("".concat(opf.path).concat((_opf$comparator = opf.comparator) !== null && _opf$comparator !== void 0 ? _opf$comparator : '==').concat(opfv));
+        innerFilters.push(`${opf.path}${opf.comparator ?? '=='}${opfv}`);
       } else {
         innerFilters.push(opfv);
       }
     });
     return conditionalEncodeURIComponent(innerFilters.join('||'), encode);
-  } else if (opf !== null && opf !== void 0 && opf.value) {
+  } else if (opf?.value) {
     // If no value OR values, then ignore
     if (opf.path) {
-      var _opf$comparator2;
-      const filterString = "".concat(opf.path).concat((_opf$comparator2 = opf.comparator) !== null && _opf$comparator2 !== void 0 ? _opf$comparator2 : '==').concat(opf.value);
+      const filterString = `${opf.path}${opf.comparator ?? '=='}${opf.value}`;
       return conditionalEncodeURIComponent(filterString, encode);
     }
     return conditionalEncodeURIComponent(opf.value, encode);
@@ -108,9 +104,8 @@ const generateKiwtQueryParams = function (options, nsValues) {
   } = options;
   const paramsArray = [];
   if (query) {
-    var _split, _ref;
-    paramsArray.push(...((_split = (_ref = qindex || searchKey) === null || _ref === void 0 ? void 0 : _ref.split(',')) !== null && _split !== void 0 ? _split : []).map(m => "match=".concat(conditionalEncodeURIComponent(m, encode))));
-    paramsArray.push("term=".concat(conditionalEncodeURIComponent(query, encode)));
+    paramsArray.push(...((qindex || searchKey)?.split(',') ?? []).map(m => `match=${conditionalEncodeURIComponent(m, encode)}`));
+    paramsArray.push(`term=${conditionalEncodeURIComponent(query, encode)}`);
   }
 
   // Actually build the optionsFilters block (Moved logic to its own function to allow recursion)
@@ -118,71 +113,67 @@ const generateKiwtQueryParams = function (options, nsValues) {
     optionsFilters.forEach(opf => {
       const optionsBlock = buildFilterOptionBlock(opf, false, encode);
       if (optionsBlock) {
-        paramsArray.push("filters=".concat(optionsBlock));
+        paramsArray.push(`filters=${optionsBlock}`);
       }
     });
   }
   if (filters) {
     const filterMap = {};
     filters.split(',').forEach(filter => {
-      var _filter$trim$split, _filter$trim;
-      const [filterName, ...filterRest] = (_filter$trim$split = (_filter$trim = filter.trim()) === null || _filter$trim === void 0 ? void 0 : _filter$trim.split('.')) !== null && _filter$trim$split !== void 0 ? _filter$trim$split : [];
+      const [filterName, ...filterRest] = filter.trim()?.split('.') ?? [];
       const filterValue = filterRest.join('.');
       if (filterMap[filterName] === undefined) filterMap[filterName] = [];
       filterMap[filterName].push(filterValue);
     });
 
     // We now have a filterMap of shape { status: ['active', 'cancelled'], type: ['local'] }
-    Object.entries(filterMap).forEach(_ref2 => {
-      let [filterName, filterValues] = _ref2;
+    Object.entries(filterMap).forEach(_ref => {
+      let [filterName, filterValues] = _ref;
       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 => {
-          var _filterConfigEntry$va;
-          const fceValue = filterConfigEntry === null || filterConfigEntry === void 0 || (_filterConfigEntry$va = filterConfigEntry.values) === null || _filterConfigEntry$va === void 0 || (_filterConfigEntry$va = _filterConfigEntry$va.find(fce => fce.name === v)) === null || _filterConfigEntry$va === void 0 ? void 0 : _filterConfigEntry$va.value;
-          return "".concat(filterName, "==").concat(fceValue !== null && fceValue !== void 0 ? fceValue : v);
+          const fceValue = filterConfigEntry?.values?.find(fce => fce.name === v)?.value;
+          return `${filterName}==${fceValue ?? v}`;
         }).join('||');
-        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
+        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString, encode)}`);
       } else if (!filterKey) {
         // These filters have no key mapping so we just pass the values to the backend as-is.
-        paramsArray.push(...(filterValues !== null && filterValues !== void 0 ? filterValues : []).map(f => "filters=".concat(conditionalEncodeURIComponent(f, encode))));
+        paramsArray.push(...(filterValues ?? []).map(f => `filters=${conditionalEncodeURIComponent(f, encode)}`));
       } else {
-        const filterString = filterValues.map(v => "".concat(filterKey, "==").concat(v)).join('||');
-        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
+        const filterString = filterValues.map(v => `${filterKey}==${v}`).join('||');
+        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString, encode)}`);
       }
     });
   }
   if (optionsSort && optionsSort.length > 0) {
     optionsSort.forEach(os => {
       if (os.value) {
-        paramsArray.push("sort=".concat(conditionalEncodeURIComponent(os.value, encode)));
+        paramsArray.push(`sort=${conditionalEncodeURIComponent(os.value, encode)}`);
       } else if (os.path) {
-        var _os$direction;
         // If no path then ignore
-        const sortString = "".concat(os.path, ";").concat((_os$direction = os.direction) !== null && _os$direction !== void 0 ? _os$direction : 'asc');
-        paramsArray.push("sort=".concat(conditionalEncodeURIComponent(sortString, encode)));
+        const sortString = `${os.path};${os.direction ?? 'asc'}`;
+        paramsArray.push(`sort=${conditionalEncodeURIComponent(sortString, encode)}`);
       }
     });
   }
   if (sort) {
-    var _sort$trim$split, _sort$trim;
-    paramsArray.push(...((_sort$trim$split = (_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',')) !== null && _sort$trim$split !== void 0 ? _sort$trim$split : []).map(sortKey => {
+    paramsArray.push(...(sort.trim()?.split(',') ?? []).map(sortKey => {
       const descending = sortKey.startsWith('-');
       let term = sortKey.replace('-', '');
       if (term in sortKeys) {
         term = term.replace(term, sortKeys[term]);
       }
-      const sortString = "".concat(term, ";").concat(descending ? 'desc' : 'asc');
-      return "sort=".concat(conditionalEncodeURIComponent(sortString, encode));
+      const sortString = `${term};${descending ? 'desc' : 'asc'}`;
+      return `sort=${conditionalEncodeURIComponent(sortString, encode)}`;
     }));
   }
   if (stats) {
     paramsArray.push('stats=true');
   }
   for (const [key, value] of Object.entries(rest)) {
-    paramsArray.push("".concat(key, "=").concat(conditionalEncodeURIComponent(value, encode)));
+    paramsArray.push(`${key}=${conditionalEncodeURIComponent(value, encode)}`);
   }
   return paramsArray;
 };

package/es/lib/utils/groupCustomPropertiesByCtx.js

@@ -7,12 +7,11 @@ exports.default = void 0;
 const groupCustomPropertiesByCtx = function () {
   let customProperties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return customProperties.reduce((acc, curr) => {
-    var _curr$ctx, _acc$ctx;
-    const ctx = (_curr$ctx = curr.ctx) !== null && _curr$ctx !== void 0 ? _curr$ctx : 'isNull';
+    const ctx = curr.ctx ?? 'isNull';
     const returnObj = {
       ...acc
     };
-    returnObj[ctx] = [...((_acc$ctx = acc === null || acc === void 0 ? void 0 : acc[ctx]) !== null && _acc$ctx !== void 0 ? _acc$ctx : []), curr];
+    returnObj[ctx] = [...(acc?.[ctx] ?? []), curr];
     return returnObj;
   }, {});
 };

package/es/lib/utils/highlightString.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.highlightString = exports.boldString = void 0;
 var _matchString = _interopRequireDefault(require("./matchString"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const highlightString = function (match, str) {
   let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   let simpleSplit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;

package/es/lib/utils/index.js

@@ -151,4 +151,4 @@ var _filterParsers = require("./filterParsers");
 var _parseErrorResponse = _interopRequireDefault(require("./parseErrorResponse"));
 var _modConfigEntriesQueryKey = _interopRequireDefault(require("./modConfigEntriesQueryKey"));
 var _parseModConfigEntry = _interopRequireDefault(require("./parseModConfigEntry"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/es/lib/utils/matchString.js

@@ -5,30 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const matchString = function (match, str) {
-  var _str$split2;
   let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   let simpleSplit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   // Simple regex split -- this is default behaviour
-  const regexSimple = new RegExp("".concat(match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')), 'gi');
+  const regexSimple = new RegExp(`${match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')}`, 'gi');
 
   // Split Elivis "The King" Presley into [Elvis, The King, Presley]
-  const regex = new RegExp("".concat(match.split(/(?!\B"[^"]*)\s+(?![^"]*"\B)/).filter(h => h.trim()).map(quotedSection => {
+  const regex = new RegExp(`${match.split(/(?!\B"[^"]*)\s+(?![^"]*"\B)/).filter(h => h.trim()).map(quotedSection => {
     if (quotedSection.charAt(0) === '"' && quotedSection.charAt(quotedSection.length - 1) === '"') {
       return quotedSection.slice(1, quotedSection.length - 1);
     }
     return quotedSection;
-  }).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')), 'gi');
+  }).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')}`, 'gi');
   if (ignoreNull && !match) {
     const nullRegex = /a^/gi; // Should match nothing
 
     return [[str], nullRegex];
   }
   if (simpleSplit) {
-    var _str$split;
-    return [(_str$split = str.split(regexSimple)) === null || _str$split === void 0 ? void 0 : _str$split.filter(s => s && s.trim()), regexSimple];
+    return [str.split(regexSimple)?.filter(s => s && s.trim()), regexSimple];
   }
-  return [(_str$split2 = str.split(regex)) === null || _str$split2 === void 0 ? void 0 : _str$split2.filter(s => s && s.trim()), regex];
+  return [str.split(regex)?.filter(s => s && s.trim()), regex];
 };
 var _default = exports.default = matchString;

package/es/lib/utils/parseErrorResponse.js

@@ -5,15 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const parseErrorResponse = async responseObj => {
-  var _ref;
   let errorResp = {
     message: 'something went wrong'
   };
   if (!responseObj) {
     return errorResp;
   }
-  const code = responseObj === null || responseObj === void 0 ? void 0 : responseObj.status;
-  const contentType = (_ref = [...(responseObj === null || responseObj === void 0 ? void 0 : responseObj.headers)]) === null || _ref === void 0 || (_ref = _ref.find(header => header[0] === 'content-type')) === null || _ref === void 0 ? void 0 : _ref[1];
+  const code = responseObj?.status;
+  const contentType = [...responseObj?.headers]?.find(header => header[0] === 'content-type')?.[1];
   if (contentType.includes('json')) {
     errorResp = await responseObj.json();
   } else {

package/es/lib/utils/selectorSafe.js

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const selectorSafe = string => {
-  var _string$normalize;
   // Normalise to separate diacritics from their base characters as "marks"
   // then strip out all marks.
-  return (_string$normalize = string.normalize('NFKD')) === null || _string$normalize === void 0 || (_string$normalize = _string$normalize.replace(/\p{M}/gu, '')
+  return string.normalize('NFKD')?.replace(/\p{M}/gu, '')
   // Then swap out any non-letter/number characters (Also ignore - and _) for `_`
-  ) === null || _string$normalize === void 0 ? void 0 : _string$normalize.replace(/[^\p{L}\p{N}\-_]/gu, '_');
+  ?.replace(/[^\p{L}\p{N}\-_]/gu, '_');
 };
 var _default = exports.default = selectorSafe;
 /*

package/es/lib/utils/sortByLabel.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const sortByLabel = (a, b) => {
-  var _a$label$toLowerCase, _a$label, _a$id, _b$label$toLowerCase, _b$label, _b$id;
-  const al = (_a$label$toLowerCase = (_a$label = a.label) === null || _a$label === void 0 ? void 0 : _a$label.toLowerCase()) !== null && _a$label$toLowerCase !== void 0 ? _a$label$toLowerCase : (_a$id = a.id) === null || _a$id === void 0 ? void 0 : _a$id.toLowerCase();
-  const bl = (_b$label$toLowerCase = (_b$label = b.label) === null || _b$label === void 0 ? void 0 : _b$label.toLowerCase()) !== null && _b$label$toLowerCase !== void 0 ? _b$label$toLowerCase : (_b$id = b.id) === null || _b$id === void 0 ? void 0 : _b$id.toLowerCase();
+  const al = a.label?.toLowerCase() ?? a.id?.toLowerCase();
+  const bl = b.label?.toLowerCase() ?? b.id?.toLowerCase();
   if (al < bl) {
     return -1;
   }

package/es/lib/validators/validators.js

@@ -7,7 +7,7 @@ exports.requiredObject = exports.required = exports.rangeUnderflow = exports.ran
 var _reactIntl = require("react-intl");
 var _FormattedKintMessage = _interopRequireDefault(require("../FormattedKintMessage"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const required = value => {
   const blankString = /^\s+$/;
   if (value && !blankString.test(value) || value === false || value === 0) {
@@ -64,7 +64,7 @@ const invalidNumber = function (value, _min, _max, intlKey, intlNS) {
       id: "errors.invalidNumber",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.invalidNumberError
+      overrideValue: labelOverrides?.invalidNumberError
     });
   }
   return undefined;
@@ -77,7 +77,7 @@ const rangeOverflow = function (value, min, max, intlKey, intlNS) {
       id: "errors.decimalValueNotInRange",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.decimalValueNotInRangeError,
+      overrideValue: labelOverrides?.decimalValueNotInRangeError,
       values: {
         min,
         max
@@ -94,7 +94,7 @@ const rangeUnderflow = function (value, min, max, intlKey, intlNS) {
       id: "errors.decimalValueNotInRange",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.decimalValueNotInRangeError,
+      overrideValue: labelOverrides?.decimalValueNotInRangeError,
       values: {
         min,
         max

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "5.6.1",
+  "version": "5.7.1",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint src --resolve-plugins-relative-to ./node_modules/@folio/eslint-config-stripes/",
     "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",
@@ -29,7 +29,6 @@
   "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",
@@ -58,7 +57,6 @@
     "classnames": ">=2.2.6",
     "core-js": "^3.6.1",
     "eslint": "^8.0.0",
-    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^28.0.0",
     "graphql": "^16.0.0",
     "identity-obj-proxy": "^3.0.0",

package/src/lib/SASQLookupComponent/TableBody/TableBody.js

@@ -22,7 +22,7 @@ const TableBody = ({
   mclProps: {
     formatter = {},
     ...mclProps
-  },
+  } = {},
   onSort,
   path,
   resultColumns,

package/src/lib/Typedown/Typedown.js

@@ -28,6 +28,7 @@ const Typedown = ({
   renderFooter = null,
   renderListItem = null,
   required,
+  selectedStyles, // A way to pass any styles that need to be applied globally on selection
   uniqueIdentificationPath = 'id'
 }) => {
   const selectedUniqueId = get(input.value, uniqueIdentificationPath);
@@ -86,12 +87,12 @@ const Typedown = ({
     }
   } = useTypedown(input.name);
 
-  const renderItem = useCallback((option) => (
+  const renderItem = useCallback((option, optionIsSelected = false) => (
     <div
       className={css.listItem}
     >
       {renderListItem ?
-        renderListItem(option, currentlyTyped, exactMatch) :
+        renderListItem(option, currentlyTyped, exactMatch, optionIsSelected) :
         get(option, uniqueIdentificationPath)
       }
     </div>
@@ -119,12 +120,15 @@ const Typedown = ({
         >
           {displayData?.length ? displayData?.map((d, index) => {
             const isSelectedEval = isSelected ? isSelected(input.value, d) : get(input.value, uniqueIdentificationPath) === get(d, uniqueIdentificationPath);
+
+            const selectedCSS = selectedStyles ?? css.selectedMenuButton;
             return (
               <button
                 key={`typedown-button-[${index}]`}
                 className={classnames(
                   css.fullWidth,
-                  css.menuButton
+                  css.menuButton,
+                  { [`${selectedCSS}`]: isSelectedEval },
                 )}
                 data-selected={isSelectedEval}
                 id={`typedown-button-[${index}]`}
@@ -135,7 +139,7 @@ const Typedown = ({
                 onKeyDown={listKeyDownHandler}
                 type="button"
               >
-                {renderItem(d)}
+                {renderItem(d, isSelectedEval)}
               </button>
             );
           }) :
@@ -161,13 +165,15 @@ const Typedown = ({
     footerRef,
     handleChange,
     handleNextFocus,
-    input,
+    input.name,
+    input.value,
     isSelected,
     listKeyDownHandler,
     listRef,
     renderFooter,
     renderItem,
     searchWidth,
+    selectedStyles,
     uniqueIdentificationPath
   ]);
 
@@ -270,6 +276,7 @@ Typedown.propTypes = {
   renderFooter: PropTypes.func,
   renderListItem: PropTypes.func,
   required: PropTypes.bool,
+  selectedStyles: PropTypes.string,
   uniqueIdentificationPath: PropTypes.string
 };
 

package/styles/TypeDown.css

@@ -33,7 +33,12 @@
   text-align: left;
 }
 
-.menuButton[data-selected=true], .selected {
+/* .menuButton[data-selected=true], .selected {
+  background-color: var(--primary);
+  color: #fff;
+} */
+
+.selectedMenuButton {
   background-color: var(--primary);
   color: #fff;
 }