@tulip-systems/drive 0.8.3 → 0.10.0

package/dist/client.d.mts

@@ -2,4 +2,5 @@ import { DriveGrid, DriveGridBottombar, DriveGridEmpty, DriveGridEmptyProps, Dri
 import { DriveGridCard, DriveGridCardSkeleton, DriveGridFileCard, DriveGridFolderCard } from "./components/grid-card.client.mjs";
 import { DriveSelectionContextValue, DriveSelectionProvider, useDriveSelectionContext } from "./components/selection.client.mjs";
 import { DriveViewContextValue, DriveViewMode, DriveViewProvider, DriveViewProviderProps, useDriveViewContext } from "./components/view.client.mjs";
-export { DriveGrid, DriveGridBottombar, DriveGridCard, DriveGridCardSkeleton, DriveGridEmpty, DriveGridEmptyProps, DriveGridFileCard, DriveGridFolderCard, DriveGridLoading, DriveGridLoadingProps, DriveGridProps, DriveSelectionContextValue, DriveSelectionProvider, DriveViewContextValue, DriveViewMode, DriveViewProvider, DriveViewProviderProps, useDriveSelectionContext, useDriveViewContext };
+import { CreateDriveViewConfigInput, DriveViewCommands, DriveViewConfig, DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig } from "./lib/view-config.client.mjs";
+export { CreateDriveViewConfigInput, DriveGrid, DriveGridBottombar, DriveGridCard, DriveGridCardSkeleton, DriveGridEmpty, DriveGridEmptyProps, DriveGridFileCard, DriveGridFolderCard, DriveGridLoading, DriveGridLoadingProps, DriveGridProps, DriveSelectionContextValue, DriveSelectionProvider, DriveViewCommands, DriveViewConfig, DriveViewConfigProvider, DriveViewContextValue, DriveViewMode, DriveViewProvider, DriveViewProviderProps, createDriveViewConfig, useDriveSelectionContext, useDriveViewConfig, useDriveViewContext };

package/dist/client.mjs

@@ -2,5 +2,6 @@ import { DriveSelectionProvider, useDriveSelectionContext } from "./components/s
 import { DriveGridCard, DriveGridCardSkeleton, DriveGridFileCard, DriveGridFolderCard } from "./components/grid-card.client.mjs";
 import { DriveGrid, DriveGridBottombar, DriveGridEmpty, DriveGridLoading } from "./components/grid.client.mjs";
 import { DriveViewProvider, useDriveViewContext } from "./components/view.client.mjs";
+import { DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig } from "./lib/view-config.client.mjs";
 
-export { DriveGrid, DriveGridBottombar, DriveGridCard, DriveGridCardSkeleton, DriveGridEmpty, DriveGridFileCard, DriveGridFolderCard, DriveGridLoading, DriveSelectionProvider, DriveViewProvider, useDriveSelectionContext, useDriveViewContext };
+export { DriveGrid, DriveGridBottombar, DriveGridCard, DriveGridCardSkeleton, DriveGridEmpty, DriveGridFileCard, DriveGridFolderCard, DriveGridLoading, DriveSelectionProvider, DriveViewConfigProvider, DriveViewProvider, createDriveViewConfig, useDriveSelectionContext, useDriveViewConfig, useDriveViewContext };

package/dist/components/grid-card.client.d.mts

@@ -2,7 +2,7 @@ import { DriveNode } from "../lib/dto.mjs";
 import { ComponentProps } from "react";
 import { ImageLoaderProps } from "next/image";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
-import { CommandDef } from "@tulip-systems/core/commands";
+import { CommandFor } from "@tulip-systems/core/commands";
 
 //#region src/components/grid-card.client.d.ts
 /**
@@ -10,7 +10,7 @@ import { CommandDef } from "@tulip-systems/core/commands";
  */
 type DriveGridCardProps<TData extends DriveNode> = ComponentProps<"div"> & {
   node: TData;
-  commands?: CommandDef<TData>[];
+  commands?: CommandFor<TData>[];
   imageLoader?: (props: ImageLoaderProps) => string;
   unoptimized?: boolean;
 };

package/dist/lib/view-config.client.d.mts

@@ -0,0 +1,57 @@
+import { Selection, TableColumnDef, TableFiltersResult, TableMetaInput } from "@tulip-systems/core/data-tables";
+import { PropsWithChildren } from "react";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
+import { TableConfigContextValue, useInfiniteStrategy } from "@tulip-systems/core/data-tables/client";
+import { CommandFor } from "@tulip-systems/core/commands";
+import { VisibilityState } from "@tanstack/react-table";
+
+//#region src/lib/view-config.client.d.ts
+/**
+ * DriveViewConfig context
+ */
+type DriveViewCommands<TData, TMeta = object> = {
+  node?: CommandFor<TData, TMeta>[];
+  selectedNodes?: CommandFor<TData[], TMeta>[];
+};
+type DriveViewConfigContextValue<TData, TMeta = object> = {
+  commands?: DriveViewCommands<TData, TMeta>;
+};
+/**
+ * Drive View configuration
+ */
+type DriveViewConfig<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>> = DriveViewConfigContextValue<TData, TMeta> & Omit<TableConfigContextValue<TData, TableFiltersResult, TMeta>, "commands">;
+type CreateDriveViewConfigInput<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>> = {
+  queryData: TData[];
+  columns: TableColumnDef<TData>[];
+  strategy: ReturnType<typeof useInfiniteStrategy>;
+  commands?: DriveViewCommands<TData, TMeta>;
+  meta?: TMeta;
+  columnVisibility?: VisibilityState;
+  selection?: Selection;
+  getRowId?: (row: TData) => string;
+};
+declare function createDriveViewConfig<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>>({
+  queryData,
+  columns,
+  strategy,
+  commands,
+  meta,
+  columnVisibility,
+  selection,
+  getRowId
+}: CreateDriveViewConfigInput<TData, TMeta>): DriveViewConfig<TData, TMeta>;
+/**
+ * DriveViewConfigProvider component
+ * Wraps the children components with the DriveViewConfigContext provider
+ * and provides the configuration for the drive view
+ */
+type DriveViewConfigProviderProps<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>> = PropsWithChildren<{
+  config: ReturnType<typeof createDriveViewConfig<TData, TMeta>>;
+}>;
+declare function DriveViewConfigProvider<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>>({
+  config,
+  children
+}: DriveViewConfigProviderProps<TData, TMeta>): react_jsx_runtime0.JSX.Element;
+declare function useDriveViewConfig<TData, TMeta extends TableMetaInput<TData> = TableMetaInput<TData>>(): DriveViewConfig<TData, TMeta>;
+//#endregion
+export { CreateDriveViewConfigInput, DriveViewCommands, DriveViewConfig, DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig };

package/dist/lib/view-config.client.mjs

@@ -0,0 +1,46 @@
+"use client";
+
+import { createContext, use } from "react";
+import { jsx } from "react/jsx-runtime";
+import { TableConfigProvider, createTableConfig, useTableConfigContext } from "@tulip-systems/core/data-tables/client";
+
+//#region src/lib/view-config.client.tsx
+const DriveViewConfigContext = createContext({});
+function createDriveViewConfig({ queryData, columns, strategy, commands, meta, columnVisibility, selection, getRowId = (row) => row.id }) {
+	const { commands: _commands, ...table } = createTableConfig({
+		queryData,
+		columns,
+		getRowId,
+		strategy,
+		meta,
+		columnVisibility,
+		selection
+	});
+	return {
+		...table,
+		commands
+	};
+}
+function DriveViewConfigProvider({ config, children }) {
+	return /* @__PURE__ */ jsx(DriveViewConfigContext, {
+		value: config,
+		children: /* @__PURE__ */ jsx(TableConfigProvider, {
+			config: {
+				...config,
+				commands: config.commands?.selectedNodes
+			},
+			children
+		})
+	});
+}
+function useDriveViewConfig() {
+	const tableConfig = useTableConfigContext();
+	const viewConfig = use(DriveViewConfigContext);
+	return {
+		...tableConfig,
+		...viewConfig
+	};
+}
+
+//#endregion
+export { DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig };

package/dist/providers/google/components/view.client.d.mts

@@ -1,9 +1,9 @@
+import { DriveViewCommands } from "../../../lib/view-config.client.mjs";
 import { GoogleDriveNode } from "../lib/validators.mjs";
 import { TableColumnDef } from "@tulip-systems/core/data-tables";
 import { ComponentProps } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { useInfiniteStrategy } from "@tulip-systems/core/data-tables/client";
-import { CommandDef } from "@tulip-systems/core/commands";
 import { VisibilityState } from "@tanstack/react-table";
 
 //#region src/providers/google/components/view.client.d.ts
@@ -14,7 +14,7 @@ type GoogleDriveViewProviderProps<TData extends GoogleDriveNode = GoogleDriveNod
   queryData: TData[];
   columns?: TableColumnDef<TData>[];
   strategy: ReturnType<typeof useInfiniteStrategy>;
-  commands?: CommandDef<TData>[];
+  commands?: DriveViewCommands<TData>;
   columnVisibility?: VisibilityState;
 };
 declare function GoogleDriveViewProvider<TData extends GoogleDriveNode = GoogleDriveNode>({

package/dist/providers/google/components/view.client.mjs

@@ -4,27 +4,27 @@ import { useDriveSelectionContext } from "../../../components/selection.client.m
 import { DriveGridCard, DriveGridCardSkeleton } from "../../../components/grid-card.client.mjs";
 import { DriveGrid, DriveGridBottombar, DriveGridEmpty, DriveGridLoading } from "../../../components/grid.client.mjs";
 import { useDriveViewContext } from "../../../components/view.client.mjs";
+import { DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig } from "../../../lib/view-config.client.mjs";
 import { googleDriveColumns } from "../config/columns-data.mjs";
 import { useGoogleDriveContext } from "./provider.client.mjs";
 import { TableLayout, TableSkeleton } from "@tulip-systems/core/data-tables";
 import { useMemo } from "react";
 import { FloatingCommandMenu } from "@tulip-systems/core/commands/client";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { DataTable, TableConfigProvider, createTableConfig, useTableConfigContext } from "@tulip-systems/core/data-tables/client";
+import { DataTable } from "@tulip-systems/core/data-tables/client";
 
 //#region src/providers/google/components/view.client.tsx
 function GoogleDriveViewProvider({ queryData, columns = googleDriveColumns, strategy, commands, columnVisibility, children, ...props }) {
 	const { meta } = useGoogleDriveContext();
-	const { selection } = useDriveSelectionContext();
-	return /* @__PURE__ */ jsx(TableConfigProvider, {
-		config: createTableConfig({
+	return /* @__PURE__ */ jsx(DriveViewConfigProvider, {
+		config: createDriveViewConfig({
 			queryData,
 			columns,
 			strategy,
 			commands,
 			meta,
 			columnVisibility,
-			selection
+			selection: useDriveSelectionContext()?.selection
 		}),
 		children: /* @__PURE__ */ jsx(TableLayout, {
 			...props,
@@ -45,7 +45,7 @@ function GoogleDriveView() {
 * GoogleDriveGrid
 */
 function GoogleDriveGrid(props) {
-	const { queryData, strategy, commands, selection, meta } = useTableConfigContext();
+	const { queryData, strategy, commands, selection, meta } = useDriveViewConfig();
 	const { rowCount, paginationState } = strategy;
 	const { isFetching, isFetchingNextPage, fetchNextPage } = strategy.meta;
 	const hasNextPage = rowCount == null ? false : queryData.length < rowCount;
@@ -55,7 +55,7 @@ function GoogleDriveGrid(props) {
 		children: [
 			queryData.length > 0 ? queryData.map((node) => /* @__PURE__ */ jsx(DriveGridCard, {
 				node,
-				commands,
+				commands: commands?.node,
 				unoptimized: true
 			}, node.id)) : /* @__PURE__ */ jsx(DriveGridEmpty, { title: "Geen resultaten gevonden" }),
 			isFetchingNextPage && Array.from({ length: paginationState?.pageSize ?? 0 }).map((_, index) => /* @__PURE__ */ jsx(DriveGridCardSkeleton, {}, index)),
@@ -65,9 +65,9 @@ function GoogleDriveGrid(props) {
 				isFetching,
 				isFetchingNextPage
 			}),
-			commands && commands.length > 0 && /* @__PURE__ */ jsx(FloatingCommandMenu, {
+			commands?.selectedNodes && commands.selectedNodes.length > 0 && /* @__PURE__ */ jsx(FloatingCommandMenu, {
 				data: selectedData,
-				commands,
+				commands: commands.selectedNodes,
 				meta,
 				state: selectedData.length > 0 ? "open" : "closed",
 				onSuccess: () => selection?.setRowSelection?.({})

package/dist/providers/google/config/columns-data.mjs

@@ -6,8 +6,8 @@ import { TableColumnHeader } from "@tulip-systems/core/data-tables";
 import { findStatus } from "@tulip-systems/core/components";
 import { FolderIcon } from "lucide-react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@tulip-systems/core/components/client";
 import { TableTextCell, createTableSelectCell } from "@tulip-systems/core/data-tables/client";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@tulip-systems/core/components/client";
 import Link from "next/link";
 import { createSerializer, useQueryStates } from "nuqs";
 

package/dist/providers/google/lib/router.server.d.mts

@@ -315,7 +315,7 @@ declare function createGoogleDriveProcedures<TSchema extends TDatabaseSchema>(dr
     trashedAt: Date | null;
     googleParents: string[];
     canEdit: boolean | null;
-  }, "id" | "name" | "parentId"> & {
+  }, "name" | "parentId" | "id"> & {
     depth: number;
   })[], (Pick<{
     id: string;
@@ -348,7 +348,7 @@ declare function createGoogleDriveProcedures<TSchema extends TDatabaseSchema>(dr
     trashedAt: Date | null;
     googleParents: string[];
     canEdit: boolean | null;
-  }, "id" | "name" | "parentId"> & {
+  }, "name" | "parentId" | "id"> & {
     depth: number;
   })[]>, Record<never, never>, Record<never, never>>;
   createFolder: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<_tulip_systems_core_router_server0.RPCContext<TSchema> & Record<never, never>, _tulip_systems_core_router_server0.RPCContext<TSchema> & Record<never, never>, _tulip_systems_core_router_server0.RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<_tulip_systems_core_router_server0.RPCContext<TSchema>, _tulip_systems_core_router_server0.ProtectedRPCContext<TSchema>>, z.ZodObject<{

package/dist/providers/local/components/view.client.d.mts

@@ -1,9 +1,9 @@
+import { DriveViewCommands } from "../../../lib/view-config.client.mjs";
 import { LocalDriveNodeWithAsset } from "../lib/validators.mjs";
 import { TableColumnDef } from "@tulip-systems/core/data-tables";
 import { ComponentProps } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { useInfiniteStrategy } from "@tulip-systems/core/data-tables/client";
-import { CommandDef } from "@tulip-systems/core/commands";
 import { VisibilityState } from "@tanstack/react-table";
 
 //#region src/providers/local/components/view.client.d.ts
@@ -11,7 +11,7 @@ type LocalDriveViewProviderProps<TData extends LocalDriveNodeWithAsset = LocalDr
   queryData: TData[];
   columns?: TableColumnDef<TData>[];
   strategy: ReturnType<typeof useInfiniteStrategy>;
-  commands?: CommandDef<TData>[];
+  commands?: DriveViewCommands<TData>;
   columnVisibility?: VisibilityState;
 };
 declare function LocalDriveViewProvider<TData extends LocalDriveNodeWithAsset = LocalDriveNodeWithAsset>({

package/dist/providers/local/components/view.client.mjs

@@ -4,6 +4,7 @@ import { useDriveSelectionContext } from "../../../components/selection.client.m
 import { DriveGridCard, DriveGridCardSkeleton } from "../../../components/grid-card.client.mjs";
 import { DriveGrid, DriveGridBottombar, DriveGridEmpty, DriveGridLoading } from "../../../components/grid.client.mjs";
 import { useDriveViewContext } from "../../../components/view.client.mjs";
+import { DriveViewConfigProvider, createDriveViewConfig, useDriveViewConfig } from "../../../lib/view-config.client.mjs";
 import { localDriveColumns } from "../config/columns-data.mjs";
 import { localDriveImageLoader } from "../lib/helpers.mjs";
 import { useLocalDriveUploadZone } from "./upload-zone-context.client.mjs";
@@ -12,21 +13,20 @@ import { TableLayout, TableSkeleton } from "@tulip-systems/core/data-tables";
 import { useMemo } from "react";
 import { FloatingCommandMenu } from "@tulip-systems/core/commands/client";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { DataTable, TableConfigProvider, createTableConfig, useTableConfigContext } from "@tulip-systems/core/data-tables/client";
+import { DataTable } from "@tulip-systems/core/data-tables/client";
 
 //#region src/providers/local/components/view.client.tsx
 function LocalDriveViewProvider({ queryData, columns = localDriveColumns, strategy, commands, columnVisibility, children, ...props }) {
 	const { meta } = useLocalDriveContext();
-	const { selection } = useDriveSelectionContext();
-	return /* @__PURE__ */ jsx(TableConfigProvider, {
-		config: createTableConfig({
+	return /* @__PURE__ */ jsx(DriveViewConfigProvider, {
+		config: createDriveViewConfig({
 			queryData,
 			columns,
 			strategy,
 			commands,
 			meta,
 			columnVisibility,
-			selection
+			selection: useDriveSelectionContext()?.selection
 		}),
 		children: /* @__PURE__ */ jsx(TableLayout, {
 			...props,
@@ -41,7 +41,7 @@ function LocalDriveView() {
 	return null;
 }
 function LocalDriveGrid(props) {
-	const { queryData, strategy, commands, selection, meta } = useTableConfigContext();
+	const { queryData, strategy, commands, selection, meta } = useDriveViewConfig();
 	const { optimistic } = useLocalDriveUploadZone();
 	const { rowCount, paginationState } = strategy;
 	const { isFetching, isFetchingNextPage, fetchNextPage } = strategy.meta;
@@ -52,7 +52,7 @@ function LocalDriveGrid(props) {
 		children: [
 			queryData.length > 0 ? queryData.filter((node) => !node.hidden).map((node) => /* @__PURE__ */ jsx(DriveGridCard, {
 				node,
-				commands,
+				commands: commands?.node,
 				imageLoader: localDriveImageLoader
 			}, node.id)) : /* @__PURE__ */ jsx(DriveGridEmpty, { title: "Geen resultaten gevonden" }),
 			isFetchingNextPage && Array.from({ length: paginationState?.pageSize ?? 0 }).map((_, index) => /* @__PURE__ */ jsx(DriveGridCardSkeleton, {}, index)),
@@ -62,9 +62,9 @@ function LocalDriveGrid(props) {
 				isFetching,
 				isFetchingNextPage
 			}),
-			commands && commands.length > 0 && /* @__PURE__ */ jsx(FloatingCommandMenu, {
+			commands?.selectedNodes && commands?.selectedNodes.length > 0 && /* @__PURE__ */ jsx(FloatingCommandMenu, {
 				data: selectedData,
-				commands,
+				commands: commands.selectedNodes,
 				meta,
 				state: selectedData.length > 0 ? "open" : "closed",
 				onSuccess: () => {

package/dist/providers/local/config/columns-data.mjs

@@ -6,8 +6,8 @@ import { TableColumnHeader } from "@tulip-systems/core/data-tables";
 import { findStatus } from "@tulip-systems/core/components";
 import { FolderIcon } from "lucide-react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@tulip-systems/core/components/client";
 import { TableTextCell, createTableSelectCell } from "@tulip-systems/core/data-tables/client";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@tulip-systems/core/components/client";
 import Link from "next/link";
 import { createSerializer, useQueryStates } from "nuqs";
 

package/dist/providers/local/config/sorting.mjs

@@ -0,0 +1,16 @@
+import { nodes } from "../lib/schema.mjs";
+import { asc, getTableColumns } from "drizzle-orm";
+import { createTableQuerySortingParser } from "@tulip-systems/core/data-tables/server";
+
+//#region src/providers/local/config/sorting.ts
+/**
+* Local Drive specific sorting config
+*/
+const localDriveTableQuerySortingConfig = getTableColumns(nodes);
+/**
+* Local Drive specific sorting parser
+*/
+const parseLocalDriveTableQuerySorting = createTableQuerySortingParser(localDriveTableQuerySortingConfig, { fallback: asc(nodes.createdAt) });
+
+//#endregion
+export { parseLocalDriveTableQuerySorting };

package/dist/providers/local/lib/router.server.d.mts

@@ -13944,38 +13944,38 @@ declare function createLocalDriveProcedures(drive: LocalDrive<DriveSchema>): {
     id: z.ZodNullable<z.ZodString>;
     namespace: z.ZodString;
   }, z.core.$strip>, _orpc_contract0.Schema<(Pick<{
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
     name: string;
+    namespace: string;
     type: "file" | "folder" | null;
-    readonly: boolean | null;
+    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
-    namespace: string;
-    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
+    readonly: boolean | null;
     hidden: boolean | null;
     archivedAt: Date | null;
     parentId: string | null;
-    assetId: string | null;
-  }, "id" | "name" | "parentId"> & {
-    depth: number;
-  })[], (Pick<{
     id: string;
     createdAt: Date;
     updatedAt: Date;
+    assetId: string | null;
+  }, "name" | "parentId" | "id"> & {
+    depth: number;
+  })[], (Pick<{
     name: string;
+    namespace: string;
     type: "file" | "folder" | null;
-    readonly: boolean | null;
+    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
-    namespace: string;
-    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
+    readonly: boolean | null;
     hidden: boolean | null;
     archivedAt: Date | null;
     parentId: string | null;
+    id: string;
+    createdAt: Date;
+    updatedAt: Date;
     assetId: string | null;
-  }, "id" | "name" | "parentId"> & {
+  }, "name" | "parentId" | "id"> & {
     depth: number;
   })[]>, Record<never, never>, Record<never, never>>;
   /**
@@ -19473,19 +19473,19 @@ declare function createLocalDriveProcedures(drive: LocalDrive<DriveSchema>): {
     presignedUrl: string;
     node: LocalDriveFileNode;
     asset: {
+      contentType: string | null;
+      size: number | null;
+      metadata: unknown;
+      key: string;
+      status: "error" | "pending" | "ready";
       id: string;
       createdAt: Date;
       updatedAt: Date;
       name: string | null;
-      key: string;
-      metadata: unknown;
       provider: "s3";
-      uploadId: string;
-      visibility: "private" | "public";
-      size: number | null;
-      contentType: string | null;
       bucket: string;
-      status: "error" | "pending" | "ready";
+      visibility: "private" | "public";
+      uploadId: string;
       etag: string | null;
       uploadedAt: Date;
       deletedAt: Date | null;
@@ -19495,19 +19495,19 @@ declare function createLocalDriveProcedures(drive: LocalDrive<DriveSchema>): {
     presignedUrl: string;
     node: LocalDriveFileNode;
     asset: {
+      contentType: string | null;
+      size: number | null;
+      metadata: unknown;
+      key: string;
+      status: "error" | "pending" | "ready";
       id: string;
       createdAt: Date;
       updatedAt: Date;
       name: string | null;
-      key: string;
-      metadata: unknown;
       provider: "s3";
-      uploadId: string;
-      visibility: "private" | "public";
-      size: number | null;
-      contentType: string | null;
       bucket: string;
-      status: "error" | "pending" | "ready";
+      visibility: "private" | "public";
+      uploadId: string;
       etag: string | null;
       uploadedAt: Date;
       deletedAt: Date | null;

package/dist/providers/local/lib/service.server.d.mts

@@ -104,21 +104,21 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     id: string | null;
     namespace: string;
   }): Promise<(Pick<{
-    id: string;
-    createdAt: Date;
-    updatedAt: Date;
     name: string;
+    namespace: string;
     type: "file" | "folder" | null;
-    readonly: boolean | null;
+    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
-    namespace: string;
-    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
+    readonly: boolean | null;
     hidden: boolean | null;
     archivedAt: Date | null;
     parentId: string | null;
+    id: string;
+    createdAt: Date;
+    updatedAt: Date;
     assetId: string | null;
-  }, "id" | "name" | "parentId"> & {
+  }, "name" | "parentId" | "id"> & {
     depth: number;
   })[]>;
   /**
@@ -247,19 +247,19 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     presignedUrl: string;
     node: LocalDriveFileNode;
     asset: {
+      contentType: string | null;
+      size: number | null;
+      metadata: unknown;
+      key: string;
+      status: "error" | "pending" | "ready";
       id: string;
       createdAt: Date;
       updatedAt: Date;
       name: string | null;
-      key: string;
-      metadata: unknown;
       provider: "s3";
-      uploadId: string;
-      visibility: "private" | "public";
-      size: number | null;
-      contentType: string | null;
       bucket: string;
-      status: "error" | "pending" | "ready";
+      visibility: "private" | "public";
+      uploadId: string;
       etag: string | null;
       uploadedAt: Date;
       deletedAt: Date | null;

package/dist/providers/local/lib/service.server.mjs

@@ -2,12 +2,13 @@ import { deviceSizes } from "./constants.mjs";
 import { inferLocalDriveNodeSubtype, isLocalDriveFile, isLocalDriveFolder, toLocalDriveNode } from "./helpers.mjs";
 import { nodePresignedUrls, nodeVariants, nodes } from "./schema.mjs";
 import { getLocalFileURLSchemaDefaults } from "./validators.mjs";
+import { parseLocalDriveTableQuerySorting } from "../config/sorting.mjs";
 import { storageAssets } from "@tulip-systems/core/storage";
-import { and, asc, desc, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
+import { and, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
 import { ServerError } from "@tulip-systems/core/router/server";
 import { after } from "next/server";
 import stream from "node:stream/consumers";
-import { convertOrderByToQueryParams, convertSearchToQueryParams, createTableQueryResponse } from "@tulip-systems/core/data-tables/server";
+import { convertSearchToQueryParams, createTableQueryResponse } from "@tulip-systems/core/data-tables/server";
 import { addSeconds } from "date-fns";
 
 //#region src/providers/local/lib/service.server.ts
@@ -105,11 +106,11 @@ var LocalDrive = class {
 	* @returns A promise resolving to the matching child nodes.
 	*/
 	async getNodesByParentId({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, asc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const parentFilter = filters.parentId ? eq(nodes.parentId, filters.parentId) : isNull(nodes.parentId);
-		return (await this.#db.select().from(nodes).where(and(filters.nodeIds != null ? inArray(nodes.id, filters.nodeIds) : void 0, filters.types != null ? inArray(nodes.type, filters.types) : void 0, archivedFilter, filters.hidden != null ? eq(nodes.hidden, filters.hidden) : void 0, parentFilter, eq(nodes.namespace, filters.namespace), search)).orderBy(orderBy)).map(toLocalDriveNode);
+		return (await this.#db.select().from(nodes).where(and(filters.nodeIds != null ? inArray(nodes.id, filters.nodeIds) : void 0, filters.types != null ? inArray(nodes.type, filters.types) : void 0, archivedFilter, filters.hidden != null ? eq(nodes.hidden, filters.hidden) : void 0, parentFilter, eq(nodes.namespace, filters.namespace), search)).orderBy(...orderBy)).map(toLocalDriveNode);
 	}
 	/**
 	* Lists tree-scoped nodes with pagination, search, and richer local filters.
@@ -121,7 +122,7 @@ var LocalDrive = class {
 	* @returns A paginated table-query response.
 	*/
 	async listTree({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const parentFilter = filters.parentId ? eq(nodes.parentId, filters.parentId) : isNull(nodes.parentId);
@@ -132,7 +133,7 @@ var LocalDrive = class {
 			return [await tx.select({
 				...getTableColumns(nodes),
 				asset: storageAssets
-			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
+			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(...orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
 		});
 		return createTableQueryResponse({
 			data: data.map(({ asset, ...node }) => ({
@@ -153,7 +154,7 @@ var LocalDrive = class {
 	* @returns A paginated table-query response.
 	*/
 	async listFlat({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const limit = query.limit;
@@ -163,7 +164,7 @@ var LocalDrive = class {
 			return [await tx.select({
 				...getTableColumns(nodes),
 				asset: storageAssets
-			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
+			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(...orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
 		});
 		return createTableQueryResponse({
 			data: data.map(({ asset, ...node }) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tulip-systems/drive",
-  "version": "0.8.3",
+  "version": "0.10.0",
   "type": "module",
   "sideEffects": false,
   "license": "AGPL-3.0",
@@ -65,7 +65,7 @@
     "uuid": "^14.0.0",
     "vaul": "^1.1.2",
     "zod": "^4.4.3",
-    "@tulip-systems/core": "0.8.3"
+    "@tulip-systems/core": "0.10.0"
   },
   "peerDependencies": {
     "@tailwindcss/typography": "^0.5.19",

package/src/components/grid-card.client.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useDraggable, useDroppable } from "@dnd-kit/react";
-import type { CommandDef } from "@tulip-systems/core/commands";
+import type { CommandFor } from "@tulip-systems/core/commands";
 import {
   ContextCommandMenu,
   ContextCommandMenuContent,
@@ -29,7 +29,7 @@ import { useDriveSelectionContext } from "./selection.client";
  */
 type DriveGridCardProps<TData extends DriveNode> = ComponentProps<"div"> & {
   node: TData;
-  commands?: CommandDef<TData>[];
+  commands?: CommandFor<TData>[];
   imageLoader?: (props: ImageLoaderProps) => string;
   unoptimized?: boolean;
 };

package/src/entry.client.ts

@@ -5,3 +5,8 @@ export * from "@/components/grid-card.client";
  */
 export * from "@/components/selection.client";
 export * from "@/components/view.client";
+
+/**
+ * Lib
+ */
+export * from "@/lib/view-config.client";

package/src/lib/view-config.client.tsx

@@ -0,0 +1,116 @@
+"use client";
+
+import type { VisibilityState } from "@tanstack/react-table";
+import type { CommandFor } from "@tulip-systems/core/commands";
+import type {
+  Selection,
+  TableColumnDef,
+  TableFiltersResult,
+  TableMetaInput,
+} from "@tulip-systems/core/data-tables";
+import {
+  createTableConfig,
+  type TableConfigContextValue,
+  TableConfigProvider,
+  type useInfiniteStrategy,
+  useTableConfigContext,
+} from "@tulip-systems/core/data-tables/client";
+import { createContext, type PropsWithChildren, use } from "react";
+
+/**
+ * DriveViewConfig context
+ */
+export type DriveViewCommands<TData, TMeta = object> = {
+  node?: CommandFor<TData, TMeta>[];
+  selectedNodes?: CommandFor<TData[], TMeta>[];
+};
+
+type DriveViewConfigContextValue<TData, TMeta = object> = {
+  commands?: DriveViewCommands<TData, TMeta>;
+};
+
+const DriveViewConfigContext = createContext({} as DriveViewConfigContextValue<any, any>);
+
+/**
+ * Drive View configuration
+ */
+export type DriveViewConfig<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+> = DriveViewConfigContextValue<TData, TMeta> &
+  Omit<TableConfigContextValue<TData, TableFiltersResult, TMeta>, "commands">;
+
+export type CreateDriveViewConfigInput<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+> = {
+  queryData: TData[];
+  columns: TableColumnDef<TData>[];
+  strategy: ReturnType<typeof useInfiniteStrategy>;
+  commands?: DriveViewCommands<TData, TMeta>;
+  meta?: TMeta;
+  columnVisibility?: VisibilityState;
+  selection?: Selection;
+  getRowId?: (row: TData) => string;
+};
+
+export function createDriveViewConfig<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+>({
+  queryData,
+  columns,
+  strategy,
+  commands,
+  meta,
+  columnVisibility,
+  selection,
+  getRowId = (row) => (row as { id: string }).id,
+}: CreateDriveViewConfigInput<TData, TMeta>) {
+  const { commands: _commands, ...table } = createTableConfig<TData, TableFiltersResult, TMeta>({
+    queryData,
+    columns,
+    getRowId,
+    strategy,
+    meta,
+    columnVisibility,
+    selection,
+  });
+
+  return { ...table, commands } as DriveViewConfig<TData, TMeta>;
+}
+
+/**
+ * DriveViewConfigProvider component
+ * Wraps the children components with the DriveViewConfigContext provider
+ * and provides the configuration for the drive view
+ */
+type DriveViewConfigProviderProps<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+> = PropsWithChildren<{
+  config: ReturnType<typeof createDriveViewConfig<TData, TMeta>>;
+}>;
+
+export function DriveViewConfigProvider<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+>({ config, children }: DriveViewConfigProviderProps<TData, TMeta>) {
+  return (
+    <DriveViewConfigContext value={config}>
+      <TableConfigProvider config={{ ...config, commands: config.commands?.selectedNodes }}>
+        {children}
+      </TableConfigProvider>
+    </DriveViewConfigContext>
+  );
+}
+
+export function useDriveViewConfig<
+  TData,
+  TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
+>() {
+  const tableConfig = useTableConfigContext<TData, TableFiltersResult, TMeta>();
+  const viewConfig = use(DriveViewConfigContext) as DriveViewConfigContextValue<TData, TMeta>;
+
+  return { ...tableConfig, ...viewConfig } as DriveViewConfig<TData, TMeta>;
+}

package/src/providers/google/components/view.client.tsx

@@ -1,16 +1,12 @@
 "use client";
 
 import type { VisibilityState } from "@tanstack/react-table";
-import type { CommandDef } from "@tulip-systems/core/commands";
 import { FloatingCommandMenu } from "@tulip-systems/core/commands/client";
 import { type TableColumnDef, TableLayout, TableSkeleton } from "@tulip-systems/core/data-tables";
 import {
-  createTableConfig,
   DataTable,
   type InfiniteStrategyMeta,
-  TableConfigProvider,
   type useInfiniteStrategy,
-  useTableConfigContext,
 } from "@tulip-systems/core/data-tables/client";
 import { type ComponentProps, useMemo } from "react";
 import {
@@ -22,6 +18,12 @@ import {
 import { DriveGridCard, DriveGridCardSkeleton } from "@/components/grid-card.client";
 import { useDriveSelectionContext } from "@/components/selection.client";
 import { useDriveViewContext } from "@/components/view.client";
+import {
+  createDriveViewConfig,
+  type DriveViewCommands,
+  DriveViewConfigProvider,
+  useDriveViewConfig,
+} from "@/lib/view-config.client";
 import { googleDriveColumns } from "../config/columns-data";
 import type { GoogleDriveNode } from "../lib/validators";
 import { useGoogleDriveContext } from "./provider.client";
@@ -34,7 +36,7 @@ type GoogleDriveViewProviderProps<TData extends GoogleDriveNode = GoogleDriveNod
     queryData: TData[];
     columns?: TableColumnDef<TData>[];
     strategy: ReturnType<typeof useInfiniteStrategy>;
-    commands?: CommandDef<TData>[];
+    commands?: DriveViewCommands<TData>;
     columnVisibility?: VisibilityState;
   };
 
@@ -48,25 +50,21 @@ export function GoogleDriveViewProvider<TData extends GoogleDriveNode = GoogleDr
   ...props
 }: GoogleDriveViewProviderProps<TData>) {
   const { meta } = useGoogleDriveContext();
-  const { selection } = useDriveSelectionContext();
-
-  /**
-   * Table
-   */
-  const config = createTableConfig<TData>({
+  const selectionContext = useDriveSelectionContext();
+  const config = createDriveViewConfig<TData>({
     queryData,
     columns,
     strategy,
     commands,
     meta,
     columnVisibility,
-    selection,
+    selection: selectionContext?.selection,
   });
 
   return (
-    <TableConfigProvider config={config}>
+    <DriveViewConfigProvider config={config}>
       <TableLayout {...props}>{children}</TableLayout>
-    </TableConfigProvider>
+    </DriveViewConfigProvider>
   );
 }
 
@@ -91,8 +89,7 @@ export function GoogleDriveView() {
  * GoogleDriveGrid
  */
 function GoogleDriveGrid(props: ComponentProps<"div">) {
-  const { queryData, strategy, commands, selection, meta } =
-    useTableConfigContext<GoogleDriveNode>();
+  const { queryData, strategy, commands, selection, meta } = useDriveViewConfig<GoogleDriveNode>();
   const { rowCount, paginationState } = strategy;
   const { isFetching, isFetchingNextPage, fetchNextPage } = strategy.meta as InfiniteStrategyMeta;
 
@@ -107,7 +104,7 @@ function GoogleDriveGrid(props: ComponentProps<"div">) {
     <DriveGrid {...props}>
       {queryData.length > 0 ? (
         queryData.map((node) => (
-          <DriveGridCard key={node.id} node={node} commands={commands} unoptimized />
+          <DriveGridCard key={node.id} node={node} commands={commands?.node} unoptimized />
         ))
       ) : (
         <DriveGridEmpty title="Geen resultaten gevonden" />
@@ -125,10 +122,10 @@ function GoogleDriveGrid(props: ComponentProps<"div">) {
         isFetchingNextPage={isFetchingNextPage}
       />
 
-      {commands && commands.length > 0 && (
+      {commands?.selectedNodes && commands.selectedNodes.length > 0 && (
         <FloatingCommandMenu
-          data={selectedData as never}
-          commands={commands as never}
+          data={selectedData}
+          commands={commands.selectedNodes}
           meta={meta}
           state={selectedData.length > 0 ? "open" : "closed"}
           onSuccess={() => selection?.setRowSelection?.({})}

package/src/providers/local/components/view.client.tsx

@@ -1,16 +1,12 @@
 "use client";
 
 import type { VisibilityState } from "@tanstack/react-table";
-import type { CommandDef } from "@tulip-systems/core/commands";
 import { FloatingCommandMenu } from "@tulip-systems/core/commands/client";
 import { type TableColumnDef, TableLayout, TableSkeleton } from "@tulip-systems/core/data-tables";
 import {
-  createTableConfig,
   DataTable,
   type InfiniteStrategyMeta,
-  TableConfigProvider,
   type useInfiniteStrategy,
-  useTableConfigContext,
 } from "@tulip-systems/core/data-tables/client";
 import { type ComponentProps, useMemo } from "react";
 import {
@@ -22,6 +18,12 @@ import {
 import { DriveGridCard, DriveGridCardSkeleton } from "@/components/grid-card.client";
 import { useDriveSelectionContext } from "@/components/selection.client";
 import { useDriveViewContext } from "@/components/view.client";
+import {
+  createDriveViewConfig,
+  type DriveViewCommands,
+  DriveViewConfigProvider,
+  useDriveViewConfig,
+} from "@/lib/view-config.client";
 import { localDriveColumns } from "../config/columns-data";
 import { localDriveImageLoader } from "../lib/helpers";
 import type { LocalDriveNodeWithAsset } from "../lib/validators";
@@ -33,7 +35,7 @@ type LocalDriveViewProviderProps<TData extends LocalDriveNodeWithAsset = LocalDr
     queryData: TData[];
     columns?: TableColumnDef<TData>[];
     strategy: ReturnType<typeof useInfiniteStrategy>;
-    commands?: CommandDef<TData>[];
+    commands?: DriveViewCommands<TData>;
     columnVisibility?: VisibilityState;
   };
 
@@ -49,22 +51,21 @@ export function LocalDriveViewProvider<
   ...props
 }: LocalDriveViewProviderProps<TData>) {
   const { meta } = useLocalDriveContext();
-  const { selection } = useDriveSelectionContext();
-
-  const config = createTableConfig<TData>({
+  const selectionContext = useDriveSelectionContext();
+  const config = createDriveViewConfig<TData>({
     queryData,
     columns,
     strategy,
     commands,
     meta,
     columnVisibility,
-    selection,
+    selection: selectionContext?.selection,
   });
 
   return (
-    <TableConfigProvider config={config}>
+    <DriveViewConfigProvider config={config}>
       <TableLayout {...props}>{children}</TableLayout>
-    </TableConfigProvider>
+    </DriveViewConfigProvider>
   );
 }
 
@@ -79,7 +80,7 @@ export function LocalDriveView() {
 
 function LocalDriveGrid(props: ComponentProps<"div">) {
   const { queryData, strategy, commands, selection, meta } =
-    useTableConfigContext<LocalDriveNodeWithAsset>();
+    useDriveViewConfig<LocalDriveNodeWithAsset>();
   const { optimistic } = useLocalDriveUploadZone();
 
   const { rowCount, paginationState } = strategy;
@@ -101,7 +102,7 @@ function LocalDriveGrid(props: ComponentProps<"div">) {
             <DriveGridCard
               key={node.id}
               node={node}
-              commands={commands}
+              commands={commands?.node}
               imageLoader={localDriveImageLoader}
             />
           ))
@@ -121,10 +122,10 @@ function LocalDriveGrid(props: ComponentProps<"div">) {
         isFetchingNextPage={isFetchingNextPage}
       />
 
-      {commands && commands.length > 0 && (
+      {commands?.selectedNodes && commands?.selectedNodes.length > 0 && (
         <FloatingCommandMenu
-          data={selectedData as never}
-          commands={commands as never}
+          data={selectedData}
+          commands={commands.selectedNodes}
           meta={meta}
           state={selectedData.length > 0 ? "open" : "closed"}
           onSuccess={() => {

package/src/providers/local/config/sorting.ts

@@ -0,0 +1,16 @@
+import { createTableQuerySortingParser } from "@tulip-systems/core/data-tables/server";
+import { asc, getTableColumns } from "drizzle-orm";
+import { nodes } from "../lib/schema";
+
+/**
+ * Local Drive specific sorting config
+ */
+const localDriveTableQuerySortingConfig = getTableColumns(nodes);
+
+/**
+ * Local Drive specific sorting parser
+ */
+export const parseLocalDriveTableQuerySorting = createTableQuerySortingParser(
+  localDriveTableQuerySortingConfig,
+  { fallback: asc(nodes.createdAt) },
+);

package/src/providers/local/lib/service.server.ts

@@ -2,7 +2,6 @@ import stream from "node:stream/consumers";
 import type { TDatabaseSchema } from "@tulip-systems/core/config";
 import type { TableQueryResponse } from "@tulip-systems/core/data-tables/server";
 import {
-  convertOrderByToQueryParams,
   convertSearchToQueryParams,
   createTableQueryResponse,
 } from "@tulip-systems/core/data-tables/server";
@@ -11,18 +10,7 @@ import { ServerError } from "@tulip-systems/core/router/server";
 import { type ObjectBodyInput, storageAssets } from "@tulip-systems/core/storage";
 import type { Storage } from "@tulip-systems/core/storage/server";
 import { addSeconds } from "date-fns";
-import {
-  and,
-  asc,
-  desc,
-  eq,
-  getTableColumns,
-  inArray,
-  isNotNull,
-  isNull,
-  type SQL,
-  sql,
-} from "drizzle-orm";
+import { and, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
 import { after } from "next/server";
 import type { QueryResult } from "pg";
 import type {
@@ -34,6 +22,7 @@ import type {
   DriveReader,
   DriveReadonly,
 } from "../../../lib/contracts";
+import { parseLocalDriveTableQuerySorting } from "../config/sorting";
 import { deviceSizes } from "./constants";
 import {
   inferLocalDriveNodeSubtype,
@@ -221,7 +210,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: GetLocalDriveNodesByParentIdInput): Promise<LocalDriveNode[]> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, asc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
     const archivedFilter =
       filters.isArchived === true
@@ -247,7 +236,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
           search,
         ),
       )
-      .orderBy(orderBy as SQL);
+      .orderBy(...orderBy);
 
     return items.map(toLocalDriveNode);
   }
@@ -265,7 +254,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: ListLocalDriveTreeSchema): Promise<TableQueryResponse<LocalDriveNodeWithAsset>> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
 
     const archivedFilter =
@@ -303,7 +292,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
         .from(nodes)
         .where(where)
         .leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id))
-        .orderBy(orderBy as SQL)
+        .orderBy(...orderBy)
         .limit(limit)
         .offset(offset);
 
@@ -331,7 +320,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: ListLocalDriveFlatSchema): Promise<TableQueryResponse<LocalDriveNodeWithAsset>> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
     const archivedFilter =
       filters.isArchived === true
@@ -363,7 +352,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
         .from(nodes)
         .where(where)
         .leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id))
-        .orderBy(orderBy as SQL)
+        .orderBy(...orderBy)
         .limit(limit)
         .offset(offset);