From 211bfd6af2971a6c991905ac2610889366d8943c Mon Sep 17 00:00:00 2001 From: Adam G-H <32250-phenaproxima@users.noreply.drupalcode.org> Date: Wed, 22 Jan 2025 20:23:53 +0000 Subject: [PATCH] Issue #3498901 by utkarsh_33, chrisfromredfin, phenaproxima, dunx, zetagraph: Recipe description appears twice in modal --- src/Plugin/ProjectBrowserSource/Recipes.php | 2 +- sveltejs/public/build/bundle.js | Bin 295035 -> 295821 bytes sveltejs/public/build/bundle.js.map | Bin 275121 -> 275402 bytes sveltejs/src/DetailModal.svelte | 11 ++++++----- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Plugin/ProjectBrowserSource/Recipes.php b/src/Plugin/ProjectBrowserSource/Recipes.php index c10a934a3..36602ff31 100644 --- a/src/Plugin/ProjectBrowserSource/Recipes.php +++ b/src/Plugin/ProjectBrowserSource/Recipes.php @@ -112,7 +112,7 @@ class Recipes extends ProjectBrowserSourceBase { ], isCompatible: TRUE, machineName: basename($path), - body: $description ? ['value' => $description] : [], + body: $description ? ['summary' => $description] : [], title: $recipe['name'], author: [], packageName: $package_name, diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index 8068e44702dc898ddd71dff0d8e3f0cb31adf9e3..6ef58447fa8e647f3fc2c5097d5e123614cbda68 100644 GIT binary patch delta 1691 zcmZWqZA_C_6wd8=X^T=RA5sb^Z}9_)6)94b@1mswRz6fvM8T?<u%X}tH@7U5jfJ_) zh{NRB=AuKh4~>g#D(^B;irX^g0zxn|Iuo70mT8vFUrRKy^S0Bm*dM+3-1D4s&&PAm z`^Xo0ushP%CAu`{>2ajUMqfK6DhW|kOJX_p#ZW04){qvTwo|-vFNQLu1jo{xOso9b zyr!LU>q{*!G;VK8+t#vUf7(88b342TG$vHWQz(XFC<%{`Xu?o&hGJ)^+D3VioRoy& zWmJT)V$!2RqHz4-qFD%a(_EyuX(4`hQx>jSDH5mN6cuPat4YP_Joc5}B~sAwA=z-Y zODrUNP9{8|lC0#!Q@O;!-tke4ay*ePO0=AH6MHqe%KP)_Ga;5L&V}^1ma}6_j<R<# zU66!bv1ZV1Nn|M6Wwb#uX64S1`4`&U*e362+LwtwyA+4+Tsn`bBbrb(izPU=Kr&$J z48@@-mqRyyL2-&9pR9s?%Vv=P^iveJnmD7j0!mbCXMoKt!bAqDq9_KJ@@OVBZ%{P+ zF{H!M0*3qjLc&)CR3b8iprIj+0WF0L$|$7R5Qm&ETVOw>iNaHj4VC9e!tp|CLba2_ zY3QeT<U1)ApE${c(I5EU{Z6uRT!DKBo#YZ(5JfZxS648$tX#~6@jSV3yIjO814R@e z&@(_`*!`_YLwphULtepR{YrLUu##jLx3bfg0rKJgO72I8D#p1e4R5;046lol!m_P$ z)6Rx%%`Mws%vKJ$=v9GsH^;L<ZLiPD8H-}h_+2+8;I5mT9Fk=fCFrtjftvSDoQ~FI z2KILJf5R8=UquH(_@pgE)p3CmN~n~VVVg8t3bd)CgyzG4g}X8K0qKHgmrFSFOo&v9 z<E3cunFN0+m(5#Bv$er1(K;ebYK{i<4^oJ51dSY+P>q68h=cE6j=ozo56(-|K~-fO zqQON5?XDCKCJ5K6aC<uTjEI;(k)BuDgG%>mikyCj9T7>w6g9nwY5zLze213w`i_|4 zxlD(YbPp|2Dc4uQ4KGL)i6|?f2smwG4th2U4@N5~6}zs`3UrjSg3A+yMUzjd`F%Ov zRH<o((I$-ec$|rOr-Bl>R=<wWI2KQ`4KsBHs*<Ewth-8E)aR^+zJ^`=cr}2u<VlMW z{S$fc-FC^WvC6npMHXE2aJ!kN;ka1EZg-DTA&hJJ>HIcICFowu0k0mTVov+;7~PwO z9J)ry@101(gKFk|>3YWXjFS<vP3SQ;PCB;eTu+N|u!ao1qr-ZZ|2oIR=0Oby`{$&X zg`+R?*!jGW?8vBQ^S3AI0;Z~&X|d{rIX2E`uV1GGl_Cy!Yj}{1T&I&r-#`xdYH2`y zKVc|K6=5jfM8&~A+R^t4CBwgo_57+9;BXy_;T5!sM~-nyEXA!lmC;USP{35TnWI)q z%KC^gCRgHS(gi4F@7;4EMLk_ddAt-&kcAhyj`pand?IG^GOVVQzJ}s?|4Uuq{YKb? zNuT|c2x{3ycJJ_TG$Ygk=(Bk|>~3#v?zQyAA-z`Q<L+kKh$labnK)F><ECc||82U# z&H3mC?;aiHTJ=|RI|o(8Gm&HY@+~TZuAb^pyM>!~_dX9Me?24F`ajWu)%9dzxHpSx z`2}~L<Qn(fq;RFRfjk0hcrg5L5}@;IjRn^#C9QH}E2kDG7e4>#Xq0p0<mB#$UQ!-< Ir2}*S0rC6}B>(^b delta 1623 zcmZWpYfO`86wce{D^MuV0&*!AKZtVCf-T`H14<cC6tIXWf`I5SAtH;)*xZjvGB-jN z9kUxJ3;fvJmKif0i_A~vX645gb#fc(B8=4RpUXlZ%Q6=>-T7K&H-3D5Ip@63`<&-o zPWFYZ^oI4G5GORF_#=$mk&u<RaO{T2r=Cbuk~0=biYF4;l9XfFoJB2qNmg#gqec?B zwEQX}l}$;wA|aQ3Ge<QAN@@x|79vxbPQ^n%k*CINR$#&BlCY@%L?{zkxGo8+GMJBD zD$3eom|Ppb2&JeZjB-%PX-yoR`x-`iScLWTdm%z`r0qqjEkZmc#3PjQ=Y*adU-9QB zcGAWXn3TF=qzN?vKl0cRPM)j6pN4HHR8t6`-a7b`IY#J3CS@2Tnf&cA(9sga(#R;H z$nDky6YPkf#(L<f-v+(NB2NjNBAYCBbke>{zA!Caw!=!pc9_V05ecMg<_qbi{CQyK z5N9c#6}hhQFHQ7L84{F<Qk)X>X(>m>jA0GErJe?kK|eUg2=~e$le>&hr^fj7ryId! zD@QtAP`!QSNTkIDwjKPQ@yE-NL}$yH^P_SOj;&_LQaSWWZUqhrdd7hSCcQ2W$+S=b z9bI7qedu6Pzc>&_A!fGScOaZaAE{uJ&`Q|&Jbqrp1U}c%lWUgwo9&u87vZ1nJzMGh zGfd-bCHl2&>CRMrem)-=lSCBVPZVKvYztypCTG2f=AR2&u#U?(GmOXp6_4*_(c$YN zk_NO0qn>IQ2i*wt0(u`y_5o(46$Hxsr_<^9T2@9!S6BNH$BybMxlrc%TUQa8XLpX5 zrH^rrioRarOF7iGl~ew4t6Hiu1p6IIUA1yAdP%UvVd6<(_cab=rT-PEv08kQs__3r zAXFn-)jya#RnR^G5muiPTn!a>s$R$>n-J>ieLF^RSL5oFu5{OOR~Bs$YgM_7WHXC+ z8fXwzw8@DLMoVi?TjvYya$;ejoXXk$JqA%U<b+XJluw)p7OUMHP6o3u&?}Ew*KOZ& zFUyl6fDGH=?-Q14n~*{YxA1}Y0fY5F53G*UnwbAf?Tam-sRNQ6lqPo^Xx-QO{QiTP z^x0ij;9d=@c6<lV=F}v=VYq<`D!RjD);<>N=)rB_9inK8z9Z~v2jp<Q@_c*-rdYf~ zyJ4Yk?ubTOn&cUNeJAp%cN!_D&m>XC43A*kE`FtXMor4hNsZKVQYuKk4`gx%!LEt% z0PgkWi<&4(|Bm%sniU~*{$=iP-87G<wt*qsJD<`ko`r*E8@T7k#t=dyv&i*R5xLY} zosRE%%4_>=9H507t`)BYE#11#ODDbomuRt(5f>X!#zn4bf|>U2#+bSR0_o?Q?8<B8 zAl?Ph<ky5UFJG(c@R?M4sfitxE&O)f9$%8b?qT?AEiiFU8qGXKt<CUfSc_Sti#*r( zc!at*IW_)yqgZOD*K|Dio_oxEsg^UWnuE-HY<WmTtA+r2bXNqCtqnngdl5t@=a}8f z5bNP}cB!`ck6<IG30m^(#ZJC#oJS13S<Lcgw=sCo54>|?=XslYZ9|MjD|y()>*2j* r-W~4-GJnGYexsTN-bCIZXx-0sJb78OM!B&ciK0(xha$C0{Rw{ogDD44 diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index 61f98a2e24d3e923700ecb735cb933b7953ae6f6..dcce5d6fd5e2d5768731a906f21a57faa519afe4 100644 GIT binary patch delta 546 zcmZvYK}Zx~7>4=(x7nsGr!~<^aCgR#4YIY}WfPlV`Da$fX^Sy~NT^UtVwPdGP-%n6 zLlj-Q1b&we1)YQvL70P=z*7rakdhf&U93Zx)kO~l%?3eK-|c<*_`Zi{dNor17#Y9G zW_VhrjLb`oYE~V-GE^A6Fp?M;x>!n#^?Rd(>Jc>__n*kTU79$+C7P<|GMNgmrRAMm zrRO_%9W^LCN-2dm(`Ey&r~3(BbK6z8?<$y?W$k{nj5|E!nj$}D()4#U()t&Kse3ZG zcWx28B}e4a25AdON~unfv;MQBP~QuLsBIGx9e1#Qn<JdG(RxDIba@^&onOE%`lM{x z=XcEGY6zZXlU7EIx<6nqb7}1*1Vz4LyJQQ`I78PLF-L3P5JkT57nDrdCB$&jGyMJ~ zXgutQf;C+Ib(rqH!a+G>9Sg!Gle7(}0Z5xs&G~9<CS@6uVO@7bZ%<GjB6R~T^x!dS zV2f*h>@{MHl_<M{)9e&YtY9ECYKVUrq&=NN2>s8oML^VQQF0Y^e(?>SGD&w0QKVD_ zEi6ODA84ZSvw_$f6==+)hZWqSsgXdK_bh1FkN$T4t8041<*h=uh1rqwlW%d4p(`-a N_a1To^E=G-`~<Xgw*~+J delta 424 zcmYMvF=!KU7zJ?t|95xBnw}8@qJlLj*x?|iQffU=zB^4!YK)PFA}CZHtkEHZ)U|`u zE`g}XTg63jDT3t&2kX+IHMq2aSV_ASmtt!{L<jNTrH=3W-tc?#-x6=v5)+TqJAEp~ zE3cHr{+NCk&BgS9&6yi|A7@?NP2bfSzCNy#-0SK%C!ee2<7rn%(=KM-Tm3;g;PN7R z_<0LXRG-I9&4!CTc1bE@=c7&&e;hT&_9D(W_d>Z7+~@319H!eu7tb!?fNiej8dG%~ zWW0%9t`5Vp^O6aMd2S2GIJJZq9B<(WMyg@N7E-#~_e+w_)&j36eK~$~;O)xf3MQRq zBaM_*l7WC9e(4ho+IVAP@iM<}pjTbsk2VG|p1aK_pN#s_7yPyRvT|*3M-bm;?dQe< z9B%$bQdRhJ8MiFcD)ML@hqjqL|NpxyBI1QI^dP$U6)lyx8%Q-PURk8<<wb_r$Rio^ ueSgHLs@$9~^BdRA{8|SoBYN7wBu7tLmgDCotc6iw1<#Z!M4eTvU;PK9HIe`T diff --git a/sveltejs/src/DetailModal.svelte b/sveltejs/src/DetailModal.svelte index 8a80fe2cf..aa530ab20 100644 --- a/sveltejs/src/DetailModal.svelte +++ b/sveltejs/src/DetailModal.svelte @@ -10,10 +10,9 @@ // eslint-disable-next-line import/no-mutable-exports,import/prefer-default-export export let project; const { Drupal } = window; - onMount(() => { const description = document.createElement('div'); - description.innerHTML = project.body.value; + description.innerHTML = project.body.value ? project.body.value : ''; const anchors = description.getElementsByTagName('a'); for (let i = 0; i < anchors.length; i++) { anchors[i].setAttribute('target', '_blank'); @@ -51,9 +50,11 @@ <ImageCarousel sources={project.project_images} /> </div> {/if} - <div class="pb-detail-modal__description" id="description-wrapper"> - {@html project.body.value} - </div> + {#if project.body.value} + <div class="pb-detail-modal__description" id="description-wrapper"> + {@html project.body.value} + </div> + {/if} </div> <div class="pb-detail-modal__sidebar"> <!-- <Image sources={project.logo} class="pb-detail-modal__project-logo" /> --> -- GitLab