From 4273aa9f123d429d5fe4d2163b19407cece86ba9 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Mon, 17 May 2021 17:57:49 -0400 Subject: [PATCH] fix(presets): loading columns presets should only be done once - loading of Columns Grid Presets should only be done once (before resizing) and loading Filters Grid Presets could be done one or more times, so to fix this I have separated `loadPresetsWhenDatasetInitialized` into 2 new methods and made sure to call the columns grid preset only once. - this issue was identified while porting the previous PR #341 into Angular-Slickgrid --- .../slickgrid-vanilla-bundle.zip | Bin 817495 -> 817530 bytes .../components/slick-vanilla-grid-bundle.ts | 56 ++++++++++-------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip index cc08851b0b963274ab0c0a8280520b0452c27013..1e79f877543cc2a189e1581a76d9f7ee21392ef4 100644 GIT binary patch delta 19785 zcmV(;K-<69@-h1IF|Z2+2owMa00;mhuCqJ@NFxXe000000Q{|!69gv$Bd&uHHHQ&3 z0f!Ma0=E%01Dkw*6F^vt3Yz$AKdmvUyWN3^ic)EThr_L>UM8g_p0R73*zf0uoWmj4 z3jmi3^+$)cJ)*5E7A(c1uvs@~=JXg^I>P{_+83B=-=nAFhaQIE7g@-@uXs>+sl+_jTIoL}iGdQ#* z2-x*d;84Uz3lu8I<7b`ipDVQ95xlmk@)|I;-j8Rg+Frm{(=fURTS^37WgEU zzmvLur8j!{usnx42=!RO5%oj7?xhq8xB$Jql+qDtcrv(u@w- zY{rn|JGw1!A1(ybH_6%nC?vEL~r1He6mlji3xY zPPM3q!+YRSO>B9d0-;ChBLVMuz-poh_>wPJJ@Yis65(m>)U^bEVm|kcC&>HmIj+lp z#^lgrSxn7t#V5wwXo507*?k1%-g32f6LgB^l0vOEwnI28k2{&FRtWo!%uQt+gi$Hf zn~ud*34RSDWh6FgN8|-dCq`@n1mi%8@oYuEJ+G0WjbfGWS{0HAmBPv?ZX;SLELjII zh$txmKHzq0^5TwJt0{hgN2mizhMOCIzGsZ7mBmk3Xeic~iCOhrH~h$)6^NEuJ-y@> zHfS&`lY49lCn6-4y1NTq-JB(8vsRb6eT7z+@&zAA$LiKrp|LMsUGm>_ zb!%gF1z(qsR6VI)h1m+VUc{sOyTlHMg^X{mIo6JUV;c8; zES_U|-MSMj@w(JvL-TR_yn-6bq&5n}s~<|0X`7F=h@cmDs3&9DjkSQHprgWb+Mj8F zd=Lb`XIUFp!4AW%&11V5Gzvz{dU2=C95*Hb6|+Z5t(6A$C8@J~!CXq@HDsr(U+F*X zM!Iq=)cJFw&g5hM7i2j+$flQn6wc(C2nql-YYiL&;YKNT)EZHhkz#*ttE`Smxtf93 zX!}H0>ZJLE#H_Nx`DIMUC18|aEi)*+#-G3}U7>HvBAJC4sq8*_m1YO4qCAW#-RL}XHX7~dvYc& z7&)-6@KMb){T0J1_o}LY03~fgnMBFk#Mf!;LPs3K@~)cR=O%|vPcXZNGU5)xqnxdA z7B|^?imW2Mqi3obv7Dk04>Qe}?a`-Xqw{sXnEf4MRQB{As7Fca$!yP8oxBnui2>Y> z*5N84v0aHAK%~B+-(toA7TOCCYJDT3a6%wi#1E_GD==R&gY5xhs|M$HQ1cPSNd|Wm!qpmz*qb&>ek2AIqtP=(`~1KwMOK4h6kNUtYfVOf-erm6!Qn9nM(0mf4#*yh z?hFuK-YAB;l|<}laJvJ0=+!-2v+R!3r;I#o=dT2^+QW%~UzkH;FU(-0`{8bKe~G

=JFzVf9=*s-4J@GaNfY} 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 delta 19632 zcmV(^K-Itc@-f%)F|Z2+2nqlI0002Tfsx_0-Frv_vv?jT8Gl{E%ljqcOE$Cc9 z&6~3yTH2SyTydH3{7#avv(~*k6MJ{&**mS>ooIJAs<;!jVNFUszUlT^OT8yBvF$yn z-}zm$C8f4;DX}a+sm~mg*bIE?cP_VGn^V7Mx??j+11|Tb^pScbl0-8GrLH@^Y4k~b zmY^oFO~P`2|8KgjhBsn!Z&WjI_Um;GPt-9tZ=*DI$KhE2-NxfBq9uXvsGH2M^qHH6 z+MqlgQ1+e|>3x&r6U*5p%ab}Gvh;>dsNhK!v_} zwuk{fdOp-jw4RQepZ0FFlt~h^XIXnXd9VN8W$n05}E3gk%q|3mRn&!WN~IUIjM#hogO_f!jflFHvn z-O?L>{d-u3Lmh;Atl)^sAzsH)iX|T&cH^d@|9JE+dgXLhsHPr;a~Bmoau;dlhHN%t z$nhQB7Pt==g6VM+`?zh}B9uLIv`Q$WGK3xW)4X1gzk;PPPJFFUSMGoB79WW{nNGAc z?mm*xol5>b_(6_pP0fw+v+qc;9)^@~-nFQI`Zhm8+SR9Z0U3_^%>+(mzm{yadfT>5 zNxstNa}_lerC8^qtRM>z*@VNoZMl)^D}$fXKUk05Iay`}BsP{#uQnSlFP}zGh8}lX z)WG3A@F*p=JWqkpBlVGh_dH-VQ3Slm7p#(b8fb~|w07!Rf+sPb`^FRGefJ!vWn*%G z=&LNIX1C%K<8Atj$lmqTiIYp!v;x--4XivqVXEXHY$5U~m9eLzQs^ihv#FBd8b*~! zY!raV3zid%*t7)3fjr^aihg@uBX1hTDrvQ<1`(=fl~XiDw0c&um|qa*QCfPyjm_l6 z9WyyoQ~{4rk&_HJw_eW}e<~}Ou=q}YED{s561Z**kvS`n60>@G$<1WYU|1&i*b+`e zN|J1KK}mFj$u@PL6}q}P%d%#zF7w?Atu7_;A4tdQ)>gH!FJ4{p-*k0rV|4|KmXB0X zs9x383bkIuqrkhw4u^#dPvAi5*70Z)$`B=O(F`y>xd}NIfMaU&eXM|Exz4(O6D;w% z)M7*Par?Z2YR9BDs=KQnN*`(4fVHrm7k8-gVkwHXsGy*?!E@T5DRX=f1nXv*3|GMp z!>!E&v=}rBM$CF~r_CHUCILOMN8qfL8ucZqvwXq)LgY1Mr>tN7KJ7-jA}JK>b3(`D zWBwPUDm=)hmlV$AneglfjcE;k#Gi1>5<6;*D6L4bKQ}m5$D~}%!1c3zqAPXMeDYpa z+2H)*qGQ(|ZkE1FiTf{o3e0ZArUI$jUKDQu1?!K;T6JG&w4n4tjl19VAYHz z60!#e_!H-;f(M*HoD>xGv?^SQ@TwQik6c-v0MZ zLicBD0X4t)Vl70cg(DzxZLN^X%d4vlI3wU_DER@;?3NZ-1|!2fqYmF9oG0LA#!oKy zZt`eSxEsV=x<5J3G&8pa&h3v5exemHaIJ$@tbs8of94sKgX8X)i3>&!tm|%6Gffr6 zu*$tE4M0ho&5B1qfN7HO?1hB&Xfy8R=!8~>wR52jgBlr^uaI5;os%Ym5Y z_w&3Sfcb7oQQKg9z}Tw6`5hE)gmIF=9ffeUhKlr;Wm%EI&1F8l6b)-Ky)5$ov&Q0& zR5Bll0mW$aOwm3+@N$pUU>F6LFT#S6k#||5cyM^kfzkPYla&Lq$D%s}gqJspq4*>b zI~v^Xz#e+l$kr^ogY79J58L@GfzHr&r@G@!l91#vCy(`Tdq1}3=^P$Z4r87E(VsuK% z=!|`~Clynm(9Ie0e1Fk&Zt|+-@1w7JwidO#trB$jlI7R}eHQm=Kaii?; zegix*XzVlO;E>v&@z`Rlcp{}r=;23cSrEOs)pwPDwo|q>Y9RXj(Ajtg5EKRT{4HC7 zOEWXX5I0GR(j3+*Mao#ZVJxyc8`LoWg|VV;zLl>08NT2PJp($|%*3jU_m?<3COzE# zJf?NaOOv;d6Il_STZ1?*zX5-;;f8KqeH_nvdX#l~iaAM7JUTf0SPosUH;T@B9DUzn zdrS&{W=vZv#5fK`Ho1n*9%@t5LBZmOL;W?r*b}*F%7SzUj_jGjezBcHcW*Kq1{~(y zkBk!$^j>dvMUferNou7LCdzBg0j+rtBOiI$>a9g7JGg3XjqUrdnBVh ziIV_t$o!sd3puQrUTDKwI*)lZgz_yj{)&3s!KUmzy**7^LP07rNm~Q~ zTSU3a0n7rMPI&2Po<_#UyRjW)xs`nRvakbh?4)~v!yqAYjuMb-&=`hm-?ma07EW!vdC-+*D)QNHI>$KY>optPO(jMyJi#8;o6c}IVc6DS+@vNSwH8UmQ z$1TEU0Ie{pbsTOfDqNzovCmwPb8|sW53Uu_$oU$^ZrXE3yqy{r2+F4{ z>D2x1xAo|csx0>E(Rn$$dtXt1ULHQPTu^dEao;fdAURT9?R|PlKt+vU2hek{gleBN zP*YorFu2L8LAF>?{^D)`{~aCVs9}a4pmG*@N(WGF9Uq7Z56abGx+n`&bF1-KiPd#Q z5wmp{(b}bjPp@7XAStldKu&;w?2$w6hxmDZrqH(EzhUp~-y`p0q z3nABBx5f1OBs8=1P+Z)5bLIGQd-z;k0y^Jdl>WResq3;_u9XlWlJ7%Wp;NND;@{B? zJNe>SPPqW#35vFwNIjCRE%50kpI22m%|V0CQXXkca!cT}JtQ zJac>r*<9wmJBofU6b8S4`;l3M=?#m{rhFb}6`x21mt_RJo9`tQs-yt$J%O}lm-(F1 zySVAeRVQI7g@EuLR@7P*g*|~hu5L%Jzs8K&8@4C*E8Xp(2&=i7 zwy_Ks=6f810)0c7!&?H&*V-EH1CN?`GXu{Ao^+tKSyE402OYQJd{u+OHqCxeL$%R@ihYrgbF<(z zNAHM-<*w+pC9cvkG|T<+YFSpfkaadc%+kv1n^9F>F$XuIOU-8mIPYpRwI+dIdbYur zTK(fV{#W3C8lS%puq{A_f?37F1-F|3BD$Bd?xd{-CPb4OJ(Y;;sUh66bzj)Je^FOk zS1H=nW24$zIsr%&q{b~vvvJj*WHtHlaqKT85UAjx<@d1~?Foaqg+FjDe|1a03`2lo zI<0avr-&m?+c+Y6F^54ew%hI}rrEA_&9zD{!7rSDLfF=-enqFuRfw1QVs=_;+w;7b zu~^3Tq=8*I1AQfQO5>@vczsJnKK7f2#53vDgdiVjI?Cupm^LXcv!Vc-jf~v^l?2Gl zsdm^E=Kk~zM4-)@Pjs)Ri}j51MbU`Ls`RW0btY+Z<9(NXCWC6d0!?E^Zyo3yDeAnV zH+H~(2;V?$^B~G+(O}7iO zJXvt8sMK+KNHF_`*sCBxQ`pP$>VP5>;d`R$DI~Ht=7@9KLkvj6r}j-TxrZseSc6kQ z`l?8tUtCajCIhsT&hq31{dz5j)p?PBaGaI?GfxhR^;MM?iAegr$`k2YRHc_ig1d>{ zVA}I#kpNKz?wB49`rx`w*cr-6m0lFhIHI#*`nqUKFts;yBACpG{W0Pxo+jTEaYH}) z?Cge|FDXZQMo|2%&dwSvayI@S-+%u<2aFSYmn}i?dVlJ>2M9HsEh|=y0|4rs4ggR~0|XQR2mlBG#(}rm#seoS0^otS!@>g<1Oml@ zmwc=TEtYBw4VSQL3O@l6m;VLZhx`*PAb*M_!9#&u6-V=H-rZ^-mdmma9=Zz*|J6H`v!3Z?LUu5}j4yzR zT8hejdfcS3*m=DqNm$?{c2bepge6vjtX2GQ&gGHFKUaz_>NY|WR^dT?$qFHzC|_Oq z?sxtISR_7vud8Rv@-r*mbN-6owaX>CGxL_fskoMcDy-;o4u5>g1(yQRlX3{MsunX` zrwF}sUyYOA^uqErimFvc%FfhBTu)zHo&Z;?AvWqDVY<_ zm$3O<@+RaER*t~nE&QBIi$&FPj;k#I@_{NU7keNmFHVx2?SiDiV2kuvn@((^W7-pt zYrAJtMA~;xCx0!s_I$28kCZr0B=kL2*|Y@JU-D5F6*a4=`B%u0=tlLHWRJ0$E9DQIB@Ct_`X3E>3=bA6a6D?`5c_wVI;puCv|1L zXct5L$oj}-ZHF4srE^%!?l*~8(>WL3=Y}{e&Brsj}?C3a3%+Iqd&1n+`G{rDxTR!qJs&JEfJWDlazm5-TzzO_kU{7)O@ClZ*|a;5^*z0v+>)khE&7( zykE&p`28|T=i}T=A+~#R$$wv#^C@Ct=q+~s0pepnu2$I-`6n=h^3O4i{mh;KLXuh9 zgDXiHUYTF}=Fefq4{J<%#vVOxgfrisi%EB9G>tY_@48od?5oJ67h&#efwXElSb7xP zLVv)|UqOI8u)oC1(+EtQtCZvVbp9o~ZtJzZ zF8OI#B(>yloOeReNu`nV4>ivFJ$xFMpQl_LDl|WR442kOOr9)hMQCnmKw$%{95}fF zr4rkJ2jYthhpdKa);dhYzfusDa0N(`A3=P_IBzG;q+aY_3#TRq^{cf^JDfB)H~0davO5)! zCX?;KxJ_k6N9sV0)WM*f&3K=^BLIBuRUX~=$3JA-QEJ@R(=lSJh+jhYVAP{JEOm}%69E&@Gz4DB<=7d>{%Pr7N< z!v{gnF5To9vur8z8aDN}>yqD~ONa|tj*ZXt8T3hra%0&C5~)Vwcf>)qT;|yYKf~c% zgj%PUe^&<^PJzABL7`}!IW7_XYbpywPTh|69Efee{&07;@S|2S?|m?KYm3^ zim7R{OgdI9?JsJZtrnKCSOw@>_pAw9koa%owT4|5Uah{D=vN0Ee`hVhQAtu?Le6@y zEC{TD?>?Y~0b@Mh7dd#sW%G|cx$CQ5*3)hGBsmDDJ!icIU+-)xylGhvGD)juPq%w; za`ogl^uBODffsN-g_p{!o_IJN^!n^JyIRcIu;(6)y>aip=TzpUme(xpnMQ{ZD8XKn ze8(AF+>IwCzi*lJe~;NRgRO^7Z65u=T2t!|Ud~wt#?J=cqpZf!!D2WjJ3R%5A%PnB z5Es)Q%4N@5s0i8s*k1^An$3Ze?oD}p0CeC-D(pc%4PsQV3Ft&mfG+fA^X$S5xIT;Z5=LVQKw3pvoxDhxJ1PE9bFm<5%9f9y3wJJw;LBeLz4PYZ{O z)cVs%F{Um!a$N+PALzG-eBL-wrmomXF&fE3ZHRWon+s52(A=>ICd^-&G4~sdMt@tRo z_jsVP-a|G?f5&IC4V83vVcvu@%5ij>_UY_^4kZcdiJ}@xXGd7!Hf1n=p^kXW(WSE{x0r4D;QOIuc z3xFpcTmjM*J6s+vSOIM%@mKvKWqJ(?=fCchtr=Xz`S|_2H}aJT;^M#i1!QuyJ&vbx zWMTIWE|+XJ&LLWv8Q15&RfzOQM>XH%Reqk&^BOV%UFOp%WOYni5=KH*OuW~3vqcIw zOr1xwe{nXnV^Q?1M1Zk662X|Eb$$WNCHfN@_VWbtyo|Q$5N{F=tv(CHR(Em-@gfHB z=}lH#TyvIrld^rz+>JY12N#d`tnYJ8&8v5Z?~l%&{pTmX4M2ruL-?wm$e#mDm#wNK zaT&oo$n{SA?sWS*0c=T}IIT1MjGFjf$r&>+e>}y`j&0oo0Ej{-U{fi*JW*mV%^$V& z>(l8rI9lSr?F+8?G?YG=-V3FWipec!YbplLx-gh6M)j}7s5bc}LiGfwSTa&6CP1(C!4$J}1|O;ND_Uqj z7aDT_qBp}A+#kB!B z@()fl3AjQ)gv-=?=28qLOVGDte*)x%*h-zOg#h8^IrK}UHUEZd;fsPFlRbG1Q}I1o z>$9Dm>61MXd+XR(XugJW4mtZ=JIiB;ZvP(Rj50|2kxx|^=wuAP(EZYFi8n9Gf+t5J zKUE~F!&lkvt`HlAYs6pjevSTjIbl#k3Z!Jj=Sand!+KK7HzZd1Y*mwn1d zk92OOFz?fZZea~43g0IftHg#84Q(oAiWuLr{!ib-7P(<_&Rn$(4~S!Hm+f5#87WUM zE|v^c7`#nT=16_sGCCam_<@8qz?(wiAkKc8t0;Qws8Gb%xylBYFJ1>8f1Ix~k6jl- zxw9jKW0#NeM@u~XE3tC(q-h+xUd30!(uz~UCjoq?_v1miz%KAk z9u`NuZSYSwMT}hwf1Y`!py9nZ96&d&4^t@VpNZgxAc^|HLZ&`6Yf4oOmjAHsmu5Jhcj0}(mks+TlSw`+=n>FADK9SOMh&Pc@X>&`@5Ex0Q{%imh&H$NIF0mOxG;&{ z3;aRolwUpPi~pF<*VAfZzG0U2X4!7VAMa*Y;0v>xRg<1xmdj=NW%n9(lB)fjwO5}q zuRhooU~JUVe_0L@>O)_V{nOL)q+b@Nr^k;H{-gRn8L$44-DD88v#5vt5C7}Q$L|yT z_p1LZ7U0Ex_&yN@`X7FU_k-`_@8Av=JhL0iiHDsZfGLKO3qZ?!QmMg5-op40%BK*o zBThCjMDh#e3U}fa)`e}xi9u?CN*#(r$U;6Tm(!|Of5}IDc+^B{U$o($eoB|-$Dh)U zz>487>3YEu!=Lu{QWr^K*n&}zc6e9eGJIEz7Yyt(mrOb(y>_4psJQB3#0Ta;!KnIP zBDn@505nTkN%{)U?+|kxVb;Au&&BZxAFVDgKHfN;Mx|ewgfHUFo()*}8=Ef_6hRSs z6#@qufBO!XpVkLBSm%5DZHYD8LyT!wP2B)2-9)8;5j@yoL6hOg#9iRWs`5?=rQ_yM z44Yvbd=13GH_mzhB&F#rK(56D3Skq(8BytQJ`wcrRzDTwtr=Nwn4$>f)BFafcvpmy zLyocVKoT2ra4ajoXZBaTabLP<4x`Y{(Pccxe*@9s&U6ofNK+5iL3B`b&P}V+1-`v+ zA4&8o!LuG*RAUF)fZPe=bqWc1>@^Aw=K2yEZ&;qhGD|5gkld9>YG@#S^Yr-S?ETU6 zrzbBk5wQDEdHQs91MkK0`bGV~>p*9Tb0GE$GXET#ZsO04I;al4@#a;0xQ;-F$?mvbojQDJI(Ya}yNC)~xM)oWm5A76`;2oE zfWIsHjPJQA@KTA?O~p6V6x)C@N$@y{;{2U%gJ^}@K&Ir|trho%!UZ}1q|ed=$iq_D zod6FJpvmwxau^Szj!`x(WhGS_L1_uo*)&k^4U zA~%^O|3kxL_ux+8?seKX&;FGymoukX`M_?oiQKOD8?GRa5%3pK(!@4#w~Ly9ksQ^; zvHz2ZFA@VGo9#I~@u$>W)GhJv$Z0x=KzfT-YG!6-`gUy_>FockUs%BulEnl^;%JjZ)OAd6bOB&S z0kaA)Jgl(1{`iWitp{*yS`W0ljm6DzK`#L5YO3jj#;S!7uU;Mtn@w!mKER}UHQ*K6 zBHA_3bGlG41&3NGa>UzK%+l%!e=Zqm?Nuvv8t(uc5OS)g)>P9AtbMWrDvOqhH>Jg- zPu)pZw%>KSd~J2vx*)GD$5qIY6B7XC5JyB8bFF%U%N`7II=4Pxnm7-xlaArD^+3tJ zL(d)s*u|LD1>B357$T)@oveGvm_5b%Ua)b6KlRLL6>bpC2KPK+oy(b@f28$ohq68V9p;jYpY5fy%WD0V~O7mF4^Ss zd3meUc+#rv7o_Q=6Lh`VVt8TE7kI)chN?xOYyiU6RG;sS!XQNMH2z*^qgpx?cdvf6 zLd8KnifC6x%;CkypZ0p_$TCtHAB|K@iAtQl`S(7a2D3|kP2S0zz4XO6* zNih|;j{Cj;rW#!ru|=lf`poXCwR8nZ0zhGSnY}Ki?Di0x2LHnD_!;$N&&cKi_)s_` z?WN)JQft=HAmpg%OdPouA@&hY@E+(fHacBY%*!TgWOHS0^NBAh=>&BYFkV6y6Xm+P z&c_G0j53n zZn0!Hv3CU@pV&LNzR_X#2+YtIN|LL33oifikzroJvC*vQ7l*U4)OzVhlGqU;@h`Hv zPK1BB0Wuzkrxh%I02yiu8Y7c4OKZc{=qljT7(!HNClbd~h`}91(GGw9FM%DPpWU2u zJrJ$m_rF&|oMx6ZCfF`k_@i%MenYphO%Vcdq5}31S z!JJi52!b!LP-fTs3NPEsM(rEg()&n2-GcM2gMvu!B3uHYtpfJ}W}XuXNKj^gEh~V1`oSmAy^%I`vGj+Q`V~#e3inYW zGL!VOn=GG8jB|FJ|I;(<`$vRd1>yvCMhNg>?xdj#>RKn|T6IoJk-34K#+~(OVUfOp z)>iC}UvGlT7e>#N6&XEYZNt6W*|aXH>;3im>fG}Z30D+FvB!U;ChxEI>~P3f*RH@f z1Gl9PM-aOfDfi#tu42|}=LngiVnrZlWtKkYu7u#J={#23#0;iDQ5FZ2OAgiNZS)*k zlsZm%n7EVd)jq}?*Nwml7&gKgHk1Ja#*RZWD;o$%6(;1o`4i-ijU)0w&aOak(Qv`*EHqxJ)D+eFpQG{8sBE>(bu>( zgj+i)own-oU(k}dN{IUe8i~G*+lJqwzR*mAIDrvQoNv;exKfdLUM#L_(PCkq;wc~& zjS?~hLHvJpQXXi+jAUg0CVe{=NjN~q4+p1nM$+DGxL>sP;M@D-Q0kJI4K!kZ#Md@< zxR!&@=5zy{kMy|-T%Ey7z{}!$x;=mhkX`S9=Pb3m)G!;yS_`ec8FSzU8Ub_NH)w+# zwSh+dDo6J#8zGlepphf~HZQNMhc*=7b^0VgNnd|jn?{sdr-I-3Q9o{urE2jE@Dn43 z836+Q|tv75B2(&gQ_iIFb z-adc%esla7Yi&&&a}k~Uri}rG*4D&<*F@Eh+96wGbofeT$B($xo<_5r7}c_tycA>| zMXVczZ48|jC`@uFY>P)P-klvief2`61T=Pt4XDt{hqEVasN3z`Zbv-ehJbZ*b7or|2> zyihJvnTWq<2IGPJ;P=X9F}S*hsOLG!LPv^>$ltVZ3ewgxJ z5$nL%>Hs2iA)S5ohbdZ(KahsVbKVNgt2C~q5KFvy)_$H^6fI>SYWK_m_~39`Ar3$B4n$I6*pGLypnZa8#v{_+uw4w%$AeOe8L5? za7oakA2VRHS`XkU-az0S^V|SuFegS`+R(Nu#Tye}%+?{S?4bIRLu_=;Sm;#(wFFMqY zk!oH~!XJ=^lzT3%WSv!JvQ7~9Qy5`g!v<-54lotD3=#Ga8Od7$t|%tGT-?!YFYg!v z1x#2!LLl)$K9wsV=YdHCbUz2j4xQg&yk(+st9B%N;%?c2-5~G9Yh`)W<4k|C^QreI z@y&@=a=kmj+WWkS`X@N)&}fzrj|p&+o(1s7UF7~i(t0<+GHKB-?WRye(>3Vpqx1)E z7`$%qa_lDXjZ7d(PU?pbTU*IszO=24qA6iu=bp?w7r}C8*GnBurceC)7CBs zw3L?_+#YwhGOE1)IZ`JwP8KP5><;`-u?o`fIM_eH@3@uYW_2#QqtbuaH;0#MN>c55 zy*=}LYnOEMk3n}&6vkWNe2|?pnPqfScY&p9iqUrN_V2KrH+gh=qr=iR2KAC5sE*sS zFQK#6DoT6zW&aEI?zgTE9wkN54i&|FtD%-ueVu>4O#hm`Nq;tI3vqTg{+7VnHK=+s)Zi=kK3p{`-O|u!h;x?jq;+MT|2O13GH%K6+QnH|u z;?qT!<8KEpe+O<=&=beir)+%{taK%p!?l5XwaQu$cd?fK)2@^ChmSZ=szno!>tw46 z&8^J0;F>~XNZ?~(ALTrA58t17ijOD21}rPFk4f&bj?~V+zOSW4{!LykQ412s z&5j}ie_lpx3l|#GXPiB5a=EJ(^$0d5q^o;Z?RA8#(6PXkNQ+XW0da1P{F6)1V`PEQ zT+{S~QUH}^i&2PFIK9FKGe+>})OxXaned9C2OU{)MaxH!VE4*=L|9~`hQ8AMFjKo< zru?AOnR!i-C3}ZK2I_d>MM5^jQbj*WZZk5ee_jC<`s7s8K0C}0#;_o4{paWf5qT%l z0S{v}nSUHFoM_qr&4}xn;4V%~w3Bmc?Jr*1Odg@2OL4n7o+oL1akHqKXi2)UcAbAT>Mc}!m^N_C$ac=WX!hTk6 zWK~#IFH5ZiF(*yxvVfFS-V|ZA^=~~@Dj|tKX4Bv(0$2mbgRfL;y+=o{#I(P&w z;515z24uf57oqNB)8^jQ5JZs?8s!BgGJv?aPr4ClB16{}GfAAJak66?j%zEX!vL%-B&uCtf`!2{Fze*B*{(*hO zUXH@A$Kq3)PKX{)*O7#u>-M@Rf7;w{;y<%{9uPHU-=n^ApiGbqV&r~r9EBM=?!ukg zd7}#NQ+=;m049BNvAYbTNZ|9X{1SjU(eIv&_tX-M(-0hYl#F=IDJ3L1Zv>v@ZFya> z-!B=PA5WI$d@k>DB{8gBVXQZZ@0!Wd4f&4)bm5fOejsm1y|$~Ouc(Ube>xXO^sHOU zZ6y&M4tdJ6KFN)8$;3YpNTQxAOE`GS67kE zkIJe(5-N&=Y(9rU3eDG6z=t`J2|(}j0#b5IJ;P9q)qHF?qRm}XL-$9fUS|WVNjjqQ zot=3z^7qZuO==&-G*kr=f3yAg1Dc(dkJn8;wNmH6m<(RU3Z_B9KSs5^(UhSC&C+Oz zVLO3F?mjib?pLVkZS`WMM+Q{5;T6Pzp+k%G3^po=>Ye1Sh+r6Zv&Iqok}cFi75Vv2 z%42o)OTR$zd;@=K)W|-aP6dFUs7?}lzAa+3HYAmVW<7(%Sg5HPf48<`*Sg889AG)u zsp(2&$`xNr>COpn%v5W9Fkuj<{$;knI>*xSn78(Jqs0qXdiES>grsCFNnfMUbpo1 zZ)N$piZ^O0&-6}ie~oidXsqY@ww#O|IWu8#bjHIMo1wmI`DV8<6ciak9aKz`t(1Xf3!qG^=+4sZ`*N{7a0PrjA!2AXmq`} zPSjoOUtC7A3^1i`7Q#T00CJ@sA|vkN4tre$mre(@cB4FLe`8?f%WB;ULG6MRRY=rl z-;t;z3-L-#)|G3%+z*-a?0ir z37+%F^ZqOeNbs@EdZQ}en1exWHutOW+b^@~@Jpe-4Z^$biiz+Mk{twGSjkLoJs$a_ zJl6dy+kR1EsyCUoFXJKa7n%Q*u8aV{m^Ef|0`B{EUDTufA^ zS*<`u+Sy?aGv`xxH)<{-emUcY`T*LV9M$z{)#5&0-mu^D>68`T1BFQrDBuVTAeljW zrrq!hL;&`up4C&>sQZaItb@i71ulBl4Q0Nw6D>+Hf6JwGFfX$yeSC!M2ZE~K^3z(M z(NIpjtKenG64V;my4M}HXl^SKrr6(l9As2lq9423Ny2`B$UPiN^#E|XkmI%QS|-}6 zVp3RK1e;ZZVqT5DqdSb8RR`*xo20e=-f&ZvwKk zTyN}_e@(7yh7;n5Rk5x>_k{x>uykG5vc*@rVmOGDS# zlscB6VaPm`y3G7A?2_)fLJ!0K?4Av27;)6MeM8Iu+I?789w`0j;{ ze^*9odhUPZ-C&`CD6xy7H{(c!bSv=Tc}yarEEG27R0SjmcZf9hLmQ;PUf>pv#fY>} z;o?l*Y@(_q%h5A*dQ)ODQ&3E6x#f&SRXrM=ZYxX`!X=`AtK?xoPC+#6-0$Kz*Y0cu za;iH!Yth?xAM_IxlcDoDOf6hX>c1a~e~%Q4MLzN+fPzav73cByO&NSN)W6fZtv)&c zNd!hp#5^~YRK}E`>nT4mSF63GY4|?@eGJW5FH-c>gE$&eu?89vF+^n3sW>R#^67z{ zaiLfsA1cT%+ZN*-=%bUg8kHns*`MU~oc#r?kVzUUg#}WyN(rrk)FqMzwD7BfQAgDO~_w(t16Cb-7+i(OX)!ZCcWAH2qR} z%|$Cw`6w&c97H(f)b3h!v|7vJuILBTV4vefRsc}5c8qnIa=rb?<(|j(nf5#6aC6OK}XEr8y8_T|L+(B7)-*arXI*0zus%vg3 z*)dsWeUUjhp7f&fZ#a@p+`A8}fXA3g$Ou!2JWFNG>7Z1)OV6ZgB)Uf2O)RmJTjYhn z7h~>y0__0udA8)=p4Wm?MID&(ax}RvV!6C>eo!%z%S$IXjGlY^R(&B&f6?sOoiIrA z!vY?mYA5Y)Zrh#;ZdGS#5h0?O2q#gAg#B0}yI&wTX7%J!8quIYzfAA3B&>=dOS9z# zzp5Jq^`u@ce1vm>+UAU~@a~F_Fu&|Su#OR~oos1eJ;LmN>p|w%3K4*27&xP-Z-iTtAt(U=&>`7lte}!~~UYMDFEdK)d z!x!1)lG7PKQBeS(Nv(kiVAAp=mRh6IOY&Plnk1`ttXxjPLA1T2OS95KGGJD@%_1CAg`3x4#pe=1^`<7%%nVg}^gR5=_Getk>M8>k30NDrg202jr3fbY$Pm5M<6xA71-#7U+Lb;~0sV?} zm6&NKDeoCEg*)W@`sfCzN&zd^+Gr&TSdGeOfkq`c>9(2re`IvSRHI{x5e1bvSME&) z1Ae(FZ4tlV#-U0hpE{m00+Q8sHMiMrzJ|p{)IoL-5#>#dH@NB6V`LiP9bZ+|K){Wz zR#RfL4ysGC!TEJQpZ*QPQugT&sU}J5@pM0wn7vYwh>;T>4Z&5)5;qAukQj!toU2|( z80sKFNN$eDe}xzMC<1*%YGQTnwg59_=!d|$7dAq#Ai0%xcIYpi4$ka)IwTuM5G{hf z`(zNqfnqRfR0V4`xh(SkeT~U3xtu;w z4XW1of12WT{wUL1Ry}?xMaS=S8&hPe6qwG)@C&PV_)Ze!-@ukW*)>K!&`5lg0ju~s zJV-mHJu;UOHM7&z?m&Ic*u%vB#sCT*)(-qa5Q+Ub!;M~td+Gfp)*4b0DP}nv5;{#X z?4X2U?>>X)4rB7K9xE2WF=#VZb9Rln$|rsGf3Cwec#0&@7ojtXt3212+jAdO2U5eYqD2M27eLko`NPcBzKZR#I56!vlIR ze>cWrA2!t^%O*ZVw+_$%ESbdSV4kCJ#P_Vff1wN5I!6?5~T%f8kJ; zERv2BWgeDZU-(M9hf{2I5w6LJB6oGRqEv{Ic{`Xgeuj=Z*f_RYJqD|P(}rngq2{oS zBcRxWVx8E-qMCvSsAsm0y2c3K;e`4@zBA zZCzY>Jk;wKo+X*(^)uObBgVcYBuY_k$dW8s$`WHugUK$&mKqWzy)h(Iw8`3Np;VTN zl5D9+LYA?%xOD6H9d+;LcK@0AoaemfInU>ucmA8_ojKhl`CHsl?mVW`l#zoC^96=KeT$9`s-8UV#bnjU1IxrpNF)y~BA9CfR>_6=l_& z^=5Id_uQz>cCqy<8zelecw#K0p*pbe_GJxPfL>(rT1l)=>50$(sH4td>ViI&q&(7$ zqOYx|&XL)h6-nw-CQbLfI)o@@_@f89j2WrkgR9MQpCru2nSrbmT+4q1U z_oa?U(Mn=cePNAqT_YD6yBBa{4YK!_(mHmf=@MH9-RTPA;?MEmGl=ja#o&_1)kd z8~HRH*JKd0*g=1$MTy7Ew|_R#x#S=kPk(G2oN+qVww9e>T4LYfwrRLy`IKXQP{W6y zW;g!tMo}kAo`?q~{Li(q;0yWa<}J2y(>YHEsO}dDrLMz z{>{Q#Vv0X1mlHfAT;V5A^f3`Ws#=y*(U_{)J0U^Eu>-}a^p15gBGr9zEPGYEn}`+F;(wr&#<~M)TtH{`>nyN8b121PO0t6PPxA^E>0s^f{ld#u}VVG9{ny zS1JB%QQkwoP;%JSaYTXF?KaAKZ5xAb*-`si#nz>YG+(uw#-pTH4A;AFk~7yYWX_yu z9L(f-F%u^g@m|8Fq?$R^>OzUdj0r?NwDP_oXP~H*L=j6UaU0c%pP{tpNkvFNXEEG- z=*8>V?Hftoh9{#xNs*e{3Too?{2tcpo%RafCx5_u%4<-|U9`H>?M&A~`)LNjYvKr2 z@xCrvM(f3lVqyAYtMKayNtb1J_#ElPr#ghOhvsiDT^ewRWS^LzbzQ!R;mxKA-`HkM z@gHCR~5-|8z)i|66oayidJObShOr)zqY z1_7O(r^)kyyZ78W6}`cut)DR=If2;J@L%RgebdD@OY}vih$V5R6*T_pJaMa{)A4+}a|9!MHd%T5#qukv);@Qlf zN$qPEooj!UIbZemrg3+Bghr4})kD*JAsDp#(_lN(+-JV;MFKHZQq)zWY)a>sovF*MnbjKVO-oD9h+H%oy`L&U}tMSQ7hw zX)>2NT|gUqN4%4jMBi20|1{>Mfc%by+Y`e1mnRFVEt-RsO}vi1aMf(Aa0>j^9kJzJDk7O^Q z!^bOAqx11`*A&#Z9GI1^Yom`B2e&E97iV?2a?H0W?-kD{DV3dl;6|LalD9pkEh>C} z$XZvW)EzaJX0}~xVw~`(U)R(hC%kY8%`DcKa`RKepH-1Asu!+FR5ft8^~h=3^c3m5 z23uISXgsa$9{&S^croLVy;5p0>m2Q&;pnHuZp!!3`5l88%C-sU8k8vh3~ z-7#|Mq5DdgE>|{hjtDc;70ro|7LR^lZ6lxc=N7d~+qOS{PCgr9jI%Z#u^>BsG}PT& zR#_f>Cwc=^y12XhMS|BHpM`CB(rDG#NH;OQPFYqsyHc*Zc1`3nh8F)x`HZQ4*|a&M zu<=)V8~K5U$oR{2;)(wmGp9o+JY? zI35V3**`LI7qpQa*Tc2}1_c2ed$D#LZt2&v}PN=T8j%==Mpx;`%(Zgw9)b3 z*Ky5nm&Ay_Amb7|q^xR5th9p(52zg&yMx`A8|7>_bq~MLMw&4ks=@8>t-9 z!n7tHWttP&Ompx`R`Kr_iz@9_o-X?JLHs8mp*SYItKfZqAdWcfV4y#c;#;>0g$kfi zeWEm}nqg2l0H|RSl%P#5mJH8_0wDJe5%g~}pX5JmWYo<>9z7Jy3;I|xYJRmLD7wg!cRLxF$-8x8<|?&_X%(Y(xGD6)56C=mnzw?H`vNkuf` zU{MgzQ2Xy7lGgiP&e1}l5?CnIy5DqMfQ3O|E0_EomjQ<2xpPrkxgb#OAkr6+xcMNG z>MH(s3b`n}@WjEN&GWhWE3GSeRrUWiUnNbk?bJb`cAiI}G=6J7M}=!>$P^I$HZ)`k zGP&GX8P3uG4(8Jkazxh^B!i61_{AH3hfG&f`I`#1?~?9yV1(9IvAK@ zjqQmr!Ja4!#Y2E9cFd6omG&T!4-%n!VO9t*!&(LrVR{fz0e(k7%=>FlH5Aw*H1VOp z3PY%ej8Gs0CqjWHIvI-7fdy8wi3s;L5y|if9bwUh6?9;Y8R~?UbRYx;4}p!C&%Hkb z^FAUUq#Z(N@q<5+@goV4hF^Ojv~h9rP2J5C$x>vriL^0&2cq$y|W0!?iB5CB_65v8O(8OAatRRZe^8nz1yCM+CL~I4p zf;S?N3G9;ib)Y^9p%#b)GH7S09SPjf_AnFq!tN&nSVRWuP%;WRUP%FPjsoOh01{y~ kszFW^kcBl-Kp$-gr=oxh=8Y*A6N4VnKzQ{JKY* 0) { if (!this._isDatasetInitialized) { - this.loadPresetsWhenDatasetInitialized(); + this.loadFilterPresetsWhenDatasetInitialized(); if (this._gridOptions.enableCheckboxSelector) { this.loadRowSelectionPresetWhenExists(); @@ -1216,34 +1217,37 @@ export class SlickVanillaGridBundle { } } - /** Load any possible Grid Presets (columns, filters) */ - private loadPresetsWhenDatasetInitialized() { + /** Load any possible Columns Grid Presets */ + private loadColumnPresetsWhenDatasetInitialized() { + // if user entered some Columns "presets", we need to reflect them all in the grid + if (this.gridOptions.presets && Array.isArray(this.gridOptions.presets.columns) && this.gridOptions.presets.columns.length > 0) { + const gridColumns: Column[] = this.gridStateService.getAssociatedGridColumns(this.slickGrid, this.gridOptions.presets.columns); + if (gridColumns && Array.isArray(gridColumns) && gridColumns.length > 0) { + // make sure that the checkbox selector is also visible if it is enabled + if (this.gridOptions.enableCheckboxSelector) { + const checkboxColumn = (Array.isArray(this._columnDefinitions) && this._columnDefinitions.length > 0) ? this._columnDefinitions[0] : null; + if (checkboxColumn && checkboxColumn.id === '_checkbox_selector' && gridColumns[0].id !== '_checkbox_selector') { + gridColumns.unshift(checkboxColumn); + } + } + + // keep copy the original optional `width` properties optionally provided by the user. + // We will use this when doing a resize by cell content, if user provided a `width` it won't override it. + gridColumns.forEach(col => col.originalWidth = col.width); + + // finally set the new presets columns (including checkbox selector if need be) + this.slickGrid.setColumns(gridColumns); + } + } + } + + /** Load any possible Filters Grid Presets */ + private loadFilterPresetsWhenDatasetInitialized() { if (this.gridOptions && !this.customDataView) { // if user entered some Filter "presets", we need to reflect them all in the DOM if (this.gridOptions.presets && Array.isArray(this.gridOptions.presets.filters)) { this.filterService.populateColumnFilterSearchTermPresets(this.gridOptions.presets.filters); } - - // if user entered some Columns "presets", we need to reflect them all in the grid - if (this.gridOptions.presets && Array.isArray(this.gridOptions.presets.columns) && this.gridOptions.presets.columns.length > 0) { - const gridColumns: Column[] = this.gridStateService.getAssociatedGridColumns(this.slickGrid, this.gridOptions.presets.columns); - if (gridColumns && Array.isArray(gridColumns) && gridColumns.length > 0) { - // make sure that the checkbox selector is also visible if it is enabled - if (this.gridOptions.enableCheckboxSelector) { - const checkboxColumn = (Array.isArray(this._columnDefinitions) && this._columnDefinitions.length > 0) ? this._columnDefinitions[0] : null; - if (checkboxColumn && checkboxColumn.id === '_checkbox_selector' && gridColumns[0].id !== '_checkbox_selector') { - gridColumns.unshift(checkboxColumn); - } - } - - // keep copy the original optional `width` properties optionally provided by the user. - // We will use this when doing a resize by cell content, if user provided a `width` it won't override it. - gridColumns.forEach(col => col.originalWidth = col.width); - - // finally set the new presets columns (including checkbox selector if need be) - this.slickGrid.setColumns(gridColumns); - } - } } }