@k-int/stripes-kint-components 5.36.1 → 5.37.0

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

@@ -12,13 +12,15 @@ 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 {
-    ...jest.requireActual('react-query'),
-    ...mockReactQuery,
+  const _jest$requireActual = jest.requireActual('@folio/stripes-erm-testing'),
+    mockReactQuery = _jest$requireActual.mockReactQuery;
+  return _objectSpread(_objectSpread(_objectSpread({}, jest.requireActual('react-query')), mockReactQuery), {}, {
     useQuery: jest.fn((_key, func, opts) => {
       const defaultData = {
         results: [{
@@ -48,7 +50,7 @@ jest.mock('react-query', () => {
         extraProp: 'extraProp'
       };
     })
-  };
+  });
 });
 
 // TODO why does unmocking react-router-dom cause module hierarchy issues?
@@ -56,24 +58,19 @@ jest.mock('react-query', () => {
 const mockHistoryPush = jest.fn();
 const mockHistoryReplace = jest.fn();
 jest.mock('react-router-dom', () => {
-  const {
-    mockReactRouterDom
-  } = jest.requireActual('@folio/stripes-erm-testing');
+  const _jest$requireActual2 = jest.requireActual('@folio/stripes-erm-testing'),
+    mockReactRouterDom = _jest$requireActual2.mockReactRouterDom;
   const actualReactRouterDom = jest.requireActual('react-router-dom');
-  return {
-    ...actualReactRouterDom,
-    ...mockReactRouterDom,
+  return _objectSpread(_objectSpread(_objectSpread({}, 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 {
-    mclProps
-  } = _ref;
+  let mclProps = _ref.mclProps;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       children: "TableBody"
@@ -121,13 +118,12 @@ describe('SASQLookupComponent', () => {
     expectedMockKyCall: '/wibble?filters=status.value%3D%3DtestFilter&stats=true&page=1'
   }, {
     testLabel: 'with searchable indexes',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       searchableIndexes: [{
         key: 'name',
         label: 'Name'
       }]
-    },
+    }),
     expectQueryFire: false,
     // No actual query yet
     expectedSearchKeyControl: true
@@ -173,15 +169,14 @@ describe('SASQLookupComponent', () => {
     expectedMockKyCallAfterSearch: '/wibble?match=test.test1.test2&term=some%20test%20query&stats=true&page=1'
   }, {
     testLabel: 'starting with qindex and query',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       sasqProps: {
         initialSearchState: {
           query: 'hello',
           qindex: 'test.test1.test2'
         }
       }
-    },
+    }),
     startingLocation: '/wibble?qindex=some.new.qindex.path&query=hello',
     expectedQueryNamespace: getBaseExpectedQueryNamespace({
       filters: '',
@@ -210,77 +205,68 @@ describe('SASQLookupComponent', () => {
     }
   }, {
     testLabel: 'with FilterComponent',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, 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: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       hasFilterPane: false
-    },
+    }),
     expectQueryFire: false,
     expectedSearchField: true,
     expectedFilterPane: false
   }, {
     testLabel: 'with filter pane disabled (and no search)',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       hasFilterPane: false,
       noSearchField: true
-    },
+    }),
     expectQueryFire: false,
     expectedSearchField: false,
     expectedFilterPane: false
   }, {
     testLabel: 'with FilterHeaderComponent',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, 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: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       noSearchField: true
-    },
+    }),
     expectQueryFire: false,
     expectedSearchField: false
   }, {
     testLabel: 'with RenderBody',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, 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: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       lookupQueryNamespaceGenerator: _ref2 => {
-        let {
-          currentPage,
-          namespace,
-          id: passedId
-        } = _ref2;
-        return [`testing-${currentPage}`, `testing-${namespace}`, `testing-${passedId}`];
+        let currentPage = _ref2.currentPage,
+          namespace = _ref2.namespace,
+          passedId = _ref2.id;
+        return ["testing-".concat(currentPage), "testing-".concat(namespace), "testing-".concat(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',
@@ -305,8 +291,7 @@ describe('SASQLookupComponent', () => {
     }
   }, {
     testLabel: 'with lookupResponseTransform',
-    props: {
-      ...baseSASQLookupProps,
+    props: _objectSpread(_objectSpread({}, baseSASQLookupProps), {}, {
       sasqProps: {
         initialSearchState: {
           query: 'test',
@@ -318,7 +303,7 @@ describe('SASQLookupComponent', () => {
         originalData: resp,
         transformed: true
       })
-    },
+    }),
     startingLocation: '/wibble?query=test',
     expectedQueryNamespace: getBaseExpectedQueryNamespace({
       filters: '',
@@ -349,22 +334,29 @@ describe('SASQLookupComponent', () => {
     },
     expectedNumberOfResults: 0
   }])('$testLabel', _ref3 => {
-    let {
-      props,
-      startingLocation = '/wibble',
-      expectQueryFire = true,
-      expectedQueryNamespace = getBaseExpectedQueryNamespace(baseSASQObj),
-      expectedMockKyCall = '/wibble?match=test.test1.test2&match=test3&term=some%20test%20query&stats=true&page=1',
-      expectedMockKyCallAfterSearch = '/wibble?match=test.test1.test2&match=test3&term=some%20test%20query&stats=true&page=1',
-      expectedFilterComponent,
-      expectedFilterHeaderComponent,
-      expectedFilterPane = true,
-      expectedBodyComponent,
-      expectedNumberOfResults = 2,
-      expectedSearchField = true,
-      expectedSearchKeyControl = false,
-      expectedRef
-    } = _ref3;
+    let props = _ref3.props,
+      _ref3$startingLocatio = _ref3.startingLocation,
+      startingLocation = _ref3$startingLocatio === void 0 ? '/wibble' : _ref3$startingLocatio,
+      _ref3$expectQueryFire = _ref3.expectQueryFire,
+      expectQueryFire = _ref3$expectQueryFire === void 0 ? true : _ref3$expectQueryFire,
+      _ref3$expectedQueryNa = _ref3.expectedQueryNamespace,
+      expectedQueryNamespace = _ref3$expectedQueryNa === void 0 ? getBaseExpectedQueryNamespace(baseSASQObj) : _ref3$expectedQueryNa,
+      _ref3$expectedMockKyC = _ref3.expectedMockKyCall,
+      expectedMockKyCall = _ref3$expectedMockKyC === void 0 ? '/wibble?match=test.test1.test2&match=test3&term=some%20test%20query&stats=true&page=1' : _ref3$expectedMockKyC,
+      _ref3$expectedMockKyC2 = _ref3.expectedMockKyCallAfterSearch,
+      expectedMockKyCallAfterSearch = _ref3$expectedMockKyC2 === void 0 ? '/wibble?match=test.test1.test2&match=test3&term=some%20test%20query&stats=true&page=1' : _ref3$expectedMockKyC2,
+      expectedFilterComponent = _ref3.expectedFilterComponent,
+      expectedFilterHeaderComponent = _ref3.expectedFilterHeaderComponent,
+      _ref3$expectedFilterP = _ref3.expectedFilterPane,
+      expectedFilterPane = _ref3$expectedFilterP === void 0 ? true : _ref3$expectedFilterP,
+      expectedBodyComponent = _ref3.expectedBodyComponent,
+      _ref3$expectedNumberO = _ref3.expectedNumberOfResults,
+      expectedNumberOfResults = _ref3$expectedNumberO === void 0 ? 2 : _ref3$expectedNumberO,
+      _ref3$expectedSearchF = _ref3.expectedSearchField,
+      expectedSearchField = _ref3$expectedSearchF === void 0 ? true : _ref3$expectedSearchF,
+      _ref3$expectedSearchK = _ref3.expectedSearchKeyControl,
+      expectedSearchKeyControl = _ref3$expectedSearchK === void 0 ? false : _ref3$expectedSearchK,
+      expectedRef = _ref3.expectedRef;
     beforeEach(() => {
       // CLEAR MOCKS
       _core.mockKy.mockClear();
@@ -377,24 +369,23 @@ 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, {
-          ref: theRef,
-          ...props,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SASQLookupComponent.default, _objectSpread(_objectSpread({
+          ref: theRef
+        }, props), {}, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             children: "CHILD COMPONENT"
           })
-        })
+        }))
       }), undefined, _helpers.default);
     });
     test('renders children', () => {
-      const {
-        getByText
-      } = renderComponent;
+      const _renderComponent = renderComponent,
+        getByText = _renderComponent.getByText;
       expect(getByText('CHILD COMPONENT')).toBeInTheDocument();
     });
     test('renders the main pane', async () => {
       await (0, _stripesErmTesting.Pane)({
-        id: `${props.id}-main-pane`
+        id: "".concat(props.id, "-main-pane")
       }).exists();
     });
 
@@ -422,9 +413,8 @@ describe('SASQLookupComponent', () => {
     describe('Searching', () => {
       if (expectedSearchKeyControl) {
         test('renders SearchKeyControl', () => {
-          const {
-            getByText
-          } = renderComponent;
+          const _renderComponent2 = renderComponent,
+            getByText = _renderComponent2.getByText;
           expect(getByText('SearchKeyControl')).toBeInTheDocument();
         });
       }
@@ -482,21 +472,19 @@ describe('SASQLookupComponent', () => {
     test('displays the correct number of found values', async () => {
       // SASQ uses paneSub for "found X values"
       await (0, _stripesErmTesting.Pane)({
-        subtitle: `Found ${expectedNumberOfResults} values`
+        subtitle: "Found ".concat(expectedNumberOfResults, " values")
       }).exists();
     });
     if (expectedBodyComponent) {
       test('renders the RenderBody', () => {
-        const {
-          getByText
-        } = renderComponent;
+        const _renderComponent3 = renderComponent,
+          getByText = _renderComponent3.getByText;
         expect(getByText(expectedBodyComponent)).toBeInTheDocument();
       });
     } else {
       test('renders the TableBody', () => {
-        const {
-          getByText
-        } = renderComponent;
+        const _renderComponent4 = renderComponent,
+          getByText = _renderComponent4.getByText;
         expect(getByText('TableBody')).toBeInTheDocument();
       });
     }
@@ -504,7 +492,7 @@ describe('SASQLookupComponent', () => {
       describe('Filter pane', () => {
         test('renders the filter pane', async () => {
           await (0, _stripesErmTesting.Pane)({
-            id: `${props.id}-filter-pane`
+            id: "".concat(props.id, "-filter-pane")
           }).exists();
         });
         test('collapse filter pane button exists', async () => {
@@ -525,23 +513,21 @@ describe('SASQLookupComponent', () => {
           });
           test('filter pane is removed from DOM', async () => {
             await (0, _stripesErmTesting.Pane)({
-              id: `${props.id}-filter-pane`
+              id: "".concat(props.id, "-filter-pane")
             }).absent();
           });
         });
         if (expectedFilterComponent) {
           test('FilterComponent renders', () => {
-            const {
-              getByText
-            } = renderComponent;
+            const _renderComponent5 = renderComponent,
+              getByText = _renderComponent5.getByText;
             expect(getByText(expectedFilterComponent)).toBeInTheDocument();
           });
         }
         if (expectedFilterHeaderComponent) {
           test('FilterHeaderComponent renders', () => {
-            const {
-              getByText
-            } = renderComponent;
+            const _renderComponent6 = renderComponent,
+              getByText = _renderComponent6.getByText;
             expect(getByText(expectedFilterHeaderComponent)).toBeInTheDocument();
           });
         }

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

@@ -10,34 +10,51 @@ 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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 => {
-  let {
-    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 ?? '';
+  var _query$sort, _match$params2;
+  let data = _ref.data,
+    error = _ref.error,
+    fetchNextPage = _ref.fetchNextPage,
+    filterPaneVisible = _ref.filterPaneVisible,
+    passedIntlKey = _ref.intlKey,
+    passedIntlNS = _ref.intlNS,
+    isError = _ref.isError,
+    isLoading = _ref.isLoading,
+    _ref$labelOverrides = _ref.labelOverrides,
+    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
+    match = _ref.match,
+    _ref$mclProps = _ref.mclProps,
+    _ref$mclProps2 = _ref$mclProps === void 0 ? {} : _ref$mclProps,
+    _ref$mclProps2$format = _ref$mclProps2.formatter,
+    formatter = _ref$mclProps2$format === void 0 ? {} : _ref$mclProps2$format,
+    mclProps = _objectWithoutProperties(_ref$mclProps2, _excluded),
+    _ref$noResultsProps = _ref.noResultsProps,
+    noResultsProps = _ref$noResultsProps === void 0 ? {} : _ref$noResultsProps,
+    onSort = _ref.onSort,
+    path = _ref.path,
+    resultColumns = _ref.resultColumns,
+    _ref$rowNavigation = _ref.rowNavigation,
+    rowNavigation = _ref$rowNavigation === void 0 ? true : _ref$rowNavigation,
+    _ref$getNavigationIde = _ref.getNavigationIdentifier,
+    getNavigationIdentifier = _ref$getNavigationIde === void 0 ? row => row === null || row === void 0 ? void 0 : row.id : _ref$getNavigationIde,
+    toggleFilterPane = _ref.toggleFilterPane,
+    query = _ref.query;
+  const sortOrder = (_query$sort = query.sort) !== null && _query$sort !== void 0 ? _query$sort : '';
   const history = (0, _reactRouterDom.useHistory)();
   const location = (0, _reactRouterDom.useLocation)();
   const onNeedMoreData = (_askAmount, index) => {
@@ -52,9 +69,10 @@ const TableBody = _ref => {
   // Build the list of visible columns
   const visibleColumns = resultColumns.map(e => e.propertyPath);
   const getRowUrl = (0, _react.useCallback)(rowData => {
-    const baseUrl = `${path}/${getNavigationIdentifier(rowData)}`;
+    var _location$search;
+    const baseUrl = "".concat(path, "/").concat(getNavigationIdentifier(rowData));
     return {
-      url: `${baseUrl}${location?.search ?? ''}`,
+      url: "".concat(baseUrl).concat((_location$search = location === null || location === void 0 ? void 0 : location.search) !== null && _location$search !== void 0 ? _location$search : ''),
       path,
       baseUrl,
       location
@@ -62,12 +80,14 @@ const TableBody = _ref => {
   }, [getNavigationIdentifier, location, path]);
   const getEnhancedFormatter = (0, _react.useCallback)(() => {
     const enhancedFormatter = {};
-    for (const [key, value] of Object.entries(formatter)) {
+    for (const _ref2 of Object.entries(formatter)) {
+      var _ref3 = _slicedToArray(_ref2, 2);
+      const key = _ref3[0];
+      const value = _ref3[1];
       if (typeof value === 'function') {
-        enhancedFormatter[key] = item => value({
-          ...item,
+        enhancedFormatter[key] = item => value(_objectSpread(_objectSpread({}, item), {}, {
           defaultRowUrl: getRowUrl(item)
-        });
+        }));
       } else {
         enhancedFormatter[key] = value;
       }
@@ -82,22 +102,24 @@ const TableBody = _ref => {
     }
     return null;
   }, [getRowUrl, history, rowNavigation]);
-  const isSelected = (0, _react.useCallback)(_ref2 => {
-    let {
-      item
-    } = _ref2;
-    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, {
+  const isSelected = (0, _react.useCallback)(_ref4 => {
+    var _match$params;
+    let item = _ref4.item;
+    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({
     autosize: true,
     columnMapping: columnMapping,
-    contentData: data?.results,
+    contentData: data === null || data === void 0 ? void 0 : data.results,
     formatter: getEnhancedFormatter() // Pass enhanced formatter
     ,
     hasMargin: true,
     interactive: rowNavigation,
-    isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(NoResultsComponent, {
+    isEmptyMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(NoResultsComponent, _objectSpread({}, _objectSpread({
       error,
       filters: query.filters,
       // Separate out filters as per "searchTerm" below
@@ -111,9 +133,8 @@ const TableBody = _ref => {
       // Passing the whole query object just in case
       searchTerm: query.query,
       // Here for compatibility, probably better to just use "query" prop
-      toggleFilterPane,
-      ...noResultsProps // Anything passed in directly takes precedence
-    }),
+      toggleFilterPane
+    }, noResultsProps))),
     isSelected: isSelected,
     onHeaderClick: onSort,
     onNeedMoreData: onNeedMoreData,
@@ -122,9 +143,8 @@ 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({