@platforma-sdk/model 1.45.42 → 1.46.0

package/dist/annotations/converter.cjs

@@ -3,21 +3,37 @@
 var ptablerExpressionJs = require('@milaboratories/ptabler-expression-js');
 var converter = require('../filters/converter.cjs');
 
-function convertFilterSpecsToExpressionSpecs(annotationsUI) {
-    return annotationsUI
-        .filter((annotation) => {
-        // No need to convert empty steps
-        if (annotation.filter.type == null) {
-            return false;
-        }
-        if (annotation.filter.type === 'or') {
-            return annotation.filter.filters.length > 0;
-        }
-        if (annotation.filter.type === 'and') {
-            return annotation.filter.filters.length > 0;
-        }
+function filterPredicate(item) {
+    // No need to convert empty steps
+    if (item.type == null) {
         return false;
-    })
+    }
+    if (item.type === 'or') {
+        return item.filters.length > 0;
+    }
+    if (item.type === 'and') {
+        return item.filters.length > 0;
+    }
+    return true;
+}
+function filterEmptyPeaces(item) {
+    if (item.type === 'or' || item.type === 'and') {
+        const filtered = item.filters
+            .map(filterEmptyPeaces)
+            .filter(filterPredicate);
+        return {
+            ...item,
+            filters: filtered,
+        };
+    }
+    return item;
+}
+function convertFilterSpecsToExpressionSpecs(annotationsUI) {
+    const validAnnotationsUI = annotationsUI.map((step) => ({
+        label: step.label,
+        filter: filterEmptyPeaces(step.filter),
+    }));
+    return validAnnotationsUI
         .map((step) => ({
         type: 'alias',
         name: step.label.trim(),

package/dist/annotations/converter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"converter.cjs","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from '@milaboratories/ptabler-expression-js';\nimport { convertFilterUiToExpressionImpl } from '../filters/converter';\nimport type { ExpressionSpec, FilterSpecUi } from './types';\n\nexport function convertFilterSpecsToExpressionSpecs(annotationsUI: FilterSpecUi[]): ExpressionSpec[] {\n  return annotationsUI\n    .filter((annotation) => {\n      // No need to convert empty steps\n      if (annotation.filter.type == null) {\n        return false;\n      }\n\n      if (annotation.filter.type === 'or') {\n        return annotation.filter.filters.length > 0;\n      }\n\n      if (annotation.filter.type === 'and') {\n        return annotation.filter.filters.length > 0;\n      }\n\n      return false;\n    })\n    .map((step): ExpressionSpec => ({\n      type: 'alias',\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter)).then(true).otherwise(false).toJSON(),\n    }));\n}\n"],"names":["when","convertFilterUiToExpressionImpl"],"mappings":";;;;;AAIM,SAAU,mCAAmC,CAAC,aAA6B,EAAA;AAC/E,IAAA,OAAO;AACJ,SAAA,MAAM,CAAC,CAAC,UAAU,KAAI;;QAErB,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE;AAClC,YAAA,OAAO,KAAK;QACd;QAEA,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACnC,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAC7C;QAEA,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;YACpC,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAC7C;AAEA,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AACA,SAAA,GAAG,CAAC,CAAC,IAAI,MAAsB;AAC9B,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAEA,wBAAI,CAACC,yCAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AAC/F,KAAA,CAAC,CAAC;AACP;;;;"}
+{"version":3,"file":"converter.cjs","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from '@milaboratories/ptabler-expression-js';\nimport type { FilterSpec } from '../filters';\nimport { convertFilterUiToExpressionImpl } from '../filters/converter';\nimport type { ExpressionSpec, FilterSpecUi } from './types';\n\nfunction filterPredicate(item: FilterSpec): boolean {\n  // No need to convert empty steps\n  if (item.type == null) {\n    return false;\n  }\n\n  if (item.type === 'or') {\n    return item.filters.length > 0;\n  }\n\n  if (item.type === 'and') {\n    return item.filters.length > 0;\n  }\n\n  return true;\n}\n\nfunction filterEmptyPeaces(item: FilterSpec): FilterSpec {\n  if (item.type === 'or' || item.type === 'and') {\n    const filtered = item.filters\n      .map(filterEmptyPeaces)\n      .filter(filterPredicate);\n    return {\n      ...item,\n      filters: filtered,\n    };\n  }\n\n  return item;\n}\n\nexport function convertFilterSpecsToExpressionSpecs(annotationsUI: FilterSpecUi[]): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI.map((step) => ({\n    label: step.label,\n    filter: filterEmptyPeaces(step.filter),\n  }));\n  return validAnnotationsUI\n    .map((step): ExpressionSpec => ({\n      type: 'alias',\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter)).then(true).otherwise(false).toJSON(),\n    }));\n}\n"],"names":["when","convertFilterUiToExpressionImpl"],"mappings":";;;;;AAKA,SAAS,eAAe,CAAC,IAAgB,EAAA;;AAEvC,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;AACtB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AACvB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,OAAO,IAAI;AACb;AAEA,SAAS,iBAAiB,CAAC,IAAgB,EAAA;AACzC,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AAC7C,QAAA,MAAM,QAAQ,GAAG,IAAI,CAAC;aACnB,GAAG,CAAC,iBAAiB;aACrB,MAAM,CAAC,eAAe,CAAC;QAC1B,OAAO;AACL,YAAA,GAAG,IAAI;AACP,YAAA,OAAO,EAAE,QAAQ;SAClB;IACH;AAEA,IAAA,OAAO,IAAI;AACb;AAEM,SAAU,mCAAmC,CAAC,aAA6B,EAAA;IAC/E,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM;QACtD,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC,CAAC;AACH,IAAA,OAAO;AACJ,SAAA,GAAG,CAAC,CAAC,IAAI,MAAsB;AAC9B,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAEA,wBAAI,CAACC,yCAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AAC/F,KAAA,CAAC,CAAC;AACP;;;;"}

package/dist/annotations/converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/annotations/converter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,wBAAgB,mCAAmC,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CAuBnG"}
+{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/annotations/converter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAiC5D,wBAAgB,mCAAmC,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CAWnG"}

package/dist/annotations/converter.js

@@ -1,21 +1,37 @@
 import { when } from '@milaboratories/ptabler-expression-js';
 import { convertFilterUiToExpressionImpl } from '../filters/converter.js';
 
-function convertFilterSpecsToExpressionSpecs(annotationsUI) {
-    return annotationsUI
-        .filter((annotation) => {
-        // No need to convert empty steps
-        if (annotation.filter.type == null) {
-            return false;
-        }
-        if (annotation.filter.type === 'or') {
-            return annotation.filter.filters.length > 0;
-        }
-        if (annotation.filter.type === 'and') {
-            return annotation.filter.filters.length > 0;
-        }
+function filterPredicate(item) {
+    // No need to convert empty steps
+    if (item.type == null) {
         return false;
-    })
+    }
+    if (item.type === 'or') {
+        return item.filters.length > 0;
+    }
+    if (item.type === 'and') {
+        return item.filters.length > 0;
+    }
+    return true;
+}
+function filterEmptyPeaces(item) {
+    if (item.type === 'or' || item.type === 'and') {
+        const filtered = item.filters
+            .map(filterEmptyPeaces)
+            .filter(filterPredicate);
+        return {
+            ...item,
+            filters: filtered,
+        };
+    }
+    return item;
+}
+function convertFilterSpecsToExpressionSpecs(annotationsUI) {
+    const validAnnotationsUI = annotationsUI.map((step) => ({
+        label: step.label,
+        filter: filterEmptyPeaces(step.filter),
+    }));
+    return validAnnotationsUI
         .map((step) => ({
         type: 'alias',
         name: step.label.trim(),

package/dist/annotations/converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.js","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from '@milaboratories/ptabler-expression-js';\nimport { convertFilterUiToExpressionImpl } from '../filters/converter';\nimport type { ExpressionSpec, FilterSpecUi } from './types';\n\nexport function convertFilterSpecsToExpressionSpecs(annotationsUI: FilterSpecUi[]): ExpressionSpec[] {\n  return annotationsUI\n    .filter((annotation) => {\n      // No need to convert empty steps\n      if (annotation.filter.type == null) {\n        return false;\n      }\n\n      if (annotation.filter.type === 'or') {\n        return annotation.filter.filters.length > 0;\n      }\n\n      if (annotation.filter.type === 'and') {\n        return annotation.filter.filters.length > 0;\n      }\n\n      return false;\n    })\n    .map((step): ExpressionSpec => ({\n      type: 'alias',\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter)).then(true).otherwise(false).toJSON(),\n    }));\n}\n"],"names":[],"mappings":";;;AAIM,SAAU,mCAAmC,CAAC,aAA6B,EAAA;AAC/E,IAAA,OAAO;AACJ,SAAA,MAAM,CAAC,CAAC,UAAU,KAAI;;QAErB,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE;AAClC,YAAA,OAAO,KAAK;QACd;QAEA,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YACnC,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAC7C;QAEA,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;YACpC,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAC7C;AAEA,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AACA,SAAA,GAAG,CAAC,CAAC,IAAI,MAAsB;AAC9B,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AAC/F,KAAA,CAAC,CAAC;AACP;;;;"}
+{"version":3,"file":"converter.js","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from '@milaboratories/ptabler-expression-js';\nimport type { FilterSpec } from '../filters';\nimport { convertFilterUiToExpressionImpl } from '../filters/converter';\nimport type { ExpressionSpec, FilterSpecUi } from './types';\n\nfunction filterPredicate(item: FilterSpec): boolean {\n  // No need to convert empty steps\n  if (item.type == null) {\n    return false;\n  }\n\n  if (item.type === 'or') {\n    return item.filters.length > 0;\n  }\n\n  if (item.type === 'and') {\n    return item.filters.length > 0;\n  }\n\n  return true;\n}\n\nfunction filterEmptyPeaces(item: FilterSpec): FilterSpec {\n  if (item.type === 'or' || item.type === 'and') {\n    const filtered = item.filters\n      .map(filterEmptyPeaces)\n      .filter(filterPredicate);\n    return {\n      ...item,\n      filters: filtered,\n    };\n  }\n\n  return item;\n}\n\nexport function convertFilterSpecsToExpressionSpecs(annotationsUI: FilterSpecUi[]): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI.map((step) => ({\n    label: step.label,\n    filter: filterEmptyPeaces(step.filter),\n  }));\n  return validAnnotationsUI\n    .map((step): ExpressionSpec => ({\n      type: 'alias',\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter)).then(true).otherwise(false).toJSON(),\n    }));\n}\n"],"names":[],"mappings":";;;AAKA,SAAS,eAAe,CAAC,IAAgB,EAAA;;AAEvC,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;AACtB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AACvB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,OAAO,IAAI;AACb;AAEA,SAAS,iBAAiB,CAAC,IAAgB,EAAA;AACzC,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AAC7C,QAAA,MAAM,QAAQ,GAAG,IAAI,CAAC;aACnB,GAAG,CAAC,iBAAiB;aACrB,MAAM,CAAC,eAAe,CAAC;QAC1B,OAAO;AACL,YAAA,GAAG,IAAI;AACP,YAAA,OAAO,EAAE,QAAQ;SAClB;IACH;AAEA,IAAA,OAAO,IAAI;AACb;AAEM,SAAU,mCAAmC,CAAC,aAA6B,EAAA;IAC/E,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM;QACtD,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC,CAAC;AACH,IAAA,OAAO;AACJ,SAAA,GAAG,CAAC,CAAC,IAAI,MAAsB;AAC9B,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AAC/F,KAAA,CAAC,CAAC;AACP;;;;"}

package/dist/components/PFrameForGraphs.cjs

@@ -4,7 +4,6 @@ var plModelCommon = require('@milaboratories/pl-model-common');
 require('canonicalize');
 var column_collection = require('../render/util/column_collection.cjs');
 require('../render/util/label.cjs');
-var pcolumn_data = require('../render/util/pcolumn_data.cjs');
 
 /** Create id for column copy with added keys in axes domains */
 const colId = (id, domains) => {
@@ -37,6 +36,9 @@ function getKeysCombinations(idsLists) {
 function isHiddenFromGraphColumn(column) {
     return !!plModelCommon.readAnnotationJson(column, plModelCommon.Annotation.HideDataFromGraphs);
 }
+function isHiddenFromUIColumn(column) {
+    return !!plModelCommon.readAnnotationJson(column, plModelCommon.Annotation.HideDataFromUi);
+}
 function getAvailableWithLinkersAxes(linkerColumns, blockAxes) {
     const linkerMap = plModelCommon.LinkerMap.fromColumns(linkerColumns.map(plModelCommon.getColumnIdAndSpec));
     const startKeys = [];
@@ -56,11 +58,7 @@ function getAvailableWithLinkersAxes(linkerColumns, blockAxes) {
 }
 /** Add columns with fully compatible axes created from partial compatible ones */
 function enrichCompatible(blockAxes, columns) {
-    const result = [];
-    columns.forEach((column) => {
-        result.push(...getAdditionalColumnsForColumn(blockAxes, column));
-    });
-    return result;
+    return columns.flatMap((column) => getAdditionalColumnsForColumn(blockAxes, column));
 }
 function getAdditionalColumnsForColumn(blockAxes, column) {
     const columnAxesIds = column.spec.axesSpec.map(plModelCommon.getAxisId);
@@ -122,6 +120,7 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
             annotations[plModelCommon.Annotation.Label] = label && labelDomainPart ? label + ' / ' + labelDomainPart : label + labelDomainPart;
         }
         return {
+            ...column,
             id: id,
             spec: {
                 ...column.spec,
@@ -131,7 +130,6 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
                 })),
                 annotations,
             },
-            data: column.data,
         };
     });
     return [column, ...additionalColumns];
@@ -149,15 +147,12 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
  and modified label (with added domain values in case if more than one copy with different domains exist).
  */
 function createPFrameForGraphs(ctx, blockColumns) {
+    const suitableSpec = (spec) => !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);
     // if current block doesn't produce own columns then use all columns from result pool
     if (!blockColumns) {
         const columns = new column_collection.PColumnCollection();
         columns.addColumnProvider(ctx.resultPool);
-        const allColumns = columns.getColumns((spec) => !isHiddenFromGraphColumn(spec), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];
-        // if at least one column is not yet ready, we can't show the graph
-        if (!pcolumn_data.allPColumnsReady(allColumns)) {
-            return undefined;
-        }
+        const allColumns = columns.getUniversalEntries(suitableSpec, { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];
         const allAxes = new Map(allColumns
             .flatMap((column) => plModelCommon.getNormalizedAxesList(column.spec.axesSpec))
             .map((axisSpec) => {
@@ -168,9 +163,6 @@ function createPFrameForGraphs(ctx, blockColumns) {
         const extendedColumns = enrichCompatible(allAxes, allColumns);
         return ctx.createPFrame(extendedColumns);
     }
-    if (!pcolumn_data.allPColumnsReady(blockColumns)) {
-        return undefined;
-    }
     // if current block has its own columns then take from result pool only compatible with them
     const columns = new column_collection.PColumnCollection();
     columns.addColumnProvider(ctx.resultPool);
@@ -187,7 +179,7 @@ function createPFrameForGraphs(ctx, blockColumns) {
         }
     }
     // 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) => plModelCommon.isLinkerColumn(spec)) ?? [];
+    const linkerColumns = columns.getUniversalEntries((spec) => suitableSpec(spec) && plModelCommon.isLinkerColumn(spec)) ?? [];
     const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);
     // all possible axes from connected linkers
     for (const item of availableWithLinkersAxes) {
@@ -196,14 +188,10 @@ function createPFrameForGraphs(ctx, blockColumns) {
     }
     const blockAxesArr = Array.from(blockAxes.values());
     // all compatible with block columns but without label columns
-    let compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {
+    let compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {
         const axisId = plModelCommon.getAxisId(axisSpec);
         return blockAxesArr.some((selectorAxisSpec) => plModelCommon.matchAxisId(plModelCommon.getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !plModelCommon.isLabelColumn(column.spec));
-    // if at least one column is not yet ready, we can't show the graph
-    if (!pcolumn_data.allPColumnsReady(compatibleWithoutLabels)) {
-        return undefined;
-    }
     // extend axes set for label columns request
     for (const c of compatibleWithoutLabels) {
         for (const spec of plModelCommon.getNormalizedAxesList(c.spec.axesSpec)) {
@@ -213,19 +201,15 @@ function createPFrameForGraphs(ctx, blockColumns) {
     }
     const allAxesArr = Array.from(allAxes.values());
     // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)
-    compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.every((axisSpec) => {
+    compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.every((axisSpec) => {
         const axisId = plModelCommon.getAxisId(axisSpec);
         return allAxesArr.some((selectorAxisSpec) => plModelCommon.matchAxisId(plModelCommon.getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !plModelCommon.isLabelColumn(column.spec));
     // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool
-    const compatibleLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {
+    const compatibleLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {
         const axisId = plModelCommon.getAxisId(axisSpec);
         return allAxesArr.some((selectorAxisSpec) => plModelCommon.matchAxisId(plModelCommon.getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => plModelCommon.isLabelColumn(column.spec));
-    // if at least one column is not yet ready, we can't show the graph
-    if (!pcolumn_data.allPColumnsReady(compatibleLabels)) {
-        return undefined;
-    }
     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(blockAxes, compatible);
@@ -236,4 +220,5 @@ exports.createPFrameForGraphs = createPFrameForGraphs;
 exports.enrichCompatible = enrichCompatible;
 exports.getAvailableWithLinkersAxes = getAvailableWithLinkersAxes;
 exports.isHiddenFromGraphColumn = isHiddenFromGraphColumn;
+exports.isHiddenFromUIColumn = isHiddenFromUIColumn;
 //# sourceMappingURL=PFrameForGraphs.cjs.map

package/dist/components/PFrameForGraphs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"PFrameForGraphs.cjs","sources":["../../src/components/PFrameForGraphs.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpecNormalized,\n  CanonicalizedJson,\n  PColumn,\n  PColumnSpec,\n  PFrameHandle,\n  PObjectId,\n} from '@milaboratories/pl-model-common';\nimport {\n  Annotation,\n  canonicalizeJson,\n  getArrayFromAxisTree,\n  getAxesTree,\n  getAxisId,\n  getColumnIdAndSpec,\n  getNormalizedAxesList,\n  isLabelColumn,\n  isLinkerColumn,\n  LinkerMap,\n  matchAxisId,\n  readAnnotation,\n  readAnnotationJson,\n  stringifyJson,\n} from '@milaboratories/pl-model-common';\nimport type { PColumnDataUniversal, RenderCtx } from '../render';\nimport { allPColumnsReady, PColumnCollection } from '../render';\n\n/** Create id for column copy with added keys in axes domains */\nconst colId = (id: PObjectId, domains: (Record<string, string> | undefined)[]) => {\n  let wid = id.toString();\n  domains?.forEach((domain) => {\n    if (domain) {\n      for (const [k, v] of Object.entries(domain)) {\n        wid += k;\n        wid += v;\n      }\n    }\n  });\n  return wid;\n};\n\n/** All combinations with 1 key from each list */\nfunction getKeysCombinations(idsLists: AxisId[][]) {\n  if (!idsLists.length) {\n    return [];\n  }\n  let result: AxisId[][] = [[]];\n  idsLists.forEach((list) => {\n    const nextResult: AxisId[][] = [];\n    list.forEach((key) => {\n      nextResult.push(...result.map((resultItem) => [...resultItem, key]));\n    });\n    result = nextResult;\n  });\n  return result;\n}\n\nexport function isHiddenFromGraphColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);\n}\n\ntype AxesVault = Map<CanonicalizedJson<AxisId>, AxisSpecNormalized>;\n\nexport function getAvailableWithLinkersAxes(\n  linkerColumns: PColumn<PColumnDataUniversal>[],\n  blockAxes: AxesVault,\n): AxesVault {\n  const linkerMap = LinkerMap.fromColumns(linkerColumns.map(getColumnIdAndSpec));\n  const startKeys: CanonicalizedJson<AxisId[]>[] = [];\n  const blockAxesGrouped: AxisId[][] = [...blockAxes.values()].map((axis) => getArrayFromAxisTree(getAxesTree(axis)).map(getAxisId));\n\n  for (const axesGroupBlock of blockAxesGrouped) {\n    const matched = linkerMap.keyAxesIds.find(\n      (keyIds: AxisId[]) => keyIds.every(\n        (keySourceAxis) => axesGroupBlock.find((axisSpecFromBlock) => matchAxisId(axisSpecFromBlock, keySourceAxis)),\n      ),\n    );\n    if (matched) {\n      startKeys.push(canonicalizeJson(matched)); // linker column can contain fewer domains than in block's columns, it's fixed on next step in enrichCompatible\n    }\n  }\n\n  const availableKeys = linkerMap.searchAvailableAxesKeys(startKeys);\n  const availableAxes = linkerMap.getAxesListFromKeysList([...availableKeys]);\n\n  return new Map(availableAxes.map((axisSpec) => {\n    const id = getAxisId(axisSpec);\n    return [canonicalizeJson(id), axisSpec];\n  }));\n}\n/** Add columns with fully compatible axes created from partial compatible ones */\nexport function enrichCompatible(blockAxes: AxesVault, columns: PColumn<PColumnDataUniversal>[]) {\n  const result: PColumn<PColumnDataUniversal>[] = [];\n  columns.forEach((column) => {\n    result.push(...getAdditionalColumnsForColumn(blockAxes, column));\n  });\n  return result;\n}\n\nfunction getAdditionalColumnsForColumn(\n  blockAxes: AxesVault,\n  column: PColumn<PColumnDataUniversal>,\n): PColumn<PColumnDataUniversal>[] {\n  const columnAxesIds = column.spec.axesSpec.map(getAxisId);\n\n  if (columnAxesIds.every((id) => blockAxes.has(canonicalizeJson(id)))) {\n    return [column]; // the column is compatible with its own domains without modifications\n  }\n\n  // options with different possible domains for every axis of secondary column\n  const secondaryIdsOptions = columnAxesIds.map((id) => {\n    const result = [];\n    for (const [_, mainId] of blockAxes) {\n      if (matchAxisId(mainId, id) && !matchAxisId(id, mainId)) {\n        result.push(mainId);\n      }\n    }\n    return result;\n  });\n  // all possible combinations of axes with added domains\n  const secondaryIdsVariants = getKeysCombinations(secondaryIdsOptions);\n\n  // sets of added to column domain fields\n  const allAddedDomainValues = new Set<string>();\n  const addedNotToAllVariantsDomainValues = new Set<string>();\n  const addedByVariantsDomainValues = secondaryIdsVariants.map((idsList) => {\n    const addedSet = new Set<string>();\n    idsList.map((axisId, idx) => {\n      const d1 = column.spec.axesSpec[idx].domain;\n      const d2 = axisId.domain;\n      Object.entries(d2 ?? {}).forEach(([key, value]) => {\n        if (d1?.[key] === undefined) {\n          const item = JSON.stringify([key, value]);\n          addedSet.add(item);\n          allAddedDomainValues.add(item);\n        }\n      });\n      return ({\n        ...axisId,\n        annotations: column.spec.axesSpec[idx].annotations,\n      });\n    });\n    return addedSet;\n  });\n  [...allAddedDomainValues].forEach((addedPart) => {\n    if (addedByVariantsDomainValues.some((s) => !s.has(addedPart))) {\n      addedNotToAllVariantsDomainValues.add(addedPart);\n    }\n  });\n\n  const additionalColumns = secondaryIdsVariants.map((idsList, idx) => {\n    const id = colId(column.id, idsList.map((id) => id.domain));\n\n    const label = readAnnotation(column.spec, Annotation.Label) ?? '';\n    const labelDomainPart = ([...addedByVariantsDomainValues[idx]])\n      .filter((str) => addedNotToAllVariantsDomainValues.has(str))\n      .sort()\n      .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\n      .join(' / ');\n\n    const annotations: Annotation = {\n      ...column.spec.annotations,\n      [Annotation.Graph.IsVirtual]: stringifyJson(true),\n    };\n    if (label || labelDomainPart) {\n      annotations[Annotation.Label] = label && labelDomainPart ? label + ' / ' + labelDomainPart : label + labelDomainPart;\n    }\n\n    return {\n      id: id as PObjectId,\n      spec: {\n        ...column.spec,\n        axesSpec: idsList.map((axisId, idx) => ({\n          ...axisId,\n          annotations: column.spec.axesSpec[idx].annotations,\n        })),\n        annotations,\n      },\n      data: column.data,\n    };\n  });\n\n  return [column, ...additionalColumns];\n}\n\n/**\n The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool\n (including linker columns and all label columns).\n Block’s columns are added to pframe as is.\n Other columns are added basing on set of axes of block’s columns, considering available with linker columns.\n Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from\n result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values\n among existing ones).\n In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case\n of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)\n and modified label (with added domain values in case if more than one copy with different domains exist).\n */\nexport function createPFrameForGraphs<A, U>(\n  ctx: RenderCtx<A, U>,\n  blockColumns?: PColumn<PColumnDataUniversal>[],\n): PFrameHandle | undefined {\n  // if current block doesn't produce own columns then use all columns from result pool\n  if (!blockColumns) {\n    const columns = new PColumnCollection();\n    columns.addColumnProvider(ctx.resultPool);\n\n    const allColumns = columns.getColumns((spec) => !isHiddenFromGraphColumn(spec), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];\n    // if at least one column is not yet ready, we can't show the graph\n    if (!allPColumnsReady(allColumns)) {\n      return undefined;\n    }\n\n    const allAxes: AxesVault = new Map(allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }));\n\n    // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n    const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n    return ctx.createPFrame(extendedColumns);\n  };\n\n  if (!allPColumnsReady(blockColumns)) {\n    return undefined;\n  }\n\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(blockColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of blockColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns = columns.getColumns((spec) => isLinkerColumn(spec)) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return blockAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));\n\n  // if at least one column is not yet ready, we can't show the graph\n  if (!allPColumnsReady(compatibleWithoutLabels)) {\n    return undefined;\n  }\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.every((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => isLabelColumn(column.spec));\n\n  // if at least one column is not yet ready, we can't show the graph\n  if (!allPColumnsReady(compatibleLabels)) {\n    return undefined;\n  }\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return ctx.createPFrame(extendedColumns);\n}\n"],"names":["readAnnotationJson","Annotation","LinkerMap","getColumnIdAndSpec","getArrayFromAxisTree","getAxesTree","getAxisId","matchAxisId","canonicalizeJson","readAnnotation","stringifyJson","PColumnCollection","allPColumnsReady","getNormalizedAxesList","isLinkerColumn","isLabelColumn"],"mappings":"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"}
+{"version":3,"file":"PFrameForGraphs.cjs","sources":["../../src/components/PFrameForGraphs.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpecNormalized,\n  CanonicalizedJson,\n  PColumn,\n  PColumnSpec,\n  PFrameHandle,\n  PObjectId,\n} from '@milaboratories/pl-model-common';\nimport {\n  Annotation,\n  canonicalizeJson,\n  getArrayFromAxisTree,\n  getAxesTree,\n  getAxisId,\n  getColumnIdAndSpec,\n  getNormalizedAxesList,\n  isLabelColumn,\n  isLinkerColumn,\n  LinkerMap,\n  matchAxisId,\n  readAnnotation,\n  readAnnotationJson,\n  stringifyJson,\n} from '@milaboratories/pl-model-common';\nimport type { PColumnDataUniversal, PColumnEntryUniversal, PColumnEntryWithLabel, RenderCtx } from '../render';\nimport { PColumnCollection } from '../render';\n\n/** Create id for column copy with added keys in axes domains */\nconst colId = (id: PObjectId, domains: (Record<string, string> | undefined)[]) => {\n  let wid = id.toString();\n  domains?.forEach((domain) => {\n    if (domain) {\n      for (const [k, v] of Object.entries(domain)) {\n        wid += k;\n        wid += v;\n      }\n    }\n  });\n  return wid;\n};\n\n/** All combinations with 1 key from each list */\nfunction getKeysCombinations(idsLists: AxisId[][]) {\n  if (!idsLists.length) {\n    return [];\n  }\n  let result: AxisId[][] = [[]];\n  idsLists.forEach((list) => {\n    const nextResult: AxisId[][] = [];\n    list.forEach((key) => {\n      nextResult.push(...result.map((resultItem) => [...resultItem, key]));\n    });\n    result = nextResult;\n  });\n  return result;\n}\n\nexport function isHiddenFromGraphColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);\n}\n\nexport function isHiddenFromUIColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromUi);\n}\n\ntype AxesVault = Map<CanonicalizedJson<AxisId>, AxisSpecNormalized>;\n\nexport function getAvailableWithLinkersAxes(\n  linkerColumns: (PColumnEntryWithLabel | PColumnEntryUniversal)[],\n  blockAxes: AxesVault,\n): AxesVault {\n  const linkerMap = LinkerMap.fromColumns(linkerColumns.map(getColumnIdAndSpec));\n  const startKeys: CanonicalizedJson<AxisId[]>[] = [];\n  const blockAxesGrouped: AxisId[][] = [...blockAxes.values()].map((axis) => getArrayFromAxisTree(getAxesTree(axis)).map(getAxisId));\n\n  for (const axesGroupBlock of blockAxesGrouped) {\n    const matched = linkerMap.keyAxesIds.find(\n      (keyIds: AxisId[]) => keyIds.every(\n        (keySourceAxis) => axesGroupBlock.find((axisSpecFromBlock) => matchAxisId(axisSpecFromBlock, keySourceAxis)),\n      ),\n    );\n    if (matched) {\n      startKeys.push(canonicalizeJson(matched)); // linker column can contain fewer domains than in block's columns, it's fixed on next step in enrichCompatible\n    }\n  }\n\n  const availableKeys = linkerMap.searchAvailableAxesKeys(startKeys);\n  const availableAxes = linkerMap.getAxesListFromKeysList([...availableKeys]);\n\n  return new Map(availableAxes.map((axisSpec) => {\n    const id = getAxisId(axisSpec);\n    return [canonicalizeJson(id), axisSpec];\n  }));\n}\n/** Add columns with fully compatible axes created from partial compatible ones */\nexport function enrichCompatible<T extends Omit<PColumn<PColumnDataUniversal>, 'data'>>(blockAxes: AxesVault, columns: T[]): T[] {\n  return columns.flatMap((column) => getAdditionalColumnsForColumn(blockAxes, column));\n}\n\nfunction getAdditionalColumnsForColumn<T extends Omit<PColumn<PColumnDataUniversal>, 'data'>>(\n  blockAxes: AxesVault,\n  column: T,\n): T[] {\n  const columnAxesIds = column.spec.axesSpec.map(getAxisId);\n\n  if (columnAxesIds.every((id) => blockAxes.has(canonicalizeJson(id)))) {\n    return [column]; // the column is compatible with its own domains without modifications\n  }\n\n  // options with different possible domains for every axis of secondary column\n  const secondaryIdsOptions = columnAxesIds.map((id) => {\n    const result = [];\n    for (const [_, mainId] of blockAxes) {\n      if (matchAxisId(mainId, id) && !matchAxisId(id, mainId)) {\n        result.push(mainId);\n      }\n    }\n    return result;\n  });\n  // all possible combinations of axes with added domains\n  const secondaryIdsVariants = getKeysCombinations(secondaryIdsOptions);\n\n  // sets of added to column domain fields\n  const allAddedDomainValues = new Set<string>();\n  const addedNotToAllVariantsDomainValues = new Set<string>();\n  const addedByVariantsDomainValues = secondaryIdsVariants.map((idsList) => {\n    const addedSet = new Set<string>();\n    idsList.map((axisId, idx) => {\n      const d1 = column.spec.axesSpec[idx].domain;\n      const d2 = axisId.domain;\n      Object.entries(d2 ?? {}).forEach(([key, value]) => {\n        if (d1?.[key] === undefined) {\n          const item = JSON.stringify([key, value]);\n          addedSet.add(item);\n          allAddedDomainValues.add(item);\n        }\n      });\n      return ({\n        ...axisId,\n        annotations: column.spec.axesSpec[idx].annotations,\n      });\n    });\n    return addedSet;\n  });\n  [...allAddedDomainValues].forEach((addedPart) => {\n    if (addedByVariantsDomainValues.some((s) => !s.has(addedPart))) {\n      addedNotToAllVariantsDomainValues.add(addedPart);\n    }\n  });\n\n  const additionalColumns = secondaryIdsVariants.map((idsList, idx) => {\n    const id = colId(column.id, idsList.map((id) => id.domain));\n\n    const label = readAnnotation(column.spec, Annotation.Label) ?? '';\n    const labelDomainPart = ([...addedByVariantsDomainValues[idx]])\n      .filter((str) => addedNotToAllVariantsDomainValues.has(str))\n      .sort()\n      .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\n      .join(' / ');\n\n    const annotations: Annotation = {\n      ...column.spec.annotations,\n      [Annotation.Graph.IsVirtual]: stringifyJson(true),\n    };\n    if (label || labelDomainPart) {\n      annotations[Annotation.Label] = label && labelDomainPart ? label + ' / ' + labelDomainPart : label + labelDomainPart;\n    }\n\n    return {\n      ...column,\n      id: id as PObjectId,\n      spec: {\n        ...column.spec,\n        axesSpec: idsList.map((axisId, idx) => ({\n          ...axisId,\n          annotations: column.spec.axesSpec[idx].annotations,\n        })),\n        annotations,\n      },\n    };\n  });\n\n  return [column, ...additionalColumns];\n}\n\n/**\n The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool\n (including linker columns and all label columns).\n Block’s columns are added to pframe as is.\n Other columns are added basing on set of axes of block’s columns, considering available with linker columns.\n Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from\n result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values\n among existing ones).\n In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case\n of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)\n and modified label (with added domain values in case if more than one copy with different domains exist).\n */\nexport function createPFrameForGraphs<A, U>(\n  ctx: RenderCtx<A, U>,\n  blockColumns?: PColumn<PColumnDataUniversal>[],\n): PFrameHandle | undefined {\n  const suitableSpec = (spec: PColumnSpec) => !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);\n  // if current block doesn't produce own columns then use all columns from result pool\n  if (!blockColumns) {\n    const columns = new PColumnCollection();\n    columns.addColumnProvider(ctx.resultPool);\n    const allColumns = columns.getUniversalEntries(suitableSpec, { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];\n\n    const allAxes: AxesVault = new Map(allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }));\n\n    // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n    const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n    return ctx.createPFrame(extendedColumns);\n  };\n\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(blockColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of blockColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns = columns.getUniversalEntries((spec) => suitableSpec(spec) && isLinkerColumn(spec)) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return blockAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.every((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {\n    const axisId = getAxisId(axisSpec);\n    return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));\n  }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return ctx.createPFrame(extendedColumns);\n}\n"],"names":["readAnnotationJson","Annotation","LinkerMap","getColumnIdAndSpec","getArrayFromAxisTree","getAxesTree","getAxisId","matchAxisId","canonicalizeJson","readAnnotation","stringifyJson","PColumnCollection","getNormalizedAxesList","isLinkerColumn","isLabelColumn"],"mappings":"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"}

package/dist/components/PFrameForGraphs.d.ts

@@ -1,10 +1,11 @@
 import type { AxisId, AxisSpecNormalized, CanonicalizedJson, PColumn, PColumnSpec, PFrameHandle } from '@milaboratories/pl-model-common';
-import type { PColumnDataUniversal, RenderCtx } from '../render';
+import type { PColumnDataUniversal, PColumnEntryUniversal, PColumnEntryWithLabel, RenderCtx } from '../render';
 export declare function isHiddenFromGraphColumn(column: PColumnSpec): boolean;
+export declare function isHiddenFromUIColumn(column: PColumnSpec): boolean;
 type AxesVault = Map<CanonicalizedJson<AxisId>, AxisSpecNormalized>;
-export declare function getAvailableWithLinkersAxes(linkerColumns: PColumn<PColumnDataUniversal>[], blockAxes: AxesVault): AxesVault;
+export declare function getAvailableWithLinkersAxes(linkerColumns: (PColumnEntryWithLabel | PColumnEntryUniversal)[], blockAxes: AxesVault): AxesVault;
 /** Add columns with fully compatible axes created from partial compatible ones */
-export declare function enrichCompatible(blockAxes: AxesVault, columns: PColumn<PColumnDataUniversal>[]): PColumn<PColumnDataUniversal>[];
+export declare function enrichCompatible<T extends Omit<PColumn<PColumnDataUniversal>, 'data'>>(blockAxes: AxesVault, columns: T[]): T[];
 /**
  The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool
  (including linker columns and all label columns).

package/dist/components/PFrameForGraphs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PFrameForGraphs.d.ts","sourceRoot":"","sources":["../../src/components/PFrameForGraphs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,WAAW,EACX,YAAY,EAEb,MAAM,iCAAiC,CAAC;AAiBzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAiCjE,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,KAAK,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,EAC9C,SAAS,EAAE,SAAS,GACnB,SAAS,CAuBX;AACD,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,mCAM9F;AAwFD;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EACxC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EACpB,YAAY,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,GAC7C,YAAY,GAAG,SAAS,CAoG1B"}
+{"version":3,"file":"PFrameForGraphs.d.ts","sourceRoot":"","sources":["../../src/components/PFrameForGraphs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EACP,WAAW,EACX,YAAY,EAEb,MAAM,iCAAiC,CAAC;AAiBzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAiC/G,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAEpE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAEjE;AAED,KAAK,SAAS,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,CAAC,qBAAqB,GAAG,qBAAqB,CAAC,EAAE,EAChE,SAAS,EAAE,SAAS,GACnB,SAAS,CAuBX;AACD,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE/H;AAwFD;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EACxC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EACpB,YAAY,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,GAC7C,YAAY,GAAG,SAAS,CAkF1B"}

package/dist/components/PFrameForGraphs.js

@@ -2,7 +2,6 @@ import { readAnnotationJson, Annotation, LinkerMap, getColumnIdAndSpec, getArray
 import 'canonicalize';
 import { PColumnCollection } from '../render/util/column_collection.js';
 import '../render/util/label.js';
-import { allPColumnsReady } from '../render/util/pcolumn_data.js';
 
 /** Create id for column copy with added keys in axes domains */
 const colId = (id, domains) => {
@@ -35,6 +34,9 @@ function getKeysCombinations(idsLists) {
 function isHiddenFromGraphColumn(column) {
     return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);
 }
+function isHiddenFromUIColumn(column) {
+    return !!readAnnotationJson(column, Annotation.HideDataFromUi);
+}
 function getAvailableWithLinkersAxes(linkerColumns, blockAxes) {
     const linkerMap = LinkerMap.fromColumns(linkerColumns.map(getColumnIdAndSpec));
     const startKeys = [];
@@ -54,11 +56,7 @@ function getAvailableWithLinkersAxes(linkerColumns, blockAxes) {
 }
 /** Add columns with fully compatible axes created from partial compatible ones */
 function enrichCompatible(blockAxes, columns) {
-    const result = [];
-    columns.forEach((column) => {
-        result.push(...getAdditionalColumnsForColumn(blockAxes, column));
-    });
-    return result;
+    return columns.flatMap((column) => getAdditionalColumnsForColumn(blockAxes, column));
 }
 function getAdditionalColumnsForColumn(blockAxes, column) {
     const columnAxesIds = column.spec.axesSpec.map(getAxisId);
@@ -120,6 +118,7 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
             annotations[Annotation.Label] = label && labelDomainPart ? label + ' / ' + labelDomainPart : label + labelDomainPart;
         }
         return {
+            ...column,
             id: id,
             spec: {
                 ...column.spec,
@@ -129,7 +128,6 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
                 })),
                 annotations,
             },
-            data: column.data,
         };
     });
     return [column, ...additionalColumns];
@@ -147,15 +145,12 @@ function getAdditionalColumnsForColumn(blockAxes, column) {
  and modified label (with added domain values in case if more than one copy with different domains exist).
  */
 function createPFrameForGraphs(ctx, blockColumns) {
+    const suitableSpec = (spec) => !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);
     // if current block doesn't produce own columns then use all columns from result pool
     if (!blockColumns) {
         const columns = new PColumnCollection();
         columns.addColumnProvider(ctx.resultPool);
-        const allColumns = columns.getColumns((spec) => !isHiddenFromGraphColumn(spec), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];
-        // if at least one column is not yet ready, we can't show the graph
-        if (!allPColumnsReady(allColumns)) {
-            return undefined;
-        }
+        const allColumns = columns.getUniversalEntries(suitableSpec, { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];
         const allAxes = new Map(allColumns
             .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))
             .map((axisSpec) => {
@@ -166,9 +161,6 @@ function createPFrameForGraphs(ctx, blockColumns) {
         const extendedColumns = enrichCompatible(allAxes, allColumns);
         return ctx.createPFrame(extendedColumns);
     }
-    if (!allPColumnsReady(blockColumns)) {
-        return undefined;
-    }
     // if current block has its own columns then take from result pool only compatible with them
     const columns = new PColumnCollection();
     columns.addColumnProvider(ctx.resultPool);
@@ -185,7 +177,7 @@ function createPFrameForGraphs(ctx, blockColumns) {
         }
     }
     // 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 linkerColumns = columns.getUniversalEntries((spec) => suitableSpec(spec) && isLinkerColumn(spec)) ?? [];
     const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);
     // all possible axes from connected linkers
     for (const item of availableWithLinkersAxes) {
@@ -194,14 +186,10 @@ function createPFrameForGraphs(ctx, blockColumns) {
     }
     const blockAxesArr = Array.from(blockAxes.values());
     // all compatible with block columns but without label columns
-    let compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {
+    let compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {
         const axisId = getAxisId(axisSpec);
         return blockAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));
-    // if at least one column is not yet ready, we can't show the graph
-    if (!allPColumnsReady(compatibleWithoutLabels)) {
-        return undefined;
-    }
     // extend axes set for label columns request
     for (const c of compatibleWithoutLabels) {
         for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {
@@ -211,24 +199,20 @@ function createPFrameForGraphs(ctx, blockColumns) {
     }
     const allAxesArr = Array.from(allAxes.values());
     // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)
-    compatibleWithoutLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.every((axisSpec) => {
+    compatibleWithoutLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.every((axisSpec) => {
         const axisId = getAxisId(axisSpec);
         return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));
     // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool
-    const compatibleLabels = (columns.getColumns((spec) => !isHiddenFromGraphColumn(spec) && spec.axesSpec.some((axisSpec) => {
+    const compatibleLabels = (columns.getUniversalEntries((spec) => suitableSpec(spec) && spec.axesSpec.some((axisSpec) => {
         const axisId = getAxisId(axisSpec);
         return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
     }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => isLabelColumn(column.spec));
-    // if at least one column is not yet ready, we can't show the graph
-    if (!allPColumnsReady(compatibleLabels)) {
-        return undefined;
-    }
     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(blockAxes, compatible);
     return ctx.createPFrame(extendedColumns);
 }
 
-export { createPFrameForGraphs, enrichCompatible, getAvailableWithLinkersAxes, isHiddenFromGraphColumn };
+export { createPFrameForGraphs, enrichCompatible, getAvailableWithLinkersAxes, isHiddenFromGraphColumn, isHiddenFromUIColumn };
 //# sourceMappingURL=PFrameForGraphs.js.map