Skip to content

Commit 4832614

Browse files
SamYSFSamYSF
committed
fix: fix history page display
1 parent 7802f5a commit 4832614

File tree

13 files changed

+652
-616
lines changed

13 files changed

+652
-616
lines changed

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

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ function setTestCaseWithSuite(e, suite) {
401401
suiteName: suite,
402402
data: e
403403
} as TestCaseWithSuite;
404+
if (isHistoryTestCase.value == true){ testCaseWithSuite.value.data.request.api = `${testCaseWithSuite.value.data.suiteApi}${testCaseWithSuite.value.data.request.api}` }
404405
}
405406
406407
load()
@@ -515,19 +516,33 @@ function openHistoryDialog(){
515516
})
516517
}
517518
519+
function handleDialogClose(){
520+
caseRevertLoading.value = false
521+
historyDialogOpened.value = false
522+
historyForm.value.selectedID = ''
523+
const target = document.getElementById('compareView');
524+
target.innerHTML = ''
525+
}
526+
518527
function handleHistoryChange(value) {
519528
selectedHistory.value = historyRecords.value.find(record => record.ID === value);
520529
const {
521530
caseName: name,
522531
suiteName,
523532
request,
524-
response
533+
response,
534+
historyHeader,
525535
} = selectedHistory.value;
536+
request.header = historyHeader
537+
request.header.push({
538+
key: '',
539+
value: ''
540+
})
526541
formatHistoryCase.value = {
527-
name,
528-
suiteName,
529-
request,
530-
response
542+
name,
543+
suiteName,
544+
request,
545+
response
531546
};
532547
initCompare(testCaseWithSuite.value.data, formatHistoryCase.value)
533548
}
@@ -573,11 +588,7 @@ const submitForm = async (formEl) => {
573588
load()
574589
}
575590
}, UIAPI.ErrorTip, saveLoading)
576-
caseRevertLoading.value = false
577-
historyDialogOpened.value = false
578-
historyForm.value.selectedID = ''
579-
const target = document.getElementById('compareView');
580-
target.innerHTML = '';
591+
handleDialogClose()
581592
}
582593
})
583594
}
@@ -587,12 +598,8 @@ const goToHistory = async (formEl) => {
587598
await formEl.validate((valid: boolean, fields) => {
588599
if (valid) {
589600
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 = '';
601+
emit('toHistoryPanel', { ID: selectedHistory.value.ID, panelName: 'history' });handleDialogClose()
602+
596603
}
597604
})
598605
}
@@ -601,11 +608,7 @@ const deleteAllHistory = async (formEl) => {
601608
if (!formEl) return
602609
caseRevertLoading.value = true
603610
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 = '';
611+
handleDialogClose()
609612
}
610613
611614
const options = GetHTTPMethods()
@@ -1107,7 +1110,7 @@ Magic.Keys(() => {
11071110
</template>
11081111
</el-drawer>
11091112

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

‎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: 19 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,27 @@ 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+
//for i, item := range suite.Items {
283+
// suite.Items[i].Request.API = fmt.Sprintf("%s/%s", suite.API, item.Request.API)
284+
//}
285+
fmt.Printf("historyHeader: %+v\n", historyHeader)
286+
err = loader.CreateHistoryTestCase(ToNormalTestCaseResult(testCaseResult), suite, historyHeader)
287+
if err != nil {
288+
remoteServerLogger.Info("error create history")
289+
}
290+
}
291+
}(historyHeader)
273292
}
274293

275294
if reply.Error != "" {
276295
fmt.Fprintln(buf, reply.Error)
277296
}
278297
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-
294298
return
295299
}
296300

0 commit comments

Comments
 (0)