@datawheel/bespoke 0.1.19 → 0.1.21

package/dist/server.js

@@ -500,7 +500,8 @@ var BLOCK_CONTENT_TYPES = {
   // todo1.0 - move to logic types
   STAT: "stat",
   SUBTITLE: "subtitle",
-  TITLE: "title"
+  TITLE: "title",
+  NAV: "nav"
   // todo1.0, how to put custom blocks in here?
 };
 var BLOCK_LOGIC_TYPES = {
@@ -1737,11 +1738,11 @@ function capitalize(str) {
 
 // libs/configs/getLocales.ts
 var getLocales_default = () => {
-  const localeDefault10 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
-  const locales8 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault10];
-  if (!locales8.includes(localeDefault10))
-    locales8.push(localeDefault10);
-  return { localeDefault: localeDefault10, locales: locales8 };
+  const localeDefault11 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
+  const locales9 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault11];
+  if (!locales9.includes(localeDefault11))
+    locales9.push(localeDefault11);
+  return { localeDefault: localeDefault11, locales: locales9 };
 };
 
 // libs/js/stripHTML.ts
@@ -2382,12 +2383,12 @@ function dbBlockFactory(db) {
     deleteBlock
   };
   async function createBlock(data) {
-    const { locale, ...blockData } = data;
+    const { locales: locales9, ...blockData } = data;
     const entity = await Block.create({
       ...blockData,
       consumers: [],
       inputs: [],
-      contentByLocale: [{ locale }]
+      contentByLocale: locales9.map((locale) => ({ locale }))
     }, {
       include: blockQuery.include
     });
@@ -2533,6 +2534,7 @@ function dbFormatterFactory(db) {
 }
 
 // api/db/entityCRUD/report.ts
+var { locales: reportLocales } = getLocales_default();
 function dbReportFactory(db) {
   const { report: Report } = db;
   return {
@@ -2551,14 +2553,33 @@ function dbReportFactory(db) {
     });
     return entity.toJSON();
   }
-  async function readReport({ id, include } = {}) {
+  async function readReport({
+    id,
+    include,
+    locales: locales9 = reportLocales
+  } = {}) {
     const idList = id == null ? [] : [].concat(id);
     const entities = await Report.findAll({
       where: idList.length > 0 ? { id: idList } : void 0,
       include: include ? reportQuery.include : void 0
     });
     if (idList.length === 0 || entities.length === idList.length) {
-      return entities.map((entity) => entity.toJSON());
+      return entities.map((entity) => {
+        const report = entity.toJSON();
+        return {
+          ...report,
+          sections: report.sections.map((section) => ({
+            ...section,
+            blocks: section.blocks.map((block) => ({
+              ...block,
+              contentByLocale: Object.keys(block.contentByLocale).reduce((filteredContent, locale) => ({
+                ...filteredContent,
+                ...[...locales9, "logic"].includes(locale) ? { [locale]: block.contentByLocale[locale] } : {}
+              }), {})
+            }))
+          }))
+        };
+      });
     }
     const found = entities.map((entity) => entity.id);
     const missing = idList.filter((item) => !found.includes(item));
@@ -3523,7 +3544,31 @@ function dbReadPrivateBlocksFactory(db) {
     const allBlocks = await Report.findByPk(
       params.report_id,
       {
-        include: reportQuery.include
+        include: {
+          association: "sections",
+          separate: true,
+          include: [
+            {
+              association: "blocks",
+              separate: true,
+              include: [
+                {
+                  association: "contentByLocale",
+                  separate: true,
+                  where: {
+                    locale: params.locale
+                  }
+                },
+                {
+                  association: "inputs"
+                },
+                {
+                  association: "consumers"
+                }
+              ]
+            }
+          ]
+        }
       }
     ).then((report) => {
       if (report && report.sections && Array.isArray(report.sections)) {
@@ -3868,12 +3913,13 @@ function endpointRevalidateFactory(operations) {
 }
 
 // api/endpoints/readPrivateBlocks.ts
+var { localeDefault: localeDefault5 } = getLocales_default();
 function endpointReadPrivateBlocksFactory(operations) {
   const { readPrivateBlocks: readPrivateBlocks2 } = operations;
   return endpoint("POST", "read/blocks/private", (req, res, session) => {
     const params = {
       report_id: parseInt(req.body.report_id, 10),
-      locale: req.body.locale || "es",
+      locale: req.body.locale || localeDefault5,
       roles: session && session.user ? session.user.bespoke_roles : []
     };
     return readPrivateBlocks2(params);
@@ -4224,12 +4270,12 @@ var transformReadMembers = (params) => {
 };
 
 // models/block.ts
-var { localeDefault: localeDefault5 } = getLocales_default();
+var { localeDefault: localeDefault6 } = getLocales_default();
 function parseBlockContext(context) {
   return {
     variables: context.variables || {},
     query: context.query || {},
-    locale: context.locale || localeDefault5
+    locale: context.locale || localeDefault6
   };
 }
 var verbose6 = yn3(process.env.REPORTS_LOGGING);
@@ -4417,13 +4463,13 @@ var selectorQueryToVariable = (id, query, config) => {
 var selectorQueryToVariable_default = selectorQueryToVariable;
 
 // libs/blocks/getBlockContent.ts
-var { localeDefault: localeDefault6 } = getLocales_default();
+var { localeDefault: localeDefault7, locales: locales6 } = getLocales_default();
 var logicTypes = Object.values(BLOCK_LOGIC_TYPES);
-var getLocaleDerived = (block, locale = localeDefault6) => block && logicTypes.includes(block.type) ? BLOCK_LOGIC_LOCALE : locale;
-var getBlockContent = (block, _locale = localeDefault6) => {
+var getLocaleDerived = (block, locale = localeDefault7) => block && logicTypes.includes(block.type) ? { locale: BLOCK_LOGIC_LOCALE, locales: [BLOCK_LOGIC_LOCALE] } : { locale, locales: locales6 };
+var getBlockContent = (block, _locale = localeDefault7) => {
   if (!block)
     return {};
-  const locale = getLocaleDerived(block, _locale);
+  const { locale } = getLocaleDerived(block, _locale);
   return block.contentByLocale?.[locale]?.content;
 };
 
@@ -4556,147 +4602,64 @@ async function runSingleBlock(block, formatterFunctions, blockContext) {
     }
   };
 }
-var getConsumers = (bid, blocks, acc = []) => {
+var getDependencies = (bid, blocks, acc = [], crawlUp = true, crawlDown2 = true) => {
   const rootBlock = blocks[bid];
-  if (rootBlock.consumers.length) {
-    rootBlock.consumers.forEach((consumer) => {
-      getConsumers(consumer, blocks, acc);
+  if (rootBlock.inputs.length && crawlUp) {
+    rootBlock.inputs.forEach((iid) => {
+      const rel = `${iid}-${bid}`;
+      if (!acc.includes(rel))
+        acc.push(rel);
+      rootBlock.inputs.forEach((iid2) => getDependencies(iid2, blocks, acc, crawlUp, false));
     });
   }
-  acc.push(bid);
-  return acc;
-};
-var getDependencies = (bid, blocks, acc = []) => {
-  const rootBlock = blocks[bid];
-  if (rootBlock.consumers.length) {
+  if (rootBlock.consumers.length && crawlDown2) {
     rootBlock.consumers.forEach((cid) => {
-      acc.push([bid, cid]);
-      rootBlock.consumers.forEach((cid2) => getDependencies(cid2, blocks, acc));
+      const rel = `${bid}-${cid}`;
+      if (!acc.includes(rel))
+        acc.push(rel);
+      rootBlock.consumers.forEach((cid2) => getDependencies(cid2, blocks, acc, crawlUp, crawlDown2));
     });
   }
   return acc;
 };
 var runConsumersV2 = async (blocks, sections, bid, formatterFunctions, blockContext, initialVariables = {}) => {
   if (!bid && !sections)
-    return { variables: {} };
+    return { variables: { ...initialVariables } };
   const variablesById = { ...initialVariables };
   const parsedBlockContext = parseBlockContext(blockContext);
   const attributes = parsedBlockContext.variables;
   const rootBlocks = bid ? { [bid]: blocks[bid] } : sections.reduce((rootBlocks2, { id }) => ({ ...rootBlocks2, ...getRootBlocksForSection_default(id, blocks) }), {});
-  const blockDeps = Object.keys(rootBlocks).reduce((deps, bid2) => [...deps, ...getDependencies(Number(bid2), blocks)], []);
+  const blockDeps = Object.keys(rootBlocks).reduce((deps, id) => {
+    const dependencies = getDependencies(Number(id), blocks, [], !bid).map((rel) => rel.split("-"));
+    return [...deps, ...dependencies];
+  }, []);
   const orderedDAG = toposort(blockDeps);
-  const blockOrder = bid ? orderedDAG : Object.keys(blocks).sort((a, b) => orderedDAG.indexOf(Number(a)) - orderedDAG.indexOf(Number(b)));
-  for (const blockId of blockOrder) {
-    const block = blocks[blockId];
-    const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
-    const { outputVariables } = await runSingleBlock(
-      block,
-      formatterFunctions,
-      {
-        ...parsedBlockContext,
-        variables
-      }
-    );
-    variablesById[blockId] = outputVariables;
-  }
-  return { variables: { ...initialVariables, ...variablesById } };
-};
-var runConsumers = async (blocks, sid, bid, formatterFunctions, blockContext, initialVariables) => {
-  const revalidate = bid ? getConsumers(bid, blocks) : [];
-  const rootBlocks = bid ? { [bid]: blocks[bid] } : getRootBlocksForSection_default(sid, blocks);
-  const parsedBlockContext = parseBlockContext(blockContext);
-  const attributes = parsedBlockContext.variables;
-  const variablesById = initialVariables ? { ...initialVariables } : {};
-  const statusById = {};
-  const crawlUp = async (bid2) => {
-    const block = blocks[bid2];
-    if (block.inputs.length === 0 && !variablesById[bid2]) {
-      const { outputVariables, status } = await runSingleBlock(block, formatterFunctions, parsedBlockContext);
-      variablesById[bid2] = outputVariables;
-      statusById[bid2] = status;
-      return;
-    }
-    for (let i = 0; i < block.inputs.length; i += 1) {
-      const input = block.inputs[i];
-      if (!variablesById[input])
-        await crawlUp(input);
-    }
-    const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
-    if (!variablesById[bid2]) {
-      const { outputVariables, status } = await runSingleBlock(
-        block,
-        formatterFunctions,
-        { ...parsedBlockContext, variables }
+  async function runTasksInParallel(executionOrder, blocks2) {
+    const runningBlocks = /* @__PURE__ */ new Map();
+    for (const bid2 of executionOrder) {
+      const block = blocks2[bid2];
+      const dependenciesDone = Promise.all(
+        block.inputs.filter((iid) => executionOrder.includes(String(iid))).map((iid) => runningBlocks.get(Number(iid)))
       );
-      variablesById[bid2] = outputVariables;
-      statusById[bid2] = status;
-    }
-  };
-  const crawlDown2 = async (bid2, cascader = false) => {
-    if (cascader) {
-      variablesById[bid2] = {};
-      statusById[bid2] = { hiddenByCascade: cascader };
-      for (let i = 0; i < blocks[bid2].consumers.length; i += 1) {
-        const cid = blocks[bid2].consumers[i];
-        await crawlDown2(cid, cascader);
-      }
-      return;
-    }
-    let block;
-    let variables = {};
-    if (rootBlocks[bid2]) {
-      block = rootBlocks[bid2];
-      if (blocks[bid2].inputs.length > 0) {
-        await crawlUp(bid2);
-        variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), {});
-      }
-    } else {
-      block = blocks[bid2];
-      if (block.inputs.some((d) => !variablesById[d]))
-        await crawlUp(bid2);
-      variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), {});
-    }
-    let allowed = true;
-    if ("allowed" in block.settings && block.settings.allowed !== "always") {
-      if (block.settings.allowed === "never")
-        allowed = false;
-      else {
-        const { vars, error, output } = mortarEval_default(
-          "variables",
-          { ...variables, ...attributes },
-          block.settings.allowedLogic,
+      const runningTask = dependenciesDone.then(() => {
+        const variables = block.inputs.reduce((acc, d) => ({ ...acc, ...variablesById[d] }), attributes);
+        return runSingleBlock(
+          block,
           formatterFunctions,
-          void 0,
-          parsedBlockContext
-        );
-        if (!error)
-          allowed = Boolean(output);
-      }
-    }
-    if (allowed) {
-      if (!variablesById[bid2] || revalidate.includes(Number(bid2))) {
-        const { outputVariables, status } = await runSingleBlock(block, formatterFunctions, { ...parsedBlockContext, variables: { ...variables, ...attributes } });
-        variablesById[bid2] = outputVariables;
-        statusById[bid2] = status;
-      }
-      for (const cid of blocks[bid2].consumers) {
-        await crawlDown2(cid);
-      }
-    } else {
-      variablesById[bid2] = {};
-      statusById[bid2] = { hiddenByCascade: bid2 };
-      for (const cid of blocks[bid2].consumers) {
-        await crawlDown2(cid, bid2);
-      }
+          {
+            ...parsedBlockContext,
+            variables
+          }
+        ).then(({ outputVariables }) => {
+          variablesById[bid2] = outputVariables;
+        });
+      });
+      runningBlocks.set(Number(bid2), runningTask);
     }
-  };
-  for (const id of Object.keys(rootBlocks)) {
-    await crawlDown2(id);
+    await Promise.all(Array.from(runningBlocks.values()));
   }
-  return {
-    variables: variablesById,
-    status: statusById
-  };
+  await runTasksInParallel(orderedDAG, blocks);
+  return { variables: { ...initialVariables, ...variablesById } };
 };
 
 // libs/variables/previewsToAttributes.ts
@@ -4716,12 +4679,6 @@ function previewsToAttributes(previews = []) {
   }, {});
 }
 var previewsToAttributes_default = previewsToAttributes;
-
-// store/envvars.ts
-var localeDefault7 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
-var locales6 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault7];
-if (!locales6.includes(localeDefault7))
-  locales6.push(localeDefault7);
 function comparePositions(firstPos, secondPos) {
   return +(firstPos < secondPos) - +(firstPos > secondPos);
 }
@@ -4863,9 +4820,18 @@ var funcifyFormattersByLocale = (formatters = [], locale = localeDefault8) => fo
   acc[f.name] = formatterFn;
   return acc;
 }, {});
+
+// store/envvars.ts
+var localeDefault9 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
+var locales7 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault9];
+if (!locales7.includes(localeDefault9))
+  locales7.push(localeDefault9);
+
+// store/statusSlice.ts
 var initialState = {
-  localeDefault: localeDefault7,
-  locales: locales6,
+  localeDefault: localeDefault9,
+  locales: locales7,
+  currentLocale: localeDefault9,
   showToolbar: false,
   activeSection: null,
   previews: [],
@@ -5000,6 +4966,10 @@ var recordsSlice = createSlice({
         } else if (req.type === "section") {
           const item = req.data;
           state.entities.report[item.report_id].sections.push(item.id);
+          state.entities.report[item.report_id].sections = recalculateOrder(
+            nextEntities.report[item.report_id].sections,
+            nextEntities.section
+          );
         } else if (req.type === "block") {
           const item = req.data;
           state.entities.section[item.section_id].blocks.push(item.id);
@@ -5412,8 +5382,9 @@ function setQueryParam(resource, key, value) {
 function recalculateVariables(resource, params) {
   return async (dispatch, getState) => {
     const state = getState();
+    const { currentLocale } = state.status;
     const blocks = state.records.entities.block;
-    const formatterFunctions = resource.formatterFunctions[localeDefault7];
+    const formatterFunctions = resource.formatterFunctions[currentLocale];
     const { parsedParams, statusPayload } = parseVariableUpdateParams(state.status, params);
     const {
       sid,
@@ -5427,12 +5398,12 @@ function recalculateVariables(resource, params) {
     const blockContext = {
       variables: attributes,
       query,
-      locale: localeDefault7
-      //TODO: locale is variable
+      locale: currentLocale
     };
-    const data = await runConsumers(
+    const section = state.records.entities.section[sid];
+    const data = await runConsumersV2(
       blocks,
-      sid,
+      section && [section],
       bid,
       formatterFunctions,
       blockContext
@@ -5581,10 +5552,10 @@ function parseReportId(value) {
   const [, reportId] = Array.isArray(value) ? value : [value];
   return Number.parseInt(reportId) || void 0;
 }
-var { locales: locales7 } = getLocales_default();
+var { locales: locales8 } = getLocales_default();
 var initialContext = {
   pathSegment: "path",
-  formatterFunctions: locales7.reduce((acc, d) => ({ ...acc, [d]: {} }), {})
+  formatterFunctions: locales8.reduce((acc, d) => ({ ...acc, [d]: {} }), {})
 };
 createContext(initialContext);
 
@@ -5607,19 +5578,19 @@ function BespokeRendererStaticPaths(options) {
   } = options || {};
   return async (context) => {
     const {
-      defaultLocale = localeDefault7,
-      locales: locales8 = []
+      defaultLocale = localeDefault9,
+      locales: locales9 = []
     } = context;
     let paths = [];
     if (limit > 0) {
-      const locale = locales8.find((token) => token === defaultLocale);
+      const locale = locales9.find((token) => token === defaultLocale);
       const { searchMember: searchMember2 } = await getDB().then(apiFactory);
       const req = await searchMember2({
         query: "",
         // gets top {limit} ranked per profile type.
         limit,
         format: "plain",
-        locale: locale || localeDefault7,
+        locale: locale || localeDefault9,
         noImage: true,
         visible: true,
         report: [],
@@ -5629,7 +5600,7 @@ function BespokeRendererStaticPaths(options) {
       });
       if (req.ok === true) {
         paths = req.data.results.slice(0, limit).map((item) => ({
-          locale: locales8.find((token) => token === item.locale),
+          locale: locales9.find((token) => token === item.locale),
           params: {
             bespoke: [item.variant.slug, item.slug]
             // TODO: fix SearchResult definition
@@ -5653,7 +5624,7 @@ function BespokeRendererStaticProps(options) {
       await dispatch(useDatabaseApi);
       const buildTime = (/* @__PURE__ */ new Date()).toISOString();
       const {
-        locale = localeDefault7,
+        locale = localeDefault9,
         // TODO: detect or use app default
         params = {}
       } = context;
@@ -5677,12 +5648,13 @@ function BespokeRendererStaticProps(options) {
         dispatch(readEntity("formatter", {})),
         dispatch(readEntity("report", {
           id: members.results.map((member) => member.report_id),
-          include: true
+          include: true,
+          locales: [locale]
         }))
       ]);
       const state = store.getState();
       const formatterList = selectFormatterList(state);
-      const formatters = funcifyFormattersByLocale(formatterList, localeDefault7);
+      const formatters = funcifyFormattersByLocale(formatterList, localeDefault9);
       const sectionList = selectSectionList(state);
       const blockRecords = selectBlockRecords(state);
       const publicBlockRecords = { ...blockRecords };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -41,6 +41,7 @@
   "dependencies": {
     "@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",
@@ -88,7 +89,6 @@
     "pg": "^8.7.3",
     "pretty-format": "^28.1.1",
     "react": "^18.0.2",
-    "react-beautiful-dnd": "^13.1.0",
     "react-clipboard.js": "^2.0.16",
     "react-icons": "^4.3.1",
     "react-redux": "^7.2.6",