From 8cd0a5a9e2a06cb78af77ef1eaa2a187ad57c907 Mon Sep 17 00:00:00 2001 From: Joan Date: Tue, 19 Jun 2018 08:12:36 +0200 Subject: [PATCH] stackable snackbar. Updated E2E #357 --- .../src/components/snackbar/snackbar.html | 6 +- .../core/src/components/snackbar/snackbar.js | 119 ++++++++++-------- .../core/src/components/snackbar/style.scss | 42 ++++--- client/core/src/components/watcher/watcher.js | 2 +- client/core/src/lib/app.js | 9 ++ client/core/src/styles/fontello-codes.css | 1 + client/core/src/styles/fontello.woff2 | Bin 8784 -> 8848 bytes client/ticket/src/data/step-one/index.js | 2 +- e2e/helpers/extensions.js | 22 +++- .../client-module/01_create_client.spec.js | 8 +- .../client-module/02_edit_basic_data.spec.js | 2 +- .../client-module/03_edit_fiscal_data.spec.js | 4 +- .../client-module/04_edit_pay_method.spec.js | 4 +- .../client-module/05_add_address.spec.js | 6 +- .../06_add_address_notes.spec.js | 6 +- .../client-module/07_edit_web_access.spec.js | 2 +- e2e/paths/client-module/08_add_notes.spec.js | 2 +- e2e/paths/client-module/09_add_credit.spec.js | 2 +- e2e/paths/client-module/10_add_greuge.spec.js | 4 +- .../12_lock_of_verified_data.spec.js | 10 +- .../02_edit_item_basic_data.spec.js | 2 +- .../item-module/03_edit_item_tax.spec.js | 2 +- .../item-module/04_create_item_tags.spec.js | 2 +- .../item-module/05_create_item_niche.spec.js | 2 +- .../06_create_item_botanical.spec.js | 4 +- .../07_create_item_barcode.spec.js | 2 +- .../08_item_create_and_clone.spec.js | 2 +- .../01_create_ticket_observations.spec.js | 2 +- .../04_create_ticket_packages.spec.js | 10 +- .../05_create_new_tracking_state.spec.js | 6 +- 30 files changed, 172 insertions(+), 115 deletions(-) diff --git a/client/core/src/components/snackbar/snackbar.html b/client/core/src/components/snackbar/snackbar.html index 60eff1e46d..66f777d7dc 100644 --- a/client/core/src/components/snackbar/snackbar.html +++ b/client/core/src/components/snackbar/snackbar.html @@ -1,4 +1,8 @@ -
+
+ + + \ No newline at end of file diff --git a/client/core/src/components/snackbar/snackbar.js b/client/core/src/components/snackbar/snackbar.js index aeec1f12fa..cf1418903b 100644 --- a/client/core/src/components/snackbar/snackbar.js +++ b/client/core/src/components/snackbar/snackbar.js @@ -9,11 +9,50 @@ export default class Controller extends Component { constructor($element, $translate) { super($element); this.$translate = $translate; - this.shown = false; this.snackbar = $element[0].firstChild; this.$snackbar = angular.element(this.snackbar); - this.button = $element[0].querySelector('button'); - this.textNode = this.snackbar.querySelector('.text'); + } + + /** + * It creates a new snackbar notification + * @param {Object} data Snackbar data + * @return {Object} Created snackbar shape + */ + createShape(data) { + let shape = document.createElement('div'); + shape.className = 'shape'; + + let button = document.createElement('button'); + + let buttonText = data.actionText || this.$translate.instant('Hide'); + buttonText = document.createTextNode(buttonText); + button.appendChild(buttonText); + + button.addEventListener('click', () => { + this.onButtonClick(shape); + }); + + shape.appendChild(button); + + let shapeText = document.createElement('div'); + shapeText.setAttribute('class', 'text'); + shape.appendChild(shapeText); + + let text = document.createTextNode(data.message); + shapeText.appendChild(text); + + if (data.shapeType) + shape.classList.add(data.shapeType); + + let parent = this.snackbar.querySelectorAll('.shape')[0]; + + if (parent) { + this.snackbar.insertBefore(shape, parent); + } else { + this.snackbar.appendChild(shape); + } + + return shape; } /** @@ -22,24 +61,15 @@ export default class Controller extends Component { * @param {Object} data The message data */ show(data) { - if (this.shown) { - this.hide(); - this.onTransitionEnd(); - } - - this.clearTimeouts(); - this.shown = true; - this.textNode.textContent = data.message; this.actionHandler = data.actionHandler; - this.button.textContent = - data.actionText || this.$translate.instant('Hide'); + let shape = this.createShape(data); - this.timeoutId = setTimeout(() => - this.hide(), data.timeout || 6000); + setTimeout(() => + this.hide(shape), data.timeout || 6000); - this.transitionTimeout = setTimeout(() => - this.$snackbar.addClass('shown'), 30); + setTimeout(() => + shape.classList.add('shown'), 30); } /** @@ -48,52 +78,41 @@ export default class Controller extends Component { * @param {Object} data The message data */ showError(data) { + data.shapeType = 'error'; + + this.show(data); + } + + /** + * Shows a success. + * + * @param {Object} data The message data + */ + showSuccess(data) { + data.shapeType = 'success'; + this.show(data); - this.$snackbar.addClass('error'); } /** * Hides the snackbar. + * @param {Object} shape Snackbar element */ - hide() { - if (!this.shown) return; - clearTimeout(this.timeoutId); - this.shown = false; - this.hideTimeout = setTimeout(() => this.onTransitionEnd(), 250); - - this.transitionTimeout = - setTimeout(() => this.$snackbar.removeClass('shown'), 30); - } - - onTransitionEnd() { - this.$snackbar.removeClass('error'); - this.textNode.textContent = ''; - this.button.textContent = ''; - this.actionHandler = null; + hide(shape) { + setTimeout(() => shape.classList.remove('shown'), 30); + setTimeout(() => shape.remove(), 250); } onSnackbarClick(event) { this.event = event; } - onButtonClick() { - if (this.actionHandler) + onButtonClick(shape) { + if (this.actionHandler) { this.actionHandler(); - else - this.hide(); - } - - clearTimeouts() { - clearTimeout(this.timeoutId); - clearTimeout(this.hideTimeout); - clearTimeout(this.transitionTimeout); - this.timeoutId = null; - this.hideTimeout = null; - this.transitionTimeout = null; - } - - $onDestroy() { - this.clearTimeouts(); + } else { + this.hide(shape); + } } } Controller.$inject = ['$element', '$translate']; diff --git a/client/core/src/components/snackbar/style.scss b/client/core/src/components/snackbar/style.scss index f3617fe5e6..b8f863b790 100644 --- a/client/core/src/components/snackbar/style.scss +++ b/client/core/src/components/snackbar/style.scss @@ -1,38 +1,50 @@ @import "colors"; -vn-snackbar > div { - box-sizing: border-box; - background-color: #333; - color: white; + +vn-snackbar #shapes { position: fixed; bottom: 0; - left: 50%; + right: 15px; width: 20em; - margin-left: -10em; - padding: 1em; - border-top-left-radius: .2em; - border-top-right-radius: .2em; - transform: translateY(10em); - transition: transform 300ms ease-in-out; + max-height: 20.625em; z-index: 100; +} + +vn-snackbar .shape { + box-sizing: border-box; + background-color: rgba(1, 1, 1, 0.8); + color: white; + padding: 1em; + border-radius: .2em; box-shadow: 0 0 .4em rgba(1,1,1,.4); + margin-bottom: 15px; + transform: translateX(20em); + transition: transform 300ms ease-in-out; + + &.text { + text-align: center + } &.shown { - transform: translateY(0); + transform: translateX(0); } - &.notice { - background-color: #1e88e5; + + &.success { + background-color: rgba(163, 209, 49, 0.8); + color: #445911; & > button { color: rgba(1, 1, 1, 0.6); } } + &.error { - background-color: #c62828; + background-color: rgba(198, 40, 40, 0.8); & > button { color: rgba(1, 1, 1, 0.6); } } + & > button { cursor: pointer; float: right; diff --git a/client/core/src/components/watcher/watcher.js b/client/core/src/components/watcher/watcher.js index 790f76870f..f890a1977c 100644 --- a/client/core/src/components/watcher/watcher.js +++ b/client/core/src/components/watcher/watcher.js @@ -177,7 +177,7 @@ export default class Watcher extends Component { * Notifies the user that the data has been saved. */ notifySaved() { - this.vnApp.showMessage(this._.instant('Data saved!')); + this.vnApp.showSuccess(this._.instant('Data saved!')); } writeData(json, resolve) { diff --git a/client/core/src/lib/app.js b/client/core/src/lib/app.js index 07822682ae..ac744be9d8 100644 --- a/client/core/src/lib/app.js +++ b/client/core/src/lib/app.js @@ -11,19 +11,28 @@ export default class App { this.loaderStatus = 0; this.loading = false; } + showMessage(message) { if (this.snackbar) this.snackbar.show({message: message}); } + + showSuccess(message) { + if (this.snackbar) + this.snackbar.showSuccess({message: message}); + } + showError(message) { if (this.snackbar) this.snackbar.showError({message: message}); } + pushLoader() { this.loaderStatus++; if (this.loaderStatus === 1) this.loading = true; } + popLoader() { this.loaderStatus--; if (this.loaderStatus === 0) diff --git a/client/core/src/styles/fontello-codes.css b/client/core/src/styles/fontello-codes.css index d90a5615a7..34da979b0a 100644 --- a/client/core/src/styles/fontello-codes.css +++ b/client/core/src/styles/fontello-codes.css @@ -3,6 +3,7 @@ .icon-volume:before { content: '\e801'; } /* '' */ .icon-barcode:before { content: '\e802'; } /* '' */ .icon-bucket:before { content: '\e803'; } /* '' */ +.icon-reserva:before { content: '\e804'; } /* '' */ .icon-frozen:before { content: '\e808'; } /* '' */ .icon-disabled:before { content: '\e80b'; } /* '' */ .icon-invoices:before { content: '\e80c'; } /* '' */ diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2 index 50b83f934d298af056be7ae7856025f2dbb9b8ba..d1d21d7d87a55f4ce262dceed73156f0c6b70265 100644 GIT binary patch literal 8848 zcmV;BB5&PyPew8T0RR9103wh84*&oF06^dX03tR30RR9100000000000000000000 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 SVRhjb!T(2n-6z2s3Adw}q}}-d literal 8784 zcmV-WBCp+dPew8T0RR9103uKT4*&oF06-i703rAQ0RR9100000000000000000000 z0000SR0dW6gp>fyQdkVMp)UH(g)?oWw z#=P3NUr{ z1>1l9IY{U**QrwHsH&KX_P7O7(cQ84UuPxhOZseQ0WfpS*~w%HbCl-=^m%;16)^U9 zC1O$H>!}1Bplx|Ca}cZ#}l!_L=_waaq*xmmwT_WrU968-+? z%9-RZFlUixkC=sQ*@5e;s?EJ~RVPgc=d?uIk`xGY!tS8X!cCZ6=t~J?&EbjJKCLJv zMl)nijE&gI#yB^K!ndMMQPWkAjR%1LaIW_kNi$jlMf6pIocK*`6O&R%i&)%s=(heQ zn1&K&=2SZ!bLiv@Jz;+Zs3^=%TSn^pO_v-y3Cm+uyA`jBv4s6+6Wc0;MoE7Btt_wg zq;&`@y>l3=+3cQaMPaCkkl*AN!pNNutjt#2ksbiRDgXCV%ezZ^|J$DZ>(LdZLwhnx zD}Y@CB#cR4E9FbtB58Lg(m2J^Iupy+bY1I9^E$or(om9eOFwe2u z`|>h-f>+&>W#S-~#)b5>>jR+n7Gt1!6okMt_bgk36%Z)dVYQo#WT!Nh{XU5%TW*rh zyQ%1M7Ko`(AWMURt@$c&DIgyYg1qP! z!%h@A`iFM*i2VI2u<}H_P9rIc0i*eUaB|r1YtL8BL@c=2=6mw z;Zrx)OZ_|joy*U`sx@Urm^lv?ibkmI2iNK-6~oH|=Dw9P(T8(-jtJgEGLrHMoS@Xw zNB4tuMEh zHpq<#&!I(Wih#{StI}Q)AF0pK9Ma?+I@E@q9TEA*+rk`r zcAO3G^V1*9@F`q`qpQAUY?&~f+=vRg{u|a_%24vOErzCK)Yoc&>ImAZz-yyd#+hXA zTzQ^&=~h-#)MKMTfsrP86pmEfqZSg=MLb=d*qdPm2)d03oen(?r*6Vng&VvMw8hH~ z<#Kik0i&0+^yznJK2B(%&zCE;>9*Xhn8(p!Mg`M~!$KIriaD@h9_*Nb153b(rQpIc zaAP@mu)^_TOy1fS2;@Uvp^RYkpggbDl(K}LsqRF}w7V6av`jBM$^fh|9c6fJB3FiGv52&#=IX1` zCXIa`CZ0gt^_`p?rHk;>+$ST`mBOSGed(5$Q%W2)pQ7$2G8Pd%l`svJcnrrhP|TaXI5suqwG~@ktDp0_ zHomNme&P-&n}gvls95nUno{nntW`y;$A(l`3uP`8)by8EX@#2BoXYoBtGv3keL6fS z_A(v~I;~P3-RhdLN!@NEeR>}w)TrbBcB?v#LPdDdK%*sR+8srZO>rb&4a{J1Xte^~ zEDG8iUZu3c$mGDfqteK3nUQ#8kFKUgi@oP?W2+q>fNh98jNqpU6ktKf1Gb|GBgAO} zC0LO1fXyhw2zi=71s0S%U@NLHLY*d1g9R-Q*nv8X(5DGBV8O@(wx9_k%xMBGSeLGX zsIyq#PONwPNbJaggN>Ooa^cuw5W*>Gz&U9c7llsXT4%y7X~I2e!Xs(Iv(AE7(t>x= zf=|*K<14($8NDcCea(o{%{T1KtuIZ9||pZfvMQZ-&j>5M53u=G}`uSNZOQ{fQ~D>(V(hI$6~k<9wl7Ce>4~joaAZ zYmRr+X)0%LVs1#>2lr)FTE%>{dQ^)HJM|}@{gINe`XIKz$t8;NY6lMMF3FoZF>DxAb&^J&FKK z7jxo{E;x!$w_WGaD0KDJ9yG_PYhEM+pqOT~G|%A(N_Lz=2mzAVGO+sV=D$1UqDM4Ezfk|ZxUH2>%y(>o{E zjm;m1Z*LHt6Ot|)*P%CSZ%pf$MrQjsUU=ljuUCHU(1R&){4*e7*43ZfFE`ZKS6XW= z(nxfPHu5`I^sec#)^YSTa_Q%Q2)jd*As^sn7dZo+gFw_ZG4X2}G6E1WNu>ps(&p-+ zbCc@n&oGhc$UF&b*e1x8j9|W4&=x7_^w{pHfYSno9KZiS&K!IY8#f>;OkD?=LETyZI%5dy@0r&8Vt*lZXu zjp!v?OiQ&dq1}w8v>55=sLP@cKI3_?c5)gM_KTR()oAO2L-YF%2dn^N8{}uLU43YE zpEbt}*xHASNSt!YpfJ+HPE&aq^XZ)k)Eon4H^#jOBM^}m$S?z;6?}096{pE{Q=Gh% zi>K7Lvs4dfcProGdv=3FGl(<*4C+mfL7{<&OX?}-E%tog#ZHJch^KmJBHWpxm?LWj zBIEmvwn$+9uwFX|Sr$J(!ptzouEHQ^sv!KXbn>=tV66oPv>sywV6-VKRJf8FAU(>R z<}M;Mt>9BC$AMT{h~5@BX04wOViLhV>#E+7UW0*wqztmXm|v!+**O0S5xE?LY%lYp z7*YxBQP2v^FM$}qc5)GjYP08*6<1MQypsU~fs*l?XpUQCu($&&YP{C?)g}v2wkp5~ z&bLPFZL)P{X@x_pA5oX30uXpyJ&wCbWCYOmLt=n|Xz2fw%6>owi~Lm5w3U{tOI;In zB?RlUIIG!6oaFz|>KbulT9Y zh2tBAulX`GLY(iZvaUL+r&@h$nB=Y#5YIP-&*C^&W( zn-E-@D=G~g8&7}Rb)z&sw)$~3=}K#vo$4Ewaf^_a)7LTnD=DQL-)ff(KAo(roTE@} zEa#L;$Y4I$L}VIw+HEZ+c5_&6oQ7D!qo`~;u9-~@Gl>>hP4mSqL}*m%oOWAN_5Sfk zP5udm;l_AcVGlCEATYo1vmjuV>7_W>R|cS%H=m#zuP#AS=_IF==%M21{I!;8CxfR; z^eIF&juL63srXow$1fGnbmBtNaPvcRy+$b7qL@ev>MYaimew+;b^Hooy|9~3TQD}8J)~7hocw^Vlj*`7?z}ZQoqp5XxMR>)^6L*qqnd+ zSUsMZ&{SRLXX-Yefhr}sD<+h)fQiYbPdNS2INAi9Zh||VyWiTuOVV7DW zVai)tf-5V`%&laft)w!~0DNX_m0SB^rF}47a1JD_wSP}CM1DjTeW!hlzd3+_Z zfFIs^_Q{Ee6K?7SV(1O;=fg{bB)`00=CE_DPqXXI@eCeYWOK9E%;_U>Ht~_N_U%Pw zYj8%Wozj0ZD={~WAhimna{@9hrctse&yKqsgsivA4jB?$)DhIyIpXjf35X}V_?p{n zv3sy#$F;6*rNV5^$uXN1%I>afIlrU3luFSmI=WDpQb^)l-Cc?UAUs`-&l(G4xYgHr z2Aqwe%PEm)ec{Cf7jNHGFP~&zkw`yLInxyIXspTByZhyobJDu3NZ)UB^qZsfBlOXm z^b7kab=yq?>9EuPg!!f6e7N9GpFL1A4S`14@9}9*iuV$6&#CdYT9$i^#O*shEW<|= zsPW05g#Hk_YFz)^9)$m*@X~lD*I`2ZOL7#m_7S@hlTyPxe7qle6^g_UgwHZwz53yw z?&Fgd;4Ml?^sg-n3}f@^y+=I~mxk*;gJtL_ zcn)0b2=N4OjQ;)a@&{~LEKJPPiJSc6F50b7%Ls)!#?^|9x5p3?W(*<;uEa!J{`>Rz zwz@%bQu^HIle;gcbj*{i!jP$SxF+8&z zr+-&?xXfj>yaE^xhZSN|nb_E}=O*7dnUMY9xBA5C1`*LleGYN=)5PK3~im?|X@U*@<&$Pz1EEO>wKMXv%;nrNR+|fg^o0A8^WV)P(jRh>lc?H#T?o+4zK`B0k1XI#b6;Lo=D^lKOuh zyQCEUq|UANe(jMhwyU&~St)Y!tAtXV9LK%jP>NV_nps6ze={eSl*fpOBIPmi^3KLV zP5o_c{oB_9+)McFl3h&YsN!4QKy%3fb$yzXCeJAa7FGjInQ{s`{&NRa*B^>WL`1_R zwtKF=VMm5>_9#vX$A)-8tapW{jq*1U&UEQ^5#2$liF zGY7KvVz{tyIM?>|Y1A@7-J@-mP!t~kp8eulhfI`3VV!7;%K&mWjBzUg(J8I_Ch)`~ zA!K>vCPIk`>*k!-VX^6IEfzsZ`bOeZZ-rt#-dNu=;$Vw|=B}!-gjREuk-*MFosj@X z3+nqk@ksY2@*htTXk7nprvL?hR(<9Z3V>>JrivFp@Z(e)g?`9Lj5RklGM38((!kae zp7>k$Zf&!KBdAN`IFZP*qpmiL*b|iYu0aMyT9B*>l;pueplDh*6o87Iu!5%uzSmGQ zmP_|oE#v%v%rnP`j+2WgE6$%MFmf5B2{o?$7lOn4kIb8KB%->iqFttWUHjUoRn>DO zSxg_r2zW?-14Nre-_3tSvex|96f@jH15Nyg7#kY0%M`FqJ-BhsPCNJo*uvqXoTCnZ$_yLy#g{SA#XDE@g zh8b!UU1J`xBQz5?lc316i*3%%R50YIPkos4IXp0Y-fah2&M&2gRS}q4YJfn^-=Fm7 z#R-!@L$*m-LKRve=btC=u5rX4n0UX=a=mR5t?s?|!P-RIVDY)Qew61v96>=>5G@=3 zCaODjK?8w)jsUQla}wO+d##$(-Tra?2c^Ox)KTl3#Z6y8SvyX<@I~p7suX>nuwO3RMQs_UDa_og=##{1 zy9;=tksxR|t49~$bqG8H&eda(tGuul3)*)r^0XkLMhFGmL=$zTIL`C}z~@i>;U(dK2ZWUb&&2;U=)H5f+0R|i(*i9m zT{VW)t6lF@RN!}RRj_`tbMKxWuLAg4x2ql1aLc0(j?vL;VlQ-c9b&&?jk_oFw`x%OFca;>6}P=2W{*;*B(2vCh6Q;?ymjZ2c1ghlUY zAU9o==~g7&Nx3A7BGJlKRFy(c5ig6DJ4P~}*RRTDgQ$WB&YR_})K{t_+o{j{j=^*DaCV7gd!>%O|+v z%Vp*9l{li0Cw}M2DFLO(H5TSKIw_1;N)C?Qc;$EE{5e71JEy21yQRLiWERJ z#*y>vMP~4u3p0I0Y2%WTV)JRhJ_e68Wh+fxO2T|pzLCAf}s^a zrGaJsxM>gsJC$X6_f9O1o+ZZ=mg!0rx_TK!Vc~SjGxrxE@IBj7tWZC* zXut{wu1#pU00zx+dxvke_S@j0E6mJKwJlcj{$DYH&ZgRJAXfnopOs> zoij-9&cxukKZ1herXgU*AP*7Bj+7OhK}Z$aDMqz4p>=9Ur5yOe`KpV|I0Tg@2!$D9 zY&L^g5zi%I#mUIR+|2ms(BMFSUyr&B+#Yxuhq8!6H}f(Th*lWpYVHhndUtl}C2tUL z&m_biAX-p|=0$`0r(|7#a>U~K@O>iScn66jG5pUQ5SW6Wxyw!d1xg1fzw?%tOmTx~ z6s5!efDkg4J~wa(f~i0hV*G#@kDjF?UWC+w5nH_XEzSq)LPIKINUAZ z4rZ8U%uM@i{AG~fKfW-{JTnw`iHls|Jf}J3H9nBPo8NftiN_wix20joZq6c#vx#C1 zM;x$+1DjB$17pU5x%v0c74f%MCStk|UGd$?*#P7G<0;Pap0ymApT6{+${^T1H?YL< zZ?By*G(wYv2+G(yATF9&p=rpDC36E?VN(M}1o#ltB#FYMq9P!5kO~7~OojDnf>`P> zNcHUL%>35zkazm+27vUoSCL> z=j`M-@WD!Ebmvn8vM>TISyj*hkH;9ezY1dy@jF}PGIqNgGYSG<5eC3ZwL*+xXRQ$8 zkXXcxGlB%LU|xb#97kc`I<}>uRgS?sFqnbDA3p&A;m|KpxKJ6H5$uGw!*u*@yY znTR|aZCwFs>eN?|Qe`KM&DmDOfQnHo0=^Y|#f$8a9b!V)uTy%>DuHLs9=${ku0=B{wL4$Zyu zc9|Qz_zxY^u55np!3S>TMkcw6!yM!aE@#LdcCmx4Z00oh*g+tSDLCQ+4<0ZUv>zAR zmTo;)b3Y3P9W7}a6eTs=#w5{*cZnA##PXH!IAjr<4@EVwIu+UmFvbI^;M z3}Y6Ih3!UbkbZ5rSM05lQ5e_&tCDJ3tnDWd$+DpPqahjW9}p+ZtWdkHviqXJ{dnu! zvLHu7P8u&^60YH#SZg$L=F_!i~mNrbFmfd?9TP@!svv*)MI8_P7NXW=^U2S*P zoKhF1aS-KVReCLD12w23*M5kP((#UZ4u%_KU9D?hW~Qgch6nn(t)qwfWFg-kc89vI ztL7nK=XU3#w(b51I0W1STQC_kg#az!eb5`Ubty~6QVrn)`4Ps-5OHY&7j%f`SqH;b z3Qk+OyJKJj_e~mk^-Y;6Stw1J+JUd7i?5QsNI{=N<32%r)^Cv4y()UJ;})^fV!Uaw zvMrcnTS%R@r5w2yiqzuqj{)GfcJA0xQNMdf^UmfPW5xC@+sh3bH{|8U#fn3M7hvD` ztSQ?;PDwQ$bDUJj?ZyIa-JO?XJr;xX3+XE$N;2?r4V_UlG`WGbC4|yooQlx~MRKTt z(m}kBt8I1%8?;3pGc`pgXKLsaIa3p2&eZsJUg#Qbr;=0C#RxgXTn(TI4PP6ulGlfC zY?@QkbkP|vPer7@9kh+~#hV_CTQ41S?@Bb0Q)wN5ByWrtsW9AWoiHq3Uacg)GG? z$_EiQ33>!481WYD6Fnm28g>#2-HjHyegf5O-E(R5mFtniVfAfOS7njMQQ%mqon{c) zip=i5K3Y2=9|<@a2~LxhQ&BDV4^K{vYaOmT>);7N^WKE8{uKk|uDN40$Djz6T>?Hv zy0Y7_5iU7S*Y%-D3!NDZM0F@#vSuUzX#mtyRWxO z_5vn=E0>oSCnxf|g-1z z0mO1QCLIXP{#y?LRnGKL;AeJPj~04V7m@(LFwSnS12h(|M!BfrE=`0&ISN7ug27S> z7GWmJQu72yWU-JVbcKR0?z1kLMluG>JOG0%lmsMjhd>lOBp3oOAWpp{2s0TIl)#rl z;CjFRmE(`H(`3beB1-Nb~cG$107uovhqsgtjy1G3qQL@V9 zl*=n9s!*v)wOVScBPb+Qnsga5Wy!`7?QHafB7Gl%RUmP89z2jDyGPgQC1cQuF&BtY zQ1Wt{J5CpYeuvTKK=f00I*uByAf(|scD+a_(shyE3n9Q*OwzPr$PjxQHt+wgy%Bo{ zw>wTbcJV-d9ut$3aUlviQveQpz_-U&UZqD?Mg0tXJWpPc?QemsRR_Oa7<78NMGSQN zN9GGacmm6DVQrS)n=|pg*%fi?hqDAX@a)jP@C-0}Th|xJrPmv#|5h1HYu}}Q1?;6) Gjvga#3!;bs diff --git a/client/ticket/src/data/step-one/index.js b/client/ticket/src/data/step-one/index.js index 7e96eb40a8..5a9d8ab5b8 100644 --- a/client/ticket/src/data/step-one/index.js +++ b/client/ticket/src/data/step-one/index.js @@ -44,7 +44,7 @@ class Controller { return true; }, res => { if (res.data.error.message === 'NO_AGENCY_AVAILABLE') - this.vnApp.showError( + this.vnApp.showSuccess( this.$translate.instant(`There's no available agency for this landing date`) ); }); diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js index 7f146d30ef..57c33f84d1 100644 --- a/e2e/helpers/extensions.js +++ b/e2e/helpers/extensions.js @@ -188,11 +188,9 @@ Nightmare.action('waitForSnackbarReset', function(done) { }); Nightmare.action('waitForSnackbar', function(done) { - this.wait(500) - .waitForInnerText('vn-snackbar .text') - .then(value => { - this.waitForSnackbarReset() - .then(() => done(null, value)); + this.wait(500).waitForShapes('vn-snackbar .shape .text') + .then(shapes => { + done(null, shapes); }); }); @@ -202,3 +200,17 @@ Nightmare.action('waitForURL', function(hashURL, done) { }, hashURL) .then(done); }); + +Nightmare.action('waitForShapes', function(selector, done) { + this.wait(selector) + .evaluate_now(selector => { + let shapes = document.querySelectorAll(selector); + let shapesList = []; + + for (let shape of shapes) { + shapesList.push(shape.innerText); + } + + return shapesList; + }, done, selector); +}); diff --git a/e2e/paths/client-module/01_create_client.spec.js b/e2e/paths/client-module/01_create_client.spec.js index 971d5842c3..531a41b005 100644 --- a/e2e/paths/client-module/01_create_client.spec.js +++ b/e2e/paths/client-module/01_create_client.spec.js @@ -67,7 +67,7 @@ describe('Client', () => { .click(selectors.createClientView.createButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -81,7 +81,7 @@ describe('Client', () => { .click(selectors.createClientView.createButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -94,7 +94,7 @@ describe('Client', () => { .click(selectors.createClientView.createButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -105,7 +105,7 @@ describe('Client', () => { .click(selectors.createClientView.createButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/02_edit_basic_data.spec.js b/e2e/paths/client-module/02_edit_basic_data.spec.js index e8724c84af..c1645cc219 100644 --- a/e2e/paths/client-module/02_edit_basic_data.spec.js +++ b/e2e/paths/client-module/02_edit_basic_data.spec.js @@ -66,7 +66,7 @@ describe('Client', () => { .click(selectors.clientBasicData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/03_edit_fiscal_data.spec.js b/e2e/paths/client-module/03_edit_fiscal_data.spec.js index 70a7efbab9..09b020251a 100644 --- a/e2e/paths/client-module/03_edit_fiscal_data.spec.js +++ b/e2e/paths/client-module/03_edit_fiscal_data.spec.js @@ -109,7 +109,7 @@ describe('Client', () => { .click(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -118,7 +118,7 @@ describe('Client', () => { .waitToClick(selectors.clientFiscalData.acceptPropagationButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Equivalent tax spreaded'); + expect(result).toEqual(jasmine.arrayContaining(['Equivalent tax spreaded'])); }); }); diff --git a/e2e/paths/client-module/04_edit_pay_method.spec.js b/e2e/paths/client-module/04_edit_pay_method.spec.js index cc084d802e..e0e0cb0579 100644 --- a/e2e/paths/client-module/04_edit_pay_method.spec.js +++ b/e2e/paths/client-module/04_edit_pay_method.spec.js @@ -58,7 +58,7 @@ describe('Client', () => { .waitToClick(selectors.clientPayMethod.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('requires an IBAN'); + expect(result).toEqual(jasmine.arrayContaining(['requires an IBAN'])); }); }); @@ -69,7 +69,7 @@ describe('Client', () => { .waitToClick(selectors.clientPayMethod.saveButton) .waitForSnackbar() .then(result => { - expect((result === 'Notification sent!' || result === 'Data saved!')).toBeTruthy(); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!', 'Notification sent!'])); }); }); diff --git a/e2e/paths/client-module/05_add_address.spec.js b/e2e/paths/client-module/05_add_address.spec.js index 8ab306fb05..63f58a1386 100644 --- a/e2e/paths/client-module/05_add_address.spec.js +++ b/e2e/paths/client-module/05_add_address.spec.js @@ -90,7 +90,7 @@ describe('Client', () => { .waitToClick(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -102,7 +102,7 @@ describe('Client', () => { .click(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -143,7 +143,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('The default consignee can not be unchecked'); + expect(result).toEqual(jasmine.arrayContaining(['The default consignee can not be unchecked'])); }); }); }); diff --git a/e2e/paths/client-module/06_add_address_notes.spec.js b/e2e/paths/client-module/06_add_address_notes.spec.js index 15e75b088d..e8f0df0d44 100644 --- a/e2e/paths/client-module/06_add_address_notes.spec.js +++ b/e2e/paths/client-module/06_add_address_notes.spec.js @@ -65,7 +65,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('type cannot be blank'); + expect(result).toEqual(jasmine.arrayContaining(['type cannot be blank'])); }); }); @@ -77,7 +77,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -91,7 +91,7 @@ describe('Client', () => { .waitToClick(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); }); diff --git a/e2e/paths/client-module/07_edit_web_access.spec.js b/e2e/paths/client-module/07_edit_web_access.spec.js index 3b20674bb4..d0b3f7e947 100644 --- a/e2e/paths/client-module/07_edit_web_access.spec.js +++ b/e2e/paths/client-module/07_edit_web_access.spec.js @@ -54,7 +54,7 @@ describe('Client', () => { .waitToClick(selectors.clientWebAccess.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain(`Data saved!`); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/08_add_notes.spec.js b/e2e/paths/client-module/08_add_notes.spec.js index 5b3852b1a9..763bf8ea1d 100644 --- a/e2e/paths/client-module/08_add_notes.spec.js +++ b/e2e/paths/client-module/08_add_notes.spec.js @@ -62,7 +62,7 @@ describe('Client', () => { .click(selectors.clientNotes.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/09_add_credit.spec.js b/e2e/paths/client-module/09_add_credit.spec.js index fc5fe9560e..2f5366ead9 100644 --- a/e2e/paths/client-module/09_add_credit.spec.js +++ b/e2e/paths/client-module/09_add_credit.spec.js @@ -63,7 +63,7 @@ describe('Client', () => { .click(selectors.clientCredit.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/10_add_greuge.spec.js b/e2e/paths/client-module/10_add_greuge.spec.js index da6aea9e26..6af1c40732 100644 --- a/e2e/paths/client-module/10_add_greuge.spec.js +++ b/e2e/paths/client-module/10_add_greuge.spec.js @@ -63,7 +63,7 @@ describe('Client', () => { .click(selectors.clientGreuge.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Some fields are invalid'); + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); }); @@ -74,7 +74,7 @@ describe('Client', () => { .click(selectors.clientGreuge.saveButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/client-module/12_lock_of_verified_data.spec.js b/e2e/paths/client-module/12_lock_of_verified_data.spec.js index 4515e70234..f4bb173952 100644 --- a/e2e/paths/client-module/12_lock_of_verified_data.spec.js +++ b/e2e/paths/client-module/12_lock_of_verified_data.spec.js @@ -77,7 +77,7 @@ describe('Client', () => { .click(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -164,7 +164,7 @@ describe('Client', () => { .waitToClick(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -190,7 +190,7 @@ describe('Client', () => { .click(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -353,7 +353,7 @@ describe('Client', () => { .waitToClick(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -379,7 +379,7 @@ describe('Client', () => { .click(selectors.clientFiscalData.saveButton) .waitForSnackbar() .then(result => { - expect(result).toEqual('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/02_edit_item_basic_data.spec.js b/e2e/paths/item-module/02_edit_item_basic_data.spec.js index 1edf433bec..506438feb5 100644 --- a/e2e/paths/item-module/02_edit_item_basic_data.spec.js +++ b/e2e/paths/item-module/02_edit_item_basic_data.spec.js @@ -61,7 +61,7 @@ describe('Item', () => { .click(selectors.itemBasicData.submitBasicDataButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/03_edit_item_tax.spec.js b/e2e/paths/item-module/03_edit_item_tax.spec.js index 9795074a7e..ce2160fb77 100644 --- a/e2e/paths/item-module/03_edit_item_tax.spec.js +++ b/e2e/paths/item-module/03_edit_item_tax.spec.js @@ -55,7 +55,7 @@ describe('Item', () => { .click(selectors.itemTax.submitTaxButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/04_create_item_tags.spec.js b/e2e/paths/item-module/04_create_item_tags.spec.js index ec9534d120..3310049e30 100644 --- a/e2e/paths/item-module/04_create_item_tags.spec.js +++ b/e2e/paths/item-module/04_create_item_tags.spec.js @@ -56,7 +56,7 @@ describe('Item', () => { .click(selectors.itemTags.submitItemTagsButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/05_create_item_niche.spec.js b/e2e/paths/item-module/05_create_item_niche.spec.js index 137ce2e4e5..cedd35d2df 100644 --- a/e2e/paths/item-module/05_create_item_niche.spec.js +++ b/e2e/paths/item-module/05_create_item_niche.spec.js @@ -54,7 +54,7 @@ describe('Item', () => { .click(selectors.itemNiches.submitNichesButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/06_create_item_botanical.spec.js b/e2e/paths/item-module/06_create_item_botanical.spec.js index 1d22748031..0df2171529 100644 --- a/e2e/paths/item-module/06_create_item_botanical.spec.js +++ b/e2e/paths/item-module/06_create_item_botanical.spec.js @@ -54,7 +54,7 @@ describe('Item', () => { .waitToClick(selectors.itemBotanical.submitBotanicalButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -98,7 +98,7 @@ describe('Item', () => { .waitToClick(selectors.itemBotanical.submitBotanicalButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/07_create_item_barcode.spec.js b/e2e/paths/item-module/07_create_item_barcode.spec.js index c326d2ac1b..563eed7f64 100644 --- a/e2e/paths/item-module/07_create_item_barcode.spec.js +++ b/e2e/paths/item-module/07_create_item_barcode.spec.js @@ -53,7 +53,7 @@ describe('Item', () => { .waitToClick(selectors.itemBarcodes.submitBarcodesButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/item-module/08_item_create_and_clone.spec.js b/e2e/paths/item-module/08_item_create_and_clone.spec.js index 2a4e7b8cf2..91d624f75a 100644 --- a/e2e/paths/item-module/08_item_create_and_clone.spec.js +++ b/e2e/paths/item-module/08_item_create_and_clone.spec.js @@ -73,7 +73,7 @@ describe('Item', () => { .click(selectors.itemCreateView.createButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/ticket-module/01_create_ticket_observations.spec.js b/e2e/paths/ticket-module/01_create_ticket_observations.spec.js index 0e7b279750..0604abc4f1 100644 --- a/e2e/paths/ticket-module/01_create_ticket_observations.spec.js +++ b/e2e/paths/ticket-module/01_create_ticket_observations.spec.js @@ -55,7 +55,7 @@ describe('Ticket', () => { .click(selectors.ticketNotes.submitNotesButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); diff --git a/e2e/paths/ticket-module/04_create_ticket_packages.spec.js b/e2e/paths/ticket-module/04_create_ticket_packages.spec.js index c87b99705a..11fefba383 100644 --- a/e2e/paths/ticket-module/04_create_ticket_packages.spec.js +++ b/e2e/paths/ticket-module/04_create_ticket_packages.spec.js @@ -55,7 +55,7 @@ // .click(selectors.ticketPackages.savePackagesButton) // .waitForSnackbar() // .then(result => { -// expect(result).toContain('Some fields are invalid'); +// expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); // }); // }); @@ -65,7 +65,7 @@ // .click(selectors.ticketPackages.savePackagesButton) // .waitForSnackbar() // .then(result => { -// expect(result).toContain('Some fields are invalid'); +// expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); // }); // }); @@ -76,7 +76,7 @@ // .click(selectors.ticketPackages.savePackagesButton) // .waitForSnackbar() // .then(result => { -// expect(result).toContain('Some fields are invalid'); +// expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); // }); // }); @@ -88,7 +88,7 @@ // .click(selectors.ticketPackages.savePackagesButton) // .waitForSnackbar() // .then(result => { -// expect(result).toContain('Package cannot be blank'); +// expect(result).toEqual(jasmine.arrayContaining(['Package cannot be blank'])); // }); // }); @@ -100,7 +100,7 @@ // .click(selectors.ticketPackages.savePackagesButton) // .waitForSnackbar() // .then(result => { -// expect(result).toContain('Data saved!'); +// expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); // }); // }); diff --git a/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js b/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js index ce44e1b266..ac7addc2ae 100644 --- a/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js +++ b/e2e/paths/ticket-module/05_create_new_tracking_state.spec.js @@ -61,7 +61,7 @@ describe('Ticket', () => { .click(selectors.createStateView.saveStateButton) .waitForSnackbar() .then(result => { - expect(result).toContain('No changes to save'); + expect(result).toEqual(jasmine.arrayContaining(['No changes to save'])); }); }); @@ -73,7 +73,7 @@ describe('Ticket', () => { .click(selectors.createStateView.saveStateButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); @@ -94,7 +94,7 @@ describe('Ticket', () => { .click(selectors.createStateView.saveStateButton) .waitForSnackbar() .then(result => { - expect(result).toContain('Data saved!'); + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); });