fix: Variable reference error issue #2249

running-elephant · Sep 27, 2023 · 04c3908 · 04c3908
1 parent cc96213
commit 04c3908
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/frontend/src/app/migration/BoardConfig/migrateWidgetChartConfig.ts b/frontend/src/app/migration/BoardConfig/migrateWidgetChartConfig.ts
@@ -28,6 +28,14 @@ const migrateWidgetChartConfig = (widgets: Widget[]): Widget[] => {
   }
   return widgets
     .map(widget => {
+      // ------------------------------------------------
+      // FIXME 1.0.0-rc.3 hotfix, will remove in next version.
+      if (typeof widget?.config?.content?.dataChart?.config === 'string') {
+        widget.config.content.dataChart.config = JSON.parse(
+          widget.config.content.dataChart.config,
+        );
+      }
+      // ------------------------------------------------
       if (widget?.config?.content?.dataChart?.config) {
         const event_rc_2 = new MigrationEvent(APP_VERSION_RC_2, RC2);
         const dispatcher_rc_2 = new MigrationEventDispatcher(event_rc_2);

diff --git a/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/slice/thunk.ts b/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/slice/thunk.ts
@@ -269,7 +269,7 @@ export const addDataChartWidgets = createAsyncThunk<
   'editBoard/addDataChartWidgets',
   async ({ boardId, chartIds, boardType }, { getState, dispatch }) => {
     const {
-      data: { datacharts, views, viewVariables },
+      data: { datacharts: serverDataCharts, views, viewVariables },
     } = await request2<{
       datacharts: ServerDatachart[];
       views: View[];
@@ -278,13 +278,17 @@ export const addDataChartWidgets = createAsyncThunk<
       url: `viz/datacharts?datachartIds=${chartIds.join()}`,
       method: 'get',
     });
-    const dataCharts: DataChart[] = getDataChartsByServer(datacharts, views);
-    const dashboardDataChartMap = datacharts.reduce<
-      Record<string, ServerDatachart>
-    >((acc, cur) => {
-      acc[cur.id] = cur;
-      return acc;
-    }, {});
+    const dataCharts: DataChart[] = getDataChartsByServer(
+      serverDataCharts,
+      views,
+    );
+    const dashboardDataChartMap = dataCharts.reduce<Record<string, DataChart>>(
+      (acc, cur) => {
+        acc[cur.id] = cur;
+        return acc;
+      },
+      {},
+    );
     const viewViews = getChartDataView(views, dataCharts);
     dispatch(
       boardActions.setDataChartToMap({ dashboardId: boardId, dataCharts }),