chore: add fallback url and add reqIndex for graphql saving

hoppscotch · Apr 24, 2024 · 0802c5d · 0802c5d
1 parent 10b63be
commit 0802c5d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/packages/hoppscotch-common/src/components/collections/graphql/index.vue b/packages/hoppscotch-common/src/components/collections/graphql/index.vue
@@ -192,6 +192,7 @@ import { PersistenceService } from "~/services/persistence"
 import { PersistedOAuthConfig } from "~/services/oauth/oauth.service"
 import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
 import { EditingProperties } from "../Properties.vue"
+import { getDefaultGQLRequest } from "~/helpers/graphql/default"
 
 const t = useI18n()
 const toast = useToast()
@@ -379,32 +380,26 @@ const editCollection = (
  displayModalEdit(true)
 }
 
-const onAddRequest = ({
- name,
- path,
- index,
-}: {
- name: string
- path: string
- index: number
-}) => {
+const onAddRequest = ({ name, path }: { name: string; path: string }) => {
  const newRequest = {
  ...tabs.currentActiveTab.value.document.request,
  name,
+ url:
+ tabs.currentActiveTab.value.document.request.url ||
+ getDefaultGQLRequest().url,
  }
 
- saveGraphqlRequestAs(path, newRequest)
+ const insertionIndex = saveGraphqlRequestAs(path, newRequest)
 
  const { auth, headers } = cascadeParentCollectionForHeaderAuth(
  path,
  "graphql"
  )
-
  tabs.createNewTab({
  saveContext: {
  originLocation: "user-collection",
  folderPath: path,
- requestIndex: index,
+ requestIndex: insertionIndex,
  },
  request: newRequest,
  isDirty: false,

diff --git a/packages/hoppscotch-common/src/components/collections/index.vue b/packages/hoppscotch-common/src/components/collections/index.vue
@@ -254,6 +254,7 @@ import { PersistenceService } from "~/services/persistence"
 import { PersistedOAuthConfig } from "~/services/oauth/oauth.service"
 import { RESTOptionTabs } from "../http/RequestOptions.vue"
 import { EditingProperties } from "./Properties.vue"
+import { getDefaultRESTRequest } from "~/helpers/rest/default"
 
 const t = useI18n()
 const toast = useToast()
@@ -790,6 +791,9 @@ const onAddRequest = (requestName: string) => {
  const newRequest = {
  ...cloneDeep(tabs.currentActiveTab.value.document.request),
  name: requestName,
+ endpoint:
+ tabs.currentActiveTab.value.document.request.endpoint ||
+ getDefaultRESTRequest().endpoint,
  }
 
  const path = editingFolderPath.value

diff --git a/packages/hoppscotch-common/src/components/graphql/RequestOptions.vue b/packages/hoppscotch-common/src/components/graphql/RequestOptions.vue
@@ -120,7 +120,9 @@ const request = useVModel(props, "modelValue", emit)
 
 const url = computedWithControl(
  () => tabs.currentActiveTab.value,
- () => tabs.currentActiveTab.value.document.request.url
+ () =>
+ tabs.currentActiveTab.value.document.request.url ||
+ getDefaultGQLRequest().url
 )
 
 const activeGQLHeadersCount = computed(

diff --git a/packages/hoppscotch-common/src/newstore/collections.ts b/packages/hoppscotch-common/src/newstore/collections.ts
@@ -1393,13 +1393,23 @@ export function editGraphqlRequest(
 }
 
 export function saveGraphqlRequestAs(path: string, request: HoppGQLRequest) {
+ // For calculating the insertion request index
+ const targetLocation = navigateToFolderWithIndexPath(
+ graphqlCollectionStore.value.state,
+ path.split("/").map((x) => parseInt(x))
+ )
+
+ const insertionIndex = targetLocation!.requests.length
+
  graphqlCollectionStore.dispatch({
  dispatcher: "saveRequestAs",
  payload: {
  path,
  request,
  },
  })
+
+ return insertionIndex
 }
 
 export function removeGraphqlRequest(