synapse-react-client 4.0.46 → 4.0.48

package/dist/components/widgets/query-filter/FacetFilterControls.js

@@ -1,85 +1,86 @@
-import { facetObjectMatchesDefinition as e, getCorrespondingColumnForFacet as t, isSingleNotSetValue as n } from "../../../utils/functions/queryUtils.js";
-import { useQueryContext as r } from "../../QueryContext/QueryContext.js";
+import { useQueryVisualizationContext as e } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { getEnumerationFacet as t } from "../../../utils/functions/enumerationFacet.js";
+import { facetObjectMatchesDefinition as n, getCorrespondingColumnForFacet as r, isSingleNotSetValue as i } from "../../../utils/functions/queryUtils.js";
+import { useQueryContext as a } from "../../QueryContext/QueryContext.js";
 import "../../QueryContext/index.js";
-import { useSuspenseGetQueryMetadata as i } from "../../QueryWrapper/useGetQueryMetadata.js";
-import { useQueryVisualizationContext as a } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { useSuspenseGetQueryMetadata as o } from "../../QueryWrapper/useGetQueryMetadata.js";
 import "../../QueryVisualizationWrapper/index.js";
-import { FacetFilterHeader as o } from "./FacetFilterHeader.js";
-import { FacetFilterControlsSkeleton as s } from "./FacetFilterSkeleton.js";
-import { EnumFacetFilter as c } from "./EnumFacetFilter/EnumFacetFilter.js";
-import { CombinedRangeFacetFilter as l } from "./CombinedRangeFacetFilter.js";
-import { FacetChip as u } from "./FacetChip.js";
-import { getDefaultShownFacetFilters as d } from "./FacetFilterUtils.js";
-import { RangeFacetFilter as f } from "./RangeFacetFilter.js";
-import p from "./JsonColumnFacetFilters.js";
-import { Suspense as m, useCallback as h, useMemo as g, useState as _ } from "react";
-import { groupBy as v, noop as y, sortBy as b, union as x } from "lodash-es";
-import { jsx as S, jsxs as C } from "react/jsx-runtime";
-import { useDeepCompareEffectNoCheck as w } from "use-deep-compare-effect";
+import { FacetFilterHeader as s } from "./FacetFilterHeader.js";
+import { FacetFilterControlsSkeleton as c } from "./FacetFilterSkeleton.js";
+import { EnumFacetFilter as l } from "./EnumFacetFilter/EnumFacetFilter.js";
+import { CombinedRangeFacetFilter as u } from "./CombinedRangeFacetFilter.js";
+import { FacetChip as d } from "./FacetChip.js";
+import { getDefaultShownFacetFilters as f } from "./FacetFilterUtils.js";
+import { RangeFacetFilter as p } from "./RangeFacetFilter.js";
+import m from "./JsonColumnFacetFilters.js";
+import { Suspense as h, useCallback as g, useMemo as _, useState as v } from "react";
+import { groupBy as y, noop as b, sortBy as x, union as S } from "lodash-es";
+import { jsx as C, jsxs as w } from "react/jsx-runtime";
+import { useDeepCompareEffectNoCheck as T } from "use-deep-compare-effect";
 //#region src/components/widgets/query-filter/FacetFilterControls.tsx
-var T = (e) => ({
+var E = (e) => ({
 	concreteType: "org.sagebionetworks.repo.model.table.FacetColumnValuesRequest",
 	columnName: e.columnName,
 	facetValues: e.facetValues.filter((e) => e.isSelected).map((e) => e.value)
-}), E = (t, n = []) => {
-	let r = n.findIndex((n) => e(n, t)), i = t.concreteType === "org.sagebionetworks.repo.model.table.FacetColumnValuesRequest" && !t.facetValues?.length, a = t.concreteType === "org.sagebionetworks.repo.model.table.FacetColumnRangeRequest" && (!t.min || !t.max);
-	return r > -1 ? i || a ? n.splice(r, 1) : n[r] = t : n.push(t), n;
+}), D = (e, t = []) => {
+	let r = t.findIndex((t) => n(t, e)), i = e.concreteType === "org.sagebionetworks.repo.model.table.FacetColumnValuesRequest" && !e.facetValues?.length, a = e.concreteType === "org.sagebionetworks.repo.model.table.FacetColumnRangeRequest" && (!e.min || !e.max);
+	return r > -1 ? i || a ? t.splice(r, 1) : t[r] = e : t.push(e), t;
 };
-function D(e, t, n, r, i = !1) {
+function O(e, t, n, r, i = !1) {
 	r ? t.facetValues.forEach((e) => {
 		e.value === r && (e.isSelected = i);
 	}) : t.facetValues.forEach((e) => {
 		e.isSelected = !1;
-	}), n(E(T(t), e?.query?.selectedFacets));
+	}), n(D(E(t), e?.query?.selectedFacets));
 }
-function O(e) {
-	let { availableFacets: s, initialExpandedFacetControls: m } = e, { getCurrentQueryRequest: T, combineRangeFacetConfig: E } = r(), { getColumnDisplayName: D } = a(), O = g(() => T(), [T]), { data: k } = i(), A = k.facets.filter((e) => s == null || s.includes(e.columnName)).filter((e) => e.jsonPath == null).filter((e) => E == null || E.maxFacetColumn !== e.columnName && E.minFacetColumn !== e.columnName).filter((e) => !n(e)), j = E ? k.facets.filter((e) => E.maxFacetColumn === e.columnName || E.minFacetColumn === e.columnName) : [], M = v(k.facets.filter((e) => !!e.jsonPath), "columnName"), N = g(() => {
+function k(n) {
+	let { availableFacets: c, initialExpandedFacetControls: h } = n, { getCurrentQueryRequest: E, combineRangeFacetConfig: D } = a(), { getColumnDisplayName: O } = e(), k = _(() => E(), [E]), { data: A } = o(), j = A.facets.filter((e) => c == null || c.includes(e.columnName)).filter((e) => e.jsonPath == null).filter((e) => D == null || D.maxFacetColumn !== e.columnName && D.minFacetColumn !== e.columnName).filter((e) => !i(e)), M = D ? A.facets.filter((e) => D.maxFacetColumn === e.columnName || D.minFacetColumn === e.columnName) : [], N = y(A.facets.filter((e) => !!e.jsonPath), "columnName"), P = _(() => {
 		let e = [];
-		return A.forEach((t) => e.push(t.columnName)), E && e.push(E.label), M && Object.keys(M).forEach((t) => e.push(t)), e;
+		return j.forEach((t) => e.push(t.columnName)), D && e.push(D.label), N && Object.keys(N).forEach((t) => e.push(t)), e;
 	}, [
-		E,
-		A,
-		M
-	]), [P, F] = _(d(N, O.query.selectedFacets));
-	w(() => {
-		let e = x(m ?? [], Array.from(P));
-		F(d(N, O.query.selectedFacets, e));
-	}, [A]);
-	let I = k.columnModels, L = h((e) => {
-		let t = new Set(P);
-		t.has(e) ? t.delete(e) : t.add(e), F(t);
-	}, [P]), R = E ? I?.find((e) => e.name === E.minFacetColumn)?.columnType : void 0, z = g(() => (A ?? []).filter((e) => P.has(e.columnName)), [P, A]), B = g(() => Object.entries(M).filter(([e]) => P.has(e)), [P, M]);
-	return /* @__PURE__ */ C("div", {
+		D,
+		j,
+		N
+	]), [F, I] = v(f(P, k.query.selectedFacets));
+	T(() => {
+		let e = S(h ?? [], Array.from(F));
+		I(f(P, k.query.selectedFacets, e));
+	}, [j]);
+	let L = A.columnModels, R = g((e) => {
+		let t = new Set(F);
+		t.has(e) ? t.delete(e) : t.add(e), I(t);
+	}, [F]), z = D ? L?.find((e) => e.name === D.minFacetColumn)?.columnType : void 0, B = _(() => (j ?? []).filter((e) => F.has(e.columnName)), [F, j]), V = _(() => Object.entries(N).filter(([e]) => F.has(e)), [F, N]);
+	return /* @__PURE__ */ w("div", {
 		className: "FacetFilterControls",
 		children: [
-			/* @__PURE__ */ C("div", { children: [/* @__PURE__ */ S(o, {
+			/* @__PURE__ */ w("div", { children: [/* @__PURE__ */ C(s, {
 				label: "Available Filters",
 				hideCollapsible: !0,
 				isCollapsed: !1,
-				onClick: y
-			}), b(N).map((e) => /* @__PURE__ */ S(u, {
-				onClick: () => L(e),
-				isChecked: P.has(e),
-				children: D(e)
+				onClick: b
+			}), x(P).map((e) => /* @__PURE__ */ C(d, {
+				onClick: () => R(e),
+				isChecked: F.has(e),
+				children: O(e)
 			}, e))] }),
-			E && j.length >= 2 && /* @__PURE__ */ S(l, {
-				facetResults: j,
-				label: E.label,
-				columnType: R
+			D && M.length >= 2 && /* @__PURE__ */ C(u, {
+				facetResults: M,
+				label: D.label,
+				columnType: z
 			}),
-			z.map((e) => {
-				let n = t(e, I ?? []);
-				return /* @__PURE__ */ C("div", {
+			B.map((e) => {
+				let n = r(e, L ?? []), i = t(e);
+				return /* @__PURE__ */ w("div", {
 					className: "FacetFilterControls__facet",
-					children: [e.facetType === "enumeration" && n && /* @__PURE__ */ S(c, {
+					children: [i && n && /* @__PURE__ */ C(l, {
 						containerAs: "Collapsible",
-						facet: e
-					}), e.facetType === "range" && n && /* @__PURE__ */ S(f, { facetResult: e })]
+						facet: i
+					}), e.facetType === "range" && n && /* @__PURE__ */ C(p, { facetResult: e })]
 				}, e.columnName);
 			}),
-			B.map(([e, t]) => {
-				let n = k?.columnModels?.find((t) => t.name === e);
-				return n && /* @__PURE__ */ S(p, {
+			V.map(([e, t]) => {
+				let n = A?.columnModels?.find((t) => t.name === e);
+				return n && /* @__PURE__ */ C(m, {
 					columnModel: n,
 					facets: t
 				}, e);
@@ -87,13 +88,13 @@ function O(e) {
 		]
 	});
 }
-function k(e) {
-	return /* @__PURE__ */ S(m, {
-		fallback: /* @__PURE__ */ S(s, {}),
-		children: /* @__PURE__ */ S(O, { ...e })
+function A(e) {
+	return /* @__PURE__ */ C(h, {
+		fallback: /* @__PURE__ */ C(c, {}),
+		children: /* @__PURE__ */ C(k, { ...e })
 	});
 }
 //#endregion
-export { D as applyChangesToValuesColumn, k as default };
+export { O as applyChangesToValuesColumn, A as default };
 
 //# sourceMappingURL=FacetFilterControls.js.map

package/dist/components/widgets/query-filter/FacetFilterControls.js.map

@@ -1 +1 @@
-{"version":3,"file":"FacetFilterControls.js","names":[],"sources":["../../../../src/components/widgets/query-filter/FacetFilterControls.tsx"],"sourcesContent":["import {\n  facetObjectMatchesDefinition,\n  getCorrespondingColumnForFacet,\n  isSingleNotSetValue,\n} from '@/utils/functions/queryUtils'\nimport {\n  FacetColumnRequest,\n  FacetColumnResultRange,\n  FacetColumnResultValues,\n  FacetColumnValuesRequest,\n  QueryBundleRequest,\n} from '@sage-bionetworks/synapse-types'\nimport { groupBy, noop, sortBy, union } from 'lodash-es'\nimport { Suspense, useCallback, useMemo, useState } from 'react'\nimport { useDeepCompareEffectNoCheck } from 'use-deep-compare-effect'\nimport { useQueryContext } from '../../QueryContext'\nimport { useQueryVisualizationContext } from '../../QueryVisualizationWrapper'\nimport { useSuspenseGetQueryMetadata } from '../../QueryWrapper/useGetQueryMetadata'\nimport { CombinedRangeFacetFilter } from './CombinedRangeFacetFilter'\nimport { EnumFacetFilter } from './EnumFacetFilter/EnumFacetFilter'\nimport { FacetChip } from './FacetChip'\nimport { FacetFilterHeader } from './FacetFilterHeader'\nimport { FacetFilterControlsSkeleton } from './FacetFilterSkeleton'\nimport { getDefaultShownFacetFilters } from './FacetFilterUtils'\nimport JsonColumnFacetFilters from './JsonColumnFacetFilters'\nimport { RangeFacetFilter } from './RangeFacetFilter'\n\nexport type FacetFilterControlsProps = {\n  /* The set of faceted column names that should be shown in the Facet controls. If undefined, all faceted columns with\n    at least one non-null value will be shown. */\n  availableFacets?: string[]\n  initialExpandedFacetControls?: string[]\n}\n\nconst convertFacetToFacetColumnValuesRequest = (\n  facet: FacetColumnResultValues,\n): FacetColumnValuesRequest => ({\n  concreteType: 'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest',\n  columnName: facet.columnName,\n  facetValues: facet.facetValues\n    .filter(facet => facet.isSelected)\n    .map(facet => facet.value),\n})\n\nconst patchRequestFacets = (\n  changedFacet: FacetColumnRequest,\n  selections: FacetColumnRequest[] = [],\n): FacetColumnRequest[] => {\n  const changedFacetIndex = selections.findIndex(facet =>\n    facetObjectMatchesDefinition(facet, changedFacet),\n  )\n  const isEmptyValuesFacet =\n    changedFacet.concreteType ===\n      'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest' &&\n    !changedFacet.facetValues?.length\n  const isEmptyRangesFacet =\n    changedFacet.concreteType ===\n      'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest' &&\n    (!changedFacet.min || !changedFacet.max)\n\n  if (changedFacetIndex > -1) {\n    if (isEmptyValuesFacet || isEmptyRangesFacet) {\n      selections.splice(changedFacetIndex, 1)\n    } else {\n      selections[changedFacetIndex] = changedFacet\n    }\n  } else {\n    selections.push(changedFacet)\n  }\n  return selections\n}\n\nexport function applyChangesToValuesColumn(\n  lastRequest: QueryBundleRequest | undefined,\n  facet: FacetColumnResultValues,\n  onChangeFn: (result: FacetColumnRequest[]) => void,\n  facetName?: string,\n  checked: boolean = false,\n) {\n  if (facetName) {\n    facet.facetValues.forEach(facetValue => {\n      if (facetValue.value === facetName) {\n        facetValue.isSelected = checked\n      }\n    })\n  } else {\n    // else clear all\n    facet.facetValues.forEach(facet => {\n      facet.isSelected = false\n    })\n  }\n\n  const changedFacet = convertFacetToFacetColumnValuesRequest(facet)\n  const result = patchRequestFacets(\n    changedFacet,\n    lastRequest?.query?.selectedFacets,\n  )\n  onChangeFn(result)\n}\n\nfunction FacetFilterControls(props: FacetFilterControlsProps) {\n  const { availableFacets, initialExpandedFacetControls } = props\n  const { getCurrentQueryRequest, combineRangeFacetConfig } = useQueryContext()\n  const { getColumnDisplayName } = useQueryVisualizationContext()\n  const lastRequest = useMemo(\n    () => getCurrentQueryRequest(),\n    [getCurrentQueryRequest],\n  )\n  const { data: queryMetadata } = useSuspenseGetQueryMetadata()\n\n  const facets = queryMetadata\n    .facets!.filter(\n      facet =>\n        // If availableFacets is configured, remove those that don't match.\n        availableFacets == null || availableFacets.includes(facet.columnName),\n    )\n    // Don't include json subcolumn facets, those will be handled separately\n    .filter(facet => facet.jsonPath == null)\n    .filter(\n      facet =>\n        // Don't show facets if included in the combine range facet config, handled separately\n        combineRangeFacetConfig == null ||\n        (combineRangeFacetConfig.maxFacetColumn !== facet.columnName &&\n          combineRangeFacetConfig.minFacetColumn !== facet.columnName),\n    )\n    .filter(\n      facet =>\n        // Don't show facets where there are no values\n        !isSingleNotSetValue(facet),\n    )\n\n  const combinedRangeFacets = combineRangeFacetConfig\n    ? queryMetadata.facets!.filter(\n        facet =>\n          combineRangeFacetConfig.maxFacetColumn === facet.columnName ||\n          combineRangeFacetConfig.minFacetColumn === facet.columnName,\n      )\n    : []\n\n  // Group JSON facets by column name, so they can be grouped in the UI under their parent column name\n  const jsonFacetsGroupedByColumn = groupBy(\n    queryMetadata.facets!.filter(f => !!f.jsonPath),\n    'columnName',\n  )\n\n  const allFacetColumns: string[] = useMemo(() => {\n    const allFacetColumns: string[] = []\n    facets.forEach(facet => allFacetColumns.push(facet.columnName))\n    if (combineRangeFacetConfig) {\n      allFacetColumns.push(combineRangeFacetConfig.label)\n    }\n    if (jsonFacetsGroupedByColumn) {\n      Object.keys(jsonFacetsGroupedByColumn).forEach(jsonColumn =>\n        allFacetColumns.push(jsonColumn),\n      )\n    }\n    return allFacetColumns\n  }, [combineRangeFacetConfig, facets, jsonFacetsGroupedByColumn])\n\n  // Controls which facet columns are shown/hidden by clicking on chips. NOTE: One column may have multiple facets (e.g. JSON subcolumn facets)\n  const [facetColumnsShown, setFacetColumnsShown] = useState<Set<string>>(\n    getDefaultShownFacetFilters(\n      allFacetColumns,\n      lastRequest.query.selectedFacets,\n    ),\n  )\n\n  /**\n   * When the data facets change, reset the initially-selected chips\n   */\n  useDeepCompareEffectNoCheck(() => {\n    // Select the first three facet columns, plus any columns where a facet is already filtered,\n    // (PORTALS-3513) plus the initially expanded filters and any filters that the user explicitly expanded\n    const expandedFacets = union(\n      initialExpandedFacetControls ?? [],\n      Array.from(facetColumnsShown),\n    )\n    setFacetColumnsShown(\n      getDefaultShownFacetFilters(\n        allFacetColumns,\n        lastRequest.query.selectedFacets,\n        expandedFacets,\n      ),\n    )\n  }, [facets])\n\n  const columnModels = queryMetadata.columnModels\n\n  const toggleShowFacetFilter = useCallback(\n    (facetColumnName: string) => {\n      const newFacetColumnsShown = new Set(facetColumnsShown)\n      if (newFacetColumnsShown.has(facetColumnName)) {\n        newFacetColumnsShown.delete(facetColumnName)\n      } else {\n        newFacetColumnsShown.add(facetColumnName)\n      }\n      setFacetColumnsShown(newFacetColumnsShown)\n    },\n    [facetColumnsShown],\n  )\n  const combinedRangeFacetsColumnModelType = combineRangeFacetConfig\n    ? columnModels?.find(\n        model => model.name === combineRangeFacetConfig.minFacetColumn,\n      )?.columnType\n    : undefined\n\n  const shownTopLevelFacets = useMemo(\n    () =>\n      (facets ?? []).filter(facet => facetColumnsShown.has(facet.columnName)),\n    [facetColumnsShown, facets],\n  )\n\n  const shownJsonFacetGroups = useMemo(\n    () =>\n      Object.entries(jsonFacetsGroupedByColumn).filter(([columnName]) =>\n        facetColumnsShown.has(columnName),\n      ),\n    [facetColumnsShown, jsonFacetsGroupedByColumn],\n  )\n\n  return (\n    <div className={`FacetFilterControls`}>\n      <div>\n        <FacetFilterHeader\n          label={'Available Filters'}\n          hideCollapsible\n          isCollapsed={false}\n          onClick={noop}\n        />\n        {sortBy(allFacetColumns).map(columnName => {\n          return (\n            <FacetChip\n              key={columnName}\n              onClick={() => toggleShowFacetFilter(columnName)}\n              isChecked={facetColumnsShown.has(columnName)}\n            >\n              {getColumnDisplayName(columnName)}\n            </FacetChip>\n          )\n        })}\n      </div>\n      {combineRangeFacetConfig && combinedRangeFacets.length >= 2 && (\n        <CombinedRangeFacetFilter\n          facetResults={combinedRangeFacets as FacetColumnResultRange[]}\n          label={combineRangeFacetConfig.label}\n          columnType={combinedRangeFacetsColumnModelType!}\n        />\n      )}\n      {shownTopLevelFacets.map(facet => {\n        const columnModel = getCorrespondingColumnForFacet(\n          facet,\n          columnModels ?? [],\n        )\n        return (\n          <div className=\"FacetFilterControls__facet\" key={facet.columnName}>\n            {facet.facetType === 'enumeration' && columnModel && (\n              <EnumFacetFilter containerAs=\"Collapsible\" facet={facet} />\n            )}\n            {facet.facetType === 'range' && columnModel && (\n              <RangeFacetFilter facetResult={facet} />\n            )}\n          </div>\n        )\n      })}\n      {shownJsonFacetGroups.map(([columnName, facets]) => {\n        const columnModel = queryMetadata?.columnModels?.find(\n          cm => cm.name === columnName,\n        )\n        return (\n          columnModel && (\n            <JsonColumnFacetFilters\n              key={columnName}\n              columnModel={columnModel}\n              facets={facets}\n            />\n          )\n        )\n      })}\n    </div>\n  )\n}\n\nexport default function FacetFilterControlsWithSuspense(\n  props: FacetFilterControlsProps,\n) {\n  return (\n    <Suspense fallback={<FacetFilterControlsSkeleton />}>\n      <FacetFilterControls {...props} />\n    </Suspense>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"FacetFilterControls.js","names":[],"sources":["../../../../src/components/widgets/query-filter/FacetFilterControls.tsx"],"sourcesContent":["import {\n  EnumerationFacet,\n  getEnumerationFacet,\n} from '@/utils/functions/enumerationFacet'\nimport {\n  facetObjectMatchesDefinition,\n  getCorrespondingColumnForFacet,\n  isSingleNotSetValue,\n} from '@/utils/functions/queryUtils'\nimport {\n  FacetColumnRequest,\n  FacetColumnResultRange,\n  FacetColumnValuesRequest,\n  QueryBundleRequest,\n} from '@sage-bionetworks/synapse-types'\nimport { groupBy, noop, sortBy, union } from 'lodash-es'\nimport { Suspense, useCallback, useMemo, useState } from 'react'\nimport { useDeepCompareEffectNoCheck } from 'use-deep-compare-effect'\nimport { useQueryContext } from '../../QueryContext'\nimport { useQueryVisualizationContext } from '../../QueryVisualizationWrapper'\nimport { useSuspenseGetQueryMetadata } from '../../QueryWrapper/useGetQueryMetadata'\nimport { CombinedRangeFacetFilter } from './CombinedRangeFacetFilter'\nimport { EnumFacetFilter } from './EnumFacetFilter/EnumFacetFilter'\nimport { FacetChip } from './FacetChip'\nimport { FacetFilterHeader } from './FacetFilterHeader'\nimport { FacetFilterControlsSkeleton } from './FacetFilterSkeleton'\nimport { getDefaultShownFacetFilters } from './FacetFilterUtils'\nimport JsonColumnFacetFilters from './JsonColumnFacetFilters'\nimport { RangeFacetFilter } from './RangeFacetFilter'\n\nexport type FacetFilterControlsProps = {\n  /* The set of faceted column names that should be shown in the Facet controls. If undefined, all faceted columns with\n    at least one non-null value will be shown. */\n  availableFacets?: string[]\n  initialExpandedFacetControls?: string[]\n}\n\nconst convertFacetToFacetColumnValuesRequest = (\n  facet: EnumerationFacet,\n): FacetColumnValuesRequest => ({\n  concreteType: 'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest',\n  columnName: facet.columnName,\n  facetValues: facet.facetValues\n    .filter(facet => facet.isSelected)\n    .map(facet => facet.value),\n})\n\nconst patchRequestFacets = (\n  changedFacet: FacetColumnRequest,\n  selections: FacetColumnRequest[] = [],\n): FacetColumnRequest[] => {\n  const changedFacetIndex = selections.findIndex(facet =>\n    facetObjectMatchesDefinition(facet, changedFacet),\n  )\n  const isEmptyValuesFacet =\n    changedFacet.concreteType ===\n      'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest' &&\n    !changedFacet.facetValues?.length\n  const isEmptyRangesFacet =\n    changedFacet.concreteType ===\n      'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest' &&\n    (!changedFacet.min || !changedFacet.max)\n\n  if (changedFacetIndex > -1) {\n    if (isEmptyValuesFacet || isEmptyRangesFacet) {\n      selections.splice(changedFacetIndex, 1)\n    } else {\n      selections[changedFacetIndex] = changedFacet\n    }\n  } else {\n    selections.push(changedFacet)\n  }\n  return selections\n}\n\nexport function applyChangesToValuesColumn(\n  lastRequest: QueryBundleRequest | undefined,\n  facet: EnumerationFacet,\n  onChangeFn: (result: FacetColumnRequest[]) => void,\n  facetName?: string,\n  checked: boolean = false,\n) {\n  if (facetName) {\n    facet.facetValues.forEach(facetValue => {\n      if (facetValue.value === facetName) {\n        facetValue.isSelected = checked\n      }\n    })\n  } else {\n    // else clear all\n    facet.facetValues.forEach(facet => {\n      facet.isSelected = false\n    })\n  }\n\n  const changedFacet = convertFacetToFacetColumnValuesRequest(facet)\n  const result = patchRequestFacets(\n    changedFacet,\n    lastRequest?.query?.selectedFacets,\n  )\n  onChangeFn(result)\n}\n\nfunction FacetFilterControls(props: FacetFilterControlsProps) {\n  const { availableFacets, initialExpandedFacetControls } = props\n  const { getCurrentQueryRequest, combineRangeFacetConfig } = useQueryContext()\n  const { getColumnDisplayName } = useQueryVisualizationContext()\n  const lastRequest = useMemo(\n    () => getCurrentQueryRequest(),\n    [getCurrentQueryRequest],\n  )\n  const { data: queryMetadata } = useSuspenseGetQueryMetadata()\n\n  const facets = queryMetadata\n    .facets!.filter(\n      facet =>\n        // If availableFacets is configured, remove those that don't match.\n        availableFacets == null || availableFacets.includes(facet.columnName),\n    )\n    // Don't include json subcolumn facets, those will be handled separately\n    .filter(facet => facet.jsonPath == null)\n    .filter(\n      facet =>\n        // Don't show facets if included in the combine range facet config, handled separately\n        combineRangeFacetConfig == null ||\n        (combineRangeFacetConfig.maxFacetColumn !== facet.columnName &&\n          combineRangeFacetConfig.minFacetColumn !== facet.columnName),\n    )\n    .filter(\n      facet =>\n        // Don't show facets where there are no values\n        !isSingleNotSetValue(facet),\n    )\n\n  const combinedRangeFacets = combineRangeFacetConfig\n    ? queryMetadata.facets!.filter(\n        facet =>\n          combineRangeFacetConfig.maxFacetColumn === facet.columnName ||\n          combineRangeFacetConfig.minFacetColumn === facet.columnName,\n      )\n    : []\n\n  // Group JSON facets by column name, so they can be grouped in the UI under their parent column name\n  const jsonFacetsGroupedByColumn = groupBy(\n    queryMetadata.facets!.filter(f => !!f.jsonPath),\n    'columnName',\n  )\n\n  const allFacetColumns: string[] = useMemo(() => {\n    const allFacetColumns: string[] = []\n    facets.forEach(facet => allFacetColumns.push(facet.columnName))\n    if (combineRangeFacetConfig) {\n      allFacetColumns.push(combineRangeFacetConfig.label)\n    }\n    if (jsonFacetsGroupedByColumn) {\n      Object.keys(jsonFacetsGroupedByColumn).forEach(jsonColumn =>\n        allFacetColumns.push(jsonColumn),\n      )\n    }\n    return allFacetColumns\n  }, [combineRangeFacetConfig, facets, jsonFacetsGroupedByColumn])\n\n  // Controls which facet columns are shown/hidden by clicking on chips. NOTE: One column may have multiple facets (e.g. JSON subcolumn facets)\n  const [facetColumnsShown, setFacetColumnsShown] = useState<Set<string>>(\n    getDefaultShownFacetFilters(\n      allFacetColumns,\n      lastRequest.query.selectedFacets,\n    ),\n  )\n\n  /**\n   * When the data facets change, reset the initially-selected chips\n   */\n  useDeepCompareEffectNoCheck(() => {\n    // Select the first three facet columns, plus any columns where a facet is already filtered,\n    // (PORTALS-3513) plus the initially expanded filters and any filters that the user explicitly expanded\n    const expandedFacets = union(\n      initialExpandedFacetControls ?? [],\n      Array.from(facetColumnsShown),\n    )\n    setFacetColumnsShown(\n      getDefaultShownFacetFilters(\n        allFacetColumns,\n        lastRequest.query.selectedFacets,\n        expandedFacets,\n      ),\n    )\n  }, [facets])\n\n  const columnModels = queryMetadata.columnModels\n\n  const toggleShowFacetFilter = useCallback(\n    (facetColumnName: string) => {\n      const newFacetColumnsShown = new Set(facetColumnsShown)\n      if (newFacetColumnsShown.has(facetColumnName)) {\n        newFacetColumnsShown.delete(facetColumnName)\n      } else {\n        newFacetColumnsShown.add(facetColumnName)\n      }\n      setFacetColumnsShown(newFacetColumnsShown)\n    },\n    [facetColumnsShown],\n  )\n  const combinedRangeFacetsColumnModelType = combineRangeFacetConfig\n    ? columnModels?.find(\n        model => model.name === combineRangeFacetConfig.minFacetColumn,\n      )?.columnType\n    : undefined\n\n  const shownTopLevelFacets = useMemo(\n    () =>\n      (facets ?? []).filter(facet => facetColumnsShown.has(facet.columnName)),\n    [facetColumnsShown, facets],\n  )\n\n  const shownJsonFacetGroups = useMemo(\n    () =>\n      Object.entries(jsonFacetsGroupedByColumn).filter(([columnName]) =>\n        facetColumnsShown.has(columnName),\n      ),\n    [facetColumnsShown, jsonFacetsGroupedByColumn],\n  )\n\n  return (\n    <div className={`FacetFilterControls`}>\n      <div>\n        <FacetFilterHeader\n          label={'Available Filters'}\n          hideCollapsible\n          isCollapsed={false}\n          onClick={noop}\n        />\n        {sortBy(allFacetColumns).map(columnName => {\n          return (\n            <FacetChip\n              key={columnName}\n              onClick={() => toggleShowFacetFilter(columnName)}\n              isChecked={facetColumnsShown.has(columnName)}\n            >\n              {getColumnDisplayName(columnName)}\n            </FacetChip>\n          )\n        })}\n      </div>\n      {combineRangeFacetConfig && combinedRangeFacets.length >= 2 && (\n        <CombinedRangeFacetFilter\n          facetResults={combinedRangeFacets as FacetColumnResultRange[]}\n          label={combineRangeFacetConfig.label}\n          columnType={combinedRangeFacetsColumnModelType!}\n        />\n      )}\n      {shownTopLevelFacets.map(facet => {\n        const columnModel = getCorrespondingColumnForFacet(\n          facet,\n          columnModels ?? [],\n        )\n        const enumerationFacet = getEnumerationFacet(facet)\n        return (\n          <div className=\"FacetFilterControls__facet\" key={facet.columnName}>\n            {enumerationFacet && columnModel && (\n              <EnumFacetFilter\n                containerAs=\"Collapsible\"\n                facet={enumerationFacet}\n              />\n            )}\n            {facet.facetType === 'range' && columnModel && (\n              <RangeFacetFilter facetResult={facet} />\n            )}\n          </div>\n        )\n      })}\n      {shownJsonFacetGroups.map(([columnName, facets]) => {\n        const columnModel = queryMetadata?.columnModels?.find(\n          cm => cm.name === columnName,\n        )\n        return (\n          columnModel && (\n            <JsonColumnFacetFilters\n              key={columnName}\n              columnModel={columnModel}\n              facets={facets}\n            />\n          )\n        )\n      })}\n    </div>\n  )\n}\n\nexport default function FacetFilterControlsWithSuspense(\n  props: FacetFilterControlsProps,\n) {\n  return (\n    <Suspense fallback={<FacetFilterControlsSkeleton />}>\n      <FacetFilterControls {...props} />\n    </Suspense>\n  )\n}\n"],"mappings":"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"}

package/dist/components/widgets/query-filter/JsonColumnFacetFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonColumnFacetFilters.d.ts","sourceRoot":"","sources":["../../../../src/components/widgets/query-filter/JsonColumnFacetFilters.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAQhF,MAAM,MAAM,2BAA2B,GAAG;IAExC,WAAW,EAAE,WAAW,CAAA;IAExB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,KAAK,EAAE,2BAA2B,2CAiEnC"}
+{"version":3,"file":"JsonColumnFacetFilters.d.ts","sourceRoot":"","sources":["../../../../src/components/widgets/query-filter/JsonColumnFacetFilters.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAQhF,MAAM,MAAM,2BAA2B,GAAG;IAExC,WAAW,EAAE,WAAW,CAAA;IAExB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,KAAK,EAAE,2BAA2B,2CAiEnC"}

package/dist/components/widgets/query-filter/JsonColumnFacetFilters.js

@@ -1,30 +1,31 @@
-import { getCorrespondingColumnForFacet as e } from "../../../utils/functions/queryUtils.js";
-import { useSuspenseGetQueryMetadata as t } from "../../QueryWrapper/useGetQueryMetadata.js";
-import { useQueryVisualizationContext as n } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { useQueryVisualizationContext as e } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { getEnumerationFacet as t } from "../../../utils/functions/enumerationFacet.js";
+import { getCorrespondingColumnForFacet as n } from "../../../utils/functions/queryUtils.js";
+import { useSuspenseGetQueryMetadata as r } from "../../QueryWrapper/useGetQueryMetadata.js";
 import "../../QueryVisualizationWrapper/index.js";
-import { FacetFilterHeader as r } from "./FacetFilterHeader.js";
-import { EnumFacetFilter as i } from "./EnumFacetFilter/EnumFacetFilter.js";
-import { RangeFacetFilter as a } from "./RangeFacetFilter.js";
-import { useState as o } from "react";
-import { Box as s, Collapse as c } from "@mui/material";
-import { Fragment as l, jsx as u, jsxs as d } from "react/jsx-runtime";
+import { FacetFilterHeader as i } from "./FacetFilterHeader.js";
+import { EnumFacetFilter as a } from "./EnumFacetFilter/EnumFacetFilter.js";
+import { RangeFacetFilter as o } from "./RangeFacetFilter.js";
+import { useState as s } from "react";
+import { Box as c, Collapse as l } from "@mui/material";
+import { Fragment as u, jsx as d, jsxs as f } from "react/jsx-runtime";
 //#region src/components/widgets/query-filter/JsonColumnFacetFilters.tsx
-function f(f) {
-	let { columnModel: p, facets: m } = f, { getColumnDisplayName: h } = n(), { data: g } = t(), [_, v] = o(!1);
-	return g.columnModels == null ? /* @__PURE__ */ u(l, {}) : p.jsonSubColumns ? /* @__PURE__ */ d(s, {
+function p(p) {
+	let { columnModel: m, facets: h } = p, { getColumnDisplayName: g } = e(), { data: _ } = r(), [v, y] = s(!1);
+	return _.columnModels == null ? /* @__PURE__ */ d(u, {}) : m.jsonSubColumns ? /* @__PURE__ */ f(c, {
 		className: "FacetFilterControls__facet",
-		children: [/* @__PURE__ */ u(r, {
-			label: h(p.name),
-			isCollapsed: _,
-			onClick: (e) => v(e)
-		}), /* @__PURE__ */ u(c, {
+		children: [/* @__PURE__ */ d(i, {
+			label: g(m.name),
+			isCollapsed: v,
+			onClick: (e) => y(e)
+		}), /* @__PURE__ */ d(l, {
 			className: "JsonColumnFacetFilters",
-			in: !_,
-			children: /* @__PURE__ */ u(s, {
+			in: !v,
+			children: /* @__PURE__ */ d(c, {
 				sx: { my: 2 },
-				children: m.map((t) => {
-					let n = e(t, g.columnModels);
-					return /* @__PURE__ */ d(s, {
+				children: h.map((e) => {
+					let r = n(e, _.columnModels), i = t(e);
+					return /* @__PURE__ */ f(c, {
 						className: "FacetFilterControls__facet",
 						sx: {
 							my: 1.5,
@@ -32,21 +33,21 @@ function f(f) {
 							p: 2.5,
 							".FacetFilterHeader": { borderBottom: "none" }
 						},
-						children: [t.facetType === "enumeration" && n && /* @__PURE__ */ u(i, {
+						children: [i && r && /* @__PURE__ */ d(a, {
 							containerAs: "Collapsible",
-							facet: t,
+							facet: i,
 							hideCollapsible: !0
-						}), t.facetType === "range" && n && /* @__PURE__ */ u(a, {
-							facetResult: t,
+						}), e.facetType === "range" && r && /* @__PURE__ */ d(o, {
+							facetResult: e,
 							hideCollapsible: !0
 						})]
-					}, t.jsonPath);
+					}, e.jsonPath);
 				})
 			})
 		})]
-	}) : (console.warn("Supplied column model has no jsonSubColumns"), /* @__PURE__ */ u(l, {}));
+	}) : (console.warn("Supplied column model has no jsonSubColumns"), /* @__PURE__ */ d(u, {}));
 }
 //#endregion
-export { f as default };
+export { p as default };
 
 //# sourceMappingURL=JsonColumnFacetFilters.js.map

package/dist/components/widgets/query-filter/JsonColumnFacetFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonColumnFacetFilters.js","names":[],"sources":["../../../../src/components/widgets/query-filter/JsonColumnFacetFilters.tsx"],"sourcesContent":["import { getCorrespondingColumnForFacet } from '@/utils/functions/queryUtils'\nimport { Box, Collapse } from '@mui/material'\nimport { ColumnModel, FacetColumnResult } from '@sage-bionetworks/synapse-types'\nimport { useState } from 'react'\nimport { useQueryVisualizationContext } from '../../QueryVisualizationWrapper'\nimport { useSuspenseGetQueryMetadata } from '../../QueryWrapper/useGetQueryMetadata'\nimport { EnumFacetFilter } from './EnumFacetFilter/EnumFacetFilter'\nimport { FacetFilterHeader } from './FacetFilterHeader'\nimport { RangeFacetFilter } from './RangeFacetFilter'\n\nexport type JsonColumnFacetFiltersProps = {\n  /* The parent ColumnModel that contains the JSON Subcolumns to show in this panel */\n  columnModel: ColumnModel\n  /* The set of JSON Subcolumn FacetColumnResults that will be shown in this panel */\n  facets: FacetColumnResult[]\n}\n\n/**\n * Renders a set of facet filters that are all derived from the same JSON Column.\n * @param props\n * @constructor\n */\nexport default function JsonColumnFacetFilters(\n  props: JsonColumnFacetFiltersProps,\n) {\n  const { columnModel, facets } = props\n  const { getColumnDisplayName } = useQueryVisualizationContext()\n\n  const { data: queryMetadata } = useSuspenseGetQueryMetadata()\n\n  const [isCollapsed, setIsCollapsed] = useState<boolean>(false)\n\n  if (queryMetadata.columnModels == undefined) {\n    return <></>\n  }\n  if (!columnModel.jsonSubColumns) {\n    console.warn('Supplied column model has no jsonSubColumns')\n    return <></>\n  }\n  return (\n    <Box className={'FacetFilterControls__facet'}>\n      <FacetFilterHeader\n        label={getColumnDisplayName(columnModel.name)}\n        isCollapsed={isCollapsed}\n        onClick={(isCollapsed: boolean) => setIsCollapsed(isCollapsed)}\n      />\n      <Collapse className=\"JsonColumnFacetFilters\" in={!isCollapsed}>\n        <Box sx={{ my: 2 }}>\n          {facets.map(jsonSubcolumnFacet => {\n            const jsonSubColumnModel = getCorrespondingColumnForFacet(\n              jsonSubcolumnFacet,\n              queryMetadata.columnModels!,\n            )\n            return (\n              <Box\n                className=\"FacetFilterControls__facet\"\n                key={jsonSubcolumnFacet.jsonPath}\n                sx={{\n                  my: 1.5,\n                  backgroundColor: 'grey.100',\n                  p: 2.5,\n                  '.FacetFilterHeader': {\n                    borderBottom: 'none',\n                  },\n                }}\n              >\n                {jsonSubcolumnFacet.facetType === 'enumeration' &&\n                  jsonSubColumnModel && (\n                    <EnumFacetFilter\n                      containerAs=\"Collapsible\"\n                      facet={jsonSubcolumnFacet}\n                      hideCollapsible={true}\n                    />\n                  )}\n                {jsonSubcolumnFacet.facetType === 'range' &&\n                  jsonSubColumnModel && (\n                    <RangeFacetFilter\n                      facetResult={jsonSubcolumnFacet}\n                      hideCollapsible={true}\n                    />\n                  )}\n              </Box>\n            )\n          })}\n        </Box>\n      </Collapse>\n    </Box>\n  )\n}\n"],"mappings":";;;;;;;;;;;AAsBA,SAAwB,EACtB,GACA;CACA,IAAM,EAAE,gBAAa,cAAW,GAC1B,EAAE,4BAAyB,EAA6B,GAExD,EAAE,MAAM,MAAkB,EAA4B,GAEtD,CAAC,GAAa,KAAkB,EAAkB,EAAK;CAS7D,OAPI,EAAc,gBAAgB,OACzB,kBAAA,GAAA,CAAI,CAAA,IAER,EAAY,iBAKf,kBAAC,GAAD;EAAK,WAAW;YAAhB,CACE,kBAAC,GAAD;GACE,OAAO,EAAqB,EAAY,IAAI;GAC/B;GACb,UAAU,MAAyB,EAAe,CAAW;EAC9D,CAAA,GACD,kBAAC,GAAD;GAAU,WAAU;GAAyB,IAAI,CAAC;aAChD,kBAAC,GAAD;IAAK,IAAI,EAAE,IAAI,EAAE;cACd,EAAO,KAAI,MAAsB;KAChC,IAAM,IAAqB,EACzB,GACA,EAAc,YAChB;KACA,OACE,kBAAC,GAAD;MACE,WAAU;MAEV,IAAI;OACF,IAAI;OACJ,iBAAiB;OACjB,GAAG;OACH,sBAAsB,EACpB,cAAc,OAChB;MACF;gBAVF,CAYG,EAAmB,cAAc,iBAChC,KACE,kBAAC,GAAD;OACE,aAAY;OACZ,OAAO;OACP,iBAAiB;MAClB,CAAA,GAEJ,EAAmB,cAAc,WAChC,KACE,kBAAC,GAAD;OACE,aAAa;OACb,iBAAiB;MAClB,CAAA,CAEF;QAzBE,EAAmB,QAyBrB;IAET,CAAC;GACE,CAAA;EACG,CAAA,CACP;OAlDL,QAAQ,KAAK,6CAA6C,GACnD,kBAAA,GAAA,CAAI,CAAA;AAmDf"}
+{"version":3,"file":"JsonColumnFacetFilters.js","names":[],"sources":["../../../../src/components/widgets/query-filter/JsonColumnFacetFilters.tsx"],"sourcesContent":["import { getEnumerationFacet } from '@/utils/functions/enumerationFacet'\nimport { getCorrespondingColumnForFacet } from '@/utils/functions/queryUtils'\nimport { Box, Collapse } from '@mui/material'\nimport { ColumnModel, FacetColumnResult } from '@sage-bionetworks/synapse-types'\nimport { useState } from 'react'\nimport { useQueryVisualizationContext } from '../../QueryVisualizationWrapper'\nimport { useSuspenseGetQueryMetadata } from '../../QueryWrapper/useGetQueryMetadata'\nimport { EnumFacetFilter } from './EnumFacetFilter/EnumFacetFilter'\nimport { FacetFilterHeader } from './FacetFilterHeader'\nimport { RangeFacetFilter } from './RangeFacetFilter'\n\nexport type JsonColumnFacetFiltersProps = {\n  /* The parent ColumnModel that contains the JSON Subcolumns to show in this panel */\n  columnModel: ColumnModel\n  /* The set of JSON Subcolumn FacetColumnResults that will be shown in this panel */\n  facets: FacetColumnResult[]\n}\n\n/**\n * Renders a set of facet filters that are all derived from the same JSON Column.\n * @param props\n * @constructor\n */\nexport default function JsonColumnFacetFilters(\n  props: JsonColumnFacetFiltersProps,\n) {\n  const { columnModel, facets } = props\n  const { getColumnDisplayName } = useQueryVisualizationContext()\n\n  const { data: queryMetadata } = useSuspenseGetQueryMetadata()\n\n  const [isCollapsed, setIsCollapsed] = useState<boolean>(false)\n\n  if (queryMetadata.columnModels == undefined) {\n    return <></>\n  }\n  if (!columnModel.jsonSubColumns) {\n    console.warn('Supplied column model has no jsonSubColumns')\n    return <></>\n  }\n  return (\n    <Box className={'FacetFilterControls__facet'}>\n      <FacetFilterHeader\n        label={getColumnDisplayName(columnModel.name)}\n        isCollapsed={isCollapsed}\n        onClick={(isCollapsed: boolean) => setIsCollapsed(isCollapsed)}\n      />\n      <Collapse className=\"JsonColumnFacetFilters\" in={!isCollapsed}>\n        <Box sx={{ my: 2 }}>\n          {facets.map(jsonSubcolumnFacet => {\n            const jsonSubColumnModel = getCorrespondingColumnForFacet(\n              jsonSubcolumnFacet,\n              queryMetadata.columnModels!,\n            )\n            const enumerationFacet = getEnumerationFacet(jsonSubcolumnFacet)\n            return (\n              <Box\n                className=\"FacetFilterControls__facet\"\n                key={jsonSubcolumnFacet.jsonPath}\n                sx={{\n                  my: 1.5,\n                  backgroundColor: 'grey.100',\n                  p: 2.5,\n                  '.FacetFilterHeader': {\n                    borderBottom: 'none',\n                  },\n                }}\n              >\n                {enumerationFacet && jsonSubColumnModel && (\n                  <EnumFacetFilter\n                    containerAs=\"Collapsible\"\n                    facet={enumerationFacet}\n                    hideCollapsible={true}\n                  />\n                )}\n                {jsonSubcolumnFacet.facetType === 'range' &&\n                  jsonSubColumnModel && (\n                    <RangeFacetFilter\n                      facetResult={jsonSubcolumnFacet}\n                      hideCollapsible={true}\n                    />\n                  )}\n              </Box>\n            )\n          })}\n        </Box>\n      </Collapse>\n    </Box>\n  )\n}\n"],"mappings":";;;;;;;;;;;;AAuBA,SAAwB,EACtB,GACA;CACA,IAAM,EAAE,gBAAa,cAAW,GAC1B,EAAE,4BAAyB,EAA6B,GAExD,EAAE,MAAM,MAAkB,EAA4B,GAEtD,CAAC,GAAa,KAAkB,EAAkB,EAAK;CAS7D,OAPI,EAAc,gBAAgB,OACzB,kBAAA,GAAA,CAAI,CAAA,IAER,EAAY,iBAKf,kBAAC,GAAD;EAAK,WAAW;YAAhB,CACE,kBAAC,GAAD;GACE,OAAO,EAAqB,EAAY,IAAI;GAC/B;GACb,UAAU,MAAyB,EAAe,CAAW;EAC9D,CAAA,GACD,kBAAC,GAAD;GAAU,WAAU;GAAyB,IAAI,CAAC;aAChD,kBAAC,GAAD;IAAK,IAAI,EAAE,IAAI,EAAE;cACd,EAAO,KAAI,MAAsB;KAChC,IAAM,IAAqB,EACzB,GACA,EAAc,YAChB,GACM,IAAmB,EAAoB,CAAkB;KAC/D,OACE,kBAAC,GAAD;MACE,WAAU;MAEV,IAAI;OACF,IAAI;OACJ,iBAAiB;OACjB,GAAG;OACH,sBAAsB,EACpB,cAAc,OAChB;MACF;gBAVF,CAYG,KAAoB,KACnB,kBAAC,GAAD;OACE,aAAY;OACZ,OAAO;OACP,iBAAiB;MAClB,CAAA,GAEF,EAAmB,cAAc,WAChC,KACE,kBAAC,GAAD;OACE,aAAa;OACb,iBAAiB;MAClB,CAAA,CAEF;QAxBE,EAAmB,QAwBrB;IAET,CAAC;GACE,CAAA;EACG,CAAA,CACP;OAlDL,QAAQ,KAAK,6CAA6C,GACnD,kBAAA,GAAA,CAAI,CAAA;AAmDf"}

package/dist/components/widgets/query-filter/RangeFacetFilter.js

@@ -1,9 +1,9 @@
 import { FRIENDLY_VALUE_NOT_SET as e, VALUE_NOT_SET as t } from "../../../utils/SynapseConstants.js";
-import { getCorrespondingColumnForFacet as n } from "../../../utils/functions/queryUtils.js";
-import { useQueryContext as r } from "../../QueryContext/QueryContext.js";
+import { useQueryVisualizationContext as n } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { getCorrespondingColumnForFacet as r } from "../../../utils/functions/queryUtils.js";
+import { useQueryContext as i } from "../../QueryContext/QueryContext.js";
 import "../../QueryContext/index.js";
-import { useSuspenseGetQueryMetadata as i } from "../../QueryWrapper/useGetQueryMetadata.js";
-import { useQueryVisualizationContext as a } from "../../QueryVisualizationWrapper/QueryVisualizationContext.js";
+import { useSuspenseGetQueryMetadata as a } from "../../QueryWrapper/useGetQueryMetadata.js";
 import "../../QueryVisualizationWrapper/index.js";
 import { RangeFacetFilterUI as o } from "./RangeFacetFilterUI.js";
 import { useMemo as s } from "react";
@@ -27,7 +27,7 @@ var d = /* @__PURE__ */ function(e) {
 	}
 ];
 function p(e) {
-	let { facetResult: d, hideCollapsible: f = !1 } = e, { setRangeFacetValue: p, removeSelectedFacet: m, getCurrentQueryRequest: h } = r(), { data: g } = i(), _ = g.columnModels ? n(d, g.columnModels) : void 0, { getColumnDisplayName: v } = a(), y = s(() => h(), [h]);
+	let { facetResult: d, hideCollapsible: f = !1 } = e, { setRangeFacetValue: p, removeSelectedFacet: m, getCurrentQueryRequest: h } = i(), { data: g } = a(), _ = g.columnModels ? r(d, g.columnModels) : void 0, { getColumnDisplayName: v } = n(), y = s(() => h(), [h]);
 	return _ ? /* @__PURE__ */ u(o, {
 		label: v(d.columnName, d.jsonPath),
 		facetResult: d,

package/dist/mocks/cohortBuilder/cohortBuilderMockProfiles.d.ts

@@ -0,0 +1,53 @@
+import { AggregateCountSuppressionStrategy } from '@sage-bionetworks/synapse-client/generated/models/AggregateCountSuppressionStrategy';
+import { FacetPostProcessingConfig } from '@sage-bionetworks/synapse-client/generated/models/FacetPostProcessingConfig';
+/**
+ * Best-guess Cohort Builder 2.0 source layout, expressed as the columns the two
+ * VirtualTables expose. The participant-perspective VT groups MATERIAL by
+ * participant; the data-perspective VT groups MATERIAL by file/dataset reference.
+ * Data attributes keep the same column name in both VTs (a STRING_LIST in the
+ * participant VT, a scalar in MATERIAL and the data VT) so one filter tree can be
+ * applied to both as a defining condition.
+ */
+/** Relative frequency of each value, used by the synthetic data generator. */
+export type WeightedValues = Readonly<Record<string, number>>;
+export type MockParticipantAttribute = {
+    name: string;
+    values: WeightedValues;
+    isQuasiIdentifier: boolean;
+};
+export type MockAssay = {
+    assay: string;
+    dataType: string;
+    fileFormats: readonly string[];
+    /** Portal-specific data attributes (e.g. specimenType, tissue) and their possible values. */
+    extraAttributes: Readonly<Record<string, readonly string[]>>;
+};
+export type MockStudy = {
+    name: string;
+    participantCount: number;
+    /** FILE studies map participants to individual files; DATASET studies map every participant to every study dataset. */
+    mapping: 'FILE' | 'DATASET';
+    assays: readonly MockAssay[];
+};
+export type CohortBuilderMockProfile = {
+    portalName: string;
+    participantIdPrefix: string;
+    participantsVirtualTableId: string;
+    dataVirtualTableId: string;
+    /** First synthetic entity ID assigned to a file or dataset reference. */
+    firstReferenceEntityId: number;
+    participantAttributes: readonly MockParticipantAttribute[];
+    extraDataAttributeNames: readonly string[];
+    studies: readonly MockStudy[];
+    suppressionThreshold: number;
+    countSuppressionStrategy: AggregateCountSuppressionStrategy;
+    facetPostProcessingConfig: FacetPostProcessingConfig;
+};
+export declare const PARTICIPANT_ID_COLUMN_NAME = "individualId";
+export declare const STUDY_COLUMN_NAME = "study";
+export declare const DATA_REFERENCE_COLUMN_NAME = "dataReference";
+export declare const REFERENCE_TYPE_COLUMN_NAME = "referenceType";
+export declare const CORE_DATA_ATTRIBUTE_NAMES: readonly ["dataType", "assay", "fileFormat"];
+export declare const ELITE_MOCK_PROFILE: CohortBuilderMockProfile;
+export declare const ADKP_MOCK_PROFILE: CohortBuilderMockProfile;
+//# sourceMappingURL=cohortBuilderMockProfiles.d.ts.map

package/dist/mocks/cohortBuilder/cohortBuilderMockProfiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cohortBuilderMockProfiles.d.ts","sourceRoot":"","sources":["../../../src/mocks/cohortBuilder/cohortBuilderMockProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,qFAAqF,CAAA;AACvI,OAAO,EAAE,yBAAyB,EAAE,MAAM,6EAA6E,CAAA;AAEvH;;;;;;;GAOG;AAEH,8EAA8E;AAC9E,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAE7D,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,cAAc,CAAA;IACtB,iBAAiB,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9B,6FAA6F;IAC7F,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAA;CAC7D,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,gBAAgB,EAAE,MAAM,CAAA;IACxB,uHAAuH;IACvH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,MAAM,EAAE,SAAS,SAAS,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,0BAA0B,EAAE,MAAM,CAAA;IAClC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,yEAAyE;IACzE,sBAAsB,EAAE,MAAM,CAAA;IAC9B,qBAAqB,EAAE,SAAS,wBAAwB,EAAE,CAAA;IAC1D,uBAAuB,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1C,OAAO,EAAE,SAAS,SAAS,EAAE,CAAA;IAC7B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,wBAAwB,EAAE,iCAAiC,CAAA;IAC3D,yBAAyB,EAAE,yBAAyB,CAAA;CACrD,CAAA;AAED,eAAO,MAAM,0BAA0B,iBAAiB,CAAA;AACxD,eAAO,MAAM,iBAAiB,UAAU,CAAA;AACxC,eAAO,MAAM,0BAA0B,kBAAkB,CAAA;AACzD,eAAO,MAAM,0BAA0B,kBAAkB,CAAA;AACzD,eAAO,MAAM,yBAAyB,8CAI5B,CAAA;AA8BV,eAAO,MAAM,kBAAkB,EAAE,wBA8JhC,CAAA;AASD,eAAO,MAAM,iBAAiB,EAAE,wBAmK/B,CAAA"}