@rebasepro/app 0.14.0 → 0.14.1-canary.g7e666eb

package/dist/hooks/data/collectionQuery.d.ts

@@ -1,4 +1,4 @@
-import type { FindParams, FilterValues, LogicalCondition } from "@rebasepro/types";
+import type { FindParams, FilterValues, LogicalCondition, OrderBySpec } from "@rebasepro/types";
 /**
  * The one place a collection read's parameters are assembled.
  *
@@ -23,12 +23,12 @@ export interface CollectionQueryInput<M extends Record<string, unknown>> {
     logical?: LogicalCondition;
     /**
      * Loosened from `FindParams["orderBy"]` on purpose: callers hold the sort
-     * as a plain `[string, direction]` read off user config or a URL, where the
-     * column is not statically known. Narrowing it here would push a cast onto
-     * every call site, which is the kind of friction that sends people back to
-     * hand-building the object this exists to replace.
+     * as plain `[string, direction]` pairs read off user config or a URL, where
+     * the columns are not statically known. Narrowing it here would push a cast
+     * onto every call site, which is the kind of friction that sends people back
+     * to hand-building the object this exists to replace.
      */
-    orderBy?: [string, "asc" | "desc"];
+    orderBy?: OrderBySpec;
     limit?: number;
     offset?: number;
     page?: number;

package/dist/index.es.js

@@ -4,7 +4,7 @@ import { ALL_WHERE_FILTER_OPS, DEFAULT_DATA_SOURCE_KEY, DEFAULT_FILTERABLE_RELAT
 import { UNRENDERED_SLOTS, resolveAdminCollection } from "@rebasepro/admin-types";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { SnackbarProvider as SnackbarProvider$1, useSnackbar } from "notistack";
-import { buildRebaseData, canCreateEntity, canDeleteEntity, canEditEntity, canReadCollection, evaluateCondition, getChildViewDeclaringProperties, getChildViewRelationPropertyKeys, getEntityChildViews, getLabelOrConfigFrom, getPrimaryKeys, getSubcollections, isPropertyBuilder, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource, stripCollectionPath, wrapAsEntityData, wrapAsSdkData } from "@rebasepro/common";
+import { buildRebaseData, canCreateEntity, canDeleteEntity, canEditEntity, canReadCollection, evaluateCondition, getChildViewDeclaringProperties, getChildViewRelationPropertyKeys, getEntityChildViews, getLabelOrConfigFrom, getPrimaryKeys, getSubcollections, isPropertyBuilder, normalizeOrderBy, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource, serializeOrderBy, stripCollectionPath, wrapAsEntityData, wrapAsSdkData } from "@rebasepro/common";
 import { getTitlePropertyKey as getTitlePropertyKey$1, removeInitialAndTrailingSlashes as removeInitialAndTrailingSlashes$1 } from "@rebasepro/app";
 import { Link, Routes, createBrowserRouter, useBlocker, useLocation } from "react-router";
 import { generateForeignKeyName, hashString, isArrayValue, isObject, isPlainObject, isRecordValue, mergeDeep, randomString, readStoredJson, slugify, writeStoredJson } from "@rebasepro/utils";
@@ -2859,11 +2859,12 @@ function useDataTableController({ path, collection, scrollRestoration, entitiesD
 		return true;
 	}, []);
 	const sortInternal = useMemo(() => {
-		if (sort && fixedFilter && !checkFilterCombination(fixedFilter, sort)) {
+		const keys = normalizeOrderBy(sort);
+		if (keys && fixedFilter && !checkFilterCombination(fixedFilter, keys)) {
 			console.warn("Initial sort is not compatible with the force filter. Ignoring initial sort");
 			return;
 		}
-		return sort;
+		return keys;
 	}, [sort, fixedFilter]);
 	const { filterValues: filterUrl, sortBy: sortUrl } = parseFilterAndSort(location.search);
 	const [filterValues, setFilterValues] = React.useState(fixedFilter ?? (updateUrl ? filterUrl : void 0) ?? defaultFilter ?? void 0);
@@ -2900,8 +2901,7 @@ function useDataTableController({ path, collection, scrollRestoration, entitiesD
 		});
 	}, []);
 	const [itemCount, setItemCount] = React.useState(paginationEnabled ? initialItemCount : void 0);
-	const sortByProperty = sortBy ? sortBy[0] : void 0;
-	const currentSort = sortBy ? sortBy[1] : void 0;
+	const sortKey = sortBy ? serializeOrderBy(sortBy) : void 0;
 	const context = useRebaseContext();
 	const [rawData, setRawData] = useState(collectionScroll?.data ?? []);
 	const onScroll = useCallback(({ scrollOffset }) => {
@@ -2965,7 +2965,7 @@ function useDataTableController({ path, collection, scrollRestoration, entitiesD
 		};
 		const accessor = dataClient.collection(path);
 		const whereParams = filterValues && Object.keys(filterValues).length > 0 ? filterValues : void 0;
-		const orderByParams = sortBy ? [String(sortBy[0]), sortBy[1]] : void 0;
+		const orderByParams = sortBy && sortBy.length > 0 ? sortBy.map(([field, direction]) => [String(field), direction]) : void 0;
 		let unsubscribe;
 		const includeParams = getRelationIncludeParams(collection);
 		if (accessor.listen) unsubscribe = accessor.listen(toFindParams({
@@ -2990,8 +2990,7 @@ function useDataTableController({ path, collection, scrollRestoration, entitiesD
 		dataClient,
 		path,
 		itemCount,
-		currentSort,
-		sortByProperty,
+		sortKey,
 		filterValues,
 		searchString
 	]);
@@ -3067,9 +3066,9 @@ function useUpdateUrl(filterValues, sortBy, searchString, updateUrl) {
 }
 function encodeFilterAndSort(filterValues, sortBy) {
 	const entries = {};
-	if (sortBy) {
-		entries["__sort"] = encodeURIComponent(sortBy[0]);
-		entries["__sort_order"] = encodeURIComponent(sortBy[1]);
+	if (sortBy && sortBy.length > 0) {
+		entries["__sort"] = sortBy.map(([field]) => encodeURIComponent(field)).join(",");
+		entries["__sort_order"] = sortBy.map(([, direction]) => direction).join(",");
 	}
 	if (filterValues) Object.entries(filterValues).forEach(([key, value]) => {
 		if (value) {
@@ -3105,8 +3104,11 @@ function parseFilterAndSort(search) {
 	const filterValues = {};
 	let sortBy = void 0;
 	entries.forEach((value, key) => {
-		if (key === "__sort") sortBy = [decodeURIComponent(value), entries.get("__sort_order")];
-		else if (key.endsWith("_op")) {
+		if (key === "__sort") {
+			const directions = (entries.get("__sort_order") ?? "").split(",");
+			const keys = value.split(",").map((field) => decodeURIComponent(field).trim()).filter(Boolean).map((field, index) => [field, directions[index] === "desc" ? "desc" : "asc"]);
+			sortBy = keys.length > 0 ? keys : void 0;
+		} else if (key.endsWith("_op")) {
 			const field = key.replace("_op", "");
 			const filterOp = decodeURIComponent(value);
 			const filterValStr = entries.get(`${field}_value`);
@@ -3408,6 +3410,7 @@ var UIStyleGuide = () => {
 							children: variant
 						}), /* @__PURE__ */ jsxs(Typography, {
 							variant,
+							component: "p",
 							children: [
 								"The quick brown fox jumps over the lazy dog (",
 								variant,
@@ -5899,10 +5902,10 @@ function CrmDashboardDemo() {
 				children: [
 					/* @__PURE__ */ jsxs("div", {
 						className: "flex flex-col sm:flex-row sm:items-end justify-between mb-6 gap-4",
-						children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs(Typography, {
+						children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Typography, {
 							variant: "h4",
 							className: "tracking-tight",
-							children: [getGreeting(), " 👋"]
+							children: getGreeting()
 						}), /* @__PURE__ */ jsxs(Typography, {
 							variant: "body2",
 							color: "secondary",
@@ -7800,6 +7803,7 @@ function UIReferenceView() {
 									children: v
 								}), /* @__PURE__ */ jsx(Typography, {
 									variant: v,
+									component: "p",
 									children: "The quick brown fox jumps over the lazy dog"
 								})]
 							}, v))