@platforma-sdk/model 1.33.14 → 1.33.17

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PlatformaSDKVersion = "1.33.14";
+export declare const PlatformaSDKVersion = "1.33.17";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.33.14",
+  "version": "1.33.17",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -21,8 +21,8 @@
     "utility-types": "^3.11.0",
     "canonicalize": "~2.1.0",
     "zod": "~3.23.8",
-    "@milaboratories/pl-model-common": "^1.15.4",
-    "@milaboratories/pl-error-like": "^1.12.1"
+    "@milaboratories/pl-error-like": "^1.12.1",
+    "@milaboratories/pl-model-common": "^1.15.5"
   },
   "devDependencies": {
     "typescript": "~5.5.4",
@@ -31,8 +31,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.6",
-    "@platforma-sdk/eslint-config": "1.0.3",
-    "@milaboratories/platforma-build-configs": "1.0.3"
+    "@milaboratories/platforma-build-configs": "1.0.3",
+    "@platforma-sdk/eslint-config": "1.0.3"
   },
   "scripts": {
     "type-check": "node ./scripts/save-package-version.cjs && tsc --noEmit --composite false",

package/src/components/PFrameForGraphs.ts

@@ -1,9 +1,8 @@
 import type {
-  AxisId, CanonicalizedJson,
-  DataInfo,
+  AxisId,
+  CanonicalizedJson,
   PColumn,
   PColumnSpec,
-  PColumnValues,
   PFrameHandle,
   PObjectId,
 } from '@milaboratories/pl-model-common';
@@ -215,33 +214,53 @@ export function createPFrameForGraphs<A, U>(
   columns.addColumns(blockColumns);
 
   // all possible axes from block columns
+  const blockAxes = new Map<CanonicalizedJson<AxisId>, AxisId>();
+  // axes from block columns and compatible result pool columns
   const allAxes = new Map<CanonicalizedJson<AxisId>, AxisId>();
   for (const c of blockColumns) {
     for (const id of c.spec.axesSpec) {
       const aid = getAxisId(id);
+      blockAxes.set(canonicalizeJson(aid), aid);
       allAxes.set(canonicalizeJson(aid), aid);
     }
   }
 
   // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden
   const linkerColumns = columns.getColumns((spec) => isLinkerColumn(spec)) ?? [];
-  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, allAxes);
-  const labelColumns = columns.getColumns(isLabelColumn) ?? [];
+  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);
 
   // all possible axes from connected linkers
   for (const item of availableWithLinkersAxes) {
+    blockAxes.set(...item);
     allAxes.set(...item);
   }
 
-  let compatible = (columns.getColumns([...allAxes.values()]
+  // all compatible with block columns but without label columns
+  const compatibleWithoutLabels = (columns.getColumns([...blockAxes.values()]
     .map((ax) => ({
       axes: [ax],
       partialAxesMatch: true,
-    }))) ?? []).filter((column) => !isLabelColumn(column.spec));
-  compatible = compatible.concat(labelColumns); // add all available labels columns to avoid problems with fixed axes, but don't add twice
+    })), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => !isLabelColumn(column.spec));
+
+  // extend axes set for label columns request
+  for (const c of compatibleWithoutLabels) {
+    for (const id of c.spec.axesSpec) {
+      const aid = getAxisId(id);
+      allAxes.set(canonicalizeJson(aid), aid);
+    }
+  }
+
+  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool
+  const compatibleLabels = (columns.getColumns([...allAxes.values()]
+    .map((ax) => ({
+      axes: [ax],
+      partialAxesMatch: true,
+    })), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => isLabelColumn(column.spec));
+
+  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];
 
   // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match
-  const extendedColumns = enrichCompatible(allAxes, compatible);
+  const extendedColumns = enrichCompatible(blockAxes, compatible);
 
   // if at least one column is not yet ready, we can't show the table
   if (