@datawheel/bespoke 0.5.4 → 0.5.6

package/dist/index.js

@@ -1267,7 +1267,9 @@ var init_selectorQueryToVariable = __esm({
     init_cms();
     selectorQueryToVariable = (id, query, config) => {
       const accessor = `selector${id}id`;
-      const queryObject = new URLSearchParams(query);
+      const queryObject = new URLSearchParams(
+        typeof location !== "undefined" && location?.search ? location.search : query
+      );
       if (config.type === SELECTOR_TYPES.MULTI) {
         const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
         const options = config.options.filter((d2) => queryIds.includes(d2.id));
@@ -4984,9 +4986,9 @@ function Stat({
       }
     ),
     /* @__PURE__ */ jsxs(Stack, { spacing: 0, children: [
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "md", html: title, style: settings }),
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "xl", html: value, style: settings }),
-      /* @__PURE__ */ jsx(RichText, { component: "div", size: "sm", html: subtitle, style: settings })
+      title && /* @__PURE__ */ jsx(RichText, { component: "div", size: "md", html: title, style: settings }),
+      value && /* @__PURE__ */ jsx(RichText, { component: "div", size: "xl", html: value, style: settings }),
+      subtitle && /* @__PURE__ */ jsx(RichText, { component: "div", size: "sm", html: subtitle, style: settings })
     ] }, "stat"),
     tooltip && /* @__PURE__ */ jsx(InnerTooltip, { content: tooltip })
   ] });
@@ -12666,6 +12668,63 @@ var init_UnlocalizedFieldLabel = __esm({
     UnlocalizedFieldLabel_default = UnlocalizedFieldLabel;
   }
 });
+
+// components/blocks/types/selector.ts
+var SELECTOR_TYPE, SELECTOR_COMPONENT, OPTION_TYPE, isValidSelectorOptionsArray, isPrimitiveTypeVariable, isValidSelectorState, deriveLogicOptions;
+var init_selector = __esm({
+  "components/blocks/types/selector.ts"() {
+    init_esm_shims();
+    SELECTOR_TYPE = {
+      SINGLE: "single",
+      MULTI: "multi"
+    };
+    SELECTOR_COMPONENT = {
+      SEGMENTED_CONTROL: "segmented control",
+      SELECTOR: "selector"
+    };
+    OPTION_TYPE = {
+      STATIC: "static",
+      DYNAMIC: "dynamic"
+    };
+    isValidSelectorOptionsArray = (variable) => variable && Array.isArray(variable) && variable.length > 0;
+    isPrimitiveTypeVariable = (variable) => isValidSelectorOptionsArray(variable) && ["string"].includes(typeof variable[0]);
+    isValidSelectorState = (simpleState) => {
+      const {
+        name,
+        type,
+        optionsType,
+        options
+      } = simpleState;
+      if (![name, type, optionsType, options].every(Boolean))
+        return false;
+      if (optionsType === OPTION_TYPE.STATIC)
+        return options.static?.length > 0 && options.static?.every((o2) => o2.id);
+      if (!options.dynamic?.isPrimitiveType)
+        return !!options.dynamic?.idKey;
+      return true;
+    };
+    deriveLogicOptions = (selectorType, options, optionsType) => {
+      let defaultValue;
+      let logicOptions;
+      if (optionsType === OPTION_TYPE.STATIC) {
+        defaultValue = selectorType === SELECTOR_TYPE.SINGLE ? options.static.find((o2) => o2.isDefault)?.id : options.static.filter((o2) => o2.isDefault).map((o2) => o2.id);
+        logicOptions = options.static.map(({ id, label }) => ({ id, label: label || id }));
+      } else {
+        const {
+          optionsVar,
+          idKey,
+          labelKey,
+          defaultVar,
+          isPrimitiveType
+        } = options.dynamic;
+        if (defaultVar)
+          defaultValue = `variables["${defaultVar}"]`;
+        logicOptions = isPrimitiveType ? `variables["${optionsVar}"]` : `(variables["${optionsVar}"] || []).map(d => ({id: String(d["${idKey}"]), label: String(d["${labelKey || idKey}"])}))`;
+      }
+      return { logicOptions, defaultValue };
+    };
+  }
+});
 function StaticSelectorOptionRow({ option, editOption, deleteOption }) {
   return /* @__PURE__ */ jsxs("tr", { className: "reports-selector-static-option", children: [
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(
@@ -12904,23 +12963,7 @@ function SelectorUI(props) {
         component: selectorComponent,
         type: selectorType
       };
-      let defaultValue;
-      let logicOptions;
-      if (optionsType === OPTION_TYPE.STATIC) {
-        defaultValue = selectorType === SELECTOR_TYPE.SINGLE ? options.static.find((o2) => o2.isDefault)?.id : options.static.filter((o2) => o2.isDefault).map((o2) => o2.id);
-        logicOptions = options.static.map(({ id: id2, label }) => ({ id: id2, label: label || id2 }));
-      } else {
-        const {
-          optionsVar,
-          idKey,
-          labelKey,
-          defaultVar,
-          isPrimitiveType
-        } = options.dynamic;
-        if (defaultVar)
-          defaultValue = `variables["${defaultVar}"]`;
-        logicOptions = isPrimitiveType ? `variables["${optionsVar}"]` : `(variables["${optionsVar}"] || []).map(d => ({id: String(d["${idKey}"]), label: String(d["${labelKey || idKey}"])}))`;
-      }
+      const { logicOptions, defaultValue } = deriveLogicOptions(selectorType, options, optionsType);
       if (defaultValue)
         logicObj.defaultValue = defaultValue;
       logicObj.options = logicOptions;
@@ -13009,7 +13052,7 @@ function SelectorUI(props) {
     executeButton
   ] });
 }
-var SELECTOR_TYPE, SELECTOR_COMPONENT, OPTION_TYPE, isValidSelectorOptionsArray, isPrimitiveTypeVariable, isValidSelectorState, SelectorUI_default;
+var SelectorUI_default;
 var init_SelectorUI = __esm({
   "components/blocks/types/simpleEditors/SelectorUI.tsx"() {
     init_esm_shims();
@@ -13019,35 +13062,7 @@ var init_SelectorUI = __esm({
     init_RichTextEditor();
     init_UnlocalizedFieldLabel();
     init_cms();
-    SELECTOR_TYPE = {
-      SINGLE: "single",
-      MULTI: "multi"
-    };
-    SELECTOR_COMPONENT = {
-      SEGMENTED_CONTROL: "segmented control",
-      SELECTOR: "selector"
-    };
-    OPTION_TYPE = {
-      STATIC: "static",
-      DYNAMIC: "dynamic"
-    };
-    isValidSelectorOptionsArray = (variable) => variable && Array.isArray(variable) && variable.length > 0;
-    isPrimitiveTypeVariable = (variable) => isValidSelectorOptionsArray(variable) && ["string"].includes(typeof variable[0]);
-    isValidSelectorState = (simpleState) => {
-      const {
-        name,
-        type,
-        optionsType,
-        options
-      } = simpleState;
-      if (![name, type, optionsType, options].every(Boolean))
-        return false;
-      if (optionsType === OPTION_TYPE.STATIC)
-        return options.static?.length > 0 && options.static?.every((o2) => o2.id);
-      if (!options.dynamic?.isPrimitiveType)
-        return !!options.dynamic?.idKey;
-      return true;
-    };
+    init_selector();
     SelectorUI_default = SelectorUI;
   }
 });
@@ -18280,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) => {
@@ -18322,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
         }));
@@ -19666,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();
@@ -19683,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),
@@ -21019,6 +21034,7 @@ var scaffoldEmptyBlock = (block) => {
 // components/blocks/Block.tsx
 init_stringifyObject();
 init_BlockEditorProvider();
+init_selector();
 var UNLOCALIZED_ICON_KEYS = [
   "_iconVariant",
   "_iconSize",
@@ -21144,7 +21160,11 @@ function Block2({ id, modified, callbacks, inline }) {
         });
         const logicObj = { ...newSimple };
         if (block.type === BLOCK_TYPES.SELECTOR) {
-          logicObj.options = logicObj.options[logicObj.optionsType];
+          const { selectorType, options, optionsType } = contentByLocale[currentLocale2].content.simple;
+          const { logicOptions, defaultValue } = deriveLogicOptions(selectorType, options, optionsType);
+          if (defaultValue)
+            logicObj.defaultValue = defaultValue;
+          logicObj.options = logicOptions;
         }
         newContentByLocale[locale].content = {
           ...newContentByLocale[locale].content,
@@ -21160,10 +21180,11 @@ function Block2({ id, modified, callbacks, inline }) {
     const { settings } = blockState;
     const contentByLocale = Object.values(blockState.contentByLocale).reduce(reduceContent, {});
     const properties = ["id", "api", "shared", "type"].reduce((acc, d2) => ({ ...acc, [d2]: blockState[d2] }), {});
+    const newContent = spreadUnlocalizedContent(contentByLocale, currentLocale);
     return {
       ...properties,
       id: blockState.id,
-      contentByLocale: spreadUnlocalizedContent(contentByLocale, currentLocale),
+      contentByLocale: newContent,
       settings
     };
   };
@@ -22728,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");
@@ -24592,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: [
@@ -24605,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 })
     ] })
   ] });
@@ -25467,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) => {
@@ -25486,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,
       {
@@ -25532,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: [
@@ -25580,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,7 +4881,9 @@ 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 queryObject = new URLSearchParams(
+    typeof location !== "undefined" && location?.search ? location.search : query
+  );
   if (config.type === SELECTOR_TYPES.MULTI) {
     const queryIds = queryObject.get(accessor) ? queryObject.get(accessor).split(",") : config.defaultValue;
     const options = config.options.filter((d2) => queryIds.includes(d2.id));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -141,4 +141,4 @@
   "peerDependencies": {
     "next": "^14.2.3"
   }
-}
+}