@platforma-sdk/model 1.23.0 → 1.23.4

package/dist/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.23.0",
+  "version": "1.23.4",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -29,8 +29,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.6",
-    "@platforma-sdk/eslint-config": "1.0.1",
-    "@milaboratories/platforma-build-configs": "1.0.2"
+    "@milaboratories/platforma-build-configs": "1.0.2",
+    "@platforma-sdk/eslint-config": "1.0.1"
   },
   "scripts": {
     "type-check": "node ./scripts/save-package-version.cjs && tsc --noEmit --composite false",

package/src/components/PFrameForGraphs.test.ts

@@ -1,5 +1,10 @@
 import {test, expect, describe} from '@jest/globals';
-import {enrichColumnsWithCompatible, getAdditionalColumns, IS_VIRTUAL_COLUMN} from './PFrameForGraphs';
+import {
+    enrichColumnsWithCompatible,
+    getAdditionalColumns,
+    IS_VIRTUAL_COLUMN,
+    LABEL_ANNOTATION
+} from './PFrameForGraphs';
 import {PColumn, PColumnSpec, PColumnValues, PObjectId} from "@milaboratories/pl-model-common";
 import {TreeNodeAccessor} from "../render";
 
@@ -181,4 +186,31 @@ describe('PFrameForGraph', () => {
         const enrichedColumns = enrichColumnsWithCompatible(columns, upstream);
         expect(enrichedColumns.map((c) => c.id)).toEqual(['id1', 'id2', 'id3'])
     })
+
+    test('Labels of added columns include added domains, but not include common domains', () => {
+        const columnSpec1: PColumnSpec = {
+            kind: 'PColumn',
+            name: 'column1',
+            valueType: 'Int',
+            axesSpec: [
+                {type: 'String', name: 'axis1', domain: {key0: 'commonDomain', key1: 'a', key2: 'c'}},
+                {type: 'String', name: 'axis1', domain: {key0: 'commonDomain', key1: 'b', key2: 'c'}},
+            ]
+        }
+        const columnSpec2: PColumnSpec = {
+            kind: 'PColumn',
+            name: 'column2',
+            valueType: 'Int',
+            annotations: {[LABEL_ANNOTATION]: 'Label of column2'},
+            axesSpec: [{type: 'String', name: 'axis1', domain: {key0: 'commonDomain'}}]
+        }
+        const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
+            {id: 'id1' as PObjectId, spec: columnSpec1, data: []},
+            {id: 'id2' as PObjectId, spec: columnSpec2, data: []}
+        ] as PColumn<PColumnValues>[]
+
+        const additionalColumns = getAdditionalColumns(columns);
+        expect(additionalColumns[0].spec.annotations?.[LABEL_ANNOTATION]).toEqual('Label of column2 / a');
+        expect(additionalColumns[1].spec.annotations?.[LABEL_ANNOTATION]).toEqual('Label of column2 / b');
+    })
 })

package/src/components/PFrameForGraphs.ts

@@ -62,6 +62,7 @@ function checkCompatibility(
 }
 
 export const IS_VIRTUAL_COLUMN = 'pl7.app/graph/isVirtual'; // annotation for column duplicates with extended domains
+export const LABEL_ANNOTATION = 'pl7.app/label';
 
 /** Main column can have additional domains, if secondary column (meta-column) has all axes match main column axes
  we can add its copy with missed domain fields for compatibility */
@@ -87,8 +88,52 @@ function getAdditionalColumnsForPair(
     // all possible combinations of axes with added domains
     const secondaryIdsVariants = getKeysCombinations(secondaryIdsOptions);
 
-    return secondaryIdsVariants.map(idsList => {
+    // sets of added to column domain fields
+    const allAddedDomainValues = new Set<string>();
+    const addedNotToAllVariantsDomainValues = new Set<string>();
+    const addedByVariantsDomainValues = secondaryIdsVariants.map(idsList => {
+        const addedSet = new Set<string>();
+        idsList.map((axisId, idx) => {
+            const d1 = secondaryColumn.spec.axesSpec[idx].domain;
+            const d2 = axisId.domain;
+            Object.entries(d2 ?? {}).forEach(([key, value]) => {
+                if (d1?.[key] === undefined) {
+                    const item = JSON.stringify([key, value]);
+                    addedSet.add(item);
+                    allAddedDomainValues.add(item);
+                }
+            });
+            return ({
+                ...axisId,
+                annotations: secondaryColumn.spec.axesSpec[idx].annotations
+            })
+        });
+        return addedSet;
+    });
+    [...allAddedDomainValues].forEach(addedPart => {
+        if (addedByVariantsDomainValues.some(s => !s.has(addedPart))) {
+            addedNotToAllVariantsDomainValues.add(addedPart);
+        }
+    })
+
+    return secondaryIdsVariants.map((idsList, idx) => {
         const id = colId(secondaryColumn.id, idsList.map(id => id.domain));
+
+        const label = secondaryColumn.spec.annotations?.[LABEL_ANNOTATION] ?? '';
+        const labelDomainPart = ([...addedByVariantsDomainValues[idx]])
+            .filter(str => addedNotToAllVariantsDomainValues.has(str))
+            .sort()
+            .map((v) => JSON.parse(v)?.[1]) // use in labels only domain values, but sort them by key to save the same order in all column variants
+            .join(' / ');
+
+        const annotations:Record<string, string> = {
+            ...secondaryColumn.spec.annotations,
+            [IS_VIRTUAL_COLUMN]: 'true'
+        }
+        if (label || labelDomainPart) {
+            annotations[LABEL_ANNOTATION] = label && labelDomainPart ? label + ' / ' + labelDomainPart : label + labelDomainPart;
+        }
+
         return {
             id: id as PObjectId,
             spec: {
@@ -97,10 +142,7 @@ function getAdditionalColumnsForPair(
                     ...axisId,
                     annotations: secondaryColumn.spec.axesSpec[idx].annotations
                 })),
-                annotations: {
-                    ...secondaryColumn.spec.annotations,
-                    [IS_VIRTUAL_COLUMN]: 'true'
-                }
+                annotations
             },
             data: secondaryColumn.data
         };