From 4d0f6cda7ef2a07612c3da862571953947a4a49c Mon Sep 17 00:00:00 2001 From: askibinski Date: Wed, 10 Feb 2021 08:47:34 +0100 Subject: [PATCH 1/2] Fix configuration schema sequence for enabled extensions --- config/schema/graphql.schema.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/config/schema/graphql.schema.yml b/config/schema/graphql.schema.yml index fd3657a7a..b85fc9a66 100644 --- a/config/schema/graphql.schema.yml +++ b/config/schema/graphql.schema.yml @@ -24,7 +24,12 @@ graphql.graphql_servers.*: type: boolean label: 'Batching' schema_configuration: - type: 'graphql.schema.[%parent.schema]' + type: sequence + label: 'Schema configuration' + orderby: key + sequence: + type: 'graphql.schema.[%key]' + label: 'The configuration for a single schema extension.' persisted_queries_settings: type: sequence label: 'Persisted queries settings' @@ -34,7 +39,7 @@ graphql.graphql_servers.*: label: 'The configuration for a single persisted query plugin.' graphql.schema.*: - type: mapping + type: graphql.schema.composable label: 'Schema settings' graphql.schema.composable: @@ -45,7 +50,7 @@ graphql.schema.composable: label: Enabled extensions type: sequence sequence: - type: boolean + type: string graphql.default_persisted_query_configuration: type: mapping From 7730a3fbf2ed3e6ef28a08a74ab0642801aa11a3 Mon Sep 17 00:00:00 2001 From: askibinski Date: Wed, 10 Feb 2021 08:59:52 +0100 Subject: [PATCH 2/2] Keep %parent.schema --- config/schema/graphql.schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/schema/graphql.schema.yml b/config/schema/graphql.schema.yml index b85fc9a66..e7e053730 100644 --- a/config/schema/graphql.schema.yml +++ b/config/schema/graphql.schema.yml @@ -28,7 +28,7 @@ graphql.graphql_servers.*: label: 'Schema configuration' orderby: key sequence: - type: 'graphql.schema.[%key]' + type: 'graphql.schema.[%parent.schema]' label: 'The configuration for a single schema extension.' persisted_queries_settings: type: sequence