fix: fix cancel request issues and stream setup issues

This commit is contained in:
Andrew Bastin
2021-07-29 22:44:43 -04:00
parent b524fa7248
commit 09d552b17a
2 changed files with 42 additions and 27 deletions

View File

@@ -197,7 +197,7 @@ import {
} from "~/newstore/RESTSession"
import { getPlatformSpecialKey } from "~/helpers/platformutils"
import { runRESTRequest$ } from "~/helpers/RequestRunner"
import { subscribeToStream, useStream } from "~/helpers/utils/composables"
import { useStreamSubscriber, useStream } from "~/helpers/utils/composables"
import { defineActionHandler } from "~/helpers/actions"
import { copyToClipboard } from "~/helpers/utils/clipboard"
@@ -221,6 +221,7 @@ export default defineComponent({
app: { i18n },
} = useContext()
const t = i18n.t.bind(i18n)
const { subscribeToStream } = useStreamSubscriber()
const newEndpoint = useStream(restEndpoint$, "", setRESTEndpoint)
const newMethod = useStream(restMethod$, "", updateRESTMethod)
@@ -240,7 +241,11 @@ export default defineComponent({
runRESTRequest$(),
(responseState) => {
console.log(responseState)
updateRESTResponse(responseState)
if (loading.value) {
// Check exists because, loading can be set to false
// when cancelled
updateRESTResponse(responseState)
}
},
() => {
loading.value = false
@@ -251,6 +256,11 @@ export default defineComponent({
)
}
const cancelRequest = () => {
loading.value = false
updateRESTResponse(null)
}
const updateMethod = (method: string) => {
updateRESTMethod(method)
}
@@ -304,7 +314,10 @@ export default defineComponent({
}
}
defineActionHandler("request.send-cancel", newSendRequest)
defineActionHandler("request.send-cancel", () => {
if (!loading.value) newSendRequest()
else cancelRequest()
})
defineActionHandler("request.reset", clearContent)
defineActionHandler("request.copy-link", copyRequest)
defineActionHandler("request.method.next", cycleDownMethod)