synapse-react-client 4.0.20 → 4.0.22

package/dist/components/RssFeedCards/RssFeedCards.js

@@ -1,135 +1,126 @@
 import e from "../../assets/icons/NoData.js";
 import { LargeButton as t } from "../styled/LargeButton.js";
 import { ForwardRef as n } from "../../assets/icons/subscribe_plus.js";
-import { Component as r } from "react";
+import { useState as r } from "react";
 import { Fragment as i, jsx as a, jsxs as o } from "react/jsx-runtime";
-import s from "dayjs";
-import c from "react-mailchimp-subscribe";
-import l from "rss-parser";
+import { queryOptions as s, useQuery as c } from "@tanstack/react-query";
+import l from "dayjs";
+import u from "react-mailchimp-subscribe";
+import d from "rss-parser";
 //#region src/components/RssFeedCards/RssFeedCards.tsx
-var u = new l(), d = class extends r {
-	_isMounted = !1;
-	constructor(e) {
-		super(e), this.state = {
-			rssFeed: {},
-			isLoadingError: !1,
-			isShowingSubscribeUI: !1
-		};
-	}
-	componentDidMount() {
-		this._isMounted = !0;
-		let { url: e, filter: t } = this.props, n = t?.value, r = t?.type, i = `${e}${n ? `/${r ?? "tag"}/${n.replace(" ", "-")}` : ""}`, a = `${i}/?feed=rss2`;
-		fetch(a).then((e) => e.text()).then((e) => u.parseString(e)).then((e) => {
-			this._isMounted && this.setState({
-				rssFeed: e,
-				allItemsUrl: i
-			});
-		}).catch((e) => {
-			this._isMounted && this.setState({ isLoadingError: !0 });
-		});
-	}
-	componentWillUnmount() {
-		this._isMounted = !1;
-	}
-	onClickSubscribe = () => {
-		this.setState({ isShowingSubscribeUI: !0 });
+var f = new d();
+function p(e, t) {
+	let n = t?.value, r = t?.type, i = `${e}${n ? `/${r ?? "tag"}/${n.replace(" ", "-")}` : ""}`;
+	return {
+		allItemsUrl: i,
+		feedUrl: `${i}/?feed=rss2`
 	};
-	render() {
-		let { viewAllNewsButtonText: r } = this.props;
-		return this.state.rssFeed.items?.length === 0 ? /* @__PURE__ */ o("div", {
-			className: "text-center SRCBorderedPanel SRCBorderedPanel--padded2x",
-			children: [e, /* @__PURE__ */ a("div", {
-				style: {
-					marginTop: "20px",
-					fontStyle: "italic"
-				},
-				children: "There are no items currently available"
-			})]
-		}) : /* @__PURE__ */ o(i, { children: [this.props.mailChimpUrl && /* @__PURE__ */ o("div", {
-			className: "FeedSubscribe",
-			children: [!this.state.isShowingSubscribeUI && /* @__PURE__ */ o("a", {
-				className: "FeedSubscribeToNewsLink SRC-no-border-bottom-imp",
-				onClick: this.onClickSubscribe,
-				children: [/* @__PURE__ */ a(n, { title: "Subscribe to News" }), "Subscribe to News"]
-			}), this.state.isShowingSubscribeUI && /* @__PURE__ */ o("div", {
-				className: "MailchimpSubscribeContainer",
-				children: [
-					/* @__PURE__ */ a(n, { title: "Subscribe to News" }),
-					/* @__PURE__ */ o("p", { children: [
-						"Subscribe to receive the ",
-						this.props.mailChimpListName,
-						" by e-mail, which provides information and updates related to the Portal. You can opt out at any time by using the unsubscribe link within the e-mail. We will not share your information with any third parties or use it for any other purposes."
-					] }),
-					/* @__PURE__ */ a("div", {
-						className: "SRC-marginBottomTop",
-						children: /* @__PURE__ */ a(c, { url: this.props.mailChimpUrl })
-					})
-				]
-			})]
-		}), /* @__PURE__ */ o("div", {
-			className: "Feed",
+}
+function m(e) {
+	return s({
+		queryKey: ["rssFeed", e],
+		queryFn: () => fetch(e).then((e) => e.text()).then((e) => f.parseString(e))
+	});
+}
+function h(s) {
+	let { url: d, filter: f, itemsToShow: h, allowCategories: g, mailChimpListName: _, mailChimpUrl: v, viewAllNewsButtonText: y } = s, { allItemsUrl: b, feedUrl: x } = p(d, f), { data: S, isError: C } = c(m(x)), [w, T] = r(!1);
+	return S?.items?.length === 0 ? /* @__PURE__ */ o("div", {
+		className: "text-center SRCBorderedPanel SRCBorderedPanel--padded2x",
+		children: [e, /* @__PURE__ */ a("div", {
+			style: {
+				marginTop: "20px",
+				fontStyle: "italic"
+			},
+			children: "There are no items currently available"
+		})]
+	}) : /* @__PURE__ */ o(i, { children: [v && /* @__PURE__ */ o("div", {
+		className: "FeedSubscribe",
+		children: [!w && /* @__PURE__ */ o("a", {
+			className: "FeedSubscribeToNewsLink SRC-no-border-bottom-imp",
+			onClick: () => T(!0),
+			children: [/* @__PURE__ */ a(n, { title: "Subscribe to News" }), "Subscribe to News"]
+		}), w && /* @__PURE__ */ o("div", {
+			className: "MailchimpSubscribeContainer",
 			children: [
+				/* @__PURE__ */ a(n, { title: "Subscribe to News" }),
+				/* @__PURE__ */ o("p", { children: [
+					"Subscribe to receive the ",
+					_,
+					" by e-mail, which provides information and updates related to the Portal. You can opt out at any time by using the unsubscribe link within the e-mail. We will not share your information with any third parties or use it for any other purposes."
+				] }),
 				/* @__PURE__ */ a("div", {
-					className: "FeedItems",
-					children: this.state.rssFeed.items && this.state.rssFeed.items.map((e, t) => {
-						if (!(t >= this.props.itemsToShow)) return /* @__PURE__ */ a("div", {
-							className: "FeedItem",
-							children: /* @__PURE__ */ o("div", { children: [
-								this.props.allowCategories && this.props.allowCategories.length > 0 && /* @__PURE__ */ a("div", {
-									className: "FeedItemCategories",
-									children: e.categories.map((t) => {
-										let n = t.toLowerCase();
-										return this.props.allowCategories?.findIndex((e) => n === e.toLowerCase()) === -1 ? /* @__PURE__ */ a(i, {}) : /* @__PURE__ */ a("a", {
-											href: `${this.state.rssFeed.link}/tag/${t.replace(" ", "-")}`,
-											className: "SRC-no-border-bottom-imp",
-											target: "_blank",
-											rel: "noopener noreferrer",
-											children: /* @__PURE__ */ a("div", {
-												className: "FeedItemCategory",
-												children: t
-											})
-										}, `${e.guid}_${t}`);
-									})
-								}),
-								/* @__PURE__ */ a("p", {
-									className: "FeedItemDate",
-									children: s(e.isoDate).format("MMMM YYYY")
-								}),
-								/* @__PURE__ */ a("p", {
-									className: "FeedItemTitle",
-									children: e.title
-								}),
-								/* @__PURE__ */ a("div", {
-									className: "FeedItemDescription",
-									children: e.contentSnippet.replace(/\[...\]|\[…\]/gm, "…")
-								}),
-								/* @__PURE__ */ a("a", {
-									className: "FeedItemLink",
-									href: e.link,
-									target: "_blank",
-									rel: "noopener noreferrer",
-									children: "Continue reading"
-								})
-							] })
-						}, e.guid);
-					})
-				}),
-				this.state.rssFeed.items && this.state.rssFeed.items.length > this.props.itemsToShow && this.state.allItemsUrl && /* @__PURE__ */ a("div", {
-					className: "FeedViewAllNewsButtonContainer",
-					children: /* @__PURE__ */ a(t, {
-						color: "secondary",
-						variant: "contained",
-						onClick: () => window.open(this.state.allItemsUrl, "_blank", "noopener"),
-						target: "_blank",
-						children: r ?? "View All News"
-					})
-				}),
-				this.state.isLoadingError && /* @__PURE__ */ o("div", { children: ["Unable to load feed: ", this.props.url] })
+					className: "SRC-marginBottomTop",
+					children: /* @__PURE__ */ a(u, { url: v })
+				})
 			]
-		})] });
-	}
-};
+		})]
+	}), /* @__PURE__ */ o("div", {
+		className: "Feed",
+		children: [
+			/* @__PURE__ */ a("div", {
+				className: "FeedItems",
+				children: S?.items && S.items.map((e, t) => {
+					if (!(t >= h)) return /* @__PURE__ */ a("div", {
+						className: "FeedItem",
+						children: /* @__PURE__ */ o("div", { children: [
+							g && g.length > 0 && /* @__PURE__ */ a("div", {
+								className: "FeedItemCategories",
+								children: e.categories?.map((t) => {
+									let n = t.toLowerCase();
+									return g?.findIndex((e) => n === e.toLowerCase()) === -1 ? null : /* @__PURE__ */ a("a", {
+										href: `${S.link}/tag/${t.replace(" ", "-")}`,
+										className: "SRC-no-border-bottom-imp",
+										target: "_blank",
+										rel: "noopener noreferrer",
+										children: /* @__PURE__ */ a("div", {
+											className: "FeedItemCategory",
+											children: t
+										})
+									}, `${e.guid}_${t}`);
+								})
+							}),
+							/* @__PURE__ */ a("p", {
+								className: "FeedItemDate",
+								children: l(e.isoDate).format("MMMM YYYY")
+							}),
+							/* @__PURE__ */ a("p", {
+								className: "FeedItemTitle",
+								children: e.title
+							}),
+							/* @__PURE__ */ a("div", {
+								className: "FeedItemDescription",
+								children: e.contentSnippet?.replace(/\[...\]|\[…\]/gm, "…")
+							}),
+							/* @__PURE__ */ a("a", {
+								className: "FeedItemLink",
+								href: e.link,
+								target: "_blank",
+								rel: "noopener noreferrer",
+								children: "Continue reading"
+							})
+						] })
+					}, e.guid);
+				})
+			}),
+			S?.items && S.items.length > h && b && /* @__PURE__ */ a("div", {
+				className: "FeedViewAllNewsButtonContainer",
+				children: /* @__PURE__ */ a(t, {
+					color: "secondary",
+					variant: "contained",
+					onClick: () => window.open(b, "_blank", "noopener"),
+					target: "_blank",
+					children: y ?? "View All News"
+				})
+			}),
+			C && /* @__PURE__ */ o("div", { children: ["Unable to load feed: ", d] })
+		]
+	})] });
+}
+async function g(e, t, n) {
+	let { feedUrl: r } = p(t, n);
+	await e.prefetchQuery(m(r));
+}
 //#endregion
-export { d as RssFeedCards, d as default };
+export { h as RssFeedCards, h as default, g as prefetchRssFeed };
 
 //# sourceMappingURL=RssFeedCards.js.map

package/dist/components/RssFeedCards/RssFeedCards.js.map

@@ -1 +1 @@
-{"version":3,"file":"RssFeedCards.js","names":[],"sources":["../../../src/components/RssFeedCards/RssFeedCards.tsx"],"sourcesContent":["import NoData from '@/assets/icons/NoData'\nimport { ReactComponent as SubscribePlus } from '@/assets/icons/subscribe_plus.svg'\nimport LargeButton from '@/components/styled/LargeButton'\nimport dayjs from 'dayjs'\nimport { Component } from 'react'\nimport MailchimpSubscribe from 'react-mailchimp-subscribe'\nimport Parser from 'rss-parser'\n\nconst rssParser = new Parser()\ntype RssState = {\n  rssFeed: any\n  isLoadingError: boolean\n  isShowingSubscribeUI: boolean\n  allItemsUrl?: string\n}\n\nexport type RssFilter = {\n  type?: 'tag' | 'category'\n  value: string\n}\n\nexport type RssFeedCardsProps = {\n  url: string\n  filter?: RssFilter // optional tag or category to use as a filter\n  itemsToShow: number\n  allowCategories?: string[]\n  mailChimpListName?: string\n  mailChimpUrl?: string\n  viewAllNewsButtonText?: string\n}\nexport class RssFeedCards extends Component<RssFeedCardsProps, RssState> {\n  // only update the state if this component is mounted\n  _isMounted = false\n\n  constructor(props: RssFeedCardsProps) {\n    super(props)\n    this.state = {\n      rssFeed: {},\n      isLoadingError: false,\n      isShowingSubscribeUI: false,\n    }\n  }\n\n  componentDidMount() {\n    this._isMounted = true\n    const { url, filter } = this.props\n    const filterValue = filter?.value\n    const filterType = filter?.type\n    const tagPath = filterValue\n      ? `/${filterType ?? 'tag'}/${filterValue.replace(' ', '-')}`\n      : ''\n    const allItems = `${url}${tagPath}`\n    const feedUrl = `${allItems}/?feed=rss2`\n    fetch(feedUrl)\n      .then(response => response.text())\n      .then(responseData => rssParser.parseString(responseData))\n      .then(rss => {\n        if (this._isMounted) {\n          this.setState({ rssFeed: rss, allItemsUrl: allItems })\n        }\n      })\n      .catch(err => {\n        if (this._isMounted) {\n          this.setState({ isLoadingError: true })\n        }\n      })\n  }\n\n  componentWillUnmount() {\n    this._isMounted = false\n  }\n\n  public onClickSubscribe = () => {\n    this.setState({ isShowingSubscribeUI: true })\n  }\n\n  render() {\n    const { viewAllNewsButtonText } = this.props\n\n    if (this.state.rssFeed.items?.length === 0) {\n      return (\n        <div className=\"text-center SRCBorderedPanel SRCBorderedPanel--padded2x\">\n          {NoData}\n          <div style={{ marginTop: '20px', fontStyle: 'italic' }}>\n            There are no items currently available\n          </div>\n        </div>\n      )\n    }\n    return (\n      <>\n        {this.props.mailChimpUrl && (\n          <div className=\"FeedSubscribe\">\n            {!this.state.isShowingSubscribeUI && (\n              <a\n                className=\"FeedSubscribeToNewsLink SRC-no-border-bottom-imp\"\n                onClick={this.onClickSubscribe}\n              >\n                <SubscribePlus title=\"Subscribe to News\" />\n                Subscribe to News\n              </a>\n            )}\n            {this.state.isShowingSubscribeUI && (\n              <div className=\"MailchimpSubscribeContainer\">\n                <SubscribePlus title=\"Subscribe to News\" />\n                <p>\n                  Subscribe to receive the {this.props.mailChimpListName} by\n                  e-mail, which provides information and updates related to the\n                  Portal. You can opt out at any time by using the unsubscribe\n                  link within the e-mail. We will not share your information\n                  with any third parties or use it for any other purposes.\n                </p>\n                <div className=\"SRC-marginBottomTop\">\n                  <MailchimpSubscribe url={this.props.mailChimpUrl} />\n                </div>\n              </div>\n            )}\n          </div>\n        )}\n        <div className=\"Feed\">\n          <div className=\"FeedItems\">\n            {this.state.rssFeed.items &&\n              this.state.rssFeed.items.map((item: any, index: any) => {\n                // The other is to hide the large number of items in a particular feed (usually a max of 10 are returned).  See state.isShowingMoreItems\n                if (index >= this.props.itemsToShow) {\n                  return\n                }\n\n                return (\n                  <div key={item.guid} className={`FeedItem`}>\n                    <div>\n                      {this.props.allowCategories &&\n                        this.props.allowCategories.length > 0 && (\n                          <div className=\"FeedItemCategories\">\n                            {item['categories'].map((categoryName: string) => {\n                              // are we allowed to show this category/tag?\n                              const categoryNameLowerCase =\n                                categoryName.toLowerCase()\n                              const allowCategories = this.props.allowCategories\n                              if (\n                                allowCategories?.findIndex(\n                                  item =>\n                                    categoryNameLowerCase ===\n                                    item.toLowerCase(),\n                                ) === -1\n                              )\n                                return <></>\n                              // else\n                              return (\n                                <a\n                                  href={`${\n                                    this.state.rssFeed.link\n                                  }/tag/${categoryName.replace(' ', '-')}`}\n                                  className=\"SRC-no-border-bottom-imp\"\n                                  key={`${item.guid}_${categoryName}`}\n                                  target=\"_blank\"\n                                  rel=\"noopener noreferrer\"\n                                >\n                                  <div className=\"FeedItemCategory\">\n                                    {categoryName}\n                                  </div>\n                                </a>\n                              )\n                            })}\n                          </div>\n                        )}\n                      <p className=\"FeedItemDate\">\n                        {dayjs(item['isoDate']).format('MMMM YYYY')}\n                      </p>\n                      <p className=\"FeedItemTitle\">{item['title']}</p>\n                      <div className=\"FeedItemDescription\">\n                        {item['contentSnippet'].replace(/\\[...\\]|\\[…\\]/gm, '…')}\n                      </div>\n                      <a\n                        className=\"FeedItemLink\"\n                        href={item['link']}\n                        target=\"_blank\"\n                        rel=\"noopener noreferrer\"\n                      >\n                        Continue reading\n                      </a>\n                    </div>\n                  </div>\n                )\n              })}\n          </div>\n          {this.state.rssFeed.items &&\n            this.state.rssFeed.items.length > this.props.itemsToShow &&\n            this.state.allItemsUrl && (\n              <div className=\"FeedViewAllNewsButtonContainer\">\n                <LargeButton\n                  color=\"secondary\"\n                  variant=\"contained\"\n                  onClick={() =>\n                    window.open(this.state.allItemsUrl, '_blank', 'noopener')\n                  }\n                  // @ts-expect-error - target prop exists, but TS doesn't recognize on styled component\n                  target=\"_blank\"\n                >\n                  {viewAllNewsButtonText ?? 'View All News'}\n                </LargeButton>\n              </div>\n            )}\n          {this.state.isLoadingError && (\n            <div>Unable to load feed: {this.props.url}</div>\n          )}\n        </div>\n      </>\n    )\n  }\n}\n\nexport default RssFeedCards\n"],"mappings":"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"}
+{"version":3,"file":"RssFeedCards.js","names":[],"sources":["../../../src/components/RssFeedCards/RssFeedCards.tsx"],"sourcesContent":["import NoData from '@/assets/icons/NoData'\nimport { ReactComponent as SubscribePlus } from '@/assets/icons/subscribe_plus.svg'\nimport LargeButton from '@/components/styled/LargeButton'\nimport dayjs from 'dayjs'\nimport MailchimpSubscribe from 'react-mailchimp-subscribe'\nimport Parser from 'rss-parser'\nimport { QueryClient, queryOptions, useQuery } from '@tanstack/react-query'\nimport { useState } from 'react'\n\nconst rssParser = new Parser()\n\nexport type RssFilter = {\n  type?: 'tag' | 'category'\n  value: string\n}\n\nexport type RssFeedCardsProps = {\n  url: string\n  filter?: RssFilter // optional tag or category to use as a filter\n  itemsToShow: number\n  allowCategories?: string[]\n  mailChimpListName?: string\n  mailChimpUrl?: string\n  viewAllNewsButtonText?: string\n}\n\nfunction buildRssFeedUrl(url: string, filter?: RssFilter) {\n  const filterValue = filter?.value\n  const filterType = filter?.type\n  const tagPath = filterValue\n    ? `/${filterType ?? 'tag'}/${filterValue.replace(' ', '-')}`\n    : ''\n  const allItemsUrl = `${url}${tagPath}`\n  const feedUrl = `${allItemsUrl}/?feed=rss2`\n  return { allItemsUrl, feedUrl }\n}\n\nfunction getRssFeedQueryOptions(feedUrl: string) {\n  return queryOptions({\n    queryKey: ['rssFeed', feedUrl],\n    queryFn: () =>\n      fetch(feedUrl)\n        .then(response => response.text())\n        .then(responseData => rssParser.parseString(responseData)),\n  })\n}\n\nexport function RssFeedCards(props: RssFeedCardsProps) {\n  const {\n    url,\n    filter,\n    itemsToShow,\n    allowCategories,\n    mailChimpListName,\n    mailChimpUrl,\n    viewAllNewsButtonText,\n  } = props\n\n  const { allItemsUrl, feedUrl } = buildRssFeedUrl(url, filter)\n\n  const { data: rssFeed, isError } = useQuery(getRssFeedQueryOptions(feedUrl))\n\n  const [isShowingSubscribeUI, setIsShowingSubscribeUI] = useState(false)\n\n  if (rssFeed?.items?.length === 0) {\n    return (\n      <div className=\"text-center SRCBorderedPanel SRCBorderedPanel--padded2x\">\n        {NoData}\n        <div style={{ marginTop: '20px', fontStyle: 'italic' }}>\n          There are no items currently available\n        </div>\n      </div>\n    )\n  }\n  return (\n    <>\n      {mailChimpUrl && (\n        <div className=\"FeedSubscribe\">\n          {!isShowingSubscribeUI && (\n            <a\n              className=\"FeedSubscribeToNewsLink SRC-no-border-bottom-imp\"\n              onClick={() => setIsShowingSubscribeUI(true)}\n            >\n              <SubscribePlus title=\"Subscribe to News\" />\n              Subscribe to News\n            </a>\n          )}\n          {isShowingSubscribeUI && (\n            <div className=\"MailchimpSubscribeContainer\">\n              <SubscribePlus title=\"Subscribe to News\" />\n              <p>\n                Subscribe to receive the {mailChimpListName} by e-mail, which\n                provides information and updates related to the Portal. You can\n                opt out at any time by using the unsubscribe link within the\n                e-mail. We will not share your information with any third\n                parties or use it for any other purposes.\n              </p>\n              <div className=\"SRC-marginBottomTop\">\n                <MailchimpSubscribe url={mailChimpUrl} />\n              </div>\n            </div>\n          )}\n        </div>\n      )}\n      <div className=\"Feed\">\n        <div className=\"FeedItems\">\n          {rssFeed?.items &&\n            rssFeed.items.map((item, index) => {\n              // The other is to hide the large number of items in a particular feed (usually a max of 10 are returned).  See state.isShowingMoreItems\n              if (index >= itemsToShow) {\n                return\n              }\n\n              return (\n                <div key={item.guid} className={`FeedItem`}>\n                  <div>\n                    {allowCategories && allowCategories.length > 0 && (\n                      <div className=\"FeedItemCategories\">\n                        {item.categories?.map((categoryName: string) => {\n                          // are we allowed to show this category/tag?\n                          const categoryNameLowerCase =\n                            categoryName.toLowerCase()\n                          if (\n                            allowCategories?.findIndex(\n                              item =>\n                                categoryNameLowerCase === item.toLowerCase(),\n                            ) === -1\n                          )\n                            return null\n                          // else\n                          return (\n                            <a\n                              href={`${rssFeed.link}/tag/${categoryName.replace(\n                                ' ',\n                                '-',\n                              )}`}\n                              className=\"SRC-no-border-bottom-imp\"\n                              key={`${item.guid}_${categoryName}`}\n                              target=\"_blank\"\n                              rel=\"noopener noreferrer\"\n                            >\n                              <div className=\"FeedItemCategory\">\n                                {categoryName}\n                              </div>\n                            </a>\n                          )\n                        })}\n                      </div>\n                    )}\n                    <p className=\"FeedItemDate\">\n                      {dayjs(item.isoDate).format('MMMM YYYY')}\n                    </p>\n                    <p className=\"FeedItemTitle\">{item.title}</p>\n                    <div className=\"FeedItemDescription\">\n                      {item.contentSnippet?.replace(/\\[...\\]|\\[…\\]/gm, '…')}\n                    </div>\n                    <a\n                      className=\"FeedItemLink\"\n                      href={item.link}\n                      target=\"_blank\"\n                      rel=\"noopener noreferrer\"\n                    >\n                      Continue reading\n                    </a>\n                  </div>\n                </div>\n              )\n            })}\n        </div>\n        {rssFeed?.items &&\n          rssFeed.items.length > itemsToShow &&\n          allItemsUrl && (\n            <div className=\"FeedViewAllNewsButtonContainer\">\n              <LargeButton\n                color=\"secondary\"\n                variant=\"contained\"\n                onClick={() => window.open(allItemsUrl, '_blank', 'noopener')}\n                // @ts-expect-error - target prop exists, but TS doesn't recognize on styled component\n                target=\"_blank\"\n              >\n                {viewAllNewsButtonText ?? 'View All News'}\n              </LargeButton>\n            </div>\n          )}\n        {isError && <div>Unable to load feed: {url}</div>}\n      </div>\n    </>\n  )\n}\n\nexport default RssFeedCards\n\n/**\n * Prefetches the RSS feed into a QueryClient for use with HydrationBoundary.\n * Uses the same query key as the RssFeedCards component.\n */\nexport async function prefetchRssFeed(\n  queryClient: QueryClient,\n  url: string,\n  filter?: RssFilter,\n): Promise<void> {\n  const { feedUrl } = buildRssFeedUrl(url, filter)\n  await queryClient.prefetchQuery(getRssFeedQueryOptions(feedUrl))\n}\n"],"mappings":"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"}

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.d.ts

@@ -1,4 +1,4 @@
-import { AsynchronousJobStatus, ColumnModel, QueryBundleRequest, QueryResultBundle, RowSet } from '@sage-bionetworks/synapse-types';
+import { AsynchronousJobStatus, ColumnModel, FacetColumnRangeRequest, FacetColumnValuesRequest, QueryBundleRequest, QueryResultBundle, RowSet } from '@sage-bionetworks/synapse-types';
 import type { SearchIndexQuery, SearchQueryResults, SynapseClientError } from '@sage-bionetworks/synapse-client';
 import { InfiniteData, QueryKey, UseInfiniteQueryOptions, UseSuspenseQueryOptions } from '@tanstack/react-query';
 import { KeyFactory } from '@/synapse-queries/KeyFactory';
@@ -13,17 +13,19 @@ export type SearchTableQueryUseQueryOptions = {
     rowDataInfiniteQueryOptions: UseInfiniteQueryOptions<AsynchronousJobStatus<SearchIndexQuery, QueryResultBundle>, SynapseClientError, InfiniteData<AsynchronousJobStatus<SearchIndexQuery, QueryResultBundle>>, QueryKey, string | number | undefined>;
     queryMetadataQueryOptions: UseSuspenseQueryOptions<AsynchronousJobStatus<SearchIndexQuery, QueryResultBundle>, SynapseClientError, Omit<QueryResultBundle, 'queryResult'>>;
 };
+export declare function getNextPageParamForSearchQueryResults(lastPage: AsynchronousJobStatus<SearchIndexQuery, QueryResultBundle>, allPages: AsynchronousJobStatus<SearchIndexQuery, QueryResultBundle>[]): number | string | undefined;
 /**
  * Converts a QueryBundleRequest (used internally for state management) into a SearchIndexQuery
  * that can be sent to the SearchQueryServicesApi.
  *
  * Mapping:
- *  - columnModels (facetType defined) → facetRequests (columns to aggregate as facets, with optional sort config)
- *  - query.selectedFacets (enumeration) → termsFilters (IN-clause filters)
- *  - query.selectedFacets (range) → rangeFilters (range filters)
- *  - query.sort → sort (SortItem { column, direction } → SearchSortField { columnName, direction })
- *  - query.limit → limit
- *  - query.offset → offset
+ *  - columnModels (facetType 'enumeration') → aggregations (OpenSearch terms aggregations)
+ *  - query.selectedFacets (enumeration) → query.bool.filter terms clauses
+ *  - query.selectedFacets (range) → query.bool.filter range clauses
+ *  - query.additionalFilters (TextMatchesQueryFilter) → multi_match query clause
+ *  - query.sort → sort (SortItem { column, direction } → [{ column: 'asc'|'desc' }])
+ *  - query.limit → size
+ *  - query.offset → from
  *  - partMask → dropped (SearchIndexQuery has no bitmask concept)
  */
 export declare function toSearchIndexQuery(queryBundleRequest: QueryBundleRequest, searchIndexId: string, columnModels?: ColumnModel[]): SearchIndexQuery;
@@ -34,18 +36,17 @@ export declare function toSearchIndexQuery(queryBundleRequest: QueryBundleReques
  * Mapping:
  *  - totalHits → queryCount
  *  - hits → queryResult.queryResults (rows derived from hit.rowId/rowVersion/fields)
- *  - facets → facets (same FacetColumnResult type)
+ *  - aggregationResults → facets (parsed from opaque OpenSearch aggregation JSON)
  */
-export declare function searchQueryResultsToQueryResultBundle(results: SearchQueryResults | undefined, query: SearchIndexQuery, columnModels?: ColumnModel[]): QueryResultBundle;
+export declare function searchQueryResultsToQueryResultBundle(results: SearchQueryResults | undefined, query: SearchIndexQuery, columnModels?: ColumnModel[], selectedFacets?: (FacetColumnValuesRequest | FacetColumnRangeRequest)[]): QueryResultBundle;
 export declare function getSearchQueryUseQueryOptions(queryBundleRequest: QueryBundleRequest, keyFactory: KeyFactory, accessToken: string | undefined, searchIndexId: string, columnModels?: ColumnModel[]): SearchTableQueryUseQueryOptions;
 /**
  * Returns a stable callback that fetches autocomplete suggestions for a search input
  * using the synchronous `POST /search/autocomplete` endpoint.
  *
  * The query is built from the current `searchIndexId` and `autocompleteFieldName`:
- *  - `searchQuery.queryText` is set to the user-entered search text
- *  - `searchQuery.queryFields` is set to `[autocompleteFieldName]` so the server
- *    only returns values for that single field
+ *  - `searchQuery.query` is a `match_bool_prefix` clause scoped to `autocompleteFieldName`
+ *  - `searchQuery._source` is set to `[autocompleteFieldName]` so only that field is returned
  *
  * When `autocompleteFieldName` is undefined, the returned callback immediately returns `[]`.
  */

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchQueryUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,WAAW,EAMX,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EAIP,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAGV,gBAAgB,EAEhB,kBAAkB,EAGlB,kBAAkB,EACnB,MAAM,kCAAkC,CAAA;AAKzC,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,uBAAuB,CAAA;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAEzD;;;;;GAKG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,mBAAmB,EAAE,uBAAuB,CAC1C,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,MAAM,GAAG,SAAS,CACnB,CAAA;IACD,2BAA2B,EAAE,uBAAuB,CAClD,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,YAAY,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC,EACxE,QAAQ,EACR,MAAM,GAAG,MAAM,GAAG,SAAS,CAC5B,CAAA;IACD,yBAAyB,EAAE,uBAAuB,CAChD,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CACvC,CAAA;CACF,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,WAAW,EAAE,GAC3B,gBAAgB,CAuGlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,KAAK,EAAE,gBAAgB,EACvB,YAAY,CAAC,EAAE,WAAW,EAAE,GAC3B,iBAAiB,CAqHnB;AAED,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,WAAW,EAAE,GAC3B,+BAA+B,CA+IjC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,MAAM,GAAG,SAAS,GACxC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAmC3C;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,GACjB,+BAA+B,CAmBjC"}
+{"version":3,"file":"SearchQueryUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,WAAW,EAEX,uBAAuB,EAIvB,wBAAwB,EACxB,kBAAkB,EAClB,iBAAiB,EACjB,MAAM,EAIP,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAGV,gBAAgB,EAChB,kBAAkB,EAElB,kBAAkB,EAEnB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,uBAAuB,CAAA;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AA6BzD;;;;;GAKG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,mBAAmB,EAAE,uBAAuB,CAC1C,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,MAAM,GAAG,SAAS,CACnB,CAAA;IACD,2BAA2B,EAAE,uBAAuB,CAClD,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,YAAY,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC,EACxE,QAAQ,EACR,MAAM,GAAG,MAAM,GAAG,SAAS,CAC5B,CAAA;IACD,yBAAyB,EAAE,uBAAuB,CAChD,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC1D,kBAAkB,EAClB,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CACvC,CAAA;CACF,CAAA;AAED,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EACpE,QAAQ,EAAE,qBAAqB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAAE,GACrE,MAAM,GAAG,MAAM,GAAG,SAAS,CAyB7B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,WAAW,EAAE,GAC3B,gBAAgB,CAmHlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,KAAK,EAAE,gBAAgB,EACvB,YAAY,CAAC,EAAE,WAAW,EAAE,EAC5B,cAAc,CAAC,EAAE,CAAC,wBAAwB,GAAG,uBAAuB,CAAC,EAAE,GACtE,iBAAiB,CA6InB;AAED,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,WAAW,EAAE,GAC3B,+BAA+B,CAwIjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,MAAM,GAAG,SAAS,GACxC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAoC3C;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,GACjB,+BAA+B,CAmBjC"}

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.js

@@ -6,131 +6,144 @@ import "../../synapse-queries/index.js";
 import { useCallback as i, useMemo as a } from "react";
 import { omit as o } from "lodash-es";
 import { FACET_COLUMN_RANGE_REQUEST_CONCRETE_TYPE_VALUE as s, FACET_COLUMN_VALUES_REQUEST_CONCRETE_TYPE_VALUE as c, TEXT_MATCHES_QUERY_FILTER_CONCRETE_TYPE_VALUE as l } from "@sage-bionetworks/synapse-types";
-import { FacetRequestSortDirectionEnum as u, FacetRequestSortFieldEnum as d } from "@sage-bionetworks/synapse-client";
-import f from "dayjs";
+import u from "dayjs";
 //#region src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts
-function p(e, t, n) {
+function d(e, t) {
+	let n = e.responseBody?.queryResult?.queryResults.rows?.length ?? 0, r = e.requestBody?.searchQuery?.size, i = e.responseBody?.queryCount, a = t.reduce((e, t) => e + (t.responseBody?.queryResult?.queryResults.rows?.length ?? 0), 0);
+	if (n !== 0 && !(r != null && n < r) && !(i != null && a >= i)) return a;
+}
+function f(e, t, n) {
 	let r = n?.filter((e) => e.facetType === "enumeration").map((e) => {
 		let t = {
-			columnName: e.name,
-			maxValueCount: 100
+			field: e.name,
+			size: 100
 		};
-		return e.facetSortConfig && (e.facetSortConfig.property != null && (t.sortField = e.facetSortConfig.property === "VALUE" ? d.KEY : d.COUNT), e.facetSortConfig.direction != null && (t.sortDirection = e.facetSortConfig.direction === "ASC" ? u.ASC : u.DESC)), t;
-	}), i = e.query.selectedFacets?.filter((e) => e.concreteType === c).map((e) => ({
-		key: e.columnName,
-		values: e.facetValues
-	})), a = e.query.selectedFacets?.filter((e) => e.concreteType === s).map((e) => {
-		let t = n?.find((t) => t.name === e.columnName)?.columnType, r = (e) => !e || t !== "DATE" ? e : /^\d{4}-\d{2}-\d{2}$/.test(e) ? String(f(e).valueOf()) : e;
-		return {
-			key: e.columnName,
-			min: r(e.min),
-			max: r(e.max)
-		};
-	}), o = e.query.additionalFilters?.filter((e) => e.concreteType === l).map((e) => e.searchExpression).filter((e) => e != null && e.length > 0), p = o && o.length > 0 ? o.join(" ") : void 0, m = e.query.sort?.filter((e) => e.direction === "ASC" || e.direction === "DESC").map((e) => ({
-		columnName: e.column,
-		direction: e.direction
-	}));
+		if (e.facetSortConfig?.property != null) {
+			let n = e.facetSortConfig.property === "VALUE" ? "_key" : "_count", r = e.facetSortConfig.direction === "DESC" ? "desc" : "asc";
+			t.order = { [n]: r };
+		}
+		return [e.name, { terms: t }];
+	}), i = r && r.length > 0 ? Object.fromEntries(r) : void 0, a = [];
+	e.query.selectedFacets?.filter((e) => e.concreteType === c).forEach((e) => {
+		a.push({ terms: { [e.columnName]: e.facetValues ?? [] } });
+	}), e.query.selectedFacets?.filter((e) => e.concreteType === s).forEach((e) => {
+		let t = n?.find((t) => t.name === e.columnName)?.columnType, r = (e) => !e || t !== "DATE" ? e : /^\d{4}-\d{2}-\d{2}$/.test(e) ? String(u(e).valueOf()) : e, i = {}, o = r(e.min), s = r(e.max);
+		o !== void 0 && (i.gte = o), s !== void 0 && (i.lte = s), a.push({ range: { [e.columnName]: i } });
+	});
+	let o = e.query.additionalFilters?.filter((e) => e.concreteType === l).map((e) => e.searchExpression).filter((e) => e != null && e.length > 0), d = o && o.length > 0 ? o.join(" ") : void 0, f;
+	f = d && a.length > 0 ? { bool: {
+		must: [{ multi_match: {
+			query: d,
+			fuzziness: "AUTO"
+		} }],
+		filter: a
+	} } : d ? { multi_match: {
+		query: d,
+		fuzziness: "AUTO"
+	} } : a.length > 0 ? { bool: { filter: a } } : { match_all: {} };
+	let p = e.query.sort?.filter((e) => e.direction === "ASC" || e.direction === "DESC").map((e) => ({ [e.column]: e.direction.toLowerCase() }));
 	return {
 		concreteType: "org.sagebionetworks.repo.model.search.table.SearchIndexQuery",
 		searchIndexId: t,
 		searchQuery: {
-			facetRequests: r?.length ? r : void 0,
-			termsFilters: i?.length ? i : void 0,
-			rangeFilters: a?.length ? a : void 0,
-			queryText: p,
-			queryType: "MULTI_MATCH",
-			fuzziness: "AUTO",
-			sort: m?.length ? m : void 0,
-			limit: e.query.limit,
-			offset: e.query.offset
+			query: f,
+			aggregations: i,
+			sort: p?.length ? p : void 0,
+			size: e.query.limit,
+			from: e.query.offset
 		}
 	};
 }
-function m(e, t, n) {
+function p(e, t, n, r) {
 	if (!e) return { concreteType: "org.sagebionetworks.repo.model.table.QueryResultBundle" };
-	let r = e.selectColumns?.map((e) => e.name).filter((e) => !!e) ?? [], i = r.map((e) => ({
+	let i = e.selectColumns?.map((e) => e.name).filter((e) => !!e) ?? [], a = i.map((e) => ({
 		name: e,
 		columnType: n?.find((t) => t.name === e)?.columnType ?? "STRING"
-	})), a = (e.hits ?? []).map((e) => ({
+	})), o = (e.hits ?? []).map((e) => ({
 		rowId: e.rowId,
 		versionNumber: e.rowVersion,
-		values: r.map((t) => e.fields?.find((e) => e.name === t)?.value ?? null)
-	})), o = i.length > 0 || a.length > 0 ? {
+		values: i.map((t) => e.fields?.find((e) => e.name === t)?.value ?? null)
+	})), l = a.length > 0 || o.length > 0 ? {
 		concreteType: "org.sagebionetworks.repo.model.table.QueryResult",
 		queryResults: {
 			concreteType: "org.sagebionetworks.repo.model.table.RowSet",
 			tableId: t.searchIndexId ?? "",
 			etag: "",
-			headers: i,
-			rows: a
+			headers: a,
+			rows: o
 		}
-	} : void 0, s = e.facets, c = (n ?? []).filter((e) => e.facetType === "range" && (e.columnType === "DATE" || e.columnType === "DOUBLE" || e.columnType === "INTEGER") && !(s ?? []).some((t) => t.columnName === e.name)).map((e) => {
-		let n = t.searchQuery?.rangeFilters?.find((t) => t.key === e.name), r = (t) => !t || e.columnType !== "DATE" ? t : /^\d+$/.test(t) ? f(parseInt(t)).format("YYYY-MM-DD") : t;
+	} : void 0, u = e.aggregationResults, d = Object.entries(u ?? {}).map(([e, t]) => {
+		let n = r?.filter((t) => t.concreteType === c && t.columnName === e).flatMap((e) => e.facetValues ?? []) ?? [];
+		return {
+			concreteType: "org.sagebionetworks.repo.model.table.FacetColumnResultValues",
+			facetType: "enumeration",
+			columnName: e,
+			facetValues: (t.buckets ?? []).map((e) => ({
+				value: String(e.key),
+				count: e.doc_count,
+				isSelected: n.includes(String(e.key))
+			}))
+		};
+	}), f = (n ?? []).filter((e) => e.facetType === "range" && (e.columnType === "DATE" || e.columnType === "DOUBLE" || e.columnType === "INTEGER") && !d.some((t) => t.columnName === e.name)).map((e) => {
+		let t = r?.find((t) => t.concreteType === s && t.columnName === e.name);
 		return {
 			concreteType: "org.sagebionetworks.repo.model.table.FacetColumnResultRange",
 			facetType: "range",
 			columnName: e.name,
 			columnMin: "",
 			columnMax: "",
-			selectedMin: r(n?.min),
-			selectedMax: r(n?.max)
+			selectedMin: t?.min,
+			selectedMax: t?.max
 		};
-	}), l = [...s ?? [], ...c], u = n ? [...l.filter((e) => n.some((t) => t.name === e.columnName)).sort((e, t) => n.findIndex((t) => t.name === e.columnName) - n.findIndex((e) => e.name === t.columnName)), ...l.filter((e) => !n.some((t) => t.name === e.columnName))] : l;
+	}), p = [...d ?? [], ...f], m = n ? [...p.filter((e) => n.some((t) => t.name === e.columnName)).sort((e, t) => n.findIndex((t) => t.name === e.columnName) - n.findIndex((e) => e.name === t.columnName)), ...p.filter((e) => !n.some((t) => t.name === e.columnName))] : p;
 	return {
 		concreteType: "org.sagebionetworks.repo.model.table.QueryResultBundle",
 		queryCount: e.totalHits,
-		selectColumns: i,
-		queryResult: o,
-		facets: u
+		selectColumns: a,
+		queryResult: l,
+		facets: m
 	};
 }
-function h(t, n, i, a, s) {
-	let c = p(t, a, s), l = {
+function m(t, n, i, a, s) {
+	let c = f(t, a, s), l = {
 		...c,
 		searchQuery: {
 			...c.searchQuery,
-			facetRequests: void 0
+			aggregations: void 0
 		},
 		responseParts: new Set(["HITS", "SELECT_COLUMNS"])
 	}, u = {
 		...c,
-		responseParts: new Set([
-			"TOTAL_HITS",
-			"SELECT_COLUMNS",
-			"FACETS"
-		])
-	}, d = (e) => ({
+		responseParts: new Set(["TOTAL_HITS", "SELECT_COLUMNS"])
+	}, m = (e) => ({
 		...e,
 		responseParts: e.responseParts ? [...e.responseParts].sort() : void 0
-	}), f = async (t) => {
-		let n = await e(t, i);
+	}), h = async (n) => {
+		let r = await e(n, i);
 		return {
-			...n,
-			responseBody: m(n.responseBody, t, s)
+			...r,
+			responseBody: p(r.responseBody, n, s, t.query.selectedFacets)
 		};
 	};
 	return {
 		rowDataQueryOptions: {
 			...r,
-			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(d(l), !1),
-			queryFn: () => f(l),
+			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(m(l), !1),
+			queryFn: () => h(l),
 			select: (e) => e.responseBody?.queryResult?.queryResults
 		},
 		rowDataInfiniteQueryOptions: {
 			...r,
-			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(d(l), !0),
+			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(m(l), !0),
 			initialPageParam: 0,
-			getNextPageParam: (e, t) => {
-				let n = e.responseBody?.queryCount, r = t.reduce((e, t) => e + (t.responseBody?.queryResult?.queryResults.rows?.length ?? 0), 0);
-				if (!(n != null && r >= n)) return r;
-			},
+			getNextPageParam: (e, t) => d(e, t),
 			queryFn: (e) => {
 				let t = typeof e.pageParam == "string" ? parseInt(e.pageParam) : e.pageParam ?? 0;
-				return f({
+				return h({
 					...l,
 					searchQuery: {
 						...l.searchQuery,
-						offset: t
+						from: t
 					}
 				});
 			},
@@ -138,8 +151,8 @@ function h(t, n, i, a, s) {
 		},
 		queryMetadataQueryOptions: {
 			...r,
-			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(d(u), !1),
-			queryFn: () => f(u),
+			queryKey: n.getSearchQueryResultWithAsyncStatusQueryKey(m(u), !1),
+			queryFn: () => h(u),
 			select: (e) => {
 				let t = o(e.responseBody ?? {}, "queryResult");
 				return s ? {
@@ -150,19 +163,17 @@ function h(t, n, i, a, s) {
 		}
 	};
 }
-function g(e, n) {
+function h(e, n) {
 	let { synapseClient: r } = t();
 	return i(async (t) => {
 		if (!n) return [];
 		let i = t.trim();
 		if (!i) return [];
-		let a = await r.searchManagementServicesClient.postRepoV1SearchAutocomplete({ searchIndexQuery: {
-			concreteType: "org.sagebionetworks.repo.model.search.table.SearchIndexQuery",
+		let a = await r.searchManagementServicesClient.postRepoV1SearchAutocomplete({ searchAutocompleteRequest: {
 			searchIndexId: e,
 			searchQuery: {
-				queryText: i,
-				queryFields: [n],
-				returnFields: [n]
+				query: { match_bool_prefix: { [n]: { query: i } } },
+				_source: { includes: [n] }
 			}
 		} }), o = [];
 		for (let e of a.hits ?? []) for (let t of e.fields ?? []) t.value && o.push(t.value);
@@ -173,9 +184,9 @@ function g(e, n) {
 		n
 	]);
 }
-function _(e, r, i) {
+function g(e, r, i) {
 	let { keyFactory: o, accessToken: s } = t(), { data: c } = n(i, void 0, { includeTableBundle: !0 }), l = c?.tableBundle?.columnModels;
-	return a(() => h(e, o, s, r, l), [
+	return a(() => m(e, o, s, r, l), [
 		o,
 		s,
 		e,
@@ -184,6 +195,6 @@ function _(e, r, i) {
 	]);
 }
 //#endregion
-export { h as getSearchQueryUseQueryOptions, m as searchQueryResultsToQueryResultBundle, p as toSearchIndexQuery, g as useGetSuggestionsForSearchIndex, _ as useSearchQueryUseQueryOptions };
+export { d as getNextPageParamForSearchQueryResults, m as getSearchQueryUseQueryOptions, p as searchQueryResultsToQueryResultBundle, f as toSearchIndexQuery, h as useGetSuggestionsForSearchIndex, g as useSearchQueryUseQueryOptions };
 
 //# sourceMappingURL=SearchQueryUseQueryOptions.js.map