From b958cf5577c0468d1873fe100c9d74e58254893a Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 20 Jul 2020 22:13:47 +0530 Subject: [PATCH 1/8] update schema page --- .../src/components/Services/Data/Schema/Schema.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/console/src/components/Services/Data/Schema/Schema.js b/console/src/components/Services/Data/Schema/Schema.js index 5ffa5cafd1d81..38fd262f42fd4 100644 --- a/console/src/components/Services/Data/Schema/Schema.js +++ b/console/src/components/Services/Data/Schema/Schema.js @@ -532,9 +532,13 @@ class Schema extends Component { }; const heading = getSectionHeading( - 'Untracked foreign-key relations', + 'Untracked foreign-key relationships', 'Relationships inferred via foreign-keys that are not exposed over the GraphQL API', - getTrackAllBtn() + <> + +   + {getTrackAllBtn()} + ); return ( @@ -621,14 +625,14 @@ class Schema extends Component { const heading = getSectionHeading( 'Untracked custom functions', 'Custom functions that are not exposed over the GraphQL API', - + ); return (
@@ -689,7 +693,7 @@ class Schema extends Component { className={styles.add_mar_top} key={'non-trackable-custom-functions'} > - +
{getNonTrackableFuncList()}
From 218a578369c859a9488f05f0b51197cd73d66def Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 20 Jul 2020 22:16:18 +0530 Subject: [PATCH 2/8] update relationships page --- .../AddManualRelationship.js | 2 +- .../Data/TableRelationships/Relationships.js | 55 ++++++++++--------- .../TableRelationships/RelationshipsView.js | 32 +++++++---- .../RemoteRelationships.tsx | 27 +++++---- .../components/RemoteRelEditorWrapper.tsx | 2 +- 5 files changed, 69 insertions(+), 49 deletions(-) diff --git a/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js b/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js index be401ea186183..1543c8e558c2d 100644 --- a/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js +++ b/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js @@ -68,7 +68,7 @@ const AddManualRelationship = ({ return (
- + Add a new relationship manually
- +
+ You have no new relationships that can be added{' '} + via foreign-keys
); } @@ -250,7 +251,7 @@ const AddRelationship = ({ return (
- + Add new relationships via foreign-keys
- -
- - + <> +
+ + +
+ ); } else { addRelSection = ( @@ -471,13 +473,16 @@ const Relationships = ({
-

Table Relationships

+

+ Table Relationships + +   + +

{addedRelationshipsView} -
{getAddRelSection()}
-

Remote Relationships

{ return (
-

Remote Relationships


-
-

Relationships

+
+

+ Table Relationships + +   + +

{addedRelationshipsView} -
- -
+
+ +
{remoteRelationshipsSection()}
diff --git a/console/src/components/Services/Data/TableRelationships/RemoteRelationships/RemoteRelationships.tsx b/console/src/components/Services/Data/TableRelationships/RemoteRelationships/RemoteRelationships.tsx index ed5b454191091..292384cf0e061 100644 --- a/console/src/components/Services/Data/TableRelationships/RemoteRelationships/RemoteRelationships.tsx +++ b/console/src/components/Services/Data/TableRelationships/RemoteRelationships/RemoteRelationships.tsx @@ -4,6 +4,8 @@ import { RemoteRelationshipServer } from './utils'; import RemoteRelationshipList from './components/RemoteRelationshipList'; import { fetchRemoteSchemas } from '../../../RemoteSchema/Actions'; import { Table } from '../../../../Common/utils/pgUtils'; +import ToolTip from '../../../../Common/Tooltip/Tooltip'; +import KnowMoreLink from '../../../../Common/KnowMoreLink/KnowMoreLink'; import { Dispatch } from '../../../../../types'; type Props = { @@ -24,17 +26,22 @@ const RemoteRelationships: React.FC = ({ }, []); return ( -
-
- Relationships to remote schemas + <> +

+ Remote Schema Relationships + +   + +

+
+
- -
+ ); }; diff --git a/console/src/components/Services/Data/TableRelationships/RemoteRelationships/components/RemoteRelEditorWrapper.tsx b/console/src/components/Services/Data/TableRelationships/RemoteRelationships/components/RemoteRelEditorWrapper.tsx index ef0c554c308fa..d39530f0b04b1 100644 --- a/console/src/components/Services/Data/TableRelationships/RemoteRelationships/components/RemoteRelEditorWrapper.tsx +++ b/console/src/components/Services/Data/TableRelationships/RemoteRelationships/components/RemoteRelEditorWrapper.tsx @@ -49,7 +49,7 @@ const EditorWrapper: React.FC = ({ } : null; - const expandButtonText = isLast ? 'Add a remote relationship' : 'Edit'; + const expandButtonText = isLast ? 'Add a remote schema relationship' : 'Edit'; const collapseButtonText = isLast ? 'Cancel' : 'Close'; return ( Date: Mon, 20 Jul 2020 22:41:06 +0530 Subject: [PATCH 3/8] add timezone note for cron --- .../Services/Events/Common/Components/CronTriggerForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/src/components/Services/Events/Common/Components/CronTriggerForm.tsx b/console/src/components/Services/Events/Common/Components/CronTriggerForm.tsx index 6962b5aec497f..13894036f0291 100644 --- a/console/src/components/Services/Events/Common/Components/CronTriggerForm.tsx +++ b/console/src/components/Services/Events/Common/Components/CronTriggerForm.tsx @@ -66,7 +66,7 @@ const Form: React.FC = props => {
From 07a6e6c971be158a514afba47bca486a53883add Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 20 Jul 2020 22:44:48 +0530 Subject: [PATCH 4/8] . --- .../Data/TableRelationships/Relationships.js | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js index d63b7e94e8048..095f6424e7cc1 100644 --- a/console/src/components/Services/Data/TableRelationships/Relationships.js +++ b/console/src/components/Services/Data/TableRelationships/Relationships.js @@ -421,24 +421,22 @@ const Relationships = ({ if (relAdd.isActive) { addRelSection = ( - <> -
- - -
- +
+ + +
); } else { addRelSection = ( From b2bcb774e00b7a47a9ad1faf112516cf29e5e724 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Tue, 21 Jul 2020 16:04:40 +0530 Subject: [PATCH 5/8] fix event trigger breadcrumbs --- .../Services/Events/AdhocEvents/Container.tsx | 15 ++++++++++++++- .../Services/Events/CronTriggers/Container.tsx | 15 +++++++++++++-- .../EventTriggers/TableCommon/TableHeader.js | 6 +----- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/console/src/components/Services/Events/AdhocEvents/Container.tsx b/console/src/components/Services/Events/AdhocEvents/Container.tsx index e82eca86c2644..5f49263b087e4 100644 --- a/console/src/components/Services/Events/AdhocEvents/Container.tsx +++ b/console/src/components/Services/Events/AdhocEvents/Container.tsx @@ -22,6 +22,19 @@ interface Props { } const STContainer: React.FC = ({ children, tabName }) => { + let activeTab = tabName as string; + if (tabName === 'processed') { + activeTab = 'Processed'; + } else if (tabName === 'pending') { + activeTab = 'Pending'; + } else if (tabName === 'add') { + activeTab = 'Create'; + } else if (tabName === 'logs') { + activeTab = 'Invocation Logs'; + } else if (tabName === 'info') { + activeTab = 'Info'; + } + const breadCrumbs = [ { title: 'Events', @@ -32,7 +45,7 @@ const STContainer: React.FC = ({ children, tabName }) => { url: getAdhocEventsRoute(), }, { - title: tabName, + title: activeTab, url: '', }, ]; diff --git a/console/src/components/Services/Events/CronTriggers/Container.tsx b/console/src/components/Services/Events/CronTriggers/Container.tsx index 78939529822d4..a1123e28888c9 100644 --- a/console/src/components/Services/Events/CronTriggers/Container.tsx +++ b/console/src/components/Services/Events/CronTriggers/Container.tsx @@ -73,13 +73,24 @@ const STContainer: React.FC = ({ throw new NotFoundError(); } + let activeTab = tabName as string; + if (tabName === 'processed') { + activeTab = 'Processed'; + } else if (tabName === 'pending') { + activeTab = 'Pending'; + } else if (tabName === 'modify') { + activeTab = 'Modify'; + } else if (tabName === 'logs') { + activeTab = 'Invocation Logs'; + } + const breadCrumbs = [ { title: 'Events', url: getDataEventsLandingRoute(), }, { - title: 'Scheduled', + title: 'Cron Triggers', url: getScheduledEventsLandingRoute(), }, { @@ -87,7 +98,7 @@ const STContainer: React.FC = ({ url: tabInfo[tabName].getRoute(triggerName), }, { - title: tabName, + title: activeTab, url: '', }, ]; diff --git a/console/src/components/Services/Events/EventTriggers/TableCommon/TableHeader.js b/console/src/components/Services/Events/EventTriggers/TableCommon/TableHeader.js index 008a6d2c33c19..88065cb6f87c6 100644 --- a/console/src/components/Services/Events/EventTriggers/TableCommon/TableHeader.js +++ b/console/src/components/Services/Events/EventTriggers/TableCommon/TableHeader.js @@ -36,11 +36,7 @@ const TableHeader = ({ triggerName, tabName, count, readOnlyMode }) => { url: '', }, { - title: 'Manage', - url: getDataEventsLandingRoute(), - }, - { - title: 'Data Events', + title: 'Data Triggers', url: getDataEventsLandingRoute(), }, { From a466742e8eb7e34dec0ad9436a35b36838b6f061 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Tue, 21 Jul 2020 16:09:29 +0530 Subject: [PATCH 6/8] delete action-diagram.png --- console/src/action-diagram.png | Bin 28034 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 console/src/action-diagram.png diff --git a/console/src/action-diagram.png b/console/src/action-diagram.png deleted file mode 100644 index 20fd9615946a933b6cfa8d3c445d66c52f0a8763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28034 zcmdSBWmH?;7B-3m2*KSYI23m$1a~c7C{}23iWc`E#jQ9k?k>d(#jQZ`;x5IC+fC1T z-}8-cj63fC`zs@RWUsaMGoL+uCQ?&f0SiP9LO?*kQc{%FMnFJfKtMp00iwdMfDVXo z;2((ZwH2TURpXTV2nY}aC0S`*FT^81v@AlotAMdOs}woLsIP3FUD;@N5Ykalv@|CE z=$xwSY6AZBxz#N1d$ZB8!1AuqB)+@RmDr@_r8AOA%W2|j4k;TM>^witI&yXNZe{1} zf4ZIB)zSI&vf8xcPETX*P`|nySza0l3~Iq^d49SVLqiIR)>@DCf4mzTxJAvH`|c8` z8jeFlZB=&B{>>7(zwPOl=W56Mt0|_ge*f|j z&_Myy0zT8zhB1grvW>k5a1T);19PD4Jq&!36YHAS1Q3Kdbo>?&>KZ__M4vZkkB-hGUgec*@~{g2ZJZ#EIgRZtfzYNc8eC z^HQXkouOWhIrd*H3#V>y1GT4!JLNTgmS}Be9agnDn))`%G6K#qf`T6osy@5`SkNOB z_d!|cpA&iUDPCyxMIclainJ8{4(HO2zIg{z1_BY`M?WVHvdQ&pLd~(t+~z7>^*G7_!ZFdFe>nF#=E zq9C#|yj+`9>ZI#t)=Qs>{_*U88x?eyEeN<BXE2@kZ{L-VulBd%ZwyoH|y&;lFIRZgMs7|t|AfAqx11&D%+b4`hS4` zzxL1j0PGI1lD`x#X~I>+M!ZQ7&o)u}iI3D85$LPv>ZJPf3jnV>btQt?KyC|4`x1DH z>; zmpCjH9F!*hWlOgupuuXBr`zHr08nQ^)unDOMNp#E!G)(&%38tm^O-(T3jfXb#x$wk z{G2zWaAA;9BM5K-He~aX&{4~5ewFCJ?t8ohf`reRmy;v)m z`m0`!xT1(l#ni9^^uOe2heBxPE%vn{sj`pJSjxo^t6bHMY!W1!4*zP7iT@w;!nHNKU3Ms&Q_5`{72nuV=fH-k?hBlnBYt{rDCn zf}Ru&9E2uDe<_pPrbg;nGh!jb8Wuy1hG7Lo`J*!Tc3H(Ppq49se9e=bWI@1RlhIvf zkwR2nqdQ55Zf{)wD68-v^aE(umVZ2eKNi4&r4>g~!^uV6{%rXZ%0_4XIC?G;UACj2 zWoU+Hq)91PL>F*4>ye@&V*Y|n=Pz#Y{(yq`0-E=YEC76ky!~}XO+{3FJxo*@z7d+Me*ty~6v9ZXN`+7HB{n50?%Z$(Um6uNF zRXiha1S^a@yqE`7bJLoLZciN+1izhI$xmO|X;O!3{~Tv~Iku<)byTQtJd!Qv*2)JF z#*~*t0~{vtb(@Mj!E{ zBo-ahgq#NoxkA(YJn~|t=rzBzfLvZ18)s=O<>=?f0LCKUOwWoGIj$cZTccBIMH)T5 zW&Ts$R*L7X9J}h8X*sKrYr&L2xT5#O2$Y@R^KlJfGGOeJXLp`I0H(3Y3bJk{tHpF z--7AyW+t_@zq1jL9IE13!&LyQ^NiyPShJgYnm0Ifc<^=shVV4AYk|Hi&cYZlEPu;b zj|+=LU^YU%(+ovzQw<(UA7OGoc9mxdE3L~Sc(*X0AlgY;&JZ-CG# zx*o4RUggajV_9EoA>m3BN#QS3Y4k?U>=Zw24TynFJZf=!F#3KfnaLKWr?q9O)R3F9 zI;@_NV^bEjMKiO?>^IFQ(H?|IBC!@*ob0Q>@$Ai!&5D*Q-^i@cVL8BBl$JA}FOTC` z*m%$L_6`<>;Bpp*pB7Chgb0u|Bw178U}yG zduVt3^|k(Y=l$;}=Fu4yjOeL^wMCDiM8;?T->tjD-x{5tZg=NwSK7U8k{=OW&Soo( z&1m2zSUKWq(XLve=FM0JRs8c+2##b+_s~QWzu4^Au{MC6X!&N8s6vLhYb|=4yuMOO zTlMKQe{C-4qe_DF3sBMPglL(q-g6<>q6NWy+(YaXJ<@j25%$tMO+1zfW5IfwhnM|J z&2MafS)1Dhk*_K)HB#rTp#>y3p0hQlnlj8~>IoRBX!m*V9F6#cM0A zG`}UJ*1+zlsb>MfKOcCvek!a87UXtk$XN3#9?@Pa4cfKB-7x0zv9Z9UR&Ey5(9xCqWm$6Nt>GE+@8HO}gs2*FZ= z?0+_E><=(Z4LQ4W*IkwYE4?(&>VM3EvBmbwEoUZN_dyhZw3hyvYBQ-Le3GYb_v?Af zI3d~zmH3eAASv{1OF=7%!2}G@4Eh$LceY_St9Hga0MdL|qd0`sC5*Q-7Q>psHay+B zKHO3x?stvRYyG*&?T^9gDUHk3J9=-zCDOy2jg`9t9%2iZq8z9zNtSbRM#M1lN2LF7 znft7-Jk=6y+|)+lrEr8oUYi$AfF^#a@Fn-Y_AU{3D^pC7l}5mU9t%0GJcvB4KBFvD zD(3bF+|5L>d4m0b-t-CMeE|W~G};EJ8B!NrX61SuCIS5rvbTNj`$m?xM`a#|TJ+gv zAMsPI=~_-ab#wCUJEDA+QDWKS-*d;_i|i`%g&+_m7Wv)%G0ge2qqD@u>DBr9Xuwa0 z&cp5U;Ah(B)92F&(g^+Z=)8QPKD#*|x=zwsZF0~l+7n-f2>Ka~7qXpx!7JSB(5!3P zu~LN5kj@iLT&E%K$#1XCE*fpNu?yV@8>5iVZ&1h2KgrD(*x!%+Hx6|0%ZN~7#C)M`^}ab3 z?wvD5z#)i3O8s@#C5c!^2zD?sGE&~|L(Q7#btn~7m#1$E{{AQVJn_cA$Ij+-4<<|^ zfGUG1%50*>0z{kKAg^No>0NU$6P)OV`rGARv^}5u?CDJkE3?MiJ3JQEfTVXnJ|aAk zUPWRDzyf-V>Qb!pi_{(r(dgPJHpnNN`#x?WOi3fQp`ecye23Aj@3_)uCEpGRl}sZx z#I4J7BfjObdJLVXawh>-Vzw-ZgBGg>y=YXp(nM8wODuD#IJGo+>>S`oj^@heRmcssQS5Tp%jd`}2$ z;&2I;+v+klVaBaL46T)Jknaj)L066ISDHmN6n1&2DV3nG5yK4h*cxTh6t1>abV3H| z2p<$tZ3^$yxO=opBL|l_FESh|zInfbgsbejRJ?e5`d97wrX3%omtU+%8w-6NpNaC( zYUPTLMn8WJ^P#1QpYX6=l35vXKBei?m-Zy1o;8x*$;hJ#ytr@{r*fG@#t}btXz=;m zOOm>B?-lb^DC8Qvcfq)J>tyv9<%PZ^vp}#mw4Hf@JGcIjE8Io=*0SJHYqxc!!{-EG z>X$G_z^@X&61H6?>Nw^8$(RmaUmr{7)4vYBke7J(#9v4qH7KQ?64)M|=S_Tu`OsRDE*zwRBlVF| z#I-aDF@p?-nC?ZdL5b}`T-Xxn^6oNVJ{0Rm1pzCQvE#Ps{s5k|oBE*IQe1ELwW~^x zb@rr$DxL1fY$|)Zx1iyj`GyAj3^nAS4dn=<=@B zEw80Nk(s#|t>m63sSBd(vA@+qbXly_G2pb6W0Ye0)P8lkx|*B5#`WkyXn$oE5_sN4 zyAm6DQ_0eR7wvzyU+k$hNY&_&i49H*cj>YVes5&{?joI_L&r41_4>2}w@rGdYxC)X zZy6JH{lPZbEUE!(17Yg3_@cy*I^>U=%;$m!YBitw`FmY9qbyg%uKTgHfInSO2<&g`yY_j=#?O2B2&^TB2>0!n@4v&XBs(B%3Z){acH)Sq@jIYJqB z3beNpe45q;(xI%NQA06<*GOfH&?AUBj2aXeIaAnO^ih|n2fvI!Yzm4mNO9zwTi<3` zPF@8=|8TKWoSDv{>{`Qi*V0q1jpFx5@Go+JPt!`#Uuia0_E?xlL0AC}^EKu)R*opg zfXS=xXPLr|YS3llTZC(|@!QE}J}W6)oRpV@oKviQaS-!|g3o_|K^iXL=KiU{(w4R7 z_rKidBrtTgikuyOJnWB0$Sm~U@HNO#XOG9arG<&CP%=%t>4~%E^NJu2Ky6**x0|it zu)0Iy{ZSm|;2Uo@BGCQod9}_(J|f8-k1+PDK#}>5L&*Fu!nHQeF>Ftk;pxD`86){O zsV%ObX*e?%IzZB`!D~A}GoqW)(C}@(=yI#GUf+K1aGcuV{eo!bX|@!ZrR~)7e6a4* zq$^Ff&G};Q^F7A0l$VAG4~U^WAFzz6qOLZH8Hlo}o7ENh)ntX+3&tj2N2o%5zm}fV zK4$Ytj5b$=hCO#50uiO0NwLY{UNY^9}7Qj9N_Z7YXXJUxVDx zR|pIl-*xle3I18&EKI^ZPy5VqZwAqh@K$6+-c+!q0o6n6fQn!x;#R_+z2C)2D{gG4 zLZlw4Th?wBqJ=1f@1mtgi?Ky>sxT^H=UpKucxyhiu{2m5ac;2`eSR$>4|w}s(tMPc zIP!k#P(GPM+Aez4>Z^%J(F^C^JC_Y6;6X>?T4e_lOIEP)@9te+=7V*W<%JzFj60#ugjDz2a&Uk=hl zeQg;ZO(FW@)ONToeaO2UuvZKnIho7rntO#EAhJ?F8}vrP7PPS-8QAHOS8TnhIJ3SK zY21^kM-ZNVEi2sU7_-HVs-GNNaktA(f=L?bh&&HH8A>IIX!-*|68`m4>JY zV&ju3d+T)TAaUUM8nvSBuj1W)J)U-fxrrS#0H`<^-qTGw0mjs}&|VA>;MsZ%RyoHO z_Rg~rN(SGRyF4((`fO?}^Avm&V4;`*etpJZy?A7Gbi9fjxDE~nDPr{2eKI(h|B8dT z&%CG~(2DuZ@_uJ*lv-OJDt$5MT~sZ>zM!2z8uWa;aPu77dseGxr<>P+b?fnY;PExj z`E#@v`P1{g1%3cJzXaYKeVrr+AnnJ8;0E5nCuv#H$k=WQA%)L5ub9dhN`w)xh_Vl% z7xdYiIky_854hV6vEpG~9w-i@J{x;KzPt^}N9xCEc%s*)aM>cjxyrsiZpOWb7*5If zQ+CTSC4z51N+nF7w}B~nVnRdHuqtwf1ldl#SN=Ts%*{NLPH*>Tn1l)DFjado2qq_re6Ap%;MMk@aV zXynBz!XqAdx&Q*S0t8Wwz9LJ2ek`Iytk@n$m=4h%7e*s{^MOhV4g4}~Ll!b;ngxku zF9fcQ4LzRLd_bT!x(;(GrUR0mi6Gt(R4Ln#-tSCLK3kOc2_csOLNRR~QdU}Z3eXr=xaT40d93<3yZ!-BA^ z-bFu^P!qTu`m1AALqUp7aMa2;MrMJj85T%MWo~^7B2JzI&voU8YFHY!;0_94Nx((w zIGN1+7b{p8g4w|L)Z>8uf(Cp^YhT_f{2E3G$qi0Jx4gLqJYsm(Rwd6}8}jxbqRZ-D z%|pp?Zp(WhO6Ef6nDcf6aI?Nw3VF{Vq)~?Q}#ZJv>K^OV;OQOHjxFJHUSiLajYKC+wd>eulzx>_rOW})h5bTJ_6wO)C zt8*m);}Ug$9sGGH2xz+{SP)*6v70I zhmx2Y8coPbp!OB>pf{gI083wp%sq1$10i1aE)`Nk+4igApXO$?@!@tS63Y)17Jgl| zZN2k@(KKJ}BHPJ6k_#ANtp=ywL~&A)-*%+V!rU}<=VQCixpHfJ)w$nllD74ZaY$h--|LI?q>EK?~--&r$QltjJu80z@w4 zQ$sD>#Nd~TJV-qXfdP}Jtby|+h3Oshg=mOR`a5eF-(-;VGv4mM<#n%oU6+A~F~F!P zjQwrPo&4$Wx#w{`_GP)AM92e_vg`h0LQ1Hcq`mkX)Rilhq$nS|tJ|0&>3f{w#P?Pr z;2-^<0k5owm_e=+z1ufLdlP`JuKe*J7BkppK+w)7xa+&VlzmApZ>qoL0J(L)`F3NM z@10)46#Q(R*9PME&D;df&_uouc~D3g@L6Ol5HiQO8?rqSo&2L<>ag`g$Q<`=cDKGU z_~Kc{&}Wk4d);&?g^;5Odi132RyNAlRa`BH8*VmRxWQg`9pImAQW$@lhDv;gU+s;|P_~2cNcApEOglMqKr> z05R?pzOji@7h?0ZvoB?4Qdpnm*WRf{k7>v&=HZq!K zPQ3N=kuc?R(10d%<$J-az+MSF&z^POf_mImobTB+8SFi^Si(+`$o_Lt?Nz0NRjQg# zBI-|(f7oUHk#{-!5D4SmJNqMAwE!Nt!Yxiew6s$=wwODe`eC{t?a?TRBHi%!hJJTi zpS%uSz5Ys4T`*ppDDyN}?28<~=)cjzo9AT0^ftIIY4Uf9*T^PX`|JnAaV~kuF7pfC z4Zn0k<0_NZ#A^hLNwV#vg!2$T-}Kjc8;$r0K8_F3WQv(|xAfZnAxAu?^CW*f>EdED zW#Uc4CF`g(khs0^W1bOJWc1kRu~{_Pb5Tq+@}$0`>+cb=jHv@oZPu_ZKJ@v+hSYr> zw9;y6Zm<-FapWtd%i;k@DX9s;qM2jpU+gkBe&29@(8ABs{Z0b(;r0~e+QRhQ?W9F7}nTFh=_rA9HkJj@Oz&tDI+z5;vxvNUXuF3yq! zyA>*3nTV?EH}`W|U*s!gpE*m{?pZE$$WE2Hh`xEmUnJ_Dj}dbHvE)BBinaa@o{1r< zBSbVgm7u+Y_Tl&Gj(TlLn_~221}wJ&Z)5;Ei$C(d<2FARzsuBAVBIH2@Y`1yJJ1id5o1OB>>joKXku-$m-jLO{ z_sqRs@qpCz8E>pTSJ(Pk?*mS1wbU?lV-+!qjjZaihn6K$IoTIXlteNqkN#x9FU7_X z9_aVEAvK}zAab!9Na%@^zAwT0>URF_<@l-VkJ?6zC_#(OvWQyyp65%+n}9fM4M$}y zQyh)Q$Ec_%YNL)1?tnU~IvnZo4>OOr?Z0sNx#&;KYud24PkN#t;bL1sZ}8763y}s) z)E7t^E;Or2AHJ^pVsFsNvatuDVv(ER$ZhMeu;u2p(z_HdO z{rb)(KijgWK)sRdHd>mePeh#2x4BU;#WZxU+mh23sCaLe6CriuAP$caNBk@kA8U@?psVTKI0{i!42 zcUU{MVkxjf<`>x6;1|_E@t5qhgaE*~Bjk~7DLG_7A}^od=z=8xW%szo_YeQxs_cql z-=WqMZEF4-x{u_Vo&X>yek#s7;vR+ll^K12u-CP00rGE57M;z6UAY^ShZkuJ?Y6YY z;uHwYg>F0^nc2Lw3hy#U8=pcyhe%UIq#LA*)02u5%#LF_EAP5&1cBnASwO(R#>zxV zyfIKW#x5&OdN%27EXhg~uax>6qt!4o)22l{m2XuoP0`d=f`!YZs1!dvLJmo3hvjC@^^LTa_)b&fqm6Ks{I#Bf0D@H=i;`sr3Jb=`_2&Q zUXW0{KU*!=`-Gsff#}Af!Gam2XPT(_ksVxwpE=C@l8wIUP=6=6DwpxgetvpfvJ@%W zhvS>jEc^1(&a1=}naesfL^g(W4BJvMpn9W?RovD(qg=p>^pFi~^*Apqy!!L9Dt#bE z4VsmrDp~$ySC}`J|IULIA^sEk4utiSY|}qw&3H0^GmUBVcE!bO!yD8Q%>k*0Q+QoX zK5@%9j7~ddvAXwqSCf77F**yM*RVDidWTms8GfSCvMo1q<{rZRWJFL*alx9L*w@h`nja#2M7heXs!n~K>V zH7z8(BF0BU4=8@5rB-u03u`?5=uN18Frh9`wB*u%nuWb5kQY$3YBgG_K>8l}DqrLQ zp}@7w3Wi@^Y$a zp}=WswrH(WVG%P_gyNkoc!$XaudJ;jb5L2D@xIvywZFp24cjd;$C)**rEBg^e_qzB zai(eim`38UB4NqCZ%wGSt1(hpWvZ&#NCaDo8 zI+xtM;Hq=C8jaot0k*eYrhnyGb>q8^6xIY&#y(=0qaR95rFZU{zpskQr*@TVbuV~f zYE3g+Y;sE)CA9DqZJo7xHoN?$(=pEZ$58*Wm-(&BPcuWMvW)g0^$Z*eNsSjJayopx59mMo32-{3Y0ZX>@E_xqc58~P-%f{|F^x-| zHlqF>H^IyKAeIP)A`R<)3o!xSOs959CSYW1(bRzuU-=jcm>7cDg~CGep5KJJf0m+@ z*9g+?-cA^C?r7{eQ|-HU=_HK$M&iu&D#(r1S7a8 z+l($djl4pfK z{e%41m0;jAJ{tq({fYVL1IZJW-o;{h@1#zOlRAjz>o0p&lOLPjD|?w1|>W_#m6 z-Ja50P1F4CjY|YwIaLK2Gp$1`V@gU(@kywqBjFq+zj1 z1h*A~d+b0Lf@*$$ZMf`Ta%*g^hDKQulN#@Iv1KIo z`qh$?P}^~MVJ8cs5LvzNt*cI#zh6DPPsC{0bJcH7HB0!1iE|IiPP%1mq_(l#58T0K zJ1%l!whL-RUzYec&f=wu28Gg&58>6+Lb6Oa0iR+xMHOz2A`#{TV)fO09Ifnf=MMoWC!{lNEcqX zRJLx8{C#0qm>zzA`B%9wnEI(L_UkPz=dbY$kr_jU3g0#)>#{J)r{a?+{uFnspm$ho z;CYBT3`W7gRINqLd|^0F}!f&Bu!o#zcPr-?0hWQO;} z&Zjw3pRp|OolknK>viKJTwV4%+`#{_;xEv z!(Q@`+HF$0Da#dJljRcr_E&}z58D<7(%tj!h@!%88+A4YuK}{^ zk6W^~nVMXB&u>Qel;%Bl4$jpkH%dqKeX7YpX!`A_M+Sx)rD!(BI4=G~N%}f03~D9G zdD+w8srH*bT{Sl7F3%Bys})oDeRNJ;Ws@g6v8oHI@J-x>WB zKATSA)c#{i=N9~2sFJpLE*DMwN#D$`Q5)=i_MK#`&U!?3AePEOf)joFL*V%<0K5K| zT*lUwIlz6|>~lbHoppvU7B%SVn}nT85sH%a{hkIvpPEQ%ymPP;qk&=XA((|;VJ-4v zK4g>RlX|614{O4R__euNA|QB9IHZdntAXhxxSZ;Q{0z~?2x=Rd7hF5S*+$C72n6$BSa0q0Jc{b_c3q4ax{ML6l zPT8`3F8j$b_dGTI9MBj#3bAe{x*)5FKjfQiuu$@JaYT*c2pBLd5{0(aPzFI%8Zxh{wjCX9Rn%E^)->xr)+i{|9L2mwCMGjiv_wG5n)2GQ(FK&)JROR{_d+32eH3IpR#l!sT( ztk)E8jh>9&KwoWWW37H|Me9UrmrAsWL6CcETIN!OPLVXL%RjbFuAcZ|nyFuyLHp$p}8^fXu7(!9j= zoA;C7&fy|3%9x}P9hzF?c{57dCWW4DTskvJ!h3vue>T#xgA9!jRn*_ZAz=-Gd(=E+)p{ zmdxgA-V*2idKgKDQRBNX&EHtJHs znAXNR*#puv_ZE8sBO!c0Tgjz7*Nu@=#qKDgJ!{XyvqBg?+cjQ^LEZZDt8XhC58e+a zZ_GPMqbfIq?x}+8s#=S{)KPabD;@bUCZ<2o*ce*(Wj3x6BlRWKZ%7+j^KiO|Wx8-2 z?RP>mxV<=xOgq;<)ibv15VO8&98cHcBGqYo^AhBLEaaO0!kU3sxK$HhJs+l^wf3TC z{h&WuN!+1tM8yqCOM@F|;Y$6$%{dU@g!P~t{$-+<=g0F=bLXmaFP6_{&=;YtJB*#i zm3SA;k{F{pbh*BOU6UsC>iE-RQvX)Z9bfyc73^xkZmk7JSHT8fGd%xlrl}RW!grA?t9>vAfeSgC@!E@$dvn|LcSEjARmmD^zj2fb!?YJ~h7dIUx zPrH!~s)gdD!TWK4SPj&gXsNK!E`%bmsWNKyL*HWcAP>Lw3hW?Hou*ALDz0ts6MFXz z6`n*kKYPg}u;LHH`lc+W0$U=7GKOVlVTIuU&9*zXbdzapN0Vl4fZjD_6}^|YYqFNH zK?IusmQt*PwECiRe4l~YM%p6Pe`26DdcbS<7MhJ^obLc3|MzUZ{7=Z+TZRS<{@u5P z?Ws~rDkv!a;I{5zZ{bBzbcf#12oD}uZcR{a*OV7IYJ@u z?hl1zoqp6s4I)UvK{)3mX6_-={MH(06s3)>2{{*4u@oTCcScx{8+_tyAj640!U8QK zOayk{uxEmlr20W?F<-Tnq!=9Ogp4M>UvsN%R-5dIty4YIQ&_zKNgNfG27c*@vetl8#edc-2Fj2 ziUUEg`$L_8Nw)5`5?F~Sk@_NtjvHNh2$!GWc?!!~6al*|#3wnReCPUO|KyJp@5l&n zGWhIW8Th}2mWAN%`C7|;TopU7MR*;gK_aGDR6YG^O<&ArJp+g7}+&3OZ#N#(Qy4 zG~Qbdr7#O9_0~(wm8AF`ImKI1|L$aiwIUOfcmC-yX}hkA-O2ZJgFvSfo_g&wqfyAD5gEzVtV#lj`6Ru>AV&_qL z61YkFl5pQUPS?vq6yc{<=Hn1Xje51v-?M{-9RbCr)kMoxr3}V7R2vEEEWt30K@g<4 z#}}*hkHwl8@1drTbV6CL@BBg|!4uE{8(U5tf^O9JDCtqMF~JyN4n3AMeNQkiaiM9v zQfJ|yfl*7tfIdG1v;_CLHSv>RlEa&z^4E;$=>&*7ZmL#x7uYi<`_8xXYP$xDJZdgo z?JZZ@?4RdvaS>HlNP0gz;|Pk_?aG{O5Ti%^+)wwc3bSzkSea}W05dt%Sf+pRtpIN@ z%#KNTb~yr8EuW64gq$Ep^uDmG)%n=^hjr5X&lW>YOzfC8HkJcb9aoD|(qQi)jy84% zM}D`gG@vb&6j#JAlI+>W-DvYcBXHhiQ$*pGo9YpLUiwik78MyheMB*M&)rn!grkDv zaj;CiB~wR*LG_;&Z8)U{*#LRTfBFFdY=lW^`D^~6ID1%sI|$jk+>t;8QsW9+gZ!?X8yH1^@*#dmJ24&3zRTkBP1?tL>&xG$EOpGO&d zftHV;T1;SHB&tZ0_U+p@b!VdvVi%^3&G^eY#dAe)WN6I!|LUT6NY2=P#2b7OlWwx?S;#r%P>6Q&8jd1 zpP^tAXB$NWSWyi{XkFRRz=!HMbpaQ(Z(20p`~5ghES3$JWBhSW{r zM}0FEHp7rxr-#>mz7p<^ydJy3+6NUFpBAoGYMLsWZjlY{OUd+$^Z@&2Y!{N*m>^3mPkfiwq<5ztKJ}(n44_Jk!}giZ7*y zrv`7Du7r;lG=y(B;}S;qYtqH`O{u?U!4q(9r`hulr%^WEB7%B*)9emF-!257dzVZj zBq*b~M_9v5uroqGTzJ3(M5*9w!7S$gsJ(2q9T1Yyz(h*IXs7?);z%dYh(}~TfAVLX z_iUf5zkZqX_YC}amO z9-4T|6AvJhM_AeP^_1e0Vox{UyXd&3LpYW049R=KKtw}?`=zw`{7!h?ZzOxqn=TH# z`fWzXb3hTS@hi{u>xANe@O?F9nC&i2DqIRy0Vuim97A-_`E_>?cj;T>P&3_Fxb!HGer+-ZVt9 zbAe}ItahN3^2ox$vF!m*ZqkAQsFQav;((2 zIo+XWEXj#yJTG7nAOj4cs*<|I6~F1^x7M!{e}?&n!S|#=@c8Wt;(Jqt+y)czqn8Z4 zMv;sW5?lI;S#I7lpviJo9lO@>j<%{28%O`wS=DAJHV+UDg55Efi~Ekw1GnX%th{NB zUYlg&*|{XCSQl7;k7#1NyDljJ8CGP|BH~(ZR_|UGLRFc-LH;=4B8frM-zKPK^}1CI z`_i;9ILY>x?j%VSd~z!HZ?Am!QIHjx9(yf=^-sm7G3U!XlV8!*q_ZIXB5^P-4wB#f z)hnd0hy~xL?U_xMroAd?0c9ZwRg7(fu>0u+ZTYg0f&+OO1m&Ucn)03D7U!JFtIx;| zP?eC9Rl>`02qk_cRrN6FY?tMGZXvU&PZsca&!n3CJcH|wo6NzaK&ov{aTo2`WwZaM zVVlQsc1u-fnD!LC)Q3vb4?zgOE4kL>y9j=(W#ct}_z~^}LZm~GqZ78DuW3ym3Fs3T zm>Wi}@mdaUz_D=XQ-arMkKo1Cd91uvZ2rejaUY)h-9>@>e!@atExDl|JPC=3C9(8j z0kq{9!=}(htl{yWUe=F9$v9gg8|2B2vX98|o@C?I-@Ii`{cZbTczR&y)0aUp3hVOt z6)&4zb1)sGwD_k^P`0_i`{pBqQQ$hb*AhR_jiT94ulwC|{bawL2lzfB*Z8>BTp zY27$A$g!WdEhkRU08fpi*^BsFcvg|OuiRMapGY$)(>CBO+SU1S0o_@`DDUqj6;JwZ z4;9~Dwp73i*d*5nKg+3OPoO!CK>F;U_on5~mQmc;Q3F1j@|+3_X3kH*;g*M~hn}qEej9AaC zx&QVdQc$M%Ag+Or>5gfg%~~|hX&Q2IfOLCDe;&Ds?)LCWb)@j>JqDuDQcda|vQOA^ z|2`}_TM6~;((*y&2OTPavxFvM?Hpk0_gW+HjQ_l^;1sc%k@^J?F%B>9dFdqm!N*~x z{T9EVofwNSy33-<7dN6l-V@BuK;iO0wSf+k!1Gog8FVWG61>Q=(D;64lkRi^>5y(> z*g^xzGaIPdD(y$nneL*ko3_$SA8=84EBQ2WL2FI?r-=t*q#5HCr8SATD=>uQYpAoN=vhb$XHu={&(HIqzuXXhR2 zZjfr$#NyQ3ZgYX++P4(E9C35U_oZEXc4*69xd^A#^rn%_lR|5>uXH8x?}(7z%B?Z6 z;H2Q}w$S|SZzKyv>1FFn=TmVpqQOVu@udC*A4hW(rU~8 zlblmw5oJF|QA0t*FXsu%KR`ygw+{;z(0fa!r~wtHQN9V#%2kmR zlKCYhWZcW1d$!--OhAoIHA1TZQys>uq5;St- zE)t}$2Xce2$g>oF%>gc30kX^soSNb*Xpaz<7e4gAFuWz=JHyFtF~OT+FoM`+0}1&1W)szjW3y$6k^JQl?s>D3qvg>Cn^Dg+YFsC69L?BU zACAICjq1*jUY-&DHI#paunp{f-V|~RimfcB^$+t()gK1tgY2r{<4BC1|1>Bef;H6u zYb4Mvoc;!Yq2d%$J$y#;zqiAuK*4YWO)km?pAGqEC~zt`5FS5tSIEP?wEx&+V2~}m z|1mN=cKH8XX`qGQ#=%{V_pi?Zr6osV^&3Go9`KO0M0?HLGI462gY!k8g7<&FfB=Po z1-jrKk6Ik_%!OGm&)Zl0-DA3h|63Iij7t!d%(2idTE~@wXP?DOaW)TcTsR`GcgOoT z6oH=z0a!2vooYn-VVsxVu2=tNj8pg-=c>9o4Cm_fi`ay;)_zo7w)2CH@1Nb5M<1nd z2W-G`+q-$bpbB;p^Hv+aaiah27$h!DYfX&LLSTbfKT%tGL?Qe{H1G?yKAiI6wu91t z_6DDYnjoH-Ze^4=lx~Y^g3z05{f4s7(jn6S|E$q2P0I*E@5F4uAOwjvRDDZB;EK?$ zB^)T87TtilidWDvvSh}z)Bm!r$ukMXxiMfwVI?B`JAsQYv-YQNus%n0^)B-gxdOUK|o2xn|ln)%s<1lWp)k0?I1mU+)(pD5Fvttdfbk?R{uME1p3a%+!$k{+4F<&x=-S zZ;XVeUqd!g?fr^h=~p7HvqeUA;1Z-2MFJ;Xq;Vclx0WPt83(-DER_MrlK>~zXQmOJ z6Bp;xtOy7b+tN5+eOQ9$`}KGDfzd;+H02$`ag=^t9?m(rq>1n=!<~3w971wz9tV2H zfNFO|-x)%m25#JI|2z`c_bl*b-`noZ5P@+?kbXAB_x)5x(c%xIH!`Gifaw9Zh>$ep zk@P=NS4m1?32gJsc{@_=!0)j8GeZH!B|@AaO8n)qgw>z0CT;-rM^6EGchyz2w0IfY ze)>B`1`C2rVxnuw+oNPg)R8vUR|~^M=ts{G`QN~Tb``JNwcpQV3bIwFHXZ?2isLvX zqAY;Gz+Gbee0IS9;f}%IH!CcD_}_p8h&TavZ8t>v;Lhj2l!t}EUq}OBsmcGYoKpUc z$7L!||Npv>R|uT9p9m;zqM)sOT*9-X*kcn{7jT@K;?lNAkRty^4O)G&T!4pQNOuE| z@#qYjvQqbqIkl|)AqkHTlS1dEkac%t0`4F-pdj9AKv+o`jEf%Bq=$%}v6xD0`+VN2prsh z{|g|Q>v62GR>v$9q6$FbVU>kz`9LSUz-mPtpb)2QcTSM$8(&3J^{l^iv6!4e|2w}8 zFV_N;t)Si2z);mG4H>f5!RopqXchc{*tiLB!0}k{QDPaW)8vOKU+ckR3 zmlIrnX)|J;p!u&FKgWP`ccU1t{O`J*vJg-t zSA-n&e_=Wo9N(=uukz-9*Y%AIB*Ztvjt<5D$6~~r{l&KWOwZ|G65rs%x9+4QMrZto z>9k$A@OaH^vvLK5_}{Hg8R1*|im>DVGtnOk@&9Xxy84Yf{*$$XbAL?*0Pfzb(=U@B*7=1?h@QEwLQY{|3Cfu#N`_zvt!ymW_V3lf8ijAYWOV@{s?%C`Vy*}E| zsmKCT3d_X0YU2`as9}NG_5isjFak;eqWrVRA79br*ff`wUxeubK`+J{9%N)Bh~auE z8wjA`$sQHd0fbrM|CSioG<9n#eft~p55L_MYsBI?2~u7Bjh(o78k2zq2#K+Uh;$hc z?4@36{ia51g;dq5w3*R6^%7(kdRh#nWld}5 z{70Fz4A!0>MZ#h}w54z<4JrVRBwoBOQf3{>{gDPuytnit{CcCdMqbZy-Bv~o7gGES z_)hhDc~b2WtpDnv|2hMI1y~k@pqky>W7**#U{F%_mtVABfX@4<*R|&#PkGrQ$*;)~ zITpM=I)~rLkgfOIgskB=vB=Ps82%ML!1*-p3$F1Q~joQv|>7UvK0e1}WkqrVIT)b$xYIlx_5_gp|lo(hW*? z4TyB3Lx^-pcXvyUbf=_%fPkcQNk~a6p-6Xk$9=|ozjfF8-F5kwd7pWoH_q8-pMCZi z#@)*Y<%T07qaj^~59!i!8zD@x5F31Z0k&ceH&&Yah21!?f5(T@tL#0RqCJfG zk2Xa-)q#X`xV}GkvLxM&|9fEn3%=rWH1AF)-_E&eP=d#jW*u+z1^YUDx)089-mCTE zKM=OygNodis)7vMFC=pf+x;0IA_t~y90lyP-`_>I`kc>|fCfA9vajfH5&h$n{rUR= z75SiV3+r8Q$o&H|ebvby`Z3i{m_GE09JHg}Y&-m^izcegiHG?dd_$jV+-!x0>B$8- z`~eC(5gj$P>hdPLlife((?LN&lN(d{zg7#cz&0*W0wn|9(=vm7(jco)-9@b!7bM2p zmjPoCdoYb|;&^k9TV%omDbubATYrPRu`l->UH(4e1l5D~$b5O0g#p@z-aC|+q?JI% zZ_S1>V%)9fk)=*8btr@mY9!aqai;}+yHL~?4&z zRQ!P5!)rfmzkZ4B@-~VT>qifJjK~QSn$om%)wz69*1@!MOZYk{=!*_0B6>C753&x# zxC=(zc&Rv((NKopnCA-3=x0Cf4Gj&IdiMr3;}PojSnBo?r~yCgtCiL!Y((exE2{KRfNQGhO9=?Z~9=_w8J5Wk1q#bYDlM ztgUO2Z>3&NCj^RdbVJT;w#Y;LBrV0#1L^ln>?NX8bAgVeEq}vH#GH)!;bXrTQ{nqh zsie;~L(`z@I($6bx9&WpQ4nlrbU7j?uR-SzZ@PD0-R4rl1&_ND z+GjFjMcNWH&(AEtTjN3En%%-*;;Qao0e9qksg84nZk$RYU)(Rzz=CF6BIS+>-N?D< zqv|_vi_lSjG}dl@M=r_%U$#PuAGMkl2K@1^lD=rG=O5=>pg6>9xwm&rxz6g3l$7P- zFi!raONO<7ypf<7mYfUy5sCLb_)eqm+HiDN$Z??qtpJX#o~E&UAV=|<6agYTED-)2 z7AOfUP7QOP86(v5((y#~?k>_bu(TBRU{$D(zBNY}DnRejI=00z#qk$(p|0MP$UP?Z zP@NS!_x042l*xB8`9xba1|oTie(J^1O%l*99dxZem57O}L$1%cn5(JcZ{n};kp52G zKv_zX6^IgkE-~9n(pccW!{-YBjqyBW#jLyHZB-hvGWupS^24Rqqj#7}%7VEZspg%b zby{dmD7At#U-YU?`>&r!*V(lk`7#dpVoYIn^J$M@nLA)~X2D zu<#u9fJjMgu(_D{Fb_Q?5rQjbYB3^q@5{pR9CZ?&&o*DJpzv1gV}DYDY`66P1{!tr zxgKZrCVBJ$bPF2tH_UkjM+C@CMVD55E%8rFil`i<@iak@Kf(^AJ}PV9`tl$4Km`8( z5y1bY6X0K@<1p0Dtr;6C&Ox8+qr(wv?=?^7-LdXJ^-JpichvvPNDIthl~Y0kZbaG` z!q~`8G4J3V&GeP$dC-*cUzGm;oWXx<^*utZoy#EZDuZDKwn&Jd*UnN~U&gK6k(9y_ zNdl2|d}GBs&hZt+4e4>Q(Vho@=p6ea>v{d9wnf$x%dwB4m-_+tHejHZ(PhqSoiyta zL?6<48E~;oeSdLH<+F1*BuDLcl9L}R>fKP`ppMVMiam$!#cod~GPb8Ga%S_S z;JgA3a}>q;&2{%7Nz&lEJtH36U7L4?V15D=_^bLQb|b z4K(;ZvD%R3G1tg%T=$L63jm4(jKFXLMyho@o59I#pN!P%NDp5G83hJwIZ@_r}RC3`6l!(=R|zjMpk?nA-a-xszHqtA&rkL6!l=P>9E$LsmKeff-_Bt z_7L=Va&V^%1N_b~*%8GR=tQ<{RUr6X0D!l0*O!~XjXzwF=cA1a#&B#WZJ(8XuXP~Waet2Hyb{Xf1R!#z}S8&n5f+0vU+L#Eq zOWPp5LlehAoiIMG)>VvnK-=-+AmQ!3jN}Cq^|sYUNeOY>fBfV{uQuq9Cv_dtlUX%? z&zb02PXNu##7CJ(hEb-9AWp&$pr=fJ^cg^pao?qK&t4$(08+Uj#8}0lMtJ02-5+~i zkW|h4;%J@5d=!!fL}SPWhkegxEY`rPtG&Nl2z6Uth>MFdP`%5rU^AobuR&6N$My$_+vs@%nlgv*c`kuny9nWCBQ}-vTxqiU_Z1N$+iRS1oO6wrAX_;epj<4@j{lV zPLAdsWA}MKkJsQC(%aTCIFS=&@Z$cF?XE_Iue>-!;c^vcnxAY6+I*JnBD3=`%KdTl=yxDsc2I0 zZ=dD05QzQ~h}d?yFM$V2_S(sWvYI=?{8dKkAdXMF15^4k`+>p zF-#Ig#y>Frx=va2vYYV9lXTt@kqHWfv~dri9D1glZL3kHWpoMf#~2|o@gJUnQ*ii9 zVHxmTNmt@%?B=tb=3)y2*|^T_t%+PIG5cGv0baczEL7yR%k>;V z!+_hbl*Bskw1%r__b6fkOikbW+bm~eU`8qpo(57>F}Vz!0OFze;Z+yGn>z+o4Gp46 z?c~H~QlQ&PheOTCa+Ts(ZIPRUHd1f@*LuXz_fV$BaZ%Ex6O(b;EE{y6eq#=4ujK{= zEk{bWKV;#xjlBe(EH#OOr14^x<2h!RN2?k}iz^qSQV?yKFuu&u5(*itq;Qc&3JI!; zwyV!iK~ErZ^;J6&+S0eWVpMJwZlCkN9_5n1KD{EZnSec?@x6<)|MmGz^7=_+o?cR- z-$M67t<)Weckg?yYA0Yd)oRRdbNQ{8x`9Q~r&ntY%P}>#F26D1MrOgPI3E`kvelst zE7A|+lq_~438p==2_A)|8v4)pp8nEYD@cU#Fy{DHzqzB(DZG;c7vzpS(Kb;YOQ9}0 zO?jpK3#6a5qQw{uhr*Ik#v?UT(Au(GUck{fpHAGMR&=LkL{x(o3e>*rgC?;rCSA8D zhi-rX%st553j+NyZY*h`$wE3@(1%s~Y}WsJcWu^X6?l=C2aJ&BG13A9lb%eVUe z&-|VFm*zd;QdCu^+*5iDM?wM?-CE!7YV1*C9?MZ08~(hdubzj-HdY_2WhkaSbTV;- zR&Z^Y^V}?!zef`>vM{)9{p1GXxT-g^OuA5PlYWXv$}BY9!6{iE?3?=e?0)mnDX|2r z%N8?bI}b2_0{$TG6m%LY65l~6Quq$1*?tJJ)TtCn8;butyZ~^7?wfS3CBd+0?97J5 z$KYZ$X0=!vH2{_N&e1EVL2WG;pTk^Bb=n|NCUzDNkz@6z%$U=6ijPuBGF^IkUiWvq zi3`IzvGrg}E6S0wWgUeSI%vglj#leHm|aHq+S0F1N{G~b&dcJ1T8Z%-Lh zZVUyIN85t^exQNgsfLu}S8=&sG)!1}s#O((LDMH@KkP!Cj~A=*^~MtN<0wJGVR-(% ze?(1@_V9Q^T}q(+I!=0v?Dmnc+m@ia=-0510eww7IE$b z!dm+$?#sQg^@*bFq_qYr{YH+@jKCHT8c#aSP&gVzPJh1E5X$}7VfMK9vudalKI6%g zJh$K!Bo+oaDzAb!pBu2d1R4q?=Oac%xpEYdv$RXnxJMfW#vD74(6!9o$CRqC6%)o$ zr{*-UNd+X_p8cs%Q+2G22r;TX+k{d)R*oU}Gua4HnkTBKBN<4YLb_C?buukb^XSHt z3rX0T{g+J{QQ~`y0c?mw=S=*lIR$6P*ijd`z+y_p7ri-@<4se#ijE>e5jUXo%Z3538Y(JErJvO!xO+gO~P;F?)n2##N%@W$3QcOqc`p z7?yOlo+PaXxR!Na+eU*r3qM+t$l9c0Df5YJ)^~9iAj_KtYoy5swlJL=`0Sd2Kx~#g z0uD(??|>(xFBgV3ha}D5YU%|ZZZ0G|RU=`s3yxmeYzvySEHkx^qZxP{j!RMI z{f;S$lG|aW>n}U)3u$VziPw|j?VOQui0MvgDeTHx9B<7jIgF}q9eEi3`16TSW}EcJ z@E@;_2!glv@t?X0>TzBbFSP?fnz&Ra?z^h=?)IJR6{sTs=>|LoD(Dy^6B>r-5BI(U)PJsz8kchW$kfVSk+Zr&vc3D zEsyYP!Ub`pDQ@_$y9jT^Du?M7DW3dPLiFe`J8DCcl!b1WxaBM_wWW0%4gk?{GMz zy$4pA$$QfqBCdvbEt#j)`vE75PfXJ2$^^h4*{f3-j0wsMR1sNkuIq9auu&mN`Q|)?}bbYY( zhGRHaB6vsc=y$CZL21)KsJIU90vtC7%uCQ(S-p&2VE|O-%1Y&u%b9i?1XFN$3BK1b z1g)nCI2n`Mm0MUMF5L9|&wDUuVL65ncS1r&!xG#+ z2E-+0xN01$tBVXm^DDB_#M048zFtU9_fEd91H%jJnWVK%`3pm}AJkT-0iu0WrMM<*i4wHP_l~HC_--%4;6A%Q-?i7jW;# z3$kjYD!`_%04(|;dc9*ZXlb;lM&coV3uaYbs;b5df$@+b33N)+!BcuvwLrw{6lm;! zJeu&zKQ>^zwPH_{;ikaX%F0S_*X8nidiNz|63~j1UQ}wCEhBIVm~afvL+(&W9V7wP zX*Iq=NG?|NWUaanU<;+16#_2n!(V42iP)>>^%w834v!o!03aN`s;bNZ2$eVX#aUY3 zK6?ASWMKy-6K^?{`e$GcghznnBz0acXYLBI{Mk)!9UeFyyTmXPXW8n0wKn_Ga-=u`T=a_iKIsK*0df7;lTl&G)vl_eQJpT) z2?+$M|Ej2vJOI4}tJqD-5bK*ZsQ+wqu_(=iUb3y=lTaEp{#?_t1+}*A_NE+00Wx@3 z3y^zm*7BZyxS_f)@G;b<#)oyPKU?y86gJQYd_5h^z&KOMqO>BTGGi3)%aA!q3tIbaNFnxnpwbB8lI!4oC5nxsK}8P=G& zih5N3x+vyFp-h-r{DJcp(-Y)yM9nBYif;!6x-?9^i@oOkn2Rm8R7H}dLPqvm6{wfXOh^j8j+|#U2IR;I-2$^; z6_=usg6u3-u_u(+z%mSnl5EmSur}s(Ds%EPG!_ADP~lgWBswUc(4&gTBI-YsO!S@Q z0PH~&uAe;@c)1V-w{nIto#lyZL=kw)QA{!l4<-;u<)l!0kki+2!s~Ok!&0_2S#C3; z{rzdI*2&&LE!AkM>13Jqq}n3e6hmj%P;77QmdYo9<_8=D@O2DlziIne+<_O^KAE65 zLqd46kmndtgT+ujZz}z5qT{x4-YFQr5!_iw#-b{sfs4E;+0hs?@hkgx{|j(!`dhib zzBp=zD6ma8+I|a9c1W#tn4i1)Fxnmz7?bB}ehaF;vS6n90w*|uvdGw;p=4nYfg78* zhdz}{kj3@vs4aM&YkI>z#A+l$)4pX-eE3RXTR<8dfP+944+P|C7$AE7up3<1c!kAyTwSa?IK(7 z?@&&R8ttL;3>twu*M#Mf9f7dTI2kU-K{){n670Rq{-}&nX;-iY^;K*)YlSXO=g?J^ zuhPc$67;TVds_>`Gx`C0ib_z|J?ZPwhN<&f!uL!>zodcb(l6A}ieIhjvNz-FT8TBf zqGwkAm~J#8Xg$%23?F+}qfg4#eNUC9SyR-K?9s6fK=h6Y@cF*gLO zK@QHOVQkci2k{@YuWZGMyC8WZb>ky=NMi6Yr@*|f0z|GRwEfILjjxXaXs-qY6+-@) zk`Y1mn5qm034<&XB$4o5k_L`|6gZE~!ENl6*OabMYb# zv?!)yw|ah4@{{GLCm#lT=lGqaH=a)Fz5-kZU3Ken%=4Xd%ZrE0FX67n7n?;n8K6KM zcio?RvD1rkS!l7RKDbRou-F9=<3o(K&ZgXNl~xE03nuf>KKg?V@3pJ{YwmGG$zv-2 zsk?gK=BWD6wzbGBT;a=MN+`pWEZ?i!!{6`_0$ed@{U7`0nTlmV{p7Fh*3ZY3dT_Q~ zd_)Y8YS);*(mOFA*sUG}_JrR4DltpDr8!&_{MJdN&)scXJ{D!#U!81*5hZ{sX@*mx zs3j1UG^{K5K2hJ}FTVt=1P2p?lcSR3wMKdjzzDfN zX+5a*wE3;qvpftm`dN)i=_(9Hb9SIUCvr*VkzuJnd$gQ zQsY;YGr-_6!dpzozzQ}U3^iwf6Yr#O>c(3uDaz&%yT7T?{%V~(0|cfo!Gz3@Z|Kyv z2*|t!vUh0=h0r()S5daNwX}E9V@7r`6UfOc(L0wwn5q zg&55HQPF;94M2{`@QZUj-8TEb!p9vb5G|oLK;lRl2+sS~cmc24A;9(6A(A{}UFaj? z-%sDI4uU~F_hR}J0Y?g!M}!?HiL zyZk7`Kbo$!N?c4JN_B(IEjm6Ev(O_Gu(iZ_zQg5m)X%7^0m^k{mWEnSS3n45dM<_6 zWlr+Nuy5}J_T!A~`D)VZAIq^~_NmqlA#UJSl5s@G0Xx1ZujpF4Ka-%X_jHSYp_Y1N z`mib7)eqhkJoSP-NPQ{mp23Ws{hq!hW_kn=*1{ZY6gvd3R;3b{j6XtTKp@I{ztYz@ ze@@HH%34F8Ni9k$W3o^THetkBBE{^Irk1H^ygK^()u&d0sV7S%dId@`O;x0&9 zRLP>Xek`KA=07SG(HVat_!bt%f_w-PB2~?8FXsjx1|J+U=8Y~P;EfpO&K*y4IJk0+>ARpIaTczb%_yL7!V-XHY}>% z2ot#$lG*9_J#bTNR@L1}=KRj}|Ddy^sb?cnk}e515mHy zl4RxJS{z4wquj6Wl)JIxH|+AZEzWjk+>y;%31HA~qNh9~l+bVI+fyT8F7h7Crn?a9 zrUR|0?DbE*!Uv45@&#pJxVJ@UuVERxTu}X4rnu4%P-VQFZ}Tg^$4+Kv5!`cJP1e-u zod@*lG#Gn2tq9w7!e33~MqwJ6s@5CaPM)9`p1TLd0ocoBTzd zq&kM6!B%$rarqPV;$kjn3Nt(mtDC)k*7!@~8rg@{g_B>JhBFEYe(TkGwNKfXy15x; zQw_XJ-Y8PsQTPZB_fq+ky*coFQE3;Zl74rT+MWiqgIZ=O11RNk*y^}hNs}xwk5Skk z?U4TgG3a=gUsmsY#)29_rQ4i-T;@+^ms>P#Rhdca#T}WB=NLaFdkmR0$wlEWXRCdn zs<1IrQ#4fcaTh1P(s6>pne9KcR%=RtlT6WfjEJIqbG47KjJLbhWi!L;tR_CWj~687 zC-yRGp`C{;P)Uli_ezbpH?Vb|07|RG^biy$>Qu+?l<2X2$IWuzbWx^J_Xj2`A!FBK zhdkO*$`W?7#bbXIV-^|_L6CVSq@afBva--|Tezqc7zpMP_FIylU}MBigKQ*0M?_BP`RhTsP_IIRD~XVwMTe zxH9XFPl3p?Xlv@by?IJq^a@>*BTy*N;a+9NIDH~jWrjkh=+@GNc>i?k0Q*(R0S}Z1 z-(qP|ONGK)E=7ec^GN#jWgJ69+J+Qfu{Sy<`>#ga_wU5r{NydSETR}k`IHBd8J*g^ zx-e4)FmkS}9(sYE!_bd(UXQmujBmp{H@zm-hSCYvUkUzIFHwgk{=j+65WmPoe)7%n zMmFIsK}`g2KLU%bB`9%}6nL--B&Vz5P+&_bK%Zs419hF`w!`6h`~6>*h&S!;LI;r8X->`;d1P7wv5o*Nv`^(Nwj9b4n`iOJyJJ_!CoPT>`lgB; zE|eEh-S+xNNYmYp)q$JT1!c|9wR> zDn0Dx2J`2ef3ED$hv%}%=&I18eQ!bfYPM?QZ&zO{%+h~-LV(c)mH~WTD~C(%n@nRb zS6*#n`Uw_q9JsxLdB@OOSNlqB$8+XHZO%*P5ObJ-0_JIq#wRUWLMaZ_hG5>yQJ#+e z9IU{6+s4gK$_csPz&1`jo;(>kom@5wbm1^(QaZg{o({~^Nn+s(H6uj^6(ZPdcbMWs zKi2m~mNcIV@+4o1kqG}8r<0HoQZ?gDs&}E<_I}($uRgZG{}MilFdX3c3l)XA9-Z=l z9!vLriXrFW5c*uz?&{^cpsO@4;lF5dHZ}QPXwJZ#V!e7is8U2eRYF} z%lA6m0$|U4bwh9x!M@$Bn%1K~z|uxuoM(Rh0#(9B>{@6{-+jhxa^3{Adcv;#plwh3 zkFYgk2XOo-Hk73Xkrax7<@3_x%+V8Yga#irdgB-rJmQWYC0Vb zv7Vy@G(};xr^&!%@taK)kD6DGu-j)p@~C@amURO((3K0f_dnn;^c{(9`<%)w{Qyg< zG1Uso>)Akr5^Jr1bcW{!_LjeOw9LMJ&R_c0=C)>$C%s9r{>1Ss$};3D5;g>XFa*DS zx27lTQn}Jv%{$q1St8%^SmN-Yb`hBd)zIO1qgQk6j4Z=FwIF5ejK}!1U>l|i$Mvx< zQ=Zofg|U+|6&2hABW8L~9~&5^VA??BBOni13Q~~H!?;+~6{vc4tYSt-)Y=@|5(sWs zYSB{K%>=iqy2W@@s6^S3CA3G4W7aMFwaEYZrsX%XT5!K}MN-;(%PE_d+k#{U$|;gn zx0FM~P)vdZ7_8zcHj|)i-w z)FnAkfgYMX9XJ4q4Kr40a(w{KunkwC1iudw3f8N(Zt!I;`=>s<4^4oC-}lPnV+Fd> zfy&wSW7Y>dKsgLK@qY0&5Q1Mqz|Lj2h4KXYp7aKyv4kzB|oVnZl?iX5W7rZL-2n zXb-Q#kqs#*MM1^9P0nZe){*z<&Hd9TppclOKLE}953fE5qyvW<$Tztg#THv`%5y%> zRpR|=@Z&M~0M2`G)z9vBrbZQ?8Fk)JaPB@F%Pq zY^wnQLmB)QUgc5h$i*mN6V;Hw1(F)(>w=VSa7%%fA+7@PlQgCD)Le-!Uv0Kh{~wtK zs1FfJ$hW7rT;wFm!W|U6F#ICu){BB^ah9j zClM*YM$+<8db{ffHN)=ds|V-0^e3;R?d>;-{bJ}sA|)B{hfkDQg_TG+>; zako#V#V;Z2C^PvtV+SO!AaS@4Rzt^b#0~r(r0~0U9IfKvj-Z7;i(3mSELHX9Lwz7r X`U&&C_dV$Y@TVXHll~(4Ht2r=W|&a~ From 893bacfeedf390d998017db02ed290847b464fc3 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Tue, 21 Jul 2020 16:50:58 +0530 Subject: [PATCH 7/8] update scheduled trigger image --- .../src/components/Services/Events/AdhocEvents/Info/Info.tsx | 2 +- console/src/components/Services/Events/CronTriggers/Landing.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/console/src/components/Services/Events/AdhocEvents/Info/Info.tsx b/console/src/components/Services/Events/AdhocEvents/Info/Info.tsx index cecea65c7d083..1f43cb31b045f 100644 --- a/console/src/components/Services/Events/AdhocEvents/Info/Info.tsx +++ b/console/src/components/Services/Events/AdhocEvents/Info/Info.tsx @@ -37,7 +37,7 @@ const Info: React.FC = () => {
diff --git a/console/src/components/Services/Events/CronTriggers/Landing.tsx b/console/src/components/Services/Events/CronTriggers/Landing.tsx index 65456f7765fe7..a81cbd6e94156 100644 --- a/console/src/components/Services/Events/CronTriggers/Landing.tsx +++ b/console/src/components/Services/Events/CronTriggers/Landing.tsx @@ -50,7 +50,7 @@ const Landing: React.FC = props => {
From a1b368f89fb9ad9fcd46f5ec73d1a03f9eb1e3c9 Mon Sep 17 00:00:00 2001 From: Aleksandra Sikora Date: Tue, 21 Jul 2020 13:53:17 +0200 Subject: [PATCH 8/8] fix track custom function test --- console/cypress/integration/data/functions/spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/console/cypress/integration/data/functions/spec.ts b/console/cypress/integration/data/functions/spec.ts index 62361573307f3..2fe00582d854e 100644 --- a/console/cypress/integration/data/functions/spec.ts +++ b/console/cypress/integration/data/functions/spec.ts @@ -47,7 +47,6 @@ export const unTrackFunction = () => { }; export const trackFunction = () => { - cy.get(getElementFromAlias('toggle-trackable-functions')).click(); cy.get( getElementFromAlias(`add-track-function-${getCustomFunctionName(1)}`) ).should('exist');