@rivet-health/design-system 40.35.1 → 40.35.2

package/fesm2015/rivet-health-design-system.mjs

@@ -8657,6 +8657,48 @@ var TableResultHelpers;
 
 var TableSearchHelpers;
 (function (TableSearchHelpers) {
+    /**
+     * The configured fuse options, without the keys for columns search does not
+     * cover: the ones marked `searchable: false` and the ones turned off in
+     * "Search in". Keys that don't belong to a column are left alone.
+     */
+    function fuseOptionsForSearchColumns(fuseOptions, columns, query) {
+        if (!(fuseOptions === null || fuseOptions === void 0 ? void 0 : fuseOptions.keys))
+            return fuseOptions;
+        const excludedPaths = new Set(Array.from(columns.entries())
+            .filter(([key, column]) => column.searchable === false ||
+            query.searchColumns.get(key) === false)
+            .map(([key, column]) => columnPath(key, column)));
+        return Object.assign(Object.assign({}, fuseOptions), { keys: fuseOptions.keys.filter(key => !excludedPaths.has(fuseKeyPath(key))) });
+    }
+    TableSearchHelpers.fuseOptionsForSearchColumns = fuseOptionsForSearchColumns;
+    /**
+     * Marks the columns with no key in `fuseOptions.keys` as `searchable: false`,
+     * so "Search in" only offers columns that search can cover.
+     */
+    function markColumnsOutsideFuseKeysUnsearchable(columns, fuseOptions) {
+        if (!(fuseOptions === null || fuseOptions === void 0 ? void 0 : fuseOptions.keys))
+            return columns;
+        const keyPaths = new Set(fuseOptions.keys.map(fuseKeyPath));
+        return new Map(Array.from(columns.entries()).map(([key, column]) => [
+            key,
+            keyPaths.has(columnPath(key, column))
+                ? column
+                : Object.assign(Object.assign({}, column), { searchable: false }),
+        ]));
+    }
+    TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable = markColumnsOutsideFuseKeysUnsearchable;
+    function columnPath(key, column) {
+        var _a, _b;
+        return (_b = (_a = column.orderKey) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : key.toString();
+    }
+    function fuseKeyPath(key) {
+        if (typeof key === 'string')
+            return key;
+        if (Array.isArray(key))
+            return key.join('.');
+        return Array.isArray(key.name) ? key.name.join('.') : key.name;
+    }
     function getSearchColumnsSelectedState(state, expectedValue) {
         switch (expectedValue) {
             case 'all':
@@ -9628,41 +9670,19 @@ var RivTable;
      */
     RivTable.NestedPaginateByOptions = ['bottomRows', 'topRows'];
     function createInMemoryManager(fetchDataset, columns, pluralEntityName, options) {
+        columns = TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable(columns, options === null || options === void 0 ? void 0 : options.fuseOptions);
         let data;
         let fuse;
         const source = (query, mostRecentAction) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            //For inMemoryManagers that do not utilize searchColumns,
-            //we do not want to overwrite their fuseOptions
-            if (mostRecentAction.type === 'load') {
-                //Prevent searching on columns that are in fuse options but not supported by search.
-                const nonSearchableColumnsKeys = ((_a = options === null || options === void 0 ? void 0 : options.fuseOptions) === null || _a === void 0 ? void 0 : _a.keys)
-                    ? Array.from(columns.entries())
-                        .filter(([key, column]) => {
-                        return column.searchable == false;
-                    })
-                        .map(([key, column]) => {
-                        var _a;
-                        return ((_a = column.orderKey) === null || _a === void 0 ? void 0 : _a.toString()) || key.toString();
-                    })
-                    : undefined;
-                const fuseOptions = (options === null || options === void 0 ? void 0 : options.fuseOptions) && nonSearchableColumnsKeys
-                    ? Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.fuseOptions), { keys: (_c = (_b = options === null || options === void 0 ? void 0 : options.fuseOptions) === null || _b === void 0 ? void 0 : _b.keys) === null || _c === void 0 ? void 0 : _c.filter(k => !nonSearchableColumnsKeys.includes(k.toString())) }) : options === null || options === void 0 ? void 0 : options.fuseOptions;
-                data = yield fetchDataset();
-                fuse = new Fuse(data, fuseOptions);
-            }
-            if (mostRecentAction.type === 'searchColumnsChange' ||
+            var _a;
+            if (mostRecentAction.type === 'load' ||
+                mostRecentAction.type === 'searchColumnsChange' ||
                 mostRecentAction.type === 'toggleAllSearchColumns') {
                 data = yield fetchDataset();
-                fuse = new Fuse(data, Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.fuseOptions), { keys: Array.from(query.searchColumns.entries())
-                        .filter(([_, value]) => !!value)
-                        .map(([key, _]) => {
-                        const columnKey = columns.get(key);
-                        return (columnKey === null || columnKey === void 0 ? void 0 : columnKey.orderKey) || key;
-                    }) }));
+                fuse = new Fuse(data, TableSearchHelpers.fuseOptionsForSearchColumns(options === null || options === void 0 ? void 0 : options.fuseOptions, columns, query));
             }
             const orderColumn = query.order
-                ? (_d = columns.get(query.order.column)) === null || _d === void 0 ? void 0 : _d.orderKey
+                ? (_a = columns.get(query.order.column)) === null || _a === void 0 ? void 0 : _a.orderKey
                 : undefined;
             const hasExplicitSort = query.order != null && orderColumn !== undefined;
             const defaultSortSpec = (() => {
@@ -9716,45 +9736,22 @@ var RivTable;
     }
     RivTable.createInMemoryManager = createInMemoryManager;
     function createInMemoryManagerNested(fetchDataset, columns, pluralEntityName, options) {
+        columns = TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable(columns, options === null || options === void 0 ? void 0 : options.fuseOptions);
         let data;
         let rowsFromData;
         // The fuse will search the individual rows
         let fuse;
         const source = (query, mostRecentAction) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
-            //For inMemoryManagers that do not utilize searchColumns,
-            //we do not want to overwrite their fuseOptions
-            if (mostRecentAction.type === 'load') {
-                //Prevent searching on columns that are in fuse options but not supported by search.
-                const nonSearchableColumnsKeys = ((_a = options === null || options === void 0 ? void 0 : options.fuseOptions) === null || _a === void 0 ? void 0 : _a.keys)
-                    ? Array.from(columns.entries())
-                        .filter(([key, column]) => {
-                        return column.searchable == false;
-                    })
-                        .map(([key, column]) => {
-                        var _a;
-                        return ((_a = column.orderKey) === null || _a === void 0 ? void 0 : _a.toString()) || key.toString();
-                    })
-                    : undefined;
-                const fuseOptions = (options === null || options === void 0 ? void 0 : options.fuseOptions) && nonSearchableColumnsKeys
-                    ? Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.fuseOptions), { keys: (_c = (_b = options === null || options === void 0 ? void 0 : options.fuseOptions) === null || _b === void 0 ? void 0 : _b.keys) === null || _c === void 0 ? void 0 : _c.filter(k => !nonSearchableColumnsKeys.includes(k.toString())) }) : options === null || options === void 0 ? void 0 : options.fuseOptions;
-                data = yield fetchDataset();
-                rowsFromData = TableResultHelpers.getAllRowsFromNestedHeaders(data);
-                fuse = new Fuse(rowsFromData, fuseOptions);
-            }
-            if (mostRecentAction.type === 'searchColumnsChange' ||
+            var _a, _b, _c;
+            if (mostRecentAction.type === 'load' ||
+                mostRecentAction.type === 'searchColumnsChange' ||
                 mostRecentAction.type === 'toggleAllSearchColumns') {
                 data = yield fetchDataset();
                 rowsFromData = TableResultHelpers.getAllRowsFromNestedHeaders(data);
-                fuse = new Fuse(rowsFromData, Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.fuseOptions), { keys: Array.from(query.searchColumns.entries())
-                        .filter(([_, value]) => !!value)
-                        .map(([key, _]) => {
-                        const columnKey = columns.get(key);
-                        return (columnKey === null || columnKey === void 0 ? void 0 : columnKey.orderKey) || key;
-                    }) }));
+                fuse = new Fuse(rowsFromData, TableSearchHelpers.fuseOptionsForSearchColumns(options === null || options === void 0 ? void 0 : options.fuseOptions, columns, query));
             }
             const orderColumn = query.order
-                ? (_d = columns.get(query.order.column)) === null || _d === void 0 ? void 0 : _d.orderKey
+                ? (_a = columns.get(query.order.column)) === null || _a === void 0 ? void 0 : _a.orderKey
                 : undefined;
             const hasExplicitSort = query.order != null && orderColumn !== undefined;
             const defaultSortSpec = (() => {
@@ -9787,7 +9784,7 @@ var RivTable;
             const nestedRowsToDisplay = didRestrictDisplayedRows
                 ? TableNestingHelpers.findNestedRowsWithHeadersToKeep(data, rowsMatchingFilters)
                 : data;
-            const matchingRowCount = TableNestingHelpers.countNestedRows(nestedRowsToDisplay, (_e = options === null || options === void 0 ? void 0 : options.paginateBy) !== null && _e !== void 0 ? _e : 'bottomRows');
+            const matchingRowCount = TableNestingHelpers.countNestedRows(nestedRowsToDisplay, (_b = options === null || options === void 0 ? void 0 : options.paginateBy) !== null && _b !== void 0 ? _b : 'bottomRows');
             let sortedNestedRows;
             if (hasExplicitSort && query.order) {
                 // Explicit sort override has priority over everything else
@@ -9807,7 +9804,7 @@ var RivTable;
                 // Don't sort if we have no information to use to sort
                 sortedNestedRows = nestedRowsToDisplay;
             }
-            const paginatedHeaderRows = TablePaginationHelpers.paginateNestedHeaderRows(sortedNestedRows, query.pagination.page, query.pagination.pageSize, (_f = options === null || options === void 0 ? void 0 : options.paginateBy) !== null && _f !== void 0 ? _f : 'bottomRows');
+            const paginatedHeaderRows = TablePaginationHelpers.paginateNestedHeaderRows(sortedNestedRows, query.pagination.page, query.pagination.pageSize, (_c = options === null || options === void 0 ? void 0 : options.paginateBy) !== null && _c !== void 0 ? _c : 'bottomRows');
             const hasHeaders = paginatedHeaderRows.some(header => header.headerText != null);
             return {
                 currentPageNestedHeaders: paginatedHeaderRows,