From c338db5dbf0c2b14dfa3171df6c054b3e01d8c97 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 15 Nov 2022 15:17:03 +0800
Subject: [PATCH 1/3] update webIDE login

---
 src/forge/Main/CoderDepot.jsx   | 8 ++------
 src/forge/Merge/MessageCount.js | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 60c70f051..aff47e0bf 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -75,8 +75,6 @@ function CoderDepot(props){
       }
       if(i && i.length === 0){
         setIssuesFlag(false);
-      console.log(bannerList);
-
       }
     }
   },[bannerList])
@@ -86,7 +84,7 @@ function CoderDepot(props){
     const url =  `/users/action.json`;
   
     axios.post(url,{
-      action_type:"webide-pr",
+      action_type:"webide",
       action_id:projectDetail && projectDetail.repo_id
     }).then(result=>{});
     window.open(path,"_blank");
@@ -105,7 +103,6 @@ function CoderDepot(props){
   },[details])
 
   useEffect(()=>{
-    console.log('treeValue:'+treeValue);
     if(treeValue){
       setTreeValuePath(decodeURIComponent(treeValue).split('/'));
     }else{
@@ -360,7 +357,6 @@ function CoderDepot(props){
   const baseOper = current_user && current_user.login && issuesFlag;
   const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && projectDetail.type !== 2 && pullsFlag && props.platform;
   const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
-  console.log("maidian:",props);
   return(
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@@ -479,7 +475,7 @@ function CoderDepot(props){
                         checkIfLogin && checkIfLogin()?
                         <a className='newBtn' onClick={()=>eventTrack(`/${owner}/${projectsId}/webIDE/tree/${defaultBranch}`)}>Web IDE <div className='newBtnImg'></div></a>
                         :
-                        <a className='newBtn' onClick={showLoginDialog}>Web IDE <div className='newBtnImg'></div></a>
+                        <a className='newBtn' onClick={()=>{showLoginDialog(`/${owner}/${projectsId}`)}}>Web IDE <div className='newBtnImg'></div></a>
                       }
 
                       <Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 648cb8c2f..8b4f8f30b 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -303,8 +303,8 @@ class MessageCount extends Component {
 
   codeReview=()=>{
     const {history,match , checkIfLogin , showLoginDialog}=this.props;
+    const { projectsId, mergeId , owner } =match.params;
     if(checkIfLogin && checkIfLogin()){
-      const { projectsId, mergeId , owner } =match.params;
       const { repo_id } = this.props && this.props.projectDetail;
       // 埋点
       const url =  `/users/action.json`;
@@ -317,7 +317,7 @@ class MessageCount extends Component {
         }
       });
     }else{
-      showLoginDialog && showLoginDialog();
+      showLoginDialog && showLoginDialog(`/${owner}/${projectsId}/pulls/${mergeId}`);
     }
   }
 

From 94ffb5d299f7af373f3498926d3380669118aea0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 15 Nov 2022 15:50:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?settings=E6=8E=A5=E5=8F=A3=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 9d7745691..3aca48dc2 100644
--- a/src/App.js
+++ b/src/App.js
@@ -208,7 +208,7 @@ class App extends Component {
   componentDidMount() {
     document.title = "loading...";
 
-    this.getAppdata();
+    // this.getAppdata();
 
     window.addEventListener('error', (event) => {
       const msg = `${event.type}: ${event.message}`;

From 069af4e5f7e817aea729bdcf56136cba10d1e617 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 15 Nov 2022 15:58:46 +0800
Subject: [PATCH 3/3] issue 53976

---
 src/App.js               | 2 +-
 src/forge/Head/Header.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js
index 3aca48dc2..9d7745691 100644
--- a/src/App.js
+++ b/src/App.js
@@ -208,7 +208,7 @@ class App extends Component {
   componentDidMount() {
     document.title = "loading...";
 
-    // this.getAppdata();
+    this.getAppdata();
 
     window.addEventListener('error', (event) => {
       const msg = `${event.type}: ${event.message}`;
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 58d3fcaef..79d093a3b 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -51,7 +51,11 @@ class NewHeader extends Component {
     }
   }
   componentDidMount() {
-    this.geturlsdata();
+    // this.geturlsdata();
+    let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
+    this.setState({
+      settings
+    })
     window._header_componentHandler = this;
 
     try {