@datawheel/bespoke 0.2.7 → 0.2.9

package/README.md

@@ -8,7 +8,6 @@ REPORTS_DB_CONNECTION="postgres://user:@localhost:5432/database"
 REPORTS_LOGGING=true
 NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT="en"
 NEXT_PUBLIC_REPORTS_LOCALES="en,es"
-REPORTS_DB_WIPE=false
 REPORTS_BASE_URL="http://localhost:3000"
 
 # Images
@@ -26,3 +25,20 @@ AUTH0_ISSUER_BASE_URL="https://xxxxxxx.auth0.com"
 AUTH0_CLIENT_ID="xxxxxxxxxxx"
 AUTH0_CLIENT_SECRET="xxxxxxxxxxx"
 ```
+
+### Environmental variables into Bespoke Report scope
+
+Just add this in your `nextjs.config.js`
+
+```
+publicRuntimeConfig: {
+  // Define your public environment variables for bespoke here
+  bespoke_report_env_vars: {
+      API: process.env.NEXT_PUBLIC_API || "N/A"
+      WHATEVER: "hello"
+  },
+  // ...
+},
+```
+
+And is gonna be offered as ENV_API and ENV_WHATEVER in the list of variables in the profile.

package/dist/index.js

@@ -9,6 +9,7 @@ import { assign, closest, merge, isObject } from 'd3plus-common';
 import { strip, titleCase } from 'd3plus-text';
 import yn3 from 'yn';
 import toposort from 'toposort';
+import getConfig from 'next/config';
 import { schema, normalize } from 'normalizr';
 import { createSlice, configureStore } from '@reduxjs/toolkit';
 import { HYDRATE, createWrapper } from 'next-redux-wrapper';
@@ -1591,6 +1592,23 @@ var init_previewsToAttributes = __esm({
     previewsToAttributes_default = previewsToAttributes;
   }
 });
+function publicEnvVarsToAttributes() {
+  const { publicRuntimeConfig } = getConfig();
+  const envList = publicRuntimeConfig.bespoke_report_env_vars || {};
+  return {
+    ...Object.keys(envList).reduce((acc, envKey) => {
+      acc[`ENV_${envKey}`] = envList[envKey] || "N/A";
+      return acc;
+    }, {})
+  };
+}
+var publicEnvVarsToAttributes_default;
+var init_publicEnvVarsToAttributes = __esm({
+  "libs/variables/publicEnvVarsToAttributes.ts"() {
+    init_esm_shims();
+    publicEnvVarsToAttributes_default = publicEnvVarsToAttributes;
+  }
+});
 
 // libs/ordering.ts
 function assertDev(expr) {
@@ -2542,7 +2560,8 @@ function recalculateVariables(resource, params) {
       dispatch(statusActions.setStatus(statusPayload));
     const attributes = {
       ...previewsToAttributes_default(previews),
-      locale: currentLocale
+      locale: currentLocale,
+      ...publicEnvVarsToAttributes_default()
     };
     const blockContext = {
       variables: attributes,
@@ -2678,6 +2697,7 @@ var init_actions = __esm({
     init_esm_shims();
     init_runConsumers();
     init_previewsToAttributes();
+    init_publicEnvVarsToAttributes();
     init_lib2();
     init_statusSlice();
     init_variablesSlice();
@@ -8071,7 +8091,7 @@ function Section({ section }) {
                             )
                           ] }),
                           idx + 1 < previews.length && /* @__PURE__ */ jsx(Divider, {})
-                        ] }, image.image_id)
+                        ] }, image.id)
                       ) })
                     ] })
                   ]
@@ -8537,6 +8557,12 @@ function DimensionAutocomplete({ id, locale, onSelect, initialSelection = void 0
       inputRef.current?.select();
     }
   }, [searchMode]);
+  useEffect(() => {
+    setQuery("");
+    onSelect(void 0);
+    setCurrentMember(void 0);
+    setSearchMode(true);
+  }, [locale]);
   const onSelectPreview = (previewMember) => {
     const fullMember = results.find((d) => d.id === previewMember.value);
     if (fullMember) {
@@ -9752,7 +9778,9 @@ function CMSHeader(props) {
             size: "xs",
             data: localeOptions,
             value: currentLocale,
-            onChange: (value) => dispatch(statusActions.setStatus({ currentLocale: value || localeDefault9 }))
+            onChange: (value) => dispatch(
+              statusActions.setStatus({ currentLocale: value || localeDefault9, previews: [] })
+            )
           }
         ),
         /* @__PURE__ */ jsx(Divider, { orientation: "vertical" }),
@@ -14391,12 +14419,14 @@ function BespokeRenderer({
   translations,
   bespokeStyles,
   buildTime,
-  profilePrefix = "/defaultPath"
+  profilePrefix = "/defaultPath",
+  loader = /* @__PURE__ */ jsx(LoadingOverlay, { visible: true }),
+  mantineProviderProps = {}
 }) {
   const loading = useInitialState(pathSegmentsKey);
   if (loading)
-    return /* @__PURE__ */ jsx(LoadingOverlay, { visible: true });
-  return /* @__PURE__ */ jsx(MantineProvider, { theme: { other: { bespokeStyles } }, inherit: true, children: /* @__PURE__ */ jsxs(ResourceProvider, { pathSegment: "bespoke", profilePrefix, children: [
+    return /* @__PURE__ */ jsx(Fragment, { children: loader });
+  return /* @__PURE__ */ jsx(MantineProvider, { ...mantineProviderProps, theme: { other: { bespokeStyles } }, inherit: true, children: /* @__PURE__ */ jsxs(ResourceProvider, { pathSegment: "bespoke", profilePrefix, children: [
     /* @__PURE__ */ jsx(TranslationsProvider, { translations, children: /* @__PURE__ */ jsx(Report_default, {}) }),
     /* @__PURE__ */ jsx("small", { children: buildTime })
   ] }) });

package/dist/server.js

@@ -2,7 +2,7 @@ import { initAuth0 } from '@auth0/nextjs-auth0';
 import auth0 from 'auth0';
 import * as pg from 'pg';
 import { Sequelize, Error as Error$1, fn, col, Op, DataTypes, QueryTypes, Model } from 'sequelize';
-import yn3 from 'yn';
+import yn2 from 'yn';
 import * as d3Array from 'd3-array';
 import * as d3Collection from 'd3-collection';
 import * as d3Format from 'd3-format';
@@ -26,6 +26,7 @@ import * as allIcons from '@tabler/icons-react';
 import NextCors from 'nextjs-cors';
 import formidable from 'formidable';
 import toposort from 'toposort';
+import getConfig from 'next/config';
 import { schema, normalize } from 'normalizr';
 import { createSlice, configureStore } from '@reduxjs/toolkit';
 import { HYDRATE, createWrapper } from 'next-redux-wrapper';
@@ -349,7 +350,7 @@ var searchUsersByMetadata2 = (key, value) => {
   });
 };
 var searchUsersByMetadata_default = searchUsersByMetadata2;
-var getLogging_default = (env = process.env) => yn3(env.REPORTS_LOGGING);
+var getLogging_default = (env = process.env) => yn2(env.REPORTS_LOGGING);
 var BlockModel = class extends Model {
   getContent(locale) {
     const content = this.contentByLocale.find((item) => item.locale === locale);
@@ -704,10 +705,6 @@ var libraries = {
   stats: stats_default
 };
 var declaredFormatters = {};
-var REPORT_TYPES = {
-  REPORT: "report",
-  STORY: "story"
-};
 var REPORT_MODES = {
   UNILATERAL: "uni",
   MULTILATERAL: "multi"
@@ -716,15 +713,6 @@ var SELECTOR_TYPES = {
   SINGLE: "single",
   MULTI: "multi"
 };
-var REPORT_FIELDS = {
-  TITLE: "title",
-  SUBTITLE: "subtitle",
-  LABEL: "label"
-};
-({
-  [REPORT_TYPES.REPORT]: Object.values(REPORT_FIELDS),
-  [REPORT_TYPES.STORY]: Object.values(REPORT_FIELDS)
-});
 var BLOCK_CONTENT_TYPES = {
   // AUTHOR: "author",
   // FOOTNOTE: "footnote",
@@ -1285,7 +1273,6 @@ var modelFactoryMap = {
 // db/index.ts
 var verbose = getLogging_default();
 var connectionString = process.env.REPORTS_DB_CONNECTION || "";
-var shouldWipe = yn3(process.env.REPORTS_DB_WIPE);
 if (!connectionString) {
   throw new Error(`
     Env var 'REPORTS_DB_CONNECTION' is not present.
@@ -1319,7 +1306,7 @@ var getDB = () => {
       `);
     }
     Object.values(modelFactoryMap).map((modelFactory) => modelFactory(sequelize)).map((modelAssociator) => modelAssociator({ ...sequelize.models, sequelize }));
-    global.sequelize = sequelize.sync({ force: shouldWipe }).catch((err) => {
+    global.sequelize = sequelize.sync().catch((err) => {
       if (err instanceof Error$1) {
         console.error(
           "=".repeat(40),
@@ -2708,7 +2695,7 @@ function endpointMemberFactory(operations) {
 }
 function parseReadMemberParams(query) {
   const locale = normalizeList(query.locale)[0] || localeDefault3 || "en";
-  const all = locale === "all" || yn3(query.all);
+  const all = locale === "all" || yn2(query.all);
   const mode = normalizeList(query.mode)[0];
   const outputParam = normalizeList(query.output)[0] || "full";
   const output = outputParam === "lite" ? "lite" : "full";
@@ -2787,9 +2774,9 @@ function parseSearchMemberParams(query) {
     locale: localeIsAll ? localeDefault3 : locale,
     limit: normalizeList(query.limit).map(parseFiniteNumber)[0] ?? 5,
     format: formatIsNested ? "nested" : "plain",
-    includes: yn3(query.includes, { default: true }),
-    visible: yn3(query.visible, { default: true }),
-    noImage: yn3(query.noImage, { default: false }),
+    includes: yn2(query.includes, { default: true }),
+    visible: yn2(query.visible, { default: true }),
+    noImage: yn2(query.noImage, { default: false }),
     variant,
     dimension,
     report,
@@ -3412,7 +3399,7 @@ function endpointCRUDFactory(api, entity) {
     endpoint("GET", `read/${entity}`, (req) => {
       const params = req.query;
       const id = normalizeList(params.id).map(parseFiniteNumber);
-      return crudRead({ id, include: yn3(params.include) });
+      return crudRead({ id, include: yn2(params.include) });
     }),
     endpoint("POST", `update/${entity}`, (req) => {
       const { body } = req;
@@ -4019,7 +4006,7 @@ function parseBlockContext(context) {
     locale: context.locale || localeDefault6
   };
 }
-var verbose4 = yn3(process.env.REPORTS_LOGGING);
+var verbose4 = yn2(process.env.REPORTS_LOGGING);
 var mortarEval_default = mortarEval;
 function mortarEval(varInnerName, varOuterValue, logic, formatterFunctions, attributes = void 0, blockContext) {
   const vars = {};
@@ -4234,7 +4221,7 @@ var getRootBlocksForSection_default = getRootBlocksForSection;
 
 // libs/consts.ts
 var apiSeparator = "|||";
-var debug = yn3(process.env.NEXT_PUBLIC_REPORTS_DEBUG);
+var debug = yn2(process.env.NEXT_PUBLIC_REPORTS_DEBUG);
 var ORIGIN = process.env.REPORTS_ORIGIN || "";
 axios5.interceptors.request.use((config) => ({
   ...config,
@@ -4734,6 +4721,17 @@ function previewsToAttributes(previews = []) {
   }, {});
 }
 var previewsToAttributes_default = previewsToAttributes;
+function publicEnvVarsToAttributes() {
+  const { publicRuntimeConfig } = getConfig();
+  const envList = publicRuntimeConfig.bespoke_report_env_vars || {};
+  return {
+    ...Object.keys(envList).reduce((acc, envKey) => {
+      acc[`ENV_${envKey}`] = envList[envKey] || "N/A";
+      return acc;
+    }, {})
+  };
+}
+var publicEnvVarsToAttributes_default = publicEnvVarsToAttributes;
 function comparePositions(firstPos, secondPos) {
   return +(firstPos < secondPos) - +(firstPos > secondPos);
 }
@@ -5456,7 +5454,8 @@ function recalculateVariables(resource, params) {
       dispatch(statusActions.setStatus(statusPayload));
     const attributes = {
       ...previewsToAttributes_default(previews),
-      locale: currentLocale
+      locale: currentLocale,
+      ...publicEnvVarsToAttributes_default()
     };
     const blockContext = {
       variables: attributes,
@@ -5764,7 +5763,8 @@ function BespokeRendererStaticProps(options) {
         await dispatch(removeBlocksFromState(privateBlockIds));
         const attributes = {
           ...previewsToAttributes_default(members.results),
-          locale
+          locale,
+          ...publicEnvVarsToAttributes_default()
         };
         const readMemberFn = async (innerParams) => await dispatch(readMember(innerParams));
         await runConsumersV2(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -42,14 +42,14 @@
     "@auth0/nextjs-auth0": "^2.4.0",
     "@emotion/react": "^11.10.4",
     "@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",
+    "@mantine/core": "^6.0.19",
+    "@mantine/dates": "^6.0.19",
+    "@mantine/dropzone": "^6.0.19",
+    "@mantine/form": "^6.0.19",
+    "@mantine/hooks": "^6.0.19",
+    "@mantine/next": "^6.0.19",
+    "@mantine/notifications": "^6.0.19",
+    "@mantine/prism": "^6.0.19",
     "@monaco-editor/react": "^4.4.5",
     "@reduxjs/toolkit": "^1.8.4",
     "@tabler/icons-react": "^2.15.0",