Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Comment thread
marcdaniels-toast marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def query_attributes_for(field:, lookahead:)
.selection(@schema.element_names.highlights)

{
individual_docs_needed: pagination_fields_need_individual_docs?(lookahead),
individual_docs_needed: pagination_fields_need_individual_docs?(lookahead) || relay_connection_node_from(lookahead).selected?,
requested_fields: requested_fields_under(relay_connection_node_from(lookahead), index_field_paths),
request_all_highlights: requesting_all_highlights?(lookahead),
requested_highlights: requested_fields_under(highlights, index_field_paths)
Expand Down
36 changes: 36 additions & 0 deletions elasticgraph-graphql/spec/acceptance/search_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,42 @@ module ElasticGraph
]
end

it "returns nodes when querying only `__typename` with no other fields" do
Comment thread
marcdaniels-toast marked this conversation as resolved.
index_records(
build(:address),
build(:address),
build(:electrical_part),
build(:mechanical_part)
)

# Concrete type: nodes { __typename }
address_nodes = call_graphql_query(<<~QUERY).dig("data", "addresses", "nodes")
query { addresses { nodes { __typename } } }
QUERY
expect(address_nodes).to contain_exactly(
{"__typename" => "Address"},
{"__typename" => "Address"}
)

# Concrete type: edges { node { __typename } }
address_edges = call_graphql_query(<<~QUERY).dig("data", "addresses", "edges")
query { addresses { edges { node { __typename } } } }
QUERY
expect(address_edges).to contain_exactly(
{"node" => {"__typename" => "Address"}},
{"node" => {"__typename" => "Address"}}
)

# Abstract type: nodes { __typename } (no type-specific fragments)
part_nodes = call_graphql_query(<<~QUERY).dig("data", "parts", "nodes")
query { parts { nodes { __typename } } }
QUERY
expect(part_nodes).to contain_exactly(
{"__typename" => "ElectricalPart"},
{"__typename" => "MechanicalPart"}
)
end

describe "`list` filtering behavior" do
it "supports filtering on scalar lists, nested object lists, and embedded object lists", :expect_index_exclusions do
index_records(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,38 @@ class QueryAdapter
expect(query.individual_docs_needed).to be true
end

it "sets `individual_docs_needed = true` when only `__typename` is requested under `nodes`" do
query = datastore_query_for(:Query, :widgets, <<~QUERY)
query {
widgets {
nodes {
__typename
}
}
}
QUERY

expect(query.individual_docs_needed).to be true
expect(query.requested_fields).to be_empty
end

it "sets `individual_docs_needed = true` when only `__typename` is requested under `edges.node`" do
query = datastore_query_for(:Query, :widgets, <<~QUERY)
query {
widgets {
edges {
node {
__typename
}
}
}
}
QUERY

expect(query.individual_docs_needed).to be true
expect(query.requested_fields).to be_empty
end

it "sets `individual_docs_needed = true` when an edge cursor is requested" do
query = datastore_query_for(:Query, :widgets, <<~QUERY)
query {
Expand Down
Loading