@platforma-sdk/model 1.20.6 → 1.20.11

package/dist/version.d.ts

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

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.20.6",
+  "version": "1.20.11",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",

package/src/components/PlDataTable.ts

@@ -234,7 +234,7 @@ export type PlTableFilterStringContainsFuzzyMatch = {
    */
   substitutionsOnly: boolean;
   /**
-   * Single character in {@link reference} that will match any
+   * Single character in {@link reference} that will labelColumn any
    * single character in searched text.
    */
   wildcard?: string;
@@ -269,7 +269,7 @@ export type PlTableFiltersStateEntry = {
   filter: PlTableFilter;
   /** Flag to temporarily disable filter */
   disabled: boolean;
-}
+};
 
 /** PlTableFiltersModel state */
 export type PlTableFiltersState = PlTableFiltersStateEntry[];
@@ -302,22 +302,53 @@ export function createPlDataTable<A, U>(
     .filter(isPColumn)
     .filter((p) => p.spec.name === 'pl7.app/label' && p.spec.axesSpec.length === 1);
 
-  const labelColumns = new Map<PObjectId, PColumn<TreeNodeAccessor>>();
+  const colId = (id: PObjectId, domain?: Record<string, string>) => {
+    let wid = id.toString();
+    if (domain) {
+      for (const k in domain) {
+        wid += k;
+        wid += domain[k];
+      }
+    }
+    return wid;
+  };
+
+  const labelColumns = new Map<string, PColumn<TreeNodeAccessor>>();
+
   for (const col of columns) {
     for (const axis of col.spec.axesSpec) {
       const axisId = getAxisId(axis);
-      for (const match of allLabelCols) {
-        if (matchAxisId(axisId, getAxisId(match.spec.axesSpec[0]))) {
-          labelColumns.set(match.id, match);
+      for (const labelColumn of allLabelCols) {
+        const labelAxis = labelColumn.spec.axesSpec[0];
+        const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);
+        if (matchAxisId(axisId, labelAxisId)) {
+          const dataDomainLen = Object.keys(axisId.domain ?? {}).length;
+          const labelDomainLen = Object.keys(labelAxisId.domain ?? {}).length;
+          if (dataDomainLen > labelDomainLen) {
+            const id = colId(labelColumn.id, axisId.domain);
+
+            labelColumns.set(id, {
+              id: id as PObjectId,
+              spec: {
+                ...labelColumn.spec,
+                axesSpec: [{ ...axisId, annotations: labelAxis.annotations }]
+              },
+              data: labelColumn.data
+            });
+          } else {
+            labelColumns.set(colId(labelColumn.id), labelColumn);
+          }
         }
       }
     }
   }
 
   // if at least one column is not yet ready, we can't show the table
-  if ([...columns, ...labelColumns.values()].some((a) =>
-      a.data instanceof TreeNodeAccessor && !a.data.getIsReadyOrError()
-    ))
+  if (
+    [...columns, ...labelColumns.values()].some(
+      (a) => a.data instanceof TreeNodeAccessor && !a.data.getIsReadyOrError()
+    )
+  )
     return undefined;
 
   return ctx.createPTable({