@platforma-sdk/ui-vue 1.54.7 → 1.54.9

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-sdk/ui-vue@1.54.7 build /home/runner/_work/platforma/platforma/sdk/ui-vue
+> @platforma-sdk/ui-vue@1.54.9 build /home/runner/_work/platforma/platforma/sdk/ui-vue
 > ts-builder build --target browser-lib
 
 Building browser-lib project...
@@ -134,7 +134,7 @@ computing gzip size...
 dist/components/PlAppErrorNotificationAlert/PlAppErrorNotificationAlert.vue.js    2.81 kB │ gzip:  1.16 kB │ map:  4.23 kB
 dist/components/PlAgColumnHeader/PlAgColumnHeader.vue.js                          2.98 kB │ gzip:  1.12 kB │ map:  4.85 kB
 dist/components/PlAgDataTable/sources/row-number.js                               3.14 kB │ gzip:  1.35 kB │ map:  8.52 kB
-dist/components/PlAgDataTable/sources/table-state-v2.js                           3.47 kB │ gzip:  1.25 kB │ map: 10.89 kB
+dist/components/PlAgDataTable/sources/table-state-v2.js                           3.49 kB │ gzip:  1.25 kB │ map: 10.94 kB
 dist/components/PlTableFilters/PlTableFiltersV2.vue2.js                           3.76 kB │ gzip:  1.59 kB │ map:  7.28 kB
 dist/plugins/Monetization/LimitCard.vue2.js                                       3.84 kB │ gzip:  1.15 kB │ map:  9.62 kB
 dist/components/PlAgGridColumnManager/PlAgGridColumnManager.vue2.js               3.85 kB │ gzip:  1.53 kB │ map:  6.85 kB
@@ -152,7 +152,7 @@ computing gzip size...
 dist/components/PlAdvancedFilter/FilterEditor.vue2.js                            12.83 kB │ gzip:  3.28 kB │ map: 25.49 kB
 dist/components/PlAgDataTable/PlAgDataTableV2.vue2.js                            14.97 kB │ gzip:  4.35 kB │ map: 33.82 kB
 dist/index.js                                                                    99.79 kB │ gzip: 64.33 kB │ map:  0.13 kB
-[vite:dts] Declaration files built in 5328ms.
+[vite:dts] Declaration files built in 6892ms.
 
-✓ built in 6.81s
+✓ built in 8.32s
 Build completed successfully

package/.turbo/turbo-formatter$colon$check.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-sdk/ui-vue@1.54.7 formatter:check /home/runner/_work/platforma/platforma/sdk/ui-vue
+> @platforma-sdk/ui-vue@1.54.9 formatter:check /home/runner/_work/platforma/platforma/sdk/ui-vue
 > ts-builder formatter --check
 
 Checking formatting...
@@ -8,5 +8,5 @@ Checking formatting...
 Checking formatting...
 
 All matched files use the correct format.
-Finished in 1068ms on 120 files using 8 threads.
+Finished in 2303ms on 120 files using 8 threads.
 Format check completed successfully

package/.turbo/turbo-linter$colon$check.log

@@ -1,10 +1,10 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-sdk/ui-vue@1.54.7 linter:check /home/runner/_work/platforma/platforma/sdk/ui-vue
+> @platforma-sdk/ui-vue@1.54.9 linter:check /home/runner/_work/platforma/platforma/sdk/ui-vue
 > ts-builder linter --check
 
 Linting project...
 ↳ oxlint --config /home/runner/_work/platforma/platforma/sdk/ui-vue/.oxlintrc.json --deny-warnings
 Found 0 warnings and 0 errors.
-Finished in 28ms on 103 files with 98 rules using 8 threads.
+Finished in 24ms on 103 files with 98 rules using 8 threads.
 Linting completed successfully

package/.turbo/turbo-types$colon$check.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-sdk/ui-vue@1.54.7 types:check /home/runner/_work/platforma/platforma/sdk/ui-vue
+> @platforma-sdk/ui-vue@1.54.9 types:check /home/runner/_work/platforma/platforma/sdk/ui-vue
 > ts-builder type-check --target browser-lib
 
 ↳ vue-tsc.js --noEmit --project ./tsconfig.json --customConditions ,

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @platforma-sdk/ui-vue
 
+## 1.54.9
+
+### Patch Changes
+
+- Updated dependencies [a3659cd]
+  - @platforma-sdk/model@1.54.9
+  - @milaboratories/uikit@2.10.22
+
+## 1.54.8
+
+### Patch Changes
+
+- 4f04561: simplify distil , renaming
+- Updated dependencies [4f04561]
+  - @platforma-sdk/model@1.54.8
+  - @milaboratories/uikit@2.10.21
+
 ## 1.54.7
 
 ### Patch Changes

package/dist/components/PlAgDataTable/sources/table-state-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-state-v2.d.ts","sourceRoot":"","sources":["../../../../src/components/PlAgDataTable/sources/table-state-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EAOxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAmB,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAE,MAAM,KAAK,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA4E/D,wBAAgB,aAAa,CAC3B,sBAAsB,EAAE,GAAG,CAAC,kBAAkB,CAAC,EAC/C,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC,GACnC;IACD,SAAS,EAAE,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;IACzD,WAAW,EAAE,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAC1D,YAAY,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;CACrD,CAqHA"}
+{"version":3,"file":"table-state-v2.d.ts","sourceRoot":"","sources":["../../../../src/components/PlAgDataTable/sources/table-state-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EAQxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAmB,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAE,MAAM,KAAK,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAyE/D,wBAAgB,aAAa,CAC3B,sBAAsB,EAAE,GAAG,CAAC,kBAAkB,CAAC,EAC/C,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC,GACnC;IACD,SAAS,EAAE,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;IACzD,WAAW,EAAE,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAC1D,YAAY,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;CACrD,CAqHA"}

package/dist/components/PlAgDataTable/sources/table-state-v2.js

@@ -1,9 +1,9 @@
-import { upgradePlDataTableStateV2 as S, createDefaultPTableParams as v, distillFilter as h, canonicalizeJson as I, parseJson as m } from "@platforma-sdk/model";
+import { upgradePlDataTableStateV2 as v, createDefaultPTableParams as m, distillFilterSpec as g, canonicalizeJson as h, parseJson as S } from "@platforma-sdk/model";
 import { computed as d, watch as f } from "vue";
-import { isJsonEqual as o } from "../../../lib/util/helpers/dist/objects.js";
-import { randomInt as g } from "../../../lib/util/helpers/dist/random.js";
-import { computedCached as y } from "@milaboratories/uikit";
-function C() {
+import { isJsonEqual as n } from "../../../lib/util/helpers/dist/objects.js";
+import { randomInt as I } from "../../../lib/util/helpers/dist/random.js";
+import { computedCached as b } from "@milaboratories/uikit";
+function y() {
   return {
     sourceId: null,
     gridState: {},
@@ -11,119 +11,121 @@ function C() {
     filtersState: null
   };
 }
-function b(r) {
-  var s;
-  return ((s = r == null ? void 0 : r.hiddenColIds) == null ? void 0 : s.map(m).reduce((n, t) => (t.source.type === "column" && n.push(t.source.id), n), [])) ?? null;
+function C(r) {
+  var a;
+  return ((a = r == null ? void 0 : r.hiddenColIds) == null ? void 0 : a.map(S).reduce((u, s) => (s.source.type === "column" && u.push(s.source.id), u), [])) ?? null;
 }
 function P(r) {
-  return r.map((s) => {
-    const n = I({ type: "axis", id: s.axisId });
-    return typeof s.value == "number" ? { type: "equal", column: n, x: s.value } : { type: "patternEquals", column: n, value: s.value };
+  return r.map((a) => {
+    const u = h({ type: "axis", id: a.axisId });
+    return typeof a.value == "number" ? { type: "equal", column: u, x: a.value } : { type: "patternEquals", column: u, value: a.value };
   });
 }
-function x(r) {
-  return (r == null ? void 0 : r.sortModel.map((s) => {
-    const { spec: n, ...t } = m(s.colId).labeled;
+function T(r) {
+  return (r == null ? void 0 : r.sortModel.map((a) => {
+    const { spec: u, ...s } = S(a.colId).labeled;
     return {
-      column: t,
-      ascending: s.sort === "asc",
-      naAndAbsentAreLeastValues: s.sort === "asc"
+      column: s,
+      ascending: a.sort === "asc",
+      naAndAbsentAreLeastValues: a.sort === "asc"
     };
   })) ?? [];
 }
-function T(r) {
-  const s = h(r.filtersState), t = [
+function x(r) {
+  const a = [
     ...P(r.sheetsState),
-    ...s ? [s] : []
-  ], u = t.length === 0 ? null : t.length === 1 ? t[0] : { type: "and", filters: t };
+    ...r.filtersState ? [r.filtersState] : []
+  ], u = g(
+    a.length === 0 ? null : a.length === 1 ? a[0] : { type: "and", filters: a }
+  );
   return {
     sourceId: r.sourceId,
-    hiddenColIds: b(r.gridState.columnVisibility),
+    hiddenColIds: C(r.gridState.columnVisibility),
     filters: u,
-    sorting: x(r.gridState.sort)
+    sorting: T(r.gridState.sort)
   };
 }
-function E(r, s) {
-  const n = y({
-    get: () => S(r.value),
+function J(r, a) {
+  const u = b({
+    get: () => v(r.value),
     set: (e) => r.value = e
-  }), t = d({
+  }), s = d({
     get: () => {
-      const e = C(), a = s.value.sourceId;
-      if (!a) return e;
-      const l = n.value.stateCache.find(
-        (p) => p.sourceId === a
+      const e = y(), t = a.value.sourceId;
+      if (!t) return e;
+      const l = u.value.stateCache.find(
+        (p) => p.sourceId === t
       );
-      return l || { ...e, sourceId: a };
+      return l || { ...e, sourceId: t };
     },
     set: (e) => {
-      const a = {
-        ...n.value,
-        pTableParams: v()
+      const t = {
+        ...u.value,
+        pTableParams: m()
       };
       if (e.sourceId) {
-        a.pTableParams = T(e);
-        const l = a.stateCache.findIndex(
+        t.pTableParams = x(e);
+        const l = t.stateCache.findIndex(
           (p) => p.sourceId === e.sourceId
         );
-        l !== -1 ? a.stateCache[l] = e : (a.stateCache.push(e), a.stateCache = a.stateCache.slice(-5));
+        l !== -1 ? t.stateCache[l] = e : (t.stateCache.push(e), t.stateCache = t.stateCache.slice(-5));
       }
-      o(n.value, a) || (n.value = a);
+      n(u.value, t) || (u.value = t);
     }
   });
   f(
-    () => t.value,
-    (e) => o(t.value, e) && (t.value = e),
+    () => s.value,
+    (e) => n(s.value, e) && (s.value = e),
     { deep: !0 }
   );
-  const u = d({
-    get: () => t.value.gridState,
+  const o = d({
+    get: () => s.value.gridState,
     set: (e) => {
-      const a = t.value;
-      a.sourceId && (t.value = {
-        ...a,
+      const t = s.value;
+      t.sourceId && (s.value = {
+        ...t,
         gridState: e
       });
     }
   });
-  f(u, (e) => o(u.value, e) && (u.value = e), {
+  f(o, (e) => n(o.value, e) && (o.value = e), {
     deep: !0
   });
-  const i = d({
-    get: () => t.value.sheetsState,
+  const c = d({
+    get: () => s.value.sheetsState,
     set: (e) => {
-      const a = t.value;
-      a.sourceId && (t.value = {
-        ...a,
+      const t = s.value;
+      t.sourceId && (s.value = {
+        ...t,
         sheetsState: e
       });
     }
   });
   f(
-    i,
-    (e) => o(i.value, e) && (i.value = e),
+    c,
+    (e) => n(c.value, e) && (c.value = e),
     { deep: !0 }
   );
-  const c = d({
+  const i = d({
     get: () => {
-      const e = t.value.filtersState;
-      return e && (e.type === "and" || e.type === "or") && "filters" in e && Array.isArray(e.filters) ? e : { id: g(), type: "and", isExpanded: !0, filters: [] };
+      const e = s.value.filtersState;
+      return e && (e.type === "and" || e.type === "or") && "filters" in e && Array.isArray(e.filters) ? e : { id: I(), type: "and", isExpanded: !0, filters: [] };
     },
     set: (e) => {
-      const a = t.value;
-      a.sourceId && (t.value = {
-        ...a,
+      const t = s.value;
+      t.sourceId && (s.value = {
+        ...t,
         filtersState: e
       });
     }
   });
   return f(
-    c,
-    (e) => o(c.value, e) && (c.value = e),
+    i,
+    (e) => n(i.value, e) && (i.value = e),
     { deep: !0 }
-  ), { gridState: u, sheetsState: i, filtersState: c };
+  ), { gridState: o, sheetsState: c, filtersState: i };
 }
 export {
-  E as useTableState
+  J as useTableState
 };
 //# sourceMappingURL=table-state-v2.js.map

package/dist/components/PlAgDataTable/sources/table-state-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-state-v2.js","sources":["../../../../src/components/PlAgDataTable/sources/table-state-v2.ts"],"sourcesContent":["import {\n  createDefaultPTableParams,\n  parseJson,\n  canonicalizeJson,\n  upgradePlDataTableStateV2,\n  distillFilter,\n  type FilterSpec,\n  type FilterSpecLeaf,\n  type PTableColumnId,\n  type PlDataTableGridStateCore,\n  type PlDataTableSheetState,\n  type PlDataTableStateV2,\n  type PlDataTableStateV2CacheEntry,\n  type PlDataTableStateV2Normalized,\n  type PObjectId,\n  type PTableFilters,\n  type PTableParamsV2,\n  type PTableSorting,\n} from \"@platforma-sdk/model\";\nimport { computed, watch, type Ref, type WritableComputedRef } from \"vue\";\nimport type { PlDataTableSettingsV2 } from \"../types\";\nimport type { PlAdvancedFilter } from \"../../PlAdvancedFilter\";\nimport { isJsonEqual, randomInt } from \"@milaboratories/helpers\";\nimport { computedCached } from \"@milaboratories/uikit\";\n\ntype PlDataTableStateV2CacheEntryNullable =\n  | PlDataTableStateV2CacheEntry\n  | {\n      sourceId: null;\n      gridState: Record<string, never>;\n      sheetsState: [];\n      filtersState: null;\n    };\n\nfunction makeDefaultState(): PlDataTableStateV2CacheEntryNullable {\n  return {\n    sourceId: null,\n    gridState: {},\n    sheetsState: [],\n    filtersState: null,\n  };\n}\n\nfunction getHiddenColIds(state: PlDataTableGridStateCore[\"columnVisibility\"]): PObjectId[] | null {\n  return (\n    state?.hiddenColIds?.map(parseJson).reduce((acc, c) => {\n      if (c.source.type === \"column\") {\n        acc.push(c.source.id);\n      }\n      return acc;\n    }, [] as PObjectId[]) ?? null\n  );\n}\n\nfunction makePartitionFilters(\n  sheetsState: PlDataTableSheetState[],\n): FilterSpec<FilterSpecLeaf<string>>[] {\n  return sheetsState.map((s) => {\n    const column = canonicalizeJson<PTableColumnId>({ type: \"axis\", id: s.axisId }) as string;\n    return typeof s.value === \"number\"\n      ? { type: \"equal\" as const, column, x: s.value }\n      : { type: \"patternEquals\" as const, column, value: s.value };\n  });\n}\n\nfunction makeSorting(state: PlDataTableGridStateCore[\"sort\"]): PTableSorting[] {\n  return (\n    state?.sortModel.map((item) => {\n      const { spec: _, ...column } = parseJson(item.colId).labeled;\n      return {\n        column,\n        ascending: item.sort === \"asc\",\n        naAndAbsentAreLeastValues: item.sort === \"asc\",\n      };\n    }) ?? []\n  );\n}\n\nfunction makePTableParams(state: PlDataTableStateV2CacheEntry): PTableParamsV2 {\n  const advancedFilter = distillFilter(state.filtersState);\n  const partitionFilters = makePartitionFilters(state.sheetsState);\n\n  const parts: FilterSpec<FilterSpecLeaf<string>>[] = [\n    ...partitionFilters,\n    ...(advancedFilter ? [advancedFilter] : []),\n  ];\n  const filters: PTableFilters =\n    parts.length === 0 ? null : parts.length === 1 ? parts[0] : { type: \"and\", filters: parts };\n\n  return {\n    sourceId: state.sourceId,\n    hiddenColIds: getHiddenColIds(state.gridState.columnVisibility),\n    filters,\n    sorting: makeSorting(state.gridState.sort),\n  };\n}\n\nexport function useTableState(\n  tableStateDenormalized: Ref<PlDataTableStateV2>,\n  settings: Ref<PlDataTableSettingsV2>,\n): {\n  gridState: WritableComputedRef<PlDataTableGridStateCore>;\n  sheetsState: WritableComputedRef<PlDataTableSheetState[]>;\n  filtersState: WritableComputedRef<PlAdvancedFilter>;\n} {\n  const tableStateNormalized = computedCached<PlDataTableStateV2Normalized>({\n    get: () => upgradePlDataTableStateV2(tableStateDenormalized.value),\n    set: (newState) => (tableStateDenormalized.value = newState),\n  });\n\n  const tableState = computed<PlDataTableStateV2CacheEntryNullable>({\n    get: () => {\n      const defaultState = makeDefaultState();\n\n      const sourceId = settings.value.sourceId;\n      if (!sourceId) return defaultState;\n\n      const cachedState = tableStateNormalized.value.stateCache.find(\n        (entry) => entry.sourceId === sourceId,\n      );\n      if (!cachedState) return { ...defaultState, sourceId };\n\n      return cachedState;\n    },\n    set: (state) => {\n      const newState: PlDataTableStateV2Normalized = {\n        ...tableStateNormalized.value,\n        pTableParams: createDefaultPTableParams(),\n      };\n\n      if (state.sourceId) {\n        newState.pTableParams = makePTableParams(state);\n\n        const stateIdx = newState.stateCache.findIndex(\n          (entry) => entry.sourceId === state.sourceId,\n        );\n        if (stateIdx !== -1) {\n          newState.stateCache[stateIdx] = state;\n        } else {\n          const CacheDepth = 5;\n          newState.stateCache.push(state);\n          newState.stateCache = newState.stateCache.slice(-CacheDepth);\n        }\n      }\n\n      if (!isJsonEqual(tableStateNormalized.value, newState)) {\n        tableStateNormalized.value = newState;\n      }\n    },\n  });\n\n  watch(\n    () => tableState.value,\n    (value) => isJsonEqual(tableState.value, value) && (tableState.value = value),\n    { deep: true },\n  );\n\n  const gridState = computed<PlDataTableGridStateCore>({\n    get: () => tableState.value.gridState,\n    set: (gridState) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          gridState,\n        };\n      }\n    },\n  });\n  watch(gridState, (value) => isJsonEqual(gridState.value, value) && (gridState.value = value), {\n    deep: true,\n  });\n\n  const sheetsState = computed<PlDataTableSheetState[]>({\n    get: () => tableState.value.sheetsState,\n    set: (sheetsState) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          sheetsState,\n        };\n      }\n    },\n  });\n  watch(\n    sheetsState,\n    (value) => isJsonEqual(sheetsState.value, value) && (sheetsState.value = value),\n    { deep: true },\n  );\n\n  const filtersState = computed<PlAdvancedFilter>({\n    get: () => {\n      const raw = tableState.value.filtersState;\n      const isCorrect =\n        raw &&\n        (raw.type === \"and\" || raw.type === \"or\") &&\n        \"filters\" in raw &&\n        Array.isArray(raw.filters);\n\n      return isCorrect\n        ? (raw as PlAdvancedFilter)\n        : { id: randomInt(), type: \"and\" as const, isExpanded: true, filters: [] };\n    },\n    set: (filtersState: PlAdvancedFilter) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          filtersState,\n        };\n      }\n    },\n  });\n  watch(\n    filtersState,\n    (value) => isJsonEqual(filtersState.value, value) && (filtersState.value = value),\n    { deep: true },\n  );\n\n  return { gridState, sheetsState, filtersState };\n}\n"],"names":["makeDefaultState","getHiddenColIds","state","_a","parseJson","acc","c","makePartitionFilters","sheetsState","column","canonicalizeJson","makeSorting","item","_","makePTableParams","advancedFilter","distillFilter","parts","filters","useTableState","tableStateDenormalized","settings","tableStateNormalized","computedCached","upgradePlDataTableStateV2","newState","tableState","computed","defaultState","sourceId","cachedState","entry","createDefaultPTableParams","stateIdx","isJsonEqual","watch","value","gridState","oldState","filtersState","raw","randomInt"],"mappings":"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"}
+{"version":3,"file":"table-state-v2.js","sources":["../../../../src/components/PlAgDataTable/sources/table-state-v2.ts"],"sourcesContent":["import {\n  createDefaultPTableParams,\n  parseJson,\n  canonicalizeJson,\n  upgradePlDataTableStateV2,\n  type FilterSpec,\n  type FilterSpecLeaf,\n  type PTableColumnId,\n  type PlDataTableGridStateCore,\n  type PlDataTableSheetState,\n  type PlDataTableStateV2,\n  type PlDataTableStateV2CacheEntry,\n  type PlDataTableStateV2Normalized,\n  type PObjectId,\n  type PTableParamsV2,\n  type PTableSorting,\n  type PlDataTableFilters,\n  distillFilterSpec,\n} from \"@platforma-sdk/model\";\nimport { computed, watch, type Ref, type WritableComputedRef } from \"vue\";\nimport type { PlDataTableSettingsV2 } from \"../types\";\nimport type { PlAdvancedFilter } from \"../../PlAdvancedFilter\";\nimport { isJsonEqual, randomInt } from \"@milaboratories/helpers\";\nimport { computedCached } from \"@milaboratories/uikit\";\ntype PlDataTableStateV2CacheEntryNullable =\n  | PlDataTableStateV2CacheEntry\n  | {\n      sourceId: null;\n      gridState: Record<string, never>;\n      sheetsState: [];\n      filtersState: null;\n    };\n\nfunction makeDefaultState(): PlDataTableStateV2CacheEntryNullable {\n  return {\n    sourceId: null,\n    gridState: {},\n    sheetsState: [],\n    filtersState: null,\n  };\n}\n\nfunction getHiddenColIds(state: PlDataTableGridStateCore[\"columnVisibility\"]): PObjectId[] | null {\n  return (\n    state?.hiddenColIds?.map(parseJson).reduce((acc, c) => {\n      if (c.source.type === \"column\") {\n        acc.push(c.source.id);\n      }\n      return acc;\n    }, [] as PObjectId[]) ?? null\n  );\n}\n\nfunction convertPartitionFiltersToFilterSpec(\n  sheetsState: PlDataTableSheetState[],\n): FilterSpec<FilterSpecLeaf<string>>[] {\n  return sheetsState.map((s) => {\n    const column = canonicalizeJson<PTableColumnId>({ type: \"axis\", id: s.axisId }) as string;\n    return typeof s.value === \"number\"\n      ? { type: \"equal\" as const, column, x: s.value }\n      : { type: \"patternEquals\" as const, column, value: s.value };\n  });\n}\n\nfunction convertAgSortingToPTableSorting(state: PlDataTableGridStateCore[\"sort\"]): PTableSorting[] {\n  return (\n    state?.sortModel.map((item) => {\n      const { spec: _, ...column } = parseJson(item.colId).labeled;\n      return {\n        column,\n        ascending: item.sort === \"asc\",\n        naAndAbsentAreLeastValues: item.sort === \"asc\",\n      };\n    }) ?? []\n  );\n}\n\nfunction createPTableParams(state: PlDataTableStateV2CacheEntry): PTableParamsV2 {\n  const parts: FilterSpec<FilterSpecLeaf<string>>[] = [\n    ...convertPartitionFiltersToFilterSpec(state.sheetsState),\n    ...(state.filtersState ? [state.filtersState] : []),\n  ];\n  const filters: null | PlDataTableFilters = distillFilterSpec(\n    parts.length === 0 ? null : parts.length === 1 ? parts[0] : { type: \"and\", filters: parts },\n  );\n\n  return {\n    sourceId: state.sourceId,\n    hiddenColIds: getHiddenColIds(state.gridState.columnVisibility),\n    filters,\n    sorting: convertAgSortingToPTableSorting(state.gridState.sort),\n  };\n}\n\nexport function useTableState(\n  tableStateDenormalized: Ref<PlDataTableStateV2>,\n  settings: Ref<PlDataTableSettingsV2>,\n): {\n  gridState: WritableComputedRef<PlDataTableGridStateCore>;\n  sheetsState: WritableComputedRef<PlDataTableSheetState[]>;\n  filtersState: WritableComputedRef<PlAdvancedFilter>;\n} {\n  const tableStateNormalized = computedCached<PlDataTableStateV2Normalized>({\n    get: () => upgradePlDataTableStateV2(tableStateDenormalized.value),\n    set: (newState) => (tableStateDenormalized.value = newState),\n  });\n\n  const tableState = computed<PlDataTableStateV2CacheEntryNullable>({\n    get: () => {\n      const defaultState = makeDefaultState();\n\n      const sourceId = settings.value.sourceId;\n      if (!sourceId) return defaultState;\n\n      const cachedState = tableStateNormalized.value.stateCache.find(\n        (entry) => entry.sourceId === sourceId,\n      );\n      if (!cachedState) return { ...defaultState, sourceId };\n\n      return cachedState;\n    },\n    set: (state) => {\n      const newState: PlDataTableStateV2Normalized = {\n        ...tableStateNormalized.value,\n        pTableParams: createDefaultPTableParams(),\n      };\n\n      if (state.sourceId) {\n        newState.pTableParams = createPTableParams(state);\n\n        const stateIdx = newState.stateCache.findIndex(\n          (entry) => entry.sourceId === state.sourceId,\n        );\n        if (stateIdx !== -1) {\n          newState.stateCache[stateIdx] = state;\n        } else {\n          const CacheDepth = 5;\n          newState.stateCache.push(state);\n          newState.stateCache = newState.stateCache.slice(-CacheDepth);\n        }\n      }\n\n      if (!isJsonEqual(tableStateNormalized.value, newState)) {\n        tableStateNormalized.value = newState;\n      }\n    },\n  });\n\n  watch(\n    () => tableState.value,\n    (value) => isJsonEqual(tableState.value, value) && (tableState.value = value),\n    { deep: true },\n  );\n\n  const gridState = computed<PlDataTableGridStateCore>({\n    get: () => tableState.value.gridState,\n    set: (gridState) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          gridState,\n        };\n      }\n    },\n  });\n  watch(gridState, (value) => isJsonEqual(gridState.value, value) && (gridState.value = value), {\n    deep: true,\n  });\n\n  const sheetsState = computed<PlDataTableSheetState[]>({\n    get: () => tableState.value.sheetsState,\n    set: (sheetsState) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          sheetsState,\n        };\n      }\n    },\n  });\n  watch(\n    sheetsState,\n    (value) => isJsonEqual(sheetsState.value, value) && (sheetsState.value = value),\n    { deep: true },\n  );\n\n  const filtersState = computed<PlAdvancedFilter>({\n    get: () => {\n      const raw = tableState.value.filtersState;\n      const isCorrect =\n        raw &&\n        (raw.type === \"and\" || raw.type === \"or\") &&\n        \"filters\" in raw &&\n        Array.isArray(raw.filters);\n\n      return isCorrect\n        ? (raw as PlAdvancedFilter)\n        : { id: randomInt(), type: \"and\" as const, isExpanded: true, filters: [] };\n    },\n    set: (filtersState: PlAdvancedFilter) => {\n      const oldState = tableState.value;\n      if (oldState.sourceId) {\n        tableState.value = {\n          ...oldState,\n          filtersState,\n        };\n      }\n    },\n  });\n  watch(\n    filtersState,\n    (value) => isJsonEqual(filtersState.value, value) && (filtersState.value = value),\n    { deep: true },\n  );\n\n  return { gridState, sheetsState, filtersState };\n}\n"],"names":["makeDefaultState","getHiddenColIds","state","_a","parseJson","acc","c","convertPartitionFiltersToFilterSpec","sheetsState","s","column","canonicalizeJson","convertAgSortingToPTableSorting","item","_","createPTableParams","parts","filters","distillFilterSpec","useTableState","tableStateDenormalized","settings","tableStateNormalized","computedCached","upgradePlDataTableStateV2","newState","tableState","computed","defaultState","sourceId","cachedState","entry","createDefaultPTableParams","stateIdx","isJsonEqual","watch","value","gridState","oldState","filtersState","raw","randomInt"],"mappings":"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"}

package/dist/components/PlAnnotations/components/PlAnnotations.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlAnnotations.vue2.js","sources":["../../../../src/components/PlAnnotations/components/PlAnnotations.vue"],"sourcesContent":["<script lang=\"ts\">\nimport type { Props as BaseProps } from \"./FilterSidebar.vue\";\nexport type Props = BaseProps & {\n  onDeleteSchema?: () => void;\n};\n</script>\n\n<script setup lang=\"ts\">\nimport { computed, effect, shallowRef } from \"vue\";\n\nimport { isNil } from \"@milaboratories/helpers\";\nimport { PlSidebarGroup, useConfirm } from \"@milaboratories/uikit\";\n\nimport type { Annotation } from \"../types\";\nimport AnnotationsSidebar from \"./AnnotationsSidebar.vue\";\nimport FilterSidebar from \"./FilterSidebar.vue\";\n\n// Models\nconst annotation = defineModel<Annotation>(\"annotation\", { required: true });\n// Props\nconst props = defineProps<Props>();\n// State\nconst selectedStepId = shallowRef<number | undefined>(undefined);\nconst selectedStep = computed(() => {\n  return isNil(selectedStepId.value) || isNil(annotation.value)\n    ? undefined\n    : annotation.value.steps.find((step) => step.id === selectedStepId.value);\n});\n\n// Watchers\neffect(function setDefaultStepId() {\n  if (selectedStepId.value === undefined && annotation.value.steps.length > 0) {\n    selectedStepId.value = annotation.value.steps[0].id;\n  }\n});\n// Hooks\nconst confirmResetSchema = useConfirm({\n  title: \"Reset Schema\",\n  message: \"Are you sure you want to reset the schema? This action cannot be undone.\",\n  confirmLabel: \"Yes, reset\",\n  cancelLabel: \"No, cancel\",\n});\n// Actions\nasync function handleDeleteSchema() {\n  if (await confirmResetSchema()) {\n    selectedStepId.value = undefined;\n    props.onDeleteSchema?.();\n  }\n}\n</script>\n\n<template>\n  <PlSidebarGroup>\n    <template #item-0>\n      <AnnotationsSidebar\n        v-model:annotation=\"annotation\"\n        v-model:selectedStepId=\"selectedStepId\"\n        :class=\"$style.sidebarItem\"\n        :columns=\"props.columns\"\n        @delete-schema=\"handleDeleteSchema\"\n      />\n    </template>\n    <template #item-1>\n      <FilterSidebar\n        v-if=\"selectedStep\"\n        v-model:step=\"selectedStep\"\n        :class=\"$style.sidebarItem\"\n        :columns=\"props.columns\"\n        :get-suggest-options=\"props.getSuggestOptions\"\n        :selectedStepId=\"selectedStepId\"\n        :hasSelectedColumns=\"props.hasSelectedColumns\"\n        :getValuesForSelectedColumns=\"props.getValuesForSelectedColumns\"\n      />\n    </template>\n  </PlSidebarGroup>\n</template>\n\n<style module>\n.sidebarItem {\n  width: 100%;\n  height: 100%;\n}\n</style>\n"],"names":["annotation","_useModel","props","__props","selectedStepId","shallowRef","selectedStep","computed","isNil","step","effect","confirmResetSchema","useConfirm","handleDeleteSchema","_a","_createBlock","_unref","PlSidebarGroup","_createVNode","AnnotationsSidebar","$event","_normalizeClass","$style","FilterSidebar"],"mappings":";;;;;;;;;;;;;;;;;;;AAkBA,UAAMA,IAAaC,KAAwB,YAAgC,GAErEC,IAAQC,GAERC,IAAiBC,EAA+B,MAAS,GACzDC,IAAeC,EAAS,MACrBC,EAAMJ,EAAe,KAAK,KAAKI,EAAMR,EAAW,KAAK,IACxD,SACAA,EAAW,MAAM,MAAM,KAAK,CAACS,MAASA,EAAK,OAAOL,EAAe,KAAK,CAC3E;AAGD,IAAAM,EAAO,WAA4B;AACjC,MAAIN,EAAe,UAAU,UAAaJ,EAAW,MAAM,MAAM,SAAS,MACxEI,EAAe,QAAQJ,EAAW,MAAM,MAAM,CAAC,EAAE;AAAA,IAErD,CAAC;AAED,UAAMW,IAAqBC,EAAW;AAAA,MACpC,OAAO;AAAA,MACP,SAAS;AAAA,MACT,cAAc;AAAA,MACd,aAAa;AAAA,IAAA,CACd;AAED,mBAAeC,IAAqB;;AAClC,MAAI,MAAMF,QACRP,EAAe,QAAQ,SACvBU,IAAAZ,EAAM,mBAAN,QAAAY,EAAA,KAAAZ;AAAA,IAEJ;2BAIEa,EAsBiBC,EAAAC,CAAA,GAAA,MAAA;AAAA,MArBJ,YACT,MAME;AAAA,QANFC,EAMEC,GAAA;AAAA,UALQ,YAAYnB,EAAA;AAAA,wDAAAA,EAAU,QAAAoB;AAAA,UACtB,gBAAgBhB,EAAA;AAAA,4DAAAA,EAAc,QAAAgB;AAAA,UACrC,OAAKC,EAAEC,EAAAA,OAAO,WAAW;AAAA,UACzB,SAASpB,EAAM;AAAA,UACf,gBAAeW;AAAA,QAAA;;MAGT,YANf,MAW4C;AAAA,QAH9BP,EAAA,cADRS,EASEQ,GAAA;AAAA;UAPQ,MAAMjB,EAAA;AAAA,kDAAAA,EAAY,QAAAc;AAAA,UACzB,OAAKC,EAAEC,EAAAA,OAAO,WAAW;AAAA,UACzB,SAASpB,EAAM;AAAA,UACf,uBAAqBA,EAAM;AAAA,UAC3B,gBAAgBE,EAAA;AAAA,UAChB,oBAAoBF,EAAM;AAAA,UAC1B,6BAA6BA,EAAM;AAAA,QAAA;;;;;;"}
+{"version":3,"file":"PlAnnotations.vue2.js","sources":["../../../../src/components/PlAnnotations/components/PlAnnotations.vue"],"sourcesContent":["<script lang=\"ts\">\nimport type { Props as BaseProps } from \"./FilterSidebar.vue\";\nexport type Props = BaseProps & {\n  onDeleteSchema?: () => void;\n};\n</script>\n\n<script setup lang=\"ts\">\nimport { computed, effect, shallowRef } from \"vue\";\n\nimport { isNil } from \"@milaboratories/helpers\";\nimport { PlSidebarGroup, useConfirm } from \"@milaboratories/uikit\";\n\nimport type { Annotation } from \"../types\";\nimport AnnotationsSidebar from \"./AnnotationsSidebar.vue\";\nimport FilterSidebar from \"./FilterSidebar.vue\";\n\n// Models\nconst annotation = defineModel<Annotation>(\"annotation\", { required: true });\n// Props\nconst props = defineProps<Props>();\n// State\nconst selectedStepId = shallowRef<number | undefined>(undefined);\nconst selectedStep = computed(() => {\n  return isNil(selectedStepId.value) || isNil(annotation.value)\n    ? undefined\n    : annotation.value.steps.find((step) => step.id === selectedStepId.value);\n});\n\n// Watchers\neffect(function setDefaultStepId() {\n  if (selectedStepId.value === undefined && annotation.value.steps.length > 0) {\n    selectedStepId.value = annotation.value.steps[0].id;\n  }\n});\n// Hooks\nconst confirmResetSchema = useConfirm({\n  title: \"Reset Schema\",\n  message: \"Are you sure you want to reset the schema? This action cannot be undone.\",\n  confirmLabel: \"Yes, reset\",\n  cancelLabel: \"No, cancel\",\n});\n// Actions\nasync function handleDeleteSchema() {\n  if (await confirmResetSchema()) {\n    selectedStepId.value = undefined;\n    props.onDeleteSchema?.();\n  }\n}\n</script>\n\n<template>\n  <PlSidebarGroup>\n    <template #item-0>\n      <AnnotationsSidebar\n        v-model:annotation=\"annotation\"\n        v-model:selectedStepId=\"selectedStepId\"\n        :class=\"$style.sidebarItem\"\n        :columns=\"props.columns\"\n        @delete-schema=\"handleDeleteSchema\"\n      />\n    </template>\n    <template #item-1>\n      <FilterSidebar\n        v-if=\"selectedStep\"\n        v-model:step=\"selectedStep\"\n        :class=\"$style.sidebarItem\"\n        :columns=\"props.columns\"\n        :get-suggest-options=\"props.getSuggestOptions\"\n        :selectedStepId=\"selectedStepId\"\n        :hasSelectedColumns=\"props.hasSelectedColumns\"\n        :getValuesForSelectedColumns=\"props.getValuesForSelectedColumns\"\n      />\n    </template>\n  </PlSidebarGroup>\n</template>\n\n<style module>\n.sidebarItem {\n  width: 100%;\n  height: 100%;\n}\n</style>\n"],"names":["annotation","_useModel","props","__props","selectedStepId","shallowRef","selectedStep","computed","isNil","step","effect","confirmResetSchema","useConfirm","handleDeleteSchema","_a","_createBlock","_unref","PlSidebarGroup","_createVNode","AnnotationsSidebar","$event","_normalizeClass","$style","FilterSidebar"],"mappings":";;;;;;;;;;;;;;;;;;;AAkBA,UAAMA,IAAaC,KAAwB,YAAgC,GAErEC,IAAQC,GAERC,IAAiBC,EAA+B,MAAS,GACzDC,IAAeC,EAAS,MACrBC,EAAMJ,EAAe,KAAK,KAAKI,EAAMR,EAAW,KAAK,IACxD,SACAA,EAAW,MAAM,MAAM,KAAK,CAACS,MAASA,EAAK,OAAOL,EAAe,KAAK,CAC3E;AAGD,IAAAM,EAAO,WAA4B;AACjC,MAAIN,EAAe,UAAU,UAAaJ,EAAW,MAAM,MAAM,SAAS,MACxEI,EAAe,QAAQJ,EAAW,MAAM,MAAM,CAAC,EAAE;AAAA,IAErD,CAAC;AAED,UAAMW,IAAqBC,EAAW;AAAA,MACpC,OAAO;AAAA,MACP,SAAS;AAAA,MACT,cAAc;AAAA,MACd,aAAa;AAAA,IAAA,CACd;AAED,mBAAeC,IAAqB;;AAClC,MAAI,MAAMF,QACRP,EAAe,QAAQ,SACvBU,IAAAZ,EAAM,mBAAN,QAAAY,EAAA,KAAAZ;AAAA,IAEJ;2BAIEa,EAsBiBC,EAAAC,CAAA,GAAA,MAAA;AAAA,MArBJ,YACT,MAME;AAAA,QANFC,EAMEC,GAAA;AAAA,UALQ,YAAYnB,EAAA;AAAA,wDAAAA,EAAU,QAAAoB;AAAA,UACtB,gBAAgBhB,EAAA;AAAA,4DAAAA,EAAc,QAAAgB;AAAA,UACrC,OAAKC,EAAEC,EAAAA,OAAO,WAAW;AAAA,UACzB,SAASpB,EAAM;AAAA,UACf,gBAAeW;AAAA,QAAA;;MAGT,YACT,MASE;AAAA,QARMP,EAAA,cADRS,EASEQ,GAAA;AAAA;UAPQ,MAAMjB,EAAA;AAAA,kDAAAA,EAAY,QAAAc;AAAA,UACzB,OAAKC,EAAEC,EAAAA,OAAO,WAAW;AAAA,UACzB,SAASpB,EAAM;AAAA,UACf,uBAAqBA,EAAM;AAAA,UAC3B,gBAAgBE,EAAA;AAAA,UAChB,oBAAoBF,EAAM;AAAA,UAC1B,6BAA6BA,EAAM;AAAA,QAAA;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.54.7",
+  "version": "1.54.9",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -26,8 +26,8 @@
     "lru-cache": "^11.2.2",
     "vue": "^3.5.24",
     "zod": "~3.23.8",
-    "@milaboratories/uikit": "2.10.20",
-    "@platforma-sdk/model": "1.54.7"
+    "@milaboratories/uikit": "2.10.22",
+    "@platforma-sdk/model": "1.54.9"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.2.0",
@@ -42,9 +42,9 @@
     "typescript": "~5.6.3",
     "vite": "^6.4.1",
     "vitest": "^4.0.16",
-    "@milaboratories/build-configs": "1.4.4",
-    "@milaboratories/ts-builder": "1.2.10",
     "@milaboratories/ts-configs": "1.2.1",
+    "@milaboratories/ts-builder": "1.2.10",
+    "@milaboratories/build-configs": "1.4.4",
     "@milaboratories/helpers": "1.13.4"
   },
   "styles": "dist/index.js",

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

@@ -3,7 +3,6 @@ import {
   parseJson,
   canonicalizeJson,
   upgradePlDataTableStateV2,
-  distillFilter,
   type FilterSpec,
   type FilterSpecLeaf,
   type PTableColumnId,
@@ -13,16 +12,16 @@ import {
   type PlDataTableStateV2CacheEntry,
   type PlDataTableStateV2Normalized,
   type PObjectId,
-  type PTableFilters,
   type PTableParamsV2,
   type PTableSorting,
+  type PlDataTableFilters,
+  distillFilterSpec,
 } from "@platforma-sdk/model";
 import { computed, watch, type Ref, type WritableComputedRef } from "vue";
 import type { PlDataTableSettingsV2 } from "../types";
 import type { PlAdvancedFilter } from "../../PlAdvancedFilter";
 import { isJsonEqual, randomInt } from "@milaboratories/helpers";
 import { computedCached } from "@milaboratories/uikit";
-
 type PlDataTableStateV2CacheEntryNullable =
   | PlDataTableStateV2CacheEntry
   | {
@@ -52,7 +51,7 @@ function getHiddenColIds(state: PlDataTableGridStateCore["columnVisibility"]): P
   );
 }
 
-function makePartitionFilters(
+function convertPartitionFiltersToFilterSpec(
   sheetsState: PlDataTableSheetState[],
 ): FilterSpec<FilterSpecLeaf<string>>[] {
   return sheetsState.map((s) => {
@@ -63,7 +62,7 @@ function makePartitionFilters(
   });
 }
 
-function makeSorting(state: PlDataTableGridStateCore["sort"]): PTableSorting[] {
+function convertAgSortingToPTableSorting(state: PlDataTableGridStateCore["sort"]): PTableSorting[] {
   return (
     state?.sortModel.map((item) => {
       const { spec: _, ...column } = parseJson(item.colId).labeled;
@@ -76,22 +75,20 @@ function makeSorting(state: PlDataTableGridStateCore["sort"]): PTableSorting[] {
   );
 }
 
-function makePTableParams(state: PlDataTableStateV2CacheEntry): PTableParamsV2 {
-  const advancedFilter = distillFilter(state.filtersState);
-  const partitionFilters = makePartitionFilters(state.sheetsState);
-
+function createPTableParams(state: PlDataTableStateV2CacheEntry): PTableParamsV2 {
   const parts: FilterSpec<FilterSpecLeaf<string>>[] = [
-    ...partitionFilters,
-    ...(advancedFilter ? [advancedFilter] : []),
+    ...convertPartitionFiltersToFilterSpec(state.sheetsState),
+    ...(state.filtersState ? [state.filtersState] : []),
   ];
-  const filters: PTableFilters =
-    parts.length === 0 ? null : parts.length === 1 ? parts[0] : { type: "and", filters: parts };
+  const filters: null | PlDataTableFilters = distillFilterSpec(
+    parts.length === 0 ? null : parts.length === 1 ? parts[0] : { type: "and", filters: parts },
+  );
 
   return {
     sourceId: state.sourceId,
     hiddenColIds: getHiddenColIds(state.gridState.columnVisibility),
     filters,
-    sorting: makeSorting(state.gridState.sort),
+    sorting: convertAgSortingToPTableSorting(state.gridState.sort),
   };
 }
 
@@ -129,7 +126,7 @@ export function useTableState(
       };
 
       if (state.sourceId) {
-        newState.pTableParams = makePTableParams(state);
+        newState.pTableParams = createPTableParams(state);
 
         const stateIdx = newState.stateCache.findIndex(
           (entry) => entry.sourceId === state.sourceId,