From eb93210a0ae8fadfd1d3873cf8d58ccd1ac6d727 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 7 Feb 2022 09:09:42 +0000
Subject: [PATCH 1/5] * Finish task #48606.

---
 module/sonarqube/control.php                 | 7 ++++++-
 module/sonarqube/view/browseproject.html.php | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index f30170956e..531c022fcb 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -269,14 +269,19 @@ class sonarqube extends control
         $pager    = new pager($recTotal, $recPerPage, $pageID);
         $sonarqubeProjectList = array_chunk($sonarqubeProjectList, $pager->recPerPage);
 
+        /* Get success jobs of sonarqube.*/
+        $projectJobPairs = $this->loadModel('job')->getJobBySonarqubeProject($sonarqubeID, $projectKeyList);
+        $successJobs     = $this->loadModel('compile')->getSuccessJobs($projectJobPairs);
+
         $this->view->sonarqube            = $this->loadModel('pipeline')->getByID($sonarqubeID);
         $this->view->keyword              = urldecode(urldecode($keyword));
         $this->view->pager                = $pager;
         $this->view->title                = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->browseProject;
         $this->view->sonarqubeID          = $sonarqubeID;
         $this->view->sonarqubeProjectList = (empty($sonarqubeProjectList) or empty($sonarqubeProjectList[$pageID - 1])) ? array() : $sonarqubeProjectList[$pageID - 1];
-        $this->view->projectJobPairs      = $this->loadModel('job')->getJobBySonarqubeProject($sonarqubeID, $projectKeyList);
+        $this->view->projectJobPairs      = $projectJobPairs;
         $this->view->orderBy              = $orderBy;
+        $this->view->successJobs          = $successJobs;
         $this->display();
     }
 
diff --git a/module/sonarqube/view/browseproject.html.php b/module/sonarqube/view/browseproject.html.php
index f068913912..9e769f166d 100644
--- a/module/sonarqube/view/browseproject.html.php
+++ b/module/sonarqube/view/browseproject.html.php
@@ -49,7 +49,7 @@
           <th class='c-key text-left'><?php common::printOrderLink('key', $orderBy, $vars, $lang->sonarqube->projectKey);?></th>
           <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->sonarqube->projectName);?></th>
           <th class='text-left'><?php common::printOrderLink('lastAnalysisDate', $orderBy, $vars, $lang->sonarqube->projectlastAnalysis);?></th>
-          <th class='c-actions-2'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -67,6 +67,7 @@
             {
                 $jobID = $projectJobPairs[$sonarqubeProject->key];
                 common::printIcon('sonarqube', 'execJob', "jobID=$jobID", '', 'list', 'sonarqube', 'hiddenwin');
+                if(in_array($jobID, $successJobs)) common::printIcon('sonarqube', 'reportView', "jobID=$jobID", '', 'list', 'audit', '', 'iframe', true);
             }
             ?>
           </td>

From b4766914bc931ec9993f2f80d0b24a8c18747d6a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 8 Feb 2022 03:21:20 +0000
Subject: [PATCH 2/5] * Finish task #48608.

---
 module/group/lang/resource.php            | 3 +++
 module/sonarqube/lang/en.php              | 1 +
 module/sonarqube/lang/zh-cn.php           | 1 +
 module/sonarqube/view/reportview.html.php | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 44c6f8f36a..e5046d4280 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1404,6 +1404,7 @@ $lang->resource->sonarqube->browseProject = 'browseProject';
 $lang->resource->sonarqube->deleteProject = 'deleteProject';
 $lang->resource->sonarqube->execJob       = 'execJob';
 $lang->resource->sonarqube->reportView    = 'reportView';
+$lang->resource->sonarqube->browseIssue   = 'browseIssue';
 
 $lang->sonarqube->methodOrder[5]  = 'browse';
 $lang->sonarqube->methodOrder[10] = 'create';
@@ -1412,6 +1413,8 @@ $lang->sonarqube->methodOrder[20] = 'delete';
 $lang->sonarqube->methodOrder[25] = 'browseProject';
 $lang->sonarqube->methodOrder[35] = 'deleteProject';
 $lang->sonarqube->methodOrder[40] = 'execJob';
+$lang->sonarqube->methodOrder[45] = 'reportView';
+$lang->sonarqube->methodOrder[50] = 'browseIssue';
 
 /* merge request. */
 $lang->resource->mr = new stdclass();
diff --git a/module/sonarqube/lang/en.php b/module/sonarqube/lang/en.php
index e3f1f3c00b..a14e263602 100644
--- a/module/sonarqube/lang/en.php
+++ b/module/sonarqube/lang/en.php
@@ -14,6 +14,7 @@ $lang->sonarqube->placeholderSearch = 'Project name';
 $lang->sonarqube->execJob           = "Exec SonarQube Job";
 $lang->sonarqube->desc              = 'Description';
 $lang->sonarqube->reportView        = "SonarQube Report";
+$lang->sonarqube->browseIssue       = "SonarQube Issue List";
 
 $lang->sonarqube->id             = 'ID';
 $lang->sonarqube->name           = "Server Name";
diff --git a/module/sonarqube/lang/zh-cn.php b/module/sonarqube/lang/zh-cn.php
index 583300c3cd..40750f815f 100644
--- a/module/sonarqube/lang/zh-cn.php
+++ b/module/sonarqube/lang/zh-cn.php
@@ -14,6 +14,7 @@ $lang->sonarqube->placeholderSearch = '请输入项目名称';
 $lang->sonarqube->execJob           = "执行SonarQube任务";
 $lang->sonarqube->desc              = '描述';
 $lang->sonarqube->reportView        = "SonarQube报告";
+$lang->sonarqube->browseIssue       = "SonarQube问题列表";
 
 $lang->sonarqube->id             = 'ID';
 $lang->sonarqube->name           = "服务器名称";
diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php
index e64ed8387e..2823c3ec29 100644
--- a/module/sonarqube/view/reportview.html.php
+++ b/module/sonarqube/view/reportview.html.php
@@ -19,7 +19,7 @@
     <div class="page-title">
       <span class='text' title="<?php echo $projectName;?>">
         <h4>
-          <?php echo $projectName;?>
+          <?php common::printLink('sonarqube', 'browseIssue', "", "" . $projectName, '', "target='_parent'");?>
           <?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
           <span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
             <?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>

From 13f86ba2bff7b2734192418dc0039f54a013738b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 8 Feb 2022 06:13:26 +0000
Subject: [PATCH 3/5] * Modify null data.

---
 module/sonarqube/view/reportview.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php
index 2823c3ec29..759585a669 100644
--- a/module/sonarqube/view/reportview.html.php
+++ b/module/sonarqube/view/reportview.html.php
@@ -19,7 +19,7 @@
     <div class="page-title">
       <span class='text' title="<?php echo $projectName;?>">
         <h4>
-          <?php common::printLink('sonarqube', 'browseIssue', "", "" . $projectName, '', "target='_parent'");?>
+          <?php common::printLink('sonarqube', 'browseIssue', "", $projectName, '', "target='_parent'");?>
           <?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
           <span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
             <?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>

From 0043fe9a8feb8bf63085babe772840ce9c2e9917 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 8 Feb 2022 06:22:20 +0000
Subject: [PATCH 4/5] * Add param to url.

---
 module/sonarqube/control.php              | 1 +
 module/sonarqube/view/reportview.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index 531c022fcb..215056b83d 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -86,6 +86,7 @@ class sonarqube extends control
         $this->view->measures    = $measures;
         $this->view->qualitygate = $qualitygate;
         $this->view->projectName = $projectName;
+        $this->view->sonarqubeID = $job->sonarqubeServer;
 
         $this->display();
     }
diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php
index 759585a669..48525c85f5 100644
--- a/module/sonarqube/view/reportview.html.php
+++ b/module/sonarqube/view/reportview.html.php
@@ -19,7 +19,7 @@
     <div class="page-title">
       <span class='text' title="<?php echo $projectName;?>">
         <h4>
-          <?php common::printLink('sonarqube', 'browseIssue', "", $projectName, '', "target='_parent'");?>
+          <?php common::hasPriv('sonarqube', 'browseIssue') ? common::printLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project={$projectName}", $projectName, '', "target='_parent'") : $projectName;?>
           <?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
           <span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
             <?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>

From bfca373bcacf952714c7823eb8305d1bfc796828 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 8 Feb 2022 06:29:36 +0000
Subject: [PATCH 5/5] * Modify url create.

---
 module/sonarqube/view/reportview.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php
index 48525c85f5..801902d98b 100644
--- a/module/sonarqube/view/reportview.html.php
+++ b/module/sonarqube/view/reportview.html.php
@@ -19,7 +19,7 @@
     <div class="page-title">
       <span class='text' title="<?php echo $projectName;?>">
         <h4>
-          <?php common::hasPriv('sonarqube', 'browseIssue') ? common::printLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project={$projectName}", $projectName, '', "target='_parent'") : $projectName;?>
+          <?php echo common::hasPriv('sonarqube', 'browseIssue') ? html::a($this->createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project={$projectName}"), $projectName, '_parent') : $projectName;?>
           <?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
           <span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
             <?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>