From 9b586537576be26ee4371e7e8266b38113e94c63 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <eneiluj@posteo.net>
Date: Thu, 8 Oct 2020 11:09:29 +0200
Subject: [PATCH] fix dashboard statuses sort function

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
---
 apps/dashboard/js/dashboard.js     | Bin 1007565 -> 1007635 bytes
 apps/dashboard/js/dashboard.js.map | Bin 3091799 -> 3092044 bytes
 apps/dashboard/src/App.vue         |  13 +++++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
index f150e8365d9f90b1368aee91e117c3f91b768688..dc5a4d502cd485a56630078679e1dcc1cf3c9572 100644
GIT binary patch
delta 1250
zcmaJ<Pe>GT6lSs=$KCa<maDd@t*!g7-5qC{Sy$Iwi3-Urk^&86qcMjx(v_J>4-ypw
zMUVt$FNmm4MSl*FFm}pgAa(TKEh3@7=xD!0_l>J`_zvIqzW3hmz2E!%v1@j*>&86y
zwpWm4sUwwEB&_b?qgXZQszT|Oi@&|v%Q5U?C}Y^o;9&Ttmoo?q6%0-W7lYec?XC1J
z3z9aZsY+V4YMUX<Rcz8cHvi<Cu<r%$z|-G&H`WKhk8=kh_g_oDvshpnZ?^J2Tzt&)
z_$UAa#ZLGq0CT~jFD_1~<JuJ?J3Kl$IINm#VluHAwBEIVlcSn(oC!h@zXzd`%B=<A
z7_nRkT8K@BAV%y+6dLeU7zC1*LvYSszd8(!6wQYrOl*hrg)qD#!{vy*+mi^iQ*1qX
zDFRNCTu~5-F$49oCZbToZ3)(5GzK1$J{*GU#8`HzVJrqsWSEVCN$kRVp$<cFSO{#c
zIv*DeQ#G#|no;@-$R!}-DjNNM^!#$9@md0&d5UUgq%f)J*e8OQ+ME!ff!LS`K4PqB
z1T7KjOQf~!Qco-FBUgh2owy)E-B#&gYl(7);%_84U%v5FybnSRHu(e>N=X<d6XzG|
zt@$L>a@(d#${?d#whtr8khSIhF0aA6vi+H_WjIcT^@V#BP)N!t&`E4YfdH|!GlCbt
zDE7nlr9h=ioyM<aLI7W;?ECwag6z&??#G@sNbf2B*7TUFUm6|HwBz$ep~aeSgP8->
z=E$fa8U@`vyKx9sz8}2Y4*I<T7;?MqR#aC6?_Nzb3nvRxntoI@v`93rcbVu}a@193
b_3mV5{IK4gNM<B!<sv+#OST>u(DCChGe&?E

delta 1185
zcmaJ<Ur1AN6y|EXyKeIvm7BKIW^@1Ac6aUGsZA7uLQ*0r&>#%&*eWAU+%iI>f}rR@
z2(c4{P)|jF9z@~VQ$7Y!k3RI)TSP>G(WCtm+_}!^;d}VL^PO{k=lssxYWIh?-M5yd
z*L_YSr<q!=om#ST6OAlZ`AGXNIVpX|?Yz6*Cka#uR1549a0ti(e`AV3jetwQE#R@%
z`)UJgif$PB3x^8@%in^iRI^2gspW^<Oasqk2c7yNd#E9VAk7~{|9>rmu5y8Cx}BB-
zwE9?<=}`zn<xccFg!ypUmsBUr@xqm2PkwajT;431sj1Xf&{}MTOX8YInhhgNU&E;7
zavNbBW7Z!*E3@knB$yqIqmfQVp|G?T!C8C#-BC1gbU2DAvwx(oMDc<Rmt*#B3o&$Z
zY%}?N3@(=3aj49MfqPjKanwoMf_{o8;AQE}A>3ppvMUW^2{f}|E`buWktL;`B1x=-
zwpKlyREs6Ebgft@R{jD>DP-McV=zeGpN<ZiN#TjNtY$A=ohnSyfC?YCIiaGF*_es|
zGf^}~mWqZ7X=A6<o5ntNHEQUh6&3Z{rHAPX<sQdhX*kd90hGPe98lb(wIR>C6jU0l
z<u>@G9b>iW(8;6Qr_pru*m8e4>*&62f9Fdb$JwyCajyY`rG5il%w`RQm~EU^eDu+<
zUv?k^lTUS;K36LtdY-W_@Lk6KrfqZXr`~pS>?!}(^q4t$adbS}Nl%-UR%^K(vj^sK
j>pnSH=qb&_tuur0Np|7J5ON+Xlg9!dq4lYVBj5f2fQVpm

diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
index 9b05a25d76abf0034ab9f56a4277d6d8e4e5fdae..07b185e6408dd8c43e07cc1302117068e6f445f8 100644
GIT binary patch
delta 1712
zcmaKse`r%z6vs*0&i-&sv}yXwB-f?RwmHqxHEn9D&Sx9krYJ*LT1-1{l9x6%>1*>|
z>NH6HQ0RXm%D5B}{6i3Q8)Jg6U>OR+{uzvcV_+2==)YQ=e>kjm=cVS|msUskT<$sV
z`#tyE`|itM_ZLjRJy<aPblp-G?e4m8XJ_w?$CiuUaxvQ1cOh@_l<$bs08ZRD{@i`Z
zT;AIojcL*8Ibn8AFd=573@Jw{kPnazNF`E*R3kOWM&v_vPN+TegSj`vT+eDlX3wCS
zcvib;K5$q#@wou|g#iKNz1lcY7{l5$qz#2fh1otKBmfmsUkDHu(m1Y4(}P<6#9*jr
zHvGI6u^?7t6S7$iKd;N(t@Mdek@^Fay?F&q>OVJaR#Rnnw{J&J!0(%_nYSVJh#hG_
z8j&WX8EHYbAP&TdxDbMDMLt5@NGq}p`54)bv?1+Chgvi5>AAXQdHM|un@V$R@hCj1
zE_OMRV_*GD?CK%~i$VD4Q}PMB8-uNEZw&VH0>yl|N-w~=Du{~>#9^4ruEgOx9tk4U
z>ybJtLbYL~sRZ~9#hejvGV6e|irq`V7Tv{OCZLr^tz+OZm|RJ4^M|L$V2JMz*e_$?
z*r>NlNC(sO@3o8LaE%vhNP>q)UnZfi)Y!6_&?9lG(9W68;u>r|30`h`nuP6oq&kj)
z%~V>Wo*kM1i!Nb_3CRDyqB#XluHTaag>N{=&YgAI*}W8~?qWwH;FT4sWMxra*X)mJ
z2=ZD>X}E9IZNYJAM$7=aoC2F6n~-8zc{R(O%@Q>82&=ZSLsQVWCiT6vF7-l!Ca%H;
zf@_S0RH?C$Dw~Fb+&DZ9qlQ!KI`6Dw<e;;fJ)DL(m*odZqe?SiH{8Lz3}0_}yJ>dx
zwad*`WaH(tF1c(hpcva6QXsVE%<I{L0)D>IO9lFQ)Sorp(L~nxx%`?1%9Xwu*kvr;
zVI$kv)Dl#*oO<tD9ASLFjtFUCFJ>TM)8At*O*3Q3$zb2qx9s)^^s6V2!{6ae%6L-t
z%2Gx-{PuFF$9{)frg!B1f51{*-Y9LOK%(s=7nzJG+Ak(e$_k+=vWrl!A{~&9i<to`
zi*4<tim0ZDzFUzIm275GE3%tJQ$=4y`HXaFfp>MKpeEQ^BG4qA1<k4?q6CRgwLbxe
dou6y}E4alY{CECWk7iev0qIm%mc2v1{{Ws>N?!l~

delta 1455
zcmZvcT}V@57{}Q(o%3T;*L0@t`0d)W!!#8?N<8JFE&`(qwXi&MbDJOAbRQu`1_cIT
z5@rvgfpilTLFC1;^rEQCLMkG#0<R*vNE2_0q#gy&duCqz;Qas3|9KwH`*P0f&x@*$
z%ZsYV4|Q?XqB!y5a1Aca<|fR2*G=;A&dRQei4mPOUKCw+dMKLv(0ErJFV<GLw$#-r
zVRTAR5o#iih$r?D2}B~HA(99!kxZlzsnV2?cI}ZmavaU8X%6*}L+V~l`=mCu3icBM
z^d1$C3DDmxI0P7KcKAof*3$?bp(oOb3~6jVbNH3!P*s(yyVC8J^pe4%(o{L^qTN|j
zJ1Wc@i2a0-$Re@{6Olt4AaaR3BA+l598o|N5=BHYQ9_gwWkfk)Ar4ByytVqiycub;
zNx}=zu8Q?AU4#|cl75L$rbrCD%rj#XSE$F|T~L7fZ;*hOyTBngU`(P_yYr?U!+7gP
z9*4s&Xl3DL7fhDO5#WQO-`y8#borv^Tw++XMQuAp>9!lRDmD&qpc_i?O*f=6a~M|#
zArHBu`AMktKrUOvd!U%9vmUTA_1p)!X!nAKSx-IC#+1nmW~Q3FP{!0A&C_0Zzyhay
z%3W7{P|Ir6T*}lBAMi|V4{qv#WZ9C=^ngKe7nCq!T_5P=1kUur2vd6mTKXWL1)_Zr
zmerjnToxwv!+g=snRfsm3X9=L$Q{~!9r!E&<(T4!47nfw2B981{V>ZcO+a}G5TjZG
zki(KR&w|qd$cnL=Vw44~LC9tnEo|7;vu&*em1D@d&U(fN;5<`5qfm$ZAe@vfX=D(1
zl}<i_dT$`=9>mk{%{jQ1!zJRE5b#NIIku32m%^ZxXJLC7Y)st@E54KM(_Rll6|3_R
zXkcm}0!2*CM4+9i%?OB0jT`e#I1+_o<%iH|;7agaRCy5evO&2^@?C`THeI<0oYTS`
zY2-w%k#kD-mS92kpX+}MYnhViE9i{!0JQ&s1*W!sCz!IS_;rkKYyx4EHa7V-`#&Tb
B>skN+

diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
index 64a480e3e60..0d09bcc4537 100644
--- a/apps/dashboard/src/App.vue
+++ b/apps/dashboard/src/App.vue
@@ -180,7 +180,7 @@ export default {
 			return (status) => !(status in this.enabledStatuses) || this.enabledStatuses[status]
 		},
 		sortedAllStatuses() {
-			return Object.keys(this.allCallbacksStatus).slice().sort((a, b) => a > b)
+			return Object.keys(this.allCallbacksStatus).slice().sort(this.sortStatuses)
 		},
 		sortedPanels() {
 			return Object.values(this.panels).sort((a, b) => {
@@ -193,7 +193,7 @@ export default {
 			})
 		},
 		sortedRegisteredStatus() {
-			return this.registeredStatus.slice().sort((a, b) => a > b)
+			return this.registeredStatus.slice().sort(this.sortStatuses)
 		},
 	},
 	watch: {
@@ -352,6 +352,15 @@ export default {
 			}
 			this.saveStatuses()
 		},
+		sortStatuses(a, b) {
+			const al = a.toLowerCase()
+			const bl = b.toLowerCase()
+			return al > bl
+				? 1
+				: al < bl
+					? -1
+					: 0
+		},
 		handleScroll() {
 			if (window.scrollY > 70) {
 				document.body.classList.add('dashboard--scrolled')
-- 
GitLab