-
+ {
+ six.map((item,key)=>{
+ return(
+ key < 6 ?
- changelanguage(item.name)}>
- setVisible(false)}
- footer={
+
+
);
}
export default Form.create()(forwardRef(About));
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 1b4f8bac..5be238db 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -1,13 +1,15 @@
import React , { useState , useEffect } from 'react';
+import { Spin } from 'antd';
import { Blueback } from '../Component/layout';
import Editor from "react-monaco-editor";
import Modals from './DisposeModal';
-import FileLanguage from '../Component/FileLanguage';
+import FileLanguage from '../Component/OpsFileLanguage';
import axios from 'axios';
function Dispose(props){
- const [ info , setInfo ] = useState(undefined);
+ const [ spining , setSpining ] = useState(true);
+ const [ info , setInfo ] = useState('.trustie-pipeline.yml');
const [ visible , setVisible ] = useState(false);
const [ ymlValue , setYmlValue ] = useState("");
const [ six , setSix ] = useState(undefined);
@@ -19,35 +21,25 @@ function Dispose(props){
useEffect(()=>{
if(projectsId){
- const url = '/dev_ops/builds/get_trustie_pipeline.json';
+ const url = `/${owner}/${projectsId}/get_trustie_pipeline.json`;
axios.get(url,{
params:{
project_id:projectsId
}
}).then(result=>{
if(result && result.data.content){
- setInfo(result.data);
+ setInfo(result.data.name);
setYmlValue(result.data.content);
setFirst(true);
}else{
setFirst(false);
}
+ setSpining(false);
}).catch(error=>{
console.log(error);
})
}
- },[])
-
- useEffect(()=>{
- const url = '/dev_ops/languages/common.json';
- axios.get(url).then(result=>{
- if(result){
- setSix(result.data);
- }
- }).catch(error=>{
- console.log(error);
- })
- },[])
+ },[projectsId])
// 修改文件内容
function changeEditor(value){
@@ -57,7 +49,6 @@ function Dispose(props){
// 切换语言
function select_language(value,array){
setFileLanguage(value);
- // console.log(array);
setYmlValue( array && array.content);
}
@@ -67,12 +58,12 @@ function Dispose(props){
let params = {
branch: "master",
content:ymlValue,
- filepath:info && info.name,
+ filepath:info,
message:''
}
if(first){
// 为true，则是编辑否则是新建
- url = `/${owner}/${projectsId}/update_file.json`;
+ url = `/${owner}/${projectsId}/update_trustie_pipeline.json`;
axios.put(url,{
...params,
sha:info && info.sha
@@ -95,32 +86,21 @@ function Dispose(props){
}
}
function suresubmit(){
- props.history.push(`/projects/${owner}/${projectsId}/ops/list`);
+ props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
}
return(
-
+
setVisible(flag)} sureFunc={suresubmit}>
确定提交
-
+
)
}
export default Dispose;
\ No newline at end of file
diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index 8ccc61c8..77b82eb0 100644
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@@ -18,17 +18,17 @@ export default ((props)=>{
return(
- (
- (
- (
- 工作流配置
- { menu ? 构建列表:""}
+ 工作流配置
+ 构建列表
)
diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx
index 87343b82..40d396e4 100644
--- a/src/forge/DevOps/OpsDetailLeftpanel.jsx
+++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx
@@ -5,6 +5,7 @@ import { Menu, Popconfirm } from "antd";
import { TagsLine } from "../Component/OpsStatus";
import { Time } from "../Utils/Time";
import { truncateCommitId } from "../common/util";
+import { getUrl } from 'educoder';
const SubMenu = Menu.SubMenu;
const Img = styled.img`
@@ -15,7 +16,7 @@ const Img = styled.img`
margin-right: 10px;
}
`;
-export default ({ data, repeatSet }) => {
+export default ({ data, repeatSet , chooseSteps }) => {
const [tamp, setTamp] = useState(undefined);
const [sha, setSha] = useState(undefined);
useEffect(() => {
@@ -29,113 +30,97 @@ export default ({ data, repeatSet }) => {
}
}, [data]);
- function renderMenu() {
- if (data.stages && data.stages.length > 0) {
- data.stages.map((item, key) => {
- return item.steps && item.steps.length > 0 ? (
-
-
- {item.name}
-
- }
- >
- {item.steps.map((i, k) => {
- return (
-
+ setVisible(false)}
+ footer={
+
+
+
+
+ }
+ >
+
+ 
+
-
-
+
+ 下一步
- }
- >
-
-
-
- 下一步
-
- ) : (
-
+
+
+
+ 初始化配置已完成，请前往:
+
+
+ {redirectUrl}
+
+
+ 进入认证
+
定义DevOps工作流，帮助您检测bug、发布代码…
+ + 了解什么是DevOps？ + + {step <=1?
-
-
-
- 初始化配置已完成，请前往:
-
-
- http://ip:80/login/oauth/authorize
-
-
- 进入认证
-
定义DevOps工作流，帮助您检测bug、发布代码…
- - 了解什么是DevOps？ - - {step === 1 ? ( -
-
+ )}
+ 编程语言：
- { - six && --
- {
- six && six.map((item,key)=>{
- return(
- key < 6 ?
配置脚本：
- { menu && menu === true &&
+ {data && data.started &&
- 开始时间： {tamp}
+ 开始时间： {data.started}
- ) : (
- ""
- )}
-
- 运行时间：{data && data.timestamp}s
-
+ }
+ {
+ data && data.duration_time &&
+
+ 运行时间：{data.duration_time}
+
+ }
- {list && list.length>0 ? list.map((item, key) => {
- return (
-
+
-
- {item.name}
-
- { item.stopped ? (parseInt(item.stopped) - parseInt(item.started)) : "0" }
-
-
-
-
- );
- }):"1111"
- }
-
+
+
+
+ {step && step.name}
+
+ { step && step.duration_time}
+
+
+
+
+
+ {
+ coders && coders.length>0 ? coders.map((item,key)=>{
+ return(
+
+
+ {key+1}
+
+ )
+ }):
+ empty ?
+ {item.out}
+
+ 1
+
+ :""
+ }
+ {stageName} – {step && step.name}: Skipped
+
{meg.message}
@@ -257,11 +251,11 @@ export default (props) => {
},
{
title: "运行时间",
- dataIndex: "timestamp",
- key: "timestamp",
+ dataIndex: "duration_time",
+ key: "duration_time",
width: "15%",
render: (value, item, key) => {
- return {value || value === 0 ? `${value}s` : "--"};
+ return {value || "--"};
},
},
{
@@ -277,16 +271,14 @@ export default (props) => {