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

package/es/lib/SASQLookupComponent/SASQLookupComponent.js

@@ -16,19 +16,8 @@ var _hooks = require("../hooks");
 var _TableBody = _interopRequireDefault(require("./TableBody"));
 var _SearchKeyControl = _interopRequireDefault(require("../SearchKeyControl"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["data"],
-  _excluded2 = ["filterPaneFirstMenu", "filterPaneLastMenu"],
-  _excluded3 = ["mainPaneFirstMenu", "mainPaneLastMenu"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-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; }
-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 SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  var _fetchParameters$SASQ, _fetchParameters$quer;
   const {
     children,
     fetchParameters = {},
@@ -63,7 +52,7 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
         ky,
         queryParams
       } = _ref2;
-      return ky.get("".concat(endpoint).concat(queryParams)).json();
+      return ky.get(`${endpoint}${queryParams}`).json();
     },
     lookupResponseTransform = response => response,
     // Function to transform the response from the query
@@ -92,7 +81,7 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
     queryGetter: sasqPropsQueryGetter,
     querySetter: sasqPropsQuerySetter,
     syncToLocation = true
-  } = sasqProps !== null && sasqProps !== void 0 ? sasqProps : {};
+  } = sasqProps ?? {};
 
   // We manage our internal state of pagination (URL vs MCL page state) using usePrevNextPagination.
   // Below the queryParameterGenerator can then choose to use the outputs (namely totalRecords and page) as it sees fit.
@@ -103,7 +92,7 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
   } = (0, _hooks.usePrevNextPagination)({
     count,
     // totalRecord
-    pageSize: (_fetchParameters$SASQ = fetchParameters.SASQ_MAP) === null || _fetchParameters$SASQ === void 0 ? void 0 : _fetchParameters$SASQ.perPage,
+    pageSize: fetchParameters.SASQ_MAP?.perPage,
     syncToLocation
   });
   const {
@@ -111,70 +100,72 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
     queryGetter: kintSASQQueryGetter,
     querySetter: kintSASQQuerySetter
   } = (0, _hooks.useKiwtSASQuery)();
-  const query = (0, _react.useMemo)(() => sasqPropsQuery !== null && sasqPropsQuery !== void 0 ? sasqPropsQuery : kintSASQQuery, [sasqPropsQuery, kintSASQQuery]);
-  const queryGetter = (0, _react.useMemo)(() => sasqPropsQueryGetter !== null && sasqPropsQueryGetter !== void 0 ? sasqPropsQueryGetter : kintSASQQueryGetter, [sasqPropsQueryGetter, kintSASQQueryGetter]);
-  const querySetter = (0, _react.useMemo)(() => sasqPropsQuerySetter !== null && sasqPropsQuerySetter !== void 0 ? sasqPropsQuerySetter : kintSASQQuerySetter, [sasqPropsQuerySetter, kintSASQQuerySetter]);
+  const query = (0, _react.useMemo)(() => sasqPropsQuery ?? kintSASQQuery, [sasqPropsQuery, kintSASQQuery]);
+  const queryGetter = (0, _react.useMemo)(() => sasqPropsQueryGetter ?? kintSASQQueryGetter, [sasqPropsQueryGetter, kintSASQQueryGetter]);
+  const querySetter = (0, _react.useMemo)(() => sasqPropsQuerySetter ?? kintSASQQuerySetter, [sasqPropsQuerySetter, kintSASQQuerySetter]);
   const {
     0: namespace
   } = (0, _core.useNamespace)();
   const ky = (0, _core.useOkapiKy)();
-  const filterPaneVisibileKey = "".concat(namespace, "-").concat(id, "-filterPaneVisibility");
-  const queryParams = (0, _react.useMemo)(() => queryParameterGenerator(// With Typescript this would be a type of SASQ_MAP, and so totalRecords is a valid property in our new shape
+  const filterPaneVisibileKey = `${namespace}-${id}-filterPaneVisibility`;
+  const queryParams = (0, _react.useMemo)(() => queryParameterGenerator(
+  // With Typescript this would be a type of SASQ_MAP, and so totalRecords is a valid property in our new shape
   // In generateKiwtQueryParams we can choose to ignore totalRecords, which while being a valid property is not necessary for KIWT queries
-  _objectSpread({
+  {
     page: currentPage,
-    totalRecords: count
-  }, fetchParameters.SASQ_MAP), query !== null && query !== void 0 ? query : {}), [count, currentPage, fetchParameters.SASQ_MAP, query, queryParameterGenerator]);
+    totalRecords: count,
+    ...fetchParameters.SASQ_MAP
+  }, query ?? {}), [count, currentPage, fetchParameters.SASQ_MAP, query, queryParameterGenerator]);
   const [filterPaneVisible, setFilterPaneVisible] = (0, _hooks.useLocalStorageState)(filterPaneVisibileKey, true);
   const toggleFilterPane = () => setFilterPaneVisible(!filterPaneVisible);
-  const _useQuery = (0, _reactQuery.useQuery)(lookupQueryNamespaceGenerator({
-      currentPage,
-      endpoint: fetchParameters.endpoint,
-      namespace,
-      id,
-      query,
-      queryParams
-    }), () => {
-      return lookupQueryPromise({
-        ky,
-        queryParams,
-        endpoint: fetchParameters.endpoint
-      });
-    }, _objectSpread(_objectSpread({
-      enabled: (!!(query !== null && query !== void 0 && query.filters) || !!(query !== null && query !== void 0 && query.query)) && !!currentPage
-    }, (_fetchParameters$quer = fetchParameters.queryOptions) !== null && _fetchParameters$quer !== void 0 ? _fetchParameters$quer : {}), {}, {
-      // 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 lookupResponseTransform is a func as opposed to an object
-      select: selectData => {
-        return lookupResponseTransform(selectData);
-      }
-    })),
-    {
-      data = {}
-    } = _useQuery,
-    restOfQueryProps = _objectWithoutProperties(_useQuery, _excluded);
+  const {
+    data = {},
+    ...restOfQueryProps
+  } = (0, _reactQuery.useQuery)(lookupQueryNamespaceGenerator({
+    currentPage,
+    endpoint: fetchParameters.endpoint,
+    namespace,
+    id,
+    query,
+    queryParams
+  }), () => {
+    return lookupQueryPromise({
+      ky,
+      queryParams,
+      endpoint: fetchParameters.endpoint
+    });
+  }, {
+    enabled: (!!query?.filters || !!query?.query) && !!currentPage,
+    ...(fetchParameters.queryOptions ?? {}),
+    // 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 lookupResponseTransform is a func as opposed to an object
+    select: selectData => {
+      return lookupResponseTransform(selectData);
+    }
+  });
   (0, _react.useEffect)(() => {
-    if (count !== (data === null || data === void 0 ? void 0 : data.totalRecords)) {
-      setCount(data === null || data === void 0 ? void 0 : data.totalRecords);
+    if (count !== data?.totalRecords) {
+      setCount(data?.totalRecords);
     }
   }, [count, data.totalRecords]);
   (0, _react.useImperativeHandle)(ref, () => ({
-    lookupQueryProps: _objectSpread({
-      data
-    }, restOfQueryProps),
+    lookupQueryProps: {
+      data,
+      ...restOfQueryProps
+    },
     queryParams
   }));
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.SearchAndSortQuery, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.SearchAndSortQuery, {
     initialSearchState: {
       query: ''
     },
     queryGetter: queryGetter,
     querySetter: querySetter,
-    syncToLocation: syncToLocation
-  }, sasqProps), paginationSASQProps), {}, {
+    syncToLocation: syncToLocation,
+    ...sasqProps,
+    ...paginationSASQProps,
     children: sasqRenderProps => {
-      var _ref3, _data$total;
       const {
         activeFilters,
         filterChanged,
@@ -188,17 +179,17 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
       const searchHandlers = getSearchHandlers();
       const disableReset = !filterChanged && !searchChanged;
       const filterCount = activeFilters.string ? activeFilters.string.split(',').length : 0;
-      const Body = RenderBody !== null && RenderBody !== void 0 ? RenderBody : _TableBody.default;
+      const Body = RenderBody ?? _TableBody.default;
       const {
-          filterPaneFirstMenu,
-          filterPaneLastMenu
-        } = filterPaneProps,
-        restOfFilterPaneProps = _objectWithoutProperties(filterPaneProps, _excluded2);
+        filterPaneFirstMenu,
+        filterPaneLastMenu,
+        ...restOfFilterPaneProps
+      } = filterPaneProps;
       const {
-          mainPaneFirstMenu,
-          mainPaneLastMenu
-        } = mainPaneProps,
-        restOfMainPaneProps = _objectWithoutProperties(mainPaneProps, _excluded3);
+        mainPaneFirstMenu,
+        mainPaneLastMenu,
+        ...restOfMainPaneProps
+      } = mainPaneProps;
       const internalStateProps = {
         activeFilters,
         filterCount,
@@ -222,14 +213,14 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
         }
         return null;
       };
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_smartComponents.PersistedPaneset, _objectSpread(_objectSpread({
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_smartComponents.PersistedPaneset, {
         appId: namespace,
-        id: "".concat(id, "-paneset")
-      }, persistedPanesetProps), {}, {
-        children: [hasFilterPane && filterPaneVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, _objectSpread(_objectSpread({
+        id: `${id}-paneset`,
+        ...persistedPanesetProps,
+        children: [hasFilterPane && filterPaneVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
           defaultWidth: "20%",
           firstMenu: filterPaneFirstMenu ? filterPaneFirstMenu(internalStateProps) : null,
-          id: "".concat(id, "-filter-pane"),
+          id: `${id}-filter-pane`,
           lastMenu: filterPaneLastMenu ? filterPaneLastMenu(internalStateProps) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneMenu, {
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.CollapseFilterPaneButton, {
               onClick: toggleFilterPane
@@ -237,27 +228,27 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
           }),
           paneTitle: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
             id: "stripes-smart-components.searchAndFilter"
-          })
-        }, restOfFilterPaneProps), {}, {
+          }),
+          ...restOfFilterPaneProps,
           children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
             onSubmit: onSubmitSearch,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(FilterPaneHeaderComponent, {}), !noSearchField && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.SearchField, _objectSpread({
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.SearchField, {
                 ariaLabel: searchFieldAriaLabel,
                 autoFocus: true,
-                id: "sasq-search-field-".concat(id),
+                id: `sasq-search-field-${id}`,
                 name: "query",
                 onChange: e => {
-                  var _e$target;
-                  if ((_e$target = e.target) !== null && _e$target !== void 0 && _e$target.value) {
+                  if (e.target?.value) {
                     searchHandlers.query(e); // SASQ needs the whole event here
                   } else {
                     searchHandlers.reset();
                   }
                 },
                 onClear: searchHandlers.reset,
-                value: searchValue.query
-              }, searchFieldProps)), (searchableIndexes === null || searchableIndexes === void 0 ? void 0 : searchableIndexes.length) > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchKeyControl.default, {
+                value: searchValue.query,
+                ...searchFieldProps
+              }), searchableIndexes?.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchKeyControl.default, {
                 options: searchableIndexes
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
                 buttonStyle: "primary",
@@ -289,23 +280,23 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
               searchValue: searchValue
             })]
           })
-        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, _objectSpread(_objectSpread({
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
           defaultWidth: "fill",
           firstMenu: renderFirstMenu(),
-          id: "".concat(id, "-main-pane"),
+          id: `${id}-main-pane`,
           lastMenu: mainPaneLastMenu ? mainPaneLastMenu(internalStateProps) : null,
           noOverflow: true,
           padContent: false,
           paneSub: kintIntl.formatKintMessage({
             id: 'found#Values',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.foundValues
+            overrideValue: labelOverrides?.foundValues
           },
           // DEPRECATED data.total should NOT be the first call here, but staying for backwards compatibility. Elsewhere we use data.totalRecords
           {
-            total: (_ref3 = (_data$total = data === null || data === void 0 ? void 0 : data.total) !== null && _data$total !== void 0 ? _data$total : data === null || data === void 0 ? void 0 : data.totalRecords) !== null && _ref3 !== void 0 ? _ref3 : 0
-          })
-        }, restOfMainPaneProps), {}, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Body, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+            total: data?.total ?? data?.totalRecords ?? 0
+          }),
+          ...restOfMainPaneProps,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Body, {
             data: data,
             filterPaneVisible: filterPaneVisible,
             intlKey: passedIntlKey,
@@ -314,14 +305,20 @@ const SASQLookupComponent = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
             noResultsProps: noResultsProps,
             query: query,
             rowNavigation: rowNavigation,
-            toggleFilterPane: toggleFilterPane
-          }, restOfQueryProps), sasqRenderProps), sasqProps), _objectSpread(_objectSpread({}, props), {}, {
-            mclProps: _objectSpread(_objectSpread({}, paginationMCLProps), mclProps)
-          })))
-        })), children]
-      }));
+            toggleFilterPane: toggleFilterPane,
+            ...restOfQueryProps,
+            ...sasqRenderProps,
+            ...sasqProps,
+            ...props,
+            mclProps: {
+              ...paginationMCLProps,
+              ...mclProps
+            }
+          })
+        }), children]
+      });
     }
-  }));
+  });
 });
 SASQLookupComponent.propTypes = {
   children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node]),

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

@@ -12,16 +12,13 @@ var _SASQLookupComponent = _interopRequireDefault(require("./SASQLookupComponent
 var _helpers = _interopRequireDefault(require("../../../test/helpers"));
 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); }
 jest.mock('react-query', () => {
   const {
     mockReactQuery
   } = jest.requireActual('@folio/stripes-erm-testing');
-  return _objectSpread(_objectSpread(_objectSpread({}, jest.requireActual('react-query')), mockReactQuery), {}, {
+  return {
+    ...jest.requireActual('react-query'),
+    ...mockReactQuery,
     useQuery: jest.fn((_key, func, opts) => {
       const defaultData = {
         results: [{
@@ -51,7 +48,7 @@ jest.mock('react-query', () => {
         extraProp: 'extraProp'
       };
     })
-  });
+  };
 });
 
 // TODO why does unmocking react-router-dom cause module hierarchy issues?
@@ -63,13 +60,15 @@ jest.mock('react-router-dom', () => {
     mockReactRouterDom
   } = jest.requireActual('@folio/stripes-erm-testing');
   const actualReactRouterDom = jest.requireActual('react-router-dom');
-  return _objectSpread(_objectSpread(_objectSpread({}, actualReactRouterDom), mockReactRouterDom), {}, {
+  return {
+    ...actualReactRouterDom,
+    ...mockReactRouterDom,
     useHistory: jest.fn(() => ({
       push: mockHistoryPush,
       replace: mockHistoryReplace
     })),
     useLocation: actualReactRouterDom.useLocation // Bit ugly... idk why I need to put this back specifically like this instead of just unmocking react-router-dom
-  });
+  };
 });
 jest.mock('./TableBody', () => jest.fn(_ref => {
   let {
@@ -122,12 +121,13 @@ describe('SASQLookupComponent', () => {
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1'
   }, {
     testLabel: 'with searchable indexes',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       searchableIndexes: [{
         key: 'name',
         label: 'Name'
       }]
-    }),
+    },
     expectQueryFire: false,
     // No actual query yet
     expectedSearchKeyControl: true
@@ -173,14 +173,15 @@ describe('SASQLookupComponent', () => {
     expectedMockKyCallAfterSearch: '/wibble?match=test.test1.test2&term=some%20test%20query&stats=true&page=1'
   }, {
     testLabel: 'starting with qindex and query',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       sasqProps: {
         initialSearchState: {
           query: 'hello',
           qindex: 'test.test1.test2'
         }
       }
-    }),
+    },
     startingLocation: '/wibble?qindex=some.new.qindex.path&query=hello',
     expectedQueryNamespace: getBaseExpectedQueryNamespace({
       filters: '',
@@ -209,61 +210,67 @@ describe('SASQLookupComponent', () => {
     }
   }, {
     testLabel: 'with FilterComponent',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       FilterComponent: () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: "FilterComponent"
       })
-    }),
+    },
     expectQueryFire: false,
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1',
     expectedFilterComponent: 'FilterComponent'
   }, {
     testLabel: 'with filter pane disabled',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       hasFilterPane: false
-    }),
+    },
     expectQueryFire: false,
     expectedSearchField: false,
     expectedFilterPane: false
   }, {
     testLabel: 'with FilterHeaderComponent',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       FilterPaneHeaderComponent: () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: "FilterPaneHeaderComponent"
       })
-    }),
+    },
     expectQueryFire: false,
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1',
     expectedFilterHeaderComponent: 'FilterPaneHeaderComponent'
   }, {
     testLabel: 'no search field mode',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       noSearchField: true
-    }),
+    },
     expectQueryFire: false,
     expectedSearchField: false
   }, {
     testLabel: 'with RenderBody',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       RenderBody: () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: "TheBodyComponent"
       })
-    }),
+    },
     expectQueryFire: false,
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1',
     expectedBodyComponent: 'TheBodyComponent'
   }, {
     testLabel: 'with custom lookupQueryNamespaceGenerator',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       lookupQueryNamespaceGenerator: _ref2 => {
         let {
           currentPage,
           namespace,
           id: passedId
         } = _ref2;
-        return ["testing-".concat(currentPage), "testing-".concat(namespace), "testing-".concat(passedId)];
+        return [`testing-${currentPage}`, `testing-${namespace}`, `testing-${passedId}`];
       }
-    }),
+    },
     expectedQueryNamespace: ['testing-1', 'testing-@folio/test-implementor', 'testing-testing-sasq-lookup-component'],
     startingLocation: '/wibble?filters=status.testFilter',
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1',
@@ -288,7 +295,8 @@ describe('SASQLookupComponent', () => {
     }
   }, {
     testLabel: 'with lookupResponseTransform',
-    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
+    props: {
+      ...baseSASQLookupProps,
       sasqProps: {
         initialSearchState: {
           query: 'test',
@@ -300,7 +308,7 @@ describe('SASQLookupComponent', () => {
         originalData: resp,
         transformed: true
       })
-    }),
+    },
     startingLocation: '/wibble?query=test',
     expectedQueryNamespace: getBaseExpectedQueryNamespace({
       filters: '',
@@ -359,13 +367,13 @@ describe('SASQLookupComponent', () => {
       theRef = /*#__PURE__*/(0, _react.createRef)();
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
         initialEntries: [startingLocation],
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQLookupComponent.default, _objectSpread(_objectSpread({
-          ref: theRef
-        }, props), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQLookupComponent.default, {
+          ref: theRef,
+          ...props,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             children: "CHILD COMPONENT"
           })
-        }))
+        })
       }), undefined, _helpers.default);
     });
     test('renders children', () => {
@@ -376,7 +384,7 @@ describe('SASQLookupComponent', () => {
     });
     test('renders the main pane', async () => {
       await (0, _stripesErmTesting.Pane)({
-        id: "".concat(props.id, "-main-pane")
+        id: `${props.id}-main-pane`
       }).exists();
     });
 
@@ -463,7 +471,7 @@ describe('SASQLookupComponent', () => {
     test('displays the correct number of found values', async () => {
       // SASQ uses paneSub for "found X values"
       await (0, _stripesErmTesting.Pane)({
-        subtitle: "Found ".concat(expectedNumberOfResults, " values")
+        subtitle: `Found ${expectedNumberOfResults} values`
       }).exists();
     });
     if (expectedBodyComponent) {
@@ -485,7 +493,7 @@ describe('SASQLookupComponent', () => {
       describe('Filter pane', () => {
         test('renders the filter pane', async () => {
           await (0, _stripesErmTesting.Pane)({
-            id: "".concat(props.id, "-filter-pane")
+            id: `${props.id}-filter-pane`
           }).exists();
         });
         test('collapse filter pane button exists', async () => {
@@ -506,7 +514,7 @@ describe('SASQLookupComponent', () => {
           });
           test('filter pane is removed from DOM', async () => {
             await (0, _stripesErmTesting.Pane)({
-              id: "".concat(props.id, "-filter-pane")
+              id: `${props.id}-filter-pane`
             }).absent();
           });
         });