Skip to content

Commit 7ebe10e

Browse files
SamYSFSamYSF
committed
fix: fix history page display
1 parent 4e54fa9 commit 7ebe10e

File tree

16 files changed

+660
-623
lines changed

16 files changed

+660
-623
lines changed

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

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function generateCode() {
163163
const ID = props.historyCaseID
164164
if (isHistoryTestCase.value == true){
165165
API.HistoryGenerateCode({
166-
ID: ID,
166+
id: ID,
167167
generator: currentCodeGenerator.value
168168
}, (e) => {
169169
ElMessage({
@@ -401,6 +401,9 @@ function setTestCaseWithSuite(e, suite) {
401401
suiteName: suite,
402402
data: e
403403
} as TestCaseWithSuite;
404+
if (isHistoryTestCase.value == true){
405+
testCaseWithSuite.value.data.request.api = `${testCaseWithSuite.value.data.suiteApi}${testCaseWithSuite.value.data.request.api}`
406+
}
404407
}
405408
406409
load()
@@ -515,14 +518,28 @@ function openHistoryDialog(){
515518
})
516519
}
517520
521+
function handleDialogClose(){
522+
caseRevertLoading.value = false
523+
historyDialogOpened.value = false
524+
historyForm.value.selectedID = ''
525+
const target = document.getElementById('compareView');
526+
target.innerHTML = ''
527+
}
528+
518529
function handleHistoryChange(value) {
519530
selectedHistory.value = historyRecords.value.find(record => record.ID === value);
520531
const {
521532
caseName: name,
522533
suiteName,
523534
request,
524-
response
535+
response,
536+
historyHeader,
525537
} = selectedHistory.value;
538+
request.header = historyHeader
539+
request.header.push({
540+
key: '',
541+
value: ''
542+
})
526543
formatHistoryCase.value = {
527544
name,
528545
suiteName,
@@ -573,11 +590,7 @@ const submitForm = async (formEl) => {
573590
load()
574591
}
575592
}, UIAPI.ErrorTip, saveLoading)
576-
caseRevertLoading.value = false
577-
historyDialogOpened.value = false
578-
historyForm.value.selectedID = ''
579-
const target = document.getElementById('compareView');
580-
target.innerHTML = '';
593+
handleDialogClose()
581594
}
582595
})
583596
}
@@ -587,25 +600,17 @@ const goToHistory = async (formEl) => {
587600
await formEl.validate((valid: boolean, fields) => {
588601
if (valid) {
589602
caseRevertLoading.value = true
590-
emit('toHistoryPanel', { ID: selectedHistory.value.ID, panelName: 'history' });
591-
caseRevertLoading.value = false
592-
historyDialogOpened.value = false
593-
historyForm.value.selectedID = ''
594-
const target = document.getElementById('compareView');
595-
target.innerHTML = '';
603+
emit('toHistoryPanel', { ID: selectedHistory.value.ID, panelName: 'history' })
604+
handleDialogClose()
596605
}
597606
})
598607
}
599608
600609
const deleteAllHistory = async (formEl) => {
601610
if (!formEl) return
602611
caseRevertLoading.value = true
603-
API.DeleteAllHistoryTestCase(props.suite, props.name, handleDeleteResponse);
604-
caseRevertLoading.value = false
605-
historyDialogOpened.value = false
606-
historyForm.value.selectedID = ''
607-
const target = document.getElementById('compareView');
608-
target.innerHTML = '';
612+
API.DeleteAllHistoryTestCase(props.suite, props.name, handleDeleteResponse)
613+
handleDialogClose()
609614
}
610615
611616
const options = GetHTTPMethods()
@@ -1110,7 +1115,7 @@ Magic.Keys(() => {
11101115
</template>
11111116
</el-drawer>
11121117

1113-
<el-dialog v-model="historyDialogOpened" :title="t('button.viewHistory')" width="60%" draggable>
1118+
<el-dialog @close="handleDialogClose" v-model="historyDialogOpened" :title="t('button.viewHistory')" width="60%" draggable>
11141119
<el-form
11151120
ref="viewHistoryRef"
11161121
:model="historyForm"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ function HistoryGenerateCode(request: GenerateRequest,
357357
'X-Auth': getToken()
358358
},
359359
body: JSON.stringify({
360-
ID: request.ID,
360+
ID: request.id,
361361
Generator: request.generator
362362
})
363363
}

‎go.work.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzc
144144
cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
145145
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
146146
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
147+
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
147148
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
148149
cloud.google.com/go/contactcenterinsights v1.10.0 h1:YR2aPedGVQPpFBZXJnPkqRj8M//8veIZZH5ZvICoXnI=
149150
cloud.google.com/go/contactcenterinsights v1.10.0/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM=
@@ -1215,6 +1216,7 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
12151216
github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
12161217
github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
12171218
github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
1219+
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
12181220
github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw=
12191221
github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
12201222
github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
@@ -1788,6 +1790,7 @@ go.etcd.io/etcd/server/v3 v3.5.5/go.mod h1:rZ95vDw/jrvsbj9XpTqPrTAB9/kzchVdhRiry
17881790
go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
17891791
go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
17901792
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
1793+
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
17911794
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
17921795
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
17931796
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
@@ -2139,6 +2142,7 @@ gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
21392142
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
21402143
gonum.org/v1/plot v0.10.1 h1:dnifSs43YJuNMDzB7v8wV64O4ABBHReuAVAoBxqBqS4=
21412144
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
2145+
google.golang.org/api v0.30.0 h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w=
21422146
google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
21432147
google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
21442148
google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=

‎pkg/server/convert.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ func ConvertToGRPCHistoryTestCase(historyTestcase testing.HistoryTestCase) (resu
7777
SuiteSpec: ToGRPCTestSuiteSpec(historyTestcase.SuiteSpec),
7878
SuiteApi: historyTestcase.SuiteAPI,
7979
SuiteParam: mapToPair(historyTestcase.SuiteParam),
80+
HistoryHeader: mapToPair(historyTestcase.HistoryHeader),
8081

8182
Request: &Request{
8283
Api: req.API,

‎pkg/server/remote_server.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *TestResult, er
250250

251251
// reuse the API prefix
252252
testCase.Request.RenderAPI(suite.API)
253+
historyHeader := make(map[string]string)
254+
for k, v := range testCase.Request.Header {
255+
historyHeader[k] = v
256+
}
253257

254258
output, testErr := suiteRunner.RunTestCase(&testCase, dataContext, ctx)
255259
if getter, ok := suiteRunner.(runner.ResponseRecord); ok {
@@ -270,27 +274,23 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *TestResult, er
270274
reply.Error = testErr.Error()
271275
break
272276
}
277+
// create history record
278+
go func(historyHeader map[string]string) {
279+
loader := s.getLoader(ctx)
280+
defer loader.Close()
281+
for _, testCaseResult := range reply.TestCaseResult {
282+
err = loader.CreateHistoryTestCase(ToNormalTestCaseResult(testCaseResult), suite, historyHeader)
283+
if err != nil {
284+
remoteServerLogger.Info("error create history")
285+
}
286+
}
287+
}(historyHeader)
273288
}
274289

275290
if reply.Error != "" {
276291
fmt.Fprintln(buf, reply.Error)
277292
}
278293
reply.Message = buf.String()
279-
// create history record
280-
go func() {
281-
loader := s.getLoader(ctx)
282-
defer loader.Close()
283-
for _, testCaseResult := range reply.TestCaseResult {
284-
for i, item := range suite.Items {
285-
suite.Items[i].Request.API = fmt.Sprintf("%s/%s", suite.API, item.Request.API)
286-
}
287-
err = loader.CreateHistoryTestCase(ToNormalTestCaseResult(testCaseResult), suite)
288-
if err != nil {
289-
remoteServerLogger.Info("error create history")
290-
}
291-
}
292-
}()
293-
294294
return
295295
}
296296

0 commit comments

Comments
 (0)