From d5b582f17c92a033b5a4570ddee61fc71631eda4 Mon Sep 17 00:00:00 2001 From: cp3hnu Date: Thu, 16 May 2024 18:41:07 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/config/routes.ts | 42 ++++++++++++------- .../Experiment/components/LogGroup/index.tsx | 2 +- .../Experiment/components/LogList/index.tsx | 2 +- react-ui/src/pages/Experiment/index.jsx | 4 +- .../{experimentText => training}/index.jsx | 0 .../{experimentText => training}/index.less | 0 .../{experimentText => training}/props.less | 0 .../{experimentText => training}/props.tsx | 0 react-ui/src/pages/Pipeline/index.jsx | 4 +- .../components/ExperimentTable/index.tsx | 2 +- .../Workspace/components/QuickStart/index.tsx | 4 +- 11 files changed, 36 insertions(+), 24 deletions(-) rename react-ui/src/pages/Experiment/{experimentText => training}/index.jsx (100%) rename react-ui/src/pages/Experiment/{experimentText => training}/index.less (100%) rename react-ui/src/pages/Experiment/{experimentText => training}/props.less (100%) rename react-ui/src/pages/Experiment/{experimentText => training}/props.tsx (100%) diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts index 0e502c59..26b79145 100644 --- a/react-ui/config/routes.ts +++ b/react-ui/config/routes.ts @@ -67,24 +67,36 @@ export default [ path: '/pipeline', routes: [ { - name: '流水线', - path: '/pipeline/pipelineText', - component: './Pipeline/index', - }, - { - name: '训练', - path: '/pipeline/pytorchtext/:id/:name', - component: './Pipeline/editPipeline/index', + name: '流水线模板', + path: 'template', + routes: [ + { + name: '流水线模板', + path: '', + component: './Pipeline/index', + }, + { + name: '流水线详情', + path: ':id/:name', + component: './Pipeline/editPipeline/index', + }, + ], }, { name: '实验', - path: '/pipeline/experimentText', - component: './Experiment/index', - }, - { - name: '实验训练', - path: '/pipeline/experimentPytorchtext/:workflowId/:id', - component: './Experiment/experimentText/index', + path: 'experiment', + routes: [ + { + name: '实验', + path: '', + component: './Experiment/index', + }, + { + name: '实验训练', + path: ':workflowId/:id', + component: './Experiment/training/index', + }, + ], }, ], }, diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx index 0a89050c..f87d1d09 100644 --- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx +++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx @@ -5,8 +5,8 @@ */ import { useStateRef } from '@/hooks'; -import { ExperimentLog } from '@/pages/Experiment/experimentText/props'; import { ExperimentStatus } from '@/pages/Experiment/status'; +import { ExperimentLog } from '@/pages/Experiment/training/props'; import { getExperimentPodsLog } from '@/services/experiment/index.js'; import { DoubleRightOutlined, DownOutlined, UpOutlined } from '@ant-design/icons'; import { Button } from 'antd'; diff --git a/react-ui/src/pages/Experiment/components/LogList/index.tsx b/react-ui/src/pages/Experiment/components/LogList/index.tsx index fcad0527..69ac89b2 100644 --- a/react-ui/src/pages/Experiment/components/LogList/index.tsx +++ b/react-ui/src/pages/Experiment/components/LogList/index.tsx @@ -1,5 +1,5 @@ -import { ExperimentLog } from '@/pages/Experiment/experimentText/props'; import { ExperimentStatus } from '@/pages/Experiment/status'; +import { ExperimentLog } from '@/pages/Experiment/training/props'; import LogGroup from '../LogGroup'; import styles from './index.less'; diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx index 56548d6e..cff525c0 100644 --- a/react-ui/src/pages/Experiment/index.jsx +++ b/react-ui/src/pages/Experiment/index.jsx @@ -198,7 +198,7 @@ function Experiment() { }; const routeToEdit = (e, record) => { e.stopPropagation(); - navgite({ pathname: `/pipeline/pytorchtext/${record.workflow_id}/${record.workflow_name}` }); + navgite({ pathname: `/pipeline/template/${record.workflow_id}/${record.workflow_name}` }); }; // 创建或者编辑实验接口请求 const handleAddExperiment = async (values) => { @@ -255,7 +255,7 @@ function Experiment() { }; const routerToText = (e, item, record) => { e.stopPropagation(); - navgite({ pathname: `/pipeline/experimentPytorchtext/${record.workflow_id}/${item.id}` }); + navgite({ pathname: `/pipeline/experiment/${record.workflow_id}/${item.id}` }); }; const handleTensorboard = async (experimentIn) => { diff --git a/react-ui/src/pages/Experiment/experimentText/index.jsx b/react-ui/src/pages/Experiment/training/index.jsx similarity index 100% rename from react-ui/src/pages/Experiment/experimentText/index.jsx rename to react-ui/src/pages/Experiment/training/index.jsx diff --git a/react-ui/src/pages/Experiment/experimentText/index.less b/react-ui/src/pages/Experiment/training/index.less similarity index 100% rename from react-ui/src/pages/Experiment/experimentText/index.less rename to react-ui/src/pages/Experiment/training/index.less diff --git a/react-ui/src/pages/Experiment/experimentText/props.less b/react-ui/src/pages/Experiment/training/props.less similarity index 100% rename from react-ui/src/pages/Experiment/experimentText/props.less rename to react-ui/src/pages/Experiment/training/props.less diff --git a/react-ui/src/pages/Experiment/experimentText/props.tsx b/react-ui/src/pages/Experiment/training/props.tsx similarity index 100% rename from react-ui/src/pages/Experiment/experimentText/props.tsx rename to react-ui/src/pages/Experiment/training/props.tsx diff --git a/react-ui/src/pages/Pipeline/index.jsx b/react-ui/src/pages/Pipeline/index.jsx index ee2ac6ae..7467052f 100644 --- a/react-ui/src/pages/Pipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/index.jsx @@ -41,7 +41,7 @@ const Pipeline = () => { }; const routeToEdit = (e, record) => { e.stopPropagation(); - navgite({ pathname: `/pipeline/pytorchtext/${record.id}/${record.name}` }); + navgite({ pathname: `/pipeline/template/${record.id}/${record.name}` }); }; const showModal = () => { form.resetFields(); @@ -66,7 +66,7 @@ const Pipeline = () => { addWorkflow(values).then((ret) => { console.log(ret); if (ret.code == 200) { - navgite({ pathname: `/pipeline/pytorchtext/${ret.data.id}/${ret.data.name}` }); + navgite({ pathname: `/pipeline/template/${ret.data.id}/${ret.data.name}` }); } }); } diff --git a/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx b/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx index 535f9b49..a0f33e9b 100644 --- a/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx +++ b/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx @@ -13,7 +13,7 @@ type ExperimentTableProps = { function ExperimentTable({ tableData = [], style }: ExperimentTableProps) { const navgite = useNavigate(); const gotoExperiment = (record: ExperimentInstance) => { - navgite(`/pipeline/experimentPytorchtext/${record.workflow_id}/${record.id}`); + navgite(`/pipeline/experiment/${record.workflow_id}/${record.id}`); }; return ( diff --git a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx b/react-ui/src/pages/Workspace/components/QuickStart/index.tsx index c992c84a..f070fcf0 100644 --- a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx +++ b/react-ui/src/pages/Workspace/components/QuickStart/index.tsx @@ -75,7 +75,7 @@ function QuickStart() { buttonTop={20} x={left + 2 * (192 + space)} y={276} - onClick={() => navgite('/pipeline/pipelineText')} + onClick={() => navgite('/pipeline/template')} /> navgite('/pipeline/experimentText')} + onClick={() => navgite('/pipeline/experiment')} />