@milaboratories/milaboratories.ui-examples.model 1.0.46 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/milaboratories.ui-examples.model",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "Block model",
   "type": "module",
   "main": "dist/index.cjs",
@@ -8,13 +8,13 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "zod": "^3.23.8",
-    "@platforma-sdk/model": "1.14.1"
+    "@platforma-sdk/model": "1.17.0"
   },
   "devDependencies": {
     "typescript": "~5.5.4",
     "vite": "^5.4.11",
     "tsup": "~8.3.5",
-    "@platforma-sdk/block-tools": "2.4.2"
+    "@platforma-sdk/block-tools": "2.4.9"
   },
   "tsup": {
     "entry": [

package/src/index.ts

@@ -2,15 +2,15 @@ import {
   BlockModel,
   InferHrefType,
   InferOutputsType,
-  mapJoinEntry,
-  PColumnIdAndSpec,
-  AxisSpec,
-  JoinEntry,
-  AxisId,
   PlDataTableState,
   ValueType,
   isPColumn,
-  PlDataTableGridState
+  isPColumnSpec,
+  PlRef,
+  getUniquePartitionKeys,
+  createPlDataTableSheet,
+  createPlDataTable,
+  PlTableFiltersModel
 } from '@platforma-sdk/model';
 import { z } from 'zod';
 
@@ -21,17 +21,9 @@ export const $BlockArgs = z.object({
 export type BlockArgs = z.infer<typeof $BlockArgs>;
 
 export type TableState = {
-  settingsOpened: boolean;
-  gridState: PlDataTableGridState;
-  group: {
-    mainColumn?: PColumnIdAndSpec;
-    additionalColumns: PColumnIdAndSpec[];
-    enrichmentColumns: PColumnIdAndSpec[];
-    possiblePartitioningAxes: AxisSpec[];
-    join?: JoinEntry<PColumnIdAndSpec>;
-  };
-  partitioningAxes: AxisId[];
   tableState: PlDataTableState;
+  anchorColumn?: PlRef;
+  filterModel: PlTableFiltersModel;
 };
 
 export type UiState = {
@@ -46,47 +38,37 @@ export const platforma = BlockModel.create('Heavy')
 
   .output('numbers', (ctx) => ctx.outputs?.resolve('numbers')?.getDataAsJson<number[]>())
 
-  .output('pFrame', (ctx) => {
-    const collection = ctx.resultPool.getData();
-    if (collection === undefined || !collection.isComplete) return undefined;
-
-    const valueTypes = ['Int', 'Long', 'Float', 'Double', 'String', 'Bytes'] as ValueType[];
-    const columns = collection.entries
-      .map(({ obj }) => obj)
-      .filter(isPColumn)
-      .filter((column) => valueTypes.find((valueType) => valueType === column.spec.valueType));
-
-    try {
-      return ctx.createPFrame(columns);
-    } catch (err) {
-      return undefined;
-    }
+  .retentiveOutput('inputOptions', (ctx) => {
+    return ctx.resultPool.getOptions((spec) => isPColumnSpec(spec));
   })
 
-  .output('pTable', (ctx) => {
-    const join = ctx.uiState?.dataTableState?.tableState.pTableParams?.join;
-    if (!join) return undefined;
+  .output('sheets', (ctx) => {
+    if (!ctx.uiState?.dataTableState?.anchorColumn) return undefined;
 
-    const collection = ctx.resultPool.getData();
-    if (!collection || !collection.isComplete) return undefined;
+    const anchor = ctx.resultPool.getPColumnByRef(ctx.uiState.dataTableState.anchorColumn);
+    if (!anchor) return undefined;
 
-    const columns = collection.entries.map(({ obj }) => obj).filter(isPColumn);
-    if (columns.length === 0) return undefined;
+    const r = getUniquePartitionKeys(anchor.data);
+    if (!r) return undefined;
+    return r.map((values, i) => createPlDataTableSheet(ctx, anchor.spec.axesSpec[i], values));
+  })
+
+  .output('pt', (ctx) => {
+    if (ctx.uiState?.dataTableState?.anchorColumn === undefined) return undefined;
 
-    let columnMissing = false;
-    const src = mapJoinEntry(join, (idAndSpec) => {
-      const column = columns.find((it) => it.id === idAndSpec.columnId);
-      if (!column) columnMissing = true;
-      return column!;
-    });
+    const anchorColumn = ctx.resultPool.getDataByRef(ctx.uiState.dataTableState.anchorColumn);
+    if (!anchorColumn || !isPColumn(anchorColumn)) {
+      console.error('Anchor column is undefined or is not PColumn', anchorColumn);
+      return undefined;
+    }
 
-    if (columnMissing) return undefined;
+    // wait until sheet filters are set
+    if (ctx.uiState.dataTableState.tableState.pTableParams?.filters === undefined) return undefined;
 
-    return ctx.createPTable({
-      src,
-      filters: ctx.uiState.dataTableState?.tableState.pTableParams?.filters ?? [],
-      sorting: ctx.uiState.dataTableState?.tableState.pTableParams?.sorting ?? []
-    });
+    return createPlDataTable(ctx, [anchorColumn], ctx.uiState.dataTableState.tableState, [
+      ...ctx.uiState.dataTableState.tableState.pTableParams?.filters,
+      ...(ctx.uiState.dataTableState.filterModel?.filters ?? [])
+    ]);
   })
 
   .sections((ctx) => {