@k-int/stripes-kint-components 5.32.0 → 5.33.1

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

@@ -10,43 +10,34 @@ var _reactRouterDom = require("react-router-dom");
 var _components = require("@folio/stripes/components");
 var _NoResultsMessage = _interopRequireDefault(require("../../NoResultsMessage"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["formatter"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const TableBody = _ref => {
-  var _query$sort, _match$params2;
   let {
-      data,
-      error,
-      fetchNextPage,
-      filterPaneVisible,
-      intlKey: passedIntlKey,
-      intlNS: passedIntlNS,
-      isError,
-      isLoading,
-      labelOverrides = {},
-      match,
-      mclProps: {
-        formatter = {}
-      } = {},
-      noResultsProps = {},
-      onSort,
-      path,
-      resultColumns,
-      rowNavigation = true,
-      // Default navigation onRowClick
-      getNavigationIdentifier = row => row === null || row === void 0 ? void 0 : row.id,
-      toggleFilterPane,
-      query
-    } = _ref,
-    mclProps = _objectWithoutProperties(_ref.mclProps, _excluded);
-  const sortOrder = (_query$sort = query.sort) !== null && _query$sort !== void 0 ? _query$sort : '';
+    data,
+    error,
+    fetchNextPage,
+    filterPaneVisible,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    isError,
+    isLoading,
+    labelOverrides = {},
+    match,
+    mclProps: {
+      formatter = {},
+      ...mclProps
+    } = {},
+    noResultsProps = {},
+    onSort,
+    path,
+    resultColumns,
+    rowNavigation = true,
+    // Default navigation onRowClick
+    getNavigationIdentifier = row => row?.id,
+    toggleFilterPane,
+    query
+  } = _ref;
+  const sortOrder = query.sort ?? '';
   const history = (0, _reactRouterDom.useHistory)();
   const location = (0, _reactRouterDom.useLocation)();
   const onNeedMoreData = (_askAmount, index) => {
@@ -61,10 +52,9 @@ const TableBody = _ref => {
   // Build the list of visible columns
   const visibleColumns = resultColumns.map(e => e.propertyPath);
   const getRowUrl = (0, _react.useCallback)(rowData => {
-    var _location$search;
-    const baseUrl = "".concat(path, "/").concat(getNavigationIdentifier(rowData));
+    const baseUrl = `${path}/${getNavigationIdentifier(rowData)}`;
     return {
-      url: "".concat(baseUrl).concat((_location$search = location === null || location === void 0 ? void 0 : location.search) !== null && _location$search !== void 0 ? _location$search : ''),
+      url: `${baseUrl}${location?.search ?? ''}`,
       path,
       baseUrl,
       location
@@ -74,9 +64,10 @@ const TableBody = _ref => {
     const enhancedFormatter = {};
     for (const [key, value] of Object.entries(formatter)) {
       if (typeof value === 'function') {
-        enhancedFormatter[key] = item => value(_objectSpread(_objectSpread({}, item), {}, {
+        enhancedFormatter[key] = item => value({
+          ...item,
           defaultRowUrl: getRowUrl(item)
-        }));
+        });
       } else {
         enhancedFormatter[key] = value;
       }
@@ -92,25 +83,21 @@ const TableBody = _ref => {
     return null;
   }, [getRowUrl, history, rowNavigation]);
   const isSelected = (0, _react.useCallback)(_ref2 => {
-    var _match$params;
     let {
       item
     } = _ref2;
-    return getNavigationIdentifier(item) === (match === null || match === void 0 || (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.id);
-  }, [getNavigationIdentifier, match === null || match === void 0 || (_match$params2 = match.params) === null || _match$params2 === void 0 ? void 0 : _match$params2.id]);
-  const NoResultsComponent = (0, _react.useMemo)(() => {
-    var _noResultsProps$compo;
-    return (_noResultsProps$compo = noResultsProps === null || noResultsProps === void 0 ? void 0 : noResultsProps.component) !== null && _noResultsProps$compo !== void 0 ? _noResultsProps$compo : _NoResultsMessage.default;
-  }, [noResultsProps === null || noResultsProps === void 0 ? void 0 : noResultsProps.component]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, _objectSpread({
+    return getNavigationIdentifier(item) === match?.params?.id;
+  }, [getNavigationIdentifier, match?.params?.id]);
+  const NoResultsComponent = (0, _react.useMemo)(() => noResultsProps?.component ?? _NoResultsMessage.default, [noResultsProps?.component]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, {
     autosize: true,
     columnMapping: columnMapping,
-    contentData: data === null || data === void 0 ? void 0 : data.results,
+    contentData: data?.results,
     formatter: getEnhancedFormatter() // Pass enhanced formatter
     ,
     hasMargin: true,
     interactive: rowNavigation,
-    isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(NoResultsComponent, _objectSpread({}, _objectSpread({
+    isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(NoResultsComponent, {
       error,
       filterPaneIsVisible: filterPaneVisible,
       intlKey: passedIntlKey,
@@ -119,8 +106,9 @@ const TableBody = _ref => {
       isLoading,
       labelOverrides,
       searchTerm: query.query,
-      toggleFilterPane
-    }, noResultsProps))),
+      toggleFilterPane,
+      ...noResultsProps // Anything passed in directly takes precedence
+    }),
     isSelected: isSelected,
     onHeaderClick: onSort,
     onNeedMoreData: onNeedMoreData,
@@ -129,8 +117,9 @@ const TableBody = _ref => {
     sortDirection: sortOrder.startsWith('-') ? 'descending' : 'ascending',
     sortOrder: sortOrder.replace(/^-/, '').replace(/,.*/, ''),
     totalCount: data.totalRecords,
-    visibleColumns: visibleColumns
-  }, mclProps));
+    visibleColumns: visibleColumns,
+    ...mclProps
+  });
 };
 TableBody.propTypes = {
   data: _propTypes.default.shape({

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

@@ -6,20 +6,16 @@ var _jest = require("../../../../test/jest");
 var _TableBody = _interopRequireDefault(require("./TableBody"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const mockHistoryPush = jest.fn();
 
 // We want to use the ACTUAL location, but to mock history push so we can inspect it
 jest.mock('react-router-dom', () => {
-  return _objectSpread(_objectSpread({}, jest.requireActual('react-router-dom')), {}, {
+  return {
+    ...jest.requireActual('react-router-dom'),
     useHistory: () => ({
       push: mockHistoryPush
     })
-  });
+  };
 });
 const mockFetchNextPage = jest.fn();
 const mockToggleFilterPane = jest.fn();
@@ -28,10 +24,7 @@ const nameFormatterMock = jest.fn(item => item.name);
 const defaultMCLProps = {
   formatter: {
     name: item => item.name || '',
-    status: item => {
-      var _item$status;
-      return ((_item$status = item.status) === null || _item$status === void 0 ? void 0 : _item$status.label) || '';
-    },
+    status: item => item.status?.label || '',
     description: item => item.description || ''
   },
   columnWidths: {
@@ -110,11 +103,13 @@ describe('TableBody', () => {
   }, {
     label: 'enhanced formatter check',
     initialEntries: ['/test/items'],
-    mclProps: _objectSpread(_objectSpread({}, defaultMCLProps), {}, {
-      formatter: _objectSpread(_objectSpread({}, defaultMCLProps.formatter), {}, {
+    mclProps: {
+      ...defaultMCLProps,
+      formatter: {
+        ...defaultMCLProps.formatter,
         name: nameFormatterMock
-      })
-    }),
+      }
+    },
     checkEnhancedFormatter: true
   }])('Testing $label', _ref => {
     let {
@@ -132,7 +127,8 @@ describe('TableBody', () => {
         initialEntries: initialEntries,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
           path: "/test/items/:id?",
-          render: routeProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TableBody.default, _objectSpread(_objectSpread({}, routeProps), {}, {
+          render: routeProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TableBody.default, {
+            ...routeProps,
             data: mockData,
             fetchNextPage: mockFetchNextPage,
             filterPaneVisible: false,
@@ -146,7 +142,7 @@ describe('TableBody', () => {
             resultColumns: resultColumns,
             rowNavigation: true,
             toggleFilterPane: mockToggleFilterPane
-          }))
+          })
         })
       }));
     });
@@ -161,21 +157,21 @@ describe('TableBody', () => {
       }).exists();
     });
     if (expectedSortOrder) {
-      test("renders ".concat(expectedSortOrder, " header with ").concat(expectedSortDirection, " sort"), async () => {
+      test(`renders ${expectedSortOrder} header with ${expectedSortDirection} sort`, async () => {
         await (0, _stripesErmTesting.MultiColumnListHeader)(expectedSortOrder).has({
           sort: expectedSortDirection
         });
       });
     }
     if (selectedRowIndex !== undefined) {
-      test("row ".concat(selectedRowIndex, " is selected"), async () => {
+      test(`row ${selectedRowIndex} is selected`, async () => {
         await (0, _stripesErmTesting.MultiColumnListRow)({
           index: selectedRowIndex
         }).has({
           selected: ['mclSelected']
         });
       });
-      test("row ".concat(selectedRowIndex - 1, " is not selected"), async () => {
+      test(`row ${selectedRowIndex - 1} is not selected`, async () => {
         await (0, _stripesErmTesting.MultiColumnListRow)({
           index: selectedRowIndex - 1
         }).has({
@@ -202,7 +198,7 @@ describe('TableBody', () => {
             hasLabel
           } = _ref2;
           const expectedValue = hasLabel ? mockData.results[index][property].label : mockData.results[index][property];
-          test("renders expected ".concat(property, " content: ").concat(expectedValue), async () => {
+          test(`renders expected ${property} content: ${expectedValue}`, async () => {
             await (0, _stripesErmTesting.MultiColumnListCell)({
               row: index,
               columnIndex: col
@@ -249,8 +245,8 @@ describe('TableBody', () => {
           columnIndex: 0
         }).click();
       });
-      test("useHistory called with expected path to ".concat(expectedId), () => {
-        expect(mockHistoryPush).toHaveBeenCalledWith("/test/items/".concat(expectedId).concat(expectedPushQuery));
+      test(`useHistory called with expected path to ${expectedId}`, () => {
+        expect(mockHistoryPush).toHaveBeenCalledWith(`/test/items/${expectedId}${expectedPushQuery}`);
       });
     });
   });

package/es/lib/SASQRoute/SASQRoute.js

@@ -10,33 +10,28 @@ var _reactRouterDom = require("react-router-dom");
 var _SASQLookupComponent = require("../SASQLookupComponent");
 var _SASQViewComponent = _interopRequireDefault(require("../SASQViewComponent"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["children", "fetchParameters", "getPathLookup", "getPathView", "SASQLookupComponent", "path", "SASQViewComponent"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const SASQRoute = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
-      children,
-      fetchParameters,
-      getPathLookup = path => "".concat(path, "/:id?"),
-      getPathView = path => "".concat(path, "/:id"),
-      SASQLookupComponent: RouteLookupComponent = _SASQLookupComponent.SASQLookupComponent,
-      path,
-      SASQViewComponent: RouteViewComponent = _SASQViewComponent.default
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+    children,
+    fetchParameters,
+    getPathLookup = path => `${path}/:id?`,
+    getPathView = path => `${path}/:id`,
+    SASQLookupComponent: RouteLookupComponent = _SASQLookupComponent.SASQLookupComponent,
+    path,
+    SASQViewComponent: RouteViewComponent = _SASQViewComponent.default,
+    ...props
+  } = _ref;
   // Grab the SASQ_MAP and tweak it
   const {
     SASQ_MAP = {}
   } = fetchParameters;
   const lookupRef = (0, _react.useRef)();
   const viewRef = (0, _react.useRef)();
-  (0, _react.useImperativeHandle)(ref, () => _objectSpread(_objectSpread({}, lookupRef.current), viewRef.current));
+  (0, _react.useImperativeHandle)(ref, () => ({
+    ...lookupRef.current,
+    ...viewRef.current
+  }));
   if (!SASQ_MAP.perPage) {
     SASQ_MAP.perPage = 25;
   }
@@ -47,25 +42,26 @@ const SASQRoute = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
     path: getPathLookup(path),
     render: routeProps => {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(RouteLookupComponent, _objectSpread(_objectSpread(_objectSpread({
-        ref: lookupRef
-      }, routeProps), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(RouteLookupComponent, {
+        ref: lookupRef,
+        ...routeProps,
         fetchParameters: fetchParameters,
-        path: path
-      }, props), {}, {
+        path: path,
+        ...props,
         children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Switch, {
           children: [children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
             path: getPathView(path),
-            render: innerProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(RouteViewComponent, _objectSpread(_objectSpread({
-              ref: viewRef
-            }, innerProps), {}, {
+            render: innerProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(RouteViewComponent, {
+              ref: viewRef,
+              ...innerProps,
               fetchParameters: fetchParameters,
               path: path,
-              ViewComponent: props.ViewComponent
-            }, props))
+              ViewComponent: props.ViewComponent,
+              ...props
+            })
           })]
         })
-      }));
+      });
     }
   });
 });

package/es/lib/SASQRoute/SASQRoute.test.js

@@ -11,11 +11,8 @@ var _SASQLookupComponent = require("../SASQLookupComponent");
 var _SASQViewComponent = require("../SASQViewComponent");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // We can import these special render-mocks once we manually mock the modules
+// We can import these special render-mocks once we manually mock the modules
+
 // Using Manual mocks
 jest.mock('../SASQLookupComponent');
 jest.mock('../SASQViewComponent');
@@ -182,12 +179,13 @@ describe('SASQRoute', () => {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
             path: "/hello",
             children: "Hello world"
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQRoute.default, _objectSpread({
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQRoute.default, {
             ref: theRef
             // Allow for testing of fetch parameters
             ,
-            testFetchParametersOnClick: testFetchParametersOnClick
-          }, props))]
+            testFetchParametersOnClick: testFetchParametersOnClick,
+            ...props
+          })]
         })]
       }));
     });
@@ -206,7 +204,7 @@ describe('SASQRoute', () => {
     test('ref is unset', () => {
       expect(theRef.current).toEqual(null);
     });
-    describe("navigating to ".concat(expectedPath), () => {
+    describe(`navigating to ${expectedPath}`, () => {
       beforeEach(async () => {
         await (0, _react2.waitFor)(async () => {
           await (0, _stripesErmTesting.Button)('SASQRouteButton').click();
@@ -218,13 +216,13 @@ describe('SASQRoute', () => {
         } = renderComponent;
         expect(queryByText('Hello world')).not.toBeInTheDocument();
       });
-      test("renders SASQRoute lookup component on ".concat(expectedPath), () => {
+      test(`renders SASQRoute lookup component on ${expectedPath}`, () => {
         const {
           getByText
         } = renderComponent;
         expect(getByText(lookupComponentText)).toBeInTheDocument();
       });
-      test("does not render SASQRoute view component on ".concat(expectedPath), () => {
+      test(`does not render SASQRoute view component on ${expectedPath}`, () => {
         const {
           queryByText
         } = renderComponent;
@@ -245,13 +243,13 @@ describe('SASQRoute', () => {
           expect(testFetchParametersOnClick).toHaveBeenCalledWith(expectedFetchParameters);
         });
       });
-      describe("navigating to ".concat(expectedViewPath), () => {
+      describe(`navigating to ${expectedViewPath}`, () => {
         beforeEach(async () => {
           await (0, _react2.waitFor)(async () => {
             await (0, _stripesErmTesting.Button)('SASQViewButton').click();
           });
         });
-        test("renders SASQRoute view component on ".concat(expectedViewPath), () => {
+        test(`renders SASQRoute view component on ${expectedViewPath}`, () => {
           const {
             getByText
           } = renderComponent;

package/es/lib/SASQViewComponent/SASQViewComponent.js

@@ -9,94 +9,86 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["fetchParameters", "history", "id", "location", "match", "path", "viewQueryPromise", "viewResponseTransform", "ViewComponent", "viewQueryNamespaceGenerator"],
-  _excluded2 = ["data"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const SASQViewComponent = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
-  var _fetchParameters$item, _match$params, _match$params3;
   let {
-      fetchParameters,
-      history,
-      id,
-      location,
-      match,
-      path,
-      viewQueryPromise = _ref2 => {
-        let {
-          endpoint,
-          ky,
-          resourceId
-        } = _ref2;
-        return ky.get("".concat(endpoint, "/").concat(resourceId)).json();
-      },
-      viewResponseTransform = response => response,
-      ViewComponent,
-      viewQueryNamespaceGenerator = _ref3 => {
-        let {
-          namespace,
-          componentId,
-          id: passedId
-        } = _ref3;
-        const queryNamespace = [namespace, 'SASQ'];
-        if (componentId) {
-          queryNamespace.push(componentId);
-        }
-        queryNamespace.push('view');
-        queryNamespace.push(passedId);
-        return queryNamespace;
+    fetchParameters,
+    history,
+    id,
+    location,
+    match,
+    path,
+    viewQueryPromise = _ref2 => {
+      let {
+        endpoint,
+        ky,
+        resourceId
+      } = _ref2;
+      return ky.get(`${endpoint}/${resourceId}`).json();
+    },
+    viewResponseTransform = response => response,
+    ViewComponent,
+    viewQueryNamespaceGenerator = _ref3 => {
+      let {
+        namespace,
+        componentId,
+        id: passedId
+      } = _ref3;
+      const queryNamespace = [namespace, 'SASQ'];
+      if (componentId) {
+        queryNamespace.push(componentId);
       }
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+      queryNamespace.push('view');
+      queryNamespace.push(passedId);
+      return queryNamespace;
+    },
+    ...props
+  } = _ref;
   const {
     0: namespace
   } = (0, _core.useNamespace)();
 
   // If itemEndpoint is available, use that, otherwise use standard endpoint
-  const endpoint = (_fetchParameters$item = fetchParameters === null || fetchParameters === void 0 ? void 0 : fetchParameters.itemEndpoint) !== null && _fetchParameters$item !== void 0 ? _fetchParameters$item : fetchParameters === null || fetchParameters === void 0 ? void 0 : fetchParameters.endpoint;
+  const endpoint = fetchParameters?.itemEndpoint ?? fetchParameters?.endpoint;
   const ky = (0, _core.useOkapiKy)();
-  const _useQuery = (0, _reactQuery.useQuery)(viewQueryNamespaceGenerator({
-      componentId: id,
-      namespace,
-      endpoint,
-      id: match === null || match === void 0 || (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.id,
-      match
-    }), () => {
-      var _match$params2;
-      return viewQueryPromise({
-        ky,
-        resourceId: match === null || match === void 0 || (_match$params2 = match.params) === null || _match$params2 === void 0 ? void 0 : _match$params2.id,
-        endpoint
-      });
-    }, {
-      enabled: !!(match !== null && match !== void 0 && (_match$params3 = match.params) !== null && _match$params3 !== void 0 && _match$params3.id),
-      // select is a parameter supported by useQuery to transform the response
-      // Could be possible to instead pass this down along with the queryOptions
-      // Additionally this is assuming the viewResponseTransform is a func as opposed to an object
-      select: selectData => {
-        return viewResponseTransform(selectData);
-      }
-    }),
-    {
-      data = {}
-    } = _useQuery,
-    rest = _objectWithoutProperties(_useQuery, _excluded2);
+  const {
+    data = {},
+    ...rest
+  } = (0, _reactQuery.useQuery)(viewQueryNamespaceGenerator({
+    componentId: id,
+    namespace,
+    endpoint,
+    id: match?.params?.id,
+    match
+  }), () => {
+    return viewQueryPromise({
+      ky,
+      resourceId: match?.params?.id,
+      endpoint
+    });
+  }, {
+    enabled: !!match?.params?.id,
+    // select is a parameter supported by useQuery to transform the response
+    // Could be possible to instead pass this down along with the queryOptions
+    // Additionally this is assuming the viewResponseTransform is a func as opposed to an object
+    select: selectData => {
+      return viewResponseTransform(selectData);
+    }
+  });
   (0, _react.useImperativeHandle)(ref, () => ({
-    queryProps: _objectSpread({
-      data
-    }, rest)
+    queryProps: {
+      data,
+      ...rest
+    }
   }));
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(ViewComponent, _objectSpread({
-    onClose: () => history.push("".concat(path).concat(location.search)),
-    queryProps: _objectSpread({}, rest),
-    resource: data
-  }, props));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(ViewComponent, {
+    onClose: () => history.push(`${path}${location.search}`),
+    queryProps: {
+      ...rest
+    },
+    resource: data,
+    ...props
+  });
 });
 SASQViewComponent.propTypes = {
   fetchParameters: _propTypes.default.object,

package/es/lib/SASQViewComponent/SASQViewComponent.test.js

@@ -12,11 +12,6 @@ var _jest = require("../../../test/jest");
 var _SASQViewComponent = _interopRequireDefault(require("./SASQViewComponent"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const ViewComponentRender = exports.ViewComponentRender = jest.fn();
 const MockViewComponent = jest.fn(props => {
   ViewComponentRender(props);
@@ -57,7 +52,8 @@ describe('SASQViewComponent', () => {
         initialEntries: [startingLocation],
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
           path: "/testPath/:id",
-          render: routeProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQViewComponent.default, _objectSpread(_objectSpread({}, routeProps), {}, {
+          render: routeProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQViewComponent.default, {
+            ...routeProps,
             ref: theRef,
             fetchParameters: {
               endpoint: '/test',
@@ -69,7 +65,7 @@ describe('SASQViewComponent', () => {
             id: "sasq-test",
             path: "/testPath",
             ViewComponent: MockViewComponent
-          }))
+          })
         })
       }));
     });
@@ -90,7 +86,7 @@ describe('SASQViewComponent', () => {
       await (0, _react2.waitFor)(async () => {
         await (0, _stripesErmTesting.Button)('Close').click();
       });
-      expect(historyPush).toHaveBeenCalledWith("".concat(expectedPath).concat(expectedSearch));
+      expect(historyPush).toHaveBeenCalledWith(`${expectedPath}${expectedSearch}`);
     });
     test('ref exposes onClose function', async () => {
       await (0, _react2.waitFor)(() => {