@platforma-sdk/model 1.64.0 → 1.65.0

package/src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts

@@ -125,15 +125,24 @@ export function createPlDataTableV3<A, U, S extends RequireServices<typeof Servi
     options.columnsDisplayOptions,
   );
 
+  const primaryColumnIds = new Set<PObjectId>(
+    discovered.filter((dc) => dc.isPrimary).map((dc) => dc.id),
+  );
+  const primaryColumns = annotated.direct.filter((c) => primaryColumnIds.has(c.id));
+  const secondaryColumns = annotated.direct.filter((c) => !primaryColumnIds.has(c.id));
+
+  if (primaryColumns.length === 0) return undefined;
+
   const columnIsAvailable = createColumnValidationById([
     ...annotated.direct,
     ...annotated.linked.flatMap((lc) => [...(annotated.linkers.get(lc.id) ?? []), lc]),
     ...annotated.labels,
   ]);
 
-  const filters = mergeFilters(
+  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);
+  const filters = concatFilters(
     state.pTableParams.filters,
-    remapFilterColumnIds(options.filters, discovered),
+    state.pTableParams.defaultFilters ?? remapedDefaultFilters,
   );
   validateFilters(filters, columnIsAvailable);
 
@@ -143,14 +152,6 @@ export function createPlDataTableV3<A, U, S extends RequireServices<typeof Servi
   );
   validateSorting(sorting, columnIsAvailable);
 
-  const primaryColumnIds = new Set<PObjectId>(
-    discovered.filter((dc) => dc.isPrimary).map((dc) => dc.id),
-  );
-  const primaryColumns = annotated.direct.filter((c) => primaryColumnIds.has(c.id));
-  const secondaryColumns = annotated.direct.filter((c) => !primaryColumnIds.has(c.id));
-
-  if (primaryColumns.length === 0) return undefined;
-
   const fullDef = createPTableDefV3({
     primaryJoinType,
     primaryColumns,
@@ -170,10 +171,8 @@ export function createPlDataTableV3<A, U, S extends RequireServices<typeof Servi
     ...annotated.labels,
     ...uniqueBy([...annotated.linkers.values()].flat(), (c) => c.id),
   ]);
-  if (!fullHandle || !pframeHandle) return undefined;
 
   const hiddenSpecs = state.pTableParams.hiddenColIds;
-
   const hiddenColumnIds = computeHiddenColumns(
     [...annotated.direct, ...annotated.linked],
     sorting,
@@ -202,13 +201,13 @@ export function createPlDataTableV3<A, U, S extends RequireServices<typeof Servi
     sorting,
   });
   const visibleHandle = ctx.createPTableV2(visibleDef);
-  if (!visibleHandle) return undefined;
 
   return {
     sourceId: state.pTableParams.sourceId,
     fullTableHandle: fullHandle,
     fullPframeHandle: pframeHandle,
     visibleTableHandle: visibleHandle,
+    defaultFilters: remapedDefaultFilters,
   } satisfies PlDataTableModel;
 }
 
@@ -321,17 +320,6 @@ function createColumnValidationById(fullColumns: TableColumn[]) {
   };
 }
 
-/** Merge filters from table state and options into a single filter spec. */
-function mergeFilters(
-  stateFilters: PlDataTableFilters | null,
-  optionsFilters: PlDataTableFilters | null | undefined,
-): Nil | PlDataTableFilters {
-  const normalized = optionsFilters ?? null;
-  return stateFilters !== null && normalized !== null
-    ? { type: "and", filters: [stateFilters, normalized] }
-    : (stateFilters ?? normalized);
-}
-
 /** Validate that all column references in filters exist in the table. */
 function validateFilters(
   filters: Nil | PlDataTableFilters,
@@ -347,6 +335,16 @@ function validateFilters(
   }
 }
 
+/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */
+function concatFilters(
+  a: Nil | PlDataTableFilters,
+  b: Nil | PlDataTableFilters,
+): Nil | PlDataTableFilters {
+  if (isNil(a)) return b;
+  if (isNil(b)) return a;
+  return { ...a, filters: [...a.filters, ...b.filters] };
+}
+
 /** Pick user sorting from state if non-empty, otherwise fall back to options default. */
 function resolveSorting(
   userSorting: PTableSorting[],

package/src/components/PlDataTable/index.ts

@@ -10,6 +10,8 @@ export type {
   PTableParamsV2,
   PlDataTableStateV2Normalized,
   PlDataTableModel,
+  PlDataTableFilterSpecLeaf,
+  PlDataTableFilterMeta,
   PlDataTableFilters,
   PlDataTableFiltersWithMeta,
 } from "./typesV5";

package/src/components/PlDataTable/state-migration.ts

@@ -173,6 +173,7 @@ function migrateV4toV5(
       gridState: entry.gridState,
       sheetsState: entry.sheetsState,
       filtersState,
+      defaultFiltersState: null,
     };
   });
 
@@ -192,6 +193,7 @@ function migrateV4toV5(
               state.pTableParams.hiddenColIds?.map((id) => ({ type: "column" as const, id })) ??
               null,
             filters: distillFilterSpec(currentCache.filtersState),
+            defaultFilters: null,
             sorting: state.pTableParams.sorting,
           }
         : createDefaultPTableParams(),
@@ -274,6 +276,7 @@ export function createDefaultPTableParams(): PTableParamsV2 {
     sourceId: null,
     hiddenColIds: null,
     filters: null,
+    defaultFilters: null,
     sorting: [],
   };
 }

package/src/components/PlDataTable/typesV5.ts

@@ -12,6 +12,7 @@ import type {
   PFrameHandle,
 } from "@milaboratories/pl-model-common";
 import type { FilterSpecLeaf } from "../../filters";
+import { Nil } from "@milaboratories/helpers";
 
 export type PlTableColumnId = {
   /** Original column spec */
@@ -62,11 +63,17 @@ export type PlDataTableSheetState = {
 };
 
 /** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
+export type PlDataTableFilterMeta = {
+  id: number;
+  source?: "table-filter" | "table-search";
+  isExpanded?: boolean;
+  isSuppressed?: boolean;
+};
 export type PlDataTableFilterSpecLeaf = FilterSpecLeaf<CanonicalizedJson<PTableColumnId>>;
 export type PlDataTableFilters = RootFilterSpec<PlDataTableFilterSpecLeaf>;
 export type PlDataTableFiltersWithMeta = RootFilterSpec<
   PlDataTableFilterSpecLeaf,
-  { id: number; isExpanded?: boolean; source?: "table-filter" | "table-search" }
+  PlDataTableFilterMeta
 >;
 
 export type PlDataTableStateV2CacheEntry = {
@@ -76,8 +83,10 @@ export type PlDataTableStateV2CacheEntry = {
   gridState: PlDataTableGridStateCore;
   /** Sheets state */
   sheetsState: PlDataTableSheetState[];
-  /** Filters state (tree-based, compatible with PlAdvancedFilter) */
+  /** User filters state (tree-based, compatible with PlAdvancedFilter) */
   filtersState: null | PlDataTableFiltersWithMeta;
+  /** Default filters state from model (snapshot of defaults) */
+  defaultFiltersState: null | PlDataTableFiltersWithMeta;
   /** Fast search string */
   searchString?: string;
 };
@@ -86,14 +95,16 @@ export type PTableParamsV2 =
   | {
       sourceId: null;
       hiddenColIds: null;
-      filters: null;
       sorting: [];
+      filters: null;
+      defaultFilters: null;
     }
   | {
       sourceId: string;
       hiddenColIds: null | PTableColumnId[];
-      filters: null | PlDataTableFilters;
       sorting: PTableSorting[];
+      filters: null | PlDataTableFilters;
+      defaultFilters: null | PlDataTableFilters;
     };
 
 export type PlDataTableStateV2Normalized = {
@@ -108,13 +119,15 @@ export type PlDataTableStateV2Normalized = {
 /** PlAgDataTable model */
 export type PlDataTableModel = {
   /** DataSource identifier for state management */
-  sourceId: string | null;
+  sourceId: null | string;
   /** p-table including all columns, used to show the full specification of the table */
-  fullTableHandle: PTableHandle;
+  fullTableHandle?: PTableHandle;
   /** p-frame handle */
-  fullPframeHandle: PFrameHandle;
+  fullPframeHandle?: PFrameHandle;
   /** p-table including only visible columns, used to get the data */
-  visibleTableHandle: PTableHandle;
+  visibleTableHandle?: PTableHandle;
+  /** Default filters from model options, surfaced for UI display */
+  defaultFilters?: Nil | PlDataTableFilters;
 };
 
 export type CreatePlDataTableOps = {