@platforma-sdk/ui-vue 1.45.34 → 1.45.35

package/dist/components/PlAdvancedFilter/utils.js

@@ -0,0 +1,150 @@
+import { getTypeFromPColumnOrAxisSpec as c, parseJson as g, isFilteredPColumn as E, isAnchoredPColumnId as f, isAxisId as q, assertNever as x } from "@platforma-sdk/model";
+import { isSupportedFilterType as T } from "./types.js";
+import { DEFAULT_FILTERS as S, DEFAULT_FILTER_TYPE as h, SUPPORTED_FILTER_TYPES as d } from "./constants.js";
+import { filterUiMetadata as m } from "@milaboratories/uikit";
+import { ref as v, watch as o } from "vue";
+function s(e) {
+  return !("column" in e) || e.type === void 0 || !T(e.type) ? null : e.type === "patternFuzzyContainSubsequence" ? {
+    ...e,
+    value: e.value,
+    wildcard: e.wildcard,
+    maxEdits: e.maxEdits ?? 2,
+    substitutionsOnly: e.substitutionsOnly ?? !1
+  } : { ...e };
+}
+let i = 0;
+function u() {
+  return i++, String(i);
+}
+function p(e) {
+  if (e.type === "not") {
+    const n = p(e.filter);
+    return n ? {
+      not: !n.not,
+      operand: n.operand,
+      filters: n.filters,
+      id: u(),
+      expanded: n.expanded
+    } : null;
+  }
+  if (e.type === "and" || e.type === "or")
+    return {
+      operand: e.type,
+      not: !1,
+      filters: e.filters.map((n) => s(n)).filter((n) => n !== null),
+      id: u(),
+      expanded: e.expanded ?? !0
+    };
+  if (d.has(e.type)) {
+    const n = s(e);
+    return {
+      operand: "or",
+      not: !1,
+      filters: n ? [n] : [],
+      id: u(),
+      expanded: e.expanded ?? !0
+    };
+  }
+  return null;
+}
+function z(e) {
+  const n = {
+    operand: "or",
+    groups: []
+  };
+  if (e.type === "not")
+    return n;
+  if (e.type === "and" || e.type === "or")
+    n.operand = e.type, n.groups = e.filters.map(p).filter((t) => t !== null);
+  else if (d.has(e.type)) {
+    const t = p(e);
+    n.groups = t ? [t] : [];
+  }
+  return n.groups = n.groups.filter((t) => t.filters.length > 0), n;
+}
+function I(e) {
+  if (e.type === "isNA" || e.type === "isNotNA" || e.type === "inSet" || e.type === "notInSet")
+    return e;
+  if (e.type === "greaterThanOrEqual" || e.type === "lessThanOrEqual" || e.type === "greaterThan" || e.type === "lessThan" || e.type === "equal" || e.type === "notEqual")
+    return e.x !== void 0 ? { ...e, x: e.x } : null;
+  if (e.type === "patternEquals" || e.type === "patternNotEquals" || e.type === "patternContainSubsequence" || e.type === "patternNotContainSubsequence" || e.type === "patternMatchesRegularExpression" || e.type === "patternFuzzyContainSubsequence")
+    return e.value !== void 0 ? { ...e, value: e.value } : null;
+  x(e.type);
+}
+function C(e) {
+  const n = {
+    type: e.operand,
+    expanded: e.expanded,
+    filters: e.filters.map(I).filter((t) => t !== null)
+  };
+  return e.not ? {
+    type: "not",
+    filter: n
+  } : n;
+}
+function A(e) {
+  return {
+    type: e.operand,
+    filters: e.groups.map(C)
+  };
+}
+function P(e) {
+  return {
+    id: u(),
+    not: !1,
+    operand: "and",
+    expanded: !0,
+    filters: [{
+      ...S[h],
+      column: e
+    }]
+  };
+}
+function R(e) {
+  return { valueType: c(e), annotations: e.annotations, domain: e.domain };
+}
+function w(e) {
+  return e.type === "equal" || e.type === "notEqual" || e.type === "lessThan" || e.type === "lessThanOrEqual" || e.type === "greaterThan" || e.type === "greaterThanOrEqual";
+}
+function L(e) {
+  return e.type === "patternEquals" || e.type === "patternNotEquals" || e.type === "patternContainSubsequence" || e.type === "patternNotContainSubsequence" || e.type === "patternMatchesRegularExpression" || e.type === "patternFuzzyContainSubsequence";
+}
+function _(e) {
+  return m[e];
+}
+function G(e, n, t) {
+  const a = v(e(t.value));
+  function l(r) {
+    t.value = n(r);
+  }
+  function y(r) {
+    a.value = e(r);
+  }
+  return o(() => t.value, (r) => {
+    y(r);
+  }, { deep: !0 }), o(() => a.value, (r) => {
+    l(r);
+  }, { deep: !0 }), a;
+}
+function U(e) {
+  if (typeof e != "string")
+    return !1;
+  try {
+    const n = g(e);
+    return E(n) || f(n) || q(n);
+  } catch {
+    return !1;
+  }
+}
+export {
+  P as createNewGroup,
+  _ as getFilterInfo,
+  R as getNormalizedSpec,
+  w as isNumericFilter,
+  L as isStringFilter,
+  U as isValidColumnId,
+  z as toInnerModel,
+  A as toOuterModel,
+  G as useInnerModel
+};
+//# sourceMappingURL=utils.js.map

package/dist/components/PlAdvancedFilter/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../src/components/PlAdvancedFilter/utils.ts"],"sourcesContent":["import type { AnchoredPColumnId, AxisId, CanonicalizedJson, FilteredPColumnId, ValueType } from '@platforma-sdk/model';\nimport { assertNever, getTypeFromPColumnOrAxisSpec, isAnchoredPColumnId, isFilteredPColumn, parseJson, type AxisSpec, type PColumnSpec, type SUniversalPColumnId } from '@platforma-sdk/model';\nimport { type CommonFilterSpec, isSupportedFilterType, type Filter, type FilterType, type Group, type PlAdvancedFilterUI, type SupportedFilterTypes, type PlAdvancedFilterColumnId } from './types';\nimport { DEFAULT_FILTER_TYPE, DEFAULT_FILTERS, SUPPORTED_FILTER_TYPES } from './constants';\nimport { filterUiMetadata } from '@milaboratories/uikit';\nimport { ref, watch, type ModelRef } from 'vue';\nimport { isAxisId } from '@platforma-sdk/model';\n\nfunction toInnerFilter(outerFilter: CommonFilterSpec): Filter | null {\n  if (!('column' in outerFilter) || outerFilter.type === undefined || !isSupportedFilterType(outerFilter.type)) {\n    return null;\n  }\n  if (outerFilter.type === 'patternFuzzyContainSubsequence') {\n    return {\n      ...outerFilter,\n      value: outerFilter.value,\n      wildcard: outerFilter.wildcard,\n      maxEdits: outerFilter.maxEdits ?? 2,\n      substitutionsOnly: outerFilter.substitutionsOnly ?? false,\n    };\n  }\n\n  return { ...outerFilter } as Filter;\n}\n\nlet groupIdCounter = 0;\nfunction getNewGroupId() {\n  groupIdCounter++;\n  return String(groupIdCounter);\n}\n\nfunction toInnerFiltersGroup(f: CommonFilterSpec): Group | null {\n  if (f.type === 'not') {\n    const group = toInnerFiltersGroup(f.filter);\n    return group\n      ? {\n          not: !group.not,\n          operand: group.operand,\n          filters: group.filters,\n          id: getNewGroupId(),\n          expanded: group.expanded,\n        }\n      : null;\n  }\n  if (f.type === 'and' || f.type === 'or') {\n    return {\n      operand: f.type,\n      not: false,\n      filters: f.filters.map((f) => toInnerFilter(f)).filter((v) => v !== null) as Filter[],\n      id: getNewGroupId(),\n      expanded: f.expanded ?? true,\n    };\n  }\n  if (SUPPORTED_FILTER_TYPES.has(f.type as SupportedFilterTypes)) {\n    const filter = toInnerFilter(f);\n    return {\n      operand: 'or',\n      not: false,\n      filters: filter ? [filter] : [],\n      id: getNewGroupId(),\n      expanded: f.expanded ?? true,\n    };\n  }\n  return null;\n}\n\nexport function toInnerModel(m: CommonFilterSpec): PlAdvancedFilterUI {\n  const res: PlAdvancedFilterUI = {\n    operand: 'or',\n    groups: [],\n  };\n  if (m.type === 'not') {\n    return res; // not supported 'not' for all the groups in ui\n  }\n  if (m.type === 'and' || m.type === 'or') {\n    // group\n    res.operand = m.type;\n    res.groups = m.filters.map(toInnerFiltersGroup).filter((v) => v !== null) as Group[];\n  } else if (SUPPORTED_FILTER_TYPES.has(m.type as SupportedFilterTypes)) {\n    // single filter\n    const group = toInnerFiltersGroup(m);\n    res.groups = group ? [group] : [];\n  }\n  res.groups = res.groups.filter((gr) => gr.filters.length > 0);\n  return res;\n}\n\nfunction toOuterFilter(filter: Filter): CommonFilterSpec | null {\n  if (\n    filter.type === 'isNA' || filter.type === 'isNotNA'\n    || filter.type === 'inSet' || filter.type === 'notInSet'\n  ) {\n    return filter;\n  }\n  if (\n    filter.type === 'greaterThanOrEqual' || filter.type === 'lessThanOrEqual'\n    || filter.type === 'greaterThan' || filter.type === 'lessThan'\n    || filter.type === 'equal' || filter.type === 'notEqual'\n  ) {\n    return filter.x !== undefined ? { ...filter, x: filter.x } : null;\n  }\n  if (\n    filter.type === 'patternEquals' || filter.type === 'patternNotEquals'\n    || filter.type === 'patternContainSubsequence' || filter.type === 'patternNotContainSubsequence'\n    || filter.type === 'patternMatchesRegularExpression'\n    || filter.type === 'patternFuzzyContainSubsequence'\n  ) {\n    return filter.value !== undefined ? { ...filter, value: filter.value } : null;\n  }\n  assertNever(filter.type);\n}\n\nfunction toOuterFilterGroup(m: Group): CommonFilterSpec {\n  const res: CommonFilterSpec = {\n    type: m.operand,\n    expanded: m.expanded,\n    filters: m.filters.map(toOuterFilter).filter((v): v is CommonFilterSpec => v !== null),\n  };\n  if (m.not) {\n    return {\n      type: 'not',\n      filter: res,\n    } as CommonFilterSpec;\n  }\n  return res;\n}\nexport function toOuterModel(m: PlAdvancedFilterUI): CommonFilterSpec {\n  return {\n    type: m.operand,\n    filters: m.groups.map(toOuterFilterGroup),\n  };\n}\n\nexport function createNewGroup(selectedSourceId: string) {\n  return {\n    id: getNewGroupId(),\n    not: false,\n    operand: 'and' as const,\n    expanded: true,\n    filters: [{\n      ...DEFAULT_FILTERS[DEFAULT_FILTER_TYPE],\n      column: selectedSourceId as SUniversalPColumnId,\n    }],\n  };\n}\n\nexport type NormalizedSpecData = {\n  valueType: ValueType;\n  annotations: PColumnSpec['annotations'];\n  domain: PColumnSpec['domain'];\n};\nexport function getNormalizedSpec(spec: PColumnSpec | AxisSpec): NormalizedSpecData {\n  return { valueType: getTypeFromPColumnOrAxisSpec(spec), annotations: spec.annotations, domain: spec.domain };\n}\n\nexport function isNumericValueType(spec?: PColumnSpec | AxisSpec): boolean {\n  if (!spec) {\n    return false;\n  }\n  const valueType = getNormalizedSpec(spec).valueType;\n  return valueType === 'Int' || valueType === 'Long' || valueType === 'Float' || valueType === 'Double';\n}\n\nexport function isStringValueType(spec?: PColumnSpec | AxisSpec): boolean {\n  if (!spec) {\n    return false;\n  }\n  const valueType = getNormalizedSpec(spec).valueType;\n  return valueType === 'String';\n}\n\nexport function isNumericFilter(filter: Filter): filter is Filter & { type: 'equal' | 'notEqual' | 'lessThan' | 'lessThanOrEqual' | 'greaterThan' | 'greaterThanOrEqual' } {\n  return filter.type === 'equal' || filter.type === 'notEqual' || filter.type === 'lessThan' || filter.type === 'lessThanOrEqual' || filter.type === 'greaterThan' || filter.type === 'greaterThanOrEqual';\n}\nexport function isStringFilter(filter: Filter): filter is Filter & { type: 'patternEquals' | 'patternNotEquals' | 'patternContainSubsequence' | 'patternNotContainSubsequence' | 'patternMatchesRegularExpression' | 'patternFuzzyContainSubsequence' } {\n  return filter.type === 'patternEquals' || filter.type === 'patternNotEquals' || filter.type === 'patternContainSubsequence' || filter.type === 'patternNotContainSubsequence' || filter.type === 'patternMatchesRegularExpression' || filter.type === 'patternFuzzyContainSubsequence';\n}\n\nexport function getFilterInfo(filterType: FilterType): { label: string; supportedFor: (spec: NormalizedSpecData) => boolean } {\n  return filterUiMetadata[filterType as keyof typeof filterUiMetadata];\n}\n\nexport function useInnerModel<T, V>(\n  toInnerModel: (v: T) => V,\n  toOuterModel: (v: V) => T,\n  model: ModelRef<T>,\n) {\n  const innerModel = ref<V>(toInnerModel(model.value));\n  function updateOuterModelValue(v: V) {\n    model.value = toOuterModel(v);\n  }\n  function updateInnerModelValue(v: T) {\n    innerModel.value = toInnerModel(v);\n  }\n  watch(() => model.value, (v: T) => {\n    updateInnerModelValue(v);\n  }, { deep: true });\n  watch(() => innerModel.value, (v: V) => {\n    updateOuterModelValue(v);\n  }, { deep: true });\n\n  return innerModel;\n}\n\nexport function isValidColumnId(id: unknown): id is PlAdvancedFilterColumnId {\n  if (typeof id !== 'string') {\n    return false;\n  }\n  try {\n    const parsedId = parseJson<FilteredPColumnId | AnchoredPColumnId | AxisId>(id as CanonicalizedJson<FilteredPColumnId | AnchoredPColumnId | AxisId>);\n    return isFilteredPColumn(parsedId) || isAnchoredPColumnId(parsedId) || isAxisId(parsedId);\n  } catch {\n    return false;\n  }\n}\n"],"names":["toInnerFilter","outerFilter","isSupportedFilterType","groupIdCounter","getNewGroupId","toInnerFiltersGroup","f","group","v","SUPPORTED_FILTER_TYPES","filter","toInnerModel","m","res","gr","toOuterFilter","assertNever","toOuterFilterGroup","toOuterModel","createNewGroup","selectedSourceId","DEFAULT_FILTERS","DEFAULT_FILTER_TYPE","getNormalizedSpec","spec","getTypeFromPColumnOrAxisSpec","isNumericFilter","isStringFilter","getFilterInfo","filterType","filterUiMetadata","useInnerModel","model","innerModel","ref","updateOuterModelValue","updateInnerModelValue","watch","isValidColumnId","id","parsedId","parseJson","isFilteredPColumn","isAnchoredPColumnId","isAxisId"],"mappings":";;;;;AAQA,SAASA,EAAcC,GAA8C;AACnE,SAAI,EAAE,YAAYA,MAAgBA,EAAY,SAAS,UAAa,CAACC,EAAsBD,EAAY,IAAI,IAClG,OAELA,EAAY,SAAS,mCAChB;AAAA,IACL,GAAGA;AAAA,IACH,OAAOA,EAAY;AAAA,IACnB,UAAUA,EAAY;AAAA,IACtB,UAAUA,EAAY,YAAY;AAAA,IAClC,mBAAmBA,EAAY,qBAAqB;AAAA,EAAA,IAIjD,EAAE,GAAGA,EAAA;AACd;AAEA,IAAIE,IAAiB;AACrB,SAASC,IAAgB;AACvB,SAAAD,KACO,OAAOA,CAAc;AAC9B;AAEA,SAASE,EAAoBC,GAAmC;AAC9D,MAAIA,EAAE,SAAS,OAAO;AACpB,UAAMC,IAAQF,EAAoBC,EAAE,MAAM;AAC1C,WAAOC,IACH;AAAA,MACE,KAAK,CAACA,EAAM;AAAA,MACZ,SAASA,EAAM;AAAA,MACf,SAASA,EAAM;AAAA,MACf,IAAIH,EAAA;AAAA,MACJ,UAAUG,EAAM;AAAA,IAAA,IAElB;AAAA,EACN;AACA,MAAID,EAAE,SAAS,SAASA,EAAE,SAAS;AACjC,WAAO;AAAA,MACL,SAASA,EAAE;AAAA,MACX,KAAK;AAAA,MACL,SAASA,EAAE,QAAQ,IAAI,CAACA,MAAMN,EAAcM,CAAC,CAAC,EAAE,OAAO,CAACE,MAAMA,MAAM,IAAI;AAAA,MACxE,IAAIJ,EAAA;AAAA,MACJ,UAAUE,EAAE,YAAY;AAAA,IAAA;AAG5B,MAAIG,EAAuB,IAAIH,EAAE,IAA4B,GAAG;AAC9D,UAAMI,IAASV,EAAcM,CAAC;AAC9B,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK;AAAA,MACL,SAASI,IAAS,CAACA,CAAM,IAAI,CAAA;AAAA,MAC7B,IAAIN,EAAA;AAAA,MACJ,UAAUE,EAAE,YAAY;AAAA,IAAA;AAAA,EAE5B;AACA,SAAO;AACT;AAEO,SAASK,EAAaC,GAAyC;AACpE,QAAMC,IAA0B;AAAA,IAC9B,SAAS;AAAA,IACT,QAAQ,CAAA;AAAA,EAAC;AAEX,MAAID,EAAE,SAAS;AACb,WAAOC;AAET,MAAID,EAAE,SAAS,SAASA,EAAE,SAAS;AAEjC,IAAAC,EAAI,UAAUD,EAAE,MAChBC,EAAI,SAASD,EAAE,QAAQ,IAAIP,CAAmB,EAAE,OAAO,CAACG,MAAMA,MAAM,IAAI;AAAA,WAC/DC,EAAuB,IAAIG,EAAE,IAA4B,GAAG;AAErE,UAAML,IAAQF,EAAoBO,CAAC;AACnC,IAAAC,EAAI,SAASN,IAAQ,CAACA,CAAK,IAAI,CAAA;AAAA,EACjC;AACA,SAAAM,EAAI,SAASA,EAAI,OAAO,OAAO,CAACC,MAAOA,EAAG,QAAQ,SAAS,CAAC,GACrDD;AACT;AAEA,SAASE,EAAcL,GAAyC;AAC9D,MACEA,EAAO,SAAS,UAAUA,EAAO,SAAS,aACvCA,EAAO,SAAS,WAAWA,EAAO,SAAS;AAE9C,WAAOA;AAET,MACEA,EAAO,SAAS,wBAAwBA,EAAO,SAAS,qBACrDA,EAAO,SAAS,iBAAiBA,EAAO,SAAS,cACjDA,EAAO,SAAS,WAAWA,EAAO,SAAS;AAE9C,WAAOA,EAAO,MAAM,SAAY,EAAE,GAAGA,GAAQ,GAAGA,EAAO,EAAA,IAAM;AAE/D,MACEA,EAAO,SAAS,mBAAmBA,EAAO,SAAS,sBAChDA,EAAO,SAAS,+BAA+BA,EAAO,SAAS,kCAC/DA,EAAO,SAAS,qCAChBA,EAAO,SAAS;AAEnB,WAAOA,EAAO,UAAU,SAAY,EAAE,GAAGA,GAAQ,OAAOA,EAAO,MAAA,IAAU;AAE3E,EAAAM,EAAYN,EAAO,IAAI;AACzB;AAEA,SAASO,EAAmBL,GAA4B;AACtD,QAAMC,IAAwB;AAAA,IAC5B,MAAMD,EAAE;AAAA,IACR,UAAUA,EAAE;AAAA,IACZ,SAASA,EAAE,QAAQ,IAAIG,CAAa,EAAE,OAAO,CAACP,MAA6BA,MAAM,IAAI;AAAA,EAAA;AAEvF,SAAII,EAAE,MACG;AAAA,IACL,MAAM;AAAA,IACN,QAAQC;AAAA,EAAA,IAGLA;AACT;AACO,SAASK,EAAaN,GAAyC;AACpE,SAAO;AAAA,IACL,MAAMA,EAAE;AAAA,IACR,SAASA,EAAE,OAAO,IAAIK,CAAkB;AAAA,EAAA;AAE5C;AAEO,SAASE,EAAeC,GAA0B;AACvD,SAAO;AAAA,IACL,IAAIhB,EAAA;AAAA,IACJ,KAAK;AAAA,IACL,SAAS;AAAA,IACT,UAAU;AAAA,IACV,SAAS,CAAC;AAAA,MACR,GAAGiB,EAAgBC,CAAmB;AAAA,MACtC,QAAQF;AAAA,IAAA,CACT;AAAA,EAAA;AAEL;AAOO,SAASG,EAAkBC,GAAkD;AAClF,SAAO,EAAE,WAAWC,EAA6BD,CAAI,GAAG,aAAaA,EAAK,aAAa,QAAQA,EAAK,OAAA;AACtG;AAkBO,SAASE,EAAgBhB,GAA2I;AACzK,SAAOA,EAAO,SAAS,WAAWA,EAAO,SAAS,cAAcA,EAAO,SAAS,cAAcA,EAAO,SAAS,qBAAqBA,EAAO,SAAS,iBAAiBA,EAAO,SAAS;AACtL;AACO,SAASiB,EAAejB,GAAyN;AACtP,SAAOA,EAAO,SAAS,mBAAmBA,EAAO,SAAS,sBAAsBA,EAAO,SAAS,+BAA+BA,EAAO,SAAS,kCAAkCA,EAAO,SAAS,qCAAqCA,EAAO,SAAS;AACxP;AAEO,SAASkB,EAAcC,GAAgG;AAC5H,SAAOC,EAAiBD,CAA2C;AACrE;AAEO,SAASE,EACdpB,GACAO,GACAc,GACA;AACA,QAAMC,IAAaC,EAAOvB,EAAaqB,EAAM,KAAK,CAAC;AACnD,WAASG,EAAsB3B,GAAM;AACnC,IAAAwB,EAAM,QAAQd,EAAaV,CAAC;AAAA,EAC9B;AACA,WAAS4B,EAAsB5B,GAAM;AACnC,IAAAyB,EAAW,QAAQtB,EAAaH,CAAC;AAAA,EACnC;AACA,SAAA6B,EAAM,MAAML,EAAM,OAAO,CAACxB,MAAS;AACjC,IAAA4B,EAAsB5B,CAAC;AAAA,EACzB,GAAG,EAAE,MAAM,IAAM,GACjB6B,EAAM,MAAMJ,EAAW,OAAO,CAACzB,MAAS;AACtC,IAAA2B,EAAsB3B,CAAC;AAAA,EACzB,GAAG,EAAE,MAAM,IAAM,GAEVyB;AACT;AAEO,SAASK,EAAgBC,GAA6C;AAC3E,MAAI,OAAOA,KAAO;AAChB,WAAO;AAET,MAAI;AACF,UAAMC,IAAWC,EAA0DF,CAAuE;AAClJ,WAAOG,EAAkBF,CAAQ,KAAKG,EAAoBH,CAAQ,KAAKI,EAASJ,CAAQ;AAAA,EAC1F,QAAQ;AACN,WAAO;AAAA,EACT;AACF;"}

package/dist/index.js

@@ -12,8 +12,8 @@ import { default as x } from "./components/PlAgDataTable/PlAgOverlayNoRows.vue.j
 import { default as A } from "./components/ValueOrErrorsComponent.vue.js";
 import { useAgGridOptions as C } from "./AgGridVue/useAgGridOptions.js";
 import { createAgGridColDef as b } from "./AgGridVue/createAgGridColDef.js";
-import { deselectAll as w, getSelectedRowsCount as R, getTotalRowsCount as S, isSelectionEnabled as T, selectAll as D } from "./AgGridVue/selection.js";
-import { default as v } from "./components/PlAgColumnHeader/PlAgColumnHeader.vue.js";
+import { deselectAll as w, getSelectedRowsCount as R, getTotalRowsCount as S, isSelectionEnabled as T, selectAll as v } from "./AgGridVue/selection.js";
+import { default as V } from "./components/PlAgColumnHeader/PlAgColumnHeader.vue.js";
 import { default as O } from "./components/PlAgCellFile/PlAgCellFile.vue.js";
 import { default as G } from "./components/PlAgCellProgress/PlAgCellProgress.vue.js";
 import { default as k } from "./components/PlAgCellStatusTag/PlAgCellStatusTag.vue.js";
@@ -34,26 +34,28 @@ import { default as ae } from "./components/PlMultiSequenceAlignment/PlMultiSequ
 import { default as me } from "./components/PlAnnotations/components/PlAnnotations.vue.js";
 import { default as pe } from "./components/PlAnnotations/components/PlAnnotationsModal.vue.js";
 import { default as de } from "./components/PlBtnExportArchive/PlBtnExportArchive.vue.js";
-import { defineApp as ne, useSdkPlugin as xe } from "./defineApp.js";
-import { createModel as Ae } from "./createModel.js";
-import { defineStore as Ce } from "./defineStore.js";
-import { AgGridTheme as be, activateAgGrid as Ee } from "./aggrid.js";
-import { MultiError as Re, UnresolvedError as Se, ensureError as Te, formatZodError as De, identity as Ve, isDefined as ve, isZodError as Me, unwrapValueOrErrors as Oe, wrapOptionalResult as he, wrapValueOrErrors as Ge } from "./utils.js";
-import { objectHash as ke } from "./objectHash.js";
-import { computedResult as Be } from "./computedResult.js";
-import { ReactiveFileContent as He } from "./composition/fileContent.js";
+import { default as ne } from "./components/PlAdvancedFilter/PlAdvancedFilter.vue.js";
+import { defineApp as ge, useSdkPlugin as Ae } from "./defineApp.js";
+import { createModel as Ce } from "./createModel.js";
+import { defineStore as be } from "./defineStore.js";
+import { AgGridTheme as we, activateAgGrid as Re } from "./aggrid.js";
+import { MultiError as Te, UnresolvedError as ve, ensureError as De, formatZodError as Ve, identity as Me, isDefined as Oe, isZodError as he, unwrapValueOrErrors as Ge, wrapOptionalResult as Ne, wrapValueOrErrors as ke } from "./utils.js";
+import { objectHash as Be } from "./objectHash.js";
+import { computedResult as He } from "./computedResult.js";
+import { ReactiveFileContent as Le } from "./composition/fileContent.js";
 export * from "@milaboratories/uikit";
 export {
-  be as AgGridTheme,
+  we as AgGridTheme,
   m as BlockLayout,
   J as DeferredCircular,
-  Re as MultiError,
+  Te as MultiError,
+  ne as PlAdvancedFilter,
   O as PlAgCellFile,
   G as PlAgCellProgress,
   k as PlAgCellStatusTag,
   B as PlAgChartHistogramCell,
   H as PlAgChartStackedBarCell,
-  v as PlAgColumnHeader,
+  V as PlAgColumnHeader,
   Y as PlAgCsvExporter,
   j as PlAgDataTableRowNumberColId,
   p as PlAgDataTableV2,
@@ -67,35 +69,35 @@ export {
   u as PlDataTableV2,
   ae as PlMultiSequenceAlignment,
   te as PlTableFiltersV2,
-  He as ReactiveFileContent,
-  Se as UnresolvedError,
+  Le as ReactiveFileContent,
+  ve as UnresolvedError,
   A as ValueOrErrorsComponent,
-  Ee as activateAgGrid,
+  Re as activateAgGrid,
   q as autoSizeRowNumberColumn,
-  Be as computedResult,
+  He as computedResult,
   b as createAgGridColDef,
-  Ae as createModel,
+  Ce as createModel,
   W as defaultMainMenuItems,
-  ne as defineApp,
-  Ce as defineStore,
+  ge as defineApp,
+  be as defineStore,
   w as deselectAll,
-  Te as ensureError,
+  De as ensureError,
   K as ensureNodeVisible,
-  De as formatZodError,
+  Ve as formatZodError,
   R as getSelectedRowsCount,
   S as getTotalRowsCount,
-  Ve as identity,
-  ve as isDefined,
+  Me as identity,
+  Oe as isDefined,
   T as isSelectionEnabled,
-  Me as isZodError,
+  he as isZodError,
   z as makeRowNumberColDef,
-  ke as objectHash,
-  D as selectAll,
-  Oe as unwrapValueOrErrors,
+  Be as objectHash,
+  v as selectAll,
+  Ge as unwrapValueOrErrors,
   C as useAgGridOptions,
   L as usePlDataTableSettingsV2,
-  xe as useSdkPlugin,
-  he as wrapOptionalResult,
-  Ge as wrapValueOrErrors
+  Ae as useSdkPlugin,
+  Ne as wrapOptionalResult,
+  ke as wrapValueOrErrors
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/lib.d.ts

@@ -19,6 +19,7 @@ export * from './components/PlTableFilters';
 export * from './components/PlMultiSequenceAlignment';
 export * from './components/PlAnnotations';
 export * from './components/PlBtnExportArchive';
+export * from './components/PlAdvancedFilter';
 export * from './defineApp';
 export * from './createModel';
 export * from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.45.34",
+  "version": "1.45.35",
   "type": "module",
   "main": "dist/index.js",
   "styles": "dist/index.js",
@@ -27,9 +27,9 @@
     "zod": "~3.23.8",
     "@zip.js/zip.js": "^2.8.2",
     "@milaboratories/biowasm-tools": "2.0.0",
-    "@milaboratories/uikit": "2.6.1",
-    "@platforma-sdk/model": "1.45.30",
-    "@milaboratories/ptabler-expression-js": "1.1.2"
+    "@milaboratories/ptabler-expression-js": "1.1.3",
+    "@platforma-sdk/model": "1.45.35",
+    "@milaboratories/uikit": "2.6.2"
   },
   "devDependencies": {
     "happy-dom": "^15.11.7",
@@ -44,11 +44,11 @@
     "yarpm": "^1.2.0",
     "fast-json-patch": "^3.1.1",
     "@faker-js/faker": "^9.2.0",
+    "@milaboratories/ts-configs": "1.0.6",
     "@milaboratories/eslint-config": "1.0.5",
+    "@milaboratories/ts-builder": "1.0.5",
     "@milaboratories/build-configs": "1.0.8",
-    "@milaboratories/helpers": "1.12.0",
-    "@milaboratories/ts-configs": "1.0.6",
-    "@milaboratories/ts-builder": "1.0.5"
+    "@milaboratories/helpers": "1.12.0"
   },
   "scripts": {
     "test": "vitest run --passWithNoTests",

package/src/components/PlAdvancedFilter/OperandButton.vue

@@ -0,0 +1,53 @@
+<script lang="ts" setup>
+import type { Operand } from './types';
+
+const props = defineProps<{
+  active: Operand;
+  disabled: boolean;
+  onSelect: (op: Operand) => void;
+}>();
+
+const OPTIONS: Operand[] = ['and', 'or'];
+</script>
+<template>
+  <div v-bind="$attrs" :class="$style.block">
+    <div
+      v-for="op in OPTIONS"
+      :key="op"
+      :class="[$style.operand, {[$style.active]: op === props.active && !props.disabled}]"
+      @click="!props.disabled && props.onSelect(op)"
+    >
+      {{ op }}
+    </div>
+  </div>
+</template>
+<style module>
+.block {
+  width: 100%;
+  display: flex;
+  gap: 4px;
+  justify-content: center;
+  height: 72px;
+  align-items: center;
+}
+.operand {
+  border-radius: 16px;
+  width: 64px;
+  height: 32px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-transform: uppercase;
+  font-weight: 600;
+
+  color: var(--txt-03);
+  border: 1px solid var(--color-div-grey);
+  background: transparent;
+  cursor: pointer;
+}
+.operand.active {
+  color: var(--txt-01);
+  background: #fff;
+  border: 1px solid var(--txt-01);
+}
+</style>

package/src/components/PlAdvancedFilter/PlAdvancedFilter.vue

@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import SingleFilter from './SingleFilter.vue';
+import { PlBtnSecondary, PlElementList, PlCheckbox, PlIcon16 } from '@milaboratories/uikit';
+import type { PlAdvancedFilterColumnId, CommonFilterSpec, Group, PlAdvancedFilterUI, SourceOptionInfo } from './types';
+import { computed } from 'vue';
+import OperandButton from './OperandButton.vue';
+import { DEFAULT_FILTER_TYPE, DEFAULT_FILTERS } from './constants';
+import type { ListOptionBase } from '@platforma-sdk/model';
+import { createNewGroup, isValidColumnId, toInnerModel, toOuterModel, useInnerModel } from './utils';
+
+const props = withDefaults(defineProps<{
+  /** List of ids of sources (columns, axes) that can be selected in filters */
+  items: SourceOptionInfo[];
+  /** If true - new filter can be added by droppind element into filter group; else new column is added by button click */
+  enableDnd?: boolean;
+  /** Loading function for unique values for Equal/InSet filters and fixed axes options. */
+  getSuggestOptions: (params: { columnId: PlAdvancedFilterColumnId; searchStr: string; axisIdx?: number }) => (Promise<ListOptionBase<string | number>[]>) |
+    ((params: { columnId: PlAdvancedFilterColumnId; searchStr: string; axisIdx?: number }) => ListOptionBase<string | number>[]);
+  /** Loading function for label of selected value for Equal/InSet filters and fixed axes options. */
+  getSuggestModel: (params: { columnId: PlAdvancedFilterColumnId; searchStr: string; axisIdx?: number }) => (Promise<ListOptionBase<string | number>>) |
+    ((params: { columnId: PlAdvancedFilterColumnId; searchStr: string; axisIdx?: number }) => ListOptionBase<string | number>);
+}>(), { enableDnd: false });
+
+const model = defineModel<CommonFilterSpec>({ required: true });
+const innerModel = useInnerModel<CommonFilterSpec, PlAdvancedFilterUI>(toInnerModel, toOuterModel, model);
+
+const firstColumnId = computed(() => props.items[0]?.id);
+const emptyGroup: Group[] = [{
+  id: 'empty',
+  not: false,
+  operand: 'and',
+  filters: [],
+  expanded: true,
+}];
+
+function addColumnToGroup(groupIdx: number, selectedSourceId: PlAdvancedFilterColumnId) {
+  innerModel.value.groups[groupIdx].filters.push({
+    ...DEFAULT_FILTERS[DEFAULT_FILTER_TYPE],
+    column: selectedSourceId,
+  });
+}
+
+function removeFilterFromGroup(groupIdx: number, filterIdx: number) {
+  if (innerModel.value.groups[groupIdx].filters.length === 1 && filterIdx === 0) {
+    removeGroup(groupIdx);
+  } else {
+    innerModel.value.groups[groupIdx].filters = innerModel.value.groups[groupIdx].filters.filter((_v, idx) => idx !== filterIdx);
+  }
+}
+
+function removeGroup(groupIdx: number) {
+  innerModel.value.groups = innerModel.value.groups.filter((v, idx) => idx !== groupIdx);
+}
+function addGroup(selectedSourceId: PlAdvancedFilterColumnId) {
+  const newGroup = createNewGroup(selectedSourceId);
+  innerModel.value.groups.push(newGroup);
+}
+
+function handleDropToExistingGroup(groupIdx: number, event: DragEvent) {
+  const dataTransfer = event.dataTransfer;
+  if (dataTransfer?.getData('text/plain')) {
+    const draggedId = dataTransfer.getData('text/plain');
+    if (isValidColumnId(draggedId)) {
+      addColumnToGroup(groupIdx, draggedId);
+    }
+  }
+}
+function handleDropToNewGroup(event: DragEvent) {
+  const dataTransfer = event.dataTransfer;
+  if (dataTransfer?.getData('text/plain')) {
+    const draggedId = dataTransfer.getData('text/plain');
+    if (isValidColumnId(draggedId)) {
+      addGroup(draggedId);
+    }
+  }
+}
+function dragOver(event: DragEvent) {
+  event.preventDefault();
+}
+</script>
+<template>
+  <div>
+    <PlElementList
+      v-model:items="innerModel.groups"
+      :get-item-key="(group) => group.id"
+
+      :item-class="$style.filterGroup"
+      :item-class-content="$style.filterGroupContent"
+      :item-class-title="$style.filterGroupTitle"
+
+      :is-expanded="(group) => group.expanded"
+
+      :disableDragging="false"
+      :disableRemoving="false"
+      :disableToggling="true"
+      :disablePinning="true"
+
+      :on-expand="(group) => { group.expanded = !group.expanded}"
+    >
+      <template #item-title>
+        Filter group
+      </template>
+      <template #item-content="{ item, index }">
+        <div
+          :class="$style.groupContent" dropzone="true"
+          @drop="(event) => handleDropToExistingGroup(index, event)"
+          @dragover="dragOver"
+        >
+          <PlCheckbox v-model="item.not">NOT</PlCheckbox>
+          <SingleFilter
+            v-for="(filter, filterIdx) in item.filters"
+            :key="filterIdx"
+            v-model="item.filters[filterIdx]"
+            :operand="item.operand"
+            :column-options="items"
+            :get-suggest-model="getSuggestModel"
+            :get-suggest-options="getSuggestOptions"
+            :enable-dnd="enableDnd"
+            :is-last="filterIdx === item.filters.length - 1"
+            :on-change-operand="(v) => item.operand = v"
+            :on-delete="() => removeFilterFromGroup(index, filterIdx)"
+          />
+          <div v-if="enableDnd" :class="$style.dropzone">
+            <div>Drop dimensions here</div>
+          </div>
+          <PlBtnSecondary v-else @click="addColumnToGroup(index, firstColumnId)">
+            <PlIcon16 name="add" style="margin-right: 8px"/>Add column
+          </PlBtnSecondary>
+        </div>
+      </template>
+      <template #item-after="{ index }">
+        <OperandButton
+          :class="$style.buttonWrapper"
+          :active="innerModel.operand"
+          :disabled="index === innerModel.groups.length - 1"
+          :on-select="(v) => innerModel.operand = v"
+        />
+      </template>
+    </PlElementList>
+
+    <!-- Last group - always exists, always empty, just for adding new groups -->
+    <PlElementList
+      v-model:items="emptyGroup"
+      :get-item-key="(group) => group.id"
+      :item-class="$style.filterGroup"
+      :item-class-content="$style.filterGroupContent"
+      :item-class-title="$style.filterGroupTitle"
+
+      :is-expanded="() => true"
+
+      :disableDragging="true"
+      :disableRemoving="true"
+      :disableToggling="true"
+      :disablePinning="true"
+      dropzone="true"
+      @drop="handleDropToNewGroup"
+      @dragover="dragOver"
+    >
+      <template #item-title>Filter group</template>
+      <template #item-content="{item}">
+        <PlCheckbox v-model="item.not" disabled >NOT</PlCheckbox>
+        <div v-if="enableDnd" :class="$style.dropzone">
+          <div>Drop dimensions here</div>
+        </div>
+        <PlBtnSecondary v-else @click="addGroup(firstColumnId)">
+          <PlIcon16 name="add" style="margin-right: 8px"/>Add column
+        </PlBtnSecondary>
+      </template>
+    </PlElementList>
+  </div>
+</template>
+<style module>
+  .filterGroup {
+    background: var(--bg-base-light);
+  }
+  .filterGroup:hover {
+    background: rgba(99, 224, 36, 0.12);
+  }
+  .filterGroupTitle {
+    background: none;
+  }
+  .groupContent {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+  .dropzone {
+    border-radius: 6px;
+    border: 1.5px dashed var(--color-div-grey);
+    color: var(--txt-03);
+    font-family: Manrope;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 500;
+    height: 40px;
+    cursor: default;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .buttonWrapper {
+    height: 72px;
+    display: flex;
+    align-items: center;
+  }
+  :global(.sortable-chosen) .buttonWrapper {
+    visibility: hidden;
+  }
+</style>