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

package/es/lib/SASQLookupComponent/TableBody/TableBody.js

@@ -0,0 +1,146 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactRouterDom = require("react-router-dom");
+
+var _components = require("@folio/stripes/components");
+
+var _NoResultsMessage = _interopRequireDefault(require("../../NoResultsMessage"));
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+
+var TableBody = function TableBody(_ref) {
+  var _query$sort;
+
+  var data = _ref.data,
+      error = _ref.error,
+      fetchNextPage = _ref.fetchNextPage,
+      filterPaneVisible = _ref.filterPaneVisible,
+      isError = _ref.isError,
+      isLoading = _ref.isLoading,
+      match = _ref.match,
+      mclProps = _ref.mclProps,
+      onSort = _ref.onSort,
+      path = _ref.path,
+      resultColumns = _ref.resultColumns,
+      toggleFilterPane = _ref.toggleFilterPane,
+      query = _ref.query;
+  var sortOrder = (_query$sort = query.sort) !== null && _query$sort !== void 0 ? _query$sort : '';
+  var history = (0, _reactRouterDom.useHistory)();
+  var location = (0, _reactRouterDom.useLocation)();
+
+  var onNeedMoreData = function onNeedMoreData(_askAmount, index) {
+    fetchNextPage({
+      pageParam: index
+    });
+  }; // Build the map of column definitions
+
+
+  var columnMapping = Object.fromEntries(resultColumns.map(function (e) {
+    return [e.propertyPath, e.label];
+  })); // Build the list of visible columns
+
+  var visibleColumns = resultColumns.map(function (e) {
+    return e.propertyPath;
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, _objectSpread({
+    autosize: true,
+    columnMapping: columnMapping,
+    contentData: data === null || data === void 0 ? void 0 : data.results,
+    hasMargin: true,
+    isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(_NoResultsMessage.default, {
+      error: error,
+      isError: isError,
+      isLoading: isLoading,
+      filterPaneIsVisible: filterPaneVisible,
+      searchTerm: query.query,
+      toggleFilterPane: toggleFilterPane
+    }),
+    isSelected: function isSelected(_ref2) {
+      var _match$params;
+
+      var item = _ref2.item;
+      return item.id === (match === null || match === void 0 ? void 0 : (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.id);
+    },
+    onHeaderClick: onSort,
+    onNeedMoreData: onNeedMoreData,
+    onRowClick: function onRowClick(_e, rowData) {
+      history.push("".concat(path, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id).concat(location === null || location === void 0 ? void 0 : location.search));
+    },
+    pagingType: "click",
+    sortDirection: sortOrder.startsWith('-') ? 'descending' : 'ascending',
+    sortOrder: sortOrder.replace(/^-/, '').replace(/,.*/, ''),
+    totalCount: data.totalRecords,
+    visibleColumns: visibleColumns
+  }, mclProps));
+};
+
+__signature__(TableBody, "useHistory{history}\nuseLocation{location}", function () {
+  return [_reactRouterDom.useHistory, _reactRouterDom.useLocation];
+});
+
+TableBody.propTypes = {
+  data: _propTypes.default.shape({
+    totalRecords: _propTypes.default.number,
+    results: _propTypes.default.arrayOf(_propTypes.default.object)
+  }),
+  error: _propTypes.default.object,
+  fetchNextPage: _propTypes.default.func,
+  filterPaneVisible: _propTypes.default.bool,
+  history: _propTypes.default.object,
+  isError: _propTypes.default.bool,
+  isLoading: _propTypes.default.bool,
+  location: _propTypes.default.object,
+  match: _propTypes.default.object,
+  mclProps: _propTypes.default.object,
+  onSort: _propTypes.default.func,
+  path: _propTypes.default.string.isRequired,
+  query: _propTypes.default.object,
+  resultColumns: _propTypes.default.arrayOf(_propTypes.default.object),
+  toggleFilterPane: _propTypes.default.func
+};
+var _default = TableBody;
+var _default2 = _default;
+exports.default = _default2;
+;
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(TableBody, "TableBody", "/home/ethan/FolioModules/stripes-kint-components/src/lib/SASQLookupComponent/TableBody/TableBody.js");
+  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/SASQLookupComponent/TableBody/TableBody.js");
+})();
+
+;
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/es/lib/SASQLookupComponent/TableBody/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _TableBody.default;
+  }
+});
+
+var _TableBody = _interopRequireDefault(require("./TableBody"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};

package/es/lib/SASQLookupComponent/index.js

@@ -3,15 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, "SASQLookupComponent", {
   enumerable: true,
   get: function get() {
     return _SASQLookupComponent.default;
   }
 });
+Object.defineProperty(exports, "TableBody", {
+  enumerable: true,
+  get: function get() {
+    return _TableBody.default;
+  }
+});
 
 var _SASQLookupComponent = _interopRequireDefault(require("./SASQLookupComponent"));
 
+var _TableBody = _interopRequireDefault(require("./TableBody"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {

package/es/lib/SASQRoute/SASQRoute.js

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactRouterDom = require("react-router-dom");
 
-var _SASQLookupComponent = _interopRequireDefault(require("../SASQLookupComponent"));
+var _SASQLookupComponent = require("../SASQLookupComponent");
 
 var _SASQViewComponent = _interopRequireDefault(require("../SASQViewComponent"));
 
@@ -60,7 +60,7 @@ var SASQRoute = function SASQRoute(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
     path: "".concat(path, "/:id?"),
     render: function render(routeProps) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQLookupComponent.default, _objectSpread(_objectSpread(_objectSpread({}, routeProps), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQLookupComponent.SASQLookupComponent, _objectSpread(_objectSpread(_objectSpread({}, routeProps), {}, {
         fetchParameters: fetchParameters,
         path: path
       }, props), {}, {

package/es/lib/utils/highlightString.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.highlightString = exports.boldString = void 0;
+
+var _matchString5 = _interopRequireDefault(require("./matchString"));
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+
+var highlightString = function highlightString(match, str) {
+  var ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
+  var _matchString = (0, _matchString5.default)(match, str, ignoreNull),
+      _matchString2 = _slicedToArray(_matchString, 2),
+      parts = _matchString2[0],
+      regex = _matchString2[1];
+
+  return parts.filter(function (part) {
+    return part;
+  }).map(function (part, i) {
+    return regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("mark", {
+      children: part
+    }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: part
+    }, i);
+  });
+};
+
+exports.highlightString = highlightString;
+
+var boldString = function boldString(match, str) {
+  var ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
+  var _matchString3 = (0, _matchString5.default)(match, str, ignoreNull),
+      _matchString4 = _slicedToArray(_matchString3, 2),
+      parts = _matchString4[0],
+      regex = _matchString4[1];
+
+  return parts.filter(function (part) {
+    return part;
+  }).map(function (part, i) {
+    return regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+      children: part
+    }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: part
+    }, i);
+  });
+};
+
+exports.boldString = boldString;
+;
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(highlightString, "highlightString", "/home/ethan/FolioModules/stripes-kint-components/src/lib/utils/highlightString.js");
+  reactHotLoader.register(boldString, "boldString", "/home/ethan/FolioModules/stripes-kint-components/src/lib/utils/highlightString.js");
+})();
+
+;
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/es/lib/utils/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "boldString", {
+  enumerable: true,
+  get: function get() {
+    return _highlightString.boldString;
+  }
+});
 Object.defineProperty(exports, "buildUrl", {
   enumerable: true,
   get: function get() {
@@ -27,6 +33,18 @@ Object.defineProperty(exports, "groupCustomPropertiesByCtx", {
     return _groupCustomPropertiesByCtx.default;
   }
 });
+Object.defineProperty(exports, "highlightString", {
+  enumerable: true,
+  get: function get() {
+    return _highlightString.highlightString;
+  }
+});
+Object.defineProperty(exports, "matchString", {
+  enumerable: true,
+  get: function get() {
+    return _matchString.default;
+  }
+});
 Object.defineProperty(exports, "refdataOptions", {
   enumerable: true,
   get: function get() {
@@ -92,8 +110,12 @@ var _sortByLabel = _interopRequireDefault(require("./sortByLabel"));
 
 var _toCamelCase = _interopRequireDefault(require("./toCamelCase"));
 
+var _matchString = _interopRequireDefault(require("./matchString"));
+
+var _highlightString = require("./highlightString");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
-}; // I hate that this exists
+};

package/es/lib/utils/matchString.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+
+var matchString = function matchString(match, str) {
+  var ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var regex = new RegExp("".concat(match.split(/(\s+)/).filter(function (h) {
+    return h.trim();
+  }).map(function (hl) {
+    return '(' + (0, _escapeRegExp.default)(hl) + ')';
+  }).join('|')), 'gi');
+
+  if (ignoreNull && !match) {
+    var nullRegex = /a^/gi; // Should match nothing
+
+    return [[str], nullRegex];
+  }
+
+  return [str.split(regex), regex];
+};
+
+var _default = matchString;
+var _default2 = _default;
+exports.default = _default2;
+;
+
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+  if (!reactHotLoader) {
+    return;
+  }
+
+  reactHotLoader.register(matchString, "matchString", "/home/ethan/FolioModules/stripes-kint-components/src/lib/utils/matchString.js");
+  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/utils/matchString.js");
+})();
+
+;
+
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/package.json

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

package/src/index.js

@@ -18,9 +18,12 @@ export {
 
 // Useful utility functions
 export {
+  boldString,
   generateKiwtQuery,
   generateKiwtQueryParams,
   groupCustomPropertiesByCtx,
+  highlightString,
+  matchString,
   refdataOptions,
   refdataQueryKey,
   selectorSafe,
@@ -59,6 +62,7 @@ export {
   default as QueryTypedown
 } from './lib/QueryTypedown';
 
+/* SASQ Stuff */
 // SearchField
 export {
   default as SearchField
@@ -71,7 +75,8 @@ export {
 
 // SASQLookupComponent
 export {
-  default as SASQLookupComponent
+  SASQLookupComponent,
+  TableBody as SASQTableBody
 } from './lib/SASQLookupComponent';
 
 // SASQViewComponent

package/src/lib/ActionList/ActionListFieldArray.js

@@ -61,7 +61,7 @@ const ActionListFieldArray = ({
     const { actionListActions: _a, ...rowData } = fields.value[index];
 
     // Find "edit" entry in actionAssigner
-    const editCallback = actionAssigner.find(act => act.name === 'edit')?.callback;
+    const editCallback = actionAssigner(rowData)?.find(act => act.name === 'edit')?.callback;
     if (editCallback) {
       editCallback(rowData);
     } else {
@@ -167,7 +167,6 @@ const ActionListFieldArray = ({
                 key={`action-${action.name}[${data.rowIndex}]`}
                 disabled={editing}
                 icon={action.icon}
-                marginBottom0
                 onClick={() => (actionFunction ? actionFunction() : () => null)}
                 to={action.to}
               />
@@ -229,7 +228,7 @@ const ActionListFieldArray = ({
                   name: `${fieldName}.${key}`
                 }) :
                 <Field
-                  autofocus={fieldIndex === 0}
+                  autoFocus={fieldIndex === 0}
                   component={TextField}
                   marginBottom0
                   name={`${fieldName}.${key}`}

package/src/lib/CustomProperties/Config/CustomPropertiesSettings.js

@@ -78,20 +78,23 @@ const CustomPropertiesSettings = ({
     delete: deleteCustProp
   } = useMutateCustomProperties({
     afterQueryCalls: {
-      put: () => {
+      put: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.put();
+        setCustomProperty(res);
+        afterQueryCallsSafe.put(res);
       },
-      post: () => {
+      post: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.post();
+        setCustomProperty(res);
+        afterQueryCallsSafe.post(res);
       },
-      delete: () => {
+      delete: res => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
-        afterQueryCallsSafe.delete();
+        setCustomProperty();
+        afterQueryCallsSafe.delete(res);
       }
     },
     endpoint: customPropertiesEndpoint,

package/src/lib/CustomProperties/View/CustomPropertiesViewCtx.js

@@ -69,21 +69,26 @@ const CustomPropertiesViewCtx = ({
     );
   }
 
+  const countSetProperties = (primary) => (
+    Object.entries(customProperties)?.filter(
+      ([_key, cp]) => (
+        (cp[0]?.type?.ctx === ctx || (ctx === 'isNull' && !cp[0]?.type?.ctx)) && // Either the ctx string matches, or isNull matches blank
+        cp[0]?.type?.primary === primary // Only count non-primary set custprops
+      )
+    )?.length ?? 0
+  );
+
   // We need to display any set properties, along with any non-set primary properties
   const primaryCount = custprops?.filter(cp => cp.primary === true)?.length ?? 0;
-  const optionalCount = Object.entries(customProperties)?.filter(
-    ([_key, cp]) => (
-      (cp[0]?.type?.ctx === ctx || (ctx === 'isNull' && !cp[0]?.type?.ctx)) && // Either the ctx string matches, or isNull matches blank
-      cp[0]?.type?.primary === false // Only count non-primary set custprops
-    )
-  )?.length ?? 0;
+  const optionalCount = countSetProperties(false);
+  const setPrimaryCount = countSetProperties(true);
 
   return (
     (primaryCount + optionalCount) > 0 &&
     <Accordion
       closedByDefault
-      displayWhenClosed={<Badge>{primaryCount + optionalCount}</Badge>}
-      displayWhenOpen={<Badge>{primaryCount + optionalCount}</Badge>}
+      displayWhenClosed={<Badge>{setPrimaryCount + optionalCount}</Badge>}
+      displayWhenOpen={<Badge>{setPrimaryCount + optionalCount}</Badge>}
       id={`${id}-accordion-${ctx}`}
       label={getAccordionLabel()}
     >

package/src/lib/CustomProperties/View/CustomPropertyCard.js

@@ -16,7 +16,7 @@ import * as CUSTPROP_TYPES from '../../constants/customProperties';
 const CustomPropertyCard = ({
   ctx,
   customProperty,
-  customPropertyDefinition,
+  customPropertyDefinition = {},
   index,
   labelOverrides
 }) => {
@@ -35,7 +35,7 @@ const CustomPropertyCard = ({
     // Label override for default card title,
     if (labelOverrides.retiredName && typeof labelOverrides.retiredName === 'function') {
       return (
-        labelOverrides.retiredName(customPropertyDefinition)
+        labelOverrides.retiredName(customPropertyDefinition.name)
       );
     }
 

package/src/lib/FormModal/FormModal.js

@@ -31,6 +31,7 @@ const FormModal = ({
             <ModalFooter>
               <Button
                 buttonStyle="primary"
+                marginBottom0
                 onClick={handleSubmit}
               >
                 {
@@ -39,6 +40,7 @@ const FormModal = ({
                 }
               </Button>
               <Button
+                marginBottom0
                 onClick={handleClose}
               >
                 {