diff --git a/dinky-web/config/routes.ts b/dinky-web/config/routes.ts index b8898552b2..9c7b6976bd 100644 --- a/dinky-web/config/routes.ts +++ b/dinky-web/config/routes.ts @@ -62,7 +62,7 @@ export default [ name: 'datastudio', icon: 'CodeOutlined', footerRender: false, - component: './DataStudioNew' + component: './DataStudio' }, { path: '/devops', diff --git a/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx b/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx index bdb614285a..365b97edce 100644 --- a/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx +++ b/dinky-web/src/components/CustomEditor/CodeEdit/index.tsx @@ -28,7 +28,7 @@ import { Editor, loader, Monaco, OnChange } from '@monaco-editor/react'; import { connect } from '@umijs/max'; import useMemoCallback from 'rc-menu/es/hooks/useMemoCallback'; import { memo, useCallback, useContext, useRef } from 'react'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { DataStudioState } from '@/pages/DataStudio/model'; import ITextModel = editor.ITextModel; import CompletionItem = languages.CompletionItem; import CompletionContext = languages.CompletionContext; @@ -36,7 +36,7 @@ import CompletionList = languages.CompletionList; import ProviderResult = languages.ProviderResult; import LanguageSelector = languages.LanguageSelector; import { DevopsContext } from '@/pages/DevOps'; -import { DataStudioContext, DataStudioContextType } from '@/pages/DataStudioNew/DataStudioContext'; +import { DataStudioContext, DataStudioContextType } from '@/pages/DataStudio/DataStudioContext'; loader.config({ monaco }); diff --git a/dinky-web/src/pages/DataStudioNew/Algorithm.ts b/dinky-web/src/pages/DataStudio/Algorithm.ts similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Algorithm.ts rename to dinky-web/src/pages/DataStudio/Algorithm.ts diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/DataSourceDetail.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/DataSourceDetail.tsx similarity index 91% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/DataSourceDetail.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/DataSourceDetail.tsx index f2c9df9c7b..c4dc51f9fb 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/DataSourceDetail.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/DataSourceDetail.tsx @@ -17,11 +17,11 @@ * */ -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; import RightTagsRouter from '@/pages/RegCenter/DataSource/components/DataSourceDetail/RightTagsRouter'; import { QueryParams } from '@/pages/RegCenter/DataSource/components/DataSourceDetail/RightTagsRouter/data'; import { connect } from '@@/exports'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; const DataSourceDetail = (props: CenterTab) => { const { params } = props; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/KeyBoard/constant.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/KeyBoard/constant.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/KeyBoard/constant.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/KeyBoard/constant.tsx diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/KeyBoard/index.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/KeyBoard/index.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/KeyBoard/index.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/KeyBoard/index.tsx index ed99a8db8d..1a11caac34 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/KeyBoard/index.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/KeyBoard/index.tsx @@ -20,7 +20,7 @@ import { l } from '@/utils/intl'; import { Divider, Typography } from 'antd'; import { Fragment } from 'react'; -import { KEY_BOARD_MIDDLE } from '@/pages/DataStudioNew/CenterTabContent/KeyBoard/constant'; +import { KEY_BOARD_MIDDLE } from '@/pages/DataStudio/CenterTabContent/KeyBoard/constant'; const { Title, Paragraph, Text } = Typography; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/QuickGuide/constant.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/QuickGuide/constant.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/QuickGuide/constant.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/QuickGuide/constant.tsx diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/QuickGuide/index.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/QuickGuide/index.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/QuickGuide/index.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/QuickGuide/index.tsx index eb6120b3f2..4c62df94c4 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/QuickGuide/index.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/QuickGuide/index.tsx @@ -21,7 +21,7 @@ import { l } from '@/utils/intl'; import { Link } from '@umijs/max'; import { Divider, Typography } from 'antd'; import { Fragment } from 'react'; -import { QUICK_GUIDE } from '@/pages/DataStudioNew/CenterTabContent/QuickGuide/constant'; +import { QUICK_GUIDE } from '@/pages/DataStudio/CenterTabContent/QuickGuide/constant'; const { Title, Paragraph } = Typography; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectDb.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectDb.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectDb.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectDb.tsx index a2feefc0d2..60c43208a7 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectDb.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectDb.tsx @@ -23,7 +23,7 @@ import { TagAlignLeft } from '@/components/StyledComponents'; import { Tag } from 'antd'; import { ProFormSelect } from '@ant-design/pro-components'; import { l } from '@/utils/intl'; -import { TaskState, TempData } from '@/pages/DataStudioNew/type'; +import { TaskState, TempData } from '@/pages/DataStudio/type'; export default (props: { databaseDataList: TempData['dataSourceDataList']; data: TaskState }) => { const dataSourceData: Record = {}; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx index 33f1e56434..a13d9e6cb8 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkEnv.tsx @@ -22,7 +22,7 @@ import { l } from '@/utils/intl'; import { ProFormSelect } from '@ant-design/pro-components'; import '../index.less'; -import { EnvType } from '@/pages/DataStudioNew/type'; +import { EnvType } from '@/pages/DataStudio/type'; export const SelectFlinkEnv = memo((params: { flinkEnv: EnvType[] }) => { const { flinkEnv } = params; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx index ca0134b298..cd09c023fe 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkRunMode.tsx @@ -20,7 +20,7 @@ import { ProFormCascader } from '@ant-design/pro-form/lib'; import { CascaderProps, Tag } from 'antd'; import { DefaultOptionType } from 'antd/es/select'; -import { FlinkCluster } from '@/pages/DataStudioNew/type'; +import { FlinkCluster } from '@/pages/DataStudio/type'; import { memo } from 'react'; type Option = { diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/DiffModal.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/DiffModal.tsx similarity index 98% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/DiffModal.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/DiffModal.tsx index d51624a1cd..f563f512b9 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/DiffModal.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/DiffModal.tsx @@ -29,7 +29,7 @@ import styles from '../index.less'; import { DIFF_EDITOR_PARAMS, PARAM_DIFF_TABLE_COL -} from '@/pages/DataStudioNew/CenterTabContent/SqlTask/constants'; +} from '@/pages/DataStudio/CenterTabContent/SqlTask/constants'; loader.config({ monaco }); diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/HistoryVersion.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/HistoryVersion.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/HistoryVersion.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/HistoryVersion.tsx diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx similarity index 92% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx index 253e928d0d..e977a06a6a 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/BasicConfig.tsx @@ -29,14 +29,14 @@ import { l } from '@/utils/intl'; import { InfoCircleOutlined } from '@ant-design/icons'; import { SWITCH_OPTIONS } from '@/services/constants'; import { ProFormDependency } from '@ant-design/pro-form'; -import { ProFormFlinkConfig } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig'; -import { ProFormFlinkUdfConfig } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig'; +import { ProFormFlinkConfig } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig'; +import { ProFormFlinkUdfConfig } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig'; import React, { useEffect, useRef, useState } from 'react'; -import { TaskState, TempData } from '@/pages/DataStudioNew/type'; +import { TaskState, TempData } from '@/pages/DataStudio/type'; import { JOB_LIFE_CYCLE } from '@/pages/DevOps/constants'; import { Alert } from 'antd'; -import { SAVE_POINT_TYPE } from '@/pages/DataStudioNew/constants'; -import { buildAlertGroupOptions } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/function'; +import { SAVE_POINT_TYPE } from '@/pages/DataStudio/constants'; +import { buildAlertGroupOptions } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/function'; export const BasicConfig = (props: { tempData: TempData; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx index 67fab6c807..ea3e997256 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkConfig.tsx @@ -25,7 +25,7 @@ import FlinkOptionsSelect from '@/components/Flink/OptionsSelect'; import React, { useState } from 'react'; import { DefaultOptionType } from 'antd/es/select'; import CodeShow from '@/components/CustomEditor/CodeShow'; -import { calculatorWidth } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/function'; +import { calculatorWidth } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/function'; export const ProFormFlinkConfig = (props: { containerWidth: number; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx index a4d62ce161..9752579122 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/ProFormFlinkUdfConfig.tsx @@ -29,8 +29,8 @@ import FlinkUdfOptionsSelect from '@/components/Flink/UdfSelect'; import React, { useState } from 'react'; import { DefaultOptionType } from 'antd/es/select'; import { TaskUdfRefer } from '@/types/Studio/data'; -import { calculatorWidth } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/function'; -import {TaskState} from "@/pages/DataStudioNew/type"; +import { calculatorWidth } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/function'; +import { TaskState } from '@/pages/DataStudioNew/type'; export const ProFormFlinkUdfConfig = (props: { containerWidth: number; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/function.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/function.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/function.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/function.tsx diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/index.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/index.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/index.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/index.tsx index 644c019a1f..560ee2e5e1 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/index.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/index.tsx @@ -29,9 +29,9 @@ import { l } from '@/utils/intl'; import React from 'react'; import { InfoCircleOutlined } from '@ant-design/icons'; import { DIALECT, SWITCH_OPTIONS } from '@/services/constants'; -import { TaskState, TempData } from '@/pages/DataStudioNew/type'; -import { BasicConfig } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig/BasicConfig'; -import { isSql, assert } from '@/pages/DataStudioNew/utils'; +import { TaskState, TempData } from '@/pages/DataStudio/type'; +import { BasicConfig } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig/BasicConfig'; +import { isSql, assert } from '@/pages/DataStudio/utils'; import { DataSources } from '@/types/RegCenter/data'; import { TagAlignLeft } from '@/components/StyledComponents'; import { JOB_LIFE_CYCLE } from '@/pages/DevOps/constants'; diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskInfo.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskInfo.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskInfo.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskInfo.tsx index 5967e5bd32..f6c2bd6e7e 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/TaskInfo.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/TaskInfo.tsx @@ -20,8 +20,8 @@ import { l } from '@/utils/intl'; import { Descriptions } from 'antd'; import Paragraph from 'antd/es/typography/Paragraph'; -import { TaskState } from '@/pages/DataStudioNew/type'; -import { showFirstLevelOwner, showSecondLevelOwners } from '@/pages/DataStudioNew/function'; +import { TaskState } from '@/pages/DataStudio/type'; +import { showFirstLevelOwner, showSecondLevelOwners } from '@/pages/DataStudio/function'; import { UserBaseInfo } from '@/types/AuthCenter/data'; export const TaskInfo = (props: { params: TaskState; users: UserBaseInfo.User[] }) => { diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/constants.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/constants.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/constants.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/constants.tsx diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/index.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/index.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx index d8461a084f..d31c5af470 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/SqlTask/index.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx @@ -17,7 +17,7 @@ * */ -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; import { Button, Col, Divider, Flex, Row, Skeleton, TabsProps } from 'antd'; import '../index.less'; import React, { memo, useCallback, useEffect, useRef, useState } from 'react'; @@ -43,17 +43,17 @@ import { SafetyCertificateOutlined, SaveOutlined } from '@ant-design/icons'; -import RunToolBarButton from '@/pages/DataStudioNew/components/RunToolBarButton'; +import RunToolBarButton from '@/pages/DataStudio/components/RunToolBarButton'; import { connect, useModel } from '@umijs/max'; -import CusPanelResizeHandle from '@/pages/DataStudioNew/components/CusPanelResizeHandle'; +import CusPanelResizeHandle from '@/pages/DataStudio/components/CusPanelResizeHandle'; import { ProForm, ProFormInstance } from '@ant-design/pro-components'; import { useAsyncEffect, useFullscreen } from 'ahooks'; -import { SelectFlinkEnv } from '@/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkEnv'; -import { SelectFlinkRunMode } from '@/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectFlinkRunMode'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; -import { TaskInfo } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskInfo'; -import { HistoryVersion } from '@/pages/DataStudioNew/CenterTabContent/SqlTask/HistoryVersion'; -import { FlinkTaskRunType, StudioLineageParams, TaskState } from '@/pages/DataStudioNew/type'; +import { SelectFlinkEnv } from '@/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkEnv'; +import { SelectFlinkRunMode } from '@/pages/DataStudio/CenterTabContent/RunToolbar/SelectFlinkRunMode'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; +import { TaskInfo } from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskInfo'; +import { HistoryVersion } from '@/pages/DataStudio/CenterTabContent/SqlTask/HistoryVersion'; +import { FlinkTaskRunType, StudioLineageParams, TaskState } from '@/pages/DataStudio/type'; import { JOB_LIFE_CYCLE } from '@/pages/DevOps/constants'; import { debounce } from 'lodash'; import { @@ -64,22 +64,22 @@ import { explainSql, getJobPlan, getTaskDetails -} from '@/pages/DataStudioNew/service'; +} from '@/pages/DataStudio/service'; import { l } from '@/utils/intl'; import { editor } from 'monaco-editor'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; import { getDataByParams, handlePutDataJson, queryDataByParams } from '@/services/BusinessCrud'; import { API_CONSTANTS } from '@/services/endpoints'; import { Jobs, LineageDetailInfo } from '@/types/DevOps/data'; -import { isStatusDone, lockTask, matchLanguage } from '@/pages/DataStudioNew/function'; +import { isStatusDone, lockTask, matchLanguage } from '@/pages/DataStudio/function'; import { PushpinIcon } from '@/components/Icons/CustomIcons'; -import { assert, isSql } from '@/pages/DataStudioNew/utils'; +import { assert, isSql } from '@/pages/DataStudio/utils'; import { DIALECT } from '@/services/constants'; import { SysConfigStateType } from '@/pages/SettingCenter/GlobalSetting/model'; import CodeEdit from '@/components/CustomEditor/CodeEdit'; -import DiffModal from '@/pages/DataStudioNew/CenterTabContent/SqlTask/DiffModal'; -import TaskConfig from '@/pages/DataStudioNew/CenterTabContent/SqlTask/TaskConfig'; -import SelectDb from '@/pages/DataStudioNew/CenterTabContent/RunToolbar/SelectDb'; +import DiffModal from '@/pages/DataStudio/CenterTabContent/SqlTask/DiffModal'; +import TaskConfig from '@/pages/DataStudio/CenterTabContent/SqlTask/TaskConfig'; +import SelectDb from '@/pages/DataStudio/CenterTabContent/RunToolbar/SelectDb'; export type FlinkSqlProps = { showDesc: boolean; @@ -418,13 +418,18 @@ export const SqlTask = memo((props: FlinkSqlProps & any) => { params: { taskId: params.taskId, columns: res.data?.result?.columns ?? [], - rowData: res.data?.result?.rowData ?? [], + rowData: res.data?.result?.rowData ?? [] } }); setCurrentState((prevState) => { return { ...prevState, - status: res.data.status === 'SUCCESS' ? (res.data.pipeline?'RUNNING':'SUCCESS') : res.data.status + status: + res.data.status === 'SUCCESS' + ? res.data.pipeline + ? 'RUNNING' + : 'SUCCESS' + : res.data.status }; }); } diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/StartIntroPage.tsx b/dinky-web/src/pages/DataStudio/CenterTabContent/StartIntroPage.tsx similarity index 88% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/StartIntroPage.tsx rename to dinky-web/src/pages/DataStudio/CenterTabContent/StartIntroPage.tsx index 25b5d13b5c..d1485078fe 100644 --- a/dinky-web/src/pages/DataStudioNew/CenterTabContent/StartIntroPage.tsx +++ b/dinky-web/src/pages/DataStudio/CenterTabContent/StartIntroPage.tsx @@ -19,8 +19,8 @@ import { Divider } from 'antd'; import React, { memo } from 'react'; -import KeyBoard from '@/pages/DataStudioNew/CenterTabContent/KeyBoard'; -import QuickGuide from '@/pages/DataStudioNew/CenterTabContent/QuickGuide'; +import KeyBoard from '@/pages/DataStudio/CenterTabContent/KeyBoard'; +import QuickGuide from '@/pages/DataStudio/CenterTabContent/QuickGuide'; export default memo(() => { return ( diff --git a/dinky-web/src/pages/DataStudioNew/CenterTabContent/index.less b/dinky-web/src/pages/DataStudio/CenterTabContent/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/CenterTabContent/index.less rename to dinky-web/src/pages/DataStudio/CenterTabContent/index.less diff --git a/dinky-web/src/pages/DataStudioNew/ContentLayout.tsx b/dinky-web/src/pages/DataStudio/ContentLayout.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/ContentLayout.tsx rename to dinky-web/src/pages/DataStudio/ContentLayout.tsx index ba72c5c71b..8da912919c 100644 --- a/dinky-web/src/pages/DataStudioNew/ContentLayout.tsx +++ b/dinky-web/src/pages/DataStudio/ContentLayout.tsx @@ -34,12 +34,12 @@ import { SwitcherOutlined, SyncOutlined } from '@ant-design/icons'; -import { leftDefaultShowTab } from '@/pages/DataStudioNew/Toolbar/ToolbarRoute'; +import { leftDefaultShowTab } from '@/pages/DataStudio/Toolbar/ToolbarRoute'; import { l } from '@/utils/intl'; import * as Algorithm from 'rc-dock/src/Algorithm'; -import { createNewPanel } from '@/pages/DataStudioNew/DockLayoutFunction'; -import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudioNew/Toolbar/data.d'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { createNewPanel } from '@/pages/DataStudio/DockLayoutFunction'; +import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudio/Toolbar/data.d'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; const quickGuideTab: TabData = { closable: false, diff --git a/dinky-web/src/pages/DataStudioNew/ContextMenuSpace.tsx b/dinky-web/src/pages/DataStudio/ContextMenuSpace.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/ContextMenuSpace.tsx rename to dinky-web/src/pages/DataStudio/ContextMenuSpace.tsx diff --git a/dinky-web/src/pages/DataStudioNew/DataStudioContext.ts b/dinky-web/src/pages/DataStudio/DataStudioContext.ts similarity index 100% rename from dinky-web/src/pages/DataStudioNew/DataStudioContext.ts rename to dinky-web/src/pages/DataStudio/DataStudioContext.ts diff --git a/dinky-web/src/pages/DataStudioNew/DockLayoutFunction.tsx b/dinky-web/src/pages/DataStudio/DockLayoutFunction.tsx similarity index 98% rename from dinky-web/src/pages/DataStudioNew/DockLayoutFunction.tsx rename to dinky-web/src/pages/DataStudio/DockLayoutFunction.tsx index a7bef13701..9fb86ba9ea 100644 --- a/dinky-web/src/pages/DataStudioNew/DockLayoutFunction.tsx +++ b/dinky-web/src/pages/DataStudio/DockLayoutFunction.tsx @@ -18,8 +18,8 @@ */ import { BoxData } from 'rc-dock/es'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; -import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudioNew/Toolbar/data.d'; +import { DataStudioState } from '@/pages/DataStudio/model'; +import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudio/Toolbar/data.d'; import { PanelData, TabData } from 'rc-dock/es/DockData'; import { DockLayout, LayoutData } from 'rc-dock'; import { Filter } from 'rc-dock/es/Algorithm'; diff --git a/dinky-web/src/pages/DataStudioNew/DvaFunction.tsx b/dinky-web/src/pages/DataStudio/DvaFunction.tsx similarity index 98% rename from dinky-web/src/pages/DataStudioNew/DvaFunction.tsx rename to dinky-web/src/pages/DataStudio/DvaFunction.tsx index a0fc5a8e59..cc8796b06a 100644 --- a/dinky-web/src/pages/DataStudioNew/DvaFunction.tsx +++ b/dinky-web/src/pages/DataStudio/DvaFunction.tsx @@ -17,7 +17,7 @@ * */ -import { STUDIO_MODEL, STUDIO_MODEL_ASYNC } from '@/pages/DataStudioNew/model'; +import { STUDIO_MODEL, STUDIO_MODEL_ASYNC } from '@/pages/DataStudio/model'; import { Dispatch } from '@umijs/max'; import { CenterTabDTO, @@ -26,7 +26,7 @@ import { SaveToolbarLayoutDTO, SetLayoutDTO, UpdateActionDTO -} from '@/pages/DataStudioNew/type'; +} from '@/pages/DataStudio/type'; import { CONFIG_MODEL_ASYNC } from '@/pages/SettingCenter/GlobalSetting/model'; export const mapDispatchToProps = (dispatch: Dispatch) => { diff --git a/dinky-web/src/pages/DataStudioNew/FooterContainer/JobRunningModal/index.tsx b/dinky-web/src/pages/DataStudio/FooterContainer/JobRunningModal/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/FooterContainer/JobRunningModal/index.tsx rename to dinky-web/src/pages/DataStudio/FooterContainer/JobRunningModal/index.tsx index 86f83ce472..33fa82329c 100644 --- a/dinky-web/src/pages/DataStudioNew/FooterContainer/JobRunningModal/index.tsx +++ b/dinky-web/src/pages/DataStudio/FooterContainer/JobRunningModal/index.tsx @@ -20,7 +20,7 @@ import { StopTwoTone } from '@ant-design/icons'; import { Col, Modal, Progress, Row, Space } from 'antd'; import React from 'react'; -import { JobRunningMsgType } from '@/pages/DataStudioNew/type'; +import { JobRunningMsgType } from '@/pages/DataStudio/type'; type JobRunningModalProps = { visible: boolean; diff --git a/dinky-web/src/pages/DataStudioNew/FooterContainer/index.tsx b/dinky-web/src/pages/DataStudio/FooterContainer/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/FooterContainer/index.tsx rename to dinky-web/src/pages/DataStudio/FooterContainer/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/RightContextMenu.tsx b/dinky-web/src/pages/DataStudio/RightContextMenu.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/RightContextMenu.tsx rename to dinky-web/src/pages/DataStudio/RightContextMenu.tsx index 4f23be7c6e..07d34faf17 100644 --- a/dinky-web/src/pages/DataStudioNew/RightContextMenu.tsx +++ b/dinky-web/src/pages/DataStudio/RightContextMenu.tsx @@ -21,8 +21,8 @@ import { Dropdown } from 'antd'; import { MenuItemType } from 'antd/es/menu/interface'; import { MenuInfo } from 'rc-menu/es/interface'; import React from 'react'; -import { RightMenuItemProps } from '@/pages/DataStudioNew/data.d'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { RightMenuItemProps } from '@/pages/DataStudio/data.d'; +import { DataStudioState } from '@/pages/DataStudio/model'; import { l } from '@/utils/intl'; /** diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/data.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Catalog/data.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/data.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Catalog/data.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Catalog/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Catalog/index.tsx index 06fa87dfed..317cd5d50a 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Catalog/index.tsx @@ -35,11 +35,11 @@ import { DefaultOptionType } from 'rc-select/lib/Select'; import React, { useEffect, useState } from 'react'; import { getMSCatalogs, getMSColumns, getMSSchemaInfo } from './service'; import { useAsyncEffect } from 'ahooks'; -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; -import { isSql } from '@/pages/DataStudioNew/utils'; -import { TableDataNode } from '@/pages/DataStudioNew/Toolbar/Catalog/data'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; +import { isSql } from '@/pages/DataStudio/utils'; +import { TableDataNode } from '@/pages/DataStudio/Toolbar/Catalog/data'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; type CatalogState = { envId?: number; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/service.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Catalog/service.tsx similarity index 94% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/service.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Catalog/service.tsx index 0bdccf3d78..c7f424513c 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Catalog/service.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Catalog/service.tsx @@ -19,7 +19,7 @@ import { postAll } from '@/services/api'; import { API_CONSTANTS } from '@/services/endpoints'; -import { StudioMetaStoreParam } from '@/pages/DataStudioNew/Toolbar/Catalog/data'; +import { StudioMetaStoreParam } from '@/pages/DataStudio/Toolbar/Catalog/data'; export async function getMSSchemaInfo(params: StudioMetaStoreParam) { return (await postAll(API_CONSTANTS.STUDIO_GET_MSSCHEMA_INFO, params)).data; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/DataSource/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/DataSource/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/DataSource/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/DataSource/index.tsx index b45d583958..f912dfb725 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/DataSource/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/DataSource/index.tsx @@ -29,10 +29,10 @@ import { memo, useEffect, useRef, useState } from 'react'; import { clearDataSourceTable, getDataSourceList, showDataSourceTable } from './service'; import { useAsyncEffect } from 'ahooks'; import { ProFormCascader } from '@ant-design/pro-form/lib'; -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; import { connect } from '@umijs/max'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; interface Option { value: number | string; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/DataSource/service.tsx b/dinky-web/src/pages/DataStudio/Toolbar/DataSource/service.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/DataSource/service.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/DataSource/service.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalConfig.ts b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalConfig.ts similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalConfig.ts rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalConfig.ts diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalContent.tsx b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalContent.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalContent.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalContent.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/index.tsx index abfe419d2a..d17b5f6be3 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/index.tsx @@ -40,12 +40,12 @@ import { getData } from '@/services/api'; import { Cluster } from '@/types/RegCenter/data'; import { CLUSTER_TYPE_OPTIONS, ClusterType } from '@/pages/RegCenter/Cluster/constants'; import { l } from '@/utils/intl'; -import TerminalContent from '@/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalContent'; +import TerminalContent from '@/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalContent'; import { getTermConfig, setTermConfig, TermProps -} from '@/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/TerminalConfig'; +} from '@/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/TerminalConfig'; const TerminalTab = () => { // const [form] = Form.useForm(); diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/xterm.css b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/xterm.css similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal/xterm.css rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal/xterm.css diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/index.less b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/index.less rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/index.less diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/index.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/index.tsx index 04f895652b..4d5e4fc840 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/FlinkSqlClient/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/FlinkSqlClient/index.tsx @@ -20,7 +20,7 @@ import React, { useRef, useState } from 'react'; import { Tabs } from 'antd'; import './index.less'; -import TerminalTab from '@/pages/DataStudioNew/Toolbar/FlinkSqlClient/Terminal'; +import TerminalTab from '@/pages/DataStudio/Toolbar/FlinkSqlClient/Terminal'; type TargetKey = React.MouseEvent | React.KeyboardEvent | string; type TabItem = { label: string; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/GlobalVariable/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/GlobalVariable/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/GlobalVariable/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/GlobalVariable/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/FolderModal/FolderForm/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/FolderModal/FolderForm/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/FolderModal/FolderForm/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/FolderModal/FolderForm/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/FolderModal/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/FolderModal/index.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/FolderModal/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/FolderModal/index.tsx index 318338ee97..9a587d9b7e 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/FolderModal/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/FolderModal/index.tsx @@ -22,7 +22,7 @@ import { Catalogue } from '@/types/Studio/data'; import { ModalForm } from '@ant-design/pro-components'; import { Form } from 'antd'; import React, { useEffect } from 'react'; -import FolderForm from '@/pages/DataStudioNew/Toolbar/Project/FolderModal/FolderForm'; +import FolderForm from '@/pages/DataStudio/Toolbar/Project/FolderModal/FolderForm'; type JobModalProps = { onCancel: () => void; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobImportModal/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobImportModal/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobImportModal/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/JobImportModal/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobModal/components/TemplateSelect.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobModal/components/TemplateSelect.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobModal/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobModal/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/index.tsx index d3e2525229..8797b14bef 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/JobModal/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/index.tsx @@ -37,9 +37,9 @@ import { useModel } from '@umijs/max'; import { Form } from 'antd'; import { DefaultOptionType } from 'antd/es/select'; import React, { useEffect } from 'react'; -import { JOB_TYPE } from '@/pages/DataStudioNew/constants'; -import TemplateSelect from '@/pages/DataStudioNew/Toolbar/Project/JobModal/components/TemplateSelect'; -import { isFlinkJob, isUDF } from '@/pages/DataStudioNew/Toolbar/Project/function'; +import { JOB_TYPE } from '@/pages/DataStudio/constants'; +import TemplateSelect from '@/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect'; +import { isFlinkJob, isUDF } from '@/pages/DataStudio/Toolbar/Project/function'; type JobModalProps = { onCancel: () => void; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/RightContext.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/RightContext.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/RightContext.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/RightContext.tsx index 532bcd3fce..e04d00dde1 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/RightContext.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/RightContext.tsx @@ -22,9 +22,9 @@ import React, { Key, useEffect, useState } from 'react'; import { InitProjectState } from '@/types/Studio/init.d'; import { ProjectState } from '@/types/Studio/state'; import { Modal, Typography } from 'antd'; -import { DataStudioActionType, RightContextMenuState } from '@/pages/DataStudioNew/data.d'; -import { InitContextMenuPosition } from '@/pages/DataStudioNew/function'; -import RightContextMenu from '@/pages/DataStudioNew/RightContextMenu'; +import { DataStudioActionType, RightContextMenuState } from '@/pages/DataStudio/data.d'; +import { InitContextMenuPosition } from '@/pages/DataStudio/function'; +import RightContextMenu from '@/pages/DataStudio/RightContextMenu'; import { l } from '@/utils/intl'; import { Catalogue } from '@/types/Studio/data'; import { API_CONSTANTS } from '@/services/endpoints'; @@ -36,13 +36,13 @@ import { handleRemoveById } from '@/services/BusinessCrud'; import { DIALECT } from '@/services/constants'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { DataStudioState } from '@/pages/DataStudio/model'; import { UserBaseInfo } from '@/types/AuthCenter/data.d'; -import FolderModal from '@/pages/DataStudioNew/Toolbar/Project/FolderModal'; -import JobModal from '@/pages/DataStudioNew/Toolbar/Project/JobModal'; -import { assert } from '@/pages/DataStudioNew/utils'; -import { FOLDER_RIGHT_MENU, JOB_RIGHT_MENU } from '@/pages/DataStudioNew/Toolbar/Project/constants'; -import JobImportModal from '@/pages/DataStudioNew/Toolbar/Project/JobImportModal'; +import FolderModal from '@/pages/DataStudio/Toolbar/Project/FolderModal'; +import JobModal from '@/pages/DataStudio/Toolbar/Project/JobModal'; +import { assert } from '@/pages/DataStudio/utils'; +import { FOLDER_RIGHT_MENU, JOB_RIGHT_MENU } from '@/pages/DataStudio/Toolbar/Project/constants'; +import JobImportModal from '@/pages/DataStudio/Toolbar/Project/JobImportModal'; const { Text } = Typography; export type RightContextProps = { selectKeys: Key[]; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/constants.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/constants.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/constants.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/constants.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/function.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/function.tsx similarity index 99% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/function.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/function.tsx index fba662aba1..fe6f7a2600 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/function.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/function.tsx @@ -26,8 +26,8 @@ import { l } from '@/utils/intl'; import { LockTwoTone, UnlockTwoTone } from '@ant-design/icons'; import { Badge, Divider, Space, Tooltip } from 'antd'; import { Key } from 'react'; -import { getTabIcon, lockTask, showAllOwners } from '@/pages/DataStudioNew/function'; -import { assert } from '@/pages/DataStudioNew/utils'; +import { getTabIcon, lockTask, showAllOwners } from '@/pages/DataStudio/function'; +import { assert } from '@/pages/DataStudio/utils'; /** * generate list of tree node from data diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/index.tsx similarity index 94% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Project/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Project/index.tsx index ea7dab19ed..b0dea09060 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Project/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/index.tsx @@ -30,20 +30,20 @@ import { connect, useRequest } from '@@/exports'; import { API_CONSTANTS } from '@/services/endpoints'; import { useModel } from '@umijs/max'; import { debounce } from '@/utils/function'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { DataStudioState } from '@/pages/DataStudio/model'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; import type RcTree from 'rc-tree'; import { generateList, searchInTree } from '@/utils/treeUtils'; -import { buildProjectTree } from '@/pages/DataStudioNew/Toolbar/Project/function'; +import { buildProjectTree } from '@/pages/DataStudio/Toolbar/Project/function'; import { SysConfigStateType } from '@/pages/SettingCenter/GlobalSetting/model'; import { Catalogue } from '@/types/Studio/data'; import { handleAddOrUpdate } from '@/services/BusinessCrud'; -import { handleRightClick } from '@/pages/DataStudioNew/function'; -import { useRightContext } from '@/pages/DataStudioNew/Toolbar/Project/RightContext'; -import { TreeVo } from '@/pages/DataStudioNew/type'; -import FolderModal from '@/pages/DataStudioNew/Toolbar/Project/FolderModal'; -import { getTaskSortTypeData } from '@/pages/DataStudioNew/service'; +import { handleRightClick } from '@/pages/DataStudio/function'; +import { useRightContext } from '@/pages/DataStudio/Toolbar/Project/RightContext'; +import { TreeVo } from '@/pages/DataStudio/type'; +import FolderModal from '@/pages/DataStudio/Toolbar/Project/FolderModal'; +import { getTaskSortTypeData } from '@/pages/DataStudio/service'; export const Project = (props: any) => { const { diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx similarity index 78% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx index c788caeae8..4089755046 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/index.tsx @@ -21,10 +21,10 @@ import { JobExecutionHistory } from '@/types/Studio/data'; import { l } from '@/utils/intl'; import { Modal } from 'antd'; import React from 'react'; -import { JobConfigInfo } from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo'; -import { StatementInfo } from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo'; -import { PreViewData } from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData'; -import { ErrorMsgInfo } from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo'; +import { JobConfigInfo } from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/JobConfigInfo'; +import { StatementInfo } from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/StatementInfo'; +import { PreViewData } from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/PreViewData'; +import { ErrorMsgInfo } from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel/ErrorMsgInfo'; type JobDetailInfoModelProps = { modalVisit: boolean; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/index.tsx similarity index 98% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/index.tsx index 55e09e83db..3c110c00a8 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Service/ExecutionHistory/index.tsx @@ -28,7 +28,7 @@ import { ActionType, ProList } from '@ant-design/pro-components'; import { ProListMetas } from '@ant-design/pro-list'; import { Badge, Divider, Space, Tag, Typography } from 'antd'; import React, { useRef, useState } from 'react'; -import { JobDetailInfoModel } from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel'; +import { JobDetailInfoModel } from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory/components/JobDetailInfoModel'; const { Link, Paragraph, Text } = Typography; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/Explain/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/Explain/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/Explain/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/Explain/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/FlinkGraph/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/FlinkGraph/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/FlinkGraph/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/FlinkGraph/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/Lineage/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/Lineage/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/Lineage/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/Lineage/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/LineageNew/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/LineageNew/index.tsx similarity index 99% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/LineageNew/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/LineageNew/index.tsx index 2b65be847f..69e3f68e2b 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/LineageNew/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Service/LineageNew/index.tsx @@ -32,7 +32,7 @@ import { ReactNode } from '@antv/g6-extension-react'; import { Graphin } from '@antv/graphin'; import { DagreLayout, GridLayout } from '@antv/layout'; import { LineageDetailInfo } from '@/types/DevOps/data'; -import { DataStudioContext } from '@/pages/DataStudioNew/DataStudioContext'; +import { DataStudioContext } from '@/pages/DataStudio/DataStudioContext'; const collapse = (x: number, y: number, r: number) => { return [ diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/Output/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/Output/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/Output/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/Output/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/Result/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/Result/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/Result/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/Result/index.tsx index f0bed3cad5..e8db87f9fb 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/Result/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Service/Result/index.tsx @@ -34,8 +34,8 @@ import { FilterConfirmProps } from 'antd/es/table/interface'; import { DataIndex } from 'rc-table/es/interface'; import React, { useCallback, useEffect, useRef, useState, useTransition } from 'react'; import { useAsyncEffect } from 'ahooks'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; -import { isSql } from '@/pages/DataStudioNew/utils'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; +import { isSql } from '@/pages/DataStudio/utils'; import { ProTable } from '@ant-design/pro-components'; import { getInsights } from '@antv/ava'; import { InsightCard } from '@antv/ava-react'; @@ -64,8 +64,10 @@ export default (props: { taskId: number; action: any; dialect: string }) => { const [searchedColumn, setSearchedColumn] = useState(''); const searchInput = useRef(null); useEffect(() => { - if (actionType === DataStudioActionType.TASK_PREVIEW_RESULT - || actionType === DataStudioActionType.TASK_RUN_DEBUG) { + if ( + actionType === DataStudioActionType.TASK_PREVIEW_RESULT || + actionType === DataStudioActionType.TASK_RUN_DEBUG + ) { if (data.mockSinkResult == true) { setDataList(convertMockResultToList({ columns: params.columns, rowData: params.rowData })); } else { diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/TableData/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/TableData/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/TableData/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/TableData/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/index.less b/dinky-web/src/pages/DataStudio/Toolbar/Service/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/index.less rename to dinky-web/src/pages/DataStudio/Toolbar/Service/index.less diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Service/index.tsx similarity index 90% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Service/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Service/index.tsx index 39f5d294fa..388400f5f4 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Service/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Service/index.tsx @@ -18,8 +18,8 @@ */ import { connect } from '@@/exports'; -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; import { Flex, Tabs, TabsProps, TreeDataNode } from 'antd'; import { Panel, PanelGroup } from 'react-resizable-panels'; import DirectoryTree from 'antd/es/tree/DirectoryTree'; @@ -36,24 +36,24 @@ import { ShrinkOutlined, TableOutlined } from '@ant-design/icons'; -import RunToolBarButton from '@/pages/DataStudioNew/components/RunToolBarButton'; -import CusPanelResizeHandle from '@/pages/DataStudioNew/components/CusPanelResizeHandle'; -import Output from '@/pages/DataStudioNew/Toolbar/Service/Output'; -import ExecutionHistory from '@/pages/DataStudioNew/Toolbar/Service/ExecutionHistory'; +import RunToolBarButton from '@/pages/DataStudio/components/RunToolBarButton'; +import CusPanelResizeHandle from '@/pages/DataStudio/components/CusPanelResizeHandle'; +import Output from '@/pages/DataStudio/Toolbar/Service/Output'; +import ExecutionHistory from '@/pages/DataStudio/Toolbar/Service/ExecutionHistory'; import { KeepAlive } from 'react-activation'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; -import Explain from '@/pages/DataStudioNew/Toolbar/Service/Explain'; -import FlinkGraph from '@/pages/DataStudioNew/Toolbar/Service/FlinkGraph'; -import Result from '@/pages/DataStudioNew/Toolbar/Service/Result'; -import { getTabIcon } from '@/pages/DataStudioNew/function'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; +import Explain from '@/pages/DataStudio/Toolbar/Service/Explain'; +import FlinkGraph from '@/pages/DataStudio/Toolbar/Service/FlinkGraph'; +import Result from '@/pages/DataStudio/Toolbar/Service/Result'; +import { getTabIcon } from '@/pages/DataStudio/function'; import { DIALECT } from '@/services/constants'; -import { TableData } from '@/pages/DataStudioNew/Toolbar/Service/TableData'; -import { isSql } from '@/pages/DataStudioNew/utils'; -import { LineageNew } from '@/pages/DataStudioNew/Toolbar/Service/LineageNew'; +import { TableData } from '@/pages/DataStudio/Toolbar/Service/TableData'; +import { isSql } from '@/pages/DataStudio/utils'; +import { LineageNew } from '@/pages/DataStudio/Toolbar/Service/LineageNew'; import { useAsyncEffect } from 'ahooks'; import { sleep } from '@antfu/utils'; import { l } from '@/utils/intl'; -import { assert } from '@/pages/DataStudioNew/utils'; +import { assert } from '@/pages/DataStudio/utils'; const Service = (props: { showDesc: boolean; tabs: CenterTab[]; action: any }) => { const { diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/JsonToSql/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Tool/JsonToSql/index.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Tool/JsonToSql/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Tool/JsonToSql/index.tsx index 72f6a732f8..f530f870c1 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/JsonToSql/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Tool/JsonToSql/index.tsx @@ -22,7 +22,7 @@ import useThemeValue from '@/hooks/useThemeValue'; import { Button, Flex, Space } from 'antd'; import React, { useState } from 'react'; import CodeShow from '@/components/CustomEditor/CodeShow'; -import { jsonToSql } from '@/pages/DataStudioNew/Toolbar/Tool/JsonToSql/service'; +import { jsonToSql } from '@/pages/DataStudio/Toolbar/Tool/JsonToSql/service'; const padding = 10; diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/JsonToSql/service.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Tool/JsonToSql/service.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Tool/JsonToSql/service.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Tool/JsonToSql/service.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/TextComparison/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Tool/TextComparison/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Tool/TextComparison/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Tool/TextComparison/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/index.less b/dinky-web/src/pages/DataStudio/Toolbar/Tool/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Tool/index.less rename to dinky-web/src/pages/DataStudio/Toolbar/Tool/index.less diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Tool/index.tsx similarity index 89% rename from dinky-web/src/pages/DataStudioNew/Toolbar/Tool/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/Tool/index.tsx index 6362c4e9c0..10f8080d7a 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/Tool/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Tool/index.tsx @@ -18,8 +18,8 @@ */ import { Tabs } from 'antd'; -import TextComparison from '@/pages/DataStudioNew/Toolbar/Tool/TextComparison'; -import { JsonToSql } from '@/pages/DataStudioNew/Toolbar/Tool/JsonToSql'; +import TextComparison from '@/pages/DataStudio/Toolbar/Tool/TextComparison'; +import { JsonToSql } from '@/pages/DataStudio/Toolbar/Tool/JsonToSql'; import './index.less'; export default () => { diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/ToolbarRoute.tsx b/dinky-web/src/pages/DataStudio/Toolbar/ToolbarRoute.tsx similarity index 79% rename from dinky-web/src/pages/DataStudioNew/Toolbar/ToolbarRoute.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/ToolbarRoute.tsx index 94cbdfe98b..f22efa3972 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/ToolbarRoute.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/ToolbarRoute.tsx @@ -17,7 +17,7 @@ * */ -import { ToolbarRoute } from '@/pages/DataStudioNew/Toolbar/data.d'; +import { ToolbarRoute } from '@/pages/DataStudio/Toolbar/data.d'; import { CodeOutlined, ConsoleSqlOutlined, @@ -33,14 +33,14 @@ import { l } from '@/utils/intl'; export const lazyComponent = (element: ReactNode): ReactElement => { return loading...}>{element}; }; -const Project = lazy(() => import('@/pages/DataStudioNew/Toolbar/Project')); -const StartIntro = lazy(() => import('@/pages/DataStudioNew/CenterTabContent/StartIntroPage')); -const DataSource = lazy(() => import('@/pages/DataStudioNew/Toolbar/DataSource')); -const GlobalVariable = lazy(() => import('@/pages/DataStudioNew/Toolbar/GlobalVariable')); -const Service = lazy(() => import('@/pages/DataStudioNew/Toolbar/Service')); -const Tool = lazy(() => import('@/pages/DataStudioNew/Toolbar/Tool')); -const Catalog = lazy(() => import('@/pages/DataStudioNew/Toolbar/Catalog')); -const FlinkSqlClient = lazy(() => import('@/pages/DataStudioNew/Toolbar/FlinkSqlClient')); +const Project = lazy(() => import('@/pages/DataStudio/Toolbar/Project')); +const StartIntro = lazy(() => import('@/pages/DataStudio/CenterTabContent/StartIntroPage')); +const DataSource = lazy(() => import('@/pages/DataStudio/Toolbar/DataSource')); +const GlobalVariable = lazy(() => import('@/pages/DataStudio/Toolbar/GlobalVariable')); +const Service = lazy(() => import('@/pages/DataStudio/Toolbar/Service')); +const Tool = lazy(() => import('@/pages/DataStudio/Toolbar/Tool')); +const Catalog = lazy(() => import('@/pages/DataStudio/Toolbar/Catalog')); +const FlinkSqlClient = lazy(() => import('@/pages/DataStudio/Toolbar/FlinkSqlClient')); export const ToolbarRoutes: ToolbarRoute[] = [ { key: 'quick-start', diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/data.d.tsx b/dinky-web/src/pages/DataStudio/Toolbar/data.d.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/Toolbar/data.d.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/data.d.tsx index fc1c4f2a3e..36d2f79474 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/data.d.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/data.d.tsx @@ -19,7 +19,7 @@ import * as React from 'react'; import { JSX } from 'react'; -import { ToolbarSelect } from '@/pages/DataStudioNew/data.d'; +import { ToolbarSelect } from '@/pages/DataStudio/data.d'; import { TabData } from 'rc-dock'; export type ToolbarProp = { diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/index.less b/dinky-web/src/pages/DataStudio/Toolbar/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/Toolbar/index.less rename to dinky-web/src/pages/DataStudio/Toolbar/index.less diff --git a/dinky-web/src/pages/DataStudioNew/Toolbar/index.tsx b/dinky-web/src/pages/DataStudio/Toolbar/index.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/Toolbar/index.tsx rename to dinky-web/src/pages/DataStudio/Toolbar/index.tsx index 744ee10d07..8fa1856a9d 100644 --- a/dinky-web/src/pages/DataStudioNew/Toolbar/index.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/index.tsx @@ -20,8 +20,8 @@ import { Flex, Row, Tooltip, Typography } from 'antd'; import React, { useMemo } from 'react'; import './index.less'; -import { ToolbarPosition, ToolbarProp } from '@/pages/DataStudioNew/Toolbar/data.d'; -import { ToolbarRoutes } from '@/pages/DataStudioNew/Toolbar/ToolbarRoute'; +import { ToolbarPosition, ToolbarProp } from '@/pages/DataStudio/Toolbar/data.d'; +import { ToolbarRoutes } from '@/pages/DataStudio/Toolbar/ToolbarRoute'; import { ReactSortable } from 'react-sortablejs'; export default React.memo((props: ToolbarProp) => { diff --git a/dinky-web/src/pages/DataStudioNew/components/CusPanelResizeHandle/index.less b/dinky-web/src/pages/DataStudio/components/CusPanelResizeHandle/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/components/CusPanelResizeHandle/index.less rename to dinky-web/src/pages/DataStudio/components/CusPanelResizeHandle/index.less diff --git a/dinky-web/src/pages/DataStudioNew/components/CusPanelResizeHandle/index.tsx b/dinky-web/src/pages/DataStudio/components/CusPanelResizeHandle/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/components/CusPanelResizeHandle/index.tsx rename to dinky-web/src/pages/DataStudio/components/CusPanelResizeHandle/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/components/RunToolBarButton/index.tsx b/dinky-web/src/pages/DataStudio/components/RunToolBarButton/index.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/components/RunToolBarButton/index.tsx rename to dinky-web/src/pages/DataStudio/components/RunToolBarButton/index.tsx diff --git a/dinky-web/src/pages/DataStudioNew/constants.tsx b/dinky-web/src/pages/DataStudio/constants.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/constants.tsx rename to dinky-web/src/pages/DataStudio/constants.tsx diff --git a/dinky-web/src/pages/DataStudioNew/css/index.less b/dinky-web/src/pages/DataStudio/css/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/css/index.less rename to dinky-web/src/pages/DataStudio/css/index.less diff --git a/dinky-web/src/pages/DataStudioNew/data.d.tsx b/dinky-web/src/pages/DataStudio/data.d.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/data.d.tsx rename to dinky-web/src/pages/DataStudio/data.d.tsx index 0ae7022987..d148dd6f75 100644 --- a/dinky-web/src/pages/DataStudioNew/data.d.tsx +++ b/dinky-web/src/pages/DataStudio/data.d.tsx @@ -19,7 +19,7 @@ import { ContextMenuPosition } from '@/types/Public/state'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { DataStudioState } from '@/pages/DataStudio/model'; export type ToolbarSelect = { // 当前选中的tab diff --git a/dinky-web/src/pages/DataStudioNew/function.tsx b/dinky-web/src/pages/DataStudio/function.tsx similarity index 97% rename from dinky-web/src/pages/DataStudioNew/function.tsx rename to dinky-web/src/pages/DataStudio/function.tsx index 39ad4541ce..afa46516e9 100644 --- a/dinky-web/src/pages/DataStudioNew/function.tsx +++ b/dinky-web/src/pages/DataStudio/function.tsx @@ -17,13 +17,13 @@ * */ -import { RightContextMenuState } from '@/pages/DataStudioNew/data.d'; +import { RightContextMenuState } from '@/pages/DataStudio/data.d'; import { createContext, Dispatch, SetStateAction } from 'react'; import { ContextMenuPosition } from '@/types/Public/state'; import { DockLayout, DropDirection, LayoutBase } from 'rc-dock'; -import { ToolbarPosition } from '@/pages/DataStudioNew/Toolbar/data.d'; +import { ToolbarPosition } from '@/pages/DataStudio/Toolbar/data.d'; import { BoxBase, PanelBase } from 'rc-dock/es'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { DataStudioState } from '@/pages/DataStudio/model'; import { LayoutData } from 'rc-dock/src/DockData'; import { JOB_STATUS, JOB_SUBMIT_STATUS } from '@/pages/DevOps/constants'; import { diff --git a/dinky-web/src/pages/DataStudioNew/index.less b/dinky-web/src/pages/DataStudio/index.less similarity index 100% rename from dinky-web/src/pages/DataStudioNew/index.less rename to dinky-web/src/pages/DataStudio/index.less diff --git a/dinky-web/src/pages/DataStudioNew/index.tsx b/dinky-web/src/pages/DataStudio/index.tsx similarity index 95% rename from dinky-web/src/pages/DataStudioNew/index.tsx rename to dinky-web/src/pages/DataStudio/index.tsx index 217a02e923..80b2b5fa61 100644 --- a/dinky-web/src/pages/DataStudioNew/index.tsx +++ b/dinky-web/src/pages/DataStudio/index.tsx @@ -21,44 +21,42 @@ import { DockLayout, TabData } from 'rc-dock'; import React, { lazy, useEffect, useMemo, useRef, useState } from 'react'; import { PageContainer } from '@ant-design/pro-layout'; import { Col, ConfigProvider, Row, Space, Spin, theme as antdTheme } from 'antd'; -import Toolbar from '@/pages/DataStudioNew/Toolbar'; -import { DataStudioActionType, RightContextMenuState } from '@/pages/DataStudioNew/data.d'; +import Toolbar from '@/pages/DataStudio/Toolbar'; +import { DataStudioActionType, RightContextMenuState } from '@/pages/DataStudio/data.d'; import { getAllPanel, getLayoutState, getTabIcon, handleRightClick, InitContextMenuPosition -} from '@/pages/DataStudioNew/function'; +} from '@/pages/DataStudio/function'; // import 'rc-dock/dist/rc-dock.css'; // import 'rc-dock/dist/rc-dock-dark.css'; -import RightContextMenu, { useRightMenuItem } from '@/pages/DataStudioNew/RightContextMenu'; +import RightContextMenu, { useRightMenuItem } from '@/pages/DataStudio/RightContextMenu'; import { MenuInfo } from 'rc-menu/es/interface'; -import { lazyComponent, ToolbarRoutes } from '@/pages/DataStudioNew/Toolbar/ToolbarRoute'; -import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudioNew/Toolbar/data.d'; -import { groups } from '@/pages/DataStudioNew/ContentLayout'; +import { lazyComponent, ToolbarRoutes } from '@/pages/DataStudio/Toolbar/ToolbarRoute'; +import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudio/Toolbar/data.d'; +import { groups } from '@/pages/DataStudio/ContentLayout'; import { connect } from 'umi'; -import { CenterTab, DataStudioState } from '@/pages/DataStudioNew/model'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; +import { CenterTab, DataStudioState } from '@/pages/DataStudio/model'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; import { AliveScope, KeepAlive, useAliveController } from 'react-activation'; -import { activeTab, createNewPanel } from '@/pages/DataStudioNew/DockLayoutFunction'; +import { activeTab, createNewPanel } from '@/pages/DataStudio/DockLayoutFunction'; import * as Algorithm from './Algorithm'; import { PanelData } from 'rc-dock/lib/DockData'; import { useAsyncEffect } from 'ahooks'; import { useTheme } from '@/hooks/useThemeValue'; -import { DataStudioContext } from '@/pages/DataStudioNew/DataStudioContext'; +import { DataStudioContext } from '@/pages/DataStudio/DataStudioContext'; import './css/index.less'; import { getTenantByLocalStorage } from '@/utils/function'; -import FooterContainer from '@/pages/DataStudioNew/FooterContainer'; +import FooterContainer from '@/pages/DataStudio/FooterContainer'; import { useToken } from 'antd/es/theme/internal'; -import { TAG_RIGHT_CONTEXT_MENU } from '@/pages/DataStudioNew/constants'; -import { ContextMenuSpace } from '@/pages/DataStudioNew/ContextMenuSpace'; +import { TAG_RIGHT_CONTEXT_MENU } from '@/pages/DataStudio/constants'; +import { ContextMenuSpace } from '@/pages/DataStudio/ContextMenuSpace'; import { sleep } from '@antfu/utils'; -const SqlTask = lazy(() => import('@/pages/DataStudioNew/CenterTabContent/SqlTask')); -const DataSourceDetail = lazy( - () => import('@/pages/DataStudioNew/CenterTabContent/DataSourceDetail') -); +const SqlTask = lazy(() => import('@/pages/DataStudio/CenterTabContent/SqlTask')); +const DataSourceDetail = lazy(() => import('@/pages/DataStudio/CenterTabContent/DataSourceDetail')); let didMount = false; const DataStudioNew: React.FC = (props: any) => { diff --git a/dinky-web/src/pages/DataStudioNew/model.tsx b/dinky-web/src/pages/DataStudio/model.tsx similarity index 96% rename from dinky-web/src/pages/DataStudioNew/model.tsx rename to dinky-web/src/pages/DataStudio/model.tsx index 73b81e35e2..7b763aa2c8 100644 --- a/dinky-web/src/pages/DataStudioNew/model.tsx +++ b/dinky-web/src/pages/DataStudio/model.tsx @@ -17,11 +17,11 @@ * */ -import { DataStudioActionType, ToolbarSelect } from '@/pages/DataStudioNew/data.d'; +import { DataStudioActionType, ToolbarSelect } from '@/pages/DataStudio/data.d'; import { Effect, Reducer } from '@@/plugin-dva/types'; import { createModelTypes } from '@/utils/modelUtils'; -import { leftDefaultShowTab, ToolbarRoutes } from '@/pages/DataStudioNew/Toolbar/ToolbarRoute'; -import { layout } from '@/pages/DataStudioNew/ContentLayout'; +import { leftDefaultShowTab, ToolbarRoutes } from '@/pages/DataStudio/Toolbar/ToolbarRoute'; +import { layout } from '@/pages/DataStudio/ContentLayout'; import { CenterTabDTO, FlinkCluster, @@ -34,12 +34,12 @@ import { TempData, TempDataDTO, UpdateActionDTO -} from '@/pages/DataStudioNew/type'; +} from '@/pages/DataStudio/type'; import { LayoutBase } from 'rc-dock/src/DockData'; -import { getAllPanel } from '@/pages/DataStudioNew/function'; -import { ToolbarPosition } from '@/pages/DataStudioNew/Toolbar/data.d'; -import { findToolbarPositionByTabId } from '@/pages/DataStudioNew/DockLayoutFunction'; -import { EnvType } from '@/pages/DataStudioNew/type'; +import { getAllPanel } from '@/pages/DataStudio/function'; +import { ToolbarPosition } from '@/pages/DataStudio/Toolbar/data.d'; +import { findToolbarPositionByTabId } from '@/pages/DataStudio/DockLayoutFunction'; +import { EnvType } from '@/pages/DataStudio/type'; import { getClusterConfigurationData, getEnvData, @@ -47,12 +47,12 @@ import { getFlinkUdfOptions, getSessionData, querySuggestionData -} from '@/pages/DataStudioNew/service'; +} from '@/pages/DataStudio/service'; import { Alert } from '@/types/RegCenter/data'; import { showAlertGroup } from '@/pages/RegCenter/Alert/AlertGroup/service'; import { DefaultOptionType } from 'antd/es/select'; -import { getDataSourceList } from '@/pages/DataStudioNew/Toolbar/DataSource/service'; -import { getUserData } from '@/pages/DataStudioNew/service'; +import { getDataSourceList } from '@/pages/DataStudio/Toolbar/DataSource/service'; +import { getUserData } from '@/pages/DataStudio/service'; import { UserBaseInfo } from '@/types/AuthCenter/data.d'; /** diff --git a/dinky-web/src/pages/DataStudioNew/service.tsx b/dinky-web/src/pages/DataStudio/service.tsx similarity index 98% rename from dinky-web/src/pages/DataStudioNew/service.tsx rename to dinky-web/src/pages/DataStudio/service.tsx index 5416425ef0..ce2586bd79 100644 --- a/dinky-web/src/pages/DataStudioNew/service.tsx +++ b/dinky-web/src/pages/DataStudio/service.tsx @@ -24,7 +24,7 @@ import { queryDataByParams } from '@/services/BusinessCrud'; import { API_CONSTANTS } from '@/services/endpoints'; -import { TaskState } from '@/pages/DataStudioNew/type'; +import { TaskState } from '@/pages/DataStudio/type'; import { postAll } from '@/services/api'; export async function explainSql(title: string, params: any) { diff --git a/dinky-web/src/pages/DataStudioNew/type.ts b/dinky-web/src/pages/DataStudio/type.ts similarity index 97% rename from dinky-web/src/pages/DataStudioNew/type.ts rename to dinky-web/src/pages/DataStudio/type.ts index 156eae5d73..01a03d4503 100644 --- a/dinky-web/src/pages/DataStudioNew/type.ts +++ b/dinky-web/src/pages/DataStudio/type.ts @@ -18,11 +18,11 @@ */ import { DockLayout } from 'rc-dock'; -import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudioNew/Toolbar/data.d'; +import { ToolbarPosition, ToolbarRoute } from '@/pages/DataStudio/Toolbar/data.d'; import { AnyAction } from '@@/plugin-dva/types'; import { DropDirection, LayoutBase } from 'rc-dock/src/DockData'; -import { CenterTab } from '@/pages/DataStudioNew/model'; -import { DataStudioActionType } from '@/pages/DataStudioNew/data.d'; +import { CenterTab } from '@/pages/DataStudio/model'; +import { DataStudioActionType } from '@/pages/DataStudio/data.d'; import { Alert, DataSources } from '@/types/RegCenter/data'; import { DefaultOptionType } from 'antd/es/select'; import { TaskExtConfig } from '@/types/Studio/data'; diff --git a/dinky-web/src/pages/DataStudioNew/utils.tsx b/dinky-web/src/pages/DataStudio/utils.tsx similarity index 100% rename from dinky-web/src/pages/DataStudioNew/utils.tsx rename to dinky-web/src/pages/DataStudio/utils.tsx diff --git a/dinky-web/src/pages/DevOps/JobDetail/CheckPointsTab/components/functions.tsx b/dinky-web/src/pages/DevOps/JobDetail/CheckPointsTab/components/functions.tsx index 47d67b4d04..056f3a79c6 100644 --- a/dinky-web/src/pages/DevOps/JobDetail/CheckPointsTab/components/functions.tsx +++ b/dinky-web/src/pages/DevOps/JobDetail/CheckPointsTab/components/functions.tsx @@ -20,7 +20,7 @@ import { l } from '@/utils/intl'; import { ErrorMessage, SuccessMessage } from '@/utils/messages'; import { Modal } from 'antd'; -import { restartTask } from '@/pages/DataStudioNew/service'; +import { restartTask } from '@/pages/DataStudio/service'; export const recoveryCheckPoint = (taskId: number, path: string) => { Modal.confirm({ diff --git a/dinky-web/src/pages/DevOps/JobDetail/JobOperator/JobOperator.tsx b/dinky-web/src/pages/DevOps/JobDetail/JobOperator/JobOperator.tsx index f9fb7fe977..fbdfc4e0c3 100644 --- a/dinky-web/src/pages/DevOps/JobDetail/JobOperator/JobOperator.tsx +++ b/dinky-web/src/pages/DevOps/JobDetail/JobOperator/JobOperator.tsx @@ -17,7 +17,7 @@ * */ -import { cancelTask, savePointTask } from '@/pages/DataStudioNew/service'; +import { cancelTask, savePointTask } from '@/pages/DataStudio/service'; import { isStatusDone } from '@/pages/DevOps/function'; import EditJobInstanceForm from '@/pages/DevOps/JobDetail/JobOperator/components/EditJobInstanceForm'; import RestartForm from '@/pages/DevOps/JobDetail/JobOperator/components/RestartForm'; diff --git a/dinky-web/src/pages/DevOps/JobDetail/JobOperator/components/RestartForm.tsx b/dinky-web/src/pages/DevOps/JobDetail/JobOperator/components/RestartForm.tsx index 959e050b27..22637536d4 100644 --- a/dinky-web/src/pages/DevOps/JobDetail/JobOperator/components/RestartForm.tsx +++ b/dinky-web/src/pages/DevOps/JobDetail/JobOperator/components/RestartForm.tsx @@ -25,7 +25,7 @@ import { parseByteStr } from '@/utils/function'; import { l } from '@/utils/intl'; import { ModalForm } from '@ant-design/pro-components'; import { Alert, Button, Descriptions, DescriptionsProps, Divider, Spin, Typography } from 'antd'; -import { restartTask } from '@/pages/DataStudioNew/service'; +import { restartTask } from '@/pages/DataStudio/service'; const { Paragraph } = Typography; diff --git a/dinky-web/src/pages/DevOps/JobDetail/JobVersion/JobVersionTab.tsx b/dinky-web/src/pages/DevOps/JobDetail/JobVersion/JobVersionTab.tsx index 6d0f1ede0e..6b5b6f972a 100644 --- a/dinky-web/src/pages/DevOps/JobDetail/JobVersion/JobVersionTab.tsx +++ b/dinky-web/src/pages/DevOps/JobDetail/JobVersion/JobVersionTab.tsx @@ -19,7 +19,7 @@ import CodeShow from '@/components/CustomEditor/CodeShow'; import VersionList from '@/components/VersionList'; -import { matchLanguage } from '@/pages/DataStudioNew/function'; +import { matchLanguage } from '@/pages/DataStudio/function'; import { JobProps } from '@/pages/DevOps/JobDetail/data'; import { handleRemoveById } from '@/services/BusinessCrud'; import { API_CONSTANTS } from '@/services/endpoints'; diff --git a/dinky-web/src/pages/DevOps/JobList/index.tsx b/dinky-web/src/pages/DevOps/JobList/index.tsx index e236e7a662..45350db20a 100644 --- a/dinky-web/src/pages/DevOps/JobList/index.tsx +++ b/dinky-web/src/pages/DevOps/JobList/index.tsx @@ -48,12 +48,12 @@ import Search from 'antd/es/input/Search'; import { Key, useContext, useEffect, useRef, useState } from 'react'; import { history } from 'umi'; import EllipsisMiddle from '@/components/Typography/EllipsisMiddle'; -import { DataStudioState } from '@/pages/DataStudioNew/model'; +import { DataStudioState } from '@/pages/DataStudio/model'; import { useRequest } from '@@/exports'; -import { buildProjectTree } from '@/pages/DataStudioNew/Toolbar/Project/function'; -import { showFirstLevelOwner, showSecondLevelOwners } from '@/pages/DataStudioNew/function'; +import { buildProjectTree } from '@/pages/DataStudio/Toolbar/Project/function'; +import { showFirstLevelOwner, showSecondLevelOwners } from '@/pages/DataStudio/function'; import { generateList, getLeafKeyList, searchInTree } from '@/utils/treeUtils'; -import { mapDispatchToProps } from '@/pages/DataStudioNew/DvaFunction'; +import { mapDispatchToProps } from '@/pages/DataStudio/DvaFunction'; const { DirectoryTree } = Tree; diff --git a/dinky-web/src/pages/Home/components/MyWorker/MyWorker.tsx b/dinky-web/src/pages/Home/components/MyWorker/MyWorker.tsx index 47e93d3352..93c0f66548 100644 --- a/dinky-web/src/pages/Home/components/MyWorker/MyWorker.tsx +++ b/dinky-web/src/pages/Home/components/MyWorker/MyWorker.tsx @@ -30,7 +30,7 @@ import { l } from '@/utils/intl'; import { history } from 'umi'; import { formatDateToYYYYMMDDHHMMSS } from '@/utils/function'; import { ErrorMessageAsync } from '@/utils/messages'; -import { getTabIcon } from '@/pages/DataStudioNew/function'; +import { getTabIcon } from '@/pages/DataStudio/function'; const MyWorker = () => { const { loading, data } = useHookRequest(getData, { diff --git a/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceDetail/index.tsx b/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceDetail/index.tsx index c0ffc8b2e5..126de2cfce 100644 --- a/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceDetail/index.tsx +++ b/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceDetail/index.tsx @@ -35,7 +35,7 @@ import { useAsyncEffect } from 'ahooks'; import { clearDataSourceTable, showDataSourceTable -} from '@/pages/DataStudioNew/Toolbar/DataSource/service'; +} from '@/pages/DataStudio/Toolbar/DataSource/service'; export default () => { const location = useLocation(); diff --git a/dinky-web/src/pages/RegCenter/Document/components/DocumentModal/DocumentForm/index.tsx b/dinky-web/src/pages/RegCenter/Document/components/DocumentModal/DocumentForm/index.tsx index ca7ff6ab78..9c97cb35d0 100644 --- a/dinky-web/src/pages/RegCenter/Document/components/DocumentModal/DocumentForm/index.tsx +++ b/dinky-web/src/pages/RegCenter/Document/components/DocumentModal/DocumentForm/index.tsx @@ -18,7 +18,7 @@ */ import CodeEdit from '@/components/CustomEditor/CodeEdit'; -import { JOB_TYPE } from '@/pages/DataStudioNew/Toolbar/Project/constants'; +import { JOB_TYPE } from '@/pages/DataStudio/Toolbar/Project/constants'; import { DOCUMENT_CATEGORY_ENUMS, DOCUMENT_FUNCTION_TYPE_ENUMS,