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
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ private static void MergeFilterFieldDefinitions(
filterTypeField.Handler ??= filterExtensionField.Handler;
}

typeField.Ignore |= extensionField.Ignore;
typeField.Description ??= extensionField.Description;
typeField.RuntimeDefaultValue ??= extensionField.RuntimeDefaultValue;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,22 @@ protected override void OnCreateConfiguration(FilterInputTypeConfiguration confi

var fields = new Dictionary<string, FilterFieldConfiguration>(StringComparer.Ordinal);
var handledProperties = new HashSet<MemberInfo>();
var operationFields = Operations.Select(t => t.CreateConfiguration()).ToArray();

FieldDescriptorUtilities.AddExplicitFields(
Fields.Select(t => t.CreateConfiguration())
.Concat(Operations.Select(t => t.CreateConfiguration())),
Fields.Select(t => t.CreateConfiguration()),
f => f.Member,
fields,
handledProperties);

foreach (var operationField in operationFields)
{
if (!string.IsNullOrEmpty(operationField.Name))
{
fields[operationField.Name] = operationField;
}
}

OnCompleteFields(fields, handledProperties);

Configuration.Fields.AddRange(fields.Values);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,36 @@ public async Task FilterConvention_Should_NotAddOr()
schema.MatchSnapshot();
}

[Fact]
public async Task FilterConvention_Should_Ignore_String_Operations()
{
// arrange
var convention = new FilterConvention(
descriptor =>
{
descriptor.AddDefaults();
descriptor.Configure<StringOperationFilterInputType>(
d => d.Operation(DefaultFilterOperations.Contains).Ignore());
descriptor.Configure<StringOperationFilterInputType>(
d => d.Operation(DefaultFilterOperations.EndsWith).Ignore());
});

var builder = new ServiceCollection()
.AddGraphQL()
.AddConvention<IFilterConvention>(convention)
.AddFiltering()
.AddQueryType(
x => x.Name("Query").Field("foos").UseFiltering().Resolve(new List<Foo>()));

// act
var schema = await builder.BuildSchemaAsync();
var stringOperations = schema.Types.GetType<InputObjectType>("StringOperationFilterInput");

// assert
Assert.DoesNotContain(stringOperations.Fields, t => t.Name.Equals("contains", StringComparison.Ordinal));
Assert.DoesNotContain(stringOperations.Fields, t => t.Name.Equals("endsWith", StringComparison.Ordinal));
}

protected Schema CreateSchemaWithTypes(
IFilterInputType type,
FilterConvention convention,
Expand Down
Loading