@datawheel/bespoke 0.1.21 → 0.1.22

package/dist/index.js

@@ -12,17 +12,17 @@ import toposort from 'toposort';
 import { schema, normalize } from 'normalizr';
 import { createSlice, configureStore } from '@reduxjs/toolkit';
 import { HYDRATE, createWrapper } from 'next-redux-wrapper';
-import { NotificationsProvider, showNotification } from '@mantine/notifications';
+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, Tooltip, ActionIcon, Center, useMantineTheme, Modal, Button, Flex, Title, Select, SegmentedControl, MultiSelect, Box, List, Menu, Anchor, MantineProvider, Divider, Burger, Navbar, ScrollArea, Avatar, AppShell, UnstyledButton, ThemeIcon, LoadingOverlay, Skeleton, Container, TextInput, Loader, Alert, Autocomplete, Card, Space, Code, Textarea, Overlay, Grid, Input, Popover, Checkbox, Radio, Switch, Drawer, Tabs, Header, SimpleGrid, Image, Paper, FileInput, Accordion, CopyButton, NumberInput, Col } from '@mantine/core';
+import { Stack, Text, Badge, Group, Tooltip, ActionIcon, Center, useMantineTheme, Modal, Button, Flex, Title, Select, SegmentedControl, MultiSelect, Box, List, Menu, Anchor, MantineProvider, Divider, Burger, Navbar, ScrollArea, Avatar, AppShell, UnstyledButton, ThemeIcon, LoadingOverlay, Skeleton, Container, TextInput, Loader, Alert, Autocomplete, Card, Space, Code, Textarea, Overlay, Grid, Input, Popover, Checkbox, Radio, Switch, Drawer, Tabs, Header, px, SimpleGrid, Image, Paper, FileInput, Accordion, CopyButton, NumberInput, Col, rem } from '@mantine/core';
 import { dataConcat } from 'd3plus-viz';
 import * as d3plus from 'd3plus-react';
-import { IconInfoCircle, IconBoxMargin, IconTable, IconMathFunction, IconUsers, IconLogout, IconSearch, IconTrash, IconUserCircle, IconDatabase, IconServer, IconPencil, IconAlertCircle, IconCircleCheck, IconPlayerPlay, IconCirclePlus, IconCircleX, IconFlag, IconFileAnalytics, IconPlus, IconCamera, IconShare, IconCircleDashed, IconListSearch, IconRefreshAlert, IconSettings, IconMenu, IconRefresh, IconPolaroid, IconCircleMinus, IconEyeOff, IconAlignLeft, IconAlignCenter, IconAlignRight, IconLogin, IconWorld, IconLock, IconVariable, IconArrowRightCircle, IconExternalLink, IconDownload, IconTemplate, IconChartBar, IconCode, IconUpload, IconLink, IconClipboardCheck, IconClipboardCopy, IconPalette, IconEye, IconRss, IconGlobe } from '@tabler/icons';
-import { useDisclosure, useDebouncedValue, useMediaQuery, useHotkeys, getHotkeyHandler } from '@mantine/hooks';
-import Link from 'next/link';
 import Router, { useRouter } from 'next/router';
+import { IconInfoCircle, IconBoxMargin, IconTable, IconMathFunction, IconUsers, IconLogout, IconSearch, IconTrash, IconUserCircle, IconEdit, IconDatabase, IconServer, IconPencil, IconAlertCircle, IconCircleCheck, IconPlayerPlay, IconCirclePlus, IconCircleX, IconFlag, IconFileAnalytics, IconPlus, IconCamera, IconShare, IconCircleDashed, IconListSearch, IconExternalLink, IconSettings, IconFileOff, IconFilesOff, IconMenu, IconRefresh, IconPolaroid, IconCircleMinus, IconEyeOff, IconAlignLeft, IconAlignCenter, IconAlignRight, IconLogin, IconWorld, IconLock, IconVariable, IconArrowRightCircle, IconDownload, IconTemplate, IconChartBar, IconCode, IconUpload, IconLink, IconClipboardCheck, IconClipboardCopy, IconPalette, IconEye, IconMinimize, IconMaximize, IconRss, IconGlobe } from '@tabler/icons';
+import { useDisclosure, useDebouncedValue, useMediaQuery, useHotkeys, useFullscreen, getHotkeyHandler } from '@mantine/hooks';
+import Link from 'next/link';
 import dynamic from 'next/dynamic';
 import { UserProvider, withPageAuthRequired, useUser } from '@auth0/nextjs-auth0/client';
 import { Prism } from '@mantine/prism';
@@ -58,8 +58,8 @@ var init_esm_shims = __esm({
 });
 
 // api/http/lib.ts
-function http(axios7, config) {
-  return axios7.request(config).then((response) => {
+function http(axios6, config) {
+  return axios6.request(config).then((response) => {
     const { status, data } = response;
     return "error" in data ? { ok: false, status, error: data.error } : { ok: true, status, data: data.data };
   }, (err) => {
@@ -70,25 +70,25 @@ function http(axios7, config) {
     return { ok: false, status: 500, error: err.message };
   });
 }
-function httpGET(axios7, request, transformParams) {
+function httpGET(axios6, request, transformParams) {
   const config = typeof request === "string" ? { url: request } : request;
-  return (params) => http(axios7, {
+  return (params) => http(axios6, {
     ...config,
     method: "GET",
     params: transformParams ? transformParams(params) : params
   });
 }
-function httpPOST(axios7, request, transformPayload) {
+function httpPOST(axios6, request, transformPayload) {
   const config = typeof request === "string" ? { url: request } : request;
-  return (payload) => http(axios7, {
+  return (payload) => http(axios6, {
     ...config,
     method: "POST",
     data: transformPayload ? transformPayload(payload) : payload
   });
 }
-function httpDELETE(axios7, request, transformPayload) {
+function httpDELETE(axios6, request, transformPayload) {
   const config = typeof request === "string" ? { url: request } : request;
-  return (payload) => http(axios7, {
+  return (payload) => http(axios6, {
     ...config,
     method: "DELETE",
     data: transformPayload ? transformPayload(payload) : payload
@@ -101,8 +101,8 @@ var init_lib = __esm({
 });
 
 // api/http/image/imageSave.ts
-function httpImageSaveFactory(axios7, provider) {
-  return (params) => http(axios7, {
+function httpImageSaveFactory(axios6, provider) {
+  return (params) => http(axios6, {
     method: "GET",
     url: `search/images/${provider}`,
     params: { prompt: params.prompt, provider }
@@ -116,8 +116,8 @@ var init_imageSave = __esm({
 });
 
 // api/http/image/imageSearch.ts
-function httpImageSearchFactory(axios7, provider) {
-  return (params) => http(axios7, {
+function httpImageSearchFactory(axios6, provider) {
+  return (params) => http(axios6, {
     method: "GET",
     url: `search/images/${provider}`,
     params: { prompt: params.prompt, provider }
@@ -130,58 +130,59 @@ var init_imageSearch = __esm({
   }
 });
 function apiFactory(baseURL) {
-  const axios7 = axios.create({ baseURL });
+  const axios6 = axios.create({ baseURL });
   return {
-    createBlock: httpPOST(axios7, "create/block"),
-    createDimension: httpPOST(axios7, "create/dimension"),
-    createFormatter: httpPOST(axios7, "create/formatter"),
-    createReport: httpPOST(axios7, "create/report"),
-    createSection: httpPOST(axios7, "create/section"),
-    createVariant: httpPOST(axios7, "create/variant"),
-    deleteBlock: httpDELETE(axios7, "delete/block", transformDeletePayload),
-    deleteDimension: httpDELETE(axios7, "delete/dimension", transformDeletePayload),
-    deleteFormatter: httpDELETE(axios7, "delete/formatter", transformDeletePayload),
-    deleteReport: httpDELETE(axios7, "delete/report", transformDeletePayload),
-    deleteSection: httpDELETE(axios7, "delete/section", transformDeletePayload),
-    deleteVariant: httpDELETE(axios7, "delete/variant", transformDeletePayload),
-    readBlock: httpGET(axios7, "read/block"),
-    readDimension: httpGET(axios7, "read/dimension"),
-    readFormatter: httpGET(axios7, "read/formatter"),
-    readReport: httpGET(axios7, "read/report"),
-    readSection: httpGET(axios7, "read/section"),
-    readVariant: httpGET(axios7, "read/variant"),
-    updateBlock: httpPOST(axios7, "update/block"),
-    updateDimension: httpPOST(axios7, "update/dimension"),
-    updateFormatter: httpPOST(axios7, "update/formatter"),
-    updateReport: httpPOST(axios7, "update/report"),
-    updateSection: httpPOST(axios7, "update/section"),
-    updateVariant: httpPOST(axios7, "update/variant"),
-    searchReport: httpGET(axios7, "search/reports"),
-    validateVariantSlug: httpGET(axios7, "validate/variant"),
-    readMember: httpGET(axios7, "read/members", transformReadMembers),
-    readMemberImage: httpGET(axios7, {
+    createBlock: httpPOST(axios6, "create/block"),
+    createDimension: httpPOST(axios6, "create/dimension"),
+    createFormatter: httpPOST(axios6, "create/formatter"),
+    createReport: httpPOST(axios6, "create/report"),
+    createSection: httpPOST(axios6, "create/section"),
+    createVariant: httpPOST(axios6, "create/variant"),
+    deleteBlock: httpDELETE(axios6, "delete/block", transformDeletePayload),
+    deleteDimension: httpDELETE(axios6, "delete/dimension", transformDeletePayload),
+    deleteFormatter: httpDELETE(axios6, "delete/formatter", transformDeletePayload),
+    deleteReport: httpDELETE(axios6, "delete/report", transformDeletePayload),
+    deleteSection: httpDELETE(axios6, "delete/section", transformDeletePayload),
+    deleteVariant: httpDELETE(axios6, "delete/variant", transformDeletePayload),
+    readBlock: httpGET(axios6, "read/block"),
+    readDimension: httpGET(axios6, "read/dimension"),
+    readFormatter: httpGET(axios6, "read/formatter"),
+    readReport: httpGET(axios6, "read/report"),
+    readSection: httpGET(axios6, "read/section"),
+    readVariant: httpGET(axios6, "read/variant"),
+    updateBlock: httpPOST(axios6, "update/block"),
+    updateDimension: httpPOST(axios6, "update/dimension"),
+    updateFormatter: httpPOST(axios6, "update/formatter"),
+    updateReport: httpPOST(axios6, "update/report"),
+    updateSection: httpPOST(axios6, "update/section"),
+    updateVariant: httpPOST(axios6, "update/variant"),
+    searchReport: httpGET(axios6, "search/reports"),
+    validateVariantSlug: httpGET(axios6, "validate/variant"),
+    readMember: httpGET(axios6, "read/members", transformReadMembers),
+    readMemberImage: httpGET(axios6, {
       url: "member/image.png",
       responseType: "blob"
     }),
-    searchMember: httpGET(axios7, "search/members"),
-    updateMember: httpGET(axios7, "update/members"),
-    imageLocalSearch: httpImageSearchFactory(axios7, "local"),
-    imageLocalSave: httpImageSaveFactory(axios7, "local"),
-    imageFlickrSearch: httpImageSearchFactory(axios7, "flickr"),
-    imageFlickrSave: httpImageSaveFactory(axios7, "flickr"),
-    imageUnsplashSearch: httpImageSearchFactory(axios7, "unsplash"),
-    imageUnsplashSave: httpImageSaveFactory(axios7, "unsplash"),
-    imageUploadSave: httpImageSaveFactory(axios7, "upload"),
-    readMetadata: httpGET(axios7, "read/metadata"),
-    regenerateSearch: httpPOST(axios7, "search/regenerate"),
-    urlProxy: httpGET(axios7, "url/proxy"),
-    searchRole: httpGET(axios7, "auth/search/roles"),
-    searchUser: httpGET(axios7, "auth/search/users"),
-    readUser: httpGET(axios7, "auth/read/user"),
-    updateUser: httpPOST(axios7, "auth/update/user"),
-    addNewReportToCurrentUser: httpPOST(axios7, "auth/update/me"),
-    revalidate: httpGET(axios7, "revalidate/report"),
-    readPrivateBlocks: httpPOST(axios7, "read/blocks/private")
+    searchMember: httpGET(axios6, "search/members"),
+    updateMember: httpGET(axios6, "update/members"),
+    imageLocalSearch: httpImageSearchFactory(axios6, "local"),
+    imageLocalSave: httpImageSaveFactory(axios6, "local"),
+    imageFlickrSearch: httpImageSearchFactory(axios6, "flickr"),
+    imageFlickrSave: httpImageSaveFactory(axios6, "flickr"),
+    imageUnsplashSearch: httpImageSearchFactory(axios6, "unsplash"),
+    imageUnsplashSave: httpImageSaveFactory(axios6, "unsplash"),
+    imageUploadSave: httpImageSaveFactory(axios6, "upload"),
+    readMetadata: httpGET(axios6, "read/metadata"),
+    regenerateSearch: httpPOST(axios6, "search/regenerate"),
+    urlProxy: httpGET(axios6, "url/proxy"),
+    searchRole: httpGET(axios6, "auth/search/roles"),
+    searchUser: httpGET(axios6, "auth/search/users"),
+    readUser: httpGET(axios6, "auth/read/user"),
+    updateUser: httpPOST(axios6, "auth/update/user"),
+    addNewReportToCurrentUser: httpPOST(axios6, "auth/update/me"),
+    revalidateReport: httpGET(axios6, "revalidate/report"),
+    revalidateUrl: httpGET(axios6, "revalidate/url"),
+    readPrivateBlocks: httpPOST(axios6, "read/blocks/private")
   };
 }
 var transformDeletePayload, transformReadMembers;
@@ -1111,9 +1112,9 @@ var init_runConsumers = __esm({
       if (rootBlock.consumers.length && crawlDown) {
         rootBlock.consumers.forEach((cid) => {
           const rel = `${bid}-${cid}`;
-          if (!acc.includes(rel))
+          if (!acc.includes(rel) && blocks[cid].section_id === blocks[bid].section_id)
             acc.push(rel);
-          rootBlock.consumers.forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown));
+          rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown));
         });
       }
       return acc;
@@ -1310,13 +1311,14 @@ var init_FUNC = __esm({
   "libs/FUNC.js"() {
     init_esm_shims();
     init_libs();
-    parse = (config, formatters = {}, locale = "en", actions = {}) => {
+    parse = (config, formatters = {}, locale = "en", actions = {}, extraGlobals = {}) => {
       const globals = {
         setVariables: actions.onSetVariables ? actions.onSetVariables : (d) => d,
         openModal: actions.onOpenModal ? actions.onOpenModal : (d) => d,
         formatters,
         libs: libraries,
-        locale
+        locale,
+        ...extraGlobals
       };
       function parseFunction(obj) {
         return Function("globals", ...obj.vars, `with (globals) { ${obj.logic} }`).bind(globals, globals);
@@ -1848,7 +1850,7 @@ function rpcAnnounce(entity, key) {
 function rpcFailure(entity, key, code, message) {
   return (dispatch) => {
     if (typeof window === "object") {
-      showNotification({
+      notifications.show({
         autoClose: 3e3,
         color: "red",
         id: key,
@@ -2035,6 +2037,8 @@ __export(actions_exports, {
   recalculateVariables: () => recalculateVariables,
   removeBlocksFromState: () => removeBlocksFromState,
   reportSearch: () => reportSearch,
+  revalidateReport: () => revalidateReport,
+  revalidateUrl: () => revalidateUrl,
   searchMember: () => searchMember,
   searchRegenerate: () => searchRegenerate,
   searchRole: () => searchRole,
@@ -2130,6 +2134,7 @@ function recalculateVariables(resource, params) {
       locale: currentLocale
     };
     const section = state.records.entities.section[sid];
+    console.log(section?.blocks);
     const data = await runConsumersV2(
       blocks,
       section && [section],
@@ -2225,6 +2230,26 @@ function readPrivateBlocks(params) {
     return result.data;
   };
 }
+function revalidateUrl(params) {
+  return async (_, __, api) => {
+    const result = await api.revalidateUrl({ target: params.target });
+    if ("error" in result) {
+      throw new Error(result.error);
+    }
+    return result.data;
+  };
+}
+function revalidateReport(params) {
+  return async (_, __, api) => {
+    const result = await api.revalidateReport(
+      { reportId: params.reportId, profilePrefix: params.profilePrefix }
+    );
+    if ("error" in result) {
+      throw new Error(result.error);
+    }
+    return result.data;
+  };
+}
 var setStatus, setPreviews;
 var init_actions = __esm({
   "store/actions.ts"() {
@@ -2311,7 +2336,7 @@ function entityRefHookFactory(entity) {
     }, [key]);
     const value = useAppSelector(selector);
     useEffect(() => {
-      if (value.isUninitialized) {
+      if (value.isUninitialized && id !== null) {
         dispatch(readEntity(entity, { id, include: true }));
       }
       return () => {
@@ -2381,6 +2406,7 @@ var init_hooks = __esm({
       return result;
     };
     useInputVariablesHash = (id) => {
+      console.log("useInputVariablesHash", id);
       const block = useBlockRef(id).data;
       const variables = useAppSelector((state) => state.variables.variables);
       const attributes = useAppSelector((state) => state.variables.attributes);
@@ -2510,7 +2536,7 @@ var init_sanitizeBlockContent = __esm({
     sanitizeBlockContent_default = sanitizeBlockContent;
   }
 });
-var localeDefault7, frontEndMessage, errorStub, d3plusPropify_default;
+var localeDefault7, frontEndMessage, errorStub, propify, d3plusPropify_default;
 var init_d3plusPropify = __esm({
   "libs/d3plusPropify.ts"() {
     init_esm_shims();
@@ -2525,10 +2551,10 @@ var init_d3plusPropify = __esm({
     <strong>${frontEndMessage}</strong>
   </p>`
     };
-    d3plusPropify_default = (logic, formatters, variables = {}, locale = localeDefault7, id = null, actions = {}) => {
+    propify = (logic, formatters, variables = {}, locale = localeDefault7, id = null, actions = {}, globals = {}) => {
       let config;
       try {
-        config = parse({ vars: ["variables"], logic }, formatters, locale, actions)(variables);
+        config = parse({ vars: ["variables"], logic }, formatters, locale, actions, globals)(variables);
       } catch (e) {
         console.error(`Parsing Error in propify (ID: ${id})`);
         console.error(`Error message: ${e.message}`);
@@ -2563,6 +2589,7 @@ var init_d3plusPropify = __esm({
         topojsonFormat
       };
     };
+    d3plusPropify_default = propify;
   }
 });
 
@@ -2608,11 +2635,12 @@ function Viz(config) {
   const content = getBlockContent(block);
   const formatterFunctions = useFormatterFunctionsForLocale(locale);
   const blockContext = { variables };
+  const router = useRouter();
   const vizProps = useMemo(() => {
     if (!content?.logic)
       return { error: "Add a Configuration" };
     const transpiledLogic = varSwapRecursive_default({ logic: content.logic }, formatterFunctions, blockContext).logic;
-    return d3plusPropify_default(transpiledLogic, formatterFunctions, variables, locale, block.id, {});
+    return d3plusPropify_default(transpiledLogic, formatterFunctions, variables, locale, block.id, {}, { router });
   }, [block, active, variables]);
   const { type } = vizProps.config || {};
   const fallbackType = type && vizTypes[type] ? type : "Treemap";
@@ -2818,13 +2846,14 @@ function Viz2({
   const content = getBlockContent(block);
   const formatterFunctions = useFormatterFunctionsForLocale(locale);
   const blockContext = { variables };
+  const router = useRouter();
   const vizProps = useMemo(() => {
     if (!active)
       return { error: "Activate to View" };
     if (!content?.logic)
       return { error: "Add a Configuration" };
     const transpiledLogic = varSwapRecursive_default({ logic: content.logic }, formatterFunctions, blockContext).logic;
-    return d3plusPropify_default(transpiledLogic, formatterFunctions, variables, locale, block.id, {});
+    return d3plusPropify_default(transpiledLogic, formatterFunctions, variables, locale, block.id, {}, { router });
   }, [block, active, variables]);
   useMemo(() => {
     if (!active || !content?.logic)
@@ -3767,16 +3796,16 @@ function NavView({ headings, settings }) {
     if (!nodes || !nodes?.length) {
       return null;
     }
-    return /* @__PURE__ */ jsx(Fragment, { children: nodes.map((node) => /* @__PURE__ */ jsxs(Fragment, { children: [
+    return /* @__PURE__ */ jsx(Fragment, { children: nodes.map((node) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx(Menu.Item, { children: /* @__PURE__ */ jsx(
         Anchor,
         {
           href: `#bespoke-title-${node.id}`,
-          children: node.label
+          dangerouslySetInnerHTML: { __html: node.label }
         }
-      ) }, node.id),
+      ) }),
       /* @__PURE__ */ jsx(Box, { pl: "xs", children: renderMenu(node.children) })
-    ] })) });
+    ] }, node.id)) });
   };
   return /* @__PURE__ */ jsx(Box, { component: "nav", children: /* @__PURE__ */ jsx(
     List,
@@ -3789,7 +3818,7 @@ function NavView({ headings, settings }) {
       }),
       children: contentOutline?.map(
         (node) => /* @__PURE__ */ jsx(List.Item, { children: /* @__PURE__ */ jsxs(Menu, { trigger: "hover", openDelay: 100, closeDelay: 400, children: [
-          /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(Anchor, { href: `#bespoke-title-${node.id}`, children: node.label }) }),
+          /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(Anchor, { href: `#bespoke-title-${node.id}`, dangerouslySetInnerHTML: { __html: node.label } }) }),
           node?.children?.length ? /* @__PURE__ */ jsx(Menu.Dropdown, { children: renderMenu(node.children) }) : null
         ] }) }, node.id)
       )
@@ -4587,7 +4616,7 @@ function NavPreview({ headings, settings }) {
     if (!nodes || !nodes?.length) {
       return null;
     }
-    return /* @__PURE__ */ jsx(Fragment, { children: nodes.map((node) => /* @__PURE__ */ jsxs(Fragment, { children: [
+    return /* @__PURE__ */ jsx(Fragment, { children: nodes.map((node) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx(Menu.Item, { children: /* @__PURE__ */ jsxs(
         Anchor,
         {
@@ -4599,7 +4628,7 @@ function NavPreview({ headings, settings }) {
         }
       ) }, node.id),
       /* @__PURE__ */ jsx(Box, { pl: "xs", children: renderMenu(node.children) })
-    ] })) });
+    ] }, node.id)) });
   };
   return /* @__PURE__ */ jsxs(Box, { pos: "relative", children: [
     /* @__PURE__ */ jsx(Tooltip, { label: `
@@ -4803,7 +4832,6 @@ function Block({ blockId, active = true }) {
         return;
       }
       if (block.type === BLOCK_TYPES.NAV) {
-        console.log("nav block", block);
         setContent({
           id: block.id,
           headings: block.inputs,
@@ -4828,8 +4856,6 @@ function Block({ blockId, active = true }) {
   }, [blockContent, variables]);
   if (!block || !content || !allowed)
     return null;
-  if (block.type === "nav")
-    console.log("nav", content);
   const Renderer = blocks_default[block.type];
   return /* @__PURE__ */ jsx("div", { id: `bespoke-${block.type}-${block.id}`, className: `cms-block-wrapper cms-block-${blockId}`, children: /* @__PURE__ */ jsx(Renderer, { ...content }) });
 }
@@ -5687,30 +5713,68 @@ var Report_default = Report;
 
 // frontend/components/auth/LoginButton.tsx
 init_esm_shims();
+
+// types/auth.ts
+init_esm_shims();
+var CMS_ROLES = {
+  ADMIN: "Admin",
+  EDITOR: "Editor",
+  WRITER: "Writer"
+};
 function BespokeLoginBtn({
-  options = "",
   buttonProps = {},
-  menuProps = {}
+  editorMenuItemProps = {},
+  editorMenuItemRoute = "/cms",
+  logoutButtonProps = {},
+  menuProps = {},
+  options = "",
+  optionsPosition = "bottom",
+  translations = {},
+  withEditorMenuItem = true,
+  withSession = true
 }) {
   const { user, error, isLoading } = useUser();
+  const userRoles = useMemo(() => user?.bespoke_roles || [], [user]);
+  const isCMSUser = useMemo(() => CMS_ROLES && Object.keys(CMS_ROLES).length > 0 && Object.keys(CMS_ROLES).some((role) => userRoles.includes(CMS_ROLES[role])), [userRoles]);
   const buttonConfig = {
     leftIcon: /* @__PURE__ */ jsx(IconUserCircle, {}),
     ...buttonProps
   };
   if (user && !error && !isLoading) {
+    const editorMenuItemConfig = {
+      ...editorMenuItemProps
+    };
+    const logoutButtonConfig = {
+      color: "red",
+      fullWidth: true,
+      leftIcon: /* @__PURE__ */ jsx(IconLogout, { size: 14 }),
+      size: "xs",
+      variant: "subtle",
+      ...logoutButtonProps
+    };
     const menuConfig = {
       shadow: "md",
       width: "auto",
       position: "bottom",
       ...menuProps
     };
+    const cmsButton = /* @__PURE__ */ jsx(Link, { href: editorMenuItemRoute, passHref: true, children: /* @__PURE__ */ jsx(
+      Menu.Item,
+      {
+        icon: /* @__PURE__ */ jsx(IconEdit, { size: 14 }),
+        ...editorMenuItemConfig,
+        children: translations["Go to editor"] || "Go to editor"
+      }
+    ) });
     return /* @__PURE__ */ jsxs(Menu, { ...menuConfig, children: [
-      /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(Button, { ...buttonConfig, children: `Hi, ${user.name || user.email}!` }) }),
+      /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(Button, { ...buttonConfig, children: `${translations["Welcome message"] || `Hi, ${user.name || user.email}`}` }) }),
       /* @__PURE__ */ jsxs(Menu.Dropdown, { children: [
-        options,
-        options && /* @__PURE__ */ jsx(Menu.Divider, {}),
-        /* @__PURE__ */ jsx(Menu.Label, { children: "Session" }),
-        /* @__PURE__ */ jsxs(
+        optionsPosition === "top" && /* @__PURE__ */ jsxs(Fragment, { children: [
+          withEditorMenuItem && isCMSUser && cmsButton,
+          options,
+          (options || withEditorMenuItem && isCMSUser) && /* @__PURE__ */ jsx(Menu.Divider, {})
+        ] }),
+        withSession && /* @__PURE__ */ jsxs(
           Menu.Item,
           {
             component: "span",
@@ -5723,14 +5787,19 @@ function BespokeLoginBtn({
           }
         ),
         /* @__PURE__ */ jsx(
-          Menu.Item,
+          Button,
           {
             component: "a",
             href: "/api/auth/logout",
-            icon: /* @__PURE__ */ jsx(IconLogout, { size: 14 }),
-            children: "Disconnect"
+            ...logoutButtonConfig,
+            children: translations["Disconnect"] || "Disconnect"
           }
-        )
+        ),
+        optionsPosition === "bottom" && /* @__PURE__ */ jsxs(Fragment, { children: [
+          (options || withEditorMenuItem && isCMSUser) && /* @__PURE__ */ jsx(Menu.Divider, {}),
+          withEditorMenuItem && isCMSUser && cmsButton,
+          options
+        ] })
       ] })
     ] });
   }
@@ -5741,7 +5810,7 @@ function BespokeLoginBtn({
       href: "/api/auth/login",
       loading: isLoading,
       ...buttonConfig,
-      children: isLoading ? "Signing in..." : "Sign in"
+      children: isLoading ? translations["Signing in"] || "Signing in..." : translations["Sign in"] || "Sign in"
     }
   );
 }
@@ -5881,14 +5950,6 @@ function normalizeList(value) {
   return value.toString().split(",");
 }
 
-// types/auth.ts
-init_esm_shims();
-var CMS_ROLES = {
-  ADMIN: "Admin",
-  EDITOR: "Editor",
-  WRITER: "Writer"
-};
-
 // api/endpoints/member.ts
 var { localeDefault: localeDefault8 } = getLocales_default();
 function parseReadMemberParams(query) {
@@ -7073,21 +7134,15 @@ function CMSHeader(props) {
   const { report: currentReport, profilePrefix } = props;
   const { id } = currentReport;
   const { newConfirmation } = useDialog();
-  const location = useManagerLocation();
   const dispatch = useAppDispatch();
   const resource = useContext(ResourceContext);
   const currentLocale = useAppSelector((state) => state.status.currentLocale);
   const localeDefault9 = useAppSelector((state) => state.status.localeDefault);
   const localeOptions = useAppSelector(selectLocaleOptions);
-  const reportList = useReportList();
+  const previewsFromState = useAppSelector((state) => state.status.previews);
   const [opened, handlers] = useDisclosure(false);
   const { user } = useUser();
   const castedUser = user;
-  const reportOptions = useMemo(() => {
-    if (!reportList.isSuccess)
-      return [];
-    return reportList.data.map((d) => ({ value: `${d.id}`, label: d.name }));
-  }, [reportList.status]);
   const dimensions = useMemo(() => {
     return currentReport && currentReport.dimensions ? currentReport.dimensions : [];
   }, [currentReport]);
@@ -7096,9 +7151,14 @@ function CMSHeader(props) {
   }, [dimensions]);
   const [previewMembers, setPreviewMembers] = useState([]);
   const [initialFavorites, setInitialFavorites] = useState([]);
-  const onChangeReport = useCallback((value) => {
-    location.push(`/reports/${value}`);
-  }, [location]);
+  const previewPath = previewsFromState.reduce((acc, member) => {
+    return acc.concat([member.variant_slug, member.slug]);
+  }, []);
+  const previewName = previewsFromState.reduce((acc, member) => {
+    return acc.concat([member.name]);
+  }, []).join(" / ");
+  const localePrefix = currentLocale === localeDefault9 ? "" : `/${currentLocale}`;
+  const realPath = `${localePrefix}${profilePrefix}/${previewPath.join("/")}`;
   const onSelectPreview = (previewMember) => {
     const newPreviews = currentReport.dimensions.map((dId) => {
       let member;
@@ -7116,18 +7176,48 @@ function CMSHeader(props) {
     });
     setPreviewMembers(newPreviews);
   };
-  const maybeRevalidate = useCallback(async () => {
+  const maybeRevalidateUrl = useCallback(async () => {
+    try {
+      await newConfirmation({
+        title: "Are you sure?",
+        message: `Revalidate action will force to regenerate page: ${realPath}.`,
+        confirmText: "Revalidate now!"
+      });
+      await dispatch(actions_exports.revalidateUrl({ target: realPath })).then((response) => {
+        const message = `Revalidated page ${response.target} you will see the changes in the following minutes.`;
+        notifications.show({
+          autoClose: false,
+          color: "green",
+          id: "revalidate-results",
+          message,
+          title: "Revalidate Results"
+        });
+      }).catch((error) => {
+        notifications.show({
+          autoClose: false,
+          color: "red",
+          id: "revalidate-error",
+          message: error.message,
+          title: "Revalidate Error"
+        });
+      });
+    } catch {
+      console.debug("Revalidate error.");
+    }
+  }, [realPath]);
+  const maybeRevalidateReport = useCallback(async () => {
     try {
       await newConfirmation({
         title: "Are you sure?",
-        message: "Revalidate action will force to regenerate all the cached instances of this report type.",
+        message: `Revalidate action will force to regenerate all the cached instances of '${currentReport.name}' report type.`,
         confirmText: "Revalidate now!"
       });
-      const revalidateUrl = `/api/cms/revalidate/report?profilePrefix=${profilePrefix}&reportId=${id}`;
-      await axios.get(revalidateUrl).then((response) => {
-        const resp = response.data.data.data;
-        const message = `Revalidated ${resp.revalidated} pages of report ID ${resp.reportId}, like ${resp.samples.join(", ")}.`;
-        showNotification({
+      await dispatch(actions_exports.revalidateReport({
+        profilePrefix,
+        reportId: id
+      })).then((response) => {
+        const message = `Revalidated ${response.revalidated} pages of report ${currentReport.name}(ID ${response.reportId}), you will see the changes in the following minutes. Examples: ${response.samples.join(", ")}.`;
+        notifications.show({
           autoClose: false,
           color: "green",
           id: "revalidate-results",
@@ -7135,7 +7225,7 @@ function CMSHeader(props) {
           title: "Revalidate Results"
         });
       }).catch((error) => {
-        showNotification({
+        notifications.show({
           autoClose: false,
           color: "red",
           id: "revalidate-error",
@@ -7146,10 +7236,15 @@ function CMSHeader(props) {
     } catch {
       console.debug("Revalidate edition.");
     }
-  }, []);
+  }, [id]);
   useEffect(() => {
     setPreviewMembers([]);
   }, [dimensions]);
+  useEffect(() => {
+    if (previewsFromState && previewsFromState.length > 0) {
+      setInitialFavorites(previewsFromState.map((ps) => ({ variantId: ps.variant_id, contentId: ps.content_id })));
+    }
+  }, [previewsFromState]);
   useEffect(() => {
     if (previewMembers.length > 0) {
       dispatch(actions_exports.recalculateVariables(resource, {
@@ -7181,17 +7276,8 @@ function CMSHeader(props) {
             onChange: (value) => dispatch(statusActions.setStatus({ currentLocale: value || localeDefault9 }))
           }
         ),
-        /* @__PURE__ */ jsx(
-          Select,
-          {
-            style: { width: 100 },
-            size: "xs",
-            data: reportOptions,
-            value: String(id),
-            onChange: onChangeReport
-          }
-        ),
-        showPreviewSelector && dimensions.map((dId, ix) => /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(Divider, { orientation: "vertical" }),
+        showPreviewSelector && dimensions.map((dId, ix) => /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
           DimensionAutocomplete,
           {
             id: dId,
@@ -7200,34 +7286,53 @@ function CMSHeader(props) {
             locale: currentLocale
           },
           dId
-        )),
-        !showPreviewSelector && /* @__PURE__ */ jsx(
-          Button,
-          {
-            size: "xs",
-            variant: "outline",
-            onClick: handlers.open,
-            children: "Import Data"
-          }
-        )
-      ] }),
-      right: /* @__PURE__ */ jsxs(Group, { children: [
-        /* @__PURE__ */ jsx(ActionIcon, { onClick: maybeRevalidate, color: "blue", variant: "filled", children: /* @__PURE__ */ jsx(IconRefreshAlert, { size: 20 }) }),
-        /* @__PURE__ */ jsxs(ActionIcon, { color: "blue", variant: "filled", children: [
-          /* @__PURE__ */ jsx(IconSettings, { onClick: handlers.open, size: 20 }),
+        ) })),
+        previewsFromState.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Divider, { orientation: "vertical" }),
+          /* @__PURE__ */ jsx(ActionIcon, { component: "a", href: realPath, target: "_blank", variant: "subtle", title: "Open report in new tab", children: /* @__PURE__ */ jsx(IconExternalLink, { size: 20 }) })
+        ] }),
+        !showPreviewSelector && /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Divider, { orientation: "vertical" }),
           /* @__PURE__ */ jsx(
-            Drawer,
+            Button,
             {
-              opened,
-              onClose: handlers.close,
-              title: /* @__PURE__ */ jsx(IconTitle, { icon: /* @__PURE__ */ jsx(IconFileAnalytics, { size: 24 }), children: `Editing Report: ${currentReport ? currentReport.name : ""}` }),
-              size: "50%",
-              padding: "xl",
-              position: "right",
-              children: /* @__PURE__ */ jsx(ReportEditor, { id, onClose: handlers.close })
+              size: "xs",
+              variant: "outline",
+              onClick: handlers.open,
+              children: "Import Data"
             }
           )
         ] })
+      ] }),
+      right: /* @__PURE__ */ jsxs(Group, { spacing: "xs", children: [
+        /* @__PURE__ */ jsxs(Menu, { shadow: "md", children: [
+          /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(ActionIcon, { color: "blue", variant: "filled", children: /* @__PURE__ */ jsx(IconSettings, { size: 20 }) }) }),
+          /* @__PURE__ */ jsxs(Menu.Dropdown, { children: [
+            /* @__PURE__ */ jsx(Menu.Label, { children: "Revalidate" }),
+            /* @__PURE__ */ jsx(Menu.Item, { onClick: maybeRevalidateUrl, icon: /* @__PURE__ */ jsx(IconFileOff, { size: 20 }), children: /* @__PURE__ */ jsxs(Text, { children: [
+              "Revalidate ",
+              /* @__PURE__ */ jsx(Text, { fw: 700, children: previewName })
+            ] }) }),
+            /* @__PURE__ */ jsx(Menu.Item, { onClick: maybeRevalidateReport, icon: /* @__PURE__ */ jsx(IconFilesOff, { size: 20 }), children: /* @__PURE__ */ jsxs(Text, { children: [
+              "Revalidate ALL ",
+              /* @__PURE__ */ jsx(Text, { fw: 700, children: currentReport.name })
+            ] }) }),
+            /* @__PURE__ */ jsx(Menu.Label, { children: "Settings" }),
+            /* @__PURE__ */ jsx(Menu.Item, { onClick: handlers.open, icon: /* @__PURE__ */ jsx(IconSettings, { size: 20 }), children: "Report settings" })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx(
+          Drawer,
+          {
+            opened,
+            onClose: handlers.close,
+            title: /* @__PURE__ */ jsx(IconTitle, { icon: /* @__PURE__ */ jsx(IconFileAnalytics, { size: 24 }), children: `Editing Report: ${currentReport ? currentReport.name : ""}` }),
+            size: "50%",
+            padding: "xl",
+            position: "right",
+            children: /* @__PURE__ */ jsx(ReportEditor, { id, onClose: handlers.close })
+          }
+        )
       ] })
     }
   );
@@ -7549,13 +7654,13 @@ function MonacoWrapper({ monacoOptions, variables = {} }) {
     }
   }, [monaco]);
   return /* @__PURE__ */ jsx(
-    "div",
+    Box,
     {
       className: "cr-monaco-container",
+      w: "100%",
       children: /* @__PURE__ */ jsx(
         Editor,
         {
-          height: "50vh",
           defaultLanguage: "javascript",
           theme: "Monokai",
           ...monacoOptions
@@ -7584,6 +7689,7 @@ var emptyStatus = {
 };
 function BlockPreview(props) {
   const {
+    id,
     active,
     allowed,
     blockStateContent,
@@ -7670,10 +7776,10 @@ function BlockPreview(props) {
     {
       id: `${block.type}-${block.id}`,
       className: "cms-block-preview",
-      style: { width: "100%", minHeight: block.type === BLOCK_TYPES.VIZ && 300 },
+      style: { width: "100%", minHeight: block.type === BLOCK_TYPES.VIZ ? 300 : "auto" },
       children: [
         !allowed && allowedOverlay,
-        Renderer ? /* @__PURE__ */ jsx(Fragment$1, { children: /* @__PURE__ */ jsx(Renderer, { debug, ...content }) }, "renderer") : /* @__PURE__ */ jsx(Center, { style: { minHeight: 100 }, children: /* @__PURE__ */ jsx(Badge, { color: "gray", variant: "outline", children: block.type }, "type") }),
+        Renderer ? /* @__PURE__ */ jsx(Fragment$1, { children: /* @__PURE__ */ jsx(Renderer, { id: block.id, debug, ...content }) }, "renderer") : /* @__PURE__ */ jsx(Center, { style: { minHeight: 100 }, children: /* @__PURE__ */ jsx(Badge, { color: "gray", variant: "outline", children: block.type }, "type") }),
         debug && textLog && /* @__PURE__ */ jsx(
           Textarea,
           {
@@ -8130,7 +8236,7 @@ function VariableList({ id, setInlineId }) {
               disabled: !isGenerator,
               label: "Edit this Generator",
               style: { position: "absolute", right: 0, top: 0 },
-              transition: "pop",
+              transitionProps: { transition: "pop" },
               withArrow: true,
               children: /* @__PURE__ */ jsx(ActionIcon, { size: "xs", onClick: () => setInlineId(vid), variant: "filled", children: /* @__PURE__ */ jsx(IconSettings, {}) })
             }
@@ -8160,6 +8266,7 @@ function BlockEditor({
   const status = useBlockStatus(id);
   const resp = status?.resp;
   const variables = useInputVariablesFlat(id);
+  const { ref, toggle, fullscreen } = useFullscreen();
   const onChangeCode = (logic, locale2) => setBlockContent({ logic }, locale2);
   const onChangeAPI = (api) => setBlockContent({ api });
   const blockPreview = /* @__PURE__ */ jsx(
@@ -8179,7 +8286,9 @@ function BlockEditor({
     {
       monacoOptions: {
         onChange: (logic) => onChangeCode(logic, locale),
-        value: blockContent?.logic || ""
+        value: blockContent?.logic || "",
+        height: fullscreen ? "90vh" : "58vh",
+        width: "100%"
       },
       variables
     },
@@ -8229,7 +8338,7 @@ function BlockEditor({
                   maxHeight: 200,
                   overflowY: "scroll"
                 },
-                children: /* @__PURE__ */ jsx(InputMenuItem_default, { variables: resp })
+                children: /* @__PURE__ */ jsx(InputMenuItem_default, { id, variables: resp })
               }
             )
           ] })
@@ -8257,35 +8366,52 @@ function BlockEditor({
             {
               value: tab,
               onTabChange: setTab,
-              styles: {
-                root: {
-                  display: "flex",
-                  flex: 1,
-                  flexDirection: "column",
-                  width: "100%",
-                  body: {
-                    display: "flex",
-                    flex: "1 1 100%"
-                  }
-                }
-              },
-              variant: "pills",
               children: [
-                /* @__PURE__ */ jsxs(Tabs.List, { position: "center", children: [
-                  /* @__PURE__ */ jsx(Tabs.Tab, { value: "Content", icon: /* @__PURE__ */ jsx(IconEye, {}) }),
-                  /* @__PURE__ */ jsx(Tabs.Tab, { value: "Settings", icon: /* @__PURE__ */ jsx(IconSettings, {}) })
+                /* @__PURE__ */ jsxs(Tabs.List, { position: "left", children: [
+                  /* @__PURE__ */ jsx(Tabs.Tab, { value: "Content", icon: /* @__PURE__ */ jsx(IconEye, {}), children: "Edit" }),
+                  /* @__PURE__ */ jsx(Tabs.Tab, { value: "Settings", icon: /* @__PURE__ */ jsx(IconSettings, {}), children: "Settings" })
                 ] }),
-                /* @__PURE__ */ jsx(Tabs.Panel, { value: "Content", children: /* @__PURE__ */ jsxs(Grid, { className: "cr-block-output", style: { flex: 1, width: "100%" }, children: [
-                  /* @__PURE__ */ jsxs(Col, { span: 9, className: `cr-block-output-editor ${currentMode}`, children: [
-                    currentMode === "code" && /* @__PURE__ */ jsxs(Fragment, { children: [
-                      codeEditor,
-                      executeButton
-                    ] }),
-                    currentMode !== "code" && uiEditor
-                  ] }, "content-col"),
-                  /* @__PURE__ */ jsx(Col, { span: 3, style: { display: "flex", flexDirection: "column" }, children: blockPreview })
-                ] }) }),
-                /* @__PURE__ */ jsx(Tabs.Panel, { value: "Settings", children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx(Tabs.Panel, { value: "Content", pt: "xs", children: /* @__PURE__ */ jsx(Box, { ref, pos: "relative", bg: "white", children: /* @__PURE__ */ jsxs(
+                  Grid,
+                  {
+                    className: "cr-block-output",
+                    style: { flex: 1, width: "100%", height: fullscreen ? "100vh" : "auto", margin: 0 },
+                    children: [
+                      /* @__PURE__ */ jsxs(Col, { span: 9, bg: "#272822", className: `cr-block-output-editor ${currentMode}`, children: [
+                        currentMode === "code" && /* @__PURE__ */ jsxs(Fragment, { children: [
+                          /* @__PURE__ */ jsxs(Alert, { p: "xs", mb: "xs", icon: /* @__PURE__ */ jsx(IconInfoCircle, {}), color: "gray", children: [
+                            "You can access ",
+                            /* @__PURE__ */ jsx(Code, { children: "variables" }),
+                            ",",
+                            /* @__PURE__ */ jsx(Code, { children: "resp" }),
+                            ", and ",
+                            /* @__PURE__ */ jsx(Code, { children: "router" }),
+                            " in the scope of this generator."
+                          ] }),
+                          codeEditor,
+                          /* @__PURE__ */ jsx(Divider, { my: "sm", color: "gray.8" }),
+                          /* @__PURE__ */ jsxs(Group, { px: "xs", h: "fit-content", position: "right", children: [
+                            /* @__PURE__ */ jsx(
+                              Button,
+                              {
+                                variant: "light",
+                                color: "grey",
+                                onClick: toggle,
+                                leftIcon: fullscreen ? /* @__PURE__ */ jsx(IconMinimize, { size: rem(12) }) : /* @__PURE__ */ jsx(IconMaximize, { size: rem(12) }),
+                                compact: true,
+                                children: fullscreen ? "Minimize" : "Maximize"
+                              }
+                            ),
+                            executeButton
+                          ] })
+                        ] }),
+                        currentMode !== "code" && uiEditor
+                      ] }, "content-col"),
+                      /* @__PURE__ */ jsx(Col, { span: 3, style: { display: "flex", flexDirection: "column" }, children: blockPreview })
+                    ]
+                  }
+                ) }) }),
+                /* @__PURE__ */ jsx(Tabs.Panel, { value: "Settings", pt: "xs", children: /* @__PURE__ */ jsx(
                   BlockSettings_default,
                   {
                     id,
@@ -8314,7 +8440,7 @@ function ConsumerMenu({ id }) {
     Menu,
     {
       position: "top",
-      transition: "pop",
+      transitionProps: { transition: "pop" },
       trigger: "hover",
       zIndex: 1001,
       children: [
@@ -8447,9 +8573,10 @@ function Block2({
   const executeButton = /* @__PURE__ */ jsx(
     Button,
     {
-      style: { minHeight: 40 },
       disabled: !isValid,
       onClick: () => onSave(true),
+      size: "sm",
+      compact: true,
       children: "Save & Execute"
     }
   );
@@ -8590,7 +8717,7 @@ function BlockElement({
     onClose: maybeCloseWithoutSaving,
     overflow: "inside",
     padding: theme.spacing.sm,
-    size: "90%"
+    size: "95%"
   };
   const hoverActions = {
     onMouseEnter: () => setHoverBlock(id),
@@ -8633,8 +8760,8 @@ function BlockElement({
               className: "cr-block-controls export-hidden",
               style: {
                 position: "absolute",
-                right: theme.spacing.xs / 2,
-                top: theme.spacing.xs / 2,
+                right: px(theme.spacing.xs) / 2,
+                top: px(theme.spacing.xs) / 2,
                 backgroundColor: theme.colors.gray[2],
                 borderRadius: theme.radius.sm
               },
@@ -9130,6 +9257,7 @@ function InteractiveReport(props) {
     }
   }, [report.dimensions, previews]);
   const onDragEnd = useCallback((result) => {
+    console.log("----onDragEnd", result);
     if (!result.destination || result.source.index === result.destination.index)
       return;
     const id = Number.parseInt(result.draggableId, 10);
@@ -11434,7 +11562,7 @@ function BespokeManager(options) {
     locale = localeDefault4,
     profilePrefix
   } = options;
-  const notifications = {
+  const notifications3 = {
     position: "bottom-center",
     ...options.notifications
   };
@@ -11446,7 +11574,10 @@ function BespokeManager(options) {
   function BespokeManagerPage() {
     return /* @__PURE__ */ jsxs(ResourceProvider, { pathSegment, children: [
       /* @__PURE__ */ jsx(Head, { children: /* @__PURE__ */ jsx("title", { children: title }) }),
-      /* @__PURE__ */ jsx(MantineProvider, { inherit: false, children: /* @__PURE__ */ jsx(NotificationsProvider, { ...notifications, children: /* @__PURE__ */ jsx(DialogProvider, { children: /* @__PURE__ */ jsx(BespokeManagerShell, { locale, profilePrefix }) }) }) })
+      /* @__PURE__ */ jsxs(MantineProvider, { inherit: false, children: [
+        /* @__PURE__ */ jsx(Notifications, { ...notifications3 }),
+        /* @__PURE__ */ jsx(DialogProvider, { children: /* @__PURE__ */ jsx(BespokeManagerShell, { locale, profilePrefix }) })
+      ] })
     ] });
   }
 }

package/dist/server.js

@@ -22,12 +22,11 @@ import fs from 'fs';
 import auth0 from 'auth0';
 import NextCors from 'nextjs-cors';
 import formidable from 'formidable';
-import glob from 'fast-glob';
 import toposort from 'toposort';
 import { schema, normalize } from 'normalizr';
 import { createSlice, configureStore } from '@reduxjs/toolkit';
 import { HYDRATE, createWrapper } from 'next-redux-wrapper';
-import { showNotification } from '@mantine/notifications';
+import { notifications } from '@mantine/notifications';
 import { createContext } from 'react';
 import 'react-redux';
 import 'react/jsx-runtime';
@@ -3488,19 +3487,45 @@ function dbUrlProxyFactory() {
   };
 }
 
-// api/db/revalidate.ts
-function dbRevalidateFactory(db) {
+// api/db/revalidateReport.ts
+function dbRevalidateReportFactory(db) {
   return async (request) => {
-    const { reportId, qty, samples } = request;
     try {
-      return {
-        ok: true,
-        status: 200,
-        data: {
-          reportId,
-          revalidated: qty,
-          samples
+      const { variantPaths } = request;
+      const paths = [];
+      if (variantPaths) {
+        for (let index = 0; index < variantPaths.length; index++) {
+          const variant = variantPaths[index];
+          const members = await db.search.findAll({
+            attributes: ["slug"],
+            where: {
+              variant_id: variant.variantId
+            }
+          });
+          members.forEach((m) => {
+            paths.push(`/${variant.prefix}/${variant.variantSlug}/${m.slug}`);
+          });
         }
+      }
+      return {
+        ...request,
+        paths,
+        revalidated: 0,
+        samples: []
+      };
+    } catch (err) {
+      throw new BackendError(err.response?.status || 500, err.message);
+    }
+  };
+}
+
+// api/db/revalidateUrl.ts
+function dbRevalidateUrlFactory() {
+  return async (request) => {
+    try {
+      const { target } = request;
+      return {
+        target
       };
     } catch (err) {
       throw new BackendError(err.response?.status || 500, err.message);
@@ -3737,7 +3762,8 @@ function apiFactory(dbModels) {
     readUser: resultWrapper(dbReadUser()),
     updateUser: resultWrapper(dbUpdateUser()),
     addNewReportToCurrentUser: resultWrapper(dbAddNewReportToCurrentUser()),
-    revalidate: resultWrapper(dbRevalidateFactory()),
+    revalidateReport: resultWrapper(dbRevalidateReportFactory(dbModels)),
+    revalidateUrl: resultWrapper(dbRevalidateUrlFactory()),
     readPrivateBlocks: resultWrapper(dbReadPrivateBlocksFactory(dbModels))
   };
 }
@@ -3869,8 +3895,10 @@ function endpointUrlProxyFactory(operations) {
     });
   });
 }
-function endpointRevalidateFactory(operations) {
-  const { readMetadata: readMetadata2, revalidate } = operations;
+
+// api/endpoints/revalidateReport.ts
+function endpointRevalidateReportFactory(operations) {
+  const { readMetadata: readMetadata2, revalidateReport: revalidateReport2 } = operations;
   return endpoint("GET", "revalidate/report", async (req, res) => {
     const { reportId, profilePrefix } = req.query;
     if (!reportId || !profilePrefix) {
@@ -3879,32 +3907,50 @@ function endpointRevalidateFactory(operations) {
     try {
       const reportIdInt = parseInt(`${reportId}`, 10);
       const profilePrefixClean = `${profilePrefix}`.split("/").filter((p) => p !== "").join("/");
-      const initialPathSelector = [
-        ".next",
-        "server",
-        "pages"
-      ];
-      const pathSelector = [
-        ...initialPathSelector,
-        profilePrefixClean
-      ];
-      const paths = [];
+      const variantPaths = [];
       const report = await readMetadata2({}).then((metadata) => metadata.ok ? metadata.data.data.find((r) => r.id === reportIdInt) : []);
       if (report && report.mode === REPORT_MODES.UNILATERAL) {
         report.dimensions.forEach((d) => {
           d.variants.forEach((v) => {
-            paths.push([
-              ...pathSelector,
-              v.slug,
-              "*.html"
-            ].join("/"));
+            variantPaths.push({
+              prefix: profilePrefixClean,
+              variantId: v.id,
+              variantSlug: v.slug
+            });
           });
         });
       }
-      const files = await glob(paths);
-      const urls = files.map((file) => `${file.replace(initialPathSelector.join("/"), "").replace(".html", "")}`);
-      await Promise.all(urls.map((path) => res.revalidate(path)));
-      return revalidate({ reportId: reportIdInt, qty: urls.length, samples: urls.slice(0, 5) });
+      const urlsToRevalidate = await revalidateReport2(
+        {
+          profilePrefix: profilePrefixClean,
+          reportId: reportIdInt,
+          variantPaths
+        }
+      );
+      let samples = [];
+      let qty = 0;
+      if (urlsToRevalidate.ok) {
+        qty = urlsToRevalidate.data.paths.length;
+        samples = urlsToRevalidate.data.paths.slice(0, 5);
+        Promise.all(urlsToRevalidate.data.paths.map((path) => {
+          let rev;
+          try {
+            rev = res.revalidate(path, { unstable_onlyGenerated: true });
+          } catch (error) {
+            console.log("error", path, error);
+          }
+          return rev;
+        }));
+      }
+      return {
+        ok: true,
+        status: 200,
+        data: {
+          reportId,
+          revalidated: qty,
+          samples
+        }
+      };
     } catch (err) {
       console.log(err);
       throw new BackendError(500, "Error revalidating");
@@ -3912,6 +3958,30 @@ function endpointRevalidateFactory(operations) {
   }, [CMS_ROLES.EDITOR]);
 }
 
+// api/endpoints/revalidateUrl.ts
+function endpointRevalidateUrlFactory() {
+  return endpoint("GET", "revalidate/url", async (req, res) => {
+    const { target } = req.query;
+    if (!target) {
+      throw new BackendError(400, "Missing target parameter in revalidate factory");
+    } else {
+      try {
+        res.revalidate(target, { unstable_onlyGenerated: true });
+        return {
+          ok: true,
+          status: 200,
+          data: {
+            target
+          }
+        };
+      } catch (err) {
+        console.log(err);
+        throw new BackendError(500, "Error revalidating");
+      }
+    }
+  }, [CMS_ROLES.ADMIN, CMS_ROLES.EDITOR, CMS_ROLES.WRITER]);
+}
+
 // api/endpoints/readPrivateBlocks.ts
 var { localeDefault: localeDefault5 } = getLocales_default();
 function endpointReadPrivateBlocksFactory(operations) {
@@ -4049,7 +4119,8 @@ function getEndpointMap(db) {
     endpointGetUserDataFactory(api),
     endpointUpdateUserDataFactory(api),
     endpointAddNewReportToCurrentUserFactory(api),
-    endpointRevalidateFactory(api),
+    endpointRevalidateReportFactory(api),
+    endpointRevalidateUrlFactory(),
     endpointReadPrivateBlocksFactory(api)
   ].map(({ handler, method, path, roleRequired }) => [endpointKey(method, path), { handler, roleRequired }]));
 }
@@ -4133,6 +4204,8 @@ __export(actions_exports, {
   recalculateVariables: () => recalculateVariables,
   removeBlocksFromState: () => removeBlocksFromState,
   reportSearch: () => reportSearch,
+  revalidateReport: () => revalidateReport,
+  revalidateUrl: () => revalidateUrl,
   searchMember: () => searchMember,
   searchRegenerate: () => searchRegenerate,
   searchRole: () => searchRole,
@@ -4254,7 +4327,8 @@ function apiFactory2(baseURL) {
     readUser: httpGET(axios6, "auth/read/user"),
     updateUser: httpPOST(axios6, "auth/update/user"),
     addNewReportToCurrentUser: httpPOST(axios6, "auth/update/me"),
-    revalidate: httpGET(axios6, "revalidate/report"),
+    revalidateReport: httpGET(axios6, "revalidate/report"),
+    revalidateUrl: httpGET(axios6, "revalidate/url"),
     readPrivateBlocks: httpPOST(axios6, "read/blocks/private")
   };
 }
@@ -4615,9 +4689,9 @@ var getDependencies = (bid, blocks, acc = [], crawlUp = true, crawlDown2 = true)
   if (rootBlock.consumers.length && crawlDown2) {
     rootBlock.consumers.forEach((cid) => {
       const rel = `${bid}-${cid}`;
-      if (!acc.includes(rel))
+      if (!acc.includes(rel) && blocks[cid].section_id === blocks[bid].section_id)
         acc.push(rel);
-      rootBlock.consumers.forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown2));
+      rootBlock.consumers.filter((cid2) => blocks[cid2].section_id === blocks[bid].section_id).forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown2));
     });
   }
   return acc;
@@ -4685,13 +4759,14 @@ function comparePositions(firstPos, secondPos) {
 function orderSort(a, b, accessor = "ordering") {
   return comparePositions(b[accessor], a[accessor]);
 }
-var parse = (config, formatters = {}, locale = "en", actions = {}) => {
+var parse = (config, formatters = {}, locale = "en", actions = {}, extraGlobals = {}) => {
   const globals = {
     setVariables: actions.onSetVariables ? actions.onSetVariables : (d) => d,
     openModal: actions.onOpenModal ? actions.onOpenModal : (d) => d,
     formatters,
     libs: libraries,
-    locale
+    locale,
+    ...extraGlobals
   };
   function parseFunction(obj) {
     return Function("globals", ...obj.vars, `with (globals) { ${obj.logic} }`).bind(globals, globals);
@@ -5192,7 +5267,7 @@ function rpcAnnounce(entity, key) {
 function rpcFailure(entity, key, code, message) {
   return (dispatch) => {
     if (typeof window === "object") {
-      showNotification({
+      notifications.show({
         autoClose: 3e3,
         color: "red",
         id: key,
@@ -5401,6 +5476,7 @@ function recalculateVariables(resource, params) {
       locale: currentLocale
     };
     const section = state.records.entities.section[sid];
+    console.log(section?.blocks);
     const data = await runConsumersV2(
       blocks,
       section && [section],
@@ -5496,6 +5572,26 @@ function readPrivateBlocks(params) {
     return result.data;
   };
 }
+function revalidateUrl(params) {
+  return async (_, __, api) => {
+    const result = await api.revalidateUrl({ target: params.target });
+    if ("error" in result) {
+      throw new Error(result.error);
+    }
+    return result.data;
+  };
+}
+function revalidateReport(params) {
+  return async (_, __, api) => {
+    const result = await api.revalidateReport(
+      { reportId: params.reportId, profilePrefix: params.profilePrefix }
+    );
+    if ("error" in result) {
+      throw new Error(result.error);
+    }
+    return result.data;
+  };
+}
 var storeFactory = (_context) => configureStore({
   reducer: {
     [recordsSlice.name]: recordsSlice.reducer,
@@ -5660,7 +5756,6 @@ function BespokeRendererStaticProps(options) {
       const publicBlockRecords = { ...blockRecords };
       let privateBlockIds = Object.values(blockRecords).reduce((acc, block) => {
         if ("access" in block.settings && !["public", "guest"].some((grant) => !block.settings.access || block.settings.access.includes(grant))) {
-          console.log("is Private", block.id);
           acc.push(block.id);
         }
         return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -42,14 +42,14 @@
     "@auth0/nextjs-auth0": "^2.0.1",
     "@emotion/react": "^11.10.4",
     "@hello-pangea/dnd": "^16.2.0",
-    "@mantine/core": "^5.6.3",
-    "@mantine/dates": "^5.6.3",
-    "@mantine/dropzone": "^5.6.3",
-    "@mantine/form": "^5.6.3",
-    "@mantine/hooks": "^5.6.3",
-    "@mantine/next": "^6.0.1",
-    "@mantine/notifications": "^5.6.3",
-    "@mantine/prism": "^5.6.3",
+    "@mantine/core": "^6.0.6",
+    "@mantine/dates": "^6.0.6",
+    "@mantine/dropzone": "^6.0.6",
+    "@mantine/form": "^6.0.6",
+    "@mantine/hooks": "^6.0.6",
+    "@mantine/next": "^6.0.6",
+    "@mantine/notifications": "^6.0.6",
+    "@mantine/prism": "^6.0.6",
     "@monaco-editor/react": "^4.4.5",
     "@reduxjs/toolkit": "^1.8.4",
     "@tabler/icons": "^1.106.0",
@@ -81,7 +81,7 @@
     "jszip": "^3.10.1",
     "lunr": "^2.3.9",
     "lunr-languages": "^1.9.0",
-    "mantine-datatable": "^1.7.9",
+    "mantine-datatable": "^2.3.3",
     "monaco-themes": "^0.4.2",
     "next-redux-wrapper": "^7.0.0",
     "nextjs-cors": "^2.1.1",