feat: add history delete

Author: SamYSF

console/atest-ui/src/locales/en.json

@@ -50,7 +50,8 @@
         "filter": "Filter Keyword",
         "noParameter": "No Parameter",
         "testsuite": "Test Suite:",
-        "apiAddress": "API Address:"
+        "apiAddress": "API Address:",
+        "runningAt": "Running At:"
     },
     "field": {
         "name": "Name",

console/atest-ui/src/locales/zh.json

@@ -45,7 +45,8 @@
         "filter": "过滤",
         "noParameter": "无参数",
         "testsuite": "测试集：",
-        "apiAddress": "API 地址："
+        "apiAddress": "API 地址：",
+        "runningAt": "运行于："
     },
     "field": {
         "name": "名称",

console/atest-ui/src/views/TestCase.vue

@@ -50,7 +50,6 @@ const runTestCase = () => {
   requestLoading.value = true
   const name = props.name
   const suite = props.suite
-
   API.RunTestCase({
     suiteName: suite,
     name: name,
@@ -63,7 +62,6 @@ const runTestCase = () => {
 
     requestLoading.value = false
     UIAPI.ErrorTip(e)
-
     parseResponseBody(e.body)
   })
 }
@@ -84,26 +82,36 @@ const parseResponseBody = (body) => {
 const handleTestResult = (e) => {
   testResult.value = e;
 
-  if (e.error !== '') {
-      ElMessage({
-        message: e.error,
-        type: 'error'
-      })
-    } else {
-      ElMessage({
-        message: 'Pass!',
-        type: 'success'
-      })
-    }
-    parseResponseBody(e.body)
+  if (!isHistoryTestCase.value) {
+    handleTestResultError(e)
+  }
+
+  if (e.body !== '') {
+    testResult.value.bodyObject = JSON.parse(e.body);
+    testResult.value.originBodyObject = JSON.parse(e.body);
+  }
 
     Cache.SetTestCaseResponseCache(suite + '-' + name, {
       body: testResult.value.bodyObject,
       output: e.output,
       statusCode: testResult.value.statusCode
     } as TestCaseResponse)
 
-    parameters.value = []
+  parameters.value = [];
+}
+
+const handleTestResultError = (e) => {
+  if (e.error !== '') {
+    ElMessage({
+      message: e.error,
+      type: 'error'
+    });
+  } else {
+    ElMessage({
+      message: 'Pass!',
+      type: 'success'
+    });
+  }
 }
 
 const responseBodyFilterText = ref('')
@@ -213,6 +221,7 @@ let suite
 let historySuiteName
 let historyCaseID
 const isHistoryTestCase = ref(false)
+const HistoryTestCaseCreateTime = ref('')
 
 function load() {
    name = props.name
@@ -238,11 +247,12 @@ function load() {
 
   if (historySuiteName != '' && historySuiteName != undefined) {
     isHistoryTestCase.value = true
-    API.GetHistoryTestCase({
+    API.GetHistoryTestCaseWithResult({
       historyCaseID : historyCaseID
     }, (e) => {
       processResponse(e.data)
       handleTestResult(e.testCaseResult[0])
+      formatDate(e.createTime)
     })
   } else {
     API.GetTestCase({
@@ -254,6 +264,22 @@ function load() {
   }
 }
 
+function formatDate(createTimeStr : string){
+  let parts = createTimeStr.split(/[T.Z]/);
+    let datePart = parts[0].split("-");
+    let timePart = parts[1].split(":");
+
+    let year = datePart[0];
+    let month = datePart[1];
+    let day = datePart[2];
+    let hours = timePart[0];
+    let minutes = timePart[1];
+    let seconds = timePart[2].split(".")[0];
+
+    let formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    HistoryTestCaseCreateTime.value = formattedDate
+}
+
 function processResponse(e) {
   if (e.request.method === '') {
     e.request.method = 'GET'
@@ -334,28 +360,40 @@ function saveTestCase(tip: boolean = true, callback: (c: any) => void) {
   }, UIAPI.ErrorTip, saveLoading)
 }
 
-function deleteTestCase() {
+function deleteCase() {
   const name = props.name
   const suite = props.suite
+  const historyCaseID = props.historyCaseID
 
-  API.DeleteTestCase({
-    suiteName: suite,
-    name: name
-  }, (e) => {
-    if (e.ok) {
-      emit('updated', 'hello from child')
+  if (isHistoryTestCase.value == true){
+    deleteHistoryTestCase(historyCaseID)
+  } else {
+    deleteTestCase(name, suite)
+  }
+}
 
-      ElMessage({
-        message: 'Delete.',
-        type: 'success'
-      })
+function deleteHistoryTestCase(historyCaseID : string){
+  API.DeleteHistoryTestCase({ historyCaseID }, handleDeleteResponse);
+}
 
-      // clean all the values
-      testCaseWithSuite.value = emptyTestCaseWithSuite
-    } else {
-      UIAPI.ErrorTip(e)
-    }
-  })
+function deleteTestCase(name : string, suite : string){
+  API.DeleteTestCase({ suiteName: suite, name }, handleDeleteResponse);
+}
+
+function handleDeleteResponse(e) {
+  if (e.ok) {
+    emit('updated', 'hello from child');
+
+    ElMessage({
+      message: 'Delete.',
+      type: 'success'
+    });
+
+    // Clean all the values
+    testCaseWithSuite.value = emptyTestCaseWithSuite;
+  } else {
+    UIAPI.ErrorTip(e);
+  }
 }
 
 const codeDialogOpened = ref(false)
@@ -593,9 +631,10 @@ Magic.Keys(() => {
         <el-button type="primary" @click="saveTestCase" :icon="Edit" :loading="saveLoading"
           v-if="!Cache.GetCurrentStore().readOnly && !isHistoryTestCase"
           >{{ t('button.save') }}</el-button>
-        <el-button type="danger" @click="deleteTestCase" :icon="Delete">{{ t('button.delete') }}</el-button>
+        <el-button type="danger" @click="deleteCase" :icon="Delete">{{ t('button.delete') }}</el-button>
         <el-button type="primary" @click="openDuplicateTestCaseDialog" :icon="CopyDocument">{{ t('button.duplicate') }}</el-button>
         <el-button type="primary" @click="openCodeDialog">{{ t('button.generateCode') }}</el-button>
+        <span v-if="isHistoryTestCase" style="margin-left: 15px;">{{ t('tip.runningAt') }}{{ HistoryTestCaseCreateTime }}</span>
       </div>
       <div style="display: flex;">
         <el-select
@@ -703,7 +742,7 @@ Magic.Keys(() => {
             <el-table-column label="Key">
               <template #default="scope">
                 <el-input v-model="scope.row.key" placeholder="Key"
-                @change="cookieChange"  
+                @change="cookieChange"
                 />
               </template>
             </el-table-column>

console/atest-ui/src/views/net.ts

@@ -559,6 +559,23 @@ const GetTestSuiteYaml = (suite: string, callback: (d: any) => void, errHandle?:
     .catch(errHandle)
 }
 
+function GetHistoryTestCaseWithResult(req: HistoryTestCase,
+  callback: (d: any) => void, errHandle?: (e: any) => void | null) {
+  const requestOptions = {
+    method: 'POST',
+    headers: {
+      'X-Store-Name': Cache.GetCurrentStore().name,
+      'X-Auth': getToken()
+    },
+    body: JSON.stringify({
+      ID : req.historyCaseID
+    })
+  }
+  fetch('/server.Runner/GetHistoryTestCaseWithResult', requestOptions)
+    .then(DefaultResponseProcess)
+    .then(callback).catch(errHandle)
+}
+
 function GetHistoryTestCase(req: HistoryTestCase,
   callback: (d: any) => void, errHandle?: (e: any) => void | null) {
   const requestOptions = {
@@ -576,19 +593,34 @@ function GetHistoryTestCase(req: HistoryTestCase,
     .then(callback).catch(errHandle)
 }
 
+function DeleteHistoryTestCase(req: HistoryTestCase,
+  callback: (d: any) => void, errHandle?: (e: any) => void | null) {
+    const requestOptions = {
+      method: 'POST',
+      headers: {
+        'X-Store-Name': Cache.GetCurrentStore().name,
+        'X-Auth': getToken()
+      },
+      body: JSON.stringify({
+        ID : req.historyCaseID
+      })
+    }
+    fetch('/server.Runner/DeleteHistoryTestCase', requestOptions)
+      .then(callback).catch(errHandle)
+}
+
 export const API = {
-    DefaultResponseProcess,
-    GetVersion,
-    CreateTestSuite, UpdateTestSuite, ImportTestSuite, GetTestSuite, DeleteTestSuite, ConvertTestSuite, GetTestSuiteYaml,
-    DuplicateTestSuite,
-    CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase, DuplicateTestCase,
-    GetHistoryTestCase,
-    GenerateCode, ListCodeGenerator,
-    PopularHeaders,
-    CreateOrUpdateStore, GetStores, DeleteStore, VerifyStore,
-    FunctionsQuery,
-    GetSecrets, DeleteSecret, CreateOrUpdateSecret,
-    GetSuggestedAPIs,
-    ReloadMockServer, GetMockConfig,
-    getToken
+  DefaultResponseProcess,
+  GetVersion,
+  CreateTestSuite, UpdateTestSuite, ImportTestSuite, GetTestSuite, DeleteTestSuite, ConvertTestSuite,GetTestSuiteYaml,
+  CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase,
+  GetHistoryTestCaseWithResult, DeleteHistoryTestCase,GetHistoryTestCase,
+  GenerateCode, ListCodeGenerator,
+  PopularHeaders,
+  CreateOrUpdateStore, GetStores, DeleteStore, VerifyStore,
+  FunctionsQuery,
+  GetSecrets, DeleteSecret, CreateOrUpdateSecret,
+  GetSuggestedAPIs,
+  ReloadMockServer, GetMockConfig,
+  getToken
 }

pkg/server/convert.go

@@ -65,6 +65,37 @@ func ToNormalStore(store *Store) (result testing.Store) {
 	return
 }
 
+func ConvertToGRPCHistoryTestCase(historyTestcase testing.HistoryTestCase) (result *HistoryTestCase) {
+	req := historyTestcase.Data.Request
+	res := historyTestcase.Data.Expect
+	result = &HistoryTestCase{
+		CaseName:   historyTestcase.CaseName,
+		SuiteName:  historyTestcase.SuiteName,
+		SuiteApi:   historyTestcase.SuiteAPI,
+		SuiteParam: mapToPair(historyTestcase.SuiteParam),
+
+		Request: &Request{
+			Api:    req.API,
+			Method: req.Method,
+			Body:   req.Body.String(),
+			Header: mapToPair(req.Header),
+			Query:  mapInterToPair(req.Query),
+			Form:   mapToPair(req.Form),
+		},
+
+		Response: &Response{
+			Body:             res.Body,
+			StatusCode:       int32(res.StatusCode),
+			Schema:           res.Schema,
+			Verify:           res.Verify,
+			Header:           mapToPair(res.Header),
+			BodyFieldsExpect: mapInterToPair(res.BodyFieldsExpect),
+		},
+	}
+	result.SuiteSpec = ToGRPCTestSuiteSpec(historyTestcase.SuiteSpec)
+	return
+}
+
 func ToGRPCSuite(suite *testing.TestSuite) (result *TestSuite) {
 	result = &TestSuite{
 		Name:  suite.Name,

pkg/server/remote_server.go

@@ -528,16 +528,26 @@ func (s *server) GetTestCase(ctx context.Context, in *TestCaseIdentity) (reply *
 	return
 }
 
-func (s *server) GetHistoryTestCase(ctx context.Context, in *HistoryTestCase) (reply *HistoryTestResult, err error) {
+func (s *server) GetHistoryTestCaseWithResult(ctx context.Context, in *HistoryTestCase) (reply *HistoryTestResult, err error) {
 	var result testing.HistoryTestResult
 	loader := s.getLoader(ctx)
 	defer loader.Close()
-	if result, err = loader.GetHistoryTestCase(in.ID); err == nil {
+	if result, err = loader.GetHistoryTestCaseWithResult(in.ID); err == nil {
 		reply = ToGRPCHistoryTestCaseResult(result)
 	}
 	return
 }
 
+func (s *server) GetHistoryTestCase(ctx context.Context, in *HistoryTestCase) (reply *HistoryTestCase, err error) {
+	var result testing.HistoryTestCase
+	loader := s.getLoader(ctx)
+	defer loader.Close()
+	if result, err = loader.GetHistoryTestCase(in.ID); err == nil {
+		reply = ConvertToGRPCHistoryTestCase(result)
+	}
+	return
+}
+
 var ExecutionCountNum = promauto.NewCounter(prometheus.CounterOpts{
 	Name: "atest_execution_count",
 	Help: "The total number of request execution",
@@ -599,7 +609,7 @@ func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result
 				}
 				return
 			}
-		
+
 			result = &TestCaseResult{
 				Output:     reply.Message,
 				Error:      reply.Error,
@@ -625,7 +635,7 @@ func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result
 			result.Header = lastItem.Header
 			result.StatusCode = lastItem.StatusCode
 		}
-		
+
 		normalResult := ToNormalTestCaseResult(result)
 		var testSuite *testing.TestSuite
 		if testSuite, err = s.getSuiteFromTestTask(task); err != nil {
@@ -733,6 +743,14 @@ func (s *server) DeleteTestCase(ctx context.Context, in *TestCaseIdentity) (repl
 	return
 }
 
+func (s *server) DeleteHistoryTestCase(ctx context.Context, in *HistoryTestCase) (reply *HelloReply, err error) {
+	loader := s.getLoader(ctx)
+	defer loader.Close()
+	reply = &HelloReply{}
+	err = loader.DeleteHistoryTestCase(in.ID)
+	return
+}
+
 func (s *server) DuplicateTestCase(ctx context.Context, in *TestCaseDuplicate) (reply *HelloReply, err error) {
 	loader := s.getLoader(ctx)
 	defer loader.Close()