@platforma-sdk/ui-vue 1.19.0 → 1.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.19.0",
+  "version": "1.20.2",
   "type": "module",
   "main": "dist/lib.umd.cjs",
   "module": "dist/lib.js",
@@ -37,8 +37,8 @@
     "@ag-grid-community/theming": "^32.3.3",
     "@ag-grid-enterprise/side-bar": "^32.3.3",
     "@ag-grid-enterprise/column-tool-panel": "^32.3.3",
-    "@platforma-sdk/model": "^1.19.0",
-    "@milaboratories/uikit": "^2.2.32"
+    "@milaboratories/uikit": "^2.2.32",
+    "@platforma-sdk/model": "^1.20.0"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.2.0",
@@ -58,8 +58,8 @@
     "yarpm": "^1.2.0",
     "semver": "^7.6.3",
     "@types/semver": "^7.5.8",
-    "@milaboratories/helpers": "^1.6.9",
-    "@milaboratories/eslint-config": "^1.0.0"
+    "@milaboratories/eslint-config": "^1.0.0",
+    "@milaboratories/helpers": "^1.6.9"
   },
   "scripts": {
     "test": "vitest run --passWithNoTests",

package/src/components/PlAgDataTable/sources/focus-row.ts

@@ -28,7 +28,7 @@ export function trackFirstDataRendered(gridApi: GridApi, tracker: OnceTracker<Gr
   });
   gridApi.addEventListener('modelUpdated', (event) => {
     const groupState = event.api.getServerSideGroupLevelState();
-    if (groupState.length > 0 && groupState[0].lastRowIndexKnown) {
+    if (groupState && groupState.length > 0 && groupState[0].lastRowIndexKnown) {
       tracker.track(event.api);
     }
   });

package/src/components/PlAgDataTable/sources/table-source-heterogeneous.ts

@@ -41,10 +41,10 @@ export function getHeterogeneousColumns(specs: PTableColumnSpec[], indices: numb
         }
 
         const axisId = getAxisId(hAx);
-        const axisIdx = specs.findIndex((s) => lodash.isEqual(s.id, axisId));
+        const axisIdx = indices.find((idx) => lodash.isEqual(specs[idx].id, axisId));
 
-        if (axisIdx === -1) {
-          console.error('axis not found', i, axisId, specs);
+        if (axisIdx === undefined) {
+          console.error('axis not found', i, axisId, specs, indices);
           throw Error('axis not found');
         }
 
@@ -57,12 +57,12 @@ export function getHeterogeneousColumns(specs: PTableColumnSpec[], indices: numb
 }
 
 // auxiliary function to get a field for i-th axis-value
-const hColumnField = (originalLength: number, i: number) => (originalLength + i).toString();
+const hColumnField = (originalLength: number, i: number) => 'hC' + (originalLength + i).toString();
 
 /**
  * Calculate GridOptions for p-table data source type
  *
- * @param hColumns heterogeneous columns list
+ * @param hColumn heterogeneous column
  * @param shape table shape
  * @param columnDefs initial column definitions (with h-cols inside and no additional columns)
  * @param data data array (including initial columns)
@@ -70,7 +70,7 @@ const hColumnField = (originalLength: number, i: number) => (originalLength + i)
  * @param indices indices in the original specs array
  */
 export function updatePFrameGridOptionsHeterogeneousAxes(
-  hColumns: HeterogeneousColumnInfo[],
+  hColumn: HeterogeneousColumnInfo,
   shape: PTableShape,
   columnDefs: ColDef[],
   data: PTableVector[],
@@ -82,12 +82,6 @@ export function updatePFrameGridOptionsHeterogeneousAxes(
     rowModelType: RowModelType;
     rowData?: unknown[];
   } {
-  if (hColumns.length > 1) {
-    throw Error('hColumns.length > 1 is not supported');
-  }
-
-  const hColumn = hColumns[0];
-
   // recalculate indices of h-cols to the positions in the resulting data
   // index of axis & column in indices array
   let axisIdx: number = -1;
@@ -100,6 +94,10 @@ export function updatePFrameGridOptionsHeterogeneousAxes(
       columnIdx = i;
     }
   }
+  if (axisIdx === -1 || columnIdx === -1) {
+    console.error(`axisIdx === -1 || columnIdx === -1: ${axisIdx} ${columnIdx}`, hColumn, indices);
+    throw Error(`axisIdx === -1 || columnIdx === -1: ${axisIdx} ${columnIdx}`);
+  }
 
   // columns to add into the data table definition
   const hAxisValues: string[] = (() => {
@@ -114,11 +112,11 @@ export function updatePFrameGridOptionsHeterogeneousAxes(
 
   // remove heterogeneous column from the column defs
   if (columnIdx > axisIdx) {
-    columnDefs.splice(columnIdx, 1);
-    columnDefs.splice(axisIdx, 1);
+    columnDefs.splice(columnIdx + 1, 1); // note '+1' added to account for # column
+    columnDefs.splice(axisIdx + 1, 1);
   } else {
-    columnDefs.splice(axisIdx, 1);
-    columnDefs.splice(columnIdx, 1);
+    columnDefs.splice(axisIdx + 1, 1);
+    columnDefs.splice(columnIdx + 1, 1);
   }
 
   // calculate row data

package/src/components/PlAgDataTable/sources/table-source.ts

@@ -1,23 +1,23 @@
 import type { ColDef, ICellRendererParams, IServerSideDatasource, IServerSideGetRowsParams, RowModelType } from '@ag-grid-community/core';
 import {
+  getAxisId,
+  pTableValue,
   type AxisId,
   type PColumnSpec,
   type PFrameDriver,
+  type PlDataTableSheet,
   type PTableColumnSpec,
   type PTableHandle,
-  type PTableVector,
-  type PlDataTableSheet,
   type PTableValue,
-  getAxisId,
-  pTableValue,
+  type PTableVector,
 } from '@platforma-sdk/model';
 import canonicalize from 'canonicalize';
 import * as lodash from 'lodash';
-import { getHeterogeneousColumns, updatePFrameGridOptionsHeterogeneousAxes } from './table-source-heterogeneous';
+import { PlAgColumnHeader, type PlAgHeaderComponentParams, type PlAgHeaderComponentType } from '../../PlAgColumnHeader';
+import PlAgTextAndButtonCell from '../../PlAgTextAndButtonCell/PlAgTextAndButtonCell.vue';
 import type { PlAgDataTableRow } from '../types';
 import { makeRowNumberColDef, PlAgDataTableRowNumberColId } from './row-number';
-import { PlAgColumnHeader, type PlAgHeaderComponentType, type PlAgHeaderComponentParams } from '../../PlAgColumnHeader';
-import PlAgTextAndButtonCell from '../../PlAgTextAndButtonCell/PlAgTextAndButtonCell.vue';
+import { getHeterogeneousColumns, updatePFrameGridOptionsHeterogeneousAxes } from './table-source-heterogeneous';
 
 /**
  * Generate unique colId based on the column spec.
@@ -187,21 +187,18 @@ export async function updatePFrameGridOptions(
 
     // axis of labels
     const axisId = getAxisId((specs[idx].spec as PColumnSpec).axesSpec[0]);
-    const axisIdx = lodash.findIndex(indices, (idx) => lodash.isEqual(specs[idx].id, axisId));
+    const axisIdx = indices.findIndex((idx) => lodash.isEqual(specs[idx].id, axisId));
     if (axisIdx === -1) {
-      // no axis, probably we are in the sheet
-      const sheetIdx = lodash.findIndex(sheets, (sheet) => lodash.isEqual(getAxisId(sheet.axis), axisId));
-      if (sheetIdx === -1) {
-        console.warn(`added label column, but the axis is not in the data; axisId: ${axisId}`);
-        continue;
-      }
+      // no axis, it was already processed
+      continue;
     }
 
     // replace in h-columns
+    const oldIdx = indices[axisIdx];
     indices[axisIdx] = idx;
     for (const hCol of hColumns) {
-      if (hCol.axisIdx === idx) {
-        hCol.axisIdx = axisIdx;
+      if (hCol.axisIdx === oldIdx) {
+        hCol.axisIdx = idx;
       }
     }
 
@@ -212,15 +209,27 @@ export async function updatePFrameGridOptions(
 
   const ptShape = await pfDriver.getShape(pt);
   const rowCount = ptShape.rows;
-  const columnDefs: ColDef<PlAgDataTableRow>[] = [makeRowNumberColDef(), ...fields.map((i) => getColDef(i, specs[i], hiddenColIds, showCellButtonForAxisId))];
-
-  if (hColumns.length > 1) {
-    console.warn('Currently, only one heterogeneous axis is supported in the table, got', hColumns.length, ' transposition will not be applied.');
-  }
+  const columnDefs: ColDef<PlAgDataTableRow>[] = [
+    makeRowNumberColDef(),
+    ...fields.map((i) => getColDef(i, specs[i], hiddenColIds, showCellButtonForAxisId)),
+  ];
+
+  if (hColumns.length > 0) {
+    let valueColumn = undefined;
+    if (hColumns.length == 1) {
+      valueColumn = hColumns[0];
+    } else {
+      const vc = hColumns.filter((i) => specs[i.columnIdx].spec.annotations?.['pl7.app/table/hValue'] === 'true');
+      if (vc.length === 1) valueColumn = vc[0];
+    }
 
-  if (hColumns.length === 1) {
-    // return data
-    return updatePFrameGridOptionsHeterogeneousAxes(hColumns, ptShape, columnDefs, await pfDriver.getData(pt, indices), fields, indices);
+    if (!valueColumn) {
+      console.warn(
+        `Currently, only one heterogeneous axis / column is supported in the table, got ${hColumns.length} transposition will not be applied.`,
+      );
+    } else {
+      return updatePFrameGridOptionsHeterogeneousAxes(valueColumn, ptShape, columnDefs, await pfDriver.getData(pt, indices), fields, indices);
+    }
   }
 
   // mixing in axis indices