Browse Source

fixed the search results translation with graphql loading

bach 3 years ago
parent
commit
0704a85a63

+ 1 - 1
web/modules/custom/materio_graphql/graphql/materio_extension.extension.graphqls

@@ -11,7 +11,7 @@ extend type Query {
 }
 
 extend type Query {
-  searchresults(ids: [Int]): [SearchResult]
+  searchresults(ids: [Int], lang: String): [SearchResult]
 }
 
 extend type Query {

+ 19 - 10
web/modules/custom/materio_graphql/src/Plugin/GraphQL/SchemaExtension/MaterioSchemaExtension.php

@@ -109,12 +109,20 @@ class MaterioSchemaExtension extends SdlSchemaExtensionPluginBase {
   // | |\/| / _` |  _/ -_) '_| / _` | || |
   // |_|  |_\__,_|\__\___|_| |_\__,_|\_,_|
   protected function addMateriau(ResolverRegistryInterface $registry, ResolverBuilder $builder) {
+
+    // $language = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
     $registry->addFieldResolver('Query', 'materiau',
-      $builder->produce('entity_load')
-        ->map('type', $builder->fromValue('node'))
-        ->map('bundles', $builder->fromValue(['materiau']))
-        ->map('id', $builder->fromArgument('id'))
-      );
+      // $builder->compose(
+        $builder->produce('entity_load')
+          ->map('type', $builder->fromValue('node'))
+          ->map('bundles', $builder->fromValue(['materiau']))
+          ->map('id', $builder->fromArgument('id'))
+      //     ->map('language', $builder->fromValue('fr')),
+      //   $builder->produce('entity_translation')
+      //     ->map('entity', $builder->fromParent())
+      // )
+    );
 
     $registry->addFieldResolver('Query', 'materiaux',
       $builder->produce('entity_load_multiple')
@@ -274,15 +282,16 @@ class MaterioSchemaExtension extends SdlSchemaExtensionPluginBase {
   protected function addSearchResult(ResolverRegistryInterface $registry, ResolverBuilder $builder) {
 
     $registry->addFieldResolver('Query', 'searchresults',
-      $builder->produce('entity_load_multiple')
-        ->map('type', $builder->fromValue('node'))
-        ->map('ids', $builder->fromArgument('ids'))
+        $builder->produce('entity_load_multiple')
+          ->map('type', $builder->fromValue('node'))
+          ->map('ids', $builder->fromArgument('ids'))
+          ->map('language', $builder->fromArgument('lang'))
     );
 
     $registry->addFieldResolver('SearchResult', 'id',
       $builder->produce('entity_id')
         ->map('entity', $builder->fromParent())
-      );
+    );
 
     $registry->addFieldResolver('SearchResult', 'bundle',
       $builder->produce('entity_bundle')
@@ -314,7 +323,7 @@ class MaterioSchemaExtension extends SdlSchemaExtensionPluginBase {
         ->map('type', $builder->fromValue('entity:node'))
         ->map('value', $builder->fromParent())
         ->map('path', $builder->fromValue('field_short_description.value'))
-      );
+    );
 
     $registry->addFieldResolver('SearchResult', 'images',
       $builder->produce('entity_reference')

File diff suppressed because it is too large
+ 6 - 0
web/themes/custom/materiotheme/assets/dist/main.css


File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/main.js


+ 1 - 0
web/themes/custom/materiotheme/assets/styles/base/_colors.scss

@@ -5,6 +5,7 @@ $color-base:#69cdcf;
 $color-showrooms:#50aa3c;
 $color-blabla:#9458aa;
 $color-webshowroom:rgb(255, 159, 80);
+$color-focus:#8bc4ff;
 $alpha: 0.90;
 $color-base-transparent: change-color($color-base, $alpha: $alpha);
 $color-showrooms-transparent: change-color($color-showrooms, $alpha: $alpha);

+ 5 - 4
web/themes/custom/materiotheme/assets/styles/base/_reset.scss

@@ -41,10 +41,11 @@ input[type="password"]{
 	border-radius: 5px;
 	border : 0.5px solid #aaa;
 	padding: 0.3em 0.4em;
-	// &:focus{
-	// 	outline: none;
-	// 	border-color: blue;
-	// }
+	&:focus{
+		outline: none;
+		// border-color: blue;
+		box-shadow: 0 0 2px 1px $color-focus;
+	}
 	// outline-style: solid;
 	// outline-width: 1px;
 }

+ 1 - 1
web/themes/custom/materiotheme/assets/styles/main.scss

@@ -1,6 +1,6 @@
-@import './base/reset';
 @import './base/variables';
 @import './base/colors';
+@import './base/reset';
 @import './base/grid';
 @import './base/layout';
 @import './base/animations';

+ 1 - 1
web/themes/custom/materiotheme/vuejs/store/modules/search.js

@@ -120,7 +120,7 @@ export default {
             //   callBack: 'loadSearchResultsCallBack'
             // })
             let ast = gql`{
-              searchresults(ids: [${data.nids}]) {
+              searchresults(ids: [${data.nids}], lang: "${drupalDecoupled.lang_code}") {
                 ...SearchResultFields
               }
             }

Some files were not shown because too many files changed in this diff