Merge pull request #956 from Cuiyansong/master

fix(view): save view model version

Author: scottsut

frontend/src/app/migration/constants.ts

@@ -32,3 +32,5 @@ export const APP_SEMANTIC_VERSIONS = [
   APP_VERSION_BETA_1,
   APP_VERSION_BETA_2,
 ];
+export const APP_CURRENT_VERSION =
+  APP_SEMANTIC_VERSIONS[APP_SEMANTIC_VERSIONS.length - 1];

frontend/src/app/pages/MainPage/pages/ViewPage/Main/Outputs/Results.tsx

@@ -24,6 +24,7 @@ import {
 import { Tooltip } from 'antd';
 import { Popup, ToolbarButton, Tree } from 'app/components';
 import useI18NPrefix from 'app/hooks/useI18NPrefix';
+import { APP_CURRENT_VERSION } from 'app/migration/constants';
 import classnames from 'classnames';
 import { memo, useCallback, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
@@ -108,6 +109,7 @@ export const Results = memo(({ height = 0, width = 0 }: ResultsProps) => {
             model: {
               ...model,
               hierarchy: clonedHierarchyModel,
+              version: APP_CURRENT_VERSION,
             },
           }),
         );

frontend/src/app/pages/MainPage/pages/ViewPage/Main/Properties/DataModelTree/DataModelTree.tsx

@@ -21,6 +21,7 @@ import { Form, Input, Select, Tooltip } from 'antd';
 import { Popup, ToolbarButton, Tree } from 'app/components';
 import useI18NPrefix from 'app/hooks/useI18NPrefix';
 import useStateModal, { StateModalSize } from 'app/hooks/useStateModal';
+import { APP_CURRENT_VERSION } from 'app/migration/constants';
 import { selectRoles } from 'app/pages/MainPage/pages/MemberPage/slice/selectors';
 import { SubjectTypes } from 'app/pages/MainPage/pages/PermissionPage/constants';
 import classnames from 'classnames';
@@ -206,6 +207,7 @@ const DataModelTree: FC = memo(() => {
         model: {
           ...currentEditingView?.model,
           hierarchy,
+          version: APP_CURRENT_VERSION,
         },
       }),
     );

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

@@ -18,10 +18,12 @@
 
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import sqlReservedWords from 'app/assets/javascripts/sqlReservedWords';
+import { APP_CURRENT_VERSION } from 'app/migration/constants';
 import { migrateViewConfig } from 'app/migration/ViewConfig/migrationViewDetailConfig';
 import beginViewModelMigration from 'app/migration/ViewConfig/migrationViewModelConfig';
 import { selectOrgId } from 'app/pages/MainPage/slice/selectors';
 import i18n from 'i18next';
+import produce from 'immer';
 import { monaco } from 'react-monaco-editor';
 import { RootState } from 'types';
 import { request, request2 } from 'utils/request';
@@ -200,11 +202,11 @@ export const saveView = createAsyncThunk<
   SaveViewParams,
   { state: RootState }
 >('view/saveView', async ({ resolve, isSaveAs, currentView }, { getState }) => {
-  const currentEditingView = isSaveAs
+  let currentEditingView = isSaveAs
     ? (currentView as ViewViewModel)
     : (selectCurrentEditingView(getState()) as ViewViewModel);
   const orgId = selectOrgId(getState());
-
+ 
   try {
     if (isNewView(currentEditingView.id) || isSaveAs) {
       const { data } = await request<View>({

frontend/src/app/pages/MainPage/pages/ViewPage/utils.tsx

@@ -17,6 +17,7 @@
  */
 
 import { TreeDataNode } from 'antd';
+import { APP_CURRENT_VERSION } from 'app/migration/constants';
 import { FONT_WEIGHT_MEDIUM, SPACE_UNIT } from 'styles/StyleConstants';
 import { Nullable } from 'types';
 import { isEmptyArray } from 'utils/object';
@@ -47,7 +48,9 @@ export function generateEditingView(
     index: null,
     script: '',
     config: {},
-    model: {},
+    model: {
+      version: APP_CURRENT_VERSION,
+    },
     originVariables: [],
     variables: [],
     originColumnPermissions: [],
@@ -117,7 +120,10 @@ export function transformQueryResultToModelAndDataSource(
       {},
     ),
   );
-  return { model: { ...lastModel, columns: newColumns }, dataSource };
+  return {
+    model: { ...lastModel, columns: newColumns },
+    dataSource,
+  };
 }
 
 export function getHierarchyColumn(

frontend/src/app/utils/internalChartHelper.ts

@@ -381,9 +381,10 @@ export function transformMeta(model?: string) {
     return undefined;
   }
   const jsonObj = JSON.parse(model);
-  return Object.keys(jsonObj).flatMap(colKey => {
-    const column = jsonObj[colKey];
-    if (!isEmptyArray(column.children)) {
+  const HierarchyModel = 'hierarchy' in jsonObj ? jsonObj.hierarchy : jsonObj;
+  return Object.keys(HierarchyModel || {}).flatMap(colKey => {
+    const column = HierarchyModel[colKey];
+    if (!isEmptyArray(column?.children)) {
       return column.children.map(c => ({
         ...c,
         id: c.name,