@platforma-sdk/ui-vue 1.58.17 → 1.58.19

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

@@ -1,39 +1,43 @@
 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, createTextVNode as s, createVNode as c, defineComponent as l, mergeModels as u, normalizeClass as d, onMounted as f, openBlock as p, ref as m, unref as h, useModel as g, withCtx as _, withModifiers as v } from "vue";
-import { Annotation as y, Domain as b, canonicalizeJson as x, getAxisId as S, parseJson as C, readAnnotation as w, readDomain as T } from "@platforma-sdk/model";
-import { PlBtnGhost as E, PlSlideModal as D, usePlBlockPageTitleTeleportTarget as O } from "@milaboratories/uikit";
-var k = { key: 1 }, A = /* @__PURE__ */ l({
+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, mergeModels as d, normalizeClass as f, onMounted as p, openBlock as m, ref as h, unref as g, useModel as _, withCtx as v, withModifiers as y } from "vue";
+import { Annotation as b, Domain as x, canonicalizeJson as S, getAxisId as C, getUniqueSourceValuesWithLabels as w, parseJson as T, readAnnotation as E, readDomain as D } from "@platforma-sdk/model";
+import { PlBtnGhost as O, PlSlideModal as k, usePlBlockPageTitleTeleportTarget as A } from "@milaboratories/uikit";
+import { isNil as j } from "es-toolkit";
+var M = /* @__PURE__ */ u({
 	__name: "PlTableFiltersV2",
-	props: /* @__PURE__ */ u({ columns: {} }, {
+	props: /* @__PURE__ */ d({
+		pframeHandle: {},
+		columns: {}
+	}, {
 		modelValue: { required: !0 },
 		modelModifiers: {}
 	}),
 	emits: ["update:modelValue"],
-	setup(l) {
-		let u = g(l, "modelValue"), A = l, j = m(!1);
-		f(() => {
-			j.value = !0;
+	setup(u) {
+		let d = _(u, "modelValue"), M = u, N = h(!1);
+		p(() => {
+			N.value = !0;
 		});
-		let M = O("PlTableFiltersV2"), N = m(!1), P = r(() => u.value.filters.length > 0);
-		function F(e) {
-			return x(e.type === "axis" ? {
+		let P = A("PlTableFiltersV2"), F = h(!1), I = r(() => d.value.filters.length > 0);
+		function L(e) {
+			return S(e.type === "axis" ? {
 				type: "axis",
-				id: S(e.spec)
+				id: C(e.spec)
 			} : {
 				type: "column",
 				id: e.id
 			});
 		}
-		let I = r(() => A.columns.map((e, t) => {
-			let n = F(e), r = w(e.spec, y.Label)?.trim() ?? `Unlabeled ${e.type} ${t}`, i = T(e.spec, b.Alphabet) ?? w(e.spec, y.Alphabet);
+		let R = r(() => M.columns.map((e, t) => {
+			let n = L(e), r = E(e.spec, b.Label)?.trim() ?? `Unlabeled ${e.type} ${t}`, i = D(e.spec, x.Alphabet) ?? E(e.spec, b.Alphabet);
 			return {
 				id: n,
 				label: r,
 				spec: e.spec,
 				alphabet: i ?? void 0
 			};
-		})), L = [
+		})), z = [
 			"isNA",
 			"isNotNA",
 			"greaterThan",
@@ -49,51 +53,46 @@ var k = { key: 1 }, A = /* @__PURE__ */ l({
 			"equal",
 			"notEqual"
 		];
-		function R(e) {
-			let t = I.value.find((t) => t.id === e.columnId);
-			if (!t) return [];
-			let n = w(t.spec, y.DiscreteValues);
-			if (!n) return [];
-			try {
-				return C(n).filter((t) => e.searchStr ? String(t).toLowerCase().includes(e.searchStr.toLowerCase()) : !0).map((e) => ({
-					value: e,
-					label: String(e)
-				}));
-			} catch {
-				return [];
-			}
+		function B(e) {
+			if (j(M.pframeHandle)) return console.warn("PFrame handle is not available, cannot fetch suggest options"), [];
+			let t = e.columnId, n = T(t);
+			if (n.type !== "column") throw Error("ColumnId should be of type 'column' for suggest options");
+			return w(M.pframeHandle, {
+				columnId: n.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);
 		}
-		return (r, l) => (p(), o(t, null, [j.value && h(M) ? (p(), i(n, {
+		return (r, u) => (m(), o(t, null, [N.value && g(P) ? (m(), i(n, {
 			key: 0,
-			to: h(M)
-		}, [c(h(E), {
-			icon: P.value ? "filter-on" : "filter",
-			onClick: l[0] ||= v((e) => N.value = !0, ["stop"])
+			to: g(P)
+		}, [l(g(O), {
+			icon: I.value ? "filter-on" : "filter",
+			onClick: u[0] ||= y((e) => F.value = !0, ["stop"])
 		}, {
-			default: _(() => [...l[3] ||= [s(" Filters ", -1)]]),
+			default: v(() => [...u[3] ||= [c(" Filters ", -1)]]),
 			_: 1
-		}, 8, ["icon"])], 8, ["to"])) : a("", !0), c(h(D), {
-			modelValue: N.value,
-			"onUpdate:modelValue": l[2] ||= (e) => N.value = e,
+		}, 8, ["icon"])], 8, ["to"])) : a("", !0), l(g(k), {
+			modelValue: F.value,
+			"onUpdate:modelValue": u[2] ||= (e) => F.value = e,
 			"close-on-outside-click": !1
 		}, {
-			title: _(() => [...l[4] ||= [s("Manage Filters", -1)]]),
-			default: _(() => [I.value.length > 0 ? (p(), o("div", {
-				key: 0,
-				class: d(r.$style.root)
-			}, [c(h(e), {
-				filters: u.value,
-				"onUpdate:filters": l[1] ||= (e) => u.value = e,
-				items: I.value,
-				"supported-filters": L,
-				"get-suggest-options": R,
+			title: v(() => [...u[4] ||= [c("Manage Filters", -1)]]),
+			default: v(() => [s("div", { class: f(r.$style.root) }, [l(g(e), {
+				filters: d.value,
+				"onUpdate:filters": u[1] ||= (e) => d.value = e,
+				items: R.value,
+				"supported-filters": z,
+				"get-suggest-options": B,
 				"enable-dnd": !1,
 				"enable-add-group-button": !0
-			}, null, 8, ["filters", "items"])], 2)) : (p(), o("div", k, "No filters applicable"))]),
+			}, null, 8, ["filters", "items"])], 2)]),
 			_: 1
 		}, 8, ["modelValue"])], 64));
 	}
 });
-export { A as default };
+export { M 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  PTableColumnId,\n  ListOptionBase,\n  PlDataTableFiltersWithMeta,\n} from \"@platforma-sdk/model\";\nimport {\n  canonicalizeJson,\n  Annotation,\n  Domain,\n  readAnnotation,\n  readDomain,\n  parseJson,\n  getAxisId,\n} from \"@platforma-sdk/model\";\nimport { computed, onMounted, 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\";\n\nconst model = defineModel<PlDataTableFiltersWithMeta>({ required: true });\nconst props = defineProps<{\n  columns: PTableColumnSpec[];\n}>();\n\n// Teleport for \"Filters\" button\nconst mounted = ref(false);\nonMounted(() => {\n  mounted.value = true;\n});\nconst teleportTarget = usePlBlockPageTitleTeleportTarget(\"PlTableFiltersV2\");\nconst showManager = ref(false);\n\n// Check if any filters are active\nconst filtersOn = computed(() => {\n  return model.value.filters.length > 0;\n});\n\n// Convert PTableColumnSpec to PlAdvancedFilterColumnId\nfunction makeFilterColumnId(spec: PTableColumnSpec): PlAdvancedFilterColumnId {\n  const id: PTableColumnId =\n    spec.type === \"axis\"\n      ? { type: \"axis\", id: getAxisId(spec.spec) }\n      : { type: \"column\", id: spec.id };\n  return canonicalizeJson<PTableColumnId>(id) as unknown as PlAdvancedFilterColumnId;\n}\n\n// Convert PTableColumnSpec[] to PlAdvancedFilterItem[]\nconst items = 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 getSuggestOptions(params: {\n  columnId: PlAdvancedFilterColumnId;\n  axisIdx?: number;\n  searchStr: string;\n  searchType: \"value\" | \"label\";\n}): ListOptionBase<string | number>[] {\n  const item = items.value.find((i) => i.id === params.columnId);\n  if (!item) return [];\n\n  const discreteValuesStr = readAnnotation(item.spec, Annotation.DiscreteValues);\n  if (!discreteValuesStr) return [];\n\n  try {\n    const values = parseJson<(string | number)[]>(discreteValuesStr);\n    return values\n      .filter((v) => {\n        if (!params.searchStr) return true;\n        const str = String(v).toLowerCase();\n        return str.includes(params.searchStr.toLowerCase());\n      })\n      .map((v) => ({ value: v, label: String(v) }));\n  } catch {\n    return [];\n  }\n}\n</script>\n\n<template>\n  <Teleport v-if=\"mounted && teleportTarget\" :to=\"teleportTarget\">\n    <PlBtnGhost :icon=\"filtersOn ? 'filter-on' : 'filter'\" @click.stop=\"showManager = true\">\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 v-if=\"items.length > 0\" :class=\"$style.root\">\n      <PlAdvancedFilterComponent\n        v-model:filters=\"model as PlAdvancedFilter\"\n        :items=\"items\"\n        :supported-filters=\"supportedFilters\"\n        :get-suggest-options=\"getSuggestOptions\"\n        :enable-dnd=\"false\"\n        :enable-add-group-button=\"true\"\n      />\n    </div>\n    <div v-else>No filters applicable</div>\n  </PlSlideModal>\n</template>\n\n<style module>\n.root {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n</style>\n"],"mappings":";;;;;;;;;;;;;EA0BA,IAAM,IAAQ,EAAuC,GAAA,aAAoB,EACnE,IAAQ,GAKR,IAAU,EAAI,GAAM;AAC1B,UAAgB;AACd,KAAQ,QAAQ;IAChB;EACF,IAAM,IAAiB,EAAkC,mBAAmB,EACtE,IAAc,EAAI,GAAM,EAGxB,IAAY,QACT,EAAM,MAAM,QAAQ,SAAS,EACpC;EAGF,SAAS,EAAmB,GAAkD;AAK5E,UAAO,EAHL,EAAK,SAAS,SACV;IAAE,MAAM;IAAQ,IAAI,EAAU,EAAK,KAAK;IAAC,GACzC;IAAE,MAAM;IAAU,IAAI,EAAK;IAAI,CACM;;EAI7C,IAAM,IAAQ,QACL,EAAM,QAAQ,KAAK,GAAK,MAAQ;GACrC,IAAM,IAAK,EAAmB,EAAI,EAC5B,IACJ,EAAe,EAAI,MAAM,EAAW,MAAM,EAAE,MAAM,IAAI,aAAa,EAAI,KAAK,GAAG,KAC3E,IACJ,EAAW,EAAI,MAAM,EAAO,SAAS,IAAI,EAAe,EAAI,MAAM,EAAW,SAAS;AACxF,UAAO;IACL;IACA;IACA,MAAM,EAAI;IACV,UAAU,KAAY,KAAA;IACvB;IACD,CACF,EAGI,IAAmB;GACvB;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACD;EAGD,SAAS,EAAkB,GAKW;GACpC,IAAM,IAAO,EAAM,MAAM,MAAM,MAAM,EAAE,OAAO,EAAO,SAAS;AAC9D,OAAI,CAAC,EAAM,QAAO,EAAE;GAEpB,IAAM,IAAoB,EAAe,EAAK,MAAM,EAAW,eAAe;AAC9E,OAAI,CAAC,EAAmB,QAAO,EAAE;AAEjC,OAAI;AAEF,WADe,EAA+B,EAAkB,CAE7D,QAAQ,MACF,EAAO,YACA,OAAO,EAAE,CAAC,aAAa,CACxB,SAAS,EAAO,UAAU,aAAa,CAAC,GAFrB,GAG/B,CACA,KAAK,OAAO;KAAE,OAAO;KAAG,OAAO,OAAO,EAAE;KAAE,EAAE;WACzC;AACN,WAAO,EAAE;;;qCAMK,EAAA,SAAW,EAAA,EAAc,IAAA,GAAA,EAAzC,EAIW,GAAA;;GAJiC,IAAI,EAAA,EAAc;MAC5D,EAEa,EAAA,EAAA,EAAA;GAFA,MAAM,EAAA,QAAS,cAAA;GAA4B,SAAK,AAAA,EAAA,OAAA,GAAA,MAAO,EAAA,QAAW,IAAA,CAAA,OAAA,CAAA;;oBAE/E,CAAA,GAAA,AAAA,EAAA,OAAA,CAAA,EAFwF,aAExF,GAAA,CAAA,CAAA,CAAA;;6CAGF,EAce,EAAA,EAAA,EAAA;eAdQ,EAAA;4CAAW,QAAA;GAAG,0BAAwB;;GAChD,OAAK,QAAe,CAAA,GAAA,AAAA,EAAA,OAAA,CAAA,EAAd,kBAAc,GAAA,CAAA,CAAA,CAAA;oBAWzB,CATK,EAAA,MAAM,SAAM,KAAA,GAAA,EAAvB,EASM,OAAA;;IATwB,OAAK,EAAEA,EAAAA,OAAO,KAAI;OAC9C,EAOE,EAAA,EAAA,EAAA;IANQ,SAAS,EAAA;0CAAA,QAAK;IACrB,OAAO,EAAA;IACP,qBAAmB;IACnB,uBAAqB;IACrB,cAAY;IACZ,2BAAyB;mDAG9B,EAAuC,OAAA,GAA3B,wBAAqB,EAAA,CAAA"}
+{"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  getAxisId,\n  getUniqueSourceValuesWithLabels,\n  parseJson,\n} from \"@platforma-sdk/model\";\nimport { computed, onMounted, 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 { isNil } from \"es-toolkit\";\n\nconst model = defineModel<PlDataTableFiltersWithMeta>({ required: true });\nconst props = defineProps<{\n  pframeHandle: Nil | PFrameHandle;\n  columns: PTableColumnSpec[];\n}>();\n\n// Teleport for \"Filters\" button\nconst mounted = ref(false);\nonMounted(() => {\n  mounted.value = true;\n});\nconst teleportTarget = usePlBlockPageTitleTeleportTarget(\"PlTableFiltersV2\");\nconst showManager = ref(false);\n\n// Check if any filters are active\nconst filtersOn = computed(() => {\n  return model.value.filters.length > 0;\n});\n\nfunction makeFilterColumnId(spec: PTableColumnSpec): CanonicalizedJson<PTableColumnId> {\n  const id: PTableColumnId =\n    spec.type === \"axis\"\n      ? { type: \"axis\", id: getAxisId(spec.spec) }\n      : { type: \"column\", id: spec.id };\n  return canonicalizeJson<PTableColumnId>(id);\n}\n\nconst items = 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\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</script>\n\n<template>\n  <Teleport v-if=\"mounted && teleportTarget\" :to=\"teleportTarget\">\n    <PlBtnGhost :icon=\"filtersOn ? 'filter-on' : 'filter'\" @click.stop=\"showManager = true\">\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        v-model:filters=\"model as PlAdvancedFilter\"\n        :items=\"items\"\n        :supported-filters=\"supportedFilters\"\n        :get-suggest-options=\"handleSuggestOptions\"\n        :enable-dnd=\"false\"\n        :enable-add-group-button=\"true\"\n      />\n    </div>\n  </PlSlideModal>\n</template>\n\n<style module>\n.root {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n</style>\n"],"mappings":";;;;;;;;;;;;;;;;;EA8BA,IAAM,IAAQ,EAAuC,GAAA,aAAoB,EACnE,IAAQ,GAMR,IAAU,EAAI,GAAM;AAC1B,UAAgB;AACd,KAAQ,QAAQ;IAChB;EACF,IAAM,IAAiB,EAAkC,mBAAmB,EACtE,IAAc,EAAI,GAAM,EAGxB,IAAY,QACT,EAAM,MAAM,QAAQ,SAAS,EACpC;EAEF,SAAS,EAAmB,GAA2D;AAKrF,UAAO,EAHL,EAAK,SAAS,SACV;IAAE,MAAM;IAAQ,IAAI,EAAU,EAAK,KAAK;IAAC,GACzC;IAAE,MAAM;IAAU,IAAI,EAAK;IAAI,CACM;;EAG7C,IAAM,IAAQ,QACL,EAAM,QAAQ,KAAK,GAAK,MAAQ;GACrC,IAAM,IAAK,EAAmB,EAAI,EAC5B,IACJ,EAAe,EAAI,MAAM,EAAW,MAAM,EAAE,MAAM,IAAI,aAAa,EAAI,KAAK,GAAG,KAC3E,IACJ,EAAW,EAAI,MAAM,EAAO,SAAS,IAAI,EAAe,EAAI,MAAM,EAAW,SAAS;AACxF,UAAO;IACL;IACA;IACA,MAAM,EAAI;IACV,UAAU,KAAY,KAAA;IACvB;IACD,CACF,EAGI,IAAmB;GACvB;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACD;EAED,SAAS,EAAqB,GAK3B;AACD,OAAI,EAAM,EAAM,aAAa,CAE3B,QADA,QAAQ,KAAK,+DAA+D,EACrE,EAAE;GAGX,IAAM,IAAQ,EAAO,UACf,IAAgB,EAA0B,EAAM;AAEtD,OAAI,EAAc,SAAS,SACzB,OAAU,MAAM,0DAA0D;AAG5E,UAAO,EAAgC,EAAM,cAAc;IACzD,UAAU,EAAc;IACxB,SAAS,EAAO;IAChB,OAAO;IACP,aAAa,EAAO,eAAe,UAAU,EAAO,YAAY,KAAA;IAChE,kBAAkB,EAAO,eAAe,UAAU,EAAO,YAAY,KAAA;IACtE,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO;;qCAKR,EAAA,SAAW,EAAA,EAAc,IAAA,GAAA,EAAzC,EAIW,GAAA;;GAJiC,IAAI,EAAA,EAAc;MAC5D,EAEa,EAAA,EAAA,EAAA;GAFA,MAAM,EAAA,QAAS,cAAA;GAA4B,SAAK,AAAA,EAAA,OAAA,GAAA,MAAO,EAAA,QAAW,IAAA,CAAA,OAAA,CAAA;;oBAE/E,CAAA,GAAA,AAAA,EAAA,OAAA,CAAA,EAFwF,aAExF,GAAA,CAAA,CAAA,CAAA;;6CAGF,EAae,EAAA,EAAA,EAAA;eAbQ,EAAA;4CAAW,QAAA;GAAG,0BAAwB;;GAChD,OAAK,QAAe,CAAA,GAAA,AAAA,EAAA,OAAA,CAAA,EAAd,kBAAc,GAAA,CAAA,CAAA,CAAA;oBAWzB,CATN,EASM,OAAA,EATA,OAAK,EAAEA,EAAAA,OAAO,KAAI,EAAA,EAAA,CACtB,EAOE,EAAA,EAAA,EAAA;IANQ,SAAS,EAAA;0CAAA,QAAK;IACrB,OAAO,EAAA;IACP,qBAAmB;IACnB,uBAAqB;IACrB,cAAY;IACZ,2BAAyB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.58.17",
+  "version": "1.58.19",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -25,8 +25,8 @@
     "lru-cache": "^11.2.2",
     "vue": "^3.5.24",
     "zod": "~3.23.8",
-    "@milaboratories/uikit": "2.10.41",
-    "@platforma-sdk/model": "1.58.11"
+    "@milaboratories/uikit": "2.10.42",
+    "@platforma-sdk/model": "1.58.19"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.2.0",
@@ -40,9 +40,9 @@
     "typescript": "~5.9.3",
     "vite": "8.0.0-beta.15",
     "vitest": "^4.0.18",
-    "@milaboratories/helpers": "1.13.6",
-    "@milaboratories/ts-configs": "1.2.2",
     "@milaboratories/build-configs": "1.5.2",
+    "@milaboratories/helpers": "1.13.7",
+    "@milaboratories/ts-configs": "1.2.2",
     "@milaboratories/ts-builder": "1.3.0"
   },
   "scripts": {

package/src/components/PlAdvancedFilter/FilterEditor.vue

@@ -336,27 +336,24 @@ const stringMatchesError = computed(() => {
 
     <!-- bottom element - individual settings for every filter type -->
     <div :class="$style.bottom">
-      <template v-if="filter.type === 'patternEquals' || filter.type === 'patternNotEquals'">
-        <PlAutocomplete
-          v-model="filter.value"
-          :options-search="
-            (str, type) => getSuggestOptionsFn(columnAsSourceAndFixedAxes.source, type, str)
-          "
-          :disabled="inconsistentSourceSelected"
-          :clearable="true"
-          group-position="bottom"
-        />
-      </template>
-      <template v-if="filter.type === 'inSet' || filter.type === 'notInSet'">
-        <PlAutocompleteMulti
-          v-model="filter.value"
-          :options-search="
-            (str, type) => getMultiSuggestOptionsFn(columnAsSourceAndFixedAxes.source, type, str)
-          "
-          :disabled="inconsistentSourceSelected"
-          group-position="bottom"
-        />
-      </template>
+      <PlAutocomplete
+        v-if="filter.type === 'patternEquals' || filter.type === 'patternNotEquals'"
+        v-model="filter.value"
+        :options-search="
+          (str, type) => getSuggestOptionsFn(columnAsSourceAndFixedAxes.source, type, str)
+        "
+        :clearable="true"
+        group-position="bottom"
+      />
+      <PlAutocompleteMulti
+        v-if="filter.type === 'inSet' || filter.type === 'notInSet'"
+        v-model="filter.value"
+        :options-search="
+          (str, type) => getMultiSuggestOptionsFn(columnAsSourceAndFixedAxes.source, type, str)
+        "
+        :disabled="inconsistentSourceSelected"
+        group-position="bottom"
+      />
       <PlNumberField v-if="isNumericFilter(filter)" v-model="filter.x" group-position="bottom" />
       <PlNumberField v-if="isPositionFilter(filter)" v-model="filter.n" group-position="bottom" />
       <PlTextField

package/src/components/PlAdvancedFilter/types.ts

@@ -5,13 +5,18 @@ import type {
   FilterSpec,
   FilterSpecLeaf,
   PColumnSpec,
+  PTableColumnId,
   SUniversalPColumnId,
 } from "@platforma-sdk/model";
 import type { SUPPORTED_FILTER_TYPES } from "./constants";
 
 export type Operand = "or" | "and";
 
-export type PlAdvancedFilterColumnId = SUniversalPColumnId | CanonicalizedJson<AxisId>;
+// Can be any of string type, but for better type safety we use union of specific types
+export type PlAdvancedFilterColumnId =
+  | SUniversalPColumnId
+  | CanonicalizedJson<AxisId>
+  | CanonicalizedJson<PTableColumnId>;
 
 export type RequiredMeta = { id: number; isExpanded?: boolean };
 

package/src/components/PlAgDataTable/PlAgDataTableV2.vue

@@ -533,6 +533,7 @@ watchEffect(() => {
     <PlTableFiltersV2
       v-if="!disableFiltersPanel"
       v-model="filtersState"
+      :pframe-handle="'model' in settings ? settings?.model?.fullPframeHandle : undefined"
       :columns="filterableColumns"
     />
     <PlAgCsvExporter v-if="gridApi && showExportButton" :api="gridApi" />

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

@@ -48,12 +48,16 @@ export function useTableState(
       const defaultState = makeDefaultState();
 
       const sourceId = settings.value.sourceId;
-      if (!sourceId) return defaultState;
+      const undefinedSourceId = "error" in settings.value && settings.value.error == null;
+      if (!sourceId && undefinedSourceId) return defaultState;
+
+      const suitableSourceId = sourceId ?? tableStateNormalized.value.stateCache.at(-1)?.sourceId;
+      if (!suitableSourceId) return defaultState;
 
       const cachedState = tableStateNormalized.value.stateCache.find(
-        (entry) => entry.sourceId === sourceId,
+        (entry) => entry.sourceId === suitableSourceId,
       );
-      if (!cachedState) return { ...defaultState, sourceId };
+      if (!cachedState) return { ...defaultState, sourceId: suitableSourceId };
 
       return cachedState;
     },
@@ -70,12 +74,11 @@ export function useTableState(
           (entry) => entry.sourceId === state.sourceId,
         );
         if (stateIdx !== -1) {
-          newState.stateCache[stateIdx] = state;
-        } else {
-          const CacheDepth = 5;
-          newState.stateCache.push(state);
-          newState.stateCache = newState.stateCache.slice(-CacheDepth);
+          newState.stateCache.splice(stateIdx, 1);
         }
+        const CacheDepth = 5;
+        newState.stateCache.push(state);
+        newState.stateCache = newState.stateCache.slice(-CacheDepth);
       }
 
       if (!isJsonEqual(tableStateNormalized.value, newState)) {

package/src/components/PlAgDataTable/types.ts

@@ -8,6 +8,7 @@ import {
   type PTableKey,
   type PTableValue,
   type OutputWithStatus,
+  type ErrorLike,
 } from "@platforma-sdk/model";
 import type { PTableHidden } from "./sources/common";
 import type { ComputedRef, MaybeRefOrGetter } from "vue";
@@ -16,7 +17,7 @@ import canonicalize from "canonicalize";
 import { deepClone } from "@milaboratories/helpers";
 
 export type PlDataTableSettingsV2Base =
-  | { sourceId: null; pending: boolean }
+  | { sourceId: null; pending: boolean; error: null | ErrorLike[] }
   | {
       /** Unique source id for state caching */
       sourceId: string;
@@ -66,7 +67,7 @@ export function usePlDataTableSettingsV2<T>(
 
     if (!model.ok) {
       model.errors.forEach((e) => console.error("Error in PlDataTableModel:", e));
-      settingsBase = { sourceId: null, pending: false };
+      settingsBase = { sourceId: null, pending: false, error: model.errors };
     } else if ("sourceId" in options) {
       const sourceIdValue = deepClone(toValue(options.sourceId));
       if (options.sheets) {
@@ -78,7 +79,7 @@ export function usePlDataTableSettingsV2<T>(
                 sheets: sheetsValue,
                 model: model.value,
               }
-            : { sourceId: null, pending: !model.stable };
+            : { sourceId: null, pending: !model.stable, error: null };
       } else {
         settingsBase = sourceIdValue
           ? {
@@ -86,7 +87,7 @@ export function usePlDataTableSettingsV2<T>(
               sheets: [],
               model: model.value,
             }
-          : { sourceId: null, pending: !model.stable };
+          : { sourceId: null, pending: !model.stable, error: null };
       }
     } else {
       if (options.sheets) {
@@ -97,7 +98,7 @@ export function usePlDataTableSettingsV2<T>(
               sheets: sheetsValue,
               model: model.value,
             }
-          : { sourceId: null, pending: !model.stable };
+          : { sourceId: null, pending: !model.stable, error: null };
       } else {
         settingsBase = model.value
           ? {
@@ -105,7 +106,7 @@ export function usePlDataTableSettingsV2<T>(
               sheets: [],
               model: model.value,
             }
-          : { sourceId: null, pending: !model.stable };
+          : { sourceId: null, pending: !model.stable, error: null };
       }
     }
     return settingsBase;

package/src/components/PlTableFilters/PlTableFiltersV2.vue

@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import type {
   PTableColumnSpec,
-  PTableColumnId,
-  ListOptionBase,
   PlDataTableFiltersWithMeta,
+  PFrameHandle,
+  PTableColumnId,
+  CanonicalizedJson,
 } from "@platforma-sdk/model";
 import {
   canonicalizeJson,
@@ -11,8 +12,9 @@ import {
   Domain,
   readAnnotation,
   readDomain,
-  parseJson,
   getAxisId,
+  getUniqueSourceValuesWithLabels,
+  parseJson,
 } from "@platforma-sdk/model";
 import { computed, onMounted, ref } from "vue";
 import { PlBtnGhost, PlSlideModal, usePlBlockPageTitleTeleportTarget } from "@milaboratories/uikit";
@@ -23,9 +25,12 @@ import {
   type PlAdvancedFilterItem,
 } from "../PlAdvancedFilter";
 import type { PlAdvancedFilterColumnId } from "../PlAdvancedFilter/types";
+import type { Nil } from "@milaboratories/helpers";
+import { isNil } from "es-toolkit";
 
 const model = defineModel<PlDataTableFiltersWithMeta>({ required: true });
 const props = defineProps<{
+  pframeHandle: Nil | PFrameHandle;
   columns: PTableColumnSpec[];
 }>();
 
@@ -42,16 +47,14 @@ const filtersOn = computed(() => {
   return model.value.filters.length > 0;
 });
 
-// Convert PTableColumnSpec to PlAdvancedFilterColumnId
-function makeFilterColumnId(spec: PTableColumnSpec): PlAdvancedFilterColumnId {
+function makeFilterColumnId(spec: PTableColumnSpec): CanonicalizedJson<PTableColumnId> {
   const id: PTableColumnId =
     spec.type === "axis"
       ? { type: "axis", id: getAxisId(spec.spec) }
       : { type: "column", id: spec.id };
-  return canonicalizeJson<PTableColumnId>(id) as unknown as PlAdvancedFilterColumnId;
+  return canonicalizeJson<PTableColumnId>(id);
 }
 
-// Convert PTableColumnSpec[] to PlAdvancedFilterItem[]
 const items = computed<PlAdvancedFilterItem[]>(() => {
   return props.columns.map((col, idx) => {
     const id = makeFilterColumnId(col);
@@ -86,31 +89,31 @@ const supportedFilters = [
   "notEqual",
 ] as (typeof PlAdvancedFilterSupportedFilters)[number][];
 
-// getSuggestOptions - provide discrete values from column annotations
-function getSuggestOptions(params: {
+function handleSuggestOptions(params: {
   columnId: PlAdvancedFilterColumnId;
   axisIdx?: number;
   searchStr: string;
   searchType: "value" | "label";
-}): ListOptionBase<string | number>[] {
-  const item = items.value.find((i) => i.id === params.columnId);
-  if (!item) return [];
+}) {
+  if (isNil(props.pframeHandle)) {
+    console.warn("PFrame handle is not available, cannot fetch suggest options");
+    return [];
+  }
 
-  const discreteValuesStr = readAnnotation(item.spec, Annotation.DiscreteValues);
-  if (!discreteValuesStr) return [];
+  const strId = params.columnId as CanonicalizedJson<PTableColumnId>;
+  const tableColumnId = parseJson<PTableColumnId>(strId);
 
-  try {
-    const values = parseJson<(string | number)[]>(discreteValuesStr);
-    return values
-      .filter((v) => {
-        if (!params.searchStr) return true;
-        const str = String(v).toLowerCase();
-        return str.includes(params.searchStr.toLowerCase());
-      })
-      .map((v) => ({ value: v, label: String(v) }));
-  } catch {
-    return [];
+  if (tableColumnId.type !== "column") {
+    throw new Error("ColumnId should be of type 'column' for suggest options");
   }
+
+  return getUniqueSourceValuesWithLabels(props.pframeHandle, {
+    columnId: tableColumnId.id,
+    axisIdx: params.axisIdx,
+    limit: 100,
+    searchQuery: params.searchType === "label" ? params.searchStr : undefined,
+    searchQueryValue: params.searchType === "value" ? params.searchStr : undefined,
+  }).then((v) => v.values);
 }
 </script>
 
@@ -124,17 +127,16 @@ function getSuggestOptions(params: {
   <PlSlideModal v-model="showManager" :close-on-outside-click="false">
     <template #title>Manage Filters</template>
 
-    <div v-if="items.length > 0" :class="$style.root">
+    <div :class="$style.root">
       <PlAdvancedFilterComponent
         v-model:filters="model as PlAdvancedFilter"
         :items="items"
         :supported-filters="supportedFilters"
-        :get-suggest-options="getSuggestOptions"
+        :get-suggest-options="handleSuggestOptions"
         :enable-dnd="false"
         :enable-add-group-button="true"
       />
     </div>
-    <div v-else>No filters applicable</div>
   </PlSlideModal>
 </template>