issue3

src/forge/DevOps/Index.jsx

@@ -1,10 +1,11 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useState} from 'react';
 import { WhiteBack } from '../Component/layout';
 import './ops.scss';
 import devops from '../Images/devops.png';
 import { Route, Switch } from 'react-router-dom';
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
+import axios from 'axios';
 
 const About = Loadable({
   loader: () => import('./subIndex'),
@@ -32,7 +33,19 @@ const Params = Loadable({
 })
 
 export default ((props)=>{
-  const {jianmu_devops, isManager, project} = props;
+  const {isManager, project} = props;
+  const { projectsId, owner } = props.match.params;
+  const [jianmu_devops, setJianmu_devops] = useState(undefined);
+
+  useEffect(()=>{
+    // 请求simple接口获取jianmu_devops
+    const url = `/${owner}/${projectsId}/simple.json`;
+    axios.get(url).then((result) => {
+      if (result && result.data) {
+        result.data.jianmu_devops && setJianmu_devops(encodeURIComponent(result.data.jianmu_devops));
+      }
+    })
+  }, [])
 
   useEffect(() => {
     window.addEventListener("message", iframeHeight, false);

src/forge/Main/Detail.js

@@ -213,9 +213,7 @@ class Detail extends Component {
       defaultBranch: undefined,
 
       // 非本平台项目
-      platform: false,
+      platform: false
-      // devops工作流code
-      jianmu_devops: undefined
     }
   }
 
@@ -259,8 +257,7 @@ class Detail extends Component {
         this.setState({
           project: result.data,
           open_devops: result.data.open_devops,
-          platform: result.data.platform && result.data.platform !== 'educoder',
+          platform: result.data.platform && result.data.platform !== 'educoder'
-          jianmu_devops: result.data.jianmu_devops && encodeURIComponent(result.data.jianmu_devops)
         })
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {

src/forge/Server/data.jsx

@@ -218,7 +218,7 @@ function Data(props) {
                                     <a onClick={() => repeatCheck(e.project_id, e.branch_tag)}>重新扫描</a>
                                 }
                                 {
-                                  (e.detect_status === "fail" || e.detect_status === "detecting" ||  e.detect_status === "waiting" || (e.detect_status=="detected"&& e.is_reported=="0")) ?
+                                  (e.detect_status === "fail" || e.detect_status === "detecting" ||  e.detect_status === "waiting") ?
                                     <span>查看<i className="iconfont icon-sanjiaoxing-down"></i></span>
                                     :
                                     <a onClick={() => { lookResult(e.task_id) }}>查看<i className={`iconfont ${openResultTaskId === e.task_id ? 'icon-sanjiaoxing-up' : 'icon-sanjiaoxing-down'}`}></i></a>

src/forge/Settings/Webhooks/Index.jsx

@@ -124,7 +124,7 @@ function Index(props) {
                   </span>}
                   {i.isJianMu && <span>
                     <Popover content={"该Webhook由流水线创建, 编辑此Webhook后, 将大概率导致本仓库相关流水线失效。请在流水线中对该Webhook配置进行更改"} title="无法编辑此Webhook" overlayClassName="disabledButPopover"><Button type={"primary"} onClick={()=>{gotoEditWebhook(i)}} disabled>编辑</Button></Popover>
-                    <Popover content={"该Webhook由流水线创建, 删除此Webhook后, 将导致本仓库相关流水线失效。请在流水线中删除该Webhook"} title="无法删除此Webhook" overlayClassName="disabledButPopover"><Button className="ml20" type="danger" onClick={()=>{deleteFunc(i)}} disabled>删除</Button></Popover>
+                    <Popover content={"该Webhook由流水线创建, 删除此Webhook后, 将导致本仓库相关流水线失效。"} title="无法删除此Webhook" overlayClassName="disabledButPopover"><Button className="ml20" type="danger" onClick={()=>{deleteFunc(i)}} disabled>删除</Button></Popover>
                   </span>}
                 </List.Item>
               )

src/forge/Settings/Webhooks/Index.scss

@@ -179,5 +179,5 @@
   justify-content: center;
 }
 .disabledButPopover{
-  width: 300px;
+  width: 310px;
 }