From 53ce439592af54aa256d91cdd99371c380afee6f Mon Sep 17 00:00:00 2001 From: Calvin Date: Fri, 24 Jan 2025 11:34:45 -0800 Subject: [PATCH] Cy/non pat appless (#3667) --- src/App.test.tsx | 1 - .../onboarding/org_list_install_app.png | Bin 0 -> 42014 bytes src/layouts/BaseLayout/BaseLayout.test.tsx | 81 +- src/layouts/BaseLayout/BaseLayout.tsx | 106 +- .../InstallationHelpBanner.jsx | 65 - .../InstallationHelpBanner.test.jsx | 196 --- .../InstallationHelpBanner/index.ts | 1 - .../BaseLayout/hooks/useUserAccessGate.js | 27 +- .../hooks/useUserAccessGate.test.tsx | 225 --- src/layouts/Header/Header.test.tsx | 1 - .../components/Navigator/Navigator.test.tsx | 1 - .../UserDropdown/UserDropdown.test.tsx | 73 +- .../components/UserDropdown/UserDropdown.tsx | 48 +- .../AccountSettings/AccountSettings.test.jsx | 1 - .../AccountSettingsSideMenu.test.jsx | 1 - .../tabs/Access/Access.test.tsx | 1 - .../AccountSettings/tabs/Admin/Admin.test.jsx | 1 - .../DefaultOrgSelector/DefaultOrgSelector.jsx | 217 --- .../DefaultOrgSelector.test.jsx | 1480 ----------------- .../GitHubHelpBanner.test.tsx | 205 --- .../GitHubHelpBanner/GitHubHelpBanner.tsx | 101 -- .../GitHubHelpBanner/index.ts | 1 - .../hooks/useMyOrganizations.test.tsx | 378 ----- .../hooks/useMyOrganizations.ts | 104 -- src/pages/DefaultOrgSelector/index.js | 1 - .../GithubConfigBanner/GithubConfigBanner.jsx | 2 +- .../OwnerPage/HeaderBanners/HeaderBanners.jsx | 20 +- .../HeaderBanners/HeaderBanners.test.jsx | 25 +- .../context.test.tsx | 101 ++ .../OnboardingContainerContext/context.tsx | 82 + .../OnboardingOrg/OnboardingOrg.test.tsx | 82 + .../OwnerPage/OnboardingOrg/OnboardingOrg.tsx | 77 + .../OwnerPage/OnboardingOrg/constants.ts | 2 + src/pages/OwnerPage/OnboardingOrg/index.ts | 2 + src/pages/OwnerPage/OwnerPage.jsx | 22 +- src/pages/OwnerPage/OwnerPage.test.jsx | 27 +- src/pages/RepoPage/RepoPage.test.tsx | 1 - .../TermsOfService/TermsOfService.test.tsx | 176 +- src/pages/TermsOfService/TermsOfService.tsx | 171 +- src/pages/TermsOfService/constants.ts | 1 + .../hooks/useTermsOfService.test.tsx | 41 +- .../TermsOfService/hooks/useTermsOfService.ts | 14 +- src/services/events/types.ts | 5 +- src/services/user/useUser.test.tsx | 1 - src/services/user/useUser.ts | 2 - .../AppInstallModal/AppInstallModal.test.tsx | 120 +- .../AppInstallModal/AppInstallModal.tsx | 52 +- .../GlobalTopBanners.test.tsx | 10 - .../GlobalTopBanners/GlobalTopBanners.tsx | 5 - .../RequestInstallBanner.test.tsx | 242 --- .../RequestInstallBanner.tsx | 97 -- .../RequestInstallBanner/index.ts | 1 - .../TokenlessBanner/TokenlessBanner.test.tsx | 25 +- .../TokenlessBanner/TokenlessBanner.tsx | 7 +- src/shared/ListRepo/ListRepo.jsx | 8 +- .../{ListRepo.test.jsx => ListRepo.test.tsx} | 139 +- .../ListRepo/ReposTable/ReposTable.test.tsx | 1 - .../ContextSwitcher/ContextSwitcher.test.jsx | 17 +- src/ui/ContextSwitcher/ContextSwitcher.tsx | 20 +- src/ui/Modal/BaseModal.tsx | 4 +- 60 files changed, 1007 insertions(+), 3911 deletions(-) create mode 100644 src/assets/onboarding/org_list_install_app.png delete mode 100644 src/layouts/BaseLayout/InstallationHelpBanner/InstallationHelpBanner.jsx delete mode 100644 src/layouts/BaseLayout/InstallationHelpBanner/InstallationHelpBanner.test.jsx delete mode 100644 src/layouts/BaseLayout/InstallationHelpBanner/index.ts delete mode 100644 src/pages/DefaultOrgSelector/DefaultOrgSelector.jsx delete mode 100644 src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx delete mode 100644 src/pages/DefaultOrgSelector/GitHubHelpBanner/GitHubHelpBanner.test.tsx delete mode 100644 src/pages/DefaultOrgSelector/GitHubHelpBanner/GitHubHelpBanner.tsx delete mode 100644 src/pages/DefaultOrgSelector/GitHubHelpBanner/index.ts delete mode 100644 src/pages/DefaultOrgSelector/hooks/useMyOrganizations.test.tsx delete mode 100644 src/pages/DefaultOrgSelector/hooks/useMyOrganizations.ts delete mode 100644 src/pages/DefaultOrgSelector/index.js create mode 100644 src/pages/OwnerPage/OnboardingContainerContext/context.test.tsx create mode 100644 src/pages/OwnerPage/OnboardingContainerContext/context.tsx create mode 100644 src/pages/OwnerPage/OnboardingOrg/OnboardingOrg.test.tsx create mode 100644 src/pages/OwnerPage/OnboardingOrg/OnboardingOrg.tsx create mode 100644 src/pages/OwnerPage/OnboardingOrg/constants.ts create mode 100644 src/pages/OwnerPage/OnboardingOrg/index.ts create mode 100644 src/pages/TermsOfService/constants.ts delete mode 100644 src/shared/GlobalTopBanners/RequestInstallBanner/RequestInstallBanner.test.tsx delete mode 100644 src/shared/GlobalTopBanners/RequestInstallBanner/RequestInstallBanner.tsx delete mode 100644 src/shared/GlobalTopBanners/RequestInstallBanner/index.ts rename src/shared/ListRepo/{ListRepo.test.jsx => ListRepo.test.tsx} (74%) diff --git a/src/App.test.tsx b/src/App.test.tsx index 93afca9b91..5b4143bd4a 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -84,7 +84,6 @@ const user = { student: false, studentCreatedAt: null, studentUpdatedAt: null, - customerIntent: 'PERSONAL', }, trackingMetadata: { service: 'github', diff --git a/src/assets/onboarding/org_list_install_app.png b/src/assets/onboarding/org_list_install_app.png new file mode 100644 index 0000000000000000000000000000000000000000..4562ae092e8ba4a07077245ed71c6028ec481593 GIT binary patch literal 42014 zcmd432UL_zvp@KVsE8w37?CU@0s@1Gh~yzFQ6vgV&N*ik8FG-EqXa=fvSg7kBngr; zNX|K@?eV?u{qA@7JNrMo`~B~(=ZrA@bXQkb{i?dEx*z=HWW;aclH)=UbW>77L;?JO zLC{q_oXenPp2Xi7g0RlyUMPx!uX_ha`-jID;2-2L_Iq)Y+L`(;qpFU1&+ydV{^8oj z_U7j1&fbBRiQW3<_SWwHz|d%Re#z|o(#H0#rlIxn>iWXc>gxK|+~Nuo>!Xrybz9qe z3F$d~WA7JN*1G$Kme)2rfAw!{?Kr;=h)K@+)juLE_FP_3wYja!$lA50zBwo&!P7Ui zwWHI*+J1U=zM`(tz|y$^-Qk7u7eIZoahqtB|lL17q`!u0As>J9~HEwx2!eIbSCy zr#3d$14F_r#ov#NO}2FO^bd_WzVlyQT^k%3YtOPNtE!ijmhbH!{8m{L5gq5~>^?pJ zO-xcIIxaCVJVA`}{u3SnTL%|)P3^Oj)1va4_x|Cl>x=qw+%7Nt^hI2I2S;D2XuRUJ zOh``6E3Qbfd7&uCVr*vRtHLb9Z4wfdl%A38;OSR4UZ^hlNK2H}LW#e+w%*FtaiaaJ zq#)v`a4}f zK6f1?piih!zaPKb)l7fq7pBf{8)+;Y-r=ycyfQHE|B8!lArHMP857&(ZZ3Rx-#kxA zPUviQV?DfXgXM!H6Y=io(!NK@(Tl{x?wNyt8f|XsKpp-gotz`yNQ&!NmQt)j9NHH< zM_W$=&e!)Ae@)HK&Yd`vltsJmle)*bsd>H@Fx8YjY#iGhtgUZo-14d7puase)VAjH z?ch~vYFI(3>#M@#s+F0Q&ElRUBhII!H!5=C$8}?qKKfZGd53#^I;@WNGK>0*GHxx+ z7%vX&Z0g_m-PPY!IqsZ+GEsAX8`{*^6lR)euMseR$5~!Y>a~L7?(D|WkHL-YsdPi_ z3EQ-x$&Zmj2$_d|tH1!TY!zf)LZ0!=GH?h=>68=^Qgj?y9lUf2f^a-jmM<1jIBYS% za28c>V?mI=E)E1qgwa9}jU)g81@Gw9Y6}9x_?0P2q>3676YPIj9&lmb@fzTISv`5hF&~ELLD5)@A?aP z3U{!7u)~m6_Z+EZmxT$ih4|hv-^S*PXfGoeVOXN;i{<>W(_wDD`J?L^8xnRYbmX3! zdE^n>CqhV;4h2c95g`vY8pgBWSW~Kv1ki)IYt@$orL=K8ZNWD-X)r+8U1u^k$1Ll? zhx|L}%1+j0XNoG;4@SnLIU^2|*x$o_X(0tiPLweM`@07r5^7Y68YJX|t&DIEd&TK% z_)PQozhHtwJ>gh1te}e#=>EIaBW6KwxNJ3~%uIEDxSj%P#k7LK3I3p4@ac2;T{j$6 zY}#Enc^o>3hyYNfMM2z@V7!&y5v8!%D5t83bZ?oc){9G?Er3z9A1x#!3A<$3XoeG{ z6ZM@Nmky#MMnV*K!LWy57@>eTaV6{X>=k}A$%_XNfge~e4rurDOLf>^AOD~Q$89i7 z=Q`0cx0--|^rG z_pacTC1azgZ9uf=_FHmH6ku&$15E1xGOd8js=7klfo01kbv@`inErI^-kHjKf#vB2hVg-q2v|s2;@)u1 zLN0U~06K;Mgvf&j51-?ft{sV$dNBK!MFLGT0Ak=H5e53Rb0o0`PtP{@_+mjm7y>{@ zMBt&y6Y5qy)mPs5a<5e93nZvZM^RD)+(qu~wLe7CHv7_WV&1#{Se&nGZ` z;OESBz1tJB?semF`f=h&9xP=|(n-=m>0(Wuo<_`5Y*5&V9OJ@)KA@M1u z&HMSoMw52oF`Vcq549)3a=N!31PXoX#wv=ueH9z;h-CDa2;Ovp2Jfad+joqN%-@hA zp94fb0pM8tRjV!?w#P$dTCUD2o0Z+`ezD8x8d$D*-)}G%dMyOtrMC*lsK1#W^xhT_ zw;o-aCeX+*YWoG2MF^H#Id&g456D`9-+y$9TL(0K4Zki;JU+W-*1}>@$R2Td3Ku+P z2Q!8M9pIRVTdQ)Jmh2zG$5$Q4%x5NwIsl~rARH~wjan9ViGU-%^lruZwVRr6;u%h5 zv-2IQP78i!vaC2)@KUAYE9HL6Dl+x4E*@rsaDY5N1QH?RdAphjpaY<141Lj_i_m&^ z>KYrK{=EhyMcDiiT4>xgDbtEgR0|0F3YaIfP=_%H47rOT0A|Y}PZC~}{J>emnVXx# z<%^n=dvyy@K)R7?Oz+V!tx>pMXMv(tve0VZg_hxyF7_9 z3{(K4*Adu)-zjwrAA&JHV9eXiqYp>CJT{}3`#Cl8(jIkn$uL5jJ~hw8%qVbx4dl}1 z-I@Fz-92m@aqFrVt)vCJq_4DKP<$v|ja#H%fIM&82z$D;!lDz?E8(>pzfbCbi<>G= z4oU?IJj4SGdid>J*YlBesLC1SjF)bOgzYkCm20Y=5#vIy?}0uqV3*jhgMNKSuEK+n zfyUH$uh=r>^80g^`2-g5O&t=iUxD(0)xdzB8H7P+k_BSYfH~_i#~=20{KqGPow}?m zRAS_yDO{k%P=I?npf02p|Fk2^Q-?UJ7Y_%^sD0G&eNL(8g2gej0w)STE0fM)|iWDgZlDc-T<$C#`ZYxz|s9sWWq+GM6-M#o4qZ?HJF7+3>6Y6{=Q;cFZ>!8J=bSE`Tm)>OUt*6=nB z)h?Yx<35uws*GwkMYu(Xu|&4`&g((l@}FGh4Wy_1)^Iq(0X6L6QX4-X3Kd-nB$$E$ zdyzJ*-;L9*_`16)>&)S_R@KkJ(KX{+Xrnm2{s*O+=q=;YN$POpIsuBP_MN6GMqHCv z86eJEK=^uKcrK7KBU5wtTY`bG%=$MJcm)L(28tBo@^Y!?U)Srw-XI4ISZ=@+wueyy zfMQDa;In4AtX^a9$9w|Us4cloxwM3$nyloew+)ol^JEs_$eM{K5F;=O5}=NJUm)&P z66D(cJ;d%dk*fp=AAeG3hkk(QrjUcfo=)~SDH5s%%9Z=&3Y!C5y?F-)d})OLVJQl}7+jDd8>U@r$FB2KT>BwF-#Seox^rX+AK--BR-xhBt4xpu*y8?kgZAD_`k^tvV%bk6TAU-Umo^rwZGFf)VMltsW2l&DhJseEq2gSNlL{(S#_ znB~-VrtlIjqzLFma8e^1HdeA^{$Q}fr2XLiH3H^BvaPH0 zB>N^RFZ4;JpL`A5sH$i7aI6My@$f#FB99Xlj1HB4b(6eGqh-pG1PR$|mf;0K^U~H^)j>FK^!-qvCiwETo?0FOH zdo*BIS|kKrm!F_Adwa5Tgc;(cOX#B|Uj>Qv8p%6W;C_D&FckrG^#l+tFOfl4fJHi;TGcaNTm*#Fq-sEV# zqwV&*0($f!Ls;)pL_vya!hrJ5M8=co!>AklNCXXYnQlSrJ@d&2wYMM z*y`AcLFd#3tF<+*7x_5~wHo8*)D0u^#Lyuy81@K$lsS050mQ#+cb{b2wfK7Y=vtA$ ziCfH&e)t0D1_#W-ff;nX2lNUAQbT`l8NbR?QY}*(H`mfOGvUAF=>ZgnaqRlQ7i>x; z$T7C3sj%cQy;!$wDO#~RZc$_LPhYOL+>6By-WOdhl6(3AV0YH zQRj~B)(`YksL^}#)UlK?j^PNBeo4}WuZ-lrB$xoyEC$Ho13_s|_*iR1yL#q73cLLF zE|4&IIJF5lv0B(!ku#4AON`G%OLR88g4{6x1QMZ00>jtc7@q{&C9bMygrt9@fa1YA zqX0EL834fp8^$NF*5I37;DHCgrV6kjZf>BMu));Vs+mTU_n-A2fS_2+8p6O=1$?+U z!Q&!=b!0_OTT%PHu2HVx)UuyD?f2SqmifbOOk+bPfTecu@xhF+Ik%^58xLme*g3~D z9o*xc48H$b+&cI^^c92-Z-c-JzJsnN!j1xI-FB^=w&OF7?*TJ+0G9(8F2TO+TIhgg z#1oc>i)nq8il@u8C(eKMmFSMc6#44IF~9N6uc6p}T^}WX%p_>IS{|_#Xt0Ld#VsFo z;Cr)nGHP~PcGLWp=VdTS0iYQMz%W$!5jhj%=4TZl44q=Q_&bW_Tk-wD@s%>Ez+D_K zNXM~^T&y(cK4gj6%>U6Pb?n%6&;8;wP3(IU615N8JBvNyJq?Cb&Kn;St;G+N@ZnbSAe70R%Q?+6;S8rw- z!J|mpcF-hD?bHxAfGh#9qEHghw|aqs$)ER)SXsl3fy&Nvc@3W@xgdo}BJ(Es9SveF zc`BS4?lF}I>KWbmznre;@)>@Y`ta6>$z+YUer$e}wnLxz^^k56OWRHal6BK7+5;*A zI%>w?o&caiMFTH#&b~@5gVs9@CpDj}E+rqy=+Bw(Rn4qi&xq%eCkt3fw{6F{l8 zrQ++|_8}S3sUQ(KIjdf=vD$68s;qWz6&_YEI8 z7n=LtPz(rW-jV}udx3$xC>?d97Fn^AN^7699og{UkGAB|V13{vi1mzC5r@6gLnA$@?( z7LX-7ssTZ{hIlbjbu`g0r!gKM2)b_2G3v|l1``9!(g9Usyyr`dSJSCjy(TY}Mk1;~ zdeiQD1RbNE94>9~b?DRplq29*-$DNC551`j);)?CUR?g2`5;?*lP@~`+99Jo*ish( zG%cTj$=s!k!wf^xT)E0!Ty>8>C9GaA5tmC862|cq0`fcqS~eF2eqUK6UgWlDtmtjA zyoA|&UU@ElY3MBm+7{w4AlIo8(D`mebMdxuUvbeEH=gHpOao>#MvyW`?_gMOG18F8 zAexH@u;~Dcg|l(ZeZrZ%2eD%`QyrMfT?_^lgF*TMAv07G=g=k@;IINTMgzYF%1A&L zpf;xcr%VRNRLnqV{HNKm_{}x&9fIDU=3T2`!TNVs(Ehn9=Q&hx85E5mNa%dP>ow`6 z{|yDg|58>H1X0s-4l4+4^-UB9FG9GZhxGo<2vqv)K#Gt8-RHIa1zuR&cxwI9MEu5r z{3ohpDv`GLK07%RQ5)esV}_w;a&v!GEi7=} ztW6nbjT~8npnZThe^A5vPO6QQGPEC%I&8|}Fu* z!L{pr<{l*~A2#a*KR>gWu_Dn^t@CiNod}~3eljUqO3wC*=@KN05!DM!L{dh8JO!l; z)lpO$1Z&X1W@>(T-OmIoV~-$SkVi#T+>D)U#(Q5 z&qxB|9uJu6HwMFbc*1OcW)8Dc3>b42@pegW@uvTFEJRl9v9{|GA)B<1HOO!Jaof4A zeL8gitXq(+lo-KXpuPQ}>REB7MQynO1UZ4Cn_vhWgy75j6={VaYxmzHGZH z_5?v;+!?EqPWwQ2h5<)+?tCJqpXn@humRbcDu(3hYCU2sTDZ7r4?(lk0M<@oFt8(d zKE$w7ZVJ=T9Jw_ZX&BQL)C1o>6Ry{Ml(>v4wuMPDNM|*r@x^sfE-c9E*f(`IcqLR- zAk>$*O3N+QtUlAD-_#n`E=p~4kt2^!=YD;0N~-okPz&%B`do9Vm5b@RcKK=9MPbqC zlJ4pcZLRWOM!J#hk^YzdB@;KV>YK5DMO*DQ28S3FtF0}zsKmmFBHNaXswhQ;QoL>k z4&OpnzRMfuQZH3=&JrojQQyqZFJcZt1<_LO667xxQs!zf#lmWS|NimiR)Br_c$RD{ z&Xq}z7b4Ji8?Xal;6Mr%-vUBSn#m%Bt)1Qg>5V%`@As!lbJn?!sqTFAOKm__cY;D7(JVG4z-mP7!)U-g<~#oT^Y5zd^(yti@T>K%3SQESudA zgQlKhD0lhNg3Suz0vk-Ig{&VfZ4VK47SfYSM~62L3I17xJWpMX~fpVor5ba=O*BAS$9yRz?A(C4G^0SSv2Tenne{_GT zFy~Nk;rum?n-~m>^)0vx@m>QspS_LH#b_0Vf&1DL;*(ScyRCLj5=Dm2;_U2&nf}J) zMlfx^@vzVpqw;clY-W%iX(j9ttb74V$tv@$D{)xrz z8QG0uE~;mR)7|is=|OyI*Nd(3OHdccvHlrF;|O|>8Fc1Lm-Epl=%c-Mco6MLtWpsD z89Z0yWyNV9yt2-LYKgdSVq!QJwqvhxvejGg#;yquoj>?E=GX1V@%Ip)yofaG%1jc2 zH`+b&yokaIZ){8qR~C37Iy-+UVrAyI3c&0*-v^`?^*w2^8I6&d z6L^~aD#SSQ99VKSM+H#4vRq?kaX-h-xCiVKIfHa+ zUJh2qsaG&^q8g3o@~g^W$lk9?wS7iUMk;PP<GaMgQd_G2*OT zTRB`jdi^BqK~O3e%SfLpi*7*N@nPsn+{^p-C4XyYdG`UCnn3~!|AiK z=EFrscWmO8i^&4)*~_pyT=Rt@^qkK3_w9J?UoG)jxiCNY}1ZLH`t!x zGUE7Ua)~ASLROY5Ht(P6-+nBoty9q(S76btzJSQ*#8wBkV z0g}*p;Xg-b{~S&IuMR#zwB^wMA&tf}jlEw8hf7n41Y4+HIn_I8VC2D&%82UGwetPC z^iPEJ_(Vu^Zj;E%k6v2PfN~84wSdwN1Qq>>epoQEkjPqo1FfE zm42q$HP>3RWSNHPnYo74(IDA}q|wiLMYD(@MNn1DW<`(ySsdQe#+fSkssEr<&8put zlQXtj`s6Il*RcGh|NYpm^3m)MMPnN?GP$p!_MEG8N2NbcUM!D`ix!TGvPAb9jTvz= zgr`X;?>H5ZQIm(f%<2CvuBpitKU&wb=m>)}hpUnYOX|6UXEyoxu(xf$>6x3RE~}-g z-Z+PlUttP%gxiaWm%K?c#1O~J_{6WUa*7PNGI`1vN<&r zqsPC)>FC;sb$k&bA|g+U_g&XT(6b8?cW1ZUcNjdzv^x7I+%zEI1X(aF%PBc-Doxe`cAm&S`g z!I2^&5yZ^|g!1RSZ2t5J_|z3Q-sW}z%~fewjmyGGaPjMrGJ2*+Zl&ev)ZvK6pFeG# z-PgJE19YBIW|&)ab<)o@Tw}S~TRHj|@nM&nTP~+}$$l=&_?5|PvgdoQ)H+!qKVFrd zZwg^6FCFNuow-ati6^3V&+FH$`1sM!$AX4CQ(l{wCpKDFlt)vQzt&_ewNKz?B^9L# zNli~TgQg99d_wr*r@u}rFHfb&3BqEJj%o+wb(5Ogqid38rgj3z>XJhYjNQpjP8>7E z#WTX_S=l1vetz)vwZEj}>&y5ikQNApaPB=2eS`qECp|@$=0SB&OLb12n~8SI4(Sb+ z*~&_yif?jE!7F?Aqt$XA=U+%Vvy}=%nPFrBG@EBnEN1Uh939z|2Pg`{g3wYw7xtXt zbj7+q%YMoh-Yiv^+ujh@;@9sJ7BV^d+$$vV*6T9y4J%%_O4P~-dD3~XTM zV-;IsDBsUgR(*9&t2T6&V)dLf z;c?2&#Uv~^n>@kMW*KFv@~n4n&|5k9jMd|)%>)R1B>L7YMiMJ~->*YnwmEdgo@Yoi zrAIJ9>xP%}c-ixNrUagj^(ryx!#raL>5CONNxpJ-ySAFJiF$~z~#^71gj!>7R;$%)qq3D>S-P+tp20!yH4yMj@?M}g+_T&)}q7V*^r&Dc4E zrM%K~9JURW)q#^sZ*KW_3&zFhnU5xa%m1QPqVyd51xz|?C>z?;D{!=XB6SbD)dxRD zaz8su8)rr*;Obz|jIb83*gj2*SbBfX_(VsK75zKNZ)QO|TVc3UX=P2rRLAfUGx`CE z$k%FCoYx1tiu8Q>W;$B5`4_e@(T^MLY()+=XRaP0@E@ngXPQ`dL|$tqC7Ya$9XVzu z^V6oj7>X_U^)T8S=<5&n{}r|+H|BR3ogFPT!XFReP93Y!QzEs#`OzNuXj*WNG!t02 z9Xt^*;?i3?CNG$wo8tCOb-y@N!M2QCW4IEPv1iCh@%tXXOW#Yx?r(2}aKC}@*0VEL zcbgffA(?tf3hH>p;SNIQngt!4Vz(m&Z1S74DTP6_EMk}Q2$4gX&ZR#d)n~1JlZYHu zAKa@3;*jM^d>^GZI$X7G8}*#QZ)VM;{3I>xkOylUV1wC_#x=- zpFy8!P@SEYvifE77JHSZyo5-$H*_4PC$o(Qe$-g>SN%;cE>o;8SWPLA;V?`im0qt+7>5|Xs@WzhsljPp<9UoojDIXFbu zth7JRP|7tfl^b$hT6WF1D?Zv|<}w(XWQ#6cw`B;|e`yk!=vFo#E5lGUuyVv-XBp{h z=)(>aw2g*qgB_|z01Y;+kt>dc7yHuK#*d3>p-(#5lhKXZ(*=sXg<07AyrS(zxDR1`aWa0Ax>&N4JDFcCX`%75oK0}2xnCAbH5lZ zKjP&>*V6fPF0UrR$n8MXm?|jSLr62yLVPz`PVli^iIMbUcP72heu(T6KJE ziCopVyJv}AmdP%g`I>8|m%PWfN?e!j*uQD@Xv#@#X5*?mnTw0Ch)5Oi_PdFo2&+Ya z!eWQrzC3`Zv_; zH5ro+7ZRAvM(s|n?^T|h+227szv8P=>RLXrrCB)BD%3C4NbK?syRV`AlkY75X_rlF z%!~&0MxNR8D5Zlsr-@2Z&kGQwPV?1kK5XsB$ABS`Gl%VZ>5i{9 zGWhuO?}3C${s=1yBdqQ}!crqb3f{E2y6I?x=gHGZAos(d)0gslxETVwj}GPOinf|0 z94sAxs8%dAlpEcs(NH!>CXN~jY`?lANVIXXL2dVFpI??1n=fHu;&RGW1orF=1h$zk zZ3-yX>&8FQhRj^+YULq+0;FJ32>iV!m;;=-6|J4QD!S0%l8@yLgz^9sdBGL0qX4!-}5QqM}Vewz{ zs2FKco-E}!`+zj4F{+vqt`<6{fJutR=!SIm1i=*&-3rmK=;e1r+BhxN0sjL8SIX6G zH4e^r7pm(zosv#!^T{?18oPZGpV^zy`CsP7vuL%NGEytxLJ*kVQMmP3@s51J+cX8l zdsgjR_peLQvX*9ZUw=#>Cvm?ZV2b57g?XEz&z%r#Y)Xn%v!yNiEeZ>-n6m$eUVPVcw2kM$b z%?Oc#Lw`3YdFaTqE>zB0=T+Z91}m0QwiYodzo^_KLMj*-WHY0fND&`;0LR}60E2xik4f)^pVL;n znS`khphNPM(hEyVE0!!^cG}rWC&!OtN$M(`9{rlz(m`H_$~0%O55}W3?P{R{zpL}w4cRbTDD*!c3sf0=Nu$D{ADF7 zW1K2yaBxt=!KF$qZ?H;dac99)$#$u+``0h8M`wt_%uO@F+4pd?@{5@%ZE* zLxH}iXnWQ#bYS4u(ldu7fe>_8a+j|8xIcPf;R)A=m?W930*%q3Z?uU|Z8qOJz!Lf0 zHZ*zppH-DHRF2hc6qFQkJX^sp>`LNu;}LknxH@^^Q~D`g{Oqw*#{Q#C@y`)P>r~i@ zF)a%r)MVO|wTi~(ot$j1TXa8^RK`i=<;P`eRXg8noNmbcY=qjH_98$Bw;p7y43d#O zHq)PP3Me+Pb2DyZKV5;JI*^fhtEjLCwns0_Z#!KqdowG)*cq#sh<)VvM>aFpTn>nT z=~AGrC~Bi88;H%NelC@%NHZ0~`cz|X8SjfrORa?{sSzlt#106h<7~70vz`&oKVYo1 zUnHR9DMg|`cGoxHkqRxc^OA{7ZtU##nfBf{+4^!?jcqkrJXzfEVd3T*cYLr(CY1WZ z{b^8dmw-!ybSW_{1`eu17FVf`Xg3wKb%EI98UH`rP%JH`D{tOlM(Gd9Z z#=+5Sf!#{St%n&IQmrFTEJ$x@)P7NX*&E5ctv=X0i0iEzl&7AX8(Hb}a_~BhSFu5R zyAhrrwe)Ds=tjX87UuB2sGFq5CSA!JOFf+BRW)a`lF}xoyzU7Sy{GPJr6!Npx>NoA zN6Q~)uB;5k&)A1OVvXM7dFE7UWvy~P|_&`ZPyGc$x{>W8p z+Fp$GE-IL+lpo3c;>%~r&$YF?rMf{r_ zmX=7sUMVeC27WV&3v9|$%P`vJE7LaYN_wb%7~f@VvfxMSL>;c&(NlGNT*OgS`i%l; zRIn3Nxjlzre7XjkC1pF!|(XkH03*k&W=Tj z<1Hky7}#wE9+c3i&H{Rr9LkkYZJ**Qks|FeyP2plp##Z zjMC-JFR^8Q*)cLQ8ko9ouRZ-$dw}p7-lqb)>Gyjw{7Rkpp+b6dYonavjGv4K96INI zEB=O$lm^6nBKDC~gRPBKSlzvSdftK1y%!1_TH`Qe5lA)#`^OYDI39zthS8yq=?`?1 z;QrDhXgN3n`+^gwNN@mzh~J&+tb1RXn5>CtySmzQQ3*J#4;NosRfjdr*Dd7))@1w+ zg2grZvHlL5*`E9--9KBgv`Ebu={0%xrYBzs1DB>PySY z3V;2Yo{oyzEv3(%RoOXBOvDZqGRre{H*0P0-RsTD>-(svRxGBST@f48DDMnwT^Y>( zsC99Eq-}`C(=M|5A%(QriFrLC zfjP`ZY9z-P7q^PW!+2T(RYZxFmjV)b`Et=-eWl&N(Myo->Q{K1Xe2sCp-{kX zZYHx)M9KE|Hwj${6>>lCOr(<4nfZA4;X~GFG%=3EsUz>hhpBS1A!uUQ2)cW@U%kvQ zj>4>2PAhfngI#})KdyBA9b|n9y0@2D`*9#?$sx%&s3|xtEJg;i zB1C#JrIAQ|Ux^VG5@Z;UD@m2LXs6BZ4@Y>ny~49U)>rk7W~d?Pg=uelgtJsRgfO~2 zygd>Am_Fzb@xA)unh%~4s>bD~?gJ){mcSeqLr~{v@NN{SozOxNkuL8w-7y=L6=uUisI&5=3uT+&;VV4;H8!yRo%#qR26} zOZp$St4e~iyWc!RgiKFQrm}$*#@_Zz&60gn>v~pM{)8ZWuiMtq z?L+>fh`%WwwslgbGr&+*6#U3VdK}?;W?gIC^?dUt+UEu#zw1dTILHQPVL^1>_8ds3 z$xXhlOGP!C7ea^HH5ADBWH|YrHVy;G83BfACQOPAD@@}~ysi(fOn2KgbcgWS@+5Xe zx33LwUc?F?P=5?YpYczYzs>14uF@!QsM@Ls5!A+!0LZV;M9Wy{Fpz0{ zkt|-^f>~-$|697Q=fC)zZX=5HCu<1b}qM}b2f$qPIp%tZyJ!iEi z2(k`eJyId3*LGiHiyQ${ zAInSnoPs1*0=o6mG z^RfT9jaAt}cbM+{_QNA=+gQ=f{~?0Np;8@U=q>!}`&YOdb(YPcf)3AcPTyj3zqR#C z;1VGDL2LG7`Cj2A$`$rD>Kiko_%bhY_0tSx9u3R60 zKNn`dBweO+o#Ea+YZK~g<(db-Hs<8ysI@CZF4>Q(I)P$UwpHUA<>!~q zZ}4>uv>98K^x2@22fb|;D5$E3ns%Dmx*-26z^}4^*BzjFV6zDVz)5|@0iG_V-BDdp zO-+g6<>J(LhQ=8`5yo9n9B(2&$1w&9ifZSK96dd5u}dl3Al&&*2i)@8e2<`1aB;vh z4HNqWV8XbHz;e;b+NyZjR71{0r4PHB>vk4wA6w=^(^l7)c`gYOVmgUp2)w?4BaOhl zqb3ALr+nmi(?`aqDDc zyc5)*q>RnS$I0R09_mGsVgl*Ect2-DDfrTID+9XFeN5;*|0p=sQso?<@nH)I&kN0v zrv3fjR!%AsBNw9tGZ4fNa2K5{wbOM>!N;QW>;FCS<9Jw)XBl5rTLC! z2A4k2pr%$!%T3fgJj~WIo)^5S^XRJRl|&`+PV*Ab)GsN%;<-0Bmq5+tgQ11lJlVmm zzwaR0fu=|>GIni7(1*z4c>h|Gp#LbraF=k@;Y}Sw_~>Zsr!-xTZ5(f51SgM_Kwz+Q z&Bg@bE2XPmFJIoel~Y-I3&v4avU~dU`pSyt#_VjHe|vv_{}?aVyme`*nK@B^zf(;^ zLwvl$hk=0`WO!(~=j|PV?fuoI@=bXYS+*glQy9wlFLo#o|4$sccL@M1^q8fUJjS`-s zyJ#^$x%wASgkkRx;OqAX80Z}Z>a;Ml+%4JRh>fs3lw#2*#zl8~f5~A=6Z8aeNl{U0 zBqCN|W+rgF;?c9w(e|N3?w+6VFI3dSH(b0+A2aZ}o0b=U`TT$(Fz75W)%!~H^Yi(= zd8G~$!?!Q;YYL}rSsx;}c&m%(JaU$kP5KAg9#>Y5jKD{SuAvcj?CXxNI`NYfHtr`^Ll=#lq#w_*4W|>-NMNwH-%iCxZobZtYiInVEKk zj7CPAsO{IXKN2OT`lz_R^8?#}EC@Bta z6-oct(ka785|E)#7?buv_}R0M5}ZtLz)LeutYp`Fdjo%Vu#>`~B3cN`TP2@rmV9d& zDmLH%$x>^h*8BW+t0&D24Az&5zcHeHW8{>hLsAP1$M*dFHQ#L)AvpOGFYc(ROTwx2 zSqKho9#%9DkbWFzwP{g%6LfuG+EP)umn}i2Q(0Nk&|<+=SEM;~lFdeK@M*M;6&af~ zs{r~4Ug=hqj&$AjUSF?kk~2?`nP?4~*xNgD)m?Oa`T>62JaJYcLg;ge!pERqm0>?* zXx)%Bo;gbQ>iNxf5#@~TMv~lH^7ukRp^R7JY(JYk@#;*%mAzrJ+J|ttQ|mb)=;Pic zbGd3|-tgN`smZR-rO9<`-CDJqn=sExOnr?EAp)ZXsT%YcAOvT!kd!fEc=F=(Dbet_ z8RJX0cR$*r4+6x*o47qDuzga!kj4gCbskQt=)S1v8n~KD_sgiq>@;axpDx?_eIR?e zJn*o+P5%u3YwKHQr#eaxh9~ur47szT9rKa5K>)nkHC?4yz3I`L(7$mlXK~H#LbFY` zxF`F9UYo1$n*AzD#_z8$?Jec?sQ=3)5pq) zK3UlG3s9Dt>I1c^9}Zul^OX+wrIi^Xo^j)-<>htIU2b@GH0#GIrK0wWVoPVSCw&<) zi(kL=b@XOKKx*vm_K}geN2Fv6^KClW8KRAMKE=oO5GN+8tM~T$Z2U_3RXlO9u!E&& zbyCJ!x8I~)cDDODnI}$)l9C+x@};&R1!XYp*~t@&PlopUvItHNIuxtSH$~3J{XIPs ztm4}5usk1u_gx8C!Noygc3_Lf;Qc~^+9|m8cpIWZVzxI6g`0ne0$KS&9XU7tY?O3( ztb_$ksH%b!OiO77S zrM0NEv^HO!hyv-bZfXjHEplKJ3ZN=0Sxjtf+%%M_U)SWk%aGDBw3K@@&BL?o_MFw> zkhNy!hxfVrnes!{xD>1$2?jL!{jN_S)*g7s1>s-z`xWjWb zOFrGpA*0~=o{ofGG0%CXYFY7J>qAz`iQZ?NK^+ED_-blY{DGw7RSWl?+Y}#!r>2%$ zh`!g6xSLgKXZi)*4JV3?@g?6n>{B#?eKzPqp{h4<$-`IH`HgS^RF}cA3eD?A0>pYQ?D>@@ zARuK^JVW6YJwqRkg)PD0<3oJ?0bzhsvX@a~NKi&E9Xb18zT`(U1CFwXukOJ=67K^?D+r<~!Nd2|0l$ni(g^&%<>wFOzy7>d z`O%kERw64yOuJCIVEgE}>IV1c7y8<1={olIjw-@n>g+o}cb0_6?{&a?3xc;!|4`xd zA-{9u%BbZyxS2=yGsWxjU}=zWYGKbO0?$VvQjxpwUTA~n!VwXIUAf1^ZA*D}9*}kk z%hz=C1wQl9J!X{WmjdlYTGSNvf8+!FiK2sclMCQV`a*3@2I>ts6u}(*5Fx*UtHzkK zB#;Mz9PG~t637Ey|8;JpPq+%QHOy&IEJzssI&}J#Uot zrz-ANAR>FJi(_~n9O1zVmqTe&62ZY8M`I2Wt=meFi+3Aqq?I7_9`Xy%|AUV1 z_|&(tmRtUe52FRY{zdBF{p&a>7e093$mqu zUw3D6q)o7u#=@P!$IS_BICuY^>6{Wd=^+dI_#9jepaC!c8S@3C&Tx0RQR}$q1iA@y z%{U5?Ab zGy?D8Yw1=Rf7aij^^*6+>-mn5ug^S=`TdloBgut(53Jn<*gjxS@W$57I==ayx1b|| zFA+nJ+V#A0S@9}}ZZ2i>f-_L?ha#5!F*lDDsle+*m|kqJ5$Aon1EtF?aFjLCNuZ-e>K_k^C7GZJfwI_kWo{dOJ11iRd#wQK~w7 z4Kp)uyF6JJ?=e6A>|?-<%LK^z#q1v7j5{9upP5occkl0aCR$AT(w^Qza7K#F^yi9! zQ#kf$;CIalk=e|c*AV2KKx|vi5I`$U{TN<-*6_BQYWplphcWo4g%t%VI=cDLUEb7! z?cr@3dnFRO@%5$8h57kEEOqWmd(nW)qrCX<>4!%+ns zENpKyVy~q!!US9w?PX<@rs?XB(oT$+KlpR@Ku1YE@L_;K+4j&oo)1Z@7XntAz`BFL}#z5Vd)mKLLJnKcFX+=ZYHPPs+7pvsH=ev1s2M9vyF>dV zdF3Qj8+L4VR@Bfj4{v)?KR$WKW?B!?w*-GgURu-MZhtZfx0X>Vx}M)_cV=3zST>8aFg`K zBPV6pochX_$cJ`8VpPcDSOh-)M+f@><9m__)Ulfm1F>p`QLdhuRa8f47K7iZF?XOG zA(|NZx)OKlEhZbl=p*NkK0s{>`oTno?EES4Md`UkEd#iBt^Tb1DbQ=ONoiacewW(Q z*~-bTFg?z=7t4Db2wR)p6^%FTS~$tk`L%U-9)UkUqO9D^86U5`xF(%%>E_yz6qebf z%8{;FS5s3JF1PatOihGz!i08sKnpZq_;eP@5ZG%NYw&aiQO;L;v|L>CmZR&r7JvD~ zQQVh>9aBCkv{f9b&SJ0S&`RrG=CEBBkti8iuMsI-7}uyy_Wx1cTR>I$t?S~bfCvi& zBo-agQVWqTS+q1rcSv`G0uqao?v@ZxN?KZ4M7ji|rCX#y{&VTx`<(MTcijKIdW2Uq)%SnT+etSn(Q@mrFiCK!wF4gS{`K6^?e5@Zq})$ zHH+`rDkPw24vsjaA{>ZR=xnZ`00g8QiCpN4fGA?vctEV4PZcj zuV1k|MB4=8cIZEDD3}y|X{6z&Zu_-ptB9j@Dnlbih+OqvgJqk##2IFW1p^uelQePx z9s}kdDg#ViJnqw*cY)a7RW+jCAVh#_jVcDnhs3lDqjISHuJPbQ5&w9-JlMymP1boY z+{6IH-ydcDdg~cM4o3owQ5Nuab9Fu-iTi)~l6rfx0{fO2?#;GOlYYHPYP={*7T#he zTVQj40;!M#oBV6A$yavb7I%UqbwD%q*V|E|po4(=#tH*E805wd(2?m8T5dp}2JBYI z=Wt-C)j%ytf|`tjAcy;JZMpssc93bGK@h8jy0v;uQ!W@+tzqI~@IsTho7?jz_ zZ$}Xds2=8?;bGr=6o;eU_Y)RCu!L?e-Th>*5>MrZrr!J|{|)J4{=lpr`^AqZT-3+F z7o$ji5?5WBOBa< z{A-5ru{3slWQvT3(Rr z1g@`0;yiu;bXpLb*__6O_t;=6?9nGgKm&+?hyWk+n42Gwo4#D1vz|gvxdVKqZ$?>8 zBoD<76pwtNjT+=Ce)2jUFcwsU#q4*X7ga?7Gb~yhU6&)I&;I7y>d@J@liRO>jf(;5 z(;0Do%?gM8p-(MN0|Go5~DGhc(+FRfPMtCv!;?+2*Dk){`fG_9|a10(oR!TrC(GQr)n9zcV8(Wo=z# z+2~$#C(V8LTi88yDe&Z<$4gC2*VSG^RXyOLG^e6KpG1*E`s^njFdzsL;ZxgdgLjOL z7ia1WJ>V73VXhnay2h>va;y8s-BIK;{@7z<)qbM90N=Jrka}+;AIoAuUDIXva9GrN zeP|%FnjI|pOl08Kdkq!X&u*EV0N78x%g2y54KTe?n2;W2twABgT$8pJZ$dviYyN1M z1jFbUf!bJ+-W-$^`r%A%gUI1N!l)yRVB}~*qugV@g_vWmdHLH4t(wQKqX?IHK;Ijy zpV8ajde6?Cku^6*0(~Y}xDaEr$}geb_G3T*YPmo`V!g-^w0Bo$%x4O3IgUblc61L38JW*zN|0vx&6mG^h25!Ztgmko zA$4mcBU@VywYI+ba$umo-kyfMtVE9lj*Sh6+k0@HZW5Mq3b85y2L$@c-HPR9rEDG^ zDOw)gtg4_}x4)Add^q42GZ4w1HPBZ;56P>kDT^w~ZC}F*-abxBI`_uU5;{1`5~`SS zyE?L=jqb5u)0-6arF&OOIEbYWLM|D5^P>D-+bIQJ%?)J}Fi#;03JFHVb#Gl=rm<-j zO^)iinVp{Kbc=!W->|2@^@acTx5Ew;E4!fpHL|&s7qt!fMW{q=r=dNa`U)*H(RJz%YkEfV^lsR zEiOBopr9bdaVx368*=NGe5jOP&(M0&44Wt>>R1?m8@1_=?G3AB8{1bE0|Q}q&gu$E zh5NP=Ex37kdAN9lORZ32dS)9#aE7gEefdN^2A1yxTicjh_n~32v7PK0Hg?zdPmH=O zqp#W7X_n(V?H=HsU1b>7JO5n&0wLz!`FP`zJ)?`%WaMNp880d6@ixD2Q|-j^+jnt{ zF=0omVC+#oBO@3kPi-N0f=!rs8A6}|Y+#W>QFca(WtJD@#c51&4xr#rVz~OHE?1@^ zLpNeYB2^)=n4UvkmmbvixEq0hM)W*j`5vn4*GkUez3*Qk9jy+Lq~&r-d2f?U?qOO| zu7vg_@V4`-&^wPF)kDLj##;r+8PPt&Oe`HaPlSUy=v>{oc(^K$S-rY1g<|^|T#A}} zA2B4{ZESuQuHjVAmz_bE^ET|TjGY9Y6I0NO$2+j1^=+;>qwmCt9WjtC>Mq}O7@U+O z4$JS}`2N89=kAx(X&tVbmfy&)DP%~dMh+hirjsq$VNv|!z>e#G6dp?RxJ#L(jL$436FVd%WF=*K|9yB)U-F9D zt4BQeZ#_46YNpiXW&8VIc{SHV;WMjO)g#f0e7L{}OLEh5vJ=%8HQihGq_J2L~REI)C zr8Iknc4z4%@|!_FAbtEq=vdQDnP2*pg=$LxwlTzVfC4#&ra42@rctbQa3=X;G|Q|D(e zw}}SUxR&Q<)U536taQP>z3MFSshR!HR=9$-Y>jEs6);v|`AJrN%Bg81+_{BHBrXDB z?1ns%G;Le-&H^hknH{kaIVXGO12GFnJlyK)F_pB4^9vH6)0m(t3o_D-ff|djhp!g- z6ympPrKRr}VJC7-mdEE5N_Q)`x!KRYyj)*bse-D8-S6SGt5ufijv=o;ypZMd^L2xa zk2|$EP{lsiz#bq(7&c&{q$A^=B{c)k^C$pa0|ZzoufOBMMZY%sBuNGEp)7Ouqji0F z@^$v~=5Q!xK)|V#gybZFHSS~F#9O5j)wpPqI|PDHY!+Mm7kc*LK@VIKBXMPX9;RYR zL{4EdRT*R%CgU>lU|ol#Zr|kO_yXfkg!A&=x>e@7Uu0kMf?8PAP@g{D$0xYG2Ugv1 zewcmamP!@3#>P>+Y$>44&K?ylDA>_Cw7uQi+ZohABEFJSY;AUVuzY!Wsx^CVAJ3KtseSW>8;~hCLaNu-gXy?%P`lj{!k}k=f-eL@-F4wruk0XG@zBDWCLK2k-?DG_lq|p@vi0Sl&#)AYRA-9ab@|*#Ph`C>X4`W z0s{QQ(Y(S!>Sv2y_wTQ*2}r0rAlnAWEr1uy`AqhD=QBM@g72ceSIvfytr^0 zn#!pZg6Q%R^`4l@*6iN(Jxl=xUZHQ6NaK(WQE@+3K6^Gj zBbivsb0v@xej1E6Nhpr?WhjQp#!B{$8PWI{dl&~;ok9UEfxq#hX_2=}5z@v?15A}D z*}xb>_LrG+S?$t)HGpVzj_i0`R}l8kMu-}&*&xTD@2%e5}PvI!2Jq77Ss77?aS%7>gJ;Dh1y^xm@ z6QU6f1n27|lT*Z7N75GbAw~cZ{`*UAMNnt5fCEq(vT)67KoMt$$tKunVp%`TUdR8P z7n2jP@X7$okrwb})at-cmq9;EfJLC}m$rJ+({VC*dY|&sL~|4=Fui|Q3D9E#bmswB zY5w-gcUuJ{&Lq}p4LBb$z=ME8GSp@e>P-me6#4V&rOj+f$yoDj)Ad2oY!0}#2En4t zyUmrAGyadUD`(bjzLe+>`sT?P8Ka{;JZQicf~?OHKAaOUdh#)Wrk-3ut!H*TW{$gt zMn|_r_x2Wz%E~RO($i6-U449iW9~|B!k%v*ygn9?} zCrVooYV$(aeT#d|`?m!K*^9e0k{HHwQA0sL1)s36Y!Nxw#`J{@G<}(L0vpzGqjy3N!PA zD?wU1-q%?PrKK`vuC8`$P+JEF>(6EZZ4xF9(M2sH_#1okGi0hu2cJJ*LanVxfYp^Z zT*~(Op~!$B8=GX_rPB81=4Uxt7~lFK;nb6Q-^`OwDf@FKa3#4iZuFzY_F-4W|>UyyeT7sQpnOqZT|V2ygW~c z_MX})q0i6Vxn=~q^HZJwN!=5mEJ9*!Y{29|XVcfuSJ!yApzP@wy0hE8yu2(_z$0Sc zGql{(Bo`_XKoC_Ji-!Y^VxE`-#~}#7I+vY>EgNYQCNu;(VcbIUazg9`7F~JL!9FX_ z1A^l^zn=Tknp9*`2()v*acyyFFi`7&jmQFXT#f85eizG9<6CBQmpx0x&142 z4bZSEWfMiySYSkj%-S=%L$I;$R5YZiR8GmST0-<&lV9eL1LJ9OAi-%;)s?goPYH*Yd&*$> zDGY{_pYOZ*w%&sqwmJ{Qn540>5fYm9M&}Hx&=3*HZ0y=wy?w{>E#hPW*fz_{wQH*w zuQ3Ladu1yjcU``XO$hW*?B}gMJAp2BE*>aka}X^$#!0GTWUNN>}Bs+?R{PBalCV%wspXJ}~XYtEwaz}*(tn%3-|;cYW*eSNJ3Ca36} zfq||riGaIsYG;$83YE~r#9%a$b87s>k0xiZvFXp6AKcxhvPWk1KM?QXLAsYOHO;G7 zicrEoIMO6?y~@h67zD5u-dCH}QB)l=g$gbv?VQ#&v!+F5Wu*#o26jC$^MlFn4eCd} zv6}lroD4|1JA>ZR5ejH*FoT}-e~9#G&9OW}_>za^07S~E64Fhlh|J(?T03@7@i_VN zMV4JZGj(IP;5j+mYju@~cxOw&!XkKqslm<0ybA|UF@4#T316i+q2^IkMz8Dzg%Em= zN=Kl_+2k7_vGVaf^L%~o9$}a#ON+vDful0Qw@)MblCy6Lg z_cN7I*I5zRn43a8&P44pM*;SY_z{3>^qOAWe0P1#n4D~Paac87`wstA(YqCA5vA-e z&pP&;UUZ5Iea}#(;;gH)+S<0QSg*27J_~UL+ZhwE%T2;^vY;kFNng+e9^|>Ntnc16 z%-MFESXRB=GF|D!!WAww0LuW9hx-K5hGb$j1p33ANEOps!)}8e zZu9dWd*)=~`kIscj0->~c@1`oP&XsU3r55ODu}Tl|E$>ql`GIL-K5YcE;!J(=A#Ey z0dipyMw0^UHe?D@#TVKX06+R?Up50$Q#xRSV04_<@gM?pZ!g}||8Ea){BuGux$kXy z7*IZPLQsnd=KL04(Y)Ms$31QPUo#L!b}2bQVmlJ&1yoWH*7$9@bU^;j3h;j<9poG& zfQ(TSpmGw(EARIT=v?P=etfC>L|{2bmg@f&)`I_KkeP3@euword z&uS&~kw}5l7p7{Lt7lZq(spY1CbwD~W|GD?pi=CNC=hT+hnP6nbC>=`au5SZ4*WkH zQARk|@7R%u$L&p87Z6B3UbtY1)Z>M`XdR!PV+ip#2By9YAWsl$I**`@0NQPJo&XK1Xtqr6OZy(~O=&9`(s%#%}drDoSgJ>f~GvWg!BGZ&{L8cj0 z_}@R<>ne~mj!o0cZS!cdhEA!H^@y9)7>XKAWx;jxBQ7X`4)_wN0k;Mx^0c8lpdO)` zdli;eviboLv}&rb{0Rontou{*Z>i5O>kSNb@KF#zIselg=gUy%)~*;+LGZNMzkB)< zr*#c=(RgmrtVZ&8^>e-``e3ezvGlEXJ%ieFN4Ww~WVUzlWo;k6> z+1yEm4w!L&dv`jtGK}UG($R@QsXp7UXzoA7hb#elEDt~$x=1{oP+)#8sY@ApJUM@O_E z`wO_ZaLa$0eELNKFICE_mV_81U3Q#Cp!-gbqH;8f+0R-U7#MF^Zq11AJgeIH%;-u# zQ&W;@YH7am%Og;?NdaQK$Hux2&a`>tcDmn}>@a6J-5IpL(RNEgSD$dCQ-X#5SL}h4 z!WIV-z7&S++sXM(<+|WBD!pC?#J(Sr=U@RTSTp^P>Kl$EyJK|nUnem(y|_@Z<{?vs zx+gPxT8FhO!qne}X0s%k930uu;82!mXlgjut8dOWTD#fW+U@k-qp`Ckh^TWA^~)N} z7Sv>!ZAu*+9CWb9gbC}j8Z)7Leas7_5K<`~G3eN#~2s$XiVJkQR7 zRq>%{E1A8&Ke5mHsC}hxYI~}x`C;KTlAxXr_}&&C_;`SPEF{f=FK=r{yPdI11M@`g zv!s^-*frw)lwDulzC`Y&m7F~ZV*7qC_zPd5%%J!4jbN0jq zCnP~ZX?p3)Wz)wIugiWcj^pm~`Q>ua@Elu_bi-=^L&P+(41-Br^CL;ldI5>nC%-wE zSz6N3l^_ulwby<+%@loIbyE{BWjTiIZKE(1Zt0@LgP8 zY;I0zmtI^LHn+FF6kF5|LmgP(wzU~Ozq$|;!y`QSE~^$lje1}TO=j;}W@C$tl(A#g zTHo|OcXb}&6wg^)yg0$mE8pAIe*?KsskwRT)bYWqs{X9wHXQXPqaxq3`=?Z+p3)_PuE1&p%1xZ}>}4n-FvU7~p)`1R|&7^-6o8TM@hlvFIpZa5nh1XfjF`_16- zaXtIT&o2;Ym=7LcVSTt$94`}L(l|a{k%I5BYbh*Jc2s3SNC*X%T9@Z=1hLNG7it8q zk_RY>moQqkC`va|rp)eTsICBGLSIylpvSj8nncyyR>Q5gZ`-RJ zyVnNgg2g}O`~VaOiP19oWr}vH`gYKA!w182_Rzq<(3~Wq@2=)=jEz`#_l-L~4pxxC zlR2{a?~9)07TZKX+b8cl?GF4~Nr7M!&Z$=a}X>AuHiQZoSqwN-}9F$5r>I2MmOXC3Q9J0WPxnQ@gylaMCGKB(vMiNs>(!wbB#D|-^Lo0W0yWTBT?6LDr5F8szMKIbPRDKNgo8r}7D1@xARs)8ZT-c7 z7!rR)Gfjo$(WFPRpIv+P;7(YZ%Gf_mVGzgYtEF*RIUM+qVO3V<-GiHCbzgmT?Z9Hy z#YIOtPj2?ZA_W|3*|DPoQ`LOB(hZjUPbBpCVG|mcRsy!KfCX4uSeUrJV`mpBg*Dht z0*%5#eQ$qp<|3(%`eS8I*qn?~>f6|4;}*`oflHMKgvN=pg#@#vni|1r>2di1KbZqG zKb{eL`4iq7M>h1e+K%)x{9(#&P))xpeTXd93R^es&MhQ4U7RUs&UKTiOgLkGRvqiB zUgOl-Dxt-QPYeCebPBXt5ePszR1-%!iyR;p!786rr%f>Mvk94u(DHZ`@DhZXMV z&=8*dN@uWNLCN&!F<02ffJoTbT$JtycMrkAkr`c2qJhvZRp#fKrl$Dn5|Tk3#OxBZ zFJ9C++{Hl;jFqutTVli~A(y9PV7woD?!5;UaQ^;eB`FivQ z&Ens`HLg8J>t4VGFyR@`Ms;2Ub?nDevdZmc={J~z?faAiVx+x261qii>%B(b>(?*Q zJ#ni!l#%Y4sgnaTLCZ+Fw_!yTO7rIY9D)bIf!MyH@x1(y*Wtxp4y!LH$SlAGbK*1l z?}^a|#ZO{0%>nGJKd-^S;3Yzlx7Us;izmx-n6}I-6UGTr&N3xDYKe5OdZxXzo=In6v80zW$Lt*_Z1G z?W?KME*Ud0Fwpz5l9YVVYL!N^MhUmEfyN1X?$3V@BI8`~AQ~RX5T(LXP-uJI96rPQ zZv(Y!vR+I9PwIuzo_8Us3~(ilq53Zu;O}dk@0&Pm;hu&dG0 zXFod3799Z`%cE8;9&J_Vfd`&^8SJ5|% zXG1zFL}sj84a*1DwrUd6#6Ly=H5{b5U>rY(Jnfl1cf^J7=K>oDX?qF_L^R9-MopGO zRicPWroB~jp7ca6(j#x*C)nixK>C~cARhKJ5E?KEP=LUrj|&I_jz4(+PTuB)Y_@*;@s`fdB>vpewh5cpy_~yi#6*j{Y4D15m#Ye@N`U(0&E|jLcu+ z0@QVXW58n#_&@i>a{x9i4HN@Jg}n!N#bk7EKT^iTzj1XLz?MFCV@im7O`;L))lc@H zpw_@4QUs_kM9U~KKom#k8Q%ZNn;sU!+-!Zd{i3!rmGYxlo&Z)91O%B4kP-qf4;TsS z*>p+MFNY0TYx8&4>dOv=y0JWg8T8jLrAnHT_YjI-8(#eK+PgSv3|Qy;jw=)l^{xU* zYM32HPy~H)C~cCo(T%%egqhHn0od)>-_f9qa0)4Dr+zfjZKgprub{oe5~_7j=rqVm z10m4gmpWOJ9k`|nIqwqo8Z98>9?XM-&M<*Ilq~>QR0PrjsyYLvC-Sm%MLR)t;9@fy z`p#LA8RfzM@EhDwqd(;!3Zs1JMra_G2}G66t5 z7p|Z%J&noWNIvBM7=qn#HIx2Af zEPW!=t7Sf+bQfsZeRWeVqD1qw;dCn%4T56^5;GMuht6h+#eP~=7Cm}&@uS-xTxUhS z)`mN2Ian;0mrk@HE*S@H!C0-1(43dR>@#YaHd%Lg%pdgmv3ip#GorS(lTlN1j59A! z{8c30$Gd51q|g{NVqz>Tb;81UYb~A4jo6WuTm}*nE1SFqU`N0Hds4W+4)_a&6p8j& zwXuhEnfQrt@3zeVm#kHW_&ZWe{>&FIl$5|3Qqw!?<7f2=2Ye*k?vgnSRyOgKf3RA8 zNRN0us1yJ_qoAZAgJG-1^ax+S(<6m5ofT-f#OE!U&K=(u^qbrAbl`kN1(hFX65^p| zKaP_isjp_5Tdz-xwyLU@mjSil?VI)FDt@gq6gX?n>FBMkdCM*k1w~5A&4!-%-XX@G z9wFw`pPr}E+Z`QOFQ{?Dv`Pt|ksuJBQnV^sx75EoTj?m>CH!ieGqlec+qL9;_B@RU z5)~c4xI3`Y&^XHd^o1{jGat8t+|w6+j6b~3d~+iskKCAVqpQB%u#$8Vc$!Gn^YNst z{9b?m+sz-9gT$BzdBhqT+;-0jyjRDvkpVEvztbteQ2%{{X%N=xAaeq|L zYIKh{;LyTCI<&ukc^L$V+}%Toh=XY|SC5*Izot^hSujmtB2sxP(1wN)HxZY{h)A97V0Y@Q^ zs1XgcsY!@GcEoyiPDD7-+3RdQR7Nf&5F{CYo}CQ~OD48bPRPkwau*yRdCI28n~|lc z=p6NH27&PtVClVXX4yO-jX71VphTM>yB!Hsu=)ZI-3TXep*}3 zuy;s~tLr*Cmg}8gR)v(7Dk$l)HsPRO--BO@+%jagZ`RfM;r;gAAA~I1GL?_V*dKC~ ztn`Phvr?J;<`o$w`CJ8x9h}4b%(V#q5{6uH&?br*@!7oj z^RuIC<6`SIUpTztcQ|tM@jaaC!OS zqRV8<0F$NEO|(@NCWeJwyRmOGxUlf?W21+`CR5^wRhM$k>jzybHjs@ghk5yq&CP2Q zOXJ6r0(^@a0OzR~9hn*h!e$@e0EZ$5GMT9jc|MOYSRydyfWru9RHNwfG{^5@`6Sx| zO5SHLW(C_GJEeFeg+$iYrYI$RH724n@ zN+brcOseWr+%|l(oIn|7D#MbuXv5!MwV}yIEs&__oI$%lq$Ukp2OH&5MZGE&T2b zDj7}2Td94eK}M#ie8WzHwy&=?a}e+~u;O4(9rve)Q_ZjwslDB?n^9!AGPQL5Ih>~~ zQ#=a|@A`>5F;mCL2+vuC$}!ma_z13~xTHii{08UEBPH-Z%H!Z(EmLx_M)Nm*fpgE# z!?7m@HEDgR4B<4<=pa$@TTi<0sgZVgZphs&H(rSZo=g*&x638YR6fei%iJfp5@Gw@Sgj4w@yPP zR@XX=UD_93mko;JwN?{EkmUK-dkk_zAawDcbKTo4wR%q zhaag?>+!cW0kCAn4 z7wgPK+HXes_~+_ox}V{I`PVx+@(iSIsu&;XK~2|@5WLpyZ!qjzD!A~+n8Xx$gH-A$ zbdsu5jDwC^z2#FSqNeNd&;XD~{9D<*5{M|N=)lAItHNdc&ANmUrDAm0gS zVPnojZ9*D%xsf{Y0Bs7$T4Dg{D1F+fhg!lzNJW%C!UzzWr6ILb3%oBN3ko26i&j_z ztias{aJS}5GcjlPTq@RU5Nsy60PJ%>IP5?fI+tulko4Oi=|-%gyaR&)l%?Q#Swh)T}^4TIrgi!zx>{;-} zxw%Qg*s~i3Y!8ku!#4amC?25&Xhj6S z3A*@)ys+pNxS<6qCKyWN2@d&90)mAi_M5Rh4(!G#F~51t>A)I_Lid{r{x>W9@8cR} zesjhDuYUD%d-5fSd!qPL`)xgDk3gRJ2(&eSdJ>T8mt=;4g7Oz;_y5{W>f44L1NEPpXVQv;Od~`=J=4AGtc}Xr3tIZG8$H$kD3$+oIs8lW{&HNw z4U~Ur^ThsRMt$%&r|m=Q|<{D7{-5P^ZqjF{(tNDUt4cN|1#zNwax29`lB$= zRB%!6n?Cq}?t8t%oR*eF*_6solq3U`1(eX=%kux`Ws6$P4dl7J0p&np@K@=?{aLJ& zd{sN)G=+k4nhXu_1#dP2OMUaZW6c17P}MZS@CIu>@{ng&?^Qm2R20q_XaIocq8M?) zI(r8wYUu8E-GGK%k1vYB6CCe%Boc7nn?`qo;j)Zy?$cs8&^1-O9vo7bzZ7opj6VDE z%!*N8xRuOJk}KD7b* zTp7|FL?Hv&AbOwFKCLQxu|WEyiU|?NNi(bb;FA`hvX}>zYedox->JZ9P4Oj8j_Un~qFqiBxMRgRy~+t2Qnwt4&I1_dD?5{#c#L6?pJ; zWXilA@c9@5t4I$6P6qGW!9(@%P;q^pVV+gjDCl#bQ!Fg{;J&P)QrFjcQ9-rOhfz_T zeEea#LY1W0vF^If4Xw!}P8oEcLvwqT-cQWT2nxo-x+*72p}C34&F$&iPjTD)9u46r6F@`JqelFC@50Vz4Obx# zDPg}+KEk6>VKUwA?}SQWEbhpZe}G3ofVuQcnU~_tm)Zxj9~_@v(jC$ZUS}zm%QB9O z*go;`jp&wcs$X-8Kjg639c(vYxFMhWoXb}82Vt4Mv6^+MrDKjkd z&9EghY`7NJaEM6V@9AApW$v@C8RBGIaZCZ{ks)IHO~!l;C$mKooom`VrroNtWeUeJ zCMU&9G&l@Jd@sSl0;h5Ereag2VVPO$v>oGaABdUNxtBkw$8Xy!n4WFj5pngaH7pTf8i z8@^NcQ8-!Z+HXdLWHq|OB-Gefm=)nmLf^xnymi>|EFA|6Tu-aH>2?31*uKJ z?Uq3WVRBuE1A~T5p2uI@81L;o9JhWWzUE0;6Q7em0bEMAg!JZ{hPgv?ok`w&ay>sX z{Z{#$N;T4tnD7x#qMTtw4&bMr;C>aQ(zl|~R~htmXI;msc*vX1yv_#t z*uR^$+MO*~+;i?EG5UjQA-o&`XVxeFMF(5;Vv_H8uaz*uiGFKddik~8@^ni2Ry$b; zo=L?=JUgWZUs30`bmjuW*?y<5tt@Thxst2w2I2g+X-*NW5vZnl6?)dUX;LxkJ=_v| z0lQJ%e9zW}M^fToPcvnvZfmq9jeS(!R%pc<4M$6Ve`G>~B2TmL3ok2ZsApBG+*ym0 zba}GeTO|kkg%{i=2%6Q1W9|+pPV~tGt@#|*;&EjIsVk4?okoS$8pY~GH5mNVZ}zqX zn!aBcGf9AxVVR#8@qh1g4l7pU=_(x$y|tC7lUsB};G(IGH+a7OX!x52^pnwdJE6^> zAF^YH2OjGA9U6U~&BD9Rgj&Sq@0F$)d&(CV>g*&Zi_0@WTgL+w5(+zwI4MsqQf>@{ z4&2rtMc@})9N6;c*G+aZT*|4T=y!87sEa6=uc}gKIa3_Af5I#Q z4pr&ef%`0+@zaKQuw*&Gf@+9_eYkT4SBo{RJFkjqsa9P`v5yrBr&wzfipKXJl-Riq zzF}fmtL*0d^418}$yw;%g&UDWrv<5ij&T2(L$EJ~f96jZn`5{`M2?0H4?Nb%ZQM3@ z;X(3pzjXs8f+<$BnEJI6>l4}XLZx7_dSxb0%0$VdhI2Md2wVG^S5;U+HD`vr>kE;) z0mXwE*~_1|9wlOSEnS?XMB;Yj*hTlKXLOdf7c7W>o11noXQZ$Badc4|nY-G1Z^tqL zYF&rDeBLlcaPy(`*3%sSTzR>kiX9U?^OZ)AnrY`S2ex7Zs>moSaWzT70nPgze)Z(G zy=K%>?t%)3Li2{K0|R=z_QTJk_8!>@iAXV>ig?}4%Dd@W15TZN*`S31BTZfX5mhv~ z?Ba9D2YGS5wA6dgjO6Oa%99SRlBn~O!gWc=YEi-@j#K{Q&m zxAF{Gyrf+_fv#Nr;*Uc$%X1ItMEBBLfq;!eAl=NG<@#63st^2o<>qqluFP62D`@$NQ`OhijYZ z?t%u-@-lBqE;{m2jxuKAP!>`rrYUZyaqn=aCnv|SO*#_Bf1l$u7fp7d z_%lvN{V#6yoh4DX-ssfmurC)$F|_4uRU7lyV8-n|d-xTXU5}ikoa0V}T&QNb*5#E}YH0X=NrqeK@kP~H@o^QGXzifLX z?9k813)J)XbUhSUaV?D=i``8Y7@fhO3w-+_I8E zRmDldB_{Yl!1o>dbD~;j{C?cdq~W+bZHS#^Am0~1lnhV1y)PxgRHS=9JdzeUhH%HN zYo$FmM+-YTB)zqhBp>HM%5Cmb)G?t}f6@`wOAn^;R!IB0vC!6f?~SoM6|UIpndbW8 zM_)p6+#Ba7BYrqhV{%Faan)CP7dXr{KRnj`Wa`hj;h~&{f6Iu{s;)$W)lmN}<0gz= z8lNqolqitKI3@-ITB%~3*K(f0$Y`rwzI8gmFk#?cJdVkhC^dtZYlX!W`ihu)dKl+* z@|*CXb+VQ0(4S3{Sj#g8(ZMuZN(!ZHpsf}Qwr$<|(JcNsuUOfOeF{OGY zpG2{a*?8M%negzX1r)xp zuseu|{DpVHNC9gH$AoW$=c`b9B5s@%Un9P;pl+7@cLoxmF_;*s5E z?J(s>kXWursYvt{&i-df*ytJbWhih~*V8kXB*HFBg20^8(yJ>vny$!fdUUwFLm6>> zAHJ&76&9Ftjkmn^t*z1Tz z!LVuFT`+S|neB5NQBK{#h^UcFUnwSvKMffn&*l!l>|&uBk%9Sht@0BV^`;}yEgLZJ=NUzl)%SFnE_inM-8(&b~X_&;m4scsN85( zRbt|n4J&lF-gCIS5)AT@*q?bALKBkX1up;oQ%@QDTQ))yUeeZkz0Y&Ve|MbUBrToa zzwp_T03Vw&ww6tn^xmUl>ZsN?eNU9blIPBndaDCv!twe@EBgbpI!!G?P@fSYJWCEo z9MTL7?Ck@XN>B{R0D@B`)h~anjB1QTm5^!NNAH+^; zL;5$E)C5mZ4m0lHGLeTd53VJjRqH&((qWLz+IsAOHlhBYZ<{|sM)h3$t&&~*pxhYENZ3^7w`josMiD4yqWN5Avt_lh#Zdp`dG( z&k%t<>4Av2y!@>0sqnMdsbbUX52EJr7m-t&TDO%xBv}i7Ra(A^7fm*X3AV4zxe)fT zCvPqO-cO`);8o60OlPP#4&X4UHzf>y$pp#cd=trOBz&Wyn$VWb4wY>FS|N$A%U0`a z@S{n()eMH1YUUqpqImE~BqF6L6B@vzuc=npdORI(40+QfNN!(OZGENk>(J|+Qp(m5 z{|}Q1_GAInnVkl9*j%GQhz-g$J%Snm)wu`j-0K_y2QA`?K^|vh%y8hSJ`Byt7+p%N zoG*MjV^0+=K$YHpWgusAd~P+rQ9VT`^(BG~Y4Ed+ zi&-T(;N$AThvR}M2+Ef0skMaZ5PA< literal 0 HcmV?d00001 diff --git a/src/layouts/BaseLayout/BaseLayout.test.tsx b/src/layouts/BaseLayout/BaseLayout.test.tsx index 964d7460b0..c5b40131ac 100644 --- a/src/layouts/BaseLayout/BaseLayout.test.tsx +++ b/src/layouts/BaseLayout/BaseLayout.test.tsx @@ -27,13 +27,7 @@ const mockedUseImpersonate = useImpersonate as Mock vi.mock('shared/GlobalTopBanners', () => ({ default: () => 'GlobalTopBanners', })) -vi.mock('./InstallationHelpBanner', () => ({ - default: () => 'InstallationHelpBanner', -})) vi.mock('pages/TermsOfService', () => ({ default: () => 'TermsOfService' })) -vi.mock('pages/DefaultOrgSelector', () => ({ - default: () => 'DefaultOrgSelector', -})) vi.mock('layouts/Header', () => ({ default: () => 'Header' })) vi.mock('layouts/Footer', () => ({ default: () => 'Footer' })) @@ -53,7 +47,6 @@ const mockUser = { student: false, studentCreatedAt: null, studentUpdatedAt: null, - customerIntent: 'BUSINESS', externalId: 'asdf', owners: [ { @@ -330,9 +323,6 @@ describe('BaseLayout', () => { const hello = screen.getByText('hello') expect(hello).toBeInTheDocument() - const defaultOrg = screen.queryByText(/DefaultOrgSelector/) - expect(defaultOrg).not.toBeInTheDocument() - const termsOfService = screen.queryByText(/TermsOfService/) expect(termsOfService).not.toBeInTheDocument() }) @@ -352,9 +342,6 @@ describe('BaseLayout', () => { const hello = screen.getByText('hello') expect(hello).toBeInTheDocument() - const defaultOrg = screen.queryByText(/DefaultOrgSelector/) - expect(defaultOrg).not.toBeInTheDocument() - const termsOfService = screen.queryByText(/TermsOfService/) expect(termsOfService).not.toBeInTheDocument() }) @@ -385,60 +372,11 @@ describe('BaseLayout', () => { const header = screen.queryByText(/Header/) expect(header).not.toBeInTheDocument() }) - - it('renders help banner', async () => { - setup({ - currentUser: userNoTermsAgreement, - internalUser: mockUserNoTermsAgreement, - }) - - render(hello, { wrapper: wrapper() }) - const helpBanner = await screen.findByText(/InstallationHelpBanner/) - expect(helpBanner).toBeInTheDocument() - }) - }) - - describe('when no default org selected', () => { - it('renders the default org selector', async () => { - setup({ - currentUser: loggedInUser, - internalUser: mockUser, - }) - render(hello, { wrapper: wrapper() }) - - const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/) - expect(defaultOrgSelector).toBeInTheDocument() - }) - - it('does not render the header', async () => { - setup({ - currentUser: loggedInUser, - internalUser: mockUser, - }) - render(hello, { wrapper: wrapper() }) - - const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/) - expect(defaultOrgSelector).toBeInTheDocument() - - const header = screen.queryByText(/Header/) - expect(header).not.toBeInTheDocument() - }) - - it('renders help banner', async () => { - setup({ - currentUser: loggedInUser, - internalUser: mockUser, - }) - - render(hello, { wrapper: wrapper() }) - const helpBanner = await screen.findByText(/InstallationHelpBanner/) - expect(helpBanner).toBeInTheDocument() - }) }) - describe('when agreed to TOS and default org selected', () => { + describe('when agreed to TOS', () => { it('renders children', async () => { - setup({ currentUser: userHasDefaultOrg }) + setup({ currentUser: loggedInUser }) render(hello, { wrapper: wrapper() }) const children = await screen.findByText(/hello/) @@ -446,7 +384,7 @@ describe('BaseLayout', () => { }) it('renders header', async () => { - setup({ currentUser: userHasDefaultOrg }) + setup({ currentUser: loggedInUser }) render(hello, { wrapper: wrapper() }) const header = await screen.findByText(/Header/) @@ -488,9 +426,6 @@ describe('BaseLayout', () => { const hello = screen.getByText('hello') expect(hello).toBeInTheDocument() - const defaultOrg = screen.queryByText(/DefaultOrgSelector/) - expect(defaultOrg).not.toBeInTheDocument() - const termsOfService = screen.queryByText(/TermsOfService/) expect(termsOfService).not.toBeInTheDocument() }) @@ -510,9 +445,6 @@ describe('BaseLayout', () => { const hello = screen.getByText('hello') expect(hello).toBeInTheDocument() - const defaultOrg = screen.queryByText(/DefaultOrgSelector/) - expect(defaultOrg).not.toBeInTheDocument() - const termsOfService = screen.queryByText(/TermsOfService/) expect(termsOfService).not.toBeInTheDocument() }) @@ -550,15 +482,12 @@ describe('BaseLayout', () => { const header = await screen.findByText(/Header/) expect(header).toBeInTheDocument() - - const defaultOrgSelector = screen.queryByText(/DefaultOrgSelector/) - expect(defaultOrgSelector).not.toBeInTheDocument() }) }) describe('when agreed to TOS and default org selected', () => { it('renders children', async () => { - setup({ currentUser: userHasDefaultOrg }) + setup({ currentUser: loggedInUser }) render(hello, { wrapper: wrapper() }) const children = await screen.findByText(/hello/) @@ -566,7 +495,7 @@ describe('BaseLayout', () => { }) it('renders header', async () => { - setup({ currentUser: userHasDefaultOrg }) + setup({ currentUser: loggedInUser }) render(hello, { wrapper: wrapper() }) const header = await screen.findByText(/Header/) diff --git a/src/layouts/BaseLayout/BaseLayout.tsx b/src/layouts/BaseLayout/BaseLayout.tsx index 136dd46b43..22fd6e9287 100644 --- a/src/layouts/BaseLayout/BaseLayout.tsx +++ b/src/layouts/BaseLayout/BaseLayout.tsx @@ -9,6 +9,7 @@ import { EmptyErrorComponent } from 'layouts/shared/ErrorBoundary/ErrorBoundary' import NetworkErrorBoundary from 'layouts/shared/NetworkErrorBoundary' import SilentNetworkErrorWrapper from 'layouts/shared/SilentNetworkErrorWrapper' import ToastNotifications from 'layouts/ToastNotifications' +import { OnboardingContainerProvider } from 'pages/OwnerPage/OnboardingContainerContext/context' import { RepoBreadcrumbProvider } from 'pages/RepoPage/context' import { useEventContext } from 'services/events/hooks' import { useImpersonate } from 'services/impersonate' @@ -20,8 +21,6 @@ import LoadingLogo from 'ui/LoadingLogo' import { NavigatorDataQueryOpts } from './hooks/NavigatorDataQueryOpts' import { useUserAccessGate } from './hooks/useUserAccessGate' -const DefaultOrgSelector = lazy(() => import('pages/DefaultOrgSelector')) -const InstallationHelpBanner = lazy(() => import('./InstallationHelpBanner')) const TermsOfService = lazy(() => import('pages/TermsOfService')) const FullPageLoader = () => ( @@ -31,20 +30,16 @@ const FullPageLoader = () => ( ) interface OnboardingOrChildrenProps extends React.PropsWithChildren { - isImpersonating: boolean isFullExperience: boolean showAgreeToTerms: boolean redirectToSyncPage: boolean - showDefaultOrgSelector: boolean } function OnboardingOrChildren({ children, - isImpersonating, isFullExperience, showAgreeToTerms, redirectToSyncPage, - showDefaultOrgSelector, }: OnboardingOrChildrenProps) { if (showAgreeToTerms && !isFullExperience) { return ( @@ -58,14 +53,6 @@ function OnboardingOrChildren({ return } - if (showDefaultOrgSelector && !isFullExperience && !isImpersonating) { - return ( - - - - ) - } - return <>{children} } @@ -83,7 +70,6 @@ function BaseLayout({ children }: React.PropsWithChildren) { const { isFullExperience, showAgreeToTerms, - showDefaultOrgSelector, redirectToSyncPage, isLoading: isUserAccessGateLoading, } = useUserAccessGate() @@ -109,53 +95,49 @@ function BaseLayout({ children }: React.PropsWithChildren) { return ( <> - - {/* Header */} - - }> - - {isFullExperience || isImpersonating ? ( - <> - -
- - ) : ( - <> - {showDefaultOrgSelector ? : null} - - )} - - - - - {/* Main Page Contents */} - }> - - -
- - - {children} - -
- - - - - {/* Footer */} - {isFullExperience && ( - <> -