Skip to content

Commit 313f2dc

Browse files
SamYSFSamYSF
committed
fix: change createHistory position and change history page not editable
1 parent c46490b commit 313f2dc

File tree

2 files changed

+35
-24
lines changed

2 files changed

+35
-24
lines changed

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -803,14 +803,15 @@ Magic.Keys(() => {
803803
:fetch-suggestions="querySuggestedAPIs"
804804
placeholder="API Address"
805805
style="width: 50%; margin-left: 5px; margin-right: 5px; flex-grow: 1;"
806+
:readonly="isHistoryTestCase"
806807
>
807808
<template #default="{ item }">
808809
<div class="value">{{ item.request.method }}</div>
809810
<span class="link">{{ item.request.api }}</span>
810811
</template>
811812
</el-autocomplete>
812813

813-
<el-dropdown split-button type="primary" @click="sendRequest" v-loading="requestLoading">
814+
<el-dropdown split-button type="primary" @click="sendRequest" v-loading="requestLoading" v-if="!isHistoryTestCase">
814815
{{ t('button.send') }}
815816
<template #dropdown>
816817
<el-dropdown-menu>
@@ -835,13 +836,14 @@ Magic.Keys(() => {
835836
v-model="scope.row.key"
836837
placeholder="Key"
837838
@change="queryChange"
839+
:readonly="isHistoryTestCase"
838840
/>
839841
</template>
840842
</el-table-column>
841843
<el-table-column label="Value">
842844
<template #default="scope">
843845
<div style="display: flex; align-items: center">
844-
<el-input v-model="scope.row.value" placeholder="Value" />
846+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
845847
</div>
846848
</template>
847849
</el-table-column>
@@ -862,6 +864,7 @@ Magic.Keys(() => {
862864
placeholder="Key"
863865
@change="headerChange"
864866
@select="headerSelect"
867+
:readonly="isHistoryTestCase"
865868
/>
866869
</template>
867870
</el-table-column>
@@ -872,6 +875,7 @@ Magic.Keys(() => {
872875
v-model="scope.row.value"
873876
:fetch-suggestions="queryHeaderValues"
874877
style="width: 100%;"
878+
:readonly="isHistoryTestCase"
875879
/>
876880
</div>
877881
</template>
@@ -889,13 +893,14 @@ Magic.Keys(() => {
889893
<template #default="scope">
890894
<el-input v-model="scope.row.key" placeholder="Key"
891895
@change="cookieChange"
896+
:readonly="isHistoryTestCase"
892897
/>
893898
</template>
894899
</el-table-column>
895900
<el-table-column label="Value">
896901
<template #default="scope">
897902
<div style="display: flex; align-items: center">
898-
<el-input v-model="scope.row.value" placeholder="value" />
903+
<el-input v-model="scope.row.value" placeholder="value" :readonly="isHistoryTestCase"/>
899904
</div>
900905
</template>
901906
</el-table-column>
@@ -922,17 +927,18 @@ Magic.Keys(() => {
922927
<div style="flex-grow: 1;">
923928
<Codemirror v-if="bodyType === 3 || bodyType === 5"
924929
@blur="jsonFormat(-1)"
925-
v-model="testCaseWithSuite.data.request.body"/>
930+
v-model="testCaseWithSuite.data.request.body"
931+
:disabled="isHistoryTestCase"/>
926932
<el-table :data="testCaseWithSuite.data.request.form" style="width: 100%" v-if="bodyType === 4">
927933
<el-table-column label="Key" width="180">
928934
<template #default="scope">
929-
<el-input v-model="scope.row.key" placeholder="Key" @change="formChange"/>
935+
<el-input v-model="scope.row.key" placeholder="Key" @change="formChange" :readonly="isHistoryTestCase"/>
930936
</template>
931937
</el-table-column>
932938
<el-table-column label="Value">
933939
<template #default="scope">
934940
<div style="display: flex; align-items: center">
935-
<el-input v-model="scope.row.value" placeholder="Value" />
941+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
936942
</div>
937943
</template>
938944
</el-table-column>
@@ -955,13 +961,15 @@ Magic.Keys(() => {
955961
class="w-50 m-2"
956962
placeholder="Please input"
957963
style="width: 200px"
964+
:readonly="isHistoryTestCase"
958965
/>
959966
</el-row>
960967
<el-input
961968
v-model="testCaseWithSuite.data.response.body"
962969
:autosize="{ minRows: 4, maxRows: 8 }"
963970
type="textarea"
964971
placeholder="Expected Body"
972+
:readonly="isHistoryTestCase"
965973
/>
966974
</el-tab-pane>
967975

@@ -973,13 +981,14 @@ Magic.Keys(() => {
973981
v-model="scope.row.key"
974982
placeholder="Key"
975983
@change="expectedHeaderChange"
984+
:readonly="isHistoryTestCase"
976985
/>
977986
</template>
978987
</el-table-column>
979988
<el-table-column label="Value">
980989
<template #default="scope">
981990
<div style="display: flex; align-items: center">
982-
<el-input v-model="scope.row.value" placeholder="Value" />
991+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
983992
</div>
984993
</template>
985994
</el-table-column>
@@ -996,13 +1005,14 @@ Magic.Keys(() => {
9961005
clearable
9971006
placeholder="Key"
9981007
@change="bodyFiledExpectChange"
1008+
:readonly="isHistoryTestCase"
9991009
/>
10001010
</template>
10011011
</el-table-column>
10021012
<el-table-column label="Value">
10031013
<template #default="scope">
10041014
<div style="display: flex; align-items: center">
1005-
<el-input v-model="scope.row.value" placeholder="Value" />
1015+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
10061016
</div>
10071017
</template>
10081018
</el-table-column>
@@ -1011,7 +1021,7 @@ Magic.Keys(() => {
10111021

10121022
<el-tab-pane label="Verify" name="verify" v-if="props.kindName !== 'tRPC' && props.kindName !== 'gRPC'">
10131023
<div v-for="verify in testCaseWithSuite.data.response.verify" :key="verify">
1014-
<el-input :value="verify" />
1024+
<el-input :value="verify" :readonly="isHistoryTestCase"/>
10151025
</div>
10161026
</el-tab-pane>
10171027

@@ -1020,6 +1030,7 @@ Magic.Keys(() => {
10201030
v-model="testCaseWithSuite.data.response.schema"
10211031
:autosize="{ minRows: 4, maxRows: 20 }"
10221032
type="textarea"
1033+
:readonly="isHistoryTestCase"
10231034
/>
10241035
</el-tab-pane>
10251036
</el-tabs>

‎pkg/server/remote_server.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,21 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *TestResult, er
273273
fmt.Fprintln(buf, reply.Error)
274274
}
275275
reply.Message = buf.String()
276+
// create history record
277+
go func() {
278+
loader := s.getLoader(ctx)
279+
defer loader.Close()
280+
for _, testCaseResult := range reply.TestCaseResult {
281+
for i, item := range suite.Items {
282+
suite.Items[i].Request.API = fmt.Sprintf("%s/%s", suite.API, item.Request.API)
283+
}
284+
err = loader.CreateHistoryTestCase(ToNormalTestCaseResult(testCaseResult), suite)
285+
if err != nil {
286+
remoteServerLogger.Info("error create history")
287+
}
288+
}
289+
}()
290+
276291
return
277292
}
278293

@@ -548,7 +563,6 @@ func (s *server) GetHistoryTestCase(ctx context.Context, in *HistoryTestCase) (r
548563
return
549564
}
550565

551-
<<<<<<< HEAD
552566
var ExecutionCountNum = promauto.NewCounter(prometheus.CounterOpts{
553567
Name: "atest_execution_count",
554568
Help: "The total number of request execution",
@@ -649,20 +663,6 @@ func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result
649663
result.Header = lastItem.Header
650664
result.StatusCode = lastItem.StatusCode
651665
}
652-
653-
normalResult := ToNormalTestCaseResult(result)
654-
var testSuite *testing.TestSuite
655-
if testSuite, err = s.getSuiteFromTestTask(task); err != nil {
656-
result = &TestCaseResult{
657-
Error: err.Error(),
658-
}
659-
}
660-
err = loader.CreateHistoryTestCase(normalResult, testSuite)
661-
if err != nil {
662-
result = &TestCaseResult{
663-
Error: err.Error(),
664-
}
665-
}
666666
}
667667
return
668668
}

0 commit comments

Comments
 (0)