@datawheel/bespoke 0.6.0-rc.8 → 0.7.0-rc.0

package/dist/server.js

@@ -1,7 +1,7 @@
 import { initAuth0 } from '@auth0/nextjs-auth0';
 import auth0 from 'auth0';
 import * as pg from 'pg';
-import { Sequelize, Error as Error$1, Op, fn, col, DataTypes, QueryTypes, Model } from 'sequelize';
+import { Sequelize, Error as Error$1, Op, fn, col, literal, DataTypes, Model } from 'sequelize';
 import yn2 from 'yn';
 import * as d3Array from 'd3-array';
 import * as d3Collection from 'd3-collection';
@@ -26,8 +26,7 @@ import * as allIcons from '@tabler/icons-react';
 import NextCors from 'nextjs-cors';
 import imageType from 'image-type';
 import formidable from 'formidable';
-import { BrowserPool, PlaywrightPlugin } from '@crawlee/browser-pool';
-import { chromium } from 'playwright-chromium';
+import puppeteer from 'puppeteer';
 import DomParser from 'dom-parser';
 import path from 'path';
 import axiosRetry from 'axios-retry';
@@ -1454,7 +1453,8 @@ var getVariantSettingsDefaults = (settings) => ({
   regenerateSlugs: settings && typeof settings.regenerateSlugs !== "undefined" ? settings.regenerateSlugs : false,
   keepOldMembers: settings && typeof settings.keepOldMembers !== "undefined" ? settings.keepOldMembers : true,
   doIngest: settings && typeof settings.doIngest !== "undefined" ? settings.doIngest : false,
-  overrideAttributes: settings && typeof settings.overrideAttributes !== "undefined" ? settings.overrideAttributes : false
+  overrideAttributes: settings && typeof settings.overrideAttributes !== "undefined" ? settings.overrideAttributes : false,
+  order: settings && typeof settings.order !== "undefined" ? settings.order : 0
 });
 
 // api/db/member/ingestMembers.ts
@@ -1478,12 +1478,14 @@ function ingestMembersFactory(db) {
     const members = keyDiver(memberFetch.data, accessor);
     let toUpdateContent = [];
     try {
+      console.log(`Ingesting default items for variant ${variant.name} for ${defaultLocale}`);
       toUpdateContent = await ingestDefaultMembers(variant, defaultLocale, members);
     } catch (error) {
       const errorMsg = `[ERROR] Ingesting default member items for ${defaultLocale}`;
       console.error(errorMsg, error);
       throw new BackendError(500, errorMsg);
     }
+    console.log("toUpdateContent", toUpdateContent);
     const contentHash = await Search.findAll({ where: { variant_id: id } }).then((arr) => Object.fromEntries(
       arr.map(
         (content) => [
@@ -1530,6 +1532,7 @@ function ingestMembersFactory(db) {
             contentMember.attributes = calculatedAttributes;
           }
         } else {
+          console.log("name", d2[labelKey2], "-");
           contentMember = {
             id: searchElement.content_id,
             locale,
@@ -1584,6 +1587,8 @@ function ingestMembersFactory(db) {
       allSlugsFromOtherMembersQuery,
       oldIngestedMembersQuery
     ]);
+    console.log("allSlugsFromOtherMembers", allSlugsFromOtherMembers);
+    console.log("oldIngestedMembers", oldIngestedMembers);
     const oldIngestedSlugs = Object.values(oldIngestedMembers).map((m) => m.slug);
     const toIngestSlugs = [];
     let minValue = null;
@@ -1605,7 +1610,7 @@ function ingestMembersFactory(db) {
     const toUpdate = [];
     const toUpdateContent = [];
     let toUpdateFlag = false;
-    members.forEach((member) => {
+    members.filter((member) => member[idKey] && member[idKey] !== "" && member[labelKey] && member[labelKey] !== "").forEach((member) => {
       const memberId = member[idKey];
       const slug2 = slugify_default(member[labelKey]);
       toUpdateFlag = false;
@@ -2025,7 +2030,8 @@ function dbSearchMemberFactory(db) {
       noImage,
       includes,
       sort,
-      direction = "ASC"
+      direction = "ASC",
+      offset = 0
     } = params;
     if (query && query !== "" && searchIndexByLocale[locale]) {
       const terms = sanitizeQuery_default(query).replace(/([A-z]{2,})/g, (txt) => `+${txt}`).replace(/(.)$/g, (txt) => `${txt}*`);
@@ -2062,18 +2068,22 @@ function dbSearchMemberFactory(db) {
       locale: all ? { [Op.ne]: null } : locale
     };
     const calculatedLimit = limit && !isNaN(limit) ? limit : 20;
+    const orderClause = [["zvalue", "DESC NULLS LAST"]];
+    if (sort && sort !== "name") {
+      orderClause.unshift([sort, direction.toUpperCase()]);
+    }
     if (query === "") {
-      const rank = await sequelize.query(`
-      SELECT t.content_id
-      FROM (
-        SELECT id, content_id, variant_id, zvalue,
-          RANK() OVER (PARTITION BY variant_id ORDER BY zvalue DESC) AS rank
-        FROM bespoke_reports_search
-      ) t
-      WHERE t.rank <= ${calculatedLimit}
-      ORDER BY t.variant_id, t.zvalue DESC;
-        `, { type: QueryTypes.SELECT });
-      resultsIds = rank.map((d2) => d2.content_id);
+      const noQueryIds = await Search.findAll({
+        attributes: ["content_id"],
+        limit: calculatedLimit,
+        offset,
+        where: whereClause,
+        order: orderClause
+      });
+      resultsIds = noQueryIds.map((r2) => {
+        const result = r2.toJSON();
+        return result.content_id;
+      });
     }
     whereClause.content_id = resultsIds;
     const includeClause = [{
@@ -2092,16 +2102,29 @@ function dbSearchMemberFactory(db) {
         attributes: ["id", "slug", "name"]
       });
     }
-    const orderClause = [["zvalue", "DESC NULLS LAST"]];
-    if (sort && sort !== "name") {
-      orderClause.unshift([sort, direction.toUpperCase()]);
-    }
-    const results = await Search.findAll({
-      limit: query ? limit : void 0,
-      where: whereClause,
-      include: includeClause,
-      order: orderClause
-    });
+    const countWhereClause = {
+      ...whereClause.visible ? { visible: whereClause.visible } : {},
+      ...whereClause.noImage ? { image_id: whereClause.noImage } : {},
+      ...whereClause.content_id ? { content_id: whereClause.content_id } : {}
+    };
+    const [results, variantCount] = await Promise.all([
+      Search.findAll({
+        limit: query ? calculatedLimit : void 0,
+        offset: query ? offset : 0,
+        where: whereClause,
+        include: includeClause,
+        order: orderClause
+      }),
+      Search.findAll({
+        attributes: ["variant_id", [
+          fn("COUNT", col("variant_id")),
+          "members_count"
+        ]],
+        where: countWhereClause,
+        group: ["variant_id"]
+      })
+    ]);
+    const typedVariantCount = variantCount.map((vc) => vc.toJSON());
     if (sort === "name") {
       const sortDirection = direction.toUpperCase() === "ASC" ? 1 : -1;
       results.sort((a2, b2) => {
@@ -2142,7 +2165,11 @@ function dbSearchMemberFactory(db) {
         origin: "lunr",
         ...Object.fromEntries(
           Object.entries(params).map((entry) => [entry[0], stripHTML(entry[1])])
-        )
+        ),
+        variantCount: typedVariantCount.reduce((acc, vc) => {
+          acc[vc.variant_id] = parseInt(vc.members_count, 10);
+          return acc;
+        }, {})
       },
       results: formattedResults
     };
@@ -2235,8 +2262,6 @@ function dbMemberFactory(db) {
     readMemberImage: readMemberImageFactory(db)
   };
 }
-
-// api/db/include.ts
 var blockQuery = {
   include: [
     { association: "contentByLocale", separate: true },
@@ -2247,19 +2272,33 @@ var blockQuery = {
     }
   ]
 };
-var dimensionQuery = {
-  include: [{ association: "variants", separate: true }],
+var dimensionQuery = (searchModel) => ({
+  include: [{
+    association: "variants",
+    separate: true,
+    attributes: {
+      include: [
+        [fn("COUNT", col("members.id")), "members_count"]
+      ]
+    },
+    include: [{
+      model: searchModel,
+      as: "members",
+      attributes: []
+    }],
+    group: ["variant.id"]
+  }],
   order: [["ordering", "ASC"]]
-};
+});
 var sectionQuery = {
   include: [{ association: "blocks", separate: true, ...blockQuery }]
 };
-var reportQuery = {
+var reportQuery = (model) => ({
   include: [
-    { association: "dimensions", separate: true, ...dimensionQuery },
+    { association: "dimensions", separate: true, ...dimensionQuery(model) },
     { association: "sections", separate: true, ...sectionQuery }
   ]
-};
+});
 var imageQueryThumbOnly = [
   {
     association: "image",
@@ -2415,7 +2454,7 @@ function dbBlockFactory(db) {
 
 // api/db/entityCRUD/dimension.ts
 function dbDimensionFactory(db) {
-  const { dimension: Dimension } = db;
+  const { dimension: Dimension, search: SearchModel3 } = db;
   return {
     createDimension,
     readDimension,
@@ -2428,7 +2467,7 @@ function dbDimensionFactory(db) {
       report_id: data.report_id,
       variants: []
     }, {
-      include: dimensionQuery.include
+      include: dimensionQuery(SearchModel3).include
     });
     return entity.toJSON();
   }
@@ -2436,7 +2475,7 @@ function dbDimensionFactory(db) {
     const idList = id == null ? [] : [].concat(id);
     const entities = await Dimension.findAll({
       where: idList.length > 0 ? { id: idList } : void 0,
-      include: include ? dimensionQuery.include : void 0
+      include: include ? dimensionQuery(SearchModel3).include : void 0
     });
     if (idList.length === 0 || entities.length === idList.length) {
       return entities.map((entity) => entity.toJSON());
@@ -2448,15 +2487,18 @@ function dbDimensionFactory(db) {
   async function updateDimension(data) {
     const { id, variants, ...dimensionData } = data;
     const entity = await Dimension.findByPk(id, {
-      include: dimensionQuery.include,
-      rejectOnEmpty: true
+      include: dimensionQuery(SearchModel3).include,
+      rejectOnEmpty: false
     });
+    if (!entity) {
+      throw new BackendError(404, `Dimension(id=${id}) does not exist.`);
+    }
     entity.set(dimensionData);
     await entity.save();
     return entity.toJSON();
   }
   async function deleteDimension(id) {
-    const entity = await Dimension.findByPk(id, { rejectOnEmpty: true });
+    const entity = await Dimension.findByPk(id, { rejectOnEmpty: false });
     await entity.destroy();
     return { id, parentType: "report", parentId: entity.report_id };
   }
@@ -2503,7 +2545,7 @@ function dbFormatterFactory(db) {
 // api/db/entityCRUD/report.ts
 var { locales: reportLocales } = getLocales_default();
 function dbReportFactory(db) {
-  const { report: Report } = db;
+  const { report: Report, search: SearchModel3 } = db;
   return {
     createReport,
     readReport,
@@ -2518,7 +2560,7 @@ function dbReportFactory(db) {
         dimensions: []
       },
       {
-        include: reportQuery.include
+        include: reportQuery(SearchModel3).include
       }
     );
     return entity.toJSON();
@@ -2540,7 +2582,7 @@ function dbReportFactory(db) {
     );
     const entities = await Report.findAll({
       where: idList.length > 0 ? { id: idList } : void 0,
-      include: include ? reportQuery.include?.filter(
+      include: include ? reportQuery(SearchModel3).include?.filter(
         (i2) => typeof include === "string" ? i2["association"] === include : include
       ) : void 0
     });
@@ -2572,16 +2614,19 @@ function dbReportFactory(db) {
   async function updateReport(data) {
     const { id, dimensions, sections, ...reportData } = data;
     const entity = await Report.findByPk(id, {
-      include: reportQuery.include,
-      rejectOnEmpty: true
+      include: reportQuery(SearchModel3).include,
+      rejectOnEmpty: false
     });
+    if (!entity) {
+      throw new BackendError(404, `Report(id=${id}) does not exist.`);
+    }
     entity.set(reportData);
     await entity.save();
     await entity.reload();
     return entity.toJSON();
   }
   async function deleteReport(id) {
-    const entity = await Report.findByPk(id, { rejectOnEmpty: true });
+    const entity = await Report.findByPk(id, { rejectOnEmpty: false });
     await entity.destroy();
     return { id };
   }
@@ -2637,7 +2682,7 @@ function dbSectionFactory(db) {
   }
 }
 function dbVariantFactory(db, crud) {
-  const { variant: Variant } = db;
+  const { variant: Variant, search: Search } = db;
   return {
     createVariant,
     readVariant,
@@ -2658,7 +2703,19 @@ function dbVariantFactory(db, crud) {
   async function readVariant({ id } = {}) {
     const idList = id == null ? [] : [].concat(id);
     const entities = await Variant.findAll({
-      where: idList.length > 0 ? { id: idList } : void 0
+      where: idList.length > 0 ? { id: idList } : void 0,
+      attributes: {
+        include: [[
+          fn("COUNT", col("members.id")),
+          "members_count"
+        ]]
+      },
+      include: [{
+        model: Search,
+        attributes: [],
+        as: "members"
+      }],
+      group: ["variant.id"]
     });
     if (idList.length === 0 || entities.length === idList.length) {
       return entities.map((entity) => entity.toJSON());
@@ -2677,6 +2734,7 @@ function dbVariantFactory(db, crud) {
     const doIngest = variantData.settings.doIngest;
     variantData.settings.doIngest = false;
     await entity.update(variantData);
+    console.log(id, "doIngest", doIngest);
     if (doIngest) {
       await crud.ingestMembers(entity);
       await search_default2(db, true);
@@ -3113,7 +3171,8 @@ function parseSearchMemberParams(query) {
     report,
     all: localeIsAll,
     sort: normalizeList(query.sort)[0],
-    direction: normalizeList(query.direction)[0]
+    direction: normalizeList(query.direction)[0],
+    offset: Number(query.offset || 0)
   };
 }
 
@@ -3490,30 +3549,66 @@ function dbImageSearchFactory(db, provider) {
   }
   return resultWrapper((params) => searchProvider(db, params));
 }
-
-// api/db/readMetadata.ts
+var convertMemberCountInVariants = (report) => {
+  if (report.dimensions) {
+    report.dimensions.forEach((dimension) => {
+      if (dimension.variants) {
+        dimension.variants.forEach((variant) => {
+          if (variant.members_count) {
+            variant.members_count = parseInt(variant.members_count, 10);
+          }
+        });
+      }
+    });
+  }
+  return report;
+};
 function dbReadMetadataFactory(db) {
-  const { report: Report } = db;
+  const { report: Report, search: Search } = db;
   return dbReadMetadata;
   async function dbReadMetadata(_params) {
     const results = await Report.findAll({
-      attributes: ["id", "name"],
+      attributes: ["id", "name", [literal("COALESCE(NULLIF(settings ->> 'order', '')::INTEGER, 0)"), "ordering"]],
+      order: [
+        ["ordering", "ASC"]
+      ],
       include: [{
-        attributes: ["id", "name"],
+        attributes: ["id", "name", "ordering"],
         association: "dimensions",
         separate: true,
+        order: [
+          ["ordering", "ASC"]
+        ],
         include: [
           {
-            attributes: ["id", "name", "slug"],
+            attributes: [
+              "id",
+              "name",
+              "slug",
+              [fn("COUNT", col("members.id")), "members_count"],
+              [literal("COALESCE(NULLIF(settings ->> 'order', '')::INTEGER, 0)"), "ordering"]
+            ],
+            include: [{
+              model: Search,
+              attributes: [],
+              as: "members"
+            }],
             association: "variants",
-            separate: true
+            separate: true,
+            // TS complains about this but it works (?)
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            group: ["variant.id"],
+            order: [
+              ["ordering", "ASC"]
+            ]
           }
         ]
       }]
     });
     return {
       data: results.map((report) => ({
-        ...report.toJSON(),
+        ...convertMemberCountInVariants(report.toJSON()),
         mode: report.dimensions.length === 1 ? REPORT_MODES.UNILATERAL : REPORT_MODES.MULTILATERAL
       }))
     };
@@ -4221,135 +4316,111 @@ function endpointUpdateMyDataFactory(operations) {
     }
   }, []);
 }
-var minimal_args = [
-  "--autoplay-policy=user-gesture-required",
-  "--disable-background-networking",
-  "--disable-background-timer-throttling",
-  "--disable-backgrounding-occluded-windows",
-  "--disable-breakpad",
-  "--disable-client-side-phishing-detection",
-  "--disable-component-update",
-  "--disable-default-apps",
-  "--disable-dev-shm-usage",
-  "--disable-domain-reliability",
-  "--disable-extensions",
-  "--disable-features=AudioServiceOutOfProcess",
-  "--disable-hang-monitor",
-  "--disable-ipc-flooding-protection",
-  "--disable-notifications",
-  "--disable-offer-store-unmasked-wallet-cards",
-  "--disable-popup-blocking",
-  "--disable-print-preview",
-  "--disable-prompt-on-repost",
-  "--disable-renderer-backgrounding",
-  "--disable-setuid-sandbox",
-  "--disable-speech-api",
-  "--disable-sync",
-  "--hide-scrollbars",
-  "--ignore-gpu-blacklist",
-  "--metrics-recording-only",
-  "--mute-audio",
-  "--no-default-browser-check",
-  "--no-first-run",
-  "--no-pings",
-  "--no-zygote",
-  "--password-store=basic",
-  "--use-gl=swiftshader",
-  "--use-mock-keychain",
-  "--start-fullscreen",
-  "--disable-dev-shm-usage",
-  "--no-sandbox"
-];
-var TIME = "playwright";
-var width = 1366;
-var height = 768;
-var browserPool = new BrowserPool({
-  browserPlugins: [new PlaywrightPlugin(chromium, {
-    launchOptions: {
-      headless: true,
-      excecutablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,
+async function generatePDF(path2) {
+  const width = 1920;
+  const height = 1080;
+  const maxTimeoutPerPage = 0;
+  try {
+    const browser = await puppeteer.launch({
       args: [
         `--window-size=${width},${height}`,
-        ...minimal_args
+        "--start-fullscreen"
       ],
-      viewport: { width, height },
-      deviceScaleFactor: 2
-    }
-  })]
-});
-async function generateImage(path2, section, format = "png", transparent = false) {
-  console.time(TIME);
-  try {
-    console.timeLog(TIME, "Browser started");
+      defaultViewport: { width, height },
+      headless: "new",
+      ignoreHTTPSErrors: true
+    });
     const url = new URL(path2);
     const searchParams = new URLSearchParams(url.search);
+    searchParams.set("print", "true");
     url.search = searchParams.toString();
-    const page = await browserPool.newPage();
-    console.timeLog(TIME, "Creating page");
-    console.timeLog(TIME, "Setting request interceptor");
-    await page.goto(url.toString());
-    console.timeLog(TIME, "Navigated to page");
-    await page.waitForLoadState("networkidle");
-    if (transparent) {
-      await page.$eval(`.bespoke-Section-${section}`, (el) => el["style"].background = "transparent");
-      await page.evaluate(() => document.body.style.background = "transparent");
-      console.timeLog(TIME, "Added transparent background");
-    }
-    if (format === "svg") {
-      const element = await page.$(".d3plus-viz");
-      const svg = await element?.evaluate((el) => el.outerHTML);
-      console.timeLog(TIME, "Finishing SVG");
-      console.timeEnd(TIME);
-      await page.close();
-      return svg?.replace(/ {4}|[\t\n\r]/gm, "");
-    } else {
-      const element = await page.$(".bespoke-Section-container");
-      const screenshot = await element?.screenshot({
-        type: "png",
-        omitBackground: true
+    const page = await browser.newPage();
+    await page.goto(url.toString(), { waitUntil: "networkidle0", timeout: maxTimeoutPerPage });
+    await page.waitForSelector("#bespoke-report", { timeout: maxTimeoutPerPage });
+    await page.evaluate(async () => {
+      await new Promise((resolve) => {
+        const scrollInterval = setInterval(() => {
+          window.scrollBy(0, window.innerHeight);
+        }, 100);
+        const checkNetworkActivity = () => {
+          const activeRequests = performance.getEntriesByType("resource").filter((entry) => entry.duration === 0);
+          return activeRequests.length === 0;
+        };
+        const checkInterval = setInterval(() => {
+          if (checkNetworkActivity()) {
+            clearInterval(scrollInterval);
+            clearInterval(checkInterval);
+            resolve();
+          }
+        }, 1e3);
       });
-      console.timeLog(TIME, "Finishing PNG");
-      console.timeEnd(TIME);
-      await page.close();
-      return screenshot;
-    }
+    });
+    const pdf = await page.pdf({
+      displayHeaderFooter: true,
+      footerTemplate: `
+        <div
+          style="
+            color: lightgray; border-top: solid lightgray 1px; font-size: 10px;
+            padding-top: 5px; text-align: center; width: 100%;
+          "
+        >
+          <p>Page <span class="pageNumber" /> of <span class="totalPages" /></p>
+        </div>`,
+      format: "A4",
+      // Letter,Legal,Tabloid,Ledger,A0,A1,A2,A3,A4,A5,A6
+      headerTemplate: `
+        <div
+          style="
+            color: lightgray; border-bottom: solid lightgray 1px; font-size: 10px;
+            padding-bottom: 5px; text-align: center; width: 100%;
+          "
+        >
+          <p class="url" />
+        </div>`,
+      // height: `${height}px`,
+      landscape: false,
+      margin: {
+        bottom: 70,
+        // minimum required for footer msg to display
+        left: 20,
+        right: 20,
+        top: 70
+        // minimum required for header msg to display
+      },
+      omitBackground: true,
+      pageRanges: "",
+      // All
+      // path: "./test.pdf" // Path to save the file
+      preferCSSPageSize: false,
+      // Give any CSS @page size declared in the page priority over what is declared in the width or height or format option.
+      printBackground: true,
+      scale: 1,
+      // From 0.1 to 2
+      tagged: false,
+      // Generate tagged (accessible) PDF.
+      timeout: 0
+      // width: `${width}px`,
+    });
+    await browser.close();
+    return pdf.toString("base64");
   } catch (error) {
-    console.error("Error generating Image:", error);
-    console.timeLog(TIME, "Finishing with error");
-    console.timeEnd(TIME);
+    console.error("Error generating PDF:", error);
     throw error;
   }
 }
-function endpointExportImage() {
-  return endpoint("POST", "img", async (req, res) => {
-    const { slugs, path: path2, section, viz, query: selectors, locale, prefixLocale, transparent = false, svg = false } = req.body;
-    if (!slugs || !path2 || !section) {
-      throw new BackendError(400, "Missing parameter in request.");
+function endpointDownloadReport() {
+  return endpoint("POST", "pdf", async (req, res) => {
+    const { slugs, path: path2 } = req.body;
+    if (!slugs || !path2) {
+      throw new BackendError(400, "Missing path parameter in request.");
     } else {
-      try {
-        let path3 = prefixLocale ? `/${locale}/` : "/";
-        path3 += `embed/${JSON.parse(slugs).join("/")}`;
-        const url = new URL(path3, req.headers["origin"]);
-        const query = new URLSearchParams(Object.entries(selectors || {}));
-        query.set("section", section);
-        if (viz) {
-          query.set("viz", viz);
-        }
-        url.search = query.toString();
-        const format = yn2(svg) ? "svg" : "png";
-        const img = await generateImage(url, section, format, yn2(transparent));
-        return {
-          ok: true,
-          status: 200,
-          data: img
-        };
-      } catch (e) {
-        console.log(e);
-        return {
-          ok: false,
-          status: 500
-        };
-      }
+      const url = new URL(path2, req.headers["origin"]);
+      const pdf = await generatePDF(url);
+      return {
+        ok: true,
+        status: 200,
+        data: pdf
+      };
     }
   });
 }
@@ -4407,6 +4478,8 @@ function endpointReportVariables() {
     }
   });
 }
+
+// api/endpoints/index.ts
 var verbose3 = getLogging_default();
 function endpointKey(method, path2) {
   return `${method.toUpperCase()} ${path2.toLowerCase()}`;
@@ -4442,8 +4515,7 @@ function getEndpointMap(db) {
     endpointRevalidateReportFactory(api),
     endpointRevalidateUrlFactory(),
     endpointReadPrivateBlocksFactory(api),
-    // endpointDownloadReport(),
-    endpointExportImage(),
+    endpointDownloadReport(),
     endpointListIconsFactory(api, "tabler"),
     endpointReadIconFactory(api, "tabler"),
     endpointReportVariables()
@@ -4494,7 +4566,7 @@ async function endpointNextJsHandlerFactory(req, res) {
                   "Content-Length": contentLength.toString()
                 }
               ).send(result.data);
-            } else if (req.url && req.url.indexOf("/icon.svg?name=") > 0 || req.url && req.url.startsWith("/api/cms/img") && yn2(req.body.svg)) {
+            } else if (req.url && req.url.indexOf("/icon.svg?name=") > 0) {
               res.setHeader("Content-Type", "image/svg+xml");
               res.status(result.status).send(result.data);
             } else {
@@ -4532,7 +4604,6 @@ __export(actions_exports, {
   createEntity: () => createEntity,
   deleteEntity: () => deleteEntity,
   deleteQueryParam: () => deleteQueryParam,
-  normalizeSectionLayout: () => normalizeSectionLayout,
   readEntity: () => readEntity,
   readMember: () => readMember,
   readMetadata: () => readMetadata,
@@ -4745,11 +4816,11 @@ function mortarEval(varInnerName, varOuterValue, logic, formatterFunctions, attr
       });
       let output;
       if (attributes) {
-        const fn4 = new Function(varInnerName, "console", "libs", "formatters", "locale", "variables", logic);
-        output = fn4(varOuterValue, pConsole, libraries, formatterFunctions, locale, attributes);
+        const fn7 = new Function(varInnerName, "console", "libs", "formatters", "locale", "variables", logic);
+        output = fn7(varOuterValue, pConsole, libraries, formatterFunctions, locale, attributes);
       } else {
-        const fn4 = new Function(varInnerName, "console", "libs", "formatters", "locale", logic);
-        output = fn4(varOuterValue, pConsole, libraries, formatterFunctions, locale);
+        const fn7 = new Function(varInnerName, "console", "libs", "formatters", "locale", logic);
+        output = fn7(varOuterValue, pConsole, libraries, formatterFunctions, locale);
       }
       if (typeof output === "object" && Object.keys(output).length > 0) {
         Object.assign(vars, output);
@@ -5944,26 +6015,6 @@ var recordsSlice = createSlice({
           }
         }
       };
-    },
-    normalizeSection: (state, action) => {
-      const sectionId = action.payload.section;
-      const section = state.entities.section[sectionId];
-      return {
-        ...state,
-        entities: {
-          ...state.entities,
-          section: {
-            // ...state.entities.section,
-            [sectionId]: {
-              ...section,
-              settings: {
-                ...section.settings,
-                width: "full"
-              }
-            }
-          }
-        }
-      };
     }
   },
   extraReducers: {
@@ -6386,14 +6437,14 @@ var un = function() {
   }, e;
 }();
 var an = new un();
-var fn3 = an.produce;
+var fn6 = an.produce;
 an.produceWithPatches.bind(an);
 an.setAutoFreeze.bind(an);
 an.setUseProxies.bind(an);
 an.applyPatches.bind(an);
 an.createDraft.bind(an);
 an.finishDraft.bind(an);
-var immer_esm_default = fn3;
+var immer_esm_default = fn6;
 
 // store/recordsActions.ts
 var recordsActions = recordsSlice.actions;
@@ -7027,12 +7078,6 @@ function removeBlocksFromState(privateBlockIds) {
     await dispatch(removeBlocks(privateBlockIds));
   };
 }
-function normalizeSectionLayout(sectionId) {
-  const { normalizeSection } = recordsSlice.actions;
-  return async (dispatch) => {
-    await dispatch(normalizeSection(sectionId));
-  };
-}
 function addBlockToState(newBlocks) {
   const { addBlocks } = recordsSlice.actions;
   return async (dispatch) => {
@@ -7244,8 +7289,14 @@ function BespokeRendererStaticProps(options) {
         } = context;
         const slugs = Array.from(getSlugSegments(params[pathSegmentsKey]));
         if (slugs.length === 0) {
+          await Promise.all([
+            dispatch(readEntity("formatter", {})),
+            dispatch(readEntity("report", { include: true }))
+          ]);
           return {
-            notFound: true
+            props: {
+              buildTime
+            }
           };
         }
         const members = await dispatch(
@@ -7295,7 +7346,7 @@ function BespokeRendererStaticProps(options) {
           },
           void 0,
           readMemberFn,
-          "section"
+          "report"
         ).then((data) => {
           dispatch(variablesActions.setVariableChange({ ...data, attributes }));
         });
@@ -7324,101 +7375,4 @@ function getSlugSegments(slugs = []) {
   };
 }
 
-// views/EmbedRendererSSR.tsx
-function BespokeEmbedServerSideProps(options) {
-  const {
-    pathSegmentsKey = "bespoke"
-  } = options || {};
-  try {
-    return storeWrapper.getServerSideProps((store) => {
-      const { dispatch } = store;
-      return async (context) => {
-        const { section, block } = context.query;
-        const selectors = Object.fromEntries(
-          Object.entries(context.query).filter(([key]) => key.match(/selector\d+id/))
-        );
-        if (!section && !block) {
-          return {
-            notFound: true
-          };
-        }
-        const sectionId = Number(section);
-        await dispatch(useDatabaseApi);
-        const buildTime = (/* @__PURE__ */ new Date()).toISOString();
-        const {
-          locale = localeDefault9,
-          // TODO: detect or use app default
-          params = {}
-        } = context;
-        const slugs = Array.from(getSlugSegments(params[pathSegmentsKey]));
-        if (slugs.length === 0) {
-          return {
-            notFound: true
-          };
-        }
-        const members = await dispatch(
-          readMember({ mode: "slugs", locale, slugs, output: "full" })
-        );
-        dispatch(actions_exports.setPreviews(members.results));
-        await Promise.all([
-          dispatch(readEntity("formatter", {})),
-          dispatch(readEntity("report", {
-            id: members.results.map((member) => member.report_id),
-            include: true,
-            locales: [locale]
-          }))
-        ]);
-        const state = store.getState();
-        const formatterList = selectFormatterList(state);
-        const formatters = funcifyFormattersByLocale(formatterList, locale);
-        const sectionList = selectSectionList(state).filter((s2) => s2.id === sectionId);
-        const blockRecords = selectBlockRecords(state);
-        const publicBlockRecords = { ...blockRecords };
-        let privateBlockIds = Object.values(blockRecords).reduce((acc, block2) => {
-          if ("access" in block2.settings && !["public", "guest"].some((grant) => !block2.settings.access || block2.settings.access.includes(grant))) {
-            acc.push(block2.id);
-          }
-          return acc;
-        }, []);
-        privateBlockIds = privateBlockIds.concat(crawlDown(privateBlockIds, Object.values(publicBlockRecords)));
-        privateBlockIds.forEach((privateBlockId) => {
-          delete publicBlockRecords[privateBlockId];
-        });
-        await dispatch(removeBlocksFromState(privateBlockIds));
-        const attributes = {
-          ...previewsToAttributes_default(members.results),
-          locale,
-          ...publicEnvVarsToAttributes_default()
-        };
-        const readMemberFn = async (innerParams) => await dispatch(readMember(innerParams));
-        await runConsumersV2(
-          publicBlockRecords,
-          sectionList,
-          void 0,
-          formatters,
-          {
-            locale,
-            query: { ...params, ...selectors },
-            variables: attributes
-          },
-          void 0,
-          readMemberFn,
-          "section"
-        ).then((data) => {
-          dispatch(variablesActions.setVariableChange({ ...data, attributes }));
-        });
-        const notSectionBlocks = Object.keys(publicBlockRecords).filter((bid) => publicBlockRecords[bid].section_id !== sectionId);
-        await dispatch(removeBlocksFromState(notSectionBlocks));
-        return {
-          props: {
-            buildTime
-          }
-        };
-      };
-    });
-  } catch (error) {
-    console.log("ERROR SSR", error);
-  }
-}
-
-export { BespokeEmbedServerSideProps, getSession_default as BespokeGetSession, handleAuth_default as BespokeHandleAuth, BespokeManagerServerSideProps, BespokeRendererStaticPaths, BespokeRendererStaticProps, searchUsersByMetadata_default as BespokeSearchUsersByMetadata, updateCurrentUserAppMetadata_default as BespokeUpdateCurrentUserAppMetadata, updateCurrentUserMetadata_default as BespokeUpdateCurrentUserMetadata, withApiRoleAuthRequired_default as BespokeWithApiRoleAuthRequired, crosswalk_default as ReportCrosswalkHandler, apiFactory as dbApiFactory, endpointKey, endpointNextJsHandlerFactory, getDB, useDatabaseApi };
+export { getSession_default as BespokeGetSession, handleAuth_default as BespokeHandleAuth, BespokeManagerServerSideProps, BespokeRendererStaticPaths, BespokeRendererStaticProps, searchUsersByMetadata_default as BespokeSearchUsersByMetadata, updateCurrentUserAppMetadata_default as BespokeUpdateCurrentUserAppMetadata, updateCurrentUserMetadata_default as BespokeUpdateCurrentUserMetadata, withApiRoleAuthRequired_default as BespokeWithApiRoleAuthRequired, crosswalk_default as ReportCrosswalkHandler, apiFactory as dbApiFactory, endpointKey, endpointNextJsHandlerFactory, getDB, useDatabaseApi };