thibaud-lclr/api-client
1
0
Fork 0
Code Packages Activity Actions

fix(common): GraphQL argument addition and click event propagation (#5448)

Browse source 
Co-authored-by: Viraj <kunwar.suryavanshi@sapiens.com>

Co-authored-by: Anwarul Islam <anwaarulislaam@gmail.com>
This commit is contained in:
KvS 2025-11-26 14:34:03 +05:30 committed by GitHub
parent 4c1911c007
commit 9f703c9b5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/hoppscotch-common/src/components/graphql/Argument.vue
View file

@ -18,7 +18,7 @@
v-if="showAddButton"
class="hover:text-accent cursor-pointer flex items-center justify-center px-4 py-2"
:class="{ 'text-accent': isArgumentInOperation(arg) }"
@click="insertQuery"
@click.stop="insertQuery"
>
<icon-lucide-plus-circle
v-if="!isArgumentInOperation(arg)"

17
packages/hoppscotch-common/src/helpers/graphql/query.ts
View file

@ -5,6 +5,7 @@ import {
FieldNode,
getNamedType,
GraphQLArgument,
GraphQLField,
GraphQLType,
Kind,
OperationDefinitionNode,
@ -95,7 +96,7 @@ export function useQuery() {
*/
const createFieldNode = (
name: string,
args: GraphQLArgument[] | undefined,
args: readonly GraphQLArgument[] | undefined,
hasNestedFields = false
): Mutable<FieldNode> => ({
kind: Kind.FIELD,
@ -145,8 +146,10 @@ export function useQuery() {
// Build from bottom up starting with the last field
let currentSelection = createFieldNode(
lastItem.name,
lastItem.def?.args,
lastItem.def?.fields?.length > 0
isArgument && argumentItem
? [argumentItem.def as GraphQLArgument]
: (lastItem.def as GraphQLField<unknown, unknown>)?.args,
lastItem.def && (lastItem.def as any)?.fields?.length > 0
)
for (let i = queryPath.length - 2; i >= 0; i--) {
@ -260,7 +263,9 @@ export function useQuery() {
} else {
const newField = createFieldNode(
item.name,
(item.def as any)?.args, // these type assertion is avoidable
isLastItem && isArgument && argumentItem
? [argumentItem.def as GraphQLArgument]
: (item.def as GraphQLField<unknown, unknown>)?.args,
!isLastItem || (isLastItem && (item.def as any)?.fields?.length > 0)
)
@ -280,7 +285,7 @@ export function useQuery() {
}
}
currentSelectionSet.selections.push(newField)
;(currentSelectionSet.selections as Mutable<FieldNode[]>).push(newField)
if (!isLastItem) {
// Move to the next level
@ -419,7 +424,7 @@ export function useQuery() {
fieldNode.loc.start <= cursorPosition &&
fieldNode.loc.end >= cursorPosition
) {
args = fieldNode.arguments || []
args = [...(fieldNode.arguments || [])]
}
}
})