From 14169ab24ad70dec52f97dcdc27fe2577add0b19 Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 2 Jun 2021 12:40:46 +0200 Subject: [PATCH] fixed gql products language selection --- .../MaterioSchemaExtension.php | 2 ++ .../custom/materiotheme/assets/dist/main.js | 2 +- .../materiotheme/assets/dist/main.js.gz | Bin 148515 -> 148518 bytes .../materiotheme/assets/dist/report.html | 4 ++-- .../materiotheme/vuejs/store/modules/pages.js | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/modules/custom/materio_graphql/src/Plugin/GraphQL/SchemaExtension/MaterioSchemaExtension.php b/web/modules/custom/materio_graphql/src/Plugin/GraphQL/SchemaExtension/MaterioSchemaExtension.php index 45139355..77fe5f93 100644 --- a/web/modules/custom/materio_graphql/src/Plugin/GraphQL/SchemaExtension/MaterioSchemaExtension.php +++ b/web/modules/custom/materio_graphql/src/Plugin/GraphQL/SchemaExtension/MaterioSchemaExtension.php @@ -1298,6 +1298,7 @@ class MaterioSchemaExtension extends SdlSchemaExtensionPluginBase { ->map('type', $builder->fromValue('commerce_product')) // ->map('bundles', $builder->fromValue(['materiau'])) ->map('id', $builder->fromArgument('id')) + ->map('language', $builder->fromArgument('lang')) ); $registry->addFieldResolver('Query', 'products', @@ -1305,6 +1306,7 @@ class MaterioSchemaExtension extends SdlSchemaExtensionPluginBase { ->map('type', $builder->fromValue('commerce_product')) // ->map('bundles', $builder->fromValue(['materiau'])) ->map('ids', $builder->fromArgument('ids')) + ->map('language', $builder->fromArgument('lang')) ); $registry->addFieldResolver('Product', 'id', diff --git a/web/themes/custom/materiotheme/assets/dist/main.js b/web/themes/custom/materiotheme/assets/dist/main.js index aa09d2cb..6c0a2e61 100644 --- a/web/themes/custom/materiotheme/assets/dist/main.js +++ b/web/themes/custom/materiotheme/assets/dist/main.js @@ -18,7 +18,7 @@ } ${_()} `;s.E.post("",{query:(0,c.S)(i)}).then((t=>{e("updateItem",t.data.data.searchresult)})).catch((e=>{console.warn("Issue with refreshItem",e),Promise.reject(e)}))}}},k={namespaced:!0,state:{contenttype:null,items:[],page:0,infiniteLoadingState:null},getters:{},mutations:{setItems(e,t){e.items=e.items.concat(t)},incrementPage(e){e.page+=1},setInfiniteState(e,t){e.infiniteLoadingState=t}},actions:{getItems:({dispatch:e,commit:t,state:n})=>f.Z.get(`/blabla_rest?_format=json&page=${n.page}`,{}).then((({data:e})=>{e.length?(t("setItems",e),n.infiniteLoadingState&&n.infiniteLoadingState.loaded()):n.infiniteLoadingState&&n.infiniteLoadingState.complete()})).catch((e=>{console.warn("Issue with blabla getitems",e),Promise.reject(e)})),nextPage({dispatch:e,commit:t,state:n},i){t("incrementPage"),t("setInfiniteState",i),e("getItems")},getItemIndex:({dispatch:e,commit:t,state:n},i)=>n.items.findIndex((e=>e.nid===i)),getPrevNextItems:({dispatch:e,commit:t,state:n},i)=>({prev:n.items[i-1],next:n.items[i+1]})}},S={namespaced:!0,state:{items:[],showrooms_by_tid:{}},getters:{},mutations:{setItems(e,t){e.items=e.items.concat(t),t.forEach(((t,n)=>{e.showrooms_by_tid[t.tid]=t}))}},actions:{getItems({dispatch:e,commit:t,state:n}){f.Z.get("/showrooms_rest?_format=json",{}).then((({data:e})=>{t("setItems",e)})).catch((e=>{console.warn("Issue with showrooms",e),Promise.reject(e)}))}}};var x=n(5277),T=n.n(x);const O={namespaced:!0,state:{products_ids:[],products:[]},getters:{},mutations:{setProductsIds(e,t){e.products_ids=t},setProducts(e,t){e.products=t}},actions:{getProducts({dispatch:e,commit:t,state:n}){e("loadProductsIds")},loadProductsIds({dispatch:e,commit:t,state:n}){f.Z.get("/pricing_rest?_format=json",{}).then((({data:n})=>{const i=[];for(let e=0;e{console.warn("Issue with pricing",e),Promise.reject(e)}))},loadProducts({dispatch:e,commit:t,state:n}){const i=u()`{ - products(ids: [${n.products_ids}]) { + products(ids: [${n.products_ids}], lang: "${drupalDecoupled.lang_code}") { ...ProductsFields } } diff --git a/web/themes/custom/materiotheme/assets/dist/main.js.gz b/web/themes/custom/materiotheme/assets/dist/main.js.gz index fbd1d535940f8e399e2469a3d9def1533a779e4a..c06381bd7d61b3dfa1d2d781c64aea4366e2b433 100644 GIT binary patch delta 1904 zcmV-$2aouphzX{M34nwFv;xvRe}9ZK22Miv>Pjx+{nv95(kwIsQz0ETLJ#1pm|Lf* z^(#uYA*K=ZOGr_C;=T(wT}SnXsT z0|h|$4da?=6E_%ZS@!3QDSMnM!@W=o&lx#qpyO1kU%^bX=DG;%&8p~~MwyW4wN&)p zM7~bQ&XV*-s*{-QY;!uwe;LrOnN1!)!@RmGEyal5#AH7+%;63j#sn%)ETO|3>;A^h zW`1#zJ&Z6Cxa-~xpAUMNE#RCW4Yx23poo)k5MX{WorisEOQ0`7jCMcygA7x(LtC89 z&qOSlQ7utM35r7|JAEF(w{2d{S!4(D5Rbb@GvH4~yW@xX09pueeM7Tb$xt)IV-%@V&yb0!vP@H9rf zw!p2jH;rhI#M5=16$Dc*l|j+Vh?m*i+`vmom+kJI81r-~)5WROv14%m4$;VLMZG=Z zK}zhjMrTB<>UfVZe_;oZI(y!Th0us{>;~3x1d|92EwCYfdFO8EF*)1PM$5bXTc*t6 zU3Ty7nqt>_`qmv=emYG&ap%r$Q($(vJNIp)Y{q@}e&3WB3+H=x@0h|PklnTxhaiV9 zycHl|*XzN}6juDNs5pe>0$lfAQ9R?3T(2Kjd|*;=)5lRYe~xn_oc8f7JB(-V(Md_+ zg)O1L<&Iu*yquFRdRCiiSN>k($FNh*}aZ!JQyT;a;Je;Fe463AZ0vfK(Pl=&+aYCqpf=$Z2l!XcSbwAeWV(b%}rEhxIIWQ zevwBH15tli>7KyOVU>JBA@p$Lz`Q_gE$ycys4e4Of0j~)hX}85J7c>`^4rtCrgP(z zt@bIl6zJeBe1U!4UjqY&{k3<>*=P^bG5c{K^3BcMie4yY!epadY$C59cZM0nt()tS zGS)rae`8J*y)BxIP6E};`Lv!OH|vtU)&hp9QkSiD)|bMwn~A4i+vqbXpGV$hZaZ-S zpf0w711z^a%pJPMkc1r`EE&Wg8964G?@|VPzp*J@wK`|$?2p+>`-8-?3W;8uc?1gx zQ(6UW3s5JGid&OO4LHx?IdIJ=lzuA(Q{qQ~hx zxZ7Ey+c5!yI-gzM`M~Xo>BuS|+d0Gg`N6<9Sq#)PbrD0LXNCfW#|DC6}T0K>K##Fy-b<1+bfE9 ze|m9IqL+*{xKwJn&fflhXL7PgKVcTUuBU7-dmmwY!{m7ASB)v^rZ7OLda(E1hu7a9 zynOTM$-%Qn&tE=$;(b@U;~^)QAP!TU=5|p(T;C|%RHx!MWt9z4ls~AP%N1~(@NP;VKTuRlw0e0`#sJ_B8>giAd`x-L6MV!V?Cg^gR1j=PT z0e;y*0M3MI=|)Pz1P~Nx2l?k5IKhGQD(vK(z=((lu!yLai|y<~?`D1`w8gjXe-|Jb zcE#t0$u|K%z#WBY3rt>47ah|&I;IL8Gpv^ybktY4We$wxaAXisBVk!X!kjZSW{8Wh zjc_8NJ*+=>5hk;mz+ePQn?z<&w24Wyi3LU;0z5dSJcmeJsR|5c;uk8OZ5n`(nz=%14s>{i zGH#}lP+>-2{yXZAF^&2NE5H&0$h<*E{uG#x*-=k1Q8bDAEE*WtOCMsiVpBW}R}4<+ z@D_dKayX=(Tg*kO0FBy+*M8&o#RwMZn3wGc$O4iBlxt8j5_j&RK!dUq(uy%jogk9J qCvNkinnc)$;+96c_jF5zfB)9bZ6F8(t}&r64*nl>VSED$s0RRsyp?AF delta 1901 zcmV-z2a@=vhzX;J34nwFv;xvRf2(nWN6_E9l0SI=_56V}OUOV=NQXhtUHdAw)oE(| z+R`?SS?{N}dPzM+bIiE+DxlKdehJ*HKoi9U8uTn#ehjCA&f3m}viLa@k7;8GKZ$+g z=(8`#urhoD3k^N$;B~V;>bggFB3G=3EGtS!%gKgGm8s3mJZB9dh()t_fAPgkby=TX znqSqGMMIKV{jGV0yyoAoCAVaCE--16PE02oQ^v_thp`%d$THfr%@&(`Xd#+H<7PX zt+R~0k?QnhJKLOSat2gse`eFd&oE=IN;om1H!+RR470PtRxp9e6HCG{d%C}|vzcF9 zWDg^Z@$EWp!{>t@<^eb-NW(3R18Ci390Zs-OlMf%+7jp`5Tiv;{vg97?9dkH=`*oN zW>ia*QG$Yw$vdA%@NJtha~9cwJj8?S(F{0`(eC(RK7bYi97)85e*?N!LxfGJ_Y7tb zex62%71eP(Q-0@&Z*Vs%$C_>yy_D)JS9!{!V{*?7@qk3?q%veYDs8G`GAWHwV=ZtK z>`f!u{qWpe=lj59N@Y;=GU8G;H#hK7(q+5jCPp(|%5-rmbyOJKnL{)mTTyS1c#sl1 zt&|`KC>v0l;I6TCCJ*PR?}92RX4;LTsdDUC zVe+L3(m)_orhj}+t-5GC7En|{)S!Ed@@VUx2b+J%Zky50ZXc<}WOEbM6mAbvj7;Rw z!$8y@R=Ov!b66#xP;fllI56W6+d=y&iD1jPm!*`ue<8vv+|Jmdl05RX7wO!%TdRGF zZ2&rW3twO__Se}|Vt?(OawFQqM9Y30hl9VT&f|V!O(miWH z;+PXfe{YKuqtiPzvpKCN$j!QBiM4=Xs-$FV-SDOG>}KNW*Eaf0%IA@HnL|!o0H}*? z-~h{Q53_=EKLo2%#vw&-!94(@i= z=ypuNpw4HPcRp}?Vmh)4$STh8ett0UO@0D34f$Ha!Z00RkeONJLO>@I^h)`q+{S$e zO7s%R^;*c78n--Q_bh_8vnOm@;0Y!e+{lSH;Jv-AzosKn1`Jel{?jev6WTJWh}(l z3&eJEDknvp@sTJgxsl+?9C1>0Z-CwVHL9=hjCwkhz`lk|ZxN@llLPk>)` z5P)-BTDp;vFaZPw+Cly~2TpL{yb3!xrzRpI0xTkG++sWX(7TzR32n=*`vpjbe_ipp zVe&e_4{%3e+5(et(?!R$j*h89#|-PG1|9VkZkYpP6C4>t)JRy?kTB=miy7h~Y$Kc^ zXb&sno19z|H+RIrT*L+kGm(sT#&$x&*+afsZusdz*7e~qidBX$IomNpkE0_lh zXoP91CNLO*(k78v6m4P>ZDN5jg#ZsuDT5&rSE>SonfQf@RGS7Mq-L&=ngbo4p^TfU z^ir6sm;a9XV@!}f!V0j205WgTMLz}RV|LV2OcYI`K4k_5_R@zK#}tpbUloH>I=n?6 zxf~9b=N5C3DnN5J;)vz diff --git a/web/themes/custom/materiotheme/assets/dist/report.html b/web/themes/custom/materiotheme/assets/dist/report.html index 8d23bec7..695ccab3 100644 --- a/web/themes/custom/materiotheme/assets/dist/report.html +++ b/web/themes/custom/materiotheme/assets/dist/report.html @@ -3,7 +3,7 @@ - materio.com [2 Jun 2021 at 09:54] + materio.com [2 Jun 2021 at 10:40] diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/pages.js b/web/themes/custom/materiotheme/vuejs/store/modules/pages.js index da19e520..1e720fbd 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/pages.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/pages.js @@ -50,7 +50,7 @@ export default { }, loadProducts ({ dispatch, commit, state }) { const ast = gql`{ - products(ids: [${state.products_ids}]) { + products(ids: [${state.products_ids}], lang: "${drupalDecoupled.lang_code}") { ...ProductsFields } }