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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-open/milaboratories.repertoire-diversity-2.model",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Block model",
   "type": "module",
   "main": "dist/index.cjs",

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

@@ -2,18 +2,23 @@ import type { GraphMakerState } from '@milaboratories/graph-maker';
 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' |
   'normalizedShannonWiener' | 'inverseSimpson' | 'gini';
 
 export type Metric = {
-  id: string;
   type: DiversityType | undefined;
   downsampling: {
     type?: 'none' | 'top' | 'cumtop' | 'hypergeometric' ;
     valueChooser?: 'min' | 'fixed' | 'max' | 'auto';
     n?: number;
   };
+};
+
+export type MetricUI = Metric & {
+  id: string;
   isExpanded?: boolean;
 };
 
@@ -23,14 +28,27 @@ export type BlockArgs = {
 };
 
 export type UiState = {
+  metrics: MetricUI[];
   blockTitle: string;
   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',
@@ -80,17 +98,6 @@ export const model = BlockModel.create()
     ],
   })
 
-  .withUiState<UiState>({
-    blockTitle: 'Repertoire Diversity',
-    graphState: {
-      title: 'Repertoire Diversity',
-      template: 'bar',
-      currentTab: null,
-    },
-
-    tableState: createPlDataTableStateV2(),
-  })
-
   .argsValid((ctx) => ctx.args.abundanceRef !== undefined)
 
   .output('abundanceOptions', (ctx) =>
@@ -114,7 +121,7 @@ export const model = BlockModel.create()
       return undefined;
     }
 
-    return createPlDataTableV2(ctx, pCols, ctx.uiState?.tableState);
+    return createPlDataTableV2(ctx, pCols, ctx.uiState.tableState);
   })
 
   .output('pf', (ctx) => {