Merge pull request #1229 from scottsut/folder

fix(View): failed to change column type on new view

Author: scottsut

frontend/src/app/pages/MainPage/pages/ViewPage/Main/Editor/Toolbar.tsx

@@ -263,9 +263,9 @@ export const Toolbar = memo(({ allowManage, allowEnableViz }: ToolbarProps) => {
           />
         </Space>
       </Operates>
-      {allowManage && (
-        <Actions>
-          <Space>
+      <Actions>
+        <Space>
+          {allowManage && (
             <Tooltip
               title={
                 <TipTitle
@@ -281,18 +281,18 @@ export const Toolbar = memo(({ allowManage, allowEnableViz }: ToolbarProps) => {
                 onClick={onSave}
               />
             </Tooltip>
-
-            {!isNewView(id) && (
-              <Tooltip title={t('info')} placement="bottom">
-                <ToolbarButton
-                  icon={<SettingFilled />}
-                  disabled={isArchived}
-                  color={INFO}
-                  onClick={showEdit}
-                />
-              </Tooltip>
-            )}
-
+          )}
+          {allowManage && (
+            <Tooltip title={t('info')} placement="bottom">
+              <ToolbarButton
+                icon={<SettingFilled />}
+                disabled={isArchived || isNewView(id)}
+                color={INFO}
+                onClick={showEdit}
+              />
+            </Tooltip>
+          )}
+          {allowManage && (
             <Tooltip title={t('saveAs')} placement="bottom">
               <ToolbarButton
                 icon={<CopyFilled />}
@@ -301,24 +301,24 @@ export const Toolbar = memo(({ allowManage, allowEnableViz }: ToolbarProps) => {
                 color={INFO}
               />
             </Tooltip>
-            {/* <Tooltip title={t('saveFragment')} placement="bottom">
+          )}
+          {/* <Tooltip title={t('saveFragment')} placement="bottom">
             <ToolbarButton icon={<SnippetsFilled />} />
           </Tooltip> */}
-          </Space>
-        </Actions>
-      )}
-      {allowEnableViz && (
-        <Tooltip title={t('startAnalysis')} placement="bottom">
-          <ToolbarButton
-            disabled={isNewView(id)}
-            icon={<MonitorOutlined />}
-            color={INFO}
-            onClick={() => {
-              startAnalysis(id);
-            }}
-          />
-        </Tooltip>
-      )}
+          {allowEnableViz && (
+            <Tooltip title={t('startAnalysis')} placement="bottom">
+              <ToolbarButton
+                disabled={isNewView(id)}
+                icon={<MonitorOutlined />}
+                color={INFO}
+                onClick={() => {
+                  startAnalysis(id);
+                }}
+              />
+            </Tooltip>
+          )}
+        </Space>
+      </Actions>
     </Container>
   );
 });

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

@@ -108,6 +108,7 @@ export function transformQueryResultToModelAndDataSource(
     return {
       ...obj,
       [name]: {
+        name,
         type: hierarchyColumn?.type || type,
         primaryKey,
         category: hierarchyColumn?.category || ColumnCategories.Uncategorized, // FIXME: model 重构时一起改