From ef19107fcded9e4a1bf01f7db5f93b216969d57e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 10 Nov 2020 18:09:38 +0800
Subject: [PATCH] sha link

---
 src/forge/Main/CoderRootBranch.js    |  2 +-
 src/forge/Main/CoderRootCommit.js    |  4 ++--
 src/forge/Main/CoderRootDirectory.js | 13 +++++++------
 src/forge/Main/CoderRootTag.js       |  5 ++---
 src/forge/Main/list.css              |  1 +
 src/forge/Merge/Commits.jsx          |  2 +-
 src/forge/Merge/MergeSubmit.js       |  4 +++-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js
index f2fe27b38..4fde90e4b 100644
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@@ -34,7 +34,7 @@ export default ((props)=>{
                   <div>
                     <Link to={`/projects/${owner}/${projectsId}?branch=${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                     <p className="f-wrap-alignCenter mt15">
-                      <span className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</span>
+                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                       <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
                       <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
                     </p>
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 8655fbfc7..36585fe3d 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -113,8 +113,8 @@ class CoderRootCommit extends Component{
                     return(
                       <div key={k}>
                         <p className="f-wrap-alignCenter">
-                          <span className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</span>
-                          <span className="flex1 ml20 font-16 color-grey-3">{item.message}</span>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
                         </p>
                         <p className="f-wrap-alignCenter mt15">
                           <Link to={`/users/${item.login}`} className="show-user-link">
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 12dbf73b8..1ff47e862 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -381,6 +381,7 @@ class CoderRootDirectory extends Component {
 
   title = (branchLastCommit,lastCommitAuthor) => {
     if (branchLastCommit) {
+      const { projectsId , owner } = this.props.match.params;
       return (
         <div className="f-wrap-alignCenter">
           {lastCommitAuthor ? (
@@ -406,13 +407,13 @@ class CoderRootDirectory extends Component {
           ) : (
             ""
           )}
-          <span className="color-blue flex-1 hide-1">
+          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="color-blue flex-1 hide-1">
             {branchLastCommit.message}
-          </span>
+          </Link>
           <span>{branchLastCommit.time_from_now}</span>
-          <span className="commitKey">
+          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="commitKey">
             {truncateCommitId(branchLastCommit.sha)}
-          </span>
+          </Link>
         </div>
       );
     }else{
@@ -440,9 +441,9 @@ class CoderRootDirectory extends Component {
         width: "60%",
         render: (text, item) =>
           item.commit && item.commit.message ? 
-            <span title={item.commit.message} className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
+            <Link  to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit.sha}`)}`} title={item.commit.message} className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
               {item.commit.message}
-            </span>
+            </Link>
           : ""
       },
       {
diff --git a/src/forge/Main/CoderRootTag.js b/src/forge/Main/CoderRootTag.js
index e295a6cdc..6a035fee8 100644
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@@ -3,13 +3,12 @@ import axios from 'axios';
 import { Spin } from 'antd';
 import { truncateCommitId } from '../common/util';
 import Nodata from '../Nodata';
-
+import { Link } from 'react-router-dom'
 
 export default (( props, { projectDetail }) => {
   const [isSpin, setSpin] = useState(true);
   const [data, setData] = useState(undefined);
 
-  const repo_id = projectDetail && projectDetail.repo_id;
   const { projectsId , owner } = props.match.params;
 
   useEffect(() => {
@@ -49,7 +48,7 @@ export default (( props, { projectDetail }) => {
                           <span className="font-16">{item.name}</span>
                         </span>
                         <span className="ul_tbody_third">
-                          <span className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</span>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                         </span>
                         <span className="ul_tbody_forth">
                           <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index c3006fd75..272583d1c 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -412,6 +412,7 @@
   padding: 13px 16px!important;
 }
 .commitKey{
+  cursor: pointer;
   border:1px solid #FD7700;
   background-color:#FFF3DC;
   color: #FD7700!important;
diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx
index 7e326bdfa..bb16d6b0a 100644
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@@ -18,7 +18,7 @@ function Commits({ commits , projectsId , owner }){
               <div className="prInfo">
                 <FlexAJ>
                   <AlignCenter>
-                    <span className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</span>
+                    <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                     <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                   </AlignCenter>
                   <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index 9ebb3bb2b..478081be9 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -5,6 +5,7 @@ import axios from 'axios';
 import{ Form , Table , Spin } from 'antd'
 import { getImageUrl } from 'educoder';
 import {Link} from "react-router-dom";
+import { truncateCommitId} from '../common/util';
 class MergeSubmit extends Component{
   constructor(props){
     super(props);
@@ -85,6 +86,7 @@ class MergeSubmit extends Component{
 
 
   render(){
+    const { projectsId , owner } = this.props.match.params;
     const { titledata } = this.state;
     const columns=[{
         title:"作者",
@@ -102,7 +104,7 @@ class MergeSubmit extends Component{
         title:"SHA",
         dataIndex: 'sha',
         render: (text) => (
-          <span className="commitKey">{text}</span>
+          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
         )
       },{
         title:"备注",