@databiosphere/findable-ui 4.0.0 → 5.0.0

package/lib/components/Links/components/Link/components/ExploreViewLink/exploreViewLink.js

@@ -33,6 +33,7 @@ const useExploreState_1 = require("../../../../../../hooks/useExploreState");
 const exploreState_1 = require("../../../../../../providers/exploreState");
 const entities_1 = require("../../../../common/entities");
 const PARAM_FILTER = "filter";
+const PARAM_SORTING = "sorting";
 const ExploreViewLink = ({ className, label, onClick, target = entities_1.ANCHOR_TARGET.SELF, url, }) => {
     const { exploreDispatch, exploreState } = (0, useExploreState_1.useExploreState)();
     if (!isValidExploreURL(url, exploreState)) {
@@ -41,8 +42,9 @@ const ExploreViewLink = ({ className, label, onClick, target = entities_1.ANCHOR
     const onNavigate = (0, react_1.useCallback)(() => {
         const entityListType = getEntityListType(url.href);
         const filters = getSelectedFilters(url.query);
+        const sorting = getSorting(url.query);
         exploreDispatch({
-            payload: { entityListType, filters },
+            payload: { entityListType, filters, sorting },
             type: exploreState_1.ExploreActionKind.UpdateEntityFilters,
         });
         onClick === null || onClick === void 0 ? void 0 : onClick();
@@ -68,6 +70,16 @@ function getSelectedFilters(query) {
     const parsedQuery = JSON.parse(decodedQuery);
     return parsedQuery[PARAM_FILTER];
 }
+/**
+ * Returns the sorting from the given query.
+ * @param query - Query.
+ * @returns sorting.
+ */
+function getSorting(query) {
+    const decodedQuery = decodeURIComponent(query);
+    const parsedQuery = JSON.parse(decodedQuery);
+    return parsedQuery[PARAM_SORTING];
+}
 /**
  * Returns true if the given value is a SelectedFilter.
  * @param value - Value.

package/lib/components/Table/table.js

@@ -110,7 +110,7 @@ const TableComponent = ({ columns, getRowId, initialState, items, listView, tota
         data: items,
         enableColumnFilters: true,
         enableFilters: true,
-        enableMultiSort: false,
+        enableMultiSort: clientFiltering,
         enableRowSelection,
         enableSorting: true,
         enableSortingRemoval: false,

package/lib/config/entities.d.ts

@@ -250,7 +250,7 @@ export interface Override {
 declare type RelatedSearchFunction = (searchKey: CategoryKey | undefined, resultKey: CategoryKey | undefined, selectedCategoryValues: SelectedFilterValue | undefined) => Promise<RelatedSearchResult | undefined>;
 export interface SavedFilter {
     filters: SelectedFilter[];
-    sort?: ColumnSort;
+    sorting?: ColumnSort[];
     title: string;
 }
 /**

package/lib/providers/exploreState/initializer/utils.js

@@ -48,8 +48,7 @@ function buildSavedFilterByCategoryValueKey(savedFilters) {
     if (!savedFilters)
         return;
     const savedFilterByCategoryValueKey = new Map();
-    for (const { filters, sort, title } of savedFilters) {
-        const sorting = sort ? [sort] : undefined;
+    for (const { filters, sorting, title } of savedFilters) {
         savedFilterByCategoryValueKey.set(title, { filters, sorting, title });
     }
     return savedFilterByCategoryValueKey;

package/lib/providers/exploreState/payloads/entities.d.ts

@@ -54,6 +54,7 @@ export declare type UpdateColumnVisibilityPayload = VisibilityState;
 export interface UpdateEntityFiltersPayload {
     entityListType: string;
     filters: SelectedFilter[];
+    sorting?: ColumnSort[];
 }
 /**
  * Update entity view access payload.

package/lib/providers/exploreState.js

@@ -229,13 +229,14 @@ function exploreReducer(state, action, exploreContext) {
          * Update entity filters.
          */
         case ExploreActionKind.UpdateEntityFilters: {
-            const { entityListType, filters: filterState } = payload;
+            const { entityListType, filters: filterState, sorting } = payload;
             const categoryGroupConfigKey = (0, utils_2.getEntityCategoryGroupConfigKey)(entityListType, state.entityPageState);
             (0, utils_2.updateEntityStateByCategoryGroupConfigKey)(state, {
                 filterState,
                 savedFilterState: [], // Clear saved filter state.
             }, categoryGroupConfigKey);
-            return Object.assign(Object.assign({}, state), { entityPageState: (0, utils_2.resetRowSelection)(state, categoryGroupConfigKey) });
+            return Object.assign(Object.assign({}, state), { entityPageState: (0, utils_2.updateEntityPageState)(entityListType, Object.assign({}, (0, utils_2.resetRowSelection)(state, categoryGroupConfigKey)), { sorting } // Update sorting for the entity.
+                ) });
         }
         /**
          * Update entity view access

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@databiosphere/findable-ui",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "",
   "scripts": {
     "test": "jest",

package/src/components/Links/components/Link/components/ExploreViewLink/exploreViewLink.tsx

@@ -1,3 +1,4 @@
+import { ColumnSort } from "@tanstack/react-table";
 import Link from "next/link";
 import React, { useCallback } from "react";
 import { UrlObject } from "url";
@@ -14,6 +15,7 @@ import {
 import { LinkProps } from "../../link";
 
 const PARAM_FILTER = "filter";
+const PARAM_SORTING = "sorting";
 
 export interface ExploreViewLinkProps
   extends Omit<LinkProps, "copyable" | "noWrap" | "url"> {
@@ -36,8 +38,9 @@ export const ExploreViewLink = ({
   const onNavigate = useCallback(() => {
     const entityListType = getEntityListType(url.href);
     const filters = getSelectedFilters(url.query);
+    const sorting = getSorting(url.query);
     exploreDispatch({
-      payload: { entityListType, filters },
+      payload: { entityListType, filters, sorting },
       type: ExploreActionKind.UpdateEntityFilters,
     });
     onClick?.();
@@ -78,6 +81,19 @@ function getSelectedFilters(
   return parsedQuery[PARAM_FILTER];
 }
 
+/**
+ * Returns the sorting from the given query.
+ * @param query - Query.
+ * @returns sorting.
+ */
+function getSorting(
+  query: UrlObjectWithHrefAndQuery["query"]
+): ColumnSort[] | undefined {
+  const decodedQuery = decodeURIComponent(query);
+  const parsedQuery = JSON.parse(decodedQuery);
+  return parsedQuery[PARAM_SORTING];
+}
+
 /**
  * Returns true if the given value is a SelectedFilter.
  * @param value - Value.

package/src/components/Table/table.tsx

@@ -153,7 +153,7 @@ TableProps<T>): JSX.Element => {
     data: items,
     enableColumnFilters: true, // client-side filtering.
     enableFilters: true, // client-side filtering.
-    enableMultiSort: false,
+    enableMultiSort: clientFiltering,
     enableRowSelection,
     enableSorting: true, // client-side filtering.
     enableSortingRemoval: false, // client-side filtering.

package/src/config/entities.ts

@@ -315,7 +315,7 @@ type RelatedSearchFunction = (
 
 export interface SavedFilter {
   filters: SelectedFilter[];
-  sort?: ColumnSort;
+  sorting?: ColumnSort[];
   title: string;
 }
 /**

package/src/providers/exploreState/initializer/utils.ts

@@ -73,8 +73,7 @@ function buildSavedFilterByCategoryValueKey(
   if (!savedFilters) return;
   const savedFilterByCategoryValueKey: SavedFilterByCategoryValueKey =
     new Map();
-  for (const { filters, sort, title } of savedFilters) {
-    const sorting = sort ? [sort] : undefined;
+  for (const { filters, sorting, title } of savedFilters) {
     savedFilterByCategoryValueKey.set(title, { filters, sorting, title });
   }
   return savedFilterByCategoryValueKey;

package/src/providers/exploreState/payloads/entities.ts

@@ -78,6 +78,7 @@ export type UpdateColumnVisibilityPayload = VisibilityState;
 export interface UpdateEntityFiltersPayload {
   entityListType: string;
   filters: SelectedFilter[];
+  sorting?: ColumnSort[];
 }
 /**
  * Update entity view access payload.

package/src/providers/exploreState.tsx

@@ -601,7 +601,7 @@ function exploreReducer(
      * Update entity filters.
      */
     case ExploreActionKind.UpdateEntityFilters: {
-      const { entityListType, filters: filterState } = payload;
+      const { entityListType, filters: filterState, sorting } = payload;
       const categoryGroupConfigKey = getEntityCategoryGroupConfigKey(
         entityListType,
         state.entityPageState
@@ -616,7 +616,13 @@ function exploreReducer(
       );
       return {
         ...state,
-        entityPageState: resetRowSelection(state, categoryGroupConfigKey),
+        entityPageState: updateEntityPageState(
+          entityListType,
+          {
+            ...resetRowSelection(state, categoryGroupConfigKey), // Reset row selection for all entities with the same category group config key.
+          },
+          { sorting } // Update sorting for the entity.
+        ),
       };
     }
     /**