@platforma-sdk/model 1.45.23 → 1.45.30

package/src/components/PFrameForGraphs.ts

@@ -8,22 +8,23 @@ import type {
   PObjectId,
 } from '@milaboratories/pl-model-common';
 import {
+  Annotation,
   canonicalizeJson,
+  getArrayFromAxisTree,
+  getAxesTree,
   getAxisId,
-  matchAxisId,
   getColumnIdAndSpec,
-  Annotation,
-  readAnnotation,
   getNormalizedAxesList,
-  stringifyJson,
-  readAnnotationJson,
+  isLabelColumn,
+  isLinkerColumn,
   LinkerMap,
-  getArrayFromAxisTree,
-  getAxesTree,
+  matchAxisId,
+  readAnnotation,
+  readAnnotationJson,
+  stringifyJson,
 } from '@milaboratories/pl-model-common';
 import type { PColumnDataUniversal, RenderCtx } from '../render';
 import { allPColumnsReady, PColumnCollection } from '../render';
-import { isLabelColumn } from './PlDataTable';
 
 /** Create id for column copy with added keys in axes domains */
 const colId = (id: PObjectId, domains: (Record<string, string> | undefined)[]) => {
@@ -55,12 +56,7 @@ function getKeysCombinations(idsLists: AxisId[][]) {
   return result;
 }
 
-/** Check if column is a linker column */
-export function isLinkerColumn(column: PColumnSpec): boolean {
-  return !!readAnnotationJson(column, Annotation.IsLinkerColumn);
-}
-
-function isHiddenFromGraphColumn(column: PColumnSpec): boolean {
+export function isHiddenFromGraphColumn(column: PColumnSpec): boolean {
   return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);
 }
 
@@ -259,10 +255,11 @@ export function createPFrameForGraphs<A, U>(
     allAxes.set(...item);
   }
 
+  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) => {
     const axisId = getAxisId(axisSpec);
-    return Array.from(blockAxes.values()).some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+    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
@@ -278,16 +275,17 @@ export function createPFrameForGraphs<A, U>(
     }
   }
 
+  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) => {
     const axisId = getAxisId(axisSpec);
-    return Array.from(allAxes.values()).some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+    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 axisId = getAxisId(axisSpec);
-    return Array.from(allAxes.values()).some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+    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

package/src/components/PlAnnotations/filters_ui.ts

@@ -23,7 +23,7 @@ export type FilterUi = FilterSpec<Extract<
     | 'isNA'
     | 'isNotNA';
   }
->, { id?: number; name?: string; isExpanded?: boolean }>;
+>, { id: number; name?: string; isExpanded?: boolean }>;
 
 export type FilterUiType = Exclude<FilterUi, { type: undefined }>['type'];
 

package/src/components/PlDataTable.ts

@@ -6,7 +6,6 @@ import type {
   ListOptionBase,
   PColumn,
   PColumnIdAndSpec,
-  PColumnSpec,
   PColumnValues,
   PObjectId,
   PTableColumnId,
@@ -24,6 +23,8 @@ import {
   canonicalizeJson,
   getAxisId,
   getColumnIdAndSpec,
+  isLabelColumn,
+  isLinkerColumn,
   matchAxisId,
   PColumnName,
   readAnnotation,
@@ -40,7 +41,6 @@ import {
   allPColumnsReady,
   PColumnCollection,
 } from '../render';
-import { isLinkerColumn } from './PFrameForGraphs';
 
 export type PlTableColumnId = {
   /** Original column spec */
@@ -483,11 +483,6 @@ export type CreatePlDataTableOps = {
   doNotSkipTechnicalColumns?: boolean;
 };
 
-/** Check if column is a label column */
-export function isLabelColumn(column: PColumnSpec) {
-  return column.axesSpec.length === 1 && column.name === PColumnName.Label;
-}
-
 /** Get all label columns from the result pool */
 export function getAllLabelColumns(
   resultPool: AxisLabelProvider & ColumnProvider,

package/src/render/api.ts

@@ -55,7 +55,7 @@ import type { APColumnSelectorWithSplit } from './util/split_selectors';
 import { patchInSetFilters } from './util/pframe_upgraders';
 import { allPColumnsReady } from './util/pcolumn_data';
 
-export type PColumnDataUniversal = TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues;
+export type PColumnDataUniversal<TreeEntry = TreeNodeAccessor> = TreeEntry | DataInfo<TreeEntry> | PColumnValues;
 
 /**
  * Helper function to match domain objects
@@ -619,7 +619,7 @@ export class RenderCtx<Args, UiState> {
   }
 
   // TODO remove all non-PColumn fields
-  public createPFrame(def: PFrameDef<PColumnDataUniversal>): PFrameHandle | undefined {
+  public createPFrame(def: PFrameDef<PColumn<PColumnDataUniversal>>): PFrameHandle | undefined {
     this.verifyInlineAndExplicitColumnsSupport(def);
     if (!allPColumnsReady(def)) return undefined;
     return this.ctx.createPFrame(

package/src/render/internal.ts

@@ -143,7 +143,7 @@ export interface GlobalCfgRenderCtxMethods<AHandle = AccessorHandle, FHandle = F
   // PFrame / PTable
   //
 
-  createPFrame(def: PFrameDef<AHandle | PColumnValues | DataInfo<AHandle>>): PFrameHandle;
+  createPFrame(def: PFrameDef<PColumn<AHandle | PColumnValues | DataInfo<AHandle>>>): PFrameHandle;
 
   createPTable(def: PTableDef<PColumn<AHandle | PColumnValues | DataInfo<AHandle>>>): PTableHandle;