@platforma-sdk/ui-vue 1.8.23 → 1.8.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.8.23",
+  "version": "1.8.25",
   "type": "module",
   "main": "dist/lib.umd.cjs",
   "module": "dist/lib.js",
@@ -37,7 +37,7 @@
     "@ag-grid-community/theming": "^32.3.3",
     "@ag-grid-enterprise/side-bar": "^32.3.3",
     "@ag-grid-enterprise/column-tool-panel": "^32.3.3",
-    "@milaboratories/uikit": "^2.2.1",
+    "@milaboratories/uikit": "^2.2.2",
     "@platforma-sdk/model": "^1.8.19"
   },
   "devDependencies": {

package/src/components/PlAgDataTable/PlAgDataTable.vue

@@ -4,6 +4,7 @@ import type {
   GridApi,
   GridOptions,
   GridReadyEvent,
+  GridState,
   ManagedGridOptionKey,
   ManagedGridOptions,
   SortState,
@@ -34,7 +35,7 @@ ModuleRegistry.registerModules([
   ServerSideRowModelModule,
   RangeSelectionModule,
   SideBarModule,
-  ColumnsToolPanelModule
+  ColumnsToolPanelModule,
 ]);
 
 const tableState = defineModel<PlDataTableState>({ default: { gridState: {} } });
@@ -139,9 +140,7 @@ const gridState = computed({
     // do not apply driver sorting for client side rendering
     const sorting = gridOptions.value.rowModelType === 'clientSide' ? undefined : makeSorting(gridState.sort);
 
-    state.gridState.columnOrder = gridState.columnOrder;
-    state.gridState.sort = gridState.sort;
-    state.gridState.columnVisibility = gridState.columnVisibility;
+    state.gridState = { ...state.gridState, ...gridState };
 
     if (settings.value.sourceType === 'ptable' || settings.value.sourceType === 'pframe') {
       if (!state.pTableParams) {
@@ -314,24 +313,19 @@ const onGridReady = (event: GridReadyEvent) => {
     },
   });
 };
-const onStateUpdated = (event: StateUpdatedEvent) => {
-  gridState.value = {
-    columnOrder: event.state.columnOrder,
-    sort: event.state.sort,
-    columnVisibility: event.state.columnVisibility
-      ?? (event.state.columnOrder ? { hiddenColIds: [] } : undefined),
-  };
-  gridOptions.value.initialState = gridState.value;
-};
-const onGridPreDestroyed = () => {
-  const state = gridApi.value!.getState();
-  gridState.value = {
+const makePartialState = (state: GridState) => {
+  return {
     columnOrder: state.columnOrder,
     sort: state.sort,
-    columnVisibility: state.columnVisibility
-      ?? (state.columnOrder ? { hiddenColIds: [] } : undefined),
+    columnVisibility: state.columnVisibility ?? (state.columnOrder ? { hiddenColIds: [] } : undefined),
   };
-  gridOptions.value.initialState = gridState.value;
+};
+const onStateUpdated = (event: StateUpdatedEvent) => {
+  gridOptions.value.initialState = gridState.value = makePartialState(event.state);
+  event.api.autoSizeAllColumns();
+};
+const onGridPreDestroyed = () => {
+  gridOptions.value.initialState = gridState.value = makePartialState(gridApi.value!.getState());
   gridApi.value = undefined;
 };
 
@@ -344,13 +338,7 @@ watch(
     const [gridApi, gridState] = state;
     if (!gridApi) return;
 
-    const selfFullState = gridApi.getState();
-    const selfState = {
-      columnOrder: selfFullState.columnOrder,
-      sort: selfFullState.sort,
-      columnVisibility: selfFullState.columnVisibility
-        ?? (selfFullState.columnOrder ? { hiddenColIds: [] } : undefined),
-    };
+    const selfState = makePartialState(gridApi.getState());
     if (lodash.isEqual(gridState, selfState)) return;
 
     gridOptions.value.initialState = gridState;

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

@@ -280,9 +280,19 @@ export async function updatePFrameGridOptions(
   const specs = await pfDriver.getSpec(pt);
 
   // column indices in the specs array that we are going to process
-  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)))
+    .sort((a, b) => {
+      if (specs[a].type !== specs[b].type) return specs[a].type === 'axis' ? -1 : 1;
+
+      const aPriority = specs[a].spec.annotations?.['pl7.app/table/orderPriority'];
+      const bPriority = specs[b].spec.annotations?.['pl7.app/table/orderPriority'];
+
+      if (aPriority === undefined) return bPriority === undefined ? 0 : 1;
+      if (bPriority === undefined) return -1;
+      return Number(bPriority) - Number(aPriority);
+    });
+
   const fields = lodash.cloneDeep(indices);
 
   // get columns with heterogeneous axes