@datawheel/bespoke 0.5.5 → 0.5.7

package/dist/index.js

@@ -1267,16 +1267,18 @@ var init_selectorQueryToVariable = __esm({
     init_cms();
     selectorQueryToVariable = (id, query, config) => {
       const accessor = `selector${id}id`;
-      const queryObject = new URLSearchParams(query);
+      const locationValue = new URLSearchParams(typeof location !== "undefined" && location?.search ? location.search : "").get(accessor);
+      const queryValue = new URLSearchParams(query).get(accessor);
+      const selectorValue = locationValue || queryValue;
       if (config.type === SELECTOR_TYPES.MULTI) {
-        const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
+        const queryIds = selectorValue ? selectorValue.split(",") : config.defaultValue;
         const options = config.options.filter((d2) => queryIds.includes(d2.id));
         return {
           [`selector${id}id`]: queryIds,
           [`selector${id}label`]: (options || []).map((d2) => d2.label)
         };
       }
-      const queryId = queryObject.get(accessor) && config.options.find((d2) => d2.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
+      const queryId = selectorValue && config.options.find((d2) => d2.id === selectorValue) ? selectorValue : config.defaultValue;
       const option = config.options.find((d2) => d2.id === queryId);
       return {
         [`selector${id}id`]: queryId,
@@ -18293,12 +18295,12 @@ function ReportSelector({
 }) {
   const [slugReady, setSlugReady] = useState(false);
   const dispatch = useAppDispatch();
-  const location = useManagerLocation();
+  const location2 = useManagerLocation();
   const resource = useContext(ResourceContext);
   const dimensions = report && report.dimensions ? report.dimensions : [];
   const previews = useAppSelector((state) => state.status.previews);
   const currentReport = previews.map((p2) => ({ variantId: p2.variant_id, memberId: p2.content_id }));
-  const param = location.query.preview;
+  const param = location2.query.preview;
   const slugs = Array.isArray(param) ? param.join("!") : param || "";
   const onSelect = (previewMember) => {
     const newPreviews = report.dimensions.map((dId) => {
@@ -18335,7 +18337,7 @@ function ReportSelector({
       const changeLocation = previewsAsReadMember.filter((p2) => p2.content_id).length === dimensions.length;
       dispatch(actions_exports.setPreviews(previewsAsReadMember));
       if (changeLocation) {
-        location.setSearchParam("preview", nextParam);
+        location2.setSearchParam("preview", nextParam);
         dispatch(actions_exports.recalculateVariables(resource, {
           previews: previewsAsReadMember
         }));
@@ -19679,8 +19681,8 @@ function CMSHeader(props) {
   const resource = useContext(ResourceContext);
   const dispatch = useAppDispatch();
   const previews = useAppSelector((state) => state.status.previews);
-  const location = useManagerLocation();
-  const reportId = Number.parseInt(location.params[0]);
+  const location2 = useManagerLocation();
+  const reportId = Number.parseInt(location2.params[0]);
   const reportRef = useReportRef(reportId);
   const profilePrefix = useProfilePrefix();
   const currentLocale = useCurrentLocale2();
@@ -19696,7 +19698,7 @@ function CMSHeader(props) {
   const localePrefix = currentLocale === localeDefault10 ? "" : `/${currentLocale}`;
   const realPath = previewPath.length ? `${localePrefix}${profilePrefix}/${previewPath.join("/")}` : "";
   const onSelectLocale = (previewLocale) => {
-    location.setSearchParam("locale", previewLocale);
+    location2.setSearchParam("locale", previewLocale);
     dispatch(actions_exports.readMember({
       mode: "content_ids",
       variant: previews.map((m) => m.variant_id),
@@ -22747,8 +22749,8 @@ init_hooks();
 init_use_entity_settings();
 init_hooks3();
 function ReportSettingsPanel() {
-  const location = useManagerLocation();
-  const reportId = Number.parseInt(location.params[0]);
+  const location2 = useManagerLocation();
+  const reportId = Number.parseInt(location2.params[0]);
   const report = useReportRef(reportId).data;
   const { settings, updateSettings } = useReportSettings(reportId);
   const { handlers } = useSidebar("reportEditor");
@@ -24611,7 +24613,7 @@ init_EntityDeleteButton();
 function ReportCard(props) {
   const { for: report, enabled } = props;
   const theme = useMantineTheme();
-  const location = useManagerLocation();
+  const location2 = useManagerLocation();
   const secondaryColor = theme.colorScheme === "dark" ? theme.colors.dark[1] : theme.colors.gray[7];
   return /* @__PURE__ */ jsxs(Card, { shadow: "xs", p: "sm", w: "100%", children: [
     /* @__PURE__ */ jsxs(Group, { position: "apart", children: [
@@ -24624,7 +24626,7 @@ function ReportCard(props) {
     /* @__PURE__ */ jsx(Text, { size: "sm", style: { color: secondaryColor, lineHeight: 2 }, children: "Description of report will go here" }),
     /* @__PURE__ */ jsx(Space, { w: "xs" }),
     /* @__PURE__ */ jsxs(Group, { position: "apart", children: [
-      /* @__PURE__ */ jsx(Link, { href: location.href("reports", report.id), passHref: true, children: /* @__PURE__ */ jsx(Button, { leftIcon: /* @__PURE__ */ jsx(IconPencil, {}), compact: true, children: "Edit" }) }),
+      /* @__PURE__ */ jsx(Link, { href: location2.href("reports", report.id), passHref: true, children: /* @__PURE__ */ jsx(Button, { leftIcon: /* @__PURE__ */ jsx(IconPencil, {}), compact: true, children: "Edit" }) }),
       /* @__PURE__ */ jsx(EntityDeleteButton, { type: "report", id: report.id, disabled: !enabled })
     ] })
   ] });
@@ -25486,7 +25488,7 @@ function BespokeManagerShell(props) {
   const action = useRef(null);
   const [opened, { open, close }] = useDisclosure(false);
   const { user, error, isLoading } = useBespokeUser_default();
-  const location = useManagerLocation();
+  const location2 = useManagerLocation();
   const buildLinks = useCallback((user2) => {
     const menuLinks = [];
     links.forEach((link) => {
@@ -25505,7 +25507,7 @@ function BespokeManagerShell(props) {
   }, []);
   const navbar = useMemo(() => {
     const linkButtons = buildLinks(user);
-    const expand = location.page === "welcome" || opened;
+    const expand = location2.page === "welcome" || opened;
     return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
       Box,
       {
@@ -25551,7 +25553,7 @@ function BespokeManagerShell(props) {
             },
             withBorder: false,
             children: [
-              /* @__PURE__ */ jsx(Navbar.Section, { style: { position: "relative" }, children: /* @__PURE__ */ jsx(BespokeLogo, { href: location.href(""), onlyIcon: !expand, version }) }),
+              /* @__PURE__ */ jsx(Navbar.Section, { style: { position: "relative" }, children: /* @__PURE__ */ jsx(BespokeLogo, { href: location2.href(""), onlyIcon: !expand, version }) }),
               /* @__PURE__ */ jsx(Navbar.Section, { grow: true, component: ScrollArea, children: /* @__PURE__ */ jsx(Stack, { spacing: 0, children: linkButtons }) }),
               /* @__PURE__ */ jsx(Navbar.Section, { children: user && !error && !isLoading && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Stack, { px: 13, children: [
                 /* @__PURE__ */ jsxs(Group, { align: "flex-start", children: [
@@ -25599,34 +25601,34 @@ function BespokeManagerShell(props) {
         )
       }
     ) });
-  }, [location, opened, user]);
+  }, [location2, opened, user]);
   const route = useMemo(() => {
-    const item = links.find((page) => page.href.includes(location.page));
-    if (location.page === "welcome") {
+    const item = links.find((page) => page.href.includes(location2.page));
+    if (location2.page === "welcome") {
       return /* @__PURE__ */ jsx(HelloView, {});
     }
     if (user && Array.isArray(user.bespoke_roles) && user.bespoke_roles.includes(item?.roleRequired)) {
-      if (location.page === "metadata") {
+      if (location2.page === "metadata") {
         return /* @__PURE__ */ jsx(MetadataEditor, {});
       }
-      if (location.page === "formatters") {
+      if (location2.page === "formatters") {
         return /* @__PURE__ */ jsx(FormatterEditor, {});
       }
-      if (location.page === "reports") {
-        if (location.params.length > 0) {
-          const reportId = Number.parseInt(location.params[0]);
+      if (location2.page === "reports") {
+        if (location2.params.length > 0) {
+          const reportId = Number.parseInt(location2.params[0]);
           return /* @__PURE__ */ jsx(BuilderEditor, { id: reportId, locale });
         }
         return /* @__PURE__ */ jsx(ReportPicker, {});
       }
-      if (location.page === "users") {
+      if (location2.page === "users") {
         return /* @__PURE__ */ jsx(UsersEditor, {});
       }
     } else {
       return /* @__PURE__ */ jsx(UnauthorizeView, {});
     }
     return /* @__PURE__ */ jsx(NotFoundView, {});
-  }, [location, user]);
+  }, [location2, user]);
   const dispatch = useAppDispatch();
   useEffect(() => {
     dispatch(statusActions.setStatus({ isCMS: true }));

package/dist/server.js

@@ -4881,16 +4881,18 @@ function runSelector(id, logic, formatterFunctions, blockContext, replaceQuery =
 // libs/selectors/selectorQueryToVariable.js
 var selectorQueryToVariable = (id, query, config) => {
   const accessor = `selector${id}id`;
-  const queryObject = new URLSearchParams(query);
+  const locationValue = new URLSearchParams(typeof location !== "undefined" && location?.search ? location.search : "").get(accessor);
+  const queryValue = new URLSearchParams(query).get(accessor);
+  const selectorValue = locationValue || queryValue;
   if (config.type === SELECTOR_TYPES.MULTI) {
-    const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
+    const queryIds = selectorValue ? selectorValue.split(",") : config.defaultValue;
     const options = config.options.filter((d2) => queryIds.includes(d2.id));
     return {
       [`selector${id}id`]: queryIds,
       [`selector${id}label`]: (options || []).map((d2) => d2.label)
     };
   }
-  const queryId = queryObject.get(accessor) && config.options.find((d2) => d2.id === queryObject.get(accessor)) ? queryObject.get(accessor) : config.defaultValue;
+  const queryId = selectorValue && config.options.find((d2) => d2.id === selectorValue) ? selectorValue : config.defaultValue;
   const option = config.options.find((d2) => d2.id === queryId);
   return {
     [`selector${id}id`]: queryId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {