@platforma-sdk/ui-vue 1.40.5 → 1.41.0

package/dist/types.d.ts

@@ -42,9 +42,9 @@ export type RouteParams<Href extends `/${string}` = `/${string}`> = {
 };
 export type AppSettings = {
     /**
-     * Deep patch `model.` This parameter affects how you listen to model changes; a deep watcher is required if you use the `source` function.
+     * App ID (just for debugging)
      */
-    deepPatchModel?: boolean;
+    appId?: string;
     /**
      * Enables some debug logs
      */

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.40.5",
+  "version": "1.41.0",
   "type": "module",
   "main": "dist/lib.js",
   "styles": "dist/lib.js",
@@ -25,9 +25,9 @@
     "@vueuse/integrations": "^13.3.0",
     "d3-format": "^3.1.0",
     "zod": "~3.23.8",
-    "@milaboratories/uikit": "2.3.14",
-    "@platforma-sdk/model": "~1.40.5",
-    "@milaboratories/biowasm-tools": "^1.1.0"
+    "@milaboratories/biowasm-tools": "^1.1.0",
+    "@platforma-sdk/model": "~1.41.0",
+    "@milaboratories/uikit": "2.3.16"
   },
   "devDependencies": {
     "happy-dom": "^15.11.7",
@@ -38,12 +38,15 @@
     "typescript": "~5.6.3",
     "vite": "^6.3.5",
     "vitest": "^2.1.9",
+    "@vue/test-utils": "^2.4.6",
     "vue-tsc": "^2.2.10",
     "yarpm": "^1.2.0",
+    "fast-json-patch": "^3.1.1",
+    "@faker-js/faker": "^9.2.0",
     "@milaboratories/ts-configs": "1.0.4",
-    "@milaboratories/helpers": "^1.6.18",
     "@milaboratories/build-configs": "1.0.4",
-    "@milaboratories/eslint-config": "^1.0.4"
+    "@milaboratories/eslint-config": "^1.0.4",
+    "@milaboratories/helpers": "^1.6.18"
   },
   "scripts": {
     "test": "vitest run --passWithNoTests",

package/src/components/BlockLayout.vue

@@ -43,7 +43,7 @@ const progress = computed(() => app.value?.progress?.());
 <template>
   <div class="block block__layout">
     <BlockLoader :value="progress" />
-    <div v-if="sdk.error">{{ sdk.error }}</div>
+    <div v-if="sdk.error" :class="$style.error">{{ sdk.error }}</div>
     <LoaderPage v-else-if="!sdk.loaded">Loading...</LoaderPage>
     <component :is="CurrentView" v-else-if="CurrentView" :key="href" />
     <NotFound v-else />
@@ -52,3 +52,11 @@ const progress = computed(() => app.value?.progress?.());
   <!-- Plugins -->
   <MonetizationSidebar v-if="CurrentView" />
 </template>
+
+<style module>
+.error {
+  color: red;
+  font-weight: bold;
+  padding: 24px;
+}
+</style>

package/src/components/NotFound.vue

@@ -7,9 +7,7 @@ const sdk = useSdkPlugin();
 const app = sdk.useApp();
 
 const goToMain = () => {
-  app.updateNavigationState((state) => {
-    state.href = '/';
-  });
+  app.navigateTo('/');
 };
 </script>
 

package/src/components/PlAgDataTable/PlAgDataTableV2.vue

@@ -44,7 +44,6 @@ import type {
   PlAgOverlayNoRowsParams,
   PlDataTableSettingsV2,
   PlDataTableSheetsSettings,
-  PlTableLabeledSelectionModel,
   PlTableRowIdJson,
 } from './types';
 import { watchCached } from '@milaboratories/uikit';
@@ -53,7 +52,6 @@ const tableState = defineModel<PlDataTableStateV2>({
   required: true,
 });
 const selection = defineModel<PlSelectionModel>('selection');
-const selectionLabeled = defineModel<PlTableLabeledSelectionModel>('selectionLabeled');
 const props = defineProps<{
   /** Required component settings */
   settings: Readonly<PlDataTableSettingsV2>;
@@ -155,10 +153,10 @@ const firstDataRenderedTracker = makeOnceTracker<GridApi<PlAgDataTableV2Row>>();
 const gridOptions = shallowRef<GridOptions<PlAgDataTableV2Row>>({
   animateRows: false,
   suppressColumnMoveAnimation: true,
-  cellSelection: !selection.value && !selectionLabeled.value,
+  cellSelection: !selection.value,
   initialState: gridState.value,
   autoSizeStrategy: { type: 'fitCellContents' },
-  rowSelection: selection.value || selectionLabeled.value
+  rowSelection: selection.value
     ? {
         mode: 'multiRow',
         selectAll: 'all',
@@ -169,15 +167,11 @@ const gridOptions = shallowRef<GridOptions<PlAgDataTableV2Row>>({
       }
     : undefined,
   onSelectionChanged: (event) => {
-    const state = event.api.getServerSideSelectionState();
     if (selection.value) {
-      const selectedKeys = state?.toggledNodes?.map((nodeId) => parseJson(nodeId as PlTableRowIdJson).axesKey) ?? [];
+      const state = event.api.getServerSideSelectionState();
+      const selectedKeys = state?.toggledNodes?.map((nodeId) => parseJson(nodeId as PlTableRowIdJson)) ?? [];
       selection.value = { ...selection.value, selectedKeys };
     }
-    if (selectionLabeled.value) {
-      const selectedLabeledKeys = state?.toggledNodes?.map((nodeId) => parseJson(nodeId as PlTableRowIdJson).labeled) ?? [];
-      selectionLabeled.value = { ...selectionLabeled.value, selectedLabeledKeys };
-    }
   },
   onRowDoubleClicked: (event) => {
     if (event.data && event.data.axesKey) emit('rowDoubleClicked', event.data.axesKey);
@@ -356,12 +350,6 @@ watchCached(
           selectedKeys: [],
         };
       }
-      if (selectionLabeled.value) {
-        selectionLabeled.value = {
-          spec: [],
-          selectedLabeledKeys: [],
-        };
-      }
     } else {
       const isColDef = (def: ColDef | ColGroupDef): def is ColDef =>
         !('children' in def);
@@ -386,19 +374,6 @@ watchCached(
           axesSpec,
         };
       }
-      if (selectionLabeled.value) {
-        const spec = columns
-          .reduce((acc, column) => {
-            if (column.source.type === 'axis') {
-              acc.push(column.labeled);
-            }
-            return acc;
-          }, [] as PTableColumnSpec[]);
-        selectionLabeled.value = {
-          ...selectionLabeled.value,
-          spec,
-        };
-      }
     }
   },
   { immediate: true },
@@ -431,7 +406,7 @@ watch(
           columnDefs: undefined,
           serverSideDatasource: undefined,
         });
-        if (selection.value || selectionLabeled.value) {
+        if (selection.value) {
           gridApi.setServerSideSelectionState({
             selectAll: false,
             toggledNodes: [],
@@ -449,7 +424,7 @@ watch(
             notReady: false,
           } satisfies PlAgOverlayLoadingParams,
         });
-        if (selection.value || selectionLabeled.value) {
+        if (selection.value) {
           gridApi.setServerSideSelectionState({
             selectAll: false,
             toggledNodes: [],

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

@@ -1,3 +1,5 @@
+import type {
+  PTableColumnSpecColumn } from '@platforma-sdk/model';
 import {
   canonicalizeJson,
   getAxisId,
@@ -15,6 +17,7 @@ import {
   type PlTableColumnId,
   type PlTableColumnIdJson,
   isLabelColumn as isLabelColumnSpec,
+  isColumnHidden,
 } from '@platforma-sdk/model';
 import type {
   CellStyle,
@@ -39,7 +42,7 @@ import { getColumnRenderingSpec } from './value-rendering';
 import type { Ref } from 'vue';
 import { isJsonEqual } from '@milaboratories/helpers';
 
-export function isLabelColumn(column: PTableColumnSpec) {
+export function isLabelColumn(column: PTableColumnSpec): column is PTableColumnSpecColumn {
   return column.type === 'column' && isLabelColumnSpec(column.spec);
 }
 
@@ -48,7 +51,6 @@ function columns2rows(
   fields: number[],
   columns: PTableVector[],
   axes: number[],
-  labeledAxes: number[],
   resultMapping: number[],
 ): PlAgDataTableV2Row[] {
   const rowData: PlAgDataTableV2Row[] = [];
@@ -58,15 +60,7 @@ function columns2rows(
         pTableValue(columns[resultMapping[iAxis]], iRow),
       );
     });
-    const labeled = labeledAxes.map((iAxis) => {
-      return mapPTableValueToAxisKey(
-        pTableValue(columns[resultMapping[iAxis]], iRow),
-      );
-    });
-    const id = canonicalizeJson<PlTableRowId>({
-      axesKey,
-      labeled,
-    });
+    const id = canonicalizeJson<PlTableRowId>(axesKey);
     const row: PlAgDataTableV2Row = { id, axesKey };
     fields.forEach((field, iCol) => {
       row[field.toString() as `${number}`] = resultMapping[iCol] === -1
@@ -118,18 +112,31 @@ export async function calculateGridOptions({
   if (numberOfAxes === -1) numberOfAxes = specs.length;
 
   // column indices in the specs array that we are going to process
-  const indices = [...specs.keys()]
+  const indices = specs.keys()
     .filter(
-      (i) =>
-        !sheets.some(
-          (sheet) =>
-            isJsonEqual(getAxisId(sheet.axis), specs[i].id)
-            || (specs[i].type === 'column'
-              && specs[i].spec.name === 'pl7.app/label'
-              && specs[i].spec.axesSpec.length === 1
-              && isJsonEqual(getAxisId(sheet.axis), getAxisId(specs[i].spec.axesSpec[0]))),
-        ),
+      (i) => {
+        const spec = specs[i];
+        switch (spec.type) {
+          case 'axis':
+          {
+            return !sheets.some(
+              (sheet) => isJsonEqual(getAxisId(sheet.axis), spec.id),
+            );
+          }
+          case 'column':
+          {
+            if (isLabelColumnSpec(spec.spec)) {
+              return !sheets.some(
+                (sheet) => isJsonEqual(getAxisId(sheet.axis), getAxisId(spec.spec.axesSpec[0])),
+              );
+            } else {
+              return !isColumnHidden(spec.spec);
+            }
+          }
+        }
+      },
     )
+    .toArray()
     .sort((a, b) => {
       if (specs[a].type !== specs[b].type) return specs[a].type === 'axis' ? -1 : 1;
 
@@ -202,13 +209,6 @@ export async function calculateGridOptions({
       }
       return r;
     });
-  const labeledAxes: number[] = fields
-    .reduce((acc, field, index) => {
-      if (specs[field].type === 'axis') {
-        acc.push(allIndices.indexOf(indices[index]));
-      }
-      return acc;
-    }, [] as number[]);
 
   const requestIndices: number[] = [];
   const resultMapping: number[] = [];
@@ -260,7 +260,7 @@ export async function calculateGridOptions({
               length,
             });
             if (stateGeneration !== generation.value || params.api.isDestroyed()) return params.fail();
-            rowData = columns2rows(fields, data, axes, labeledAxes, resultMapping);
+            rowData = columns2rows(fields, data, axes, resultMapping);
           }
         }
 

package/src/components/PlAgDataTable/types.ts

@@ -24,9 +24,7 @@ export type PlDataTableFilterConfig = {
   default?: PlTableFilter;
 };
 
-/** Data table V2 settings */
-export type PlDataTableSettingsV2 =
-(
+export type PlDataTableSettingsV2Base =
   | { sourceId: null }
   | {
     /** Unique source id for state caching */
@@ -35,8 +33,10 @@ export type PlDataTableSettingsV2 =
     sheets: PlDataTableSheet[];
     /** Result of `createPlDataTableV2` */
     model: PlDataTableModel | undefined;
-  }
-) & {
+  };
+
+/** Data table V2 settings */
+export type PlDataTableSettingsV2 = PlDataTableSettingsV2Base & {
   /** Callback configuring filters for the table */
   filtersConfig: (info: {
     sourceId: string;
@@ -44,45 +44,41 @@ export type PlDataTableSettingsV2 =
   }) => PlDataTableFilterConfig;
 };
 
-type OptionsAdvanced<T> = {
-  /**
-   * Block property (such as inputAnchor) used to produce the data source.
-   * Mandatory for cases when the table can change without block run.
-   * Skip when the table is changed only after block run.
-   * Ask developers for help if you don't know what to set here.
-   */
-  sourceId: MaybeRefOrGetter<T | undefined>;
+type OptionsBasic = {
   /** Block output created by `createPlDataTableV2` */
   model: MaybeRefOrGetter<PlDataTableModel | undefined>;
   /**
-   * Sheets for partitioned data sources.
-   * Do not set if data source is never partitioned.
-   */
+    * Sheets for partitioned data sources.
+    * Do not set if data source is never partitioned.
+    */
   sheets?: MaybeRefOrGetter<PlDataTableSheet[] | undefined>;
+};
+
+type OptionsSimple = OptionsBasic & {
   /**
-   * Callback configuring filters for the table.
-   * If not provided, filtering will be disabled.
-   * Parameter `sourceId` should be compared using `isJsonEqual` from `@milaboratories/helpers`.
-   */
+    * Callback configuring filters for the table.
+    * If not provided, filtering will be disabled.
+    */
   filtersConfig?: (info: {
-    sourceId: JsonCompatible<T>;
     column: PTableColumnSpec;
   }) => PlDataTableFilterConfig;
 };
 
-type OptionsSimple = {
-  /** Block output created by `createPlDataTableV2` */
-  model: MaybeRefOrGetter<PlDataTableModel | undefined>;
+type OptionsAdvanced<T> = OptionsBasic & {
   /**
-   * Sheets for partitioned data sources.
-   * Do not set if data source is never partitioned.
-   */
-  sheets?: MaybeRefOrGetter<PlDataTableSheet[] | undefined>;
+    * Block property (such as inputAnchor) used to produce the data source.
+    * Mandatory for cases when the table can change without block run.
+    * Skip when the table is changed only after block run.
+    * Ask developers for help if you don't know what to set here.
+    */
+  sourceId: MaybeRefOrGetter<T | undefined>;
   /**
-   * Callback configuring filters for the table.
-   * If not provided, filtering will be disabled.
-   */
+    * Callback configuring filters for the table.
+    * If not provided, filtering will be disabled.
+    * Parameter `sourceId` should be compared using `isJsonEqual` from `@milaboratories/helpers`.
+    */
   filtersConfig?: (info: {
+    sourceId: JsonCompatible<T>;
     column: PTableColumnSpec;
   }) => PlDataTableFilterConfig;
 };
@@ -109,62 +105,51 @@ export function usePlDataTableSettingsV2<T>(options: OptionsAdvanced<T> | Option
     : () => ({});
   return computed(() => {
     const modelValue = toValue(options.model);
+    let settingsBase: PlDataTableSettingsV2Base;
     if ('sourceId' in options) {
       const sourceIdValue = deepClone(toValue(options.sourceId));
       if (options.sheets) {
         const sheetsValue = deepClone(toValue(options.sheets));
-        return sourceIdValue && sheetsValue
+        settingsBase = sourceIdValue && sheetsValue
           ? {
               sourceId: canonicalize(sourceIdValue)!,
               sheets: sheetsValue,
               model: modelValue,
-              filtersConfig: filtersConfigValue,
             }
-          : {
-              sourceId: null,
-              filtersConfig: filtersConfigValue,
-            };
+          : { sourceId: null };
       } else {
-        return sourceIdValue
+        settingsBase = sourceIdValue
           ? {
               sourceId: canonicalize(sourceIdValue)!,
               sheets: [],
               model: modelValue,
-              filtersConfig: filtersConfigValue,
             }
-          : {
-              sourceId: null,
-              filtersConfig: filtersConfigValue,
-            };
+          : { sourceId: null };
       }
     } else {
       if (options.sheets) {
         const sheetsValue = toValue(options.sheets);
-        return sheetsValue
+        settingsBase = sheetsValue
           ? {
               sourceId: canonicalize('static')!,
               sheets: sheetsValue,
               model: modelValue,
-              filtersConfig: filtersConfigValue,
             }
-          : {
-              sourceId: null,
-              filtersConfig: filtersConfigValue,
-            };
+          : { sourceId: null };
       } else {
-        return modelValue
+        settingsBase = modelValue
           ? {
               sourceId: canonicalize('static')!,
               sheets: [],
               model: modelValue,
-              filtersConfig: filtersConfigValue,
             }
-          : {
-              sourceId: null,
-              filtersConfig: filtersConfigValue,
-            };
+          : { sourceId: null };
       }
     }
+    return {
+      ...settingsBase,
+      filtersConfig: filtersConfigValue,
+    };
   });
 };
 
@@ -193,14 +178,9 @@ export type PlAgDataTableV2Controller = {
   focusRow: (rowKey: PTableKey) => Promise<void>;
 };
 
-export type PlTableRowId = {
-  /** Axes values */
-  axesKey: PTableKey;
-  /** Axes key where values of labeled axes are resolved to corresponding labels */
-  labeled: PTableKey;
-};
+export type PlTableRowId = PTableKey;
 
-export type PlTableRowIdJson = CanonicalizedJson<PlTableRowId>;
+export type PlTableRowIdJson = CanonicalizedJson<PTableKey>;
 
 /** PlAgDataTableV2 row */
 export type PlAgDataTableV2Row = {
@@ -212,14 +192,6 @@ export type PlAgDataTableV2Row = {
   [field: `${number}`]: PTableValue | PTableHidden;
 };
 
-/** PlSelectionModel with labeled axes replaced by label columns */
-export type PlTableLabeledSelectionModel = {
-  /** Specs for valuess in {@link PTableKey} */
-  spec: PTableColumnSpec[];
-  /** Row keys (arrays of axes values) of selected rows */
-  selectedLabeledKeys: PTableKey[];
-};
-
 export type PlAgOverlayLoadingParams = {
   /**
    * Required flag, that shows catInBag icon with message if `true`, shows PlSplash component if `false`.