@datawheel/bespoke 0.1.29 → 0.1.31

package/dist/index.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import yn3 from 'yn';
+import yn4 from 'yn';
 import * as d3Array from 'd3-array';
 import * as d3Collection from 'd3-collection';
 import * as d3Format from 'd3-format';
@@ -16,11 +16,11 @@ import { Notifications, notifications } from '@mantine/notifications';
 import React, { forwardRef, useMemo, useState, useCallback, useContext, useEffect, createContext, useRef, Fragment as Fragment$1, createElement } from 'react';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
-import { Stack, Text, Badge, Group, useMantineTheme, Flex, packSx, Tooltip, ActionIcon, Center, Modal, Button, SegmentedControl, Select, MultiSelect, Title, Box, List, Menu, Anchor, MantineProvider, Divider, Burger, Navbar, ScrollArea, Avatar, AppShell, UnstyledButton, ThemeIcon, LoadingOverlay, Skeleton, Container, TextInput, Loader, Alert, Collapse, Card, Space, Code, Textarea, rem, Paper, Grid, Input, Popover, Checkbox, Radio, Switch, Drawer, Overlay, SimpleGrid, Autocomplete, Tabs, Header, px, Image, FileInput, Accordion, HoverCard, CopyButton, NumberInput, Col } from '@mantine/core';
+import { Stack, Text, Badge, Group, useMantineTheme, Flex, packSx, Tooltip, ActionIcon, Center, Modal, Button, SegmentedControl, Select, MultiSelect, Title, TextInput, Switch, Box, List, Menu, Anchor, MantineProvider, Divider, Burger, Navbar, ScrollArea, Avatar, AppShell, UnstyledButton, ThemeIcon, LoadingOverlay, Skeleton, Container, Loader, Alert, Collapse, Card, Space, Code, Textarea, rem, Paper, Grid, Input, Popover, Checkbox, Radio, Drawer, Overlay, SimpleGrid, Autocomplete, Tabs, Header, px, Image, FileInput, Accordion, HoverCard, CopyButton, NumberInput, Col } from '@mantine/core';
 import { dataConcat } from 'd3plus-viz';
 import * as d3plus from 'd3plus-react';
 import Router, { useRouter } from 'next/router';
-import { IconInfoCircle, IconSearch, IconAlignLeft, IconAlignCenter, IconAlignRight, IconBoxMargin, IconTable, IconMathFunction, IconUsers, IconLogout, IconTrash, IconUserCircle, IconEdit, IconDatabase, IconServer, IconPencil, IconAlertCircle, IconCircleCheck, IconPlayerPlay, IconAlarmFilled, IconBox, IconLink, IconCircleX, IconFlag, IconCirclePlus, IconFileAnalytics, IconPlus, IconX, IconChevronDown, IconCamera, IconShare, IconCircleDashed, IconListSearch, IconExternalLink, IconSettings, IconFileOff, IconFilesOff, IconHierarchy3, IconMenu, IconRefresh, IconPolaroid, IconCircleMinus, IconEyeOff, IconChevronLeft, IconChevronRight, IconLogin, IconWorld, IconLock, IconVariable, IconArrowRightCircle, IconDownload, IconTemplate, IconChartBar, IconCode, IconUpload, IconCodePlus, IconClipboardCheck, IconClipboardCopy, IconPalette, IconEye, IconMinimize, IconMaximize, IconRss, IconGlobe } from '@tabler/icons-react';
+import { IconInfoCircle, IconRefresh, IconSearch, IconAlignLeft, IconAlignCenter, IconAlignRight, IconBoxMargin, IconTable, IconMathFunction, IconUsers, IconLogout, IconTrash, IconUserCircle, IconEdit, IconDatabase, IconServer, IconPencil, IconAlertCircle, IconCircleCheck, IconPlayerPlay, IconAlarmFilled, IconBox, IconLink, IconCircleX, IconFlag, IconCirclePlus, IconFileAnalytics, IconPlus, IconX, IconChevronDown, IconCamera, IconShare, IconCircleDashed, IconListSearch, IconExternalLink, IconSettings, IconFileOff, IconFilesOff, IconHierarchy3, IconMenu, IconPolaroid, IconCircleMinus, IconEyeOff, IconChevronLeft, IconChevronRight, IconLogin, IconWorld, IconLock, IconVariable, IconArrowRightCircle, IconDownload, IconTemplate, IconChartBar, IconCode, IconUpload, IconCodePlus, IconClipboardCheck, IconClipboardCopy, IconPalette, IconEye, IconMinimize, IconMaximize, IconRss, IconGlobe } from '@tabler/icons-react';
 import { useMediaQuery, useDisclosure, useDebouncedValue, useHotkeys, useFullscreen, getHotkeyHandler } from '@mantine/hooks';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
@@ -354,8 +354,9 @@ var init_cms = __esm({
       STAT: "stat",
       SUBTITLE: "subtitle",
       TITLE: "title",
-      NAV: "nav"
+      NAV: "nav",
       // todo1.0, how to put custom blocks in here?
+      RESET_BUTTON: "reset_button"
     };
     BLOCK_LOGIC_TYPES = {
       GENERATOR: "generator",
@@ -472,7 +473,7 @@ var getLogging_default;
 var init_getLogging = __esm({
   "libs/configs/getLogging.ts"() {
     init_esm_shims();
-    getLogging_default = (env = process.env) => yn3(env.REPORTS_LOGGING);
+    getLogging_default = (env = process.env) => yn4(env.REPORTS_LOGGING);
   }
 });
 
@@ -740,7 +741,7 @@ var init_mortarEval = __esm({
     init_esm_shims();
     init_block();
     init_libs();
-    verbose = yn3(process.env.REPORTS_LOGGING);
+    verbose = yn4(process.env.REPORTS_LOGGING);
     mortarEval_default = mortarEval;
   }
 });
@@ -969,7 +970,7 @@ function getRootBlocksForSection(sid, blocks) {
     blockList.filter((block) => block.section_id === sid && // leave blocks belonging to this section
     // that don't depend on any other blocks OR
     (block.inputs.length === 0 || // that depend only on blocks from other sections
-    block.inputs.every((id) => nonNativeBlocks.includes(id)))).map((block) => [block.id, block])
+    block.inputs.some((id) => nonNativeBlocks.includes(id)))).map((block) => [block.id, block])
     // then convert them to entries
   );
 }
@@ -1095,14 +1096,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
     return {
       outputVariables: {},
       renderVariables: {},
-      status: {
-        api: null,
-        duration: null,
-        resp: null,
-        log: [],
-        error: null,
-        allowed: false
-      }
+      status: { allowed: false }
     };
   }
   if (unswappedAPI) {
@@ -1133,9 +1127,6 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
       renderVariables: config,
       status: {
-        api: null,
-        duration: null,
-        resp: null,
         log: log2,
         error: error2,
         allowed
@@ -1148,11 +1139,8 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       // todo1.0 this will have to be materialized click-variables
       renderVariables: block.contentByLocale.logic.content,
       status: {
-        api: null,
-        duration: null,
-        resp: null,
         log: [],
-        error: null,
+        // todo: see if we can remove this safely
         allowed
       }
     };
@@ -1189,7 +1177,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
     }
   };
 }
-var verbose2, ORIGIN, swapAPI, urlProxy, getDependencies, isBlockAllowed, runConsumersV2, getDurationColor, getSizeColor;
+var verbose2, debug, ORIGIN, swapAPI, urlProxy, getDependencies, isBlockAllowed, runConsumersV2, getDurationColor, getSizeColor;
 var init_runConsumers = __esm({
   "libs/blocks/runConsumers.ts"() {
     init_esm_shims();
@@ -1205,6 +1193,7 @@ var init_runConsumers = __esm({
     init_getRootBlocksForSection();
     init_arrayUtils();
     verbose2 = getLogging_default();
+    debug = yn4(process.env.NEXT_PUBLIC_REPORTS_DEBUG);
     ORIGIN = process.env.REPORTS_ORIGIN || "";
     axios.interceptors.request.use((config) => ({
       ...config,
@@ -1229,17 +1218,19 @@ var init_runConsumers = __esm({
       if (rootBlock.inputs.length && crawlUp) {
         rootBlock.inputs.forEach((iid) => {
           const rel = `${iid}-${bid}`;
-          if (!acc.includes(rel))
+          if (!acc.includes(rel)) {
             acc.push(rel);
+          }
           rootBlock.inputs.forEach((iid2) => getDependencies(iid2, blocks, acc, crawlUp, false, withinSection, visited));
         });
       }
       if (rootBlock.consumers.length && crawlDown) {
         rootBlock.consumers.forEach((cid) => {
           const rel = `${bid}-${cid}`;
-          if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection))
+          if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection)) {
             acc.push(rel);
-          rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown, withinSection, visited));
+          }
+          rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, false, crawlDown, withinSection, visited));
         });
       }
       return acc;
@@ -1272,16 +1263,31 @@ var init_runConsumers = __esm({
       const statusById = { ...initialState4.status ?? {} };
       const parsedBlockContext = parseBlockContext(blockContext);
       const attributes = parsedBlockContext.variables;
-      const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+      const rootBlocks = bid ? { [bid]: blocks[bid] } : (sections ?? []).reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+      if (debug)
+        console.log("%crunConsumers: running root blocks", "color:purple", Object.keys(rootBlocks));
       const withinSection = mode === "section";
       const blockDeps = Object.keys(rootBlocks).reduce((deps, id) => {
+        const start = /* @__PURE__ */ new Date();
         const dependencies = getDependencies(Number(id), blocks, [], !bid, true, withinSection).map((rel) => rel.split("-"));
+        const end = /* @__PURE__ */ new Date();
+        const elapsedTime = (end.getTime() - start.getTime()) / 1e3;
+        if (debug)
+          console.log(
+            `%cResolved dependencies for ${id} (${elapsedTime.toFixed(2)}s)`,
+            "color:blue"
+          );
         return [...deps, ...dependencies];
       }, []);
+      const startToposort = /* @__PURE__ */ new Date();
       const orderedDAG = Object.keys(rootBlocks).reduce(
         (orderedDAG2, bid2) => orderedDAG2.includes(bid2) ? [...orderedDAG2] : [bid2, ...orderedDAG2],
         toposort(blockDeps)
       );
+      const endToposort = /* @__PURE__ */ new Date();
+      const toposortTime = (endToposort.getTime() - startToposort.getTime()) / 1e3;
+      if (debug)
+        console.log(`%cResolved DAG (${toposortTime.toFixed(2)}s): `, "color:green", orderedDAG);
       async function runTasksInParallel(executionOrder, blocks2) {
         const runningBlocks = /* @__PURE__ */ new Map();
         for (const bid2 of executionOrder) {
@@ -1289,22 +1295,21 @@ var init_runConsumers = __esm({
           const dependenciesDone = Promise.all(
             block.inputs.filter((iid) => executionOrder.includes(String(iid))).map((iid) => runningBlocks.get(Number(iid)))
           );
-          const runningTask = dependenciesDone.then(() => {
+          const runningTask = dependenciesDone.then(async () => {
             const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
-            const inputNotAllowed = block.inputs.find((iid) => !statusById[iid].allowed || statusById[iid].hiddenByCascade);
+            const inputNotAllowed = block.inputs.find(
+              (iid) => !statusById[iid].allowed || statusById[iid].hiddenByCascade
+            );
             if (inputNotAllowed) {
               statusById[bid2] = {
-                api: null,
-                duration: null,
-                resp: null,
                 log: [],
-                error: null,
                 allowed: false,
                 hiddenByCascade: statusById[inputNotAllowed].hiddenByCascade || inputNotAllowed
               };
               return;
             }
-            return runSingleBlock(
+            const startBlock = /* @__PURE__ */ new Date();
+            const blockResult = await runSingleBlock(
               block,
               formatterFunctions,
               {
@@ -1316,12 +1321,25 @@ var init_runConsumers = __esm({
               variablesById[bid2] = outputVariables;
               statusById[bid2] = status;
             });
+            const endBlock = /* @__PURE__ */ new Date();
+            const blockTime = (endBlock.getTime() - startBlock.getTime()) / 1e3;
+            if (debug)
+              console.log(
+                `%cBlock ${block.id} resolved in ${blockTime.toFixed(3)}s`,
+                blockTime > 500 ? "color:red" : "color:green"
+              );
+            return blockResult;
           });
           runningBlocks.set(Number(bid2), runningTask);
         }
         await Promise.all(Array.from(runningBlocks.values()));
       }
+      const startVariables = /* @__PURE__ */ new Date();
       await runTasksInParallel(orderedDAG, blocks);
+      const endVariables = /* @__PURE__ */ new Date();
+      const variablesTime = (endVariables.getTime() - startVariables.getTime()) / 1e3;
+      if (debug)
+        console.log(`%cResolved Variables (${variablesTime.toFixed(2)}s): `, "color:green");
       return {
         variables: { ...initialState4.variables ?? {}, ...variablesById },
         status: { ...initialState4.status ?? {}, ...statusById }
@@ -2889,6 +2907,7 @@ function Viz(config) {
   const blockContext = { variables };
   const router = useRouter();
   const { sectionVariables, setSectionVariables, resetSectionVariables } = useSectionVariables(block.section_id);
+  const sectionVariablesStr = JSON.stringify(sectionVariables);
   const vizProps = useMemo(() => {
     if (!content?.logic)
       return { error: "Add a Configuration" };
@@ -2902,7 +2921,7 @@ function Viz(config) {
       }
     };
     return d3plusPropify_default(transpiledLogic, formatterFunctions, variables, locale, block.id, {}, globals);
-  }, [block, active, variables, sectionVariables]);
+  }, [block, active, variables, sectionVariablesStr]);
   const { type } = vizProps.config || {};
   const fallbackType = type && vizTypes[type] ? type : "Treemap";
   if (!vizTypes[type])
@@ -2936,7 +2955,7 @@ function Viz(config) {
           linksFormat: vizProps.linksFormat,
           nodesFormat: vizProps.nodesFormat,
           topojsonFormat: vizProps.topojsonFormat,
-          config: { ...defaultConfig_default, ...vizConfig }
+          config: { ...defaultConfig_default, ...vizConfig, sectionVariables: sectionVariablesStr }
         },
         "viz-key"
       ) })
@@ -3102,7 +3121,7 @@ function Viz2({
   active,
   locale,
   variables,
-  debug,
+  debug: debug2,
   configOverride = {}
 }) {
   const context = useAppContext();
@@ -3472,6 +3491,7 @@ function BespokeExplore({
   const [metadata, setMetadata] = useState();
   const inputRef = useRef();
   useEffect(() => {
+    setLoading(true);
     dispatch(actions_exports.readMetadata({})).then((resp) => {
       setMetadata(resp.data);
     }, (err) => {
@@ -4332,6 +4352,30 @@ function NavView({ headings, settings }) {
   return smallerThanMd ? /* @__PURE__ */ jsx(MobileNav, { contentOutline }) : /* @__PURE__ */ jsx(DesktopNav, { contentOutline });
 }
 
+// frontend/components/report/blocks/ResetButton.tsx
+init_esm_shims();
+init_hooks();
+init_hooks();
+function ResetButtonView({ id, label, showIcon, fullWidth, showWhenDisabled }) {
+  const block = useBlockRef(id).data;
+  const { sectionVariables, resetSectionVariables } = useSectionVariables(block?.section_id);
+  const hasVariables = Boolean(Object.keys(sectionVariables).length);
+  if (!hasVariables && !showWhenDisabled)
+    return null;
+  return /* @__PURE__ */ jsx(
+    Button,
+    {
+      onClick: () => resetSectionVariables(),
+      disabled: !hasVariables,
+      fullWidth,
+      children: /* @__PURE__ */ jsxs(Group, { align: "center", children: [
+        label,
+        showIcon && /* @__PURE__ */ jsx(IconRefresh, {})
+      ] })
+    }
+  );
+}
+
 // frontend/components/report/blocks/index.tsx
 var VizView = dynamic(
   () => Promise.resolve().then(() => (init_Viz(), Viz_exports)),
@@ -4346,7 +4390,8 @@ var TypeRenderers = {
   [BLOCK_TYPES.VIZ]: VizView,
   [BLOCK_TYPES.GENERATOR]: Generator,
   [BLOCK_TYPES.IMAGE]: ImageView,
-  [BLOCK_TYPES.NAV]: NavView
+  [BLOCK_TYPES.NAV]: NavView,
+  [BLOCK_TYPES.RESET_BUTTON]: ResetButtonView
 };
 var blocks_default = TypeRenderers;
 
@@ -4778,10 +4823,67 @@ function NavUI() {
   return /* @__PURE__ */ jsx(Title, { order: 4, children: "Nav UI" });
 }
 
+// components/blocks/types/simpleEditors/ResetButtonUI.tsx
+init_esm_shims();
+function ResetButtonUI({ id, locale, executeButton, onChange, simpleState }) {
+  const [label, setLabel] = useState(simpleState?.label ?? "");
+  const [showIcon, setShowIcon] = useState(simpleState?.showIcon ?? true);
+  const [fullWidth, setFullwidth] = useState(simpleState?.fullWidth ?? false);
+  const [showWhenDisabled, setShowWhenDisabled] = useState(simpleState?.showWhenDisabled ?? false);
+  useEffect(() => {
+    const simpleState2 = {
+      label,
+      showIcon,
+      fullWidth,
+      showWhenDisabled
+    };
+    onChange(simpleState2);
+  }, [label, showIcon, fullWidth, showWhenDisabled, onChange]);
+  return /* @__PURE__ */ jsxs(Stack, { children: [
+    /* @__PURE__ */ jsx(
+      TextInput,
+      {
+        placeholder: "Label for reset section state button",
+        value: label,
+        onChange: (e) => setLabel(e.target.value),
+        label: "Label"
+      }
+    ),
+    /* @__PURE__ */ jsxs(Group, { children: [
+      /* @__PURE__ */ jsx(
+        Switch,
+        {
+          checked: showIcon,
+          label: "Show icon",
+          onChange: (e) => setShowIcon(e.currentTarget.checked)
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        Switch,
+        {
+          checked: fullWidth,
+          label: "Full width",
+          onChange: (e) => setFullwidth(e.currentTarget.checked)
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        Switch,
+        {
+          checked: showWhenDisabled,
+          label: "Show when disabled",
+          onChange: (e) => setShowWhenDisabled(e.currentTarget.checked)
+        }
+      )
+    ] }),
+    executeButton
+  ] });
+}
+
 // components/blocks/types/simpleEditors/index.js
 var simpleEditors_default = {
   [BLOCK_TYPES.SELECTOR]: SelectorUI_default,
-  [BLOCK_TYPES.NAV]: NavUI
+  [BLOCK_TYPES.NAV]: NavUI,
+  [BLOCK_TYPES.RESET_BUTTON]: ResetButtonUI
 };
 
 // components/blocks/types/renderers/index.tsx
@@ -5062,8 +5164,8 @@ function InputMenuItem({
   ] }) }) });
 }
 var InputMenuItem_default = InputMenuItem;
-function Generator2({ outputVariables, debug }) {
-  return debug ? /* @__PURE__ */ jsxs(Fragment, { children: [
+function Generator2({ outputVariables, debug: debug2 }) {
+  return debug2 ? /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Divider, { label: "Output Variables", labelPosition: "center" }),
     /* @__PURE__ */ jsx(InputMenuItem_default, { variables: outputVariables })
   ] }) : /* @__PURE__ */ jsx(Center, { children: /* @__PURE__ */ jsx(Badge, { color: "gray", variant: "outline", children: "GENERATOR" }, "type") });
@@ -5222,6 +5324,31 @@ function NavPreview({ headings, settings }) {
   ] });
 }
 
+// components/blocks/types/renderers/ResetButton.tsx
+init_esm_shims();
+init_hooks();
+init_hooks();
+function ResetButtonPreview({ id, label, showIcon, fullWidth, showWhenDisabled }) {
+  const block = useBlockRef(id).data;
+  const { sectionVariables, resetSectionVariables } = useSectionVariables(block?.section_id);
+  const hasVariables = Boolean(Object.keys(sectionVariables).length);
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    !hasVariables && !showWhenDisabled && /* @__PURE__ */ jsx(Text, { size: "xs", children: "Reset button will not be shown on its disabled state" }),
+    /* @__PURE__ */ jsx(
+      Button,
+      {
+        onClick: () => resetSectionVariables(),
+        disabled: !hasVariables,
+        fullWidth,
+        children: /* @__PURE__ */ jsxs(Group, { align: "center", children: [
+          label,
+          showIcon && /* @__PURE__ */ jsx(IconRefresh, {})
+        ] })
+      }
+    )
+  ] });
+}
+
 // components/blocks/types/renderers/index.tsx
 var VizPreview = dynamic(
   () => Promise.resolve().then(() => (init_Viz2(), Viz_exports2)),
@@ -5236,7 +5363,8 @@ var renderersMap = {
   [BLOCK_TYPES.VIZ]: VizPreview,
   [BLOCK_TYPES.GENERATOR]: Generator_default,
   [BLOCK_TYPES.IMAGE]: ImagePreview,
-  [BLOCK_TYPES.NAV]: NavPreview
+  [BLOCK_TYPES.NAV]: NavPreview,
+  [BLOCK_TYPES.RESET_BUTTON]: ResetButtonPreview
 };
 var renderers_default = renderersMap;
 
@@ -5300,6 +5428,12 @@ var allBlocks = {
     renderer: renderers_default[BLOCK_TYPES.NAV],
     renderPreviewOnEdit: true,
     evalWhenNonActive: true
+  },
+  [BLOCK_TYPES.RESET_BUTTON]: {
+    type: BLOCK_TYPES.RESET_BUTTON,
+    renderer: renderers_default[BLOCK_TYPES.RESET_BUTTON],
+    renderPreviewOnEdit: true,
+    evalWhenNonActive: true
   }
 };
 var types_default = allBlocks;
@@ -5385,6 +5519,10 @@ function Block({ blockId, active = true }) {
         });
         return;
       }
+      if (block.type === BLOCK_TYPES.RESET_BUTTON) {
+        setContent({ id: block.id, ...blockContent.simple });
+        return;
+      }
       const swappedLogic = varSwap_default(blockContent?.logic, formatterFunctions, blockContext);
       const { vars } = mortarEval_default(
         "variables",
@@ -6434,7 +6572,7 @@ var SectionResetButton = ({ id }) => {
   const hasVariables = Boolean(Object.keys(sectionVariables).length);
   if (!hasVariables)
     return null;
-  return /* @__PURE__ */ jsx(ActionIcon, { disabled: !hasVariables, onClick: resetSectionVariables, children: /* @__PURE__ */ jsx(IconRefresh, { size: 20 }) });
+  return /* @__PURE__ */ jsx(ActionIcon, { disabled: !hasVariables, onClick: resetSectionVariables, variant: "filled", size: "xs", children: /* @__PURE__ */ jsx(IconRefresh, { size: 20 }) });
 };
 function SectionMenu({ sectionId }) {
   const theme = useMantineTheme();
@@ -6443,8 +6581,7 @@ function SectionMenu({ sectionId }) {
     borderRadius: theme.radius.sm
   }, children: [
     /* @__PURE__ */ jsx(DesignSectionMenu, { sectionId }),
-    /* @__PURE__ */ jsx(EntityDeleteButton, { type: "section", id: sectionId }),
-    /* @__PURE__ */ jsx(SectionResetButton, { id: sectionId })
+    /* @__PURE__ */ jsx(EntityDeleteButton, { type: "section", id: sectionId })
   ] });
 }
 var SectionMenu_default = SectionMenu;
@@ -6948,14 +7085,9 @@ function Section({ section }) {
             id: `section-${id}`,
             pos: "relative",
             children: [
-              /* @__PURE__ */ jsxs("div", { style: {
-                position: "absolute",
-                right: 10,
-                top: 10,
-                zIndex: 3
-              }, children: [
-                sectionSettings2.optionsMenu && /* @__PURE__ */ jsx(Options, { sectionId: section.id }),
-                /* @__PURE__ */ jsx(SectionResetButton, { id: section.id })
+              /* @__PURE__ */ jsxs(Group, { position: "right", mb: "xs", children: [
+                /* @__PURE__ */ jsx(SectionResetButton, { id: section.id }),
+                sectionSettings2.optionsMenu && /* @__PURE__ */ jsx(Options, { sectionId: section.id })
               ] }),
               /* @__PURE__ */ jsx(StyleWrapper, { className: "bespoke-section-content", settings: sectionSettings2, styles: sectionStyles?.content, children: /* @__PURE__ */ jsx(ColumnsWrapper, { children: Object.keys(columns).sort((a, b) => orderSort(a, b, "blockcol")).map((columnIndex) => {
                 const column = columns[columnIndex];
@@ -7247,7 +7379,7 @@ function normalizeList(value) {
 var { localeDefault: localeDefault8 } = getLocales_default();
 function parseReadMemberParams(query) {
   const locale = normalizeList(query.locale)[0] || localeDefault8 || "en";
-  const all = locale === "all" || yn3(query.all);
+  const all = locale === "all" || yn4(query.all);
   const mode = normalizeList(query.mode)[0];
   const outputParam = normalizeList(query.output)[0] || "full";
   const output = outputParam === "lite" ? "lite" : "full";
@@ -7312,9 +7444,9 @@ function parseSearchMemberParams(query) {
     locale: localeIsAll ? localeDefault8 : locale,
     limit: normalizeList(query.limit).map(parseFiniteNumber)[0] ?? 5,
     format: formatIsNested ? "nested" : "plain",
-    includes: yn3(query.includes, { default: true }),
-    visible: yn3(query.visible, { default: true }),
-    noImage: yn3(query.noImage, { default: false }),
+    includes: yn4(query.includes, { default: true }),
+    visible: yn4(query.visible, { default: true }),
+    noImage: yn4(query.noImage, { default: false }),
     variant,
     dimension,
     report,
@@ -8896,7 +9028,7 @@ function BlockPreview(props) {
     active,
     allowed,
     blockStateContent,
-    debug,
+    debug: debug2,
     for: block,
     locale
   } = props;
@@ -8965,6 +9097,10 @@ function BlockPreview(props) {
         setContent({ headings: block.inputs, settings: block.settings });
         return;
       }
+      if (block.type === BLOCK_TYPES.RESET_BUTTON) {
+        setContent(blockContent.simple);
+        return;
+      }
       const swappedLogic = varSwap_default(blockContent?.logic, formatterFunctions, blockContext);
       const { vars, error: error2, log: log2 } = mortarEval_default(
         "variables",
@@ -9004,8 +9140,8 @@ function BlockPreview(props) {
       style: { width: "100%", minHeight: block.type === BLOCK_TYPES.VIZ ? 400 : "auto" },
       children: [
         !allowed && allowedOverlay,
-        Renderer ? /* @__PURE__ */ jsx(Fragment$1, { children: /* @__PURE__ */ jsx(Renderer, { id: block.id, debug, ...content, settings: block.settings }) }, "renderer") : /* @__PURE__ */ jsx(Center, { style: { minHeight: 100 }, children: /* @__PURE__ */ jsx(Badge, { color: "gray", variant: "outline", children: block.type }, "type") }),
-        debug && textLog && /* @__PURE__ */ jsx(
+        Renderer ? /* @__PURE__ */ jsx(Fragment$1, { children: /* @__PURE__ */ jsx(Renderer, { id: block.id, debug: debug2, ...content, settings: block.settings }) }, "renderer") : /* @__PURE__ */ jsx(Center, { style: { minHeight: 100 }, children: /* @__PURE__ */ jsx(Badge, { color: "gray", variant: "outline", children: block.type }, "type") }),
+        debug2 && textLog && /* @__PURE__ */ jsx(
           Textarea,
           {
             label: "Console",
@@ -9015,7 +9151,7 @@ function BlockPreview(props) {
             error
           }
         ),
-        debug && error && /* @__PURE__ */ jsx(Textarea, { label: "Error", readOnly: true, minRows: 3, value: error }),
+        debug2 && error && /* @__PURE__ */ jsx(Textarea, { label: "Error", readOnly: true, minRows: 3, value: error }),
         block.type === BLOCK_TYPES.GENERATOR && /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsxs(Group, { spacing: "xs", my: "xs", children: [
             status.duration && /* @__PURE__ */ jsxs(
@@ -10411,7 +10547,10 @@ function SectionEditor({
           }
         ),
         memberImageBg && /* @__PURE__ */ jsx(SectionBackground, {}),
-        optionsMenu && /* @__PURE__ */ jsx(Flex, { justify: "flex-end", mx: 16, children: /* @__PURE__ */ jsx(Options, { sectionId: section.id }) }),
+        optionsMenu && /* @__PURE__ */ jsxs(Flex, { justify: "flex-end", mx: 16, align: "center", gap: "xs", children: [
+          /* @__PURE__ */ jsx(SectionResetButton, { id: section.id }),
+          /* @__PURE__ */ jsx(Options, { sectionId: section.id })
+        ] }),
         /* @__PURE__ */ jsx(
           GeneratorsPanel,
           {

package/dist/server.js

@@ -500,8 +500,9 @@ var BLOCK_CONTENT_TYPES = {
   STAT: "stat",
   SUBTITLE: "subtitle",
   TITLE: "title",
-  NAV: "nav"
+  NAV: "nav",
   // todo1.0, how to put custom blocks in here?
+  RESET_BUTTON: "reset_button"
 };
 var BLOCK_LOGIC_TYPES = {
   GENERATOR: "generator",
@@ -2115,20 +2116,26 @@ var whitelist = [
   "vi",
   "zh"
 ];
-getLogging_default();
+var verbose3 = getLogging_default();
 var { locales } = getLocales_default();
 var enabledLocales = locales.filter((d) => whitelist.includes(d));
 var initializing = false;
 var getSearchIndexByLocale = async (db, forceRegenerate = false) => {
   if (forceRegenerate) {
+    if (verbose3)
+      console.log("0\uFE0F\u20E3 CLEARING SEARCH INDEX");
     global.lunrsearch = void 0;
     initializing = false;
   }
   if (global.lunrsearch) {
+    if (verbose3)
+      console.log("\u{1F501} RE-UTILIZING SEARCH INDEX");
     return global.lunrsearch;
   }
   try {
     if (!initializing) {
+      if (verbose3)
+        console.log("1\uFE0F\u20E3  INITIALIZING SEARCH INDEX");
       initializing = true;
       global.lunrsearch = await newSearchIndex(db);
     }
@@ -2146,34 +2153,46 @@ async function newSearchIndex(db) {
     include: [{ association: "contentByLocale" }]
   });
   const setups = enabledLocales.map(async (locale) => {
-    if (!lunr[locale] && whitelist.includes(locale) && locale !== "en") {
+    if (!lunr[locale] && locale !== "en") {
       const lunrLang = (await import(`lunr-languages/lunr.${locale}`)).default;
       lunrLang(lunr);
+      lunrStemmer(lunr);
+      if (verbose3)
+        console.log(`\u{1F3F3}\uFE0F  INITIALIZING SEARCH ${locale} LOCALE`);
     }
-    return [locale, lunr(function() {
-      if (locale && locale !== "en")
-        this.use(lunr[locale]);
-      this.ref("content_id");
-      this.field("id");
-      this.field("name");
-      this.field("keywords");
-      this.field("attr");
-      this.pipeline.reset();
-      this.searchPipeline.reset();
-      results.forEach((result) => {
-        const content = result.contentByLocale.find((d) => d.locale === locale);
-        if (content) {
-          const payload = {
-            id: result.id,
-            content_id: result.content_id,
-            name: content.name,
-            keywords: content.keywords,
-            attributes: content.attributes
-          };
-          this.add(payload, { boost: result.zvalue });
-        }
-      }, this);
-    })];
+    return [
+      locale,
+      {
+        tokenizer: lunr.tokenizer,
+        query: lunr.Query,
+        index: await lunr(
+          function() {
+            if (locale && locale !== "en")
+              this.use(lunr[locale]);
+            this.ref("content_id");
+            this.field("id");
+            this.field("name");
+            this.field("keywords");
+            this.field("attributes");
+            this.pipeline.reset();
+            this.searchPipeline.reset();
+            results.forEach((result) => {
+              const content = result.contentByLocale.find((d) => d.locale === locale);
+              if (content) {
+                const payload = {
+                  id: result.id,
+                  content_id: result.content_id,
+                  name: content.name,
+                  keywords: content.keywords,
+                  attributes: content.attributes
+                };
+                this.add(payload, { boost: result.zvalue });
+              }
+            }, this);
+          }
+        )
+      }
+    ];
   });
   return Object.fromEntries(
     await Promise.all(setups)
@@ -2205,8 +2224,10 @@ function dbSearchMemberFactory(db) {
       direction = "ASC"
     } = params;
     if (query && query !== "" && searchIndexByLocale[locale]) {
-      const terms = query.split(" ").map((d) => `+${d}*`).join(" ");
-      const lunrResults = searchIndexByLocale[locale].search(terms);
+      const terms = query.split(" ").filter((d) => d.trim() !== "").map((d) => {
+        return `+${d}~2*`;
+      }).join(" ");
+      const lunrResults = searchIndexByLocale[locale].index.search(terms);
       resultsIds = lunrResults.map((d) => parseInt(d.ref, 10));
     }
     const whereClause = {
@@ -4612,12 +4633,13 @@ function getRootBlocksForSection(sid, blocks) {
     blockList.filter((block) => block.section_id === sid && // leave blocks belonging to this section
     // that don't depend on any other blocks OR
     (block.inputs.length === 0 || // that depend only on blocks from other sections
-    block.inputs.every((id) => nonNativeBlocks.includes(id)))).map((block) => [block.id, block])
+    block.inputs.some((id) => nonNativeBlocks.includes(id)))).map((block) => [block.id, block])
     // then convert them to entries
   );
 }
 var getRootBlocksForSection_default = getRootBlocksForSection;
 var verbose7 = getLogging_default();
+var debug = yn3(process.env.NEXT_PUBLIC_REPORTS_DEBUG);
 var ORIGIN = process.env.REPORTS_ORIGIN || "";
 axios5.interceptors.request.use((config) => ({
   ...config,
@@ -4721,14 +4743,7 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
     return {
       outputVariables: {},
       renderVariables: {},
-      status: {
-        api: null,
-        duration: null,
-        resp: null,
-        log: [],
-        error: null,
-        allowed: false
-      }
+      status: { allowed: false }
     };
   }
   if (unswappedAPI) {
@@ -4759,9 +4774,6 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       outputVariables: selectorQueryToVariable_default(block.id, query, config),
       renderVariables: config,
       status: {
-        api: null,
-        duration: null,
-        resp: null,
         log: log2,
         error: error2,
         allowed
@@ -4774,11 +4786,8 @@ async function runSingleBlock(block, formatterFunctions, blockContext, readMembe
       // todo1.0 this will have to be materialized click-variables
       renderVariables: block.contentByLocale.logic.content,
       status: {
-        api: null,
-        duration: null,
-        resp: null,
         log: [],
-        error: null,
+        // todo: see if we can remove this safely
         allowed
       }
     };
@@ -4823,17 +4832,19 @@ var getDependencies = (bid, blocks, acc = [], crawlUp = true, crawlDown2 = true,
   if (rootBlock.inputs.length && crawlUp) {
     rootBlock.inputs.forEach((iid) => {
       const rel = `${iid}-${bid}`;
-      if (!acc.includes(rel))
+      if (!acc.includes(rel)) {
         acc.push(rel);
+      }
       rootBlock.inputs.forEach((iid2) => getDependencies(iid2, blocks, acc, crawlUp, false, withinSection, visited));
     });
   }
   if (rootBlock.consumers.length && crawlDown2) {
     rootBlock.consumers.forEach((cid) => {
       const rel = `${bid}-${cid}`;
-      if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection))
+      if (!acc.includes(rel) && (blocks[cid].section_id === blocks[bid].section_id || !withinSection)) {
         acc.push(rel);
-      rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown2, withinSection, visited));
+      }
+      rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id || !withinSection).forEach((cid2) => getDependencies(cid2, blocks, acc, false, crawlDown2, withinSection, visited));
     });
   }
   return acc;
@@ -4866,16 +4877,31 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
   const statusById = { ...initialState4.status ?? {} };
   const parsedBlockContext = parseBlockContext(blockContext);
   const attributes = parsedBlockContext.variables;
-  const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+  const rootBlocks = bid ? { [bid]: blocks[bid] } : (sections ?? []).reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
+  if (debug)
+    console.log("%crunConsumers: running root blocks", "color:purple", Object.keys(rootBlocks));
   const withinSection = mode === "section";
   const blockDeps = Object.keys(rootBlocks).reduce((deps, id) => {
+    const start = /* @__PURE__ */ new Date();
     const dependencies = getDependencies(Number(id), blocks, [], !bid, true, withinSection).map((rel) => rel.split("-"));
+    const end = /* @__PURE__ */ new Date();
+    const elapsedTime = (end.getTime() - start.getTime()) / 1e3;
+    if (debug)
+      console.log(
+        `%cResolved dependencies for ${id} (${elapsedTime.toFixed(2)}s)`,
+        "color:blue"
+      );
     return [...deps, ...dependencies];
   }, []);
+  const startToposort = /* @__PURE__ */ new Date();
   const orderedDAG = Object.keys(rootBlocks).reduce(
     (orderedDAG2, bid2) => orderedDAG2.includes(bid2) ? [...orderedDAG2] : [bid2, ...orderedDAG2],
     toposort(blockDeps)
   );
+  const endToposort = /* @__PURE__ */ new Date();
+  const toposortTime = (endToposort.getTime() - startToposort.getTime()) / 1e3;
+  if (debug)
+    console.log(`%cResolved DAG (${toposortTime.toFixed(2)}s): `, "color:green", orderedDAG);
   async function runTasksInParallel(executionOrder, blocks2) {
     const runningBlocks = /* @__PURE__ */ new Map();
     for (const bid2 of executionOrder) {
@@ -4883,22 +4909,21 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
       const dependenciesDone = Promise.all(
         block.inputs.filter((iid) => executionOrder.includes(String(iid))).map((iid) => runningBlocks.get(Number(iid)))
       );
-      const runningTask = dependenciesDone.then(() => {
+      const runningTask = dependenciesDone.then(async () => {
         const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
-        const inputNotAllowed = block.inputs.find((iid) => !statusById[iid].allowed || statusById[iid].hiddenByCascade);
+        const inputNotAllowed = block.inputs.find(
+          (iid) => !statusById[iid].allowed || statusById[iid].hiddenByCascade
+        );
         if (inputNotAllowed) {
           statusById[bid2] = {
-            api: null,
-            duration: null,
-            resp: null,
             log: [],
-            error: null,
             allowed: false,
             hiddenByCascade: statusById[inputNotAllowed].hiddenByCascade || inputNotAllowed
           };
           return;
         }
-        return runSingleBlock(
+        const startBlock = /* @__PURE__ */ new Date();
+        const blockResult = await runSingleBlock(
           block,
           formatterFunctions,
           {
@@ -4910,12 +4935,25 @@ var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockCont
           variablesById[bid2] = outputVariables;
           statusById[bid2] = status;
         });
+        const endBlock = /* @__PURE__ */ new Date();
+        const blockTime = (endBlock.getTime() - startBlock.getTime()) / 1e3;
+        if (debug)
+          console.log(
+            `%cBlock ${block.id} resolved in ${blockTime.toFixed(3)}s`,
+            blockTime > 500 ? "color:red" : "color:green"
+          );
+        return blockResult;
       });
       runningBlocks.set(Number(bid2), runningTask);
     }
     await Promise.all(Array.from(runningBlocks.values()));
   }
+  const startVariables = /* @__PURE__ */ new Date();
   await runTasksInParallel(orderedDAG, blocks);
+  const endVariables = /* @__PURE__ */ new Date();
+  const variablesTime = (endVariables.getTime() - startVariables.getTime()) / 1e3;
+  if (debug)
+    console.log(`%cResolved Variables (${variablesTime.toFixed(2)}s): `, "color:green");
   return {
     variables: { ...initialState4.variables ?? {}, ...variablesById },
     status: { ...initialState4.status ?? {}, ...statusById }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -103,7 +103,7 @@
     "slugify": "^1.6.5",
     "toposort": "^2.0.2",
     "unsplash-js": "^7.0.15",
-    "xlsx": "^0.18.5",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz",
     "yn": "^5.0.0"
   },
   "devDependencies": {