Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3

backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java

@@ -25,6 +25,7 @@ import java.util.List;
 
 @RequestMapping("/test/case/review")
 @RestController
+@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
 public class TestCaseReviewController {
 
     @Resource
@@ -33,7 +34,6 @@ public class TestCaseReviewController {
     TestReviewProjectService testReviewProjectService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
-    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public Pager<List<TestCaseReviewDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryCaseReviewRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, testCaseReviewService.listCaseReview(request));
@@ -46,19 +46,16 @@ public class TestCaseReviewController {
     }
 
     @PostMapping("/project")
-    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public List<Project> getProjectByReviewId(@RequestBody TestCaseReview request) {
         return testCaseReviewService.getProjectByReviewId(request);
     }
 
     @PostMapping("/reviewer")
-    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public List<User> getUserByReviewId(@RequestBody TestCaseReview request) {
         return testCaseReviewService.getUserByReviewId(request);
     }
 
     @GetMapping("/recent/{count}")
-    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public List<TestCaseReviewDTO> recentTestPlans(@PathVariable int count) {
         String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId();
         PageHelper.startPage(1, count, true);

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8

frontend/src/business/components/track/plan/event-bus.js

@@ -0,0 +1,2 @@
+import Vue from 'vue';
+export const hub = new Vue();

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue

@@ -359,6 +359,8 @@ export default {
     handleClose() {
       removeGoBackListener(this.handleClose);
       this.showDialog = false;
+      this.searchParam.status = null;
+      this.$emit('update:search-param', this.searchParam);
     },
     cancel() {
       this.handleClose();

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -196,7 +196,7 @@
 
       <test-plan-test-case-edit
         ref="testPlanTestCaseEdit"
-        :search-param="condition"
+        :search-param.sync="condition"
         @refresh="initTableData"
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
@@ -233,6 +233,7 @@
   import ShowMoreBtn from "../../../case/components/ShowMoreBtn";
   import BatchEdit from "../../../case/components/BatchEdit";
   import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
+  import {hub} from "@/business/components/track/plan/event-bus";
 
   export default {
     name: "TestPlanTestCaseList",
@@ -336,9 +337,17 @@
       }
     },
     mounted() {
+      hub.$on("openFailureTestCase", row => {
+        this.isReadOnly = true;
+        this.condition.status = 'Failure';
+        this.$refs.testPlanTestCaseEdit.openTestCaseEdit(row);
+      });
       this.refreshTableAndPlan();
       this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
     },
+    beforeDestroy() {
+      hub.$off("openFailureTestCase");
+    },
     methods: {
       initTableData() {
         if (this.planId) {

frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue

@@ -4,6 +4,7 @@
     <template>
       <el-table
         row-key="id"
+        @row-click="goFailureTestCase"
         :data="failureTestCases">
         <el-table-column
           prop="num"
@@ -91,6 +92,7 @@
     import TypeTableItem from "../../../../../common/tableItems/planview/TypeTableItem";
     import MethodTableItem from "../../../../../common/tableItems/planview/MethodTableItem";
     import StatusTableItem from "../../../../../common/tableItems/planview/StatusTableItem";
+    import {hub} from "@/business/components/track/plan/event-bus";
     export default {
       name: "FailureResultComponent",
       components: {StatusTableItem, MethodTableItem, TypeTableItem, PriorityTableItem, CommonComponent},
@@ -122,6 +124,11 @@
             ]
           }
         }
+      },
+      methods: {
+        goFailureTestCase(row) {
+          hub.$emit("openFailureTestCase", row);
+        }
       }
     }
 </script>

frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

@@ -6,7 +6,7 @@
                          :show-create="false" :tip="$t('commons.search_by_name_or_id')">
           <template v-slot:title>
             <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"
-                             :title="$t('test_track.review_view.all_review')"/>
+                             :title="$t('test_track.review_view.all_case')"/>
           </template>
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" icon="el-icon-video-play"

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

frontend/src/i18n/en-US.js

@@ -776,7 +776,7 @@ export default {
     },
     review_view: {
       review: "Review",
-      all_review: "All Review",
+      all_case: "All case",
       start_review: "Start Review",
       relevance_case: "Relevance Case",
       execute_result: "Result",

frontend/src/i18n/zh-CN.js

@@ -782,7 +782,7 @@ export default {
     },
     review_view: {
       review: "评审",
-      all_review: "全部评审",
+      all_case: "全部用例",
       start_review: "开始评审",
       relevance_case: "关联用例",
       execute_result: "执行结果",

frontend/src/i18n/zh-TW.js

@@ -778,7 +778,7 @@ export default {
     },
     review_view: {
       review: "評審",
-      all_review: "全部評審",
+      all_case: "全部用例",
       start_review: "開始評審",
       relevance_case: "關聯用例",
       execute_result: "執行結果",