@platforma-sdk/ui-vue 1.3.10 → 1.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "type": "module",
   "main": "dist/lib.umd.cjs",
   "module": "dist/lib.js",
@@ -20,7 +20,7 @@
   "dependencies": {
     "vue": "^3.5.9",
     "@milaboratories/uikit": "^1.2.7",
-    "@platforma-sdk/model": "^1.2.27"
+    "@platforma-sdk/model": "^1.2.28"
   },
   "devDependencies": {
     "@ag-grid-community/client-side-row-model": "^32.2.1",

package/src/components/PlAgDataTable/OverlayLoading.vue

@@ -39,7 +39,9 @@ defineProps<{
   height: 200px !important;
   width: 300px !important;
   mask-size: contain !important;
+  mask-position: center !important;
   background-size: contain;
+  background-position: center;
 }
 .grid-overlay-container > span {
   color: var(--txt-mask);

package/src/components/PlAgDataTable/OverlayNoRows.vue

@@ -22,6 +22,7 @@
   height: 300px;
   width: 300px;
   background-size: contain;
+  background-position: center;
 }
 .grid-overlay-container > span {
   color: var(--txt-mask);

package/src/components/PlAgDataTable/PlAgDataTable.vue

@@ -77,10 +77,15 @@ function makeFilters(sheetsState: Record<string, string | number>): PTableRecord
   return (
     settings.value.sheets?.map((sheet) => ({
       type: 'bySingleColumn',
-      column: {
-        type: 'axis',
-        id: sheet.axis,
-      },
+      column: sheet.column
+        ? {
+            type: 'column',
+            id: sheet.column,
+          }
+        : {
+            type: 'axis',
+            id: sheet.axis,
+          },
       predicate: {
         operator: 'Equal',
         reference: sheetsState[makeSheetId(sheet.axis)],
@@ -127,9 +132,6 @@ watch(
     for (const sheet of sheets) {
       const sheetId = makeSheetId(sheet.axis);
       if (!state[sheetId]) {
-        // @vadimpiven
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
         state[sheetId] = sheet.defaultValue ?? sheet.options[0].value;
       }
     }
@@ -187,9 +189,6 @@ watch(
 const onSheetChanged = (sheetId: string, newValue: string | number) => {
   const state = sheetsState.value;
   if (state[sheetId] === newValue) return;
-  // @vadimpiven
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
   state[sheetId] = newValue;
   sheetsState.value = state;
 };

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

@@ -17,6 +17,8 @@ import {
   type PTableColumnSpec,
   type PTableHandle,
   type PTableVector,
+  type PColumnSpec,
+  getAxesId,
 } from '@platforma-sdk/model';
 import * as lodash from 'lodash';
 import canonicalize from 'canonicalize';
@@ -136,7 +138,7 @@ function toDisplayValue(value: string | number | bigint | Uint8Array, valueType:
  * @param nRows number of rows
  * @returns
  */
-function columns2rows(indices: number[], columns: PTableVector[]): unknown[] {
+function columns2rows(fields: number[], columns: PTableVector[]): unknown[] {
   const nCols = columns.length;
   const rowData = [];
   for (let iRow = 0; iRow < columns[0].data.length; ++iRow) {
@@ -144,7 +146,7 @@ function columns2rows(indices: number[], columns: PTableVector[]): unknown[] {
 
     const index = [];
     for (let iCol = 0; iCol < nCols; ++iCol) {
-      const field = indices[iCol].toString();
+      const field = fields[iCol].toString();
       const value = columns[iCol].data[iRow];
       const valueType = columns[iCol].type;
       if (isValueAbsent(columns[iCol].absent, iRow)) {
@@ -183,7 +185,22 @@ export async function updatePFrameGridOptions(
   const indices = specs
     .map((spec, i) => (!lodash.find(sheets, (sheet) => lodash.isEqual(sheet.axis, spec.id)) ? i : null))
     .filter((entry) => entry !== null);
-  const columnDefs = indices.map((i) => getColDef(i, specs[i]));
+  const fields = lodash.cloneDeep(indices);
+
+  for (let i = indices.length - 1; i >= 0; --i) {
+    const idx = indices[i];
+    if (specs[idx].type !== 'column' || specs[idx].spec.name !== 'pl7.app/label') continue;
+
+    const axisId = getAxesId((specs[idx].spec as PColumnSpec).axesSpec).map(lodash.cloneDeep)[0];
+    const axisIdx = lodash.findIndex(indices, (idx) => lodash.isEqual(specs[idx].id, axisId));
+    if (axisIdx === -1) continue;
+
+    indices[axisIdx] = idx;
+    indices.splice(idx, 1);
+    fields.splice(idx, 1);
+  }
+
+  const columnDefs = fields.map((i) => getColDef(i, specs[i]));
 
   const ptShape = await pfDriver.getShape(pt);
   const rowCount = ptShape.rows;
@@ -216,7 +233,7 @@ export async function updatePFrameGridOptions(
             offset: params.startRow,
             length,
           });
-          rowData = columns2rows(indices, data);
+          rowData = columns2rows(fields, data);
         }
 
         params.successCallback(rowData, ptShape.rows);

package/src/components/PlAgDataTable/types.ts

@@ -1,11 +1,13 @@
-import type { AxisId, LocalBlobHandleAndSize, PTableHandle, RemoteBlobHandleAndSize, ValueOrErrors } from '@platforma-sdk/model';
+import type { AxisId, LocalBlobHandleAndSize, PObjectId, PTableHandle, RemoteBlobHandleAndSize, ValueOrErrors } from '@platforma-sdk/model';
 
 export type PlDataTableSheet = {
   /** id of the axis to use */
   axis: AxisId;
+  /** id of label column to use in filter instead of axis */
+  column?: PObjectId;
   /** options to show in the filter tan */
   options: {
-    /** value of the option (should be one of the values in the axis) */
+    /** value of the option (should be one of the values in the axis or column) */
     value: string | number;
     /** corresponding label */
     text: string;