From 8cb6e9d411f7a227255e5a83dd3818e41672bed0 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 8 Apr 2021 20:11:10 +0200 Subject: [PATCH] fixed gql query alltags --- ...y_form_display.node.texte_prod.default.yml | 8 ------- ...y_view_display.node.texte_prod.default.yml | 11 ---------- ...ty_view_display.node.texte_prod.teaser.yml | 2 -- ...field.field.node.texte_prod.field_date.yml | 21 ------------------- .../sync/field.storage.node.field_date.yml | 20 ------------------ .../graphql/enfr_extension.base.graphqls | 1 + .../SchemaExtension/EnFrSchemaExtension.php | 13 ++++++++---- 7 files changed, 10 insertions(+), 66 deletions(-) delete mode 100644 src/config/sync/field.field.node.texte_prod.field_date.yml delete mode 100644 src/config/sync/field.storage.node.field_date.yml diff --git a/src/config/sync/core.entity_form_display.node.texte_prod.default.yml b/src/config/sync/core.entity_form_display.node.texte_prod.default.yml index 6750b44..4363089 100644 --- a/src/config/sync/core.entity_form_display.node.texte_prod.default.yml +++ b/src/config/sync/core.entity_form_display.node.texte_prod.default.yml @@ -5,7 +5,6 @@ dependencies: config: - field.field.node.texte_prod.body - field.field.node.texte_prod.field_auteurs - - field.field.node.texte_prod.field_date - field.field.node.texte_prod.field_famille - field.field.node.texte_prod.field_fichier - field.field.node.texte_prod.field_images @@ -16,7 +15,6 @@ dependencies: - image.style.thumbnail - node.type.texte_prod module: - - datetime - field_group - file - filefield_sources @@ -168,12 +166,6 @@ content: third_party_settings: { } type: entity_reference_autocomplete region: content - field_date: - weight: 128 - settings: { } - third_party_settings: { } - type: datetime_default - region: content field_famille: weight: 123 settings: diff --git a/src/config/sync/core.entity_view_display.node.texte_prod.default.yml b/src/config/sync/core.entity_view_display.node.texte_prod.default.yml index c3e9170..186d433 100644 --- a/src/config/sync/core.entity_view_display.node.texte_prod.default.yml +++ b/src/config/sync/core.entity_view_display.node.texte_prod.default.yml @@ -5,7 +5,6 @@ dependencies: config: - field.field.node.texte_prod.body - field.field.node.texte_prod.field_auteurs - - field.field.node.texte_prod.field_date - field.field.node.texte_prod.field_famille - field.field.node.texte_prod.field_fichier - field.field.node.texte_prod.field_images @@ -15,7 +14,6 @@ dependencies: - field.field.node.texte_prod.field_videos - node.type.texte_prod module: - - datetime - entity_reference_revisions - file - image @@ -42,15 +40,6 @@ content: third_party_settings: { } type: entity_reference_label region: content - field_date: - weight: 107 - label: above - settings: - format_type: medium - timezone_override: '' - third_party_settings: { } - type: datetime_default - region: content field_famille: weight: 103 label: above diff --git a/src/config/sync/core.entity_view_display.node.texte_prod.teaser.yml b/src/config/sync/core.entity_view_display.node.texte_prod.teaser.yml index 2e7d0ae..96124f1 100644 --- a/src/config/sync/core.entity_view_display.node.texte_prod.teaser.yml +++ b/src/config/sync/core.entity_view_display.node.texte_prod.teaser.yml @@ -6,7 +6,6 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.texte_prod.body - field.field.node.texte_prod.field_auteurs - - field.field.node.texte_prod.field_date - field.field.node.texte_prod.field_famille - field.field.node.texte_prod.field_fichier - field.field.node.texte_prod.field_images @@ -38,7 +37,6 @@ content: region: content hidden: field_auteurs: true - field_date: true field_famille: true field_fichier: true field_images: true diff --git a/src/config/sync/field.field.node.texte_prod.field_date.yml b/src/config/sync/field.field.node.texte_prod.field_date.yml deleted file mode 100644 index 4f99416..0000000 --- a/src/config/sync/field.field.node.texte_prod.field_date.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: c2de7441-48b0-4b05-889c-557ae1128154 -langcode: fr -status: true -dependencies: - config: - - field.storage.node.field_date - - node.type.texte_prod - module: - - datetime -id: node.texte_prod.field_date -field_name: field_date -entity_type: node -bundle: texte_prod -label: Date -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: { } -field_type: datetime diff --git a/src/config/sync/field.storage.node.field_date.yml b/src/config/sync/field.storage.node.field_date.yml deleted file mode 100644 index b90cda2..0000000 --- a/src/config/sync/field.storage.node.field_date.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: e6a90bac-02d6-4bb3-a377-8b96a87757be -langcode: fr -status: true -dependencies: - module: - - datetime - - node -id: node.field_date -field_name: field_date -entity_type: node -type: datetime -settings: - datetime_type: date -module: datetime -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/src/web/modules/custom/enfrancais_graphql/graphql/enfr_extension.base.graphqls b/src/web/modules/custom/enfrancais_graphql/graphql/enfr_extension.base.graphqls index 9d5a049..fb4e636 100644 --- a/src/web/modules/custom/enfrancais_graphql/graphql/enfr_extension.base.graphqls +++ b/src/web/modules/custom/enfrancais_graphql/graphql/enfr_extension.base.graphqls @@ -114,6 +114,7 @@ type Taxoterm { id: Int! uuid: String! name: String! + vocabulary: String } type Auteur { diff --git a/src/web/modules/custom/enfrancais_graphql/src/Plugin/GraphQL/SchemaExtension/EnFrSchemaExtension.php b/src/web/modules/custom/enfrancais_graphql/src/Plugin/GraphQL/SchemaExtension/EnFrSchemaExtension.php index fd53a18..df66c28 100644 --- a/src/web/modules/custom/enfrancais_graphql/src/Plugin/GraphQL/SchemaExtension/EnFrSchemaExtension.php +++ b/src/web/modules/custom/enfrancais_graphql/src/Plugin/GraphQL/SchemaExtension/EnFrSchemaExtension.php @@ -820,7 +820,7 @@ class EnFrSchemaExtension extends SdlSchemaExtensionPluginBase { $builder->callback(function($parent, $arg){ $entity_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term'); $query = $entity_storage->getQuery() - ->condition('vid', ['tags', 'tag_prod'], 'IN') + ->condition('vid', ['tag','tag_prod'], 'IN') ->accessCheck(TRUE); $results = $query->execute(); return $results; @@ -861,9 +861,14 @@ class EnFrSchemaExtension extends SdlSchemaExtensionPluginBase { ); $registry->addFieldResolver('Taxoterm', 'name', - $builder->produce('entity_label') - ->map('entity', $builder->fromParent()) - ); + $builder->produce('entity_label') + ->map('entity', $builder->fromParent()) + ); + + $registry->addFieldResolver('Taxoterm', 'vocabulary', + $builder->produce('entity_bundle') + ->map('entity', $builder->fromParent()) + ); } protected function addAuteur(ResolverRegistryInterface $registry, ResolverBuilder $builder) {