@platforma-sdk/ui-vue 1.79.34 → 1.80.1

package/dist/components/PlTableFilters/PlTableFiltersV2.vue2.js

@@ -1,11 +1,11 @@
 import e from "../PlAdvancedFilter/PlAdvancedFilter.js";
 import "../PlAdvancedFilter/index.js";
 import { Fragment as t, Teleport as n, computed as r, createBlock as i, createCommentVNode as a, createElementBlock as o, createElementVNode as s, createTextVNode as c, createVNode as l, defineComponent as u, normalizeClass as d, openBlock as f, ref as p, unref as m, withCtx as h, withModifiers as g } from "vue";
-import { Annotation as _, Domain as v, canonicalizeJson as y, getPTableColumnId as b, getUniqueSourceValuesWithLabels as x, parseJson as S, readAnnotation as C, readDomain as w } from "@platforma-sdk/model";
-import { isFunction as T, isNil as E } from "es-toolkit";
-import { PlBtnGhost as D, PlSlideModal as O, usePlBlockPageTitleTeleportTarget as k } from "@milaboratories/uikit";
+import { Annotation as _, Domain as v, extractPObjectId as y, getPTableColumnId as b, getUniqueSourceValuesWithLabels as x, readAnnotation as S, readDomain as C } from "@platforma-sdk/model";
+import { isFunction as w, isNil as T } from "es-toolkit";
+import { PlBtnGhost as E, PlSlideModal as D, usePlBlockPageTitleTeleportTarget as O } from "@milaboratories/uikit";
 //#region src/components/PlTableFilters/PlTableFiltersV2.vue?vue&type=script&setup=true&lang.ts
-var A = { key: 1 }, j = /* @__PURE__ */ u({
+var k = { key: 1 }, A = /* @__PURE__ */ u({
 	__name: "PlTableFiltersV2",
 	props: {
 		columns: {},
@@ -17,29 +17,29 @@ var A = { key: 1 }, j = /* @__PURE__ */ u({
 		onUpdateDefaultFilters: { type: Function }
 	},
 	setup(u) {
-		let j = u, M = k("PlTableFiltersV2"), N = p(!1), P = r(() => j.filters.filters.length > 0), F = r(() => !E(j.defaultFilters) && j.defaultFilters.filters.length > 0), I = r(() => E(j.defaultFilters) || j.defaultFilters?.filters.length === 0 ? j.filters : {
-			...j.filters,
-			filters: [...j.defaultFilters?.filters ?? [], ...j.filters.filters]
-		}), L = (e) => {
+		let A = u, j = O("PlTableFiltersV2"), M = p(!1), N = r(() => A.filters.filters.length > 0), P = r(() => !T(A.defaultFilters) && A.defaultFilters.filters.length > 0), F = r(() => T(A.defaultFilters) || A.defaultFilters?.filters.length === 0 ? A.filters : {
+			...A.filters,
+			filters: [...A.defaultFilters?.filters ?? [], ...A.filters.filters]
+		}), I = (e) => {
 			let t = e;
-			if (E(j.defaultFilters)) return j.onUpdateFilters(t);
+			if (T(A.defaultFilters)) return A.onUpdateFilters(t);
 			let [n, ...r] = t.filters;
-			j.onUpdateFilters({
+			A.onUpdateFilters({
 				...t,
 				filters: r
-			}), j.onUpdateDefaultFilters?.({
-				...j.defaultFilters,
+			}), A.onUpdateDefaultFilters?.({
+				...A.defaultFilters,
 				filters: [n]
 			});
-		}, R = r(() => j.columns.map((e, t) => {
-			let n = V(e), r = C(e.spec, _.Label)?.trim() ?? `Unlabeled ${e.type} ${t}`, i = w(e.spec, v.Alphabet) ?? C(e.spec, _.Alphabet);
+		}, L = r(() => A.columns.map((e, t) => {
+			let n = b(e), r = S(e.spec, _.Label)?.trim() ?? `Unlabeled ${e.type} ${t}`, i = C(e.spec, v.Alphabet) ?? S(e.spec, _.Alphabet);
 			return {
 				id: n,
 				label: r,
 				spec: e.spec,
 				alphabet: i ?? void 0
 			};
-		})), z = [
+		})), R = [
 			"isNA",
 			"isNotNA",
 			"greaterThan",
@@ -55,58 +55,55 @@ var A = { key: 1 }, j = /* @__PURE__ */ u({
 			"equal",
 			"notEqual"
 		];
-		function B(e) {
-			if (E(j.pframeHandle)) return console.warn("PFrame handle is not available, cannot fetch suggest options"), [];
-			let t = e.columnId, n = S(t);
-			if (n.type !== "column") throw Error("ColumnId should be of type 'column' for suggest options");
-			return x(j.pframeHandle, {
-				columnId: n.id,
+		function z(e) {
+			if (T(A.pframeHandle)) return console.warn("PFrame handle is not available, cannot fetch suggest options"), [];
+			let t = e.columnId;
+			if (typeof t != "object" || !t || t.type !== "column") throw Error("ColumnId should be of type 'column' for suggest options");
+			return x(A.pframeHandle, {
+				columnId: y(t.id),
 				axisIdx: e.axisIdx,
 				limit: 100,
 				searchQuery: e.searchType === "label" ? e.searchStr : void 0,
 				searchQueryValue: e.searchType === "value" ? e.searchStr : void 0
 			}).then((e) => e.values);
 		}
-		function V(e) {
-			return y(b(e));
-		}
-		return (r, u) => (f(), o(t, null, [m(M) ? (f(), i(n, {
+		return (r, u) => (f(), o(t, null, [m(j) ? (f(), i(n, {
 			key: 0,
-			to: m(M)
-		}, [l(m(D), {
-			icon: P.value || F.value ? "filter-on" : "filter",
-			onClick: u[0] ||= g((e) => N.value = !0, ["stop"])
+			to: m(j)
+		}, [l(m(E), {
+			icon: N.value || P.value ? "filter-on" : "filter",
+			onClick: u[0] ||= g((e) => M.value = !0, ["stop"])
 		}, {
 			default: h(() => [...u[3] ||= [c(" Filters ", -1)]]),
 			_: 1
-		}, 8, ["icon"])], 8, ["to"])) : a("", !0), l(m(O), {
-			modelValue: N.value,
-			"onUpdate:modelValue": u[2] ||= (e) => N.value = e,
+		}, 8, ["icon"])], 8, ["to"])) : a("", !0), l(m(D), {
+			modelValue: M.value,
+			"onUpdate:modelValue": u[2] ||= (e) => M.value = e,
 			"close-on-outside-click": !1
 		}, {
 			title: h(() => [...u[4] ||= [c("Manage Filters", -1)]]),
 			default: h(() => [s("div", { class: d(r.$style.root) }, [l(m(e), {
-				filters: I.value,
-				options: R.value,
-				"supported-filters": z,
-				"get-suggest-options": B,
-				"is-pinned": (e, t) => F.value && t === 0,
-				"is-removable": (e, t) => F.value ? t > 0 : !0,
-				"is-draggable": (e, t) => F.value ? t > 0 : !0,
+				filters: F.value,
+				options: L.value,
+				"supported-filters": R,
+				"get-suggest-options": z,
+				"is-pinned": (e, t) => P.value && t === 0,
+				"is-removable": (e, t) => P.value ? t > 0 : !0,
+				"is-draggable": (e, t) => P.value ? t > 0 : !0,
 				"enable-dnd": !1,
 				"enable-toggling": !0,
 				"enable-add-group-button": !0,
-				onUpdateFilters: L
+				onUpdateFilters: I
 			}, {
-				"group-title": h(({ index: e }) => [F.value && e === 0 ? (f(), o("div", {
+				"group-title": h(({ index: e }) => [P.value && e === 0 ? (f(), o("div", {
 					key: 0,
 					class: d(r.$style.defaultGroupTitle)
-				}, [u[5] ||= c(" Default Group ", -1), m(T)(j.onResetDefaultFilters) ? (f(), i(m(D), {
+				}, [u[5] ||= c(" Default Group ", -1), m(w)(A.onResetDefaultFilters) ? (f(), i(m(E), {
 					key: 0,
 					icon: "restart",
 					class: d(r.$style.restartBtn),
-					onClick: u[1] ||= g((e) => j.onResetDefaultFilters(), ["stop"])
-				}, null, 8, ["class"])) : a("", !0)], 2)) : (f(), o("div", A, "Custom Group"))]),
+					onClick: u[1] ||= g((e) => A.onResetDefaultFilters(), ["stop"])
+				}, null, 8, ["class"])) : a("", !0)], 2)) : (f(), o("div", k, "Custom Group"))]),
 				_: 1
 			}, 8, [
 				"filters",
@@ -120,6 +117,6 @@ var A = { key: 1 }, j = /* @__PURE__ */ u({
 	}
 });
 //#endregion
-export { j as default };
+export { A as default };
 
 //# sourceMappingURL=PlTableFiltersV2.vue2.js.map

package/dist/components/PlTableFilters/PlTableFiltersV2.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlTableFiltersV2.vue_vue_type_script_setup_true_lang.js","names":["$style"],"sources":["../../../src/components/PlTableFilters/PlTableFiltersV2.vue"],"sourcesContent":["<script lang=\"ts\" setup>\nimport type {\n  PTableColumnSpec,\n  PlDataTableFiltersWithMeta,\n  PFrameHandle,\n  PTableColumnId,\n  CanonicalizedJson,\n} from \"@platforma-sdk/model\";\nimport {\n  canonicalizeJson,\n  Annotation,\n  Domain,\n  readAnnotation,\n  readDomain,\n  getUniqueSourceValuesWithLabels,\n  parseJson,\n  getPTableColumnId,\n} from \"@platforma-sdk/model\";\nimport { computed, ref } from \"vue\";\nimport { PlBtnGhost, PlSlideModal, usePlBlockPageTitleTeleportTarget } from \"@milaboratories/uikit\";\nimport {\n  PlAdvancedFilter,\n  PlAdvancedFilterComponent,\n  PlAdvancedFilterSupportedFilters,\n  type PlAdvancedFilterItem,\n} from \"../PlAdvancedFilter\";\nimport type { PlAdvancedFilterColumnId } from \"../PlAdvancedFilter/types\";\nimport type { Nil } from \"@milaboratories/helpers\";\nimport { isFunction, isNil } from \"es-toolkit\";\n\nconst props = defineProps<{\n  columns: PTableColumnSpec[];\n  pframeHandle: Nil | PFrameHandle;\n  filters: PlDataTableFiltersWithMeta;\n  defaultFilters: Nil | PlDataTableFiltersWithMeta;\n  onUpdateFilters: (value: PlDataTableFiltersWithMeta) => void;\n  onResetDefaultFilters?: () => void;\n  onUpdateDefaultFilters?: (value: PlDataTableFiltersWithMeta) => void;\n}>();\n\nconst teleportTarget = usePlBlockPageTitleTeleportTarget(\"PlTableFiltersV2\");\nconst showManager = ref(false);\nconst hasFilters = computed(() => props.filters.filters.length > 0);\nconst hasDefaultFilters = computed(\n  () => !isNil(props.defaultFilters) && props.defaultFilters.filters.length > 0,\n);\nconst filters = computed<PlDataTableFiltersWithMeta>(() => {\n  if (isNil(props.defaultFilters) || props.defaultFilters?.filters.length === 0) {\n    return props.filters;\n  }\n\n  return {\n    ...props.filters,\n    filters: [...(props.defaultFilters?.filters ?? []), ...props.filters.filters],\n  };\n});\nconst onUpdateFilters = (_value: PlAdvancedFilter) => {\n  const value = _value as PlDataTableFiltersWithMeta;\n\n  if (isNil(props.defaultFilters)) {\n    return props.onUpdateFilters(value);\n  }\n\n  const [defaults, ...rest] = value.filters;\n  props.onUpdateFilters({ ...value, filters: rest });\n  props.onUpdateDefaultFilters?.({ ...props.defaultFilters, filters: [defaults] });\n};\n\nconst options = computed<PlAdvancedFilterItem[]>(() => {\n  return props.columns.map((col, idx) => {\n    const id = makeFilterColumnId(col);\n    const label =\n      readAnnotation(col.spec, Annotation.Label)?.trim() ?? `Unlabeled ${col.type} ${idx}`;\n    const alphabet =\n      readDomain(col.spec, Domain.Alphabet) ?? readAnnotation(col.spec, Annotation.Alphabet);\n    return {\n      id,\n      label,\n      spec: col.spec,\n      alphabet: alphabet ?? undefined,\n    };\n  });\n});\n\n// Supported filters (same set as FilterSidebar)\nconst supportedFilters = [\n  \"isNA\",\n  \"isNotNA\",\n  \"greaterThan\",\n  \"greaterThanOrEqual\",\n  \"lessThan\",\n  \"lessThanOrEqual\",\n  \"patternEquals\",\n  \"patternNotEquals\",\n  \"patternContainSubsequence\",\n  \"patternNotContainSubsequence\",\n  \"patternMatchesRegularExpression\",\n  \"patternFuzzyContainSubsequence\",\n  \"equal\",\n  \"notEqual\",\n] as (typeof PlAdvancedFilterSupportedFilters)[number][];\n\n// getSuggestOptions - provide discrete values from column annotations\nfunction handleSuggestOptions(params: {\n  columnId: PlAdvancedFilterColumnId;\n  axisIdx?: number;\n  searchStr: string;\n  searchType: \"value\" | \"label\";\n}) {\n  if (isNil(props.pframeHandle)) {\n    console.warn(\"PFrame handle is not available, cannot fetch suggest options\");\n    return [];\n  }\n\n  const strId = params.columnId as CanonicalizedJson<PTableColumnId>;\n  const tableColumnId = parseJson<PTableColumnId>(strId);\n\n  if (tableColumnId.type !== \"column\") {\n    throw new Error(\"ColumnId should be of type 'column' for suggest options\");\n  }\n\n  return getUniqueSourceValuesWithLabels(props.pframeHandle, {\n    columnId: tableColumnId.id,\n    axisIdx: params.axisIdx,\n    limit: 100,\n    searchQuery: params.searchType === \"label\" ? params.searchStr : undefined,\n    searchQueryValue: params.searchType === \"value\" ? params.searchStr : undefined,\n  }).then((v) => v.values);\n}\n\nfunction makeFilterColumnId(spec: PTableColumnSpec): CanonicalizedJson<PTableColumnId> {\n  return canonicalizeJson<PTableColumnId>(getPTableColumnId(spec));\n}\n</script>\n\n<template>\n  <Teleport v-if=\"teleportTarget\" :to=\"teleportTarget\">\n    <PlBtnGhost\n      :icon=\"hasFilters || hasDefaultFilters ? 'filter-on' : 'filter'\"\n      @click.stop=\"showManager = true\"\n    >\n      Filters\n    </PlBtnGhost>\n  </Teleport>\n\n  <PlSlideModal v-model=\"showManager\" :close-on-outside-click=\"false\">\n    <template #title>Manage Filters</template>\n\n    <div :class=\"$style.root\">\n      <PlAdvancedFilterComponent\n        :filters=\"filters as PlAdvancedFilter\"\n        :options=\"options\"\n        :supported-filters=\"supportedFilters\"\n        :get-suggest-options=\"handleSuggestOptions\"\n        :is-pinned=\"(_, index) => hasDefaultFilters && index === 0\"\n        :is-removable=\"(_, index) => (hasDefaultFilters ? index > 0 : true)\"\n        :is-draggable=\"(_, index) => (hasDefaultFilters ? index > 0 : true)\"\n        :enable-dnd=\"false\"\n        :enable-toggling=\"true\"\n        :enable-add-group-button=\"true\"\n        @update-filters=\"onUpdateFilters\"\n      >\n        <template #group-title=\"{ index }\">\n          <div v-if=\"hasDefaultFilters && index === 0\" :class=\"$style.defaultGroupTitle\">\n            Default Group\n            <PlBtnGhost\n              v-if=\"isFunction(props.onResetDefaultFilters)\"\n              icon=\"restart\"\n              :class=\"$style.restartBtn\"\n              @click.stop=\"props.onResetDefaultFilters()\"\n            />\n          </div>\n          <div v-else>Custom Group</div>\n        </template>\n      </PlAdvancedFilterComponent>\n    </div>\n  </PlSlideModal>\n</template>\n\n<style module>\n.root {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n.defaultGroupTitle {\n  display: flex;\n  align-items: center;\n  gap: 4px;\n}\n.restartBtn {\n  width: 24px;\n  height: 24px;\n  padding: 4px;\n  --button-width: 24px;\n  --btn-min-width: 24px;\n  --button-height: 24px;\n  --btn-min-height: 24x;\n}\n</style>\n"],"mappings":"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"}
+{"version":3,"file":"PlTableFiltersV2.vue_vue_type_script_setup_true_lang.js","names":["$style"],"sources":["../../../src/components/PlTableFilters/PlTableFiltersV2.vue"],"sourcesContent":["<script lang=\"ts\" setup>\nimport type {\n  PTableColumnSpec,\n  PlDataTableFiltersWithMeta,\n  PFrameHandle,\n  PTableColumnId,\n} from \"@platforma-sdk/model\";\nimport {\n  Annotation,\n  Domain,\n  readAnnotation,\n  readDomain,\n  getUniqueSourceValuesWithLabels,\n  extractPObjectId,\n  getPTableColumnId,\n} from \"@platforma-sdk/model\";\nimport { computed, ref } from \"vue\";\nimport { PlBtnGhost, PlSlideModal, usePlBlockPageTitleTeleportTarget } from \"@milaboratories/uikit\";\nimport {\n  PlAdvancedFilter,\n  PlAdvancedFilterComponent,\n  PlAdvancedFilterSupportedFilters,\n  type PlAdvancedFilterItem,\n} from \"../PlAdvancedFilter\";\nimport type { PlAdvancedFilterColumnId } from \"../PlAdvancedFilter/types\";\nimport type { Nil } from \"@milaboratories/helpers\";\nimport { isFunction, isNil } from \"es-toolkit\";\n\nconst props = defineProps<{\n  columns: PTableColumnSpec[];\n  pframeHandle: Nil | PFrameHandle;\n  filters: PlDataTableFiltersWithMeta;\n  defaultFilters: Nil | PlDataTableFiltersWithMeta;\n  onUpdateFilters: (value: PlDataTableFiltersWithMeta) => void;\n  onResetDefaultFilters?: () => void;\n  onUpdateDefaultFilters?: (value: PlDataTableFiltersWithMeta) => void;\n}>();\n\nconst teleportTarget = usePlBlockPageTitleTeleportTarget(\"PlTableFiltersV2\");\nconst showManager = ref(false);\nconst hasFilters = computed(() => props.filters.filters.length > 0);\nconst hasDefaultFilters = computed(\n  () => !isNil(props.defaultFilters) && props.defaultFilters.filters.length > 0,\n);\nconst filters = computed<PlDataTableFiltersWithMeta>(() => {\n  if (isNil(props.defaultFilters) || props.defaultFilters?.filters.length === 0) {\n    return props.filters;\n  }\n\n  return {\n    ...props.filters,\n    filters: [...(props.defaultFilters?.filters ?? []), ...props.filters.filters],\n  };\n});\nconst onUpdateFilters = (_value: PlAdvancedFilter) => {\n  const value = _value as PlDataTableFiltersWithMeta;\n\n  if (isNil(props.defaultFilters)) {\n    return props.onUpdateFilters(value);\n  }\n\n  const [defaults, ...rest] = value.filters;\n  props.onUpdateFilters({ ...value, filters: rest });\n  props.onUpdateDefaultFilters?.({ ...props.defaultFilters, filters: [defaults] });\n};\n\nconst options = computed<PlAdvancedFilterItem[]>(() => {\n  return props.columns.map((col, idx) => {\n    const id = getPTableColumnId(col);\n    const label =\n      readAnnotation(col.spec, Annotation.Label)?.trim() ?? `Unlabeled ${col.type} ${idx}`;\n    const alphabet =\n      readDomain(col.spec, Domain.Alphabet) ?? readAnnotation(col.spec, Annotation.Alphabet);\n    return {\n      id,\n      label,\n      spec: col.spec,\n      alphabet: alphabet ?? undefined,\n    };\n  });\n});\n\n// Supported filters (same set as FilterSidebar)\nconst supportedFilters = [\n  \"isNA\",\n  \"isNotNA\",\n  \"greaterThan\",\n  \"greaterThanOrEqual\",\n  \"lessThan\",\n  \"lessThanOrEqual\",\n  \"patternEquals\",\n  \"patternNotEquals\",\n  \"patternContainSubsequence\",\n  \"patternNotContainSubsequence\",\n  \"patternMatchesRegularExpression\",\n  \"patternFuzzyContainSubsequence\",\n  \"equal\",\n  \"notEqual\",\n] as (typeof PlAdvancedFilterSupportedFilters)[number][];\n\n// getSuggestOptions - provide discrete values from column annotations\nfunction handleSuggestOptions(params: {\n  columnId: PlAdvancedFilterColumnId;\n  axisIdx?: number;\n  searchStr: string;\n  searchType: \"value\" | \"label\";\n}) {\n  if (isNil(props.pframeHandle)) {\n    console.warn(\"PFrame handle is not available, cannot fetch suggest options\");\n    return [];\n  }\n\n  const tableColumnId = params.columnId as PTableColumnId;\n  if (\n    typeof tableColumnId !== \"object\" ||\n    tableColumnId === null ||\n    tableColumnId.type !== \"column\"\n  ) {\n    throw new Error(\"ColumnId should be of type 'column' for suggest options\");\n  }\n\n  return getUniqueSourceValuesWithLabels(props.pframeHandle, {\n    columnId: extractPObjectId(tableColumnId.id),\n    axisIdx: params.axisIdx,\n    limit: 100,\n    searchQuery: params.searchType === \"label\" ? params.searchStr : undefined,\n    searchQueryValue: params.searchType === \"value\" ? params.searchStr : undefined,\n  }).then((v) => v.values);\n}\n</script>\n\n<template>\n  <Teleport v-if=\"teleportTarget\" :to=\"teleportTarget\">\n    <PlBtnGhost\n      :icon=\"hasFilters || hasDefaultFilters ? 'filter-on' : 'filter'\"\n      @click.stop=\"showManager = true\"\n    >\n      Filters\n    </PlBtnGhost>\n  </Teleport>\n\n  <PlSlideModal v-model=\"showManager\" :close-on-outside-click=\"false\">\n    <template #title>Manage Filters</template>\n\n    <div :class=\"$style.root\">\n      <PlAdvancedFilterComponent\n        :filters=\"filters as PlAdvancedFilter\"\n        :options=\"options\"\n        :supported-filters=\"supportedFilters\"\n        :get-suggest-options=\"handleSuggestOptions\"\n        :is-pinned=\"(_, index) => hasDefaultFilters && index === 0\"\n        :is-removable=\"(_, index) => (hasDefaultFilters ? index > 0 : true)\"\n        :is-draggable=\"(_, index) => (hasDefaultFilters ? index > 0 : true)\"\n        :enable-dnd=\"false\"\n        :enable-toggling=\"true\"\n        :enable-add-group-button=\"true\"\n        @update-filters=\"onUpdateFilters\"\n      >\n        <template #group-title=\"{ index }\">\n          <div v-if=\"hasDefaultFilters && index === 0\" :class=\"$style.defaultGroupTitle\">\n            Default Group\n            <PlBtnGhost\n              v-if=\"isFunction(props.onResetDefaultFilters)\"\n              icon=\"restart\"\n              :class=\"$style.restartBtn\"\n              @click.stop=\"props.onResetDefaultFilters()\"\n            />\n          </div>\n          <div v-else>Custom Group</div>\n        </template>\n      </PlAdvancedFilterComponent>\n    </div>\n  </PlSlideModal>\n</template>\n\n<style module>\n.root {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n.defaultGroupTitle {\n  display: flex;\n  align-items: center;\n  gap: 4px;\n}\n.restartBtn {\n  width: 24px;\n  height: 24px;\n  padding: 4px;\n  --button-width: 24px;\n  --btn-min-width: 24px;\n  --button-height: 24px;\n  --btn-min-height: 24x;\n}\n</style>\n"],"mappings":"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"}

package/dist/internal/service_factories.d.ts

@@ -4,8 +4,9 @@ export type UiServiceOptions = {
     proxy: ServiceProxy;
 };
 export declare function createUiServiceRegistry(options: UiServiceOptions): UiServiceRegistry<{
-    PFrameSpec: import('@milaboratories/pl-model-common').Branded<"pframeSpec", import('@milaboratories/pl-model-common').ServiceTypesLike<import('@milaboratories/pl-model-common').PFrameSpecDriver, import('@milaboratories/pl-model-common').PFrameSpecDriver, "wasm">>;
-    PFrame: import('@milaboratories/pl-model-common').Branded<"pframe", import('@milaboratories/pl-model-common').ServiceTypesLike<import('@milaboratories/pl-model-common').PFrameModelDriver<import('@milaboratories/pl-model-common').PColumn<string | import('@milaboratories/pl-model-common').PColumnValues | import('@milaboratories/pl-model-common').DataInfo<string>>>, import('@milaboratories/pl-model-common').PFrameDriver, "node">>;
-    Dialog: import('@milaboratories/pl-model-common').Branded<"dialog", import('@milaboratories/pl-model-common').ServiceTypesLike<Record<string, never>, import('@milaboratories/pl-model-common').DialogService, "main">>;
+    PFrameSpec: import('@milaboratories/pl-model-common').Branded<"pframeSpec", import('@milaboratories/pl-model-common').ServiceTypesLike<import('@milaboratories/pl-model-common').PFrameSpecDriver, import('@milaboratories/pl-model-common').PFrameSpecDriver, "wasm", import('@milaboratories/pl-model-common').PFrameSpecDriver, import('@milaboratories/pl-model-common').PFrameSpecDriver>>;
+    PFrame: import('@milaboratories/pl-model-common').Branded<"pframe", import('@milaboratories/pl-model-common').ServiceTypesLike<import('@milaboratories/pl-model-common').PFrameModelDriver<import('@milaboratories/pl-model-common').PColumn<string | import('@milaboratories/pl-model-common').PColumnValues | import('@milaboratories/pl-model-common').DataInfo<string>>>, import('@milaboratories/pl-model-common').PFrameDriver, "node", import('@milaboratories/pl-model-common').PFrameModelDriver<import('@milaboratories/pl-model-common').PColumn<string | import('@milaboratories/pl-model-common').PColumnValues | import('@milaboratories/pl-model-common').DataInfo<string>>>, import('@milaboratories/pl-model-common').PFrameDriver>>;
+    Dialog: import('@milaboratories/pl-model-common').Branded<"dialog", import('@milaboratories/pl-model-common').ServiceTypesLike<Record<string, never>, import('@milaboratories/pl-model-common').DialogService, "main", Record<string, never>, import('@milaboratories/pl-model-common').DialogService>>;
+    ColumnsCollection: import('@milaboratories/pl-model-common').Branded<"columnsCollection", import('@milaboratories/pl-model-common').ServiceTypesLike<import('@milaboratories/pl-model-common').ColumnsCollectionDriverModel, import('@milaboratories/pl-model-common').ColumnsCollectionDriverModel, "wasm", import('@milaboratories/pl-model-common').ColumnsCollectionDriver, import('@milaboratories/pl-model-common').ColumnsCollectionDriver>>;
 }>;
 //# sourceMappingURL=service_factories.d.ts.map

package/dist/internal/service_factories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service_factories.d.ts","sourceRoot":"","sources":["../../src/internal/service_factories.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAY,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;;;;GAMhE"}
+{"version":3,"file":"service_factories.d.ts","sourceRoot":"","sources":["../../src/internal/service_factories.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAY,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAG9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB;;;;;GAOhE"}

package/dist/internal/service_factories.js

@@ -1,14 +1,16 @@
 import { Services as e, UiServiceRegistry as t } from "@milaboratories/pl-model-common";
 import { SpecDriver as n } from "@milaboratories/pf-spec-driver";
+import { ColumnsCollectionDriverImpl as r } from "@milaboratories/columns-collection-driver";
 //#region src/internal/service_factories.ts
-function r(r) {
+function i(i) {
 	return new t(e, {
 		PFrameSpec: () => new n(),
-		PFrame: () => r.proxy(e.PFrame),
-		Dialog: () => r.proxy(e.Dialog)
+		PFrame: () => i.proxy(e.PFrame),
+		Dialog: () => i.proxy(e.Dialog),
+		ColumnsCollection: () => new r()
 	});
 }
 //#endregion
-export { r as createUiServiceRegistry };
+export { i as createUiServiceRegistry };
 
 //# sourceMappingURL=service_factories.js.map

package/dist/internal/service_factories.js.map

@@ -1 +1 @@
-{"version":3,"file":"service_factories.js","names":[],"sources":["../../src/internal/service_factories.ts"],"sourcesContent":["/**\n * UI service factories — add a factory for each new service here.\n *\n * Each entry maps a Services key to a factory function that creates the\n * UI-side driver instance:\n * - WASM services: instantiated directly (e.g. SpecDriver)\n * - Node services: proxied via IPC using NodeServiceProxy\n */\n\nimport { Services, UiServiceRegistry } from \"@milaboratories/pl-model-common\";\nimport { SpecDriver } from \"@milaboratories/pf-spec-driver\";\nimport type { ServiceProxy } from \"@platforma-sdk/model\";\n\nexport type UiServiceOptions = {\n  proxy: ServiceProxy;\n};\n\nexport function createUiServiceRegistry(options: UiServiceOptions) {\n  return new UiServiceRegistry(Services, {\n    PFrameSpec: () => new SpecDriver(),\n    PFrame: () => options.proxy(Services.PFrame),\n    Dialog: () => options.proxy(Services.Dialog),\n  });\n}\n"],"mappings":";;;AAiBA,SAAgB,EAAwB,GAA2B;AACjE,QAAO,IAAI,EAAkB,GAAU;EACrC,kBAAkB,IAAI,GAAY;EAClC,cAAc,EAAQ,MAAM,EAAS,OAAO;EAC5C,cAAc,EAAQ,MAAM,EAAS,OAAO;EAC7C,CAAC"}
+{"version":3,"file":"service_factories.js","names":[],"sources":["../../src/internal/service_factories.ts"],"sourcesContent":["/**\n * UI service factories — add a factory for each new service here.\n *\n * Each entry maps a Services key to a factory function that creates the\n * UI-side driver instance:\n * - WASM services: instantiated directly (e.g. SpecDriver)\n * - Node services: proxied via IPC using NodeServiceProxy\n */\n\nimport { Services, UiServiceRegistry } from \"@milaboratories/pl-model-common\";\nimport { SpecDriver } from \"@milaboratories/pf-spec-driver\";\nimport { ColumnsCollectionDriverImpl } from \"@milaboratories/columns-collection-driver\";\nimport type { ServiceProxy } from \"@platforma-sdk/model\";\n\nexport type UiServiceOptions = {\n  proxy: ServiceProxy;\n};\n\nexport function createUiServiceRegistry(options: UiServiceOptions) {\n  return new UiServiceRegistry(Services, {\n    PFrameSpec: () => new SpecDriver(),\n    PFrame: () => options.proxy(Services.PFrame),\n    Dialog: () => options.proxy(Services.Dialog),\n    ColumnsCollection: () => new ColumnsCollectionDriverImpl(),\n  });\n}\n"],"mappings":";;;;AAkBA,SAAgB,EAAwB,GAA2B;AACjE,QAAO,IAAI,EAAkB,GAAU;EACrC,kBAAkB,IAAI,GAAY;EAClC,cAAc,EAAQ,MAAM,EAAS,OAAO;EAC5C,cAAc,EAAQ,MAAM,EAAS,OAAO;EAC5C,yBAAyB,IAAI,GAA6B;EAC3D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.79.34",
+  "version": "1.80.1",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -26,10 +26,11 @@
     "lru-cache": "^11.2.2",
     "vue": "3.5.24",
     "zod": "~3.25.76",
-    "@milaboratories/pf-spec-driver": "1.4.18",
-    "@milaboratories/pl-model-common": "1.46.4",
-    "@milaboratories/uikit": "2.15.14",
-    "@platforma-sdk/model": "1.79.27"
+    "@milaboratories/columns-collection-driver": "0.2.0",
+    "@milaboratories/pl-model-common": "1.47.0",
+    "@milaboratories/uikit": "2.15.15",
+    "@platforma-sdk/model": "1.80.0",
+    "@milaboratories/pf-spec-driver": "1.4.20"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.2.0",
@@ -47,8 +48,8 @@
     "vitest": "^4.1.3",
     "@milaboratories/build-configs": "2.0.0",
     "@milaboratories/helpers": "1.14.3",
-    "@milaboratories/ts-configs": "1.3.0",
-    "@milaboratories/ts-builder": "1.6.0"
+    "@milaboratories/ts-builder": "1.6.0",
+    "@milaboratories/ts-configs": "1.3.0"
   },
   "scripts": {
     "dev": "ts-builder serve --target browser-lib",

package/src/components/PlAdvancedFilter/FilterEditor.vue

@@ -13,9 +13,11 @@ import type {
   AnchoredPColumnId,
   AxisFilterByIdx,
   AxisFilterValue,
+  PTableColumnId,
   SUniversalPColumnId,
 } from "@platforma-sdk/model";
 import {
+  canonicalizeJson,
   isFilteredPColumn,
   parseColumnId,
   stringifyColumnId,
@@ -102,7 +104,9 @@ function changeSourceId(newSourceId?: PlAdvancedFilterColumnId) {
   if (!newSourceId) {
     return;
   }
-  const newSourceInfo = props.columnOptions.find((v) => v.id === getSourceId(newSourceId));
+  const newSourceInfo = props.columnOptions.find((v) =>
+    columnIdEquals(v.id, getSourceId(newSourceId)),
+  );
   if (!newSourceInfo) {
     return;
   }
@@ -119,8 +123,8 @@ function changeSourceId(newSourceId?: PlAdvancedFilterColumnId) {
 }
 
 const inconsistentSourceSelected = computed(() => {
-  const selectedOption = props.columnOptions.find(
-    (op) => op.id === getSourceId(props.filter.column),
+  const selectedOption = props.columnOptions.find((op) =>
+    columnIdEquals(op.id, getSourceId(props.filter.column)),
   );
   return selectedOption === undefined;
 });
@@ -132,7 +136,13 @@ const sourceOptions = computed(() => {
   return options;
 });
 
+function isPTableColumnIdObject(c: PlAdvancedFilterColumnId): c is PTableColumnId {
+  return typeof c === "object" && c !== null;
+}
+
 function getSourceId(column: PlAdvancedFilterColumnId): PlAdvancedFilterColumnId {
+  // PTableColumnId object form: no axisFilters embedded, return as-is.
+  if (isPTableColumnIdObject(column)) return column;
   try {
     const parsedColumnId = parseColumnId(column as SUniversalPColumnId);
     if (isFilteredPColumn(parsedColumnId)) {
@@ -154,7 +164,7 @@ function getColumnAsSourceAndFixedAxes(
   column: PlAdvancedFilterColumnId,
 ): ColumnAsSourceAndFixedAxes {
   const sourceId = getSourceId(column);
-  const option = props.columnOptions.find((op) => op.id === sourceId);
+  const option = props.columnOptions.find((op) => columnIdEquals(op.id, sourceId));
   const axesToBeFixed = (option?.axesToBeFixed ?? []).reduce(
     (res, item) => {
       res[item.idx] = undefined;
@@ -162,15 +172,22 @@ function getColumnAsSourceAndFixedAxes(
     },
     {} as Record<number, AxisFilterValue | undefined>,
   );
+  // PTableColumnId object form has no axis filters baked in.
+  if (isPTableColumnIdObject(column)) {
+    return { source: column, axisFiltersByIndex: axesToBeFixed };
+  }
   try {
     const parsedColumnId = parseColumnId(column as SUniversalPColumnId);
     if (isFilteredPColumn(parsedColumnId)) {
       return {
         source: sourceId,
-        axisFiltersByIndex: parsedColumnId.axisFilters.reduce((res, item) => {
-          res[item[0]] = item[1];
-          return res;
-        }, axesToBeFixed),
+        axisFiltersByIndex: (parsedColumnId.axisFilters as AxisFilterByIdx[]).reduce(
+          (res, item) => {
+            res[item[0]] = item[1];
+            return res;
+          },
+          axesToBeFixed,
+        ),
       };
     }
   } catch {
@@ -179,12 +196,24 @@ function getColumnAsSourceAndFixedAxes(
   return { source: column, axisFiltersByIndex: axesToBeFixed };
 }
 
+/** Identity comparison for PlAdvancedFilterColumnId values — handles both string
+ *  and object (PTableColumnId) variants. */
+function columnIdEquals(a: PlAdvancedFilterColumnId, b: PlAdvancedFilterColumnId): boolean {
+  if (a === b) return true;
+  if (typeof a === "object" && typeof b === "object" && a !== null && b !== null) {
+    return canonicalizeJson(a) === canonicalizeJson(b);
+  }
+  return false;
+}
+
 function stringifyColumn(value: ColumnAsSourceAndFixedAxes): PlAdvancedFilterColumnId {
   if (Object.keys(value.axisFiltersByIndex).length === 0) {
     return value.source;
   }
+  // PTableColumnId object form can't carry axisFilters — return as-is.
+  if (isPTableColumnIdObject(value.source)) return value.source;
   return stringifyColumnId({
-    source: parseColumnId(value.source as SUniversalPColumnId) as AnchoredPColumnId,
+    source: parseColumnId(value.source as SUniversalPColumnId) as unknown as AnchoredPColumnId,
     axisFilters: Object.entries(value.axisFiltersByIndex).map(
       ([idx, value]) => [Number(idx), value] as AxisFilterByIdx,
     ),
@@ -207,7 +236,7 @@ function updateAxisFilterValue(idx: number, value: AxisFilterValue | undefined)
 }
 
 const currentOption = computed(() =>
-  props.columnOptions.find((op) => op.id === columnAsSourceAndFixedAxes.value.source),
+  props.columnOptions.find((op) => columnIdEquals(op.id, columnAsSourceAndFixedAxes.value.source)),
 );
 const currentSpec = computed(() =>
   currentOption.value?.spec ? getNormalizedSpec(currentOption.value.spec) : null,

package/src/components/PlAdvancedFilter/types.ts

@@ -13,11 +13,12 @@ import { PartialBy, RequiredBy } from "@milaboratories/helpers";
 
 export type Operand = "or" | "and";
 
-// Can be any of string type, but for better type safety we use union of specific types
+// Either a string column id (SUniversalPColumnId / canonicalized axis JSON) or
+// a structured PTableColumnId object (axis | column ref).
 export type PlAdvancedFilterColumnId =
   | SUniversalPColumnId
   | CanonicalizedJson<AxisId>
-  | CanonicalizedJson<PTableColumnId>;
+  | PTableColumnId;
 
 export type RequiredMeta = {
   id: number;

package/src/components/PlAdvancedFilter/utils.ts

@@ -29,7 +29,7 @@ export function getNewId() {
   return Date.now();
 }
 
-export function createNewGroup(selectedSourceId: string): NodeFilter {
+export function createNewGroup(selectedSourceId: PlAdvancedFilterColumnId): NodeFilter {
   return {
     id: getNewId(),
     isExpanded: true,

package/src/components/PlAgDataTable/PlAgDataTableV2.vue

@@ -2,6 +2,7 @@
 import { promiseTimeout, isJsonEqual } from "@milaboratories/helpers";
 import type {
   AxisId,
+  PlDataTableColumnsMeta,
   PlDataTableGridStateCore,
   PlDataTableStateV2,
   PlSelectionModel,
@@ -16,7 +17,6 @@ import {
   getAxisId,
   canonicalizeJson,
   isAbortError,
-  isColumnOptional,
 } from "@platforma-sdk/model";
 import type { CellRendererSelectorFunc, GridApi, GridState } from "ag-grid-enterprise";
 import { AgGridVue } from "ag-grid-vue3";
@@ -30,7 +30,7 @@ import PlAgRowCount from "./PlAgRowCount.vue";
 import { DeferredCircular, ensureNodeVisible } from "./sources/focus-row";
 import { PlAgDataTableRowNumberColId } from "./sources/row-number";
 import type { PlAgCellButtonAxisParams } from "./sources/table-source-v2";
-import { calculateGridOptions } from "./sources/table-source-v2";
+import { calculateGridOptions, effectiveVisibility } from "./sources/table-source-v2";
 import { useTableState } from "./sources/table-state-v2";
 import type {
   PlAgDataTableV2Controller,
@@ -133,6 +133,7 @@ gridOptions.value.onGridPreDestroyed = (event) => {
       makePartialState(event.api.getState()),
       gridState.value,
       event.api,
+      currentColumnsMeta(),
     );
   }
   gridApi.value = null;
@@ -145,6 +146,7 @@ gridOptions.value.onStateUpdated = (event) => {
     makePartialState(event.state),
     gridState.value,
     event.api,
+    currentColumnsMeta(),
   );
   // We have to keep initialState synchronized with gridState for gridState recovery after key updating.
   gridOptions.value.initialState = gridState.value = partialState;
@@ -219,6 +221,7 @@ function normalizeColumnVisibility(
   partialState: PlDataTableGridStateCore,
   prevState: PlDataTableGridStateCore,
   api: GridApi<PlAgDataTableV2Row>,
+  columnsMeta: PlDataTableColumnsMeta | undefined,
 ): PlDataTableGridStateCore {
   if (partialState.columnVisibility !== undefined) return partialState;
 
@@ -229,7 +232,7 @@ function normalizeColumnVisibility(
 
   // No previous explicit state → compute defaults from current columns
   // to replicate: hide: hiddenColIds?.includes(colId) ?? isColumnOptional(spec.spec)
-  const defaultHidden = getDefaultHiddenColIds(api);
+  const defaultHidden = getDefaultHiddenColIds(api, columnsMeta);
   if (defaultHidden.length > 0) {
     return { ...partialState, columnVisibility: { hiddenColIds: defaultHidden } };
   }
@@ -237,14 +240,26 @@ function normalizeColumnVisibility(
   return partialState;
 }
 
-function getDefaultHiddenColIds(api: GridApi<PlAgDataTableV2Row>): PlTableColumnIdJson[] {
+/** Sidecar display meta is only on the `model` branch of the settings union. */
+function currentColumnsMeta(): PlDataTableColumnsMeta | undefined {
+  return "model" in props.settings ? props.settings.model?.columnsMeta : undefined;
+}
+
+function getDefaultHiddenColIds(
+  api: GridApi<PlAgDataTableV2Row>,
+  columnsMeta: PlDataTableColumnsMeta | undefined,
+): PlTableColumnIdJson[] {
   const cols = api.getAllGridColumns();
   if (!cols) return [];
 
   return cols
     .filter((col) => {
       const spec = col.getColDef().context as PTableColumnSpec | undefined;
-      return spec !== undefined && spec.type === "column" && isColumnOptional(spec.spec);
+      return (
+        spec !== undefined &&
+        spec.type === "column" &&
+        effectiveVisibility(spec, columnsMeta) === "optional"
+      );
     })
     .map((col) => col.getColId() as PlTableColumnIdJson);
 }
@@ -426,6 +441,7 @@ watch(
         pfDriver: getRawPlatformaInstance().pFrameDriver,
         fullTableHandle: settings.model?.fullTableHandle,
         visibleTableHandle: settings.model?.visibleTableHandle,
+        columnsMeta: settings.model?.columnsMeta,
         sheets: settings.sheets ?? [],
         dataRenderedTracker,
         hiddenColIds: gridState.value.columnVisibility?.hiddenColIds,