Skip to content

Commit 9ed5423

Browse files
SamYSFSamYSF
committed
fix: change createHistory position and change history page not editable
1 parent 4adf118 commit 9ed5423

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
@@ -800,14 +800,15 @@ Magic.Keys(() => {
800800
:fetch-suggestions="querySuggestedAPIs"
801801
placeholder="API Address"
802802
style="width: 50%; margin-left: 5px; margin-right: 5px; flex-grow: 1;"
803+
:readonly="isHistoryTestCase"
803804
>
804805
<template #default="{ item }">
805806
<div class="value">{{ item.request.method }}</div>
806807
<span class="link">{{ item.request.api }}</span>
807808
</template>
808809
</el-autocomplete>
809810

810-
<el-dropdown split-button type="primary" @click="sendRequest" :loading="requestLoading">
811+
<el-dropdown split-button type="primary" @click="sendRequest" :loading="requestLoading" v-if="!isHistoryTestCase">
811812
{{ t('button.send') }}
812813
<template #dropdown>
813814
<el-dropdown-menu>
@@ -832,13 +833,14 @@ Magic.Keys(() => {
832833
v-model="scope.row.key"
833834
placeholder="Key"
834835
@change="queryChange"
836+
:readonly="isHistoryTestCase"
835837
/>
836838
</template>
837839
</el-table-column>
838840
<el-table-column label="Value">
839841
<template #default="scope">
840842
<div style="display: flex; align-items: center">
841-
<el-input v-model="scope.row.value" placeholder="Value" />
843+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
842844
</div>
843845
</template>
844846
</el-table-column>
@@ -859,6 +861,7 @@ Magic.Keys(() => {
859861
placeholder="Key"
860862
@change="headerChange"
861863
@select="headerSelect"
864+
:readonly="isHistoryTestCase"
862865
/>
863866
</template>
864867
</el-table-column>
@@ -869,6 +872,7 @@ Magic.Keys(() => {
869872
v-model="scope.row.value"
870873
:fetch-suggestions="queryHeaderValues"
871874
style="width: 100%;"
875+
:readonly="isHistoryTestCase"
872876
/>
873877
</div>
874878
</template>
@@ -886,13 +890,14 @@ Magic.Keys(() => {
886890
<template #default="scope">
887891
<el-input v-model="scope.row.key" placeholder="Key"
888892
@change="cookieChange"
893+
:readonly="isHistoryTestCase"
889894
/>
890895
</template>
891896
</el-table-column>
892897
<el-table-column label="Value">
893898
<template #default="scope">
894899
<div style="display: flex; align-items: center">
895-
<el-input v-model="scope.row.value" placeholder="value" />
900+
<el-input v-model="scope.row.value" placeholder="value" :readonly="isHistoryTestCase"/>
896901
</div>
897902
</template>
898903
</el-table-column>
@@ -919,17 +924,18 @@ Magic.Keys(() => {
919924
<div style="flex-grow: 1;">
920925
<Codemirror v-if="bodyType === 3 || bodyType === 5"
921926
@blur="jsonFormat(-1)"
922-
v-model="testCaseWithSuite.data.request.body"/>
927+
v-model="testCaseWithSuite.data.request.body"
928+
:disabled="isHistoryTestCase"/>
923929
<el-table :data="testCaseWithSuite.data.request.form" style="width: 100%" v-if="bodyType === 4">
924930
<el-table-column label="Key" width="180">
925931
<template #default="scope">
926-
<el-input v-model="scope.row.key" placeholder="Key" @change="formChange"/>
932+
<el-input v-model="scope.row.key" placeholder="Key" @change="formChange" :readonly="isHistoryTestCase"/>
927933
</template>
928934
</el-table-column>
929935
<el-table-column label="Value">
930936
<template #default="scope">
931937
<div style="display: flex; align-items: center">
932-
<el-input v-model="scope.row.value" placeholder="Value" />
938+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
933939
</div>
934940
</template>
935941
</el-table-column>
@@ -952,13 +958,15 @@ Magic.Keys(() => {
952958
class="w-50 m-2"
953959
placeholder="Please input"
954960
style="width: 200px"
961+
:readonly="isHistoryTestCase"
955962
/>
956963
</el-row>
957964
<el-input
958965
v-model="testCaseWithSuite.data.response.body"
959966
:autosize="{ minRows: 4, maxRows: 8 }"
960967
type="textarea"
961968
placeholder="Expected Body"
969+
:readonly="isHistoryTestCase"
962970
/>
963971
</el-tab-pane>
964972

@@ -970,13 +978,14 @@ Magic.Keys(() => {
970978
v-model="scope.row.key"
971979
placeholder="Key"
972980
@change="expectedHeaderChange"
981+
:readonly="isHistoryTestCase"
973982
/>
974983
</template>
975984
</el-table-column>
976985
<el-table-column label="Value">
977986
<template #default="scope">
978987
<div style="display: flex; align-items: center">
979-
<el-input v-model="scope.row.value" placeholder="Value" />
988+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
980989
</div>
981990
</template>
982991
</el-table-column>
@@ -993,13 +1002,14 @@ Magic.Keys(() => {
9931002
clearable
9941003
placeholder="Key"
9951004
@change="bodyFiledExpectChange"
1005+
:readonly="isHistoryTestCase"
9961006
/>
9971007
</template>
9981008
</el-table-column>
9991009
<el-table-column label="Value">
10001010
<template #default="scope">
10011011
<div style="display: flex; align-items: center">
1002-
<el-input v-model="scope.row.value" placeholder="Value" />
1012+
<el-input v-model="scope.row.value" placeholder="Value" :readonly="isHistoryTestCase"/>
10031013
</div>
10041014
</template>
10051015
</el-table-column>
@@ -1008,7 +1018,7 @@ Magic.Keys(() => {
10081018

10091019
<el-tab-pane label="Verify" name="verify" v-if="props.kindName !== 'tRPC' && props.kindName !== 'gRPC'">
10101020
<div v-for="verify in testCaseWithSuite.data.response.verify" :key="verify">
1011-
<el-input :value="verify" />
1021+
<el-input :value="verify" :readonly="isHistoryTestCase"/>
10121022
</div>
10131023
</el-tab-pane>
10141024

@@ -1017,6 +1027,7 @@ Magic.Keys(() => {
10171027
v-model="testCaseWithSuite.data.response.schema"
10181028
:autosize="{ minRows: 4, maxRows: 20 }"
10191029
type="textarea"
1030+
:readonly="isHistoryTestCase"
10201031
/>
10211032
</el-tab-pane>
10221033
</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)