fix: Migrate chart config in getConfig to also include embed mode

visualize-admin · Oct 4, 2022 · 49bec03 · 49bec03
1 parent e622aae
commit 49bec03
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/db/config.ts b/app/db/config.ts
@@ -1,3 +1,5 @@
+import { migrateChartConfig } from "@/utils/chart-config/versioning";
+
 import { createChartId } from "../utils/create-chart-id";
 
 import { pool } from "./pg-pool";
@@ -37,7 +39,19 @@ export const getConfig = async (
     [key]
   );
 
-  return result.rows[0];
+  const config = result.rows[0];
+
+  if (config && config.data) {
+    return {
+      ...config,
+      data: {
+        ...config.data,
+        chartConfig: migrateChartConfig(config.data.chartConfig),
+      },
+    };
+  }
+
+  return config;
 };
 
 /**

diff --git a/app/pages/v/[chartId].tsx b/app/pages/v/[chartId].tsx
@@ -15,7 +15,6 @@ import { PublishActions } from "@/components/publish-actions";
 import { Config } from "@/configurator";
 import { getConfig } from "@/db/config";
 import { useLocale } from "@/locales/use-locale";
-import { migrateChartConfig } from "@/utils/chart-config/versioning";
 
 type PageProps =
   | {
@@ -37,18 +36,7 @@ export const getServerSideProps: GetServerSideProps<PageProps> = async ({
 
   if (config && config.data) {
     // TODO validate configuration
-    return {
-      props: {
-        status: "found",
-        config: {
-          ...config,
-          data: {
-            ...config.data,
-            chartConfig: migrateChartConfig(config.data.chartConfig),
-          },
-        },
-      },
-    };
+    return { props: { status: "found", config } };
   }
 
   res.statusCode = 404;