fix(chart): fix merge chart data view hierarchy issue

Author: Cuiyansong

frontend/src/app/pages/ChartWorkbenchPage/slice/thunks.ts

@@ -25,7 +25,7 @@ import { ChartDTO } from 'app/types/ChartDTO';
 import { View } from 'app/types/View';
 import {
   buildUpdateChartRequest,
-  convertToChartDTO2,
+  convertToChartDto,
 } from 'app/utils/ChartDtoHelper';
 import { filterSqlOperatorName } from 'app/utils/internalChartHelper';
 import { request2 } from 'utils/request';
@@ -220,7 +220,7 @@ export const fetchChartAction = createAsyncThunk<
       method: 'GET',
       url: `viz/datacharts/${arg.chartId}`,
     });
-    return convertToChartDTO2(response?.data);
+    return convertToChartDto(response?.data);
   }
   return arg.backendChart as any;
 });

frontend/src/app/pages/MainPage/pages/VizPage/slice/thunks.ts

@@ -27,7 +27,7 @@ import { getLoggedInUserPermissions } from 'app/pages/MainPage/slice/thunks';
 import { StoryBoard } from 'app/pages/StoryBoardPage/slice/types';
 import { IChartDrillOption } from 'app/types/ChartDrillOption';
 import { ChartDTO } from 'app/types/ChartDTO';
-import { convertToChartDTO } from 'app/utils/ChartDtoHelper';
+import { convertToChartDto } from 'app/utils/ChartDtoHelper';
 import { filterSqlOperatorName } from 'app/utils/internalChartHelper';
 import { RootState } from 'types';
 import { request2 } from 'utils/request';
@@ -263,7 +263,7 @@ export const fetchVizChartAction = createAsyncThunk(
       url: `viz/datacharts/${arg.backendChartId}`,
     });
     return {
-      data: convertToChartDTO(response?.data),
+      data: convertToChartDto(response?.data),
       filterSearchParams: arg.filterSearchParams,
     };
   },

frontend/src/app/pages/SharePage/slice/thunks.ts

@@ -29,7 +29,7 @@ import {
 import { handleServerStoryAction } from 'app/pages/StoryBoardPage/slice/actions';
 import { ServerStoryBoard } from 'app/pages/StoryBoardPage/slice/types';
 import { IChartDrillOption } from 'app/types/ChartDrillOption';
-import { convertToChartDTO } from 'app/utils/ChartDtoHelper';
+import { convertToChartDto } from 'app/utils/ChartDtoHelper';
 import { RootState } from 'types';
 import persistence from 'utils/persistence';
 import { request2 } from 'utils/request';
@@ -99,7 +99,7 @@ export const fetchShareVizInfo = createAsyncThunk(
       case 'DATACHART':
         const shareVizInfo = {
           ...data,
-          vizDetail: convertToChartDTO(data.vizDetail),
+          vizDetail: convertToChartDto(data.vizDetail),
         };
         thunkAPI.dispatch(
           shareActions.setDataChart({ data: shareVizInfo, filterSearchParams }),

frontend/src/app/utils/ChartDtoHelper.ts

@@ -16,28 +16,21 @@
  * limitations under the License.
  */
 
+import beginViewModelMigration from 'app/migration/ViewConfig/migrationViewModelConfig';
 import { ChartConfig, ChartStyleConfig } from 'app/types/ChartConfig';
 import { ChartConfigDTO, ChartDetailConfigDTO } from 'app/types/ChartConfigDTO';
 import { ChartDTO } from 'app/types/ChartDTO';
 import {
   mergeChartDataConfigs,
   mergeChartStyleConfigs,
   transformHierarchyMeta,
-  transformMeta,
 } from 'app/utils/internalChartHelper';
 import { Omit } from 'utils/object';
 
-export function convertToChartDTO(data): ChartDTO {
-  return Object.assign({}, data, {
-    config: JSON.parse(data?.config),
-    view: {
-      ...Omit(data?.view, ['model']),
-      meta: transformMeta(data?.view?.model),
-    },
-  });
-}
-
-export function convertToChartDTO2(data): ChartDTO {
+export function convertToChartDto(data): ChartDTO {
+  if (data?.view?.model) {
+    data.view.model = beginViewModelMigration(data.view.model);
+  }
   return Object.assign({}, data, {
     config: JSON.parse(data?.config),
     view: {

frontend/src/app/utils/__tests__/chartDtoHelper.test.ts

@@ -19,7 +19,7 @@
 import {
   buildUpdateChartRequest,
   convertToChartConfigDTO,
-  convertToChartDTO,
+  convertToChartDto,
   mergeToChartConfig,
 } from '../ChartDtoHelper';
 
@@ -31,11 +31,19 @@ describe('chartDtoHelper Test', () => {
         model: JSON.stringify({ name: 2 }),
       },
     };
-    const dto = convertToChartDTO(data);
+    const dto = convertToChartDto(data);
     expect(dto).toEqual({
       config: { id: 1 },
       view: {
-        meta: [{ id: 'name', category: 'field' }],
+        meta: [
+          {
+            name: 'name',
+            id: 'name',
+            subType: undefined,
+            category: 'field',
+            children: undefined,
+          },
+        ],
       },
     });
   });