refactor: updated types

This commit is contained in:
liyasthomas 2021-12-16 15:15:54 +05:30
parent 8ca059cf4a
commit 34fe94215c
4 changed files with 38 additions and 9 deletions

26
.github/pull_request_template.md vendored Normal file
View File

@ -0,0 +1,26 @@
<!--
Thanks for creating this pull request 🤗
Please make sure that the pull request is limited to one type (docs, feature, etc.) and keep it as small as possible. You can open multiple prs instead of opening a huge one.
-->
<!-- If this pull request closes an issue, please mention the issue number below -->
Closes # <!-- Issue # here -->
### Description
<!-- Add a brief description of the pull request -->
<!-- You can also choose to add a list of changes and if they have been completed or not by using the markdown to-do list syntax
- [ ] Not Completed
- [x] Completed
-->
### Checks
<!-- Make sure your pull request passes the CI checks and do check the following fields as needed - -->
- [ ] My pull request adheres to the code style of this project
- [ ] My code requires changes to the documentation
- [ ] I have updated the documentation as required
- [ ] All the tests have passed
### Additional Information
<!-- Any additional information like breaking changes, dependencies added, screenshots, comparisons between new and old behavior, etc. -->

View File

@ -178,6 +178,7 @@
<script>
import { defineComponent } from "@nuxtjs/composition-api"
import { translateToNewRequest } from "@hoppscotch/data"
import { currentUser$ } from "~/helpers/fb/auth"
import * as teamUtils from "~/helpers/teams/utils"
import { useReadonlyStream } from "~/helpers/utils/composables"
@ -544,7 +545,7 @@ export default defineComponent({
pwRequest.rawParams = request.body.raw
}
}
return pwRequest
return translateToNewRequest(pwRequest)
},
hasFolder(item) {
return Object.prototype.hasOwnProperty.call(item, "item")

View File

@ -14,7 +14,9 @@ export const defaultGQLSession: GQLSession = {
name: "Untitled request",
url: "https://echo.hoppscotch.io/graphql",
headers: [],
variables: `{ "id": "1" }`,
variables: `{
"id": "1"
}`,
query: `query Request {
method
url

View File

@ -88,12 +88,12 @@ export function translateToNewRequest(x: any): HoppRESTRequest {
return x
} else {
// Old format
const endpoint: string = `${x.url}${x.path}`
const endpoint: string = `${x?.url ?? ""}${x?.path ?? ""}`
const headers: HoppRESTHeader[] = x.headers ?? []
const headers: HoppRESTHeader[] = x?.headers ?? []
// Remove old keys from params
const params: HoppRESTParam[] = (x.params ?? []).map(
const params: HoppRESTParam[] = (x?.params ?? []).map(
({
key,
value,
@ -109,11 +109,11 @@ export function translateToNewRequest(x: any): HoppRESTRequest {
})
)
const name = x.name
const method = x.method
const name = x?.name ?? "Untitled request"
const method = x?.method ?? ""
const preRequestScript = x.preRequestScript
const testScript = x.testScript
const preRequestScript = x?.preRequestScript ?? ""
const testScript = x?.testScript ?? ""
const body = parseRequestBody(x)