From 22d587869c6474c0c0bbb851ad8e30af1882f77d Mon Sep 17 00:00:00 2001
From: ysf <1807100869@qq.com>
Date: Mon, 9 Sep 2024 21:28:36 +0800
Subject: [PATCH] fix: fix the remaining problem

---
 console/atest-ui/src/views/TestCase.vue |  5 ++--
 pkg/server/convert.go                   | 39 ++++---------------------
 pkg/testing/case.go                     |  4 +--
 pkg/testing/remote/converter.go         |  6 ++--
 pkg/testing/remote/grpc_store.go        |  2 +-
 5 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/console/atest-ui/src/views/TestCase.vue b/console/atest-ui/src/views/TestCase.vue
index 87b96671..27c24d70 100644
--- a/console/atest-ui/src/views/TestCase.vue
+++ b/console/atest-ui/src/views/TestCase.vue
@@ -838,6 +838,7 @@ Magic.Keys(() => {
           placeholder="Method"
           size="default"
           test-id="case-editor-method"
+          :disabled="isHistoryTestCase"
         >
           <el-option
             v-for="item in options"
@@ -1109,7 +1110,7 @@ Magic.Keys(() => {
         </template>
       </el-drawer>
 
-      <el-dialog v-model="historyDialogOpened" :title="t('button.viewHistory')" width="50%" draggable>
+      <el-dialog v-model="historyDialogOpened" :title="t('button.viewHistory')" width="60%" draggable>
         <el-form
           ref="viewHistoryRef"
           :model="historyForm"
@@ -1137,7 +1138,7 @@ Magic.Keys(() => {
                 </el-select>
               </el-col>
               <el-col :span="4">
-              <div style="display: flex">
+              <div style="display: flex;flex-wrap: nowrap;justify-content: flex-end;">
                 <el-button
                   type="primary"
                   @click="submitForm(viewHistoryRef)"
diff --git a/pkg/server/convert.go b/pkg/server/convert.go
index 2cabd3a1..64503e10 100644
--- a/pkg/server/convert.go
+++ b/pkg/server/convert.go
@@ -239,45 +239,15 @@ func ToNormalTestCaseResult(testCaseResult *TestCaseResult) (result testing.Test
 }
 
 func ToGRPCHistoryTestCaseResult(historyTestResult testing.HistoryTestResult) (result *HistoryTestResult) {
-	res := historyTestResult.Data.Data.Request
-	resp := historyTestResult.Data.Data.Expect
-	
+	convertedHistoryTestCase := ConvertToGRPCHistoryTestCase(historyTestResult.Data)
+
 	result = &HistoryTestResult{
 		Message:    historyTestResult.Message,
 		Error:      historyTestResult.Error,
 		CreateTime: timestamppb.New(historyTestResult.CreateTime),
-
-		Data: &HistoryTestCase{
-			HistorySuiteName: historyTestResult.Data.HistorySuiteName,
-			CaseName:         historyTestResult.Data.CaseName,
-			CreateTime:       timestamppb.New(historyTestResult.CreateTime),
-			SuiteName:        historyTestResult.Data.SuiteName,
-			SuiteApi:         historyTestResult.Data.SuiteAPI,
-			SuiteParam:       mapToPair(historyTestResult.Data.SuiteParam),
-
-			Request: &Request{
-				Api:    res.API,
-				Method: res.Method,
-				Body:   res.Body.String(),
-				Header: mapToPair(res.Header),
-				Cookie: mapToPair(res.Cookie),
-				Query:  mapInterToPair(res.Query),
-				Form:   mapToPair(res.Form),
-			},
-
-			Response: &Response{
-				StatusCode:       int32(resp.StatusCode),
-				Body:             resp.Body,
-				Schema:           resp.Schema,
-				Verify:           resp.Verify,
-				BodyFieldsExpect: mapInterToPair(resp.BodyFieldsExpect),
-				Header:           mapToPair(resp.Header),
-			},
-		},
+		Data:       convertedHistoryTestCase,
 	}
 
-	result.Data.SuiteSpec = ToGRPCTestSuiteSpec(historyTestResult.Data.SuiteSpec)
-
 	for _, testCaseResult := range historyTestResult.TestCaseResult {
 		result.TestCaseResult = append(result.TestCaseResult, &TestCaseResult{
 			StatusCode: int32(testCaseResult.StatusCode),
@@ -288,7 +258,8 @@ func ToGRPCHistoryTestCaseResult(historyTestResult testing.HistoryTestResult) (r
 			Id:         testCaseResult.Id,
 		})
 	}
-	return
+
+	return result
 }
 
 func ToGRPCTestSuiteSpec(spec testing.APISpec) (result *APISpec) {
diff --git a/pkg/testing/case.go b/pkg/testing/case.go
index 9ca251fc..0e83ae6b 100644
--- a/pkg/testing/case.go
+++ b/pkg/testing/case.go
@@ -50,7 +50,7 @@ type HistoryTestCase struct {
 	CaseName         string            `yaml:"caseName,omitempty" json:"name,omitempty"`
 	SuiteName        string            `yaml:"suiteName,omitempty" json:"suiteName,omitempty"`
 	HistorySuiteName string            `yaml:"historySuiteName,omitempty" json:"historySuiteName,omitempty"`
-	CreateTime       time.Time            `yaml:"createTime,omitempty" json:"createTime,omitempty"`
+	CreateTime       time.Time         `yaml:"createTime,omitempty" json:"createTime,omitempty"`
 	SuiteAPI         string            `yaml:"api,omitempty" json:"api,omitempty"`
 	SuiteSpec        APISpec           `yaml:"spec,omitempty" json:"spec,omitempty"`
 	SuiteParam       map[string]string `yaml:"param,omitempty" json:"param,omitempty"`
@@ -62,7 +62,7 @@ type HistoryTestResult struct {
 	Error          string           `yaml:"error,omitempty" json:"error,omitempty"`
 	TestCaseResult []TestCaseResult `yaml:"testCaseResult,omitempty" json:"testCaseResult,omitempty"`
 	Data           HistoryTestCase  `yaml:"data,omitempty" json:"data,omitempty"`
-	CreateTime     time.Time           `yaml:"createTime,omitempty" json:"createTime,omitempty"`
+	CreateTime     time.Time        `yaml:"createTime,omitempty" json:"createTime,omitempty"`
 }
 
 type RPCDesc struct {
diff --git a/pkg/testing/remote/converter.go b/pkg/testing/remote/converter.go
index f107110c..d9620d3a 100644
--- a/pkg/testing/remote/converter.go
+++ b/pkg/testing/remote/converter.go
@@ -300,7 +300,7 @@ func pairToInterMap(pairs []*server.Pair) (data map[string]interface{}) {
 	return
 }
 
-func ConvertToGRPCTestCaseResult(testCaseResult testing.TestCaseResult, testSuite *testing.TestSuite) (result *server.HistoryTestResult) {
+func ConvertToGRPCHistoryTestCaseResult(testCaseResult testing.TestCaseResult, testSuite *testing.TestSuite) (result *server.HistoryTestResult) {
 	result = &server.HistoryTestResult{
 		Error:      testCaseResult.Error,
 		CreateTime: timestamppb.New(time.Now()),
@@ -340,7 +340,7 @@ func ConvertToNormalTestCaseResult(testResult *server.HistoryTestResult) (result
 	}
 
 	for _, testCaseResult := range testResult.TestCaseResult {
-		testCaseResult := testing.TestCaseResult{
+		testcaseResult := testing.TestCaseResult{
 			StatusCode: int(testCaseResult.StatusCode),
 			Body:       testCaseResult.Body,
 			Header:     pairToMap(testCaseResult.Header),
@@ -348,7 +348,7 @@ func ConvertToNormalTestCaseResult(testResult *server.HistoryTestResult) (result
 			Id:         testCaseResult.Id,
 			Output:     testCaseResult.Output,
 		}
-		result.TestCaseResult = append(result.TestCaseResult, testCaseResult)
+		result.TestCaseResult = append(result.TestCaseResult, testcaseResult)
 	}
 	result.Data = ConvertToNormalHistoryTestCase(testResult.Data)
 
diff --git a/pkg/testing/remote/grpc_store.go b/pkg/testing/remote/grpc_store.go
index 50caa311..dd3410f2 100644
--- a/pkg/testing/remote/grpc_store.go
+++ b/pkg/testing/remote/grpc_store.go
@@ -164,7 +164,7 @@ func (g *gRPCLoader) DeleteTestCase(suite, testcase string) (err error) {
 }
 
 func (g *gRPCLoader) CreateHistoryTestCase(testcaseResult testing.TestCaseResult, testSuite *testing.TestSuite) (err error) {
-	payload := ConvertToGRPCTestCaseResult(testcaseResult, testSuite)
+	payload := ConvertToGRPCHistoryTestCaseResult(testcaseResult, testSuite)
 	_, err = g.client.CreateTestCaseHistory(g.ctx, payload)
 	return
 }