@platforma-sdk/ui-vue 1.5.42 → 1.5.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.5.42",
+  "version": "1.5.57",
   "type": "module",
   "main": "dist/lib.umd.cjs",
   "module": "dist/lib.js",
@@ -21,7 +21,7 @@
     "lru-cache": "^11.0.1",
     "vue": "^3.5.11",
     "canonicalize": "^2.0.0",
-    "@milaboratories/uikit": "^1.2.18",
+    "@milaboratories/uikit": "^1.2.20",
     "@platforma-sdk/model": "^1.5.40"
   },
   "devDependencies": {

package/src/components/PlAgDataTable/PlAgDataTable.vue

@@ -14,12 +14,7 @@ import { computed, ref, watch, shallowRef, toRefs } from 'vue';
 import OverlayLoading from './OverlayLoading.vue';
 import OverlayNoRows from './OverlayNoRows.vue';
 import { updateXsvGridOptions } from './sources/file-source';
-import {
-  parseColId,
-  makeSheets,
-  updatePFrameGridOptions,
-  enrichJoinWithLabelColumns
-} from './sources/table-source';
+import { parseColId, makeSheets, updatePFrameGridOptions, enrichJoinWithLabelColumns } from './sources/table-source';
 import type { PlDataTableSheet, PlDataTableSettings } from './types';
 import * as lodash from 'lodash';
 import { computedAsync } from '@vueuse/core';
@@ -35,19 +30,15 @@ const { settings } = toRefs(props);
 watch(
   () => settings.value,
   async (settings, oldSettings) => {
-    if (
-      settings.sourceType !== 'pframe' ||
-      !settings.pFrame?.ok ||
-      !settings.pFrame.value ||
-      !settings.join
-    ) return;
-    
+    if (settings.sourceType !== 'pframe' || !settings.pFrame?.ok || !settings.pFrame.value || !settings.join) return;
+
     if (
       oldSettings &&
-      oldSettings.sourceType === 'pframe' && 
+      oldSettings.sourceType === 'pframe' &&
       lodash.isEqual(settings.pFrame, oldSettings.pFrame) &&
       lodash.isEqual(settings.join, oldSettings.join)
-    ) return;
+    )
+      return;
 
     const platforma = window.platforma;
     if (!platforma) throw Error('platforma not set');
@@ -68,39 +59,37 @@ watch(
     state.pTableParams.join = enrichedJoin;
 
     tableState.value = state;
-  } 
+  },
 );
 
-const sheets = computedAsync<PlDataTableSheet[]>(
-  async () => {
-    const sourceType = settings.value.sourceType;
-    switch(sourceType) {
-      case 'pframe': {
-        const platforma = window.platforma;
-        if (!platforma) throw Error('platforma not set');
+const sheets = computedAsync<PlDataTableSheet[]>(async () => {
+  const sourceType = settings.value.sourceType;
+  switch (sourceType) {
+    case 'pframe': {
+      const platforma = window.platforma;
+      if (!platforma) throw Error('platforma not set');
 
-        const pfDriver = platforma.pFrameDriver;
-        if (!pfDriver) throw Error('platforma.pFrameDriver not set');
+      const pfDriver = platforma.pFrameDriver;
+      if (!pfDriver) throw Error('platforma.pFrameDriver not set');
 
-        if (!settings.value.pFrame?.ok || !settings.value.pFrame.value) return [];
-        const pFrame = settings.value.pFrame.value;
+      if (!settings.value.pFrame?.ok || !settings.value.pFrame.value) return [];
+      const pFrame = settings.value.pFrame.value;
 
-        const join = tableState.value.pTableParams?.join;
-        if (!join) return [];
+      const join = tableState.value.pTableParams?.join;
+      if (!join) return [];
 
-        return await makeSheets(pfDriver, pFrame, settings.value.sheetAxes, join);
-      }
-      case 'ptable': {
-        return settings.value.sheets ?? [];
-      }
-      case 'xsv': {
-        return [];
-      }
-      default: throw Error(`unsupported source type: ${sourceType satisfies never}`);
+      return await makeSheets(pfDriver, pFrame, settings.value.sheetAxes, join);
     }
-  },
-  []
-);
+    case 'ptable': {
+      return settings.value.sheets ?? [];
+    }
+    case 'xsv': {
+      return [];
+    }
+    default:
+      throw Error(`unsupported source type: ${sourceType satisfies never}`);
+  }
+}, []);
 
 function makeSorting(state?: SortState): PTableSorting[] | undefined {
   if (settings.value.sourceType !== 'ptable' && settings.value.sourceType !== 'pframe') return undefined;
@@ -199,7 +188,12 @@ watch(
     const [settings, sheets] = state;
     if (oldState) {
       const [oldSettings, oldSheets] = oldState;
-      if ((settings.sourceType === 'ptable' || settings.sourceType === 'pframe') && settings.sourceType === oldSettings?.sourceType && lodash.isEqual(sheets, oldSheets)) return;
+      if (
+        (settings.sourceType === 'ptable' || settings.sourceType === 'pframe') &&
+        settings.sourceType === oldSettings?.sourceType &&
+        lodash.isEqual(sheets, oldSheets)
+      )
+        return;
     }
 
     if (settings.sourceType !== 'ptable' && settings.sourceType !== 'pframe') {

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

@@ -1,4 +1,5 @@
 import type { ColDef, GridApi, IDatasource, IGetRowsParams } from '@ag-grid-community/core';
+import type { PFrameHandle, AxisId, PColumnIdAndSpec, JoinEntry, PObjectId } from '@platforma-sdk/model';
 import {
   type ValueType,
   type PValue,
@@ -11,12 +12,7 @@ import {
   getAxesId,
   isValueNA,
   isValueAbsent,
-  PFrameHandle,
-  AxisId,
-  PColumnIdAndSpec,
-  JoinEntry,
   mapJoinEntry,
-  PObjectId
 } from '@platforma-sdk/model';
 import * as lodash from 'lodash';
 import canonicalize from 'canonicalize';
@@ -84,7 +80,7 @@ function toDisplayValue(value: Exclude<PValue, null>, valueType: ValueType): str
     case 'Int':
       return value as number;
     case 'Long':
-      return typeof value === 'bigint' ? Number(value as bigint) : value as number;
+      return typeof value === 'bigint' ? Number(value as bigint) : (value as number);
     case 'Float':
       return value as number;
     case 'Double':
@@ -96,7 +92,7 @@ function toDisplayValue(value: Exclude<PValue, null>, valueType: ValueType): str
     default:
       throw Error(`unsupported data type: ${valueType satisfies never}`);
   }
-};
+}
 
 function getColumnsFromJoin(join: JoinEntry<PColumnIdAndSpec>): PColumnIdAndSpec[] {
   const columns: PColumnIdAndSpec[] = [];
@@ -107,22 +103,15 @@ function getColumnsFromJoin(join: JoinEntry<PColumnIdAndSpec>): PColumnIdAndSpec
   return columns;
 }
 
-async function getLabelColumns(
-  pfDriver: PFrameDriver,
-  pFrame: PFrameHandle,
-  idsAndSpecs: PColumnIdAndSpec[]
-): Promise<PColumnIdAndSpec[]> {
+async function getLabelColumns(pfDriver: PFrameDriver, pFrame: PFrameHandle, idsAndSpecs: PColumnIdAndSpec[]): Promise<PColumnIdAndSpec[]> {
   if (!idsAndSpecs.length) return [];
 
   const response = await pfDriver.findColumns(pFrame, {
     columnFilter: {
-      name: ['pl7.app/label']
+      name: ['pl7.app/label'],
     },
-    compatibleWith: lodash.uniqWith(
-      idsAndSpecs.map((column) => getAxesId(column.spec.axesSpec).map(lodash.cloneDeep)).flat(),
-      lodash.isEqual
-    ),
-    strictlyCompatible: true
+    compatibleWith: lodash.uniqWith(idsAndSpecs.map((column) => getAxesId(column.spec.axesSpec).map(lodash.cloneDeep)).flat(), lodash.isEqual),
+    strictlyCompatible: true,
   });
   return response.hits.filter((idAndSpec) => idAndSpec.spec.axesSpec.length === 1);
 }
@@ -130,7 +119,7 @@ async function getLabelColumns(
 export async function enrichJoinWithLabelColumns(
   pfDriver: PFrameDriver,
   pFrame: PFrameHandle,
-  join: JoinEntry<PColumnIdAndSpec>
+  join: JoinEntry<PColumnIdAndSpec>,
 ): Promise<JoinEntry<PColumnIdAndSpec>> {
   const columns = getColumnsFromJoin(join);
   const labelColumns = await getLabelColumns(pfDriver, pFrame, columns);
@@ -142,15 +131,15 @@ export async function enrichJoinWithLabelColumns(
     secondary: missingLabelColumns.map((column) => ({
       type: 'column',
       column,
-    }))
-  }
+    })),
+  };
 }
 
 export async function makeSheets(
   pfDriver: PFrameDriver,
   pFrameHandle: PFrameHandle,
   sheetAxes: AxisId[],
-  join: JoinEntry<PColumnIdAndSpec>
+  join: JoinEntry<PColumnIdAndSpec>,
 ): Promise<PlDataTableSheet[]> {
   const axes = sheetAxes.filter((spec) => spec.type !== 'Bytes');
 
@@ -190,7 +179,7 @@ export async function makeSheets(
         columnId: columns[column].columnId,
         ...(!labelCol[i] && { axis: lodash.cloneDeep(axes[i]) }),
         filters: [],
-        limit
+        limit,
       });
       if (response.overflow) {
         labelCol.splice(i, 1);
@@ -224,14 +213,14 @@ export async function makeSheets(
   return axes.map((axis, i) => {
     const options = [...possibleValues[i]].map((value) => ({
       value: value,
-      text: value.toString()
+      text: value.toString(),
     }));
     const defaultValue = options[0].value;
     return {
       axis: lodash.cloneDeep(axis),
       ...(labelCol[i] && { column: labelCol[i] }),
       options,
-      defaultValue
+      defaultValue,
     } as PlDataTableSheet;
   });
 }
@@ -287,8 +276,9 @@ export async function updatePFrameGridOptions(
   datasource: IDatasource;
 }> {
   const specs = await pfDriver.getSpec(pt);
-  const indices = [...specs.keys()]
-    .filter((i) => !lodash.find(sheets, (sheet) => lodash.isEqual(sheet.axis, specs[i].id) || lodash.isEqual(sheet.column, specs[i].id)));
+  const indices = [...specs.keys()].filter(
+    (i) => !lodash.find(sheets, (sheet) => lodash.isEqual(sheet.axis, specs[i].id) || lodash.isEqual(sheet.column, specs[i].id)),
+  );
   const fields = lodash.cloneDeep(indices);
 
   for (let i = indices.length - 1; i >= 0; --i) {

package/src/components/PlAgDataTable/types.ts

@@ -1,4 +1,14 @@
-import type { AxisId, JoinEntry, LocalBlobHandleAndSize, PColumnIdAndSpec, PFrameHandle, PObjectId, PTableHandle, RemoteBlobHandleAndSize, ValueOrErrors } from '@platforma-sdk/model';
+import type {
+  AxisId,
+  JoinEntry,
+  LocalBlobHandleAndSize,
+  PColumnIdAndSpec,
+  PFrameHandle,
+  PObjectId,
+  PTableHandle,
+  RemoteBlobHandleAndSize,
+  ValueOrErrors,
+} from '@platforma-sdk/model';
 
 export type PlDataTableSheet = {
   /** id of the axis to use */