@datawheel/bespoke 0.3.11 → 0.3.13

package/dist/index.js

@@ -914,7 +914,48 @@ var init_valueInOptions = __esm({
 });
 
 // libs/selectors/runSelector.js
-var runSelector_default;
+function runSelector(id, logic, formatterFunctions, blockContext, router = void 0) {
+  const { variables } = parseBlockContext(blockContext);
+  const transpiledLogic = varSwapRecursive_default({ logic }, formatterFunctions, blockContext).logic;
+  const evalResult = mortarEval_default("variables", variables, transpiledLogic, formatterFunctions, void 0, blockContext);
+  const { vars, log, error } = evalResult;
+  const type = vars.type || SELECTOR_TYPES.SINGLE;
+  const component = vars.component || "Selector";
+  const hideLabel = vars.hideLabel || "false";
+  const name = vars.name || "Unlabeled Selector";
+  const options = scaffoldDynamic_default(vars.options || []);
+  const maybeFixForMulti2 = (defaultValue2) => type === SELECTOR_TYPES.MULTI && !Array.isArray(defaultValue2) ? [defaultValue2] : defaultValue2;
+  let potentialDefaultValue = vars.defaultValue;
+  let defaultValue;
+  if (potentialDefaultValue) {
+    potentialDefaultValue = maybeFixForMulti2(potentialDefaultValue);
+    if (valueInOptions_default(type, potentialDefaultValue, options))
+      defaultValue = potentialDefaultValue;
+  }
+  if (!defaultValue) {
+    const fallbackValue = options && options[0] && options[0].id || options[0] || "";
+    defaultValue = maybeFixForMulti2(fallbackValue);
+  }
+  if (router) {
+    const accesor = `selector${id}id`;
+    const { query, pathname } = router;
+    const currentValue = query[accesor];
+    if (currentValue && !valueInOptions_default(type, currentValue, options)) {
+      const newQuery = { ...query };
+      delete newQuery[accesor];
+      router.replace({ pathname, query: newQuery }, void 0, { shallow: true });
+    }
+  }
+  const config = {
+    name,
+    type,
+    options,
+    defaultValue,
+    component,
+    hideLabel
+  };
+  return { config, log, error };
+}
 var init_runSelector = __esm({
   "libs/selectors/runSelector.js"() {
     init_esm_shims();
@@ -924,38 +965,6 @@ var init_runSelector = __esm({
     init_varSwapRecursive();
     init_scaffoldDynamic();
     init_valueInOptions();
-    runSelector_default = (logic, formatterFunctions, blockContext) => {
-      const { variables } = parseBlockContext(blockContext);
-      const transpiledLogic = varSwapRecursive_default({ logic }, formatterFunctions, blockContext).logic;
-      const evalResult = mortarEval_default("variables", variables, transpiledLogic, formatterFunctions, void 0, blockContext);
-      const { vars, log, error } = evalResult;
-      const type = vars.type || SELECTOR_TYPES.SINGLE;
-      const component = vars.component || "Selector";
-      const hideLabel = vars.hideLabel || "false";
-      const name = vars.name || "Unlabeled Selector";
-      const options = scaffoldDynamic_default(vars.options || []);
-      const maybeFixForMulti2 = (defaultValue2) => type === SELECTOR_TYPES.MULTI && !Array.isArray(defaultValue2) ? [defaultValue2] : defaultValue2;
-      let potentialDefaultValue = vars.defaultValue;
-      let defaultValue;
-      if (potentialDefaultValue) {
-        potentialDefaultValue = maybeFixForMulti2(potentialDefaultValue);
-        if (valueInOptions_default(type, potentialDefaultValue, options))
-          defaultValue = potentialDefaultValue;
-      }
-      if (!defaultValue) {
-        const fallbackValue = options && options[0] && options[0].id || options[0] || "";
-        defaultValue = maybeFixForMulti2(fallbackValue);
-      }
-      const config = {
-        name,
-        type,
-        options,
-        defaultValue,
-        component,
-        hideLabel
-      };
-      return { config, log, error };
-    };
   }
 });
 
@@ -1162,7 +1171,7 @@ function BlockException(message) {
   this.name = "BlockException";
   this.message = message;
 }
-async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn) {
+async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn, router = void 0) {
   const { locale, variables, query } = parseBlockContext(blockContext);
   const allowed = isBlockAllowed(block, blockContext, variables, formatterFunctions);
   let resp = null;
@@ -1222,10 +1231,12 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
     duration = Math.max(...apiResponses.map((ar) => ar.requestDuration));
   }
   if (block.type === BLOCK_TYPES.SELECTOR) {
-    const { config, log: log2, error: error2 } = runSelector_default(
+    const { config, log: log2, error: error2 } = runSelector(
+      block.id,
       block.contentByLocale[locale].content.logic,
       formatterFunctions,
-      blockContext
+      blockContext,
+      router
     );
     return {
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
@@ -1445,7 +1456,7 @@ var init_runConsumers = __esm({
       }
       return allowed;
     };
-    runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section") => {
+    runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section", router = void 0) => {
       if (!bid && !sections)
         return { ...initialState4 };
       const variablesById = { ...initialState4.variables ?? {} };
@@ -1512,7 +1523,8 @@ var init_runConsumers = __esm({
                 variables,
                 locale: variables.locale
               },
-              readMemberFn
+              readMemberFn,
+              router
             ).then(({ outputVariables, status }) => {
               if (status.error) {
                 if (typeof window === "undefined") {
@@ -1935,7 +1947,8 @@ var init_statusSlice = __esm({
         tools: true,
         settings: false,
         reportEditor: false
-      }
+      },
+      isCMS: false
     };
     statusSlice = createSlice({
       name: "status",
@@ -4525,7 +4538,8 @@ function useOnChangeSelector(blockId, section, selectorIdentifier, asComparison
           status: initialStatus
         },
         readMemberFn,
-        "report"
+        "report",
+        router
       ).then((data) => {
         if (comparison.active && asComparison) {
           comparison.setComparisonVariables({
@@ -5252,7 +5266,10 @@ function StaticSelectorOptionRow({ option, editOption, deleteOption }) {
       {
         placeholder: "myOption",
         value: option.id,
-        onChange: (event) => editOption({ id: event.currentTarget.value })
+        onChange: (event) => {
+          editOption({ id: event.currentTarget.value });
+        },
+        error: option.id.indexOf(" ") > -1 ? "Please, avoid the usage of spaces in the ID" : false
       }
     ) }),
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(
@@ -5375,6 +5392,15 @@ function DynamicSelectorOptionsEditor({ id, dynamicOptions, setDynamicOptions })
       labelKey: null
     });
   }, [dynamicOptions, setDynamicOptions]);
+  const optionsHasWarnings = useMemo(() => {
+    let optionsWithSpaces = [];
+    if (optionVariableMap && optionsVar && idKey && Array.isArray(optionVariableMap[optionsVar])) {
+      optionsWithSpaces = optionVariableMap[optionsVar].filter((o) => `${o[idKey]}`.indexOf(" ") > 0);
+    }
+    return optionsWithSpaces.length > 0 ? `One or more ID's have spaces on it. (
+        ${optionsWithSpaces.map((o) => `"${o[idKey]}"`).join(",")}
+        ) Avoid this, please.` : false;
+  }, [optionVariableMap, optionsVar, idKey]);
   if (!isInitialized)
     return null;
   const optionsVarList = Object.keys(optionVariableMap);
@@ -5400,7 +5426,8 @@ function DynamicSelectorOptionsEditor({ id, dynamicOptions, setDynamicOptions })
         required: !isPrimitiveType,
         disabled: isPrimitiveType,
         onChange: (val) => setState("idKey", val),
-        data: valueSelectorList
+        data: valueSelectorList,
+        error: optionsHasWarnings
       }
     ),
     /* @__PURE__ */ jsx(
@@ -6899,7 +6926,7 @@ function Block({ blockId, active = true, asComparison = false }) {
     if (![BLOCK_TYPES.GENERATOR, BLOCK_TYPES.VIZ, BLOCK_TYPES.NAV].includes(block.type)) {
       if (block?.type === BLOCK_TYPES.SELECTOR) {
         const blockContent2 = getBlockContent(block, locale);
-        const { config: renderVariables } = runSelector_default(blockContent2?.logic, formatterFunctions, blockContext);
+        const { config: renderVariables } = runSelector(block.id, blockContent2?.logic, formatterFunctions, blockContext);
         const content2 = renderVariables;
         return { ...content2, id: block.id, section: block.section_id };
       }
@@ -6942,7 +6969,7 @@ function Block({ blockId, active = true, asComparison = false }) {
       }
       if (block.type === BLOCK_TYPES.SELECTOR) {
         const blockContent2 = getBlockContent(block, locale);
-        const { config: renderVariables } = runSelector_default(blockContent2.logic, formatterFunctions, blockContext);
+        const { config: renderVariables } = runSelector(block.id, blockContent2.logic, formatterFunctions, blockContext);
         const content2 = renderVariables;
         setContent({ ...content2, id: block.id, section: block.section_id });
         return;
@@ -7289,10 +7316,13 @@ var guessResponse = (response) => {
 function DataTab(props) {
   const { section } = props;
   const readMemberFn = useReadMemberFn();
-  const locale = useAppSelector((state2) => state2.status.currentLocale);
+  const router = useRouter();
+  const isCMS = useAppSelector((state2) => state2.status.isCMS);
+  const statusLocale = useAppSelector((state2) => state2.status.currentLocale);
+  const routerLocale = router.locale;
+  const locale = isCMS ? statusLocale : routerLocale;
   const PREVIEW_SIZE = 50;
   const formatterFunctions = useFormatterFunctionsForLocale(locale);
-  const router = useRouter();
   const optionsTranslations = useBespokeTranslations("options");
   const translations = { ...DEFAULT_TRANSLATIONS2, ...optionsTranslations["data_tab"] };
   const [sourcesOptions, setSourcesOptions] = useState([]);
@@ -15780,6 +15810,8 @@ function UsersEditor() {
 // views/BespokeManager.tsx
 init_ErrorBoundary();
 init_envvars();
+init_statusSlice();
+init_store2();
 function BespokeManager(options) {
   const {
     title = "Bespoke CMS",
@@ -15969,6 +16001,10 @@ function BespokeManagerShell(props) {
     }
     return /* @__PURE__ */ jsx(NotFoundView, {});
   }, [location, user]);
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    dispatch(statusActions.setStatus({ isCMS: true }));
+  }, []);
   return /* @__PURE__ */ jsx(AppShell, { styles: {
     main: {
       background: "#f8f9fa",

package/dist/server.js

@@ -4226,7 +4226,7 @@ var valueInOptions_default = (type, value, options) => {
 };
 
 // libs/selectors/runSelector.js
-var runSelector_default = (logic, formatterFunctions, blockContext) => {
+function runSelector(id, logic, formatterFunctions, blockContext, router = void 0) {
   const { variables } = parseBlockContext(blockContext);
   const transpiledLogic = varSwapRecursive_default({ logic }, formatterFunctions, blockContext).logic;
   const evalResult = mortarEval_default("variables", variables, transpiledLogic, formatterFunctions, void 0, blockContext);
@@ -4248,6 +4248,16 @@ var runSelector_default = (logic, formatterFunctions, blockContext) => {
     const fallbackValue = options && options[0] && options[0].id || options[0] || "";
     defaultValue = maybeFixForMulti(fallbackValue);
   }
+  if (router) {
+    const accesor = `selector${id}id`;
+    const { query, pathname } = router;
+    const currentValue = query[accesor];
+    if (currentValue && !valueInOptions_default(type, currentValue, options)) {
+      const newQuery = { ...query };
+      delete newQuery[accesor];
+      router.replace({ pathname, query: newQuery }, void 0, { shallow: true });
+    }
+  }
   const config = {
     name,
     type,
@@ -4257,7 +4267,7 @@ var runSelector_default = (logic, formatterFunctions, blockContext) => {
     hideLabel
   };
   return { config, log, error };
-};
+}
 
 // libs/selectors/selectorQueryToVariable.js
 var selectorQueryToVariable = (id, query, config) => {
@@ -4434,7 +4444,7 @@ function BlockException(message) {
   this.name = "BlockException";
   this.message = message;
 }
-async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn) {
+async function runSingleBlock(block, formatterFunctions, blockContext, readMemberFn, router = void 0) {
   const { locale, variables, query } = parseBlockContext(blockContext);
   const allowed = isBlockAllowed(block, blockContext, variables, formatterFunctions);
   let resp = null;
@@ -4494,10 +4504,12 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
     duration = Math.max(...apiResponses.map((ar) => ar.requestDuration));
   }
   if (block.type === BLOCK_TYPES.SELECTOR) {
-    const { config, log: log2, error: error2 } = runSelector_default(
+    const { config, log: log2, error: error2 } = runSelector(
+      block.id,
       block.contentByLocale[locale].content.logic,
       formatterFunctions,
-      blockContext
+      blockContext,
+      router
     );
     return {
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
@@ -4675,7 +4687,7 @@ var isBlockAllowed = (block, blockContext, variables, formatterFunctions) => {
   }
   return allowed;
 };
-var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section") => {
+var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialState4 = {}, readMemberFn, mode = "section", router = void 0) => {
   if (!bid && !sections)
     return { ...initialState4 };
   const variablesById = { ...initialState4.variables ?? {} };
@@ -4742,7 +4754,8 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
             variables,
             locale: variables.locale
           },
-          readMemberFn
+          readMemberFn,
+          router
         ).then(({ outputVariables, status }) => {
           if (status.error) {
             if (typeof window === "undefined") {
@@ -4998,7 +5011,8 @@ var initialState = {
     tools: true,
     settings: false,
     reportEditor: false
-  }
+  },
+  isCMS: false
 };
 var statusSlice = createSlice({
   name: "status",
@@ -5750,7 +5764,9 @@ function BespokeManagerServerSideProps(options) {
           dispatch(readEntity("report", {
             id: parseReportId(ctx.query[pathSegmentsKey]),
             include: true
-          }))
+          })),
+          // Mark the status as CMS environment
+          dispatch(statusActions.setStatus({ isCMS: true }))
         ]);
         const postResult = await postResolve(store, ctx);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -129,4 +129,4 @@
   "peerDependencies": {
     "next": "^13.4.0"
   }
-}
+}