From 065d44dad84c74b9df9e4faabda67126610bc2f8 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 18 May 2021 16:22:59 +0200 Subject: [PATCH] graphql fixes --- .../graphql/enfr_extension.base.graphqls | 10 ++--- .../SchemaExtension/EnFrSchemaExtension.php | 44 +++++++++---------- 2 files changed, 25 insertions(+), 29 deletions(-) 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 50233eb..50d88c0 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 @@ -17,9 +17,7 @@ interface TextInterface { videos: [VideoLink] fichiers: [File] familles: [Taxoterm] - field_titre: String auteurs: [Auteur] - edition: Taxoterm } type Textref implements NodeInterface & TextInterface{ @@ -34,10 +32,11 @@ type Textref implements NodeInterface & TextInterface{ videos: [VideoLink] fichiers: [File] familles: [Taxoterm] - field_titre: String auteurs: [Auteur] - edition: Taxoterm # + field_titre_regular: String + field_titre_italique: String + edition: [Taxoterm] text_produits: [Textprod] text_en_rebond: [Textref] tags: [Taxoterm] @@ -57,9 +56,7 @@ type Textprod implements NodeInterface & TextInterface { videos: [VideoLink] fichiers: [File] familles: [Taxoterm] - field_titre: String auteurs: [Auteur] - edition: Taxoterm # text_de_depart: [Textref] text_en_rebond: [Textref] @@ -77,7 +74,6 @@ type Creation implements NodeInterface { texte: String auteurs: [Auteur] oeuvre: Link - } interface NoteInterface { 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 0527f16..9abfcb1 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 @@ -272,13 +272,6 @@ class EnFrSchemaExtension extends SdlSchemaExtensionPluginBase { ->map('path', $builder->fromValue('field_video')) ); - $registry->addFieldResolver('Textref', 'titre_ref', - $builder->produce('property_path') - ->map('type', $builder->fromValue('entity:node')) - ->map('value', $builder->fromParent()) - ->map('path', $builder->fromValue('field_titre')) - ); - $registry->addFieldResolver('Textref', 'tags', $builder->produce('entity_reference') ->map('entity', $builder->fromParent()) @@ -298,11 +291,18 @@ class EnFrSchemaExtension extends SdlSchemaExtensionPluginBase { ->map('path', $builder->fromValue('degres_detrangement')) ); - $registry->addFieldResolver('Textref', 'field_titre', + $registry->addFieldResolver('Textref', 'field_titre_regular', $builder->produce('property_path') ->map('type', $builder->fromValue('entity:node')) ->map('value', $builder->fromParent()) - ->map('path', $builder->fromValue('field_titre')) + ->map('path', $builder->fromValue('field_titre_regular.value')) + ); + + $registry->addFieldResolver('Textref', 'field_titre_italique', + $builder->produce('property_path') + ->map('type', $builder->fromValue('entity:node')) + ->map('value', $builder->fromParent()) + ->map('path', $builder->fromValue('field_titre.value')) ); $registry->addFieldResolver('Textref', 'auteurs', @@ -435,25 +435,25 @@ class EnFrSchemaExtension extends SdlSchemaExtensionPluginBase { ->map('entity', $builder->fromParent()) ->map('field', $builder->fromValue('field_famille')) ); - - $registry->addFieldResolver('Textprod', 'field_titre', - $builder->produce('property_path') - ->map('type', $builder->fromValue('entity:node')) - ->map('value', $builder->fromParent()) - ->map('path', $builder->fromValue('field_titre')) - ); + // + // $registry->addFieldResolver('Textprod', 'field_titre', + // $builder->produce('property_path') + // ->map('type', $builder->fromValue('entity:node')) + // ->map('value', $builder->fromParent()) + // ->map('path', $builder->fromValue('field_titre')) + // ); $registry->addFieldResolver('Textprod', 'auteurs', $builder->produce('entity_reference') ->map('entity', $builder->fromParent()) ->map('field', $builder->fromValue('field_auteurs')) ); - - $registry->addFieldResolver('Textprod', 'edition', - $builder->produce('entity_reference') - ->map('entity', $builder->fromParent()) - ->map('field', $builder->fromValue('field_edition')) - ); + // + // $registry->addFieldResolver('Textprod', 'edition', + // $builder->produce('entity_reference') + // ->map('entity', $builder->fromParent()) + // ->map('field', $builder->fromValue('field_edition')) + // ); $registry->addFieldResolver('Textprod', 'notes', $builder->produce('entity_reference_revisions')