Merge pull request #63 from platforma-open/tableAggregationType

changed aggregation type and columns revision

Author: Alex-Davydov

.changeset/eighty-poets-carry.md

@@ -0,0 +1,6 @@
+---
+'@platforma-open/milaboratories.mixcr-shm-trees.workflow': minor
+'@platforma-open/milaboratories.mixcr-shm-trees.model': minor
+---
+
+Columns name revision, added new aggregation type "max_by", isotype as a node color

model/src/index.ts

@@ -16,6 +16,7 @@ import {
   RenderCtx,
   TreeNodeAccessor,
   createPlDataTable,
+  createPFrameForGraphs,
   deriveLabels,
   getAxisId,
   isPColumnSpec,
@@ -116,11 +117,14 @@ function treeNodesColumns(
   const treeNodesWithClonesColumns = ctx.outputs?.resolve('treeNodesWithClones')?.getPColumns();
   if (treeNodesWithClonesColumns === undefined) return undefined;
 
+  const treeNodesUniqueIsotypeColumns = ctx.outputs?.resolve('treeNodesUniqueIsotype')?.getPColumns();
+  if (treeNodesUniqueIsotypeColumns === undefined) return undefined;
+
   const soiResultColumns = (
     ctx.outputs?.resolve('soiNodesResults')?.mapFields((_, v) => v?.getPColumns() ?? []) ?? []
   ).flatMap((a) => a);
 
-  const targetColumns = [...soiResultColumns, ...treeNodesColumns, ...treeNodesWithClonesColumns];
+  const targetColumns = [...soiResultColumns, ...treeNodesColumns, ...treeNodesWithClonesColumns, ...treeNodesUniqueIsotypeColumns];
 
   return targetColumns;
 }
@@ -287,7 +291,13 @@ export const model = BlockModel.create()
   .output('treeNodesPFrame', (ctx) => {
     const cols = treeNodesColumns(ctx);
     if (cols === undefined) return undefined;
-    return ctx.createPFrame(cols);
+    return createPFrameForGraphs(ctx, cols);
+  })
+
+  .output('treeNodesUniqueIsotypePFrame', (ctx) => {
+    const cols = treeNodesColumns(ctx);
+    if (cols === undefined) return undefined;
+    return createPFrameForGraphs(ctx, cols);
   })
 
   .output('treeNodesPerTree', (ctx) => {

package.json

@@ -26,7 +26,7 @@
   "//": {
     "pnpm": {
       "overrides": {
-        "@platforma-open/milaboratories.software-paggregate": "file:/Users/dbolotin/milab/blocks/software-paggregate/package.tgz",
+        "@platforma-open/milaboratories.software-ptransform": "file:/Users/dbolotin/milab/blocks/software-ptransform/package.tgz",
         "@milaboratories/graph-maker": "/Users/poslavskysv/Projects/milab/platforma/graph-maker/milaboratories-graph-maker-1.1.0.tgz",
         "@platforma-sdk/model": "file:/Users/dbolotin/milab/core/platforma/sdk/model/package.tgz",
         "@platforma-sdk/workflow-tengo": "file:/Users/poslavskysv/Projects/milab/platforma/platforma-sdk/sdk/workflow-tengo/package.tgz",

pnpm-lock.yaml

@@ -21,7 +21,7 @@ catalog:
   '@platforma-open/milaboratories.software-small-binaries': ^1.15.6
   '@platforma-open/milaboratories.software-mixcr': 4.7.0-139-develop
   '@platforma-open/milaboratories.software-mitool': 2.3.1-5-main
-  '@platforma-open/milaboratories.software-paggregate': ^1.0.1
+  '@platforma-open/milaboratories.software-ptransform': ^1.1.0
 
   '@milaboratories/helpers': ^1.6.11
 

pnpm-workspace.yaml

@@ -17,7 +17,7 @@
     "@platforma-open/milaboratories.software-small-binaries": "catalog:",
     "@platforma-open/milaboratories.software-mixcr": "catalog:",
     "@platforma-open/milaboratories.software-mitool": "catalog:",
-    "@platforma-open/milaboratories.software-paggregate": "catalog:",
+    "@platforma-open/milaboratories.software-ptransform": "catalog:",
     "@platforma-sdk/test": "catalog:",
     "vitest": "catalog:",
     "typescript": "catalog:"