@datawheel/bespoke 0.1.20 → 0.1.22

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.20",
+  "version": "0.1.22",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -41,14 +41,15 @@
   "dependencies": {
     "@auth0/nextjs-auth0": "^2.0.1",
     "@emotion/react": "^11.10.4",
-    "@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",
+    "@hello-pangea/dnd": "^16.2.0",
+    "@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",
@@ -80,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",
@@ -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",