@platforma-open/milaboratories.repertoire-diversity-2.model 1.3.1 → 1.5.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@platforma-open/milaboratories.repertoire-diversity-2.model",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "description": "Block model",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@platforma-sdk/model": "^1.34.10",
-    "@milaboratories/graph-maker": "^1.1.121"
+    "@platforma-sdk/model": "^1.38.0",
+    "@milaboratories/graph-maker": "^1.1.127"
   },
   "devDependencies": {
     "@platforma-sdk/block-tools": "^2.5.57",

package/src/converters.ts

@@ -0,0 +1,10 @@
+import type { Metric, MetricUI } from './index';
+
+export const convertMetricsUiToArgs = (metrics: MetricUI[]): Metric[] => {
+  return metrics.map((metric): Metric => {
+    return {
+      type: metric.type,
+      downsampling: metric.downsampling,
+    };
+  });
+};

package/src/index.ts

@@ -1,6 +1,8 @@
 import type { GraphMakerState } from '@milaboratories/graph-maker';
-import type { InferOutputsType, PColumnIdAndSpec, PlDataTableState, PlRef } from '@platforma-sdk/model';
-import { BlockModel, createPFrameForGraphs, createPlDataTable } from '@platforma-sdk/model';
+import type { InferOutputsType, PColumnIdAndSpec, PlDataTableStateV2, PlRef } from '@platforma-sdk/model';
+import { BlockModel, createPFrameForGraphs, createPlDataTableStateV2, createPlDataTableV2 } from '@platforma-sdk/model';
+
+export * from './converters';
 
 export type DiversityType = 'chao1' | 'd50' | 'efronThisted' |
   'observed' | 'shannonWienerIndex' | 'shannonWiener' |
@@ -15,76 +17,87 @@ export type Metric = {
   };
 };
 
+export type MetricUI = Metric & {
+  id: string;
+  isExpanded?: boolean;
+};
+
 export type BlockArgs = {
   abundanceRef?: PlRef;
   metrics: Metric[];
 };
 
 export type UiState = {
+  metrics: MetricUI[];
   blockTitle: string;
-  tableState?: PlDataTableState;
+  tableState: PlDataTableStateV2;
   graphState: GraphMakerState;
 };
 
 export const model = BlockModel.create()
-
   .withArgs<BlockArgs>({
+    metrics: [],
+  })
+
+  .withUiState<UiState>({
+    blockTitle: 'Repertoire Diversity',
+    graphState: {
+      title: 'Repertoire Diversity',
+      template: 'bar',
+      currentTab: null,
+    },
+
+    tableState: createPlDataTableStateV2(),
+
     metrics: [
       {
+        id: 'observed',
         type: 'observed',
         downsampling: {
           type: 'hypergeometric',
           valueChooser: 'auto',
         },
+        isExpanded: false,
       },
       {
+        id: 'shannonWiener',
         type: 'shannonWiener',
         downsampling: {
           type: 'hypergeometric',
           valueChooser: 'auto',
         },
+        isExpanded: false,
       },
       {
+        id: 'chao1',
         type: 'chao1',
         downsampling: {
           type: 'hypergeometric',
           valueChooser: 'auto',
         },
+        isExpanded: false,
       },
       {
+        id: 'gini',
         type: 'gini',
         downsampling: {
           type: 'hypergeometric',
           valueChooser: 'auto',
         },
+        isExpanded: false,
       },
       {
+        id: 'd50',
         type: 'd50',
         downsampling: {
           type: 'hypergeometric',
           valueChooser: 'auto',
         },
+        isExpanded: false,
       },
     ],
   })
 
-  .withUiState<UiState>({
-    blockTitle: 'Repertoire Diversity',
-    graphState: {
-      title: 'Repertoire Diversity',
-      template: 'bar',
-      currentTab: null,
-    },
-
-    tableState: {
-      gridState: {},
-      pTableParams: {
-        sorting: [],
-        filters: [],
-      },
-    },
-  })
-
   .argsValid((ctx) => ctx.args.abundanceRef !== undefined)
 
   .output('abundanceOptions', (ctx) =>
@@ -108,7 +121,7 @@ export const model = BlockModel.create()
       return undefined;
     }
 
-    return createPlDataTable(ctx, pCols, ctx.uiState?.tableState);
+    return createPlDataTableV2(ctx, pCols, ctx.uiState.tableState);
   })
 
   .output('pf', (ctx) => {