From f46231573ebd2c726debae59cee33d72b621b832 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Mon, 13 Dec 2021 12:32:26 +0800 Subject: [PATCH 01/14] feat: add new node icon --- src/styles/img/api-node.png | Bin 0 -> 613 bytes src/styles/img/peer-node.png | Bin 0 -> 664 bytes src/styles/img/voting-node.png | Bin 0 -> 651 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/styles/img/api-node.png create mode 100644 src/styles/img/peer-node.png create mode 100644 src/styles/img/voting-node.png diff --git a/src/styles/img/api-node.png b/src/styles/img/api-node.png new file mode 100644 index 0000000000000000000000000000000000000000..61e503b43d42208521baa95b5dd3eb6ee68cf5a7 GIT binary patch literal 613 zcmV-r0-F7aP)khG~y;i38O<+Tad z>-CbmTmT3J0{@H1_Crw=FzyhW4s9NX4tld=V%J2@H>{+Ow;>-ZA9-z8)mo!o~;^CfP`|M0=kL{IY|mNkc=WP zEHW{+JLPPCTl}<|bLyqiO&x;Cf7y z`(t2z8_EGR;;{`*!y4R)*~6mFTQ1Kh+X zKh*a74d+3x=!V`ya}p>Q##1!B?;)3pvk`3z9n>he#1?v1$;maURxC}9Aq3Tsec8~H zeQ1xpl0(bil&?sjf}-1cbgam}%5gR7jdkD^P%Hbnyg3@mRg*jl2p3QJ2H!~sM!{Ws zC0EoOuoSs24tJFY%Tjuxl!5}Zcxf?{kt^(f81%NOH)p8Rl)8p+^5(*+E-uRHs*cn_ zU)n&Q@nC7&LMPx(=1E2}Hx1tQpJahR;1BZ!nVQ44pa^h-00000NkvXXu0mjfOoRxo literal 0 HcmV?d00001 diff --git a/src/styles/img/peer-node.png b/src/styles/img/peer-node.png new file mode 100644 index 0000000000000000000000000000000000000000..39056a0786c5d83e0b1816942930e44941e532f2 GIT binary patch literal 664 zcmV;J0%!e+P)NS!C`UYYHQ)FcaHcGr%I0 zBSJ~YiV?Lb-OjY`S5i2Un@u-(fj!A*5ujq?CxzL%f^L^e7H`kq)g1kYGXDa_7G^)> zNah_c)cP*|Db$rC{xMCEvSz5(PoFQV)dqu%@w~g@M$JE(W2PIdsZCIvEm`423vd)a zIOeR8kINUSzn-WYJu{eNU2X7Nw6~C{lDc?{r03`AdE1;-o?<08Hc^uq6Uy zBM>Kj{cA*sx8Mor@-|I;y{X8{}5?ZS)9wiG`N27T!SuU2g--CsH52UDKXQ|UyMsx zPB$Uy#mDt&fH`rshMbtnMu?rfc5FdY1XEdl^C^nsqXBGgzK(4PXORzSxIw4UQd|_D8-u9d|@} zeo-7JF~G#c|7HdwKtx493yMdIIfe34_7o?IPm1kqHaoyQA%iuA#&k4A0~sWBlm;vpRD%$rCas`$N+5)|Nh`XuVmgwyz<$}< z-5NB-B%W{L76uq~Y$JJmiUiH3b`sC;1M#cLL^qMVigo{&Sn9&<% zvu+&9+ol-p+<-8UfZ1e|R!0vWo1N7$aS-2Z@)E>q^^oN31>c%A^Q_GnGUG=)zq}2LdeTG8d<-2bOsZi0J36%O2QC550 zG{egkpp!IfO?FKG9mYTcYp=5njKoYOuaoZ}ff2$>HkiKw(Rx~IkR)K%8LlIB<{?lA z3>xAKyCrp#Owo^7=TzYE7xbHDC-$G)imU>;uf;aX9M~@@8q?93`5h*;k^2OF*XCZz l0s5`TZ}^Li+=+=h@&ll1Vyv&oc$NSF002ovPDHLkV1lB{8^Hho literal 0 HcmV?d00001 From d470c5036443bfc8a553fdd9c1786b06b9ebca84 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Tue, 14 Dec 2021 00:32:42 +0800 Subject: [PATCH 02/14] feat: add Icon field component display icon on table column --- src/components/fields/IconField.vue | 89 +++++++++++++++++++++++++ src/components/tables/TableListView.vue | 5 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/components/fields/IconField.vue diff --git a/src/components/fields/IconField.vue b/src/components/fields/IconField.vue new file mode 100644 index 000000000..3927aef48 --- /dev/null +++ b/src/components/fields/IconField.vue @@ -0,0 +1,89 @@ +/* + * + * (C) Symbol Contributors 2021 + * + * Licensed under the Apache License, Version 2.0 (the "License "); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + + + + + + diff --git a/src/components/tables/TableListView.vue b/src/components/tables/TableListView.vue index d1ed0fedc..936fb8c05 100644 --- a/src/components/tables/TableListView.vue +++ b/src/components/tables/TableListView.vue @@ -42,6 +42,7 @@ +
Show Detail @@ -116,6 +117,7 @@ import SoftwareVersion from '@/components/fields/SoftwareVersion.vue'; import Harvester from '@/components/fields/Harvester.vue'; import EpochInfoField from '@/components/fields/EpochInfoField.vue'; import MosaicFlagsField from '@/components/fields/MosaicFlagsField.vue'; +import IconField from '@/components/fields/IconField.vue'; export default { extends: TableView, @@ -136,7 +138,8 @@ export default { SoftwareVersion, Harvester, EpochInfoField, - MosaicFlagsField + MosaicFlagsField, + IconField }, props: { From 233fdad73314c7a1fae740bb0ca90afbe4bfebb1 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Tue, 14 Dec 2021 11:26:38 +0800 Subject: [PATCH 03/14] fix: replace roles type text to icon --- src/config/pages/node-list.json | 2 +- src/infrastructure/NodeService.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/config/pages/node-list.json b/src/config/pages/node-list.json index 6b081076a..8605832fd 100644 --- a/src/config/pages/node-list.json +++ b/src/config/pages/node-list.json @@ -40,7 +40,7 @@ "fields": [ "host", "friendlyName", - "roles", + "rolesIcon", "nodePublicKey", "chainInfo", "softwareVersion" diff --git a/src/infrastructure/NodeService.js b/src/infrastructure/NodeService.js index 90ca8fb67..4a66af667 100644 --- a/src/infrastructure/NodeService.js +++ b/src/infrastructure/NodeService.js @@ -129,6 +129,15 @@ class NodeService { node['softwareVersion'] = { version: el.version }; + if (el.roles) { + // convert Peer Voting node -> Peer Voting + const roles = el.roles.split(' '); + roles.pop(); + node['rolesIcon'] = Object.fromEntries(roles.map(role => [role.toLowerCase(), true])) + } + + console.log('node[] :>> ', node); + if (el.apiStatus) { const { chainHeight, finalization, lastStatusCheck, restVersion, isHttpsEnabled } = el.apiStatus; From a80ec8931ab34d8a3f641935f41b5428c51d8ee8 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Tue, 14 Dec 2021 11:46:54 +0800 Subject: [PATCH 04/14] fix: update translation --- src/config/i18n/en-us.json | 3 ++- src/config/i18n/es.json | 3 ++- src/config/i18n/ja.json | 3 ++- src/config/i18n/pt.json | 3 ++- src/config/i18n/ru.json | 3 ++- src/config/i18n/ua.json | 3 ++- src/config/i18n/zh.json | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/config/i18n/en-us.json b/src/config/i18n/en-us.json index 111ed6742..411662a9b 100644 --- a/src/config/i18n/en-us.json +++ b/src/config/i18n/en-us.json @@ -409,5 +409,6 @@ "reclaimed": "Reclaimed", "first": "First", "last": "Last", - "mosaicFlags": "Flags" + "mosaicFlags": "Flags", + "rolesIcon": "Roles" } diff --git a/src/config/i18n/es.json b/src/config/i18n/es.json index 11c3eaa64..b328e3735 100644 --- a/src/config/i18n/es.json +++ b/src/config/i18n/es.json @@ -405,5 +405,6 @@ "reclaimed": "Reclaimed", "first": "First", "last": "Last", - "mosaicFlags": "Flags" + "mosaicFlags": "Flags", + "rolesIcon": "Roles" } diff --git a/src/config/i18n/ja.json b/src/config/i18n/ja.json index 4009e3693..18ca902a0 100644 --- a/src/config/i18n/ja.json +++ b/src/config/i18n/ja.json @@ -409,5 +409,6 @@ "reclaimed": "回収", "first": "最初", "last": "最後", - "mosaicFlags": "フラグ" + "mosaicFlags": "フラグ", + "rolesIcon": "ロール" } diff --git a/src/config/i18n/pt.json b/src/config/i18n/pt.json index a79ed0d8c..6aa0f93de 100644 --- a/src/config/i18n/pt.json +++ b/src/config/i18n/pt.json @@ -405,5 +405,6 @@ "reclaimed": "Reclaimed", "first": "First", "last": "Last", - "mosaicFlags": "Flags" + "mosaicFlags": "Flags", + "rolesIcon": "Roles" } diff --git a/src/config/i18n/ru.json b/src/config/i18n/ru.json index 05f68f822..dc95f6c69 100644 --- a/src/config/i18n/ru.json +++ b/src/config/i18n/ru.json @@ -409,5 +409,6 @@ "reclaimed": "Возвращенная", "first": "Первая", "last": "Последняя", - "mosaicFlags": "Флаги" + "mosaicFlags": "Флаги", + "rolesIcon": "Роли" } diff --git a/src/config/i18n/ua.json b/src/config/i18n/ua.json index 1dbbe4ccb..8c4384a3f 100644 --- a/src/config/i18n/ua.json +++ b/src/config/i18n/ua.json @@ -405,5 +405,6 @@ "reclaimed": "Reclaimed", "first": "First", "last": "Last", - "mosaicFlags": "Flags" + "mosaicFlags": "Flags", + "rolesIcon": "Roles" } diff --git a/src/config/i18n/zh.json b/src/config/i18n/zh.json index 56180124b..85d5e0a3a 100644 --- a/src/config/i18n/zh.json +++ b/src/config/i18n/zh.json @@ -405,5 +405,6 @@ "reclaimed": "Reclaimed", "first": "First", "last": "Last", - "mosaicFlags": "Flags" + "mosaicFlags": "Flags", + "rolesIcon": "Roles" } From a2e1f1b1e22cee9dc8d081d2a4825d319e584e1a Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Wed, 12 Jan 2022 03:57:19 +0800 Subject: [PATCH 05/14] feat: add new node pin icons --- src/styles/img/pin-api-voter.png | Bin 0 -> 2231 bytes src/styles/img/pin-api.png | Bin 0 -> 2236 bytes src/styles/img/pin-peer-api-voter.png | Bin 0 -> 2477 bytes src/styles/img/pin-peer-api.png | Bin 0 -> 2144 bytes src/styles/img/pin-peer-voter.png | Bin 0 -> 2215 bytes src/styles/img/pin-peer.png | Bin 0 -> 2257 bytes src/styles/img/pin-voter.png | Bin 0 -> 2294 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/styles/img/pin-api-voter.png create mode 100644 src/styles/img/pin-api.png create mode 100644 src/styles/img/pin-peer-api-voter.png create mode 100644 src/styles/img/pin-peer-api.png create mode 100644 src/styles/img/pin-peer-voter.png create mode 100644 src/styles/img/pin-peer.png create mode 100644 src/styles/img/pin-voter.png diff --git a/src/styles/img/pin-api-voter.png b/src/styles/img/pin-api-voter.png new file mode 100644 index 0000000000000000000000000000000000000000..015e6df4130ecd6e742b8d562630aace55134f6c GIT binary patch literal 2231 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 literal 0 HcmV?d00001 diff --git a/src/styles/img/pin-peer-api.png b/src/styles/img/pin-peer-api.png new file mode 100644 index 0000000000000000000000000000000000000000..a122addf3526b4b447b2420c9711435b96ea720c GIT binary patch literal 2144 zcmV-m2%qiX00009a7bBm001F4 z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yPa>6$* z4N7mc6{=gQP1ToRn$WbdcZcVhow3JT)70JJz>aPY}_IddJN*b_I1GMB`VM{qd)mp#5d%i^52X@*L z_bR7xZ}v1mZL|<<`$>p1^ue!_1eG|TntQdfDOxLZs!#3x4CLOHkIjc3ws(9yA}}2t z`jN^H-FBPGBP#z=*+u}(R)U}kNKkAwE#d!8J@~-v+kEKb+T9&ozt_V3Z4VDylKK|< z;Jyn%F>X{3#Hd67F&rV`n)Z6L6%UxO7}V=j=B$0bbmN2+J0Kel#~B85 zv)M+XVn7S%_9jM1u>v~cUOH;SxpZqMeyjOEaeQKzvmu?tQAAX1fIi?spD3I(?Z0mC zsO*%g_8_n%BS-v1kSd6v*Z{Re%cUW2mFpaHQnQ?}I4;e1S``!sQUt{UNLh~_=kP!; z@tCul%us+O$<0poADljoVgVFbPat-!Ovuh`1u=BMjtt1Q9(Jn-J0o(fu*$Hls5WdY ziVSE6?axg8_WcpNR#>(bIrtJoC^8^NIG^yAV^8yehfIkr$n;Q%4>5!y0iyMsiiE$! z^^s+*-88AUL%LZcKm~X;Q_n1*@t#%<11b_ATK!ux^~?n4u=ZH>0!?TKR3tz`4-8q` zSp_uK(|Q*JDq4`{bz}tduFQ&iXdp?Ki8??3J?a~DM79}K97;~=ML>ZM{vjqy=WtAPO(u~+_@sZEqJYDM<^*+(4% zDiRH=!eo!2!CsOW)1%JaOL8h21| zG6u=qvStZc#}JAPNPzB(Ywe#dB2(J3>K@Kx2t@|eMv=`{x!Hl~jK!gDQfK!%hanUh z(3<;3Q%Zctb#^g!wM^(fy5pZA-HR1VZ+sM2Onsp;hD_*htM1`z45?TEu@zCU{+a7+ zL3<}h9E*Cb=S-C6hGO#v51tDhi(aV|N0-rf=_MxXVZ{cB$3!L;@!X6djYJ#hT8}Ry zKXn#sL=9q*Y;c`Ze(C|6$2^_cp~_q?A}ZD%a4Zs1d~Vv+`BHkW#)HCJR@;}KBL>C( z6JK!OtV4>9t5xSy%4)r?^&MGH9Wf{oAMj9cX`|*nm5D;~sh{E8@3h#phPut%Pl*6x zSMy~17_6+8SnB69Y;;-;vYw9+qY{gvoYjQHG1F#On<&M6Iu6Qrt+p?h<9=2;(KN&H zh*JNuX}|SyDLzOH=Z4h|Qu$P zZ`EBqM}x`t%;c7*B^*&TCUNZINd&AteiK>w=ATy-ZuNIHlaj9g#2+8s03$W!hF#=`ghC0V3a=AB*%aJZ> zt4S^1JTt0(`~4Df<;wLUD9#0AA!%(xko5P8BS(&i)zwu|tyY~zqrnM5?Ay0b+_`gy z>yA0jD(ZVCCxiC~wzjq~H8mwSH#g0e6Td$Nn_WQc^P!96Vt!raZcnf#E>l*SWOvdaxs>&1O8h;RBW;fxrY5}AwXtYN2Em3GgbJ*(=RX$X>E zDwWJ}YXAEBy04GrcRM`-;_13i!vue3X2!RU?>UFITzlU$rM@m_EK0kaDaxvNpD8*E zcB}^4axx!p22t?iK9=DMR^iSULoig)AWaFo)N`dCOS0le2bKk+6M(I)u&w5q2*`sf zoZ&(i)qxd)C#%zzVk4r5KOT)A>Rjs63o WQS{?8oq`(x0000iX00009a7bBm001F4 z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP z(?%G_pOs(of|EEQB!o$+!vto4>C`lr-f)hcP768Y(o5kJ(0qX+`UM)Uy^v0O;{cT2 z>krU$!Vzc(wbN-J8K_GF3AUx}^Q?F6jR+*RR#5T@L2oo+lh3zS#dJY~`B`^KE(^I0WS0!xy5p17|l;_>se?Wm}wsq_>7*r^L2oB?5t95dW z2{3*Us1wiwV_G0^&TW&Bj04i)P@W+$|5WM_rU=kc^ioQ?$s{DBfM)Ew=XE%DA6AXK z=2aS$VYdSk6wX6H83Xh&4fTebejT2)l1DAkK_j$%4j!kl#N1{CrTK*j*oSk1q72l^Fs zpum7EW}TxY<(|rO7vdyxkShC(v9r*D0s+GLoID4wNd0bAt-Ul5Fw6o0N`YHa{kQ_s z@(=}F3EEU3KsftXRQ;M!3jKuit{Nn0@ml+gfLV0{Q}Dp-=Hd1Ppu zcg0mHIhRCo!5fA)Wn`e}#?w462{8>pn+k2h>}^p3Xb&ZT_E0cDoc~FSY`Ux0ANN#E zUIoFw|3RAyI1aKZs-I2A(~R4&qk=flrUD+7x1xIe*?780pM1fCEkm0M1jqxotopg$ z6vR=_GzZnAcF>A_(!qrYv$#6w88l}YoH=k-piKo&9Gu^x#Xv7kEm-k_M9FzuCTNSZ zGIXH8fEchP)gK#-{AQ8Y>Zul9I4yGvI#6Ihbx4zKMVO5b#w!m!hUN^X)9E$)z<^fl zsS4+CmHHH76l!tMznFWf0mDl?7YxXQ^rGrdwp*x{BkTG8j-OG2lYV#)UZV$@iy1Fa2~wXGJ^b!qDpI zGV^W<1rUXr%jHRrsbUs=d)l?p=D93YK+62TBlI!&zgNZO3JI^R`Z51 z?<|qbLyB~$t3x7D;@d}Rb4OTL}wuiIHa!3ZV@CLZ8yhBbl&#CWH0piuC3K%zR}LF zXjgxO` z4JKXg&H`g%{G!g?tQ_EpXDi>JYsxO?XFl!VvQ1EReFB*vEq^^dr{^W67dOl|=$cu) zrd5G1C^i?=DKBBjO{tJW-NBGL6J@@6WAw%RcST5)DABthlM}``9mDB25lp@=o0*wm z%gf8GP$*cA<4{3hhYlTL>+9>(x72=G6R(rYr0?`Z(=ZE|=9sd9E#)w!Z&^0z*PLk_|B1wgEq+g-yM_4#d)0^D%@X zAR!d>oaVtvIJD05`Mg)DR0Ndq@o}EXWW01b&HMZNy|J+|58so|&(Fi@)2BIp4lcj6 z*xbmioM7RHOi{yr8l6NZTRlKOD+TDsmKz-%9RT_*ZsT|LBiIfC{aDb~1_uX6Rs0C4xi;P5|gm zcmYd-8J63JhKGk~p8@%te)&2APN`I)_eja+582pB08)@NCuPV<)6>%e(&Xf1ABM;NI9Ul@!Lcx;Ecw3i1w=9L`;gSsw=2T!HEyCdptT%@lLSevPd+D0 zucJ9fz=4)~<1HT`5o&Y*DksSU%StyXP<=A5C}7GhBG+Ig?3McyT*_$zjs)Ych{hDk zxtOdPdWjWf_xkngqED3uA$i$sR_!OYudc3oa$mX%=pqnT_B|XXctb-&p0@vv_mIxj zx4lu?HRP0|WXP!|Tt(YdlU1hZdd*a=W|pOmJc4&mI`bn>ee@~>-%cwa$;56w(IWjE=Y3} pz)n}G0Vlv)m}?RxN|b0n`X7fuWRDW*FbV(w002ovPDHLkV1hSN39kSE literal 0 HcmV?d00001 diff --git a/src/styles/img/pin-peer.png b/src/styles/img/pin-peer.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e5950126b34e12c92f8bb8f1704547e80ab034 GIT binary patch literal 2257 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 literal 0 HcmV?d00001 diff --git a/src/styles/img/pin-voter.png b/src/styles/img/pin-voter.png new file mode 100644 index 0000000000000000000000000000000000000000..138bf69156a3a8ff23fedc3fb802493679240ecc GIT binary patch literal 2294 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 Q7ytkO07*qoM6N<$f`|z-vH$=8 literal 0 HcmV?d00001 From 247b4e700188d13e1d79d23e859efff3fa23af2d Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Wed, 12 Jan 2022 04:02:21 +0800 Subject: [PATCH 06/14] feat: add new constants ROLE_TYPE_RAW --- src/config/constants.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/constants.js b/src/config/constants.js index 41f12e62b..ccd6de56d 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -152,6 +152,16 @@ class Constants { 7: 'Peer Api Voting node' } + static ROLE_TYPE_RAW = { + 'PEER': 1, + 'API': 2, + 'PEER_API': 3, + 'VOTER': 4, + 'PEER_VOTER': 5, + 'API_VOTER': 6, + 'PEER_API_VOTER': 7 + } + static AddressRestrictionFlag = { [AddressRestrictionFlag.AllowIncomingAddress]: 'Allow Incoming Addresses', [AddressRestrictionFlag.AllowOutgoingAddress]: 'Allow Outgoing Addresses', From 9e42272565fc45de96c775fe091b3dd25a1175ae Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Wed, 12 Jan 2022 04:08:50 +0800 Subject: [PATCH 07/14] fix: replace icon from the map --- src/components/NodesMap.vue | 47 +++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/components/NodesMap.vue b/src/components/NodesMap.vue index 3cf1f06ae..de6712c39 100644 --- a/src/components/NodesMap.vue +++ b/src/components/NodesMap.vue @@ -8,10 +8,14 @@ import 'leaflet/dist/leaflet.css'; import leaflet from 'leaflet'; import markerCluster from 'leaflet.markercluster'; // eslint-disable-line -import IconOrange from '../styles/img/connector_orange.png'; -import IconBlue from '../styles/img/connector_blue.png'; -import IconGreen from '../styles/img/connector_green.png'; -import IconPink from '../styles/img/connector_pink.png'; +import IconApiVoter from '../styles/img/pin-api-voter.png' +import IconApi from '../styles/img/pin-api.png' +import IconPeerApiVoter from '../styles/img/pin-peer-api-voter.png' +import IconPeerApi from '../styles/img/pin-peer-api.png' +import IconPeerVoter from '../styles/img/pin-peer-voter.png' +import IconPeer from '../styles/img/pin-peer.png' +import IconVoter from '../styles/img/pin-voter.png' +import Constants from '../config/constants'; export default { props: { @@ -66,7 +70,7 @@ export default { }, button1Style() { - return `border-radius: 3px; + return `border-radius: 3px; color: #fff; background-color: #5200c6; font-family: Noto Sans; @@ -143,10 +147,13 @@ export default { }); }; - const iconPeer = getIcon(IconBlue); - const iconVoting = getIcon(IconGreen); - const iconApi = getIcon(IconPink); - const iconApiVoting = getIcon(IconOrange); + const iconPeer = getIcon(IconPeer); + const iconVoter = getIcon(IconVoter); + const iconApi = getIcon(IconApi); + const iconApiVoter = getIcon(IconApiVoter); + const iconPeerApiVoter = getIcon(IconPeerApiVoter); + const iconPeerApi = getIcon(IconPeerApi); + const iconPeerVoter = getIcon(IconPeerVoter); const markerClusters = leaflet.markerClusterGroup({ // iconCreateFunction: this.createClusterGroup, @@ -170,17 +177,23 @@ export default { let icon = iconPeer; switch (node.rolesRaw) { - case 2: - case 3: + case Constants.ROLE_TYPE_RAW.API: icon = iconApi; break; - case 4: - case 5: - icon = iconVoting; + case Constants.ROLE_TYPE_RAW.PEER_API: + icon = iconPeerApi; + break; + case Constants.ROLE_TYPE_RAW.PEER_VOTER: + icon = iconPeerVoter; + break; + case Constants.ROLE_TYPE_RAW.VOTER: + icon = iconVoter; + break; + case Constants.ROLE_TYPE_RAW.API_VOTER: + icon = iconApiVoter; break; - case 6: - case 7: - icon = iconApiVoting; + case Constants.ROLE_TYPE_RAW.PEER_API_VOTER: + icon = iconPeerApiVoter; break; } From 91a7b7e5e0899441c862c0596649fb9f6eb17606 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Wed, 12 Jan 2022 21:57:09 +0800 Subject: [PATCH 08/14] fix: remove network and roles in pop up info --- src/components/NodesMap.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/components/NodesMap.vue b/src/components/NodesMap.vue index de6712c39..4015fa91f 100644 --- a/src/components/NodesMap.vue +++ b/src/components/NodesMap.vue @@ -8,13 +8,13 @@ import 'leaflet/dist/leaflet.css'; import leaflet from 'leaflet'; import markerCluster from 'leaflet.markercluster'; // eslint-disable-line -import IconApiVoter from '../styles/img/pin-api-voter.png' -import IconApi from '../styles/img/pin-api.png' -import IconPeerApiVoter from '../styles/img/pin-peer-api-voter.png' -import IconPeerApi from '../styles/img/pin-peer-api.png' -import IconPeerVoter from '../styles/img/pin-peer-voter.png' -import IconPeer from '../styles/img/pin-peer.png' -import IconVoter from '../styles/img/pin-voter.png' +import IconApiVoter from '../styles/img/pin-api-voter.png'; +import IconApi from '../styles/img/pin-api.png'; +import IconPeerApiVoter from '../styles/img/pin-peer-api-voter.png'; +import IconPeerApi from '../styles/img/pin-peer-api.png'; +import IconPeerVoter from '../styles/img/pin-peer-voter.png'; +import IconPeer from '../styles/img/pin-peer.png'; +import IconVoter from '../styles/img/pin-voter.png'; import Constants from '../config/constants'; export default { @@ -164,9 +164,7 @@ export default { const popup = '
' + this.getNameByKey('friendlyName') + ': ' + this.formatText(node.friendlyName) + '
' + this.getNameByKey('host') + ': ' + this.formatText(node.host) + - '
' + this.getNameByKey('roles') + ': ' + this.formatText(node.roles) + - '
' + this.getNameByKey('network') + ': ' + this.formatText(node.network) + - '
' + this.getNameByKey('address') + ': ' + this.formatText(node.address) + + '
' + this.getNameByKey('address') + ': ' + node.address + '
' + this.getNameByKey('location') + ': ' + this.formatText(node.location) + '
' + '' + this.getNameByKey('nodeDetailTitle') + From fc75f31ded9c45abbe961dc0023ed33edafe8c3e Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 05:30:26 +0800 Subject: [PATCH 09/14] feat: add mouse over on node pop up --- src/components/NodesMap.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/NodesMap.vue b/src/components/NodesMap.vue index 4015fa91f..3133e4058 100644 --- a/src/components/NodesMap.vue +++ b/src/components/NodesMap.vue @@ -197,9 +197,18 @@ export default { const m = leaflet.marker([node.coordinates.latitude, node.coordinates.longitude], { icon }); - if (this.showPopup === true) + if (this.showPopup === true) { m.bindPopup(popup); + m.on('mouseover', function (e) { + this.openPopup(); + }); + + m.on('mouseout', function (e) { + this.closePopup(); + }); + } + markerClusters.addLayer(m); } } From 31eecb6b6f4c9075f57dcd9c1297e4a38fb4991b Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 06:22:05 +0800 Subject: [PATCH 10/14] refactor: remove unused icons --- src/styles/img/connector_blue.png | Bin 1799 -> 0 bytes src/styles/img/connector_green.png | Bin 1819 -> 0 bytes src/styles/img/connector_orange.png | Bin 1861 -> 0 bytes src/styles/img/connector_pink.png | Bin 1754 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/styles/img/connector_blue.png delete mode 100644 src/styles/img/connector_green.png delete mode 100644 src/styles/img/connector_orange.png delete mode 100644 src/styles/img/connector_pink.png diff --git a/src/styles/img/connector_blue.png b/src/styles/img/connector_blue.png deleted file mode 100644 index 6a7b9df723c58dbe0cd52529215daaeb1ae0d656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1799 zcmV+i2l)7jP)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M%jY&j7RCwC#nR|>}Wf{hw_uS{qZFi^L+1)M_5L>m4no6Y*Y)n9dC<%5eV1(4F zjX+Y()(fF(vN75iXk8;UG>rjcz|u-6N)y2vQJP9fYty>8_MS$&Y}=jb?#!Gs=lXrG zf6Q)ow_O(;*DxgWOwO5P&h7U-dA|31Cx@6B??x$jm#PWg1aE>j!RJ=mYzK#41or;+ zC=A2sc3pRS9L3i|YMU~t%&%R?ch_xO45fwYdhl}m2m&Smq=dtJ-8B0rj zKN8V}@BM5U)LZ`Z^)%Z8^yJ#3&@^?P<2q0HUeFWzF^P~}K-pvJR{wh!U3YMFv?SI( zeeHh*eRIc7sHUohW8sR(^?NNverjnxZznWE8k+fwjNR57i>TZ;u&lnQ#adTHx>w4C{< zmNQ<^+w7ivTh7)MAeN!xN7XfBZsDQ6b<1YG*Q}2JWYxiyo>$!!cu_v`1)@+Ojs!$3 zA%z4pSktsY)3Sb=%jI^SKUXL{@a@~MXw7s#?(IDQwZ(#}Q>#DXf8HPQ)<d}~ zC`)u*jG+kuA_72A743|r*`Iyv#K#ZUmGP=mz0dc9eCWrBf+^5aLP`cprZ5bbc%HYl z>bgC)o!s*Bb0=QewDPaf##cXrEWU~_|9KM>T`_{9e_Jr(eS-}3V_I6*BPW6!jgUT4 zf)WRiL;wQ>0!z6th;cW7`oKNUzcuh9L_v%=oOD_;gC&ER!C)}69>w7&{lL4?tvb8X zsm$Xq-Rr+GxWh!Hz#k09g0GXN^r*I$F>)3nH-adJpwq+PkrD(;5Nd7{2w+J7J^^53 zUEq~!B^mevQ5Zvr8YnS90)Rvf8UV)kA{N;w4%hiX_4XGJ|L#{;|KVn&R?PoGkhi*x z76WlrATEW7j+Nl;|0lddXCWsd!ZZz@rCd~ZIXpf*)LSWwM`Bi%DhY%1tN}A?Ad%FO z2pHOh5EMvYydqA_77@i)h2`+!QycdoySxL|k~UD4t zCIE^&%Ub+Y-IH^(F@#@6&nz@-`vIfPT5IGId9&Sy)saLZZ$l3v@V+5n*uMfEU_b(3 z1`&Z21fVmH94OX;%nfGV z-jL`_-I?f2*@>^+I%<^zCud;g{; zJO%+!<#Cu|D^lJwbfNWP{F&FV>*r6_#?AjD_=LW=^$6^I8bQ%(Pb^5SvAfa_TKVL) zY82u0m-fILD1cO&8WzwD*Z=^Pi=>OEVTW6d-H)G)9=abp{`iAwXU-Y;guZp?BF6qv zr1>{?z2DARUrVKwd(QN|+H!W=k!j#FA}a`>%a3PkXU#sSd=q1ahjDF^!o(Y7iASk5*v)0rvF;zhQ(xI#SCdwk z<5Sfi2)vTn4D0I5U7{510<(UlJ%s3n_G2pft2`_mY)$OLj-7pPdG9%Qe5!g)6|36& z5to7rSPI}WaAtUSe*mTLt~?*iOP*0B@REA#|F<81yJD6A5i?{h5)+aPvAhG$!?!@> zlF(e9X|}$D;E(`QZ2(gda zfZ{M%Z7|1qyiJ?{XUWj!Wub*h@DLC>%+iq{t&zZ4UK+w=Ig}t)p$rpzH$Yr=pp_j+ zO>3}>Pb*&x5JMJR&~XP=bqsN-2(3~E>v{u%Pg{H#qEJL?;4Cr}z$?88wK4{1MuSC# zE(0eZ_8llkPoXWDL%BE#Sve0yw;Qk=LSC`*RnMJ5dnyff36AH(Xeh_2Rt9SspYD1! zEW)b}!&Wk=k^*gx%8D{) p)O>l>1aE>j!JFVs@OMK09so{Xafk(b&HVrX002ovPDHLkV1oZHL=6A{ diff --git a/src/styles/img/connector_green.png b/src/styles/img/connector_green.png deleted file mode 100644 index af1f4c79e8bbcdd7c78f0eaf136975e2fbe0f933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1819 zcmV+$2juvPP)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M%p-DtRRCwC#nR|@fRTam-=l&iuJ3ITDUAEhO&~{UI+ZrSm)KUd&ctjdC&^A^B zwp0VYiz~*eU_yuzKx+$PKoXEYDAw}O2$~2%jiwEnt&tXy($cP_W!>#|cV{~Dd)<4_ z@sHWv?AEdk+cgf!p2K z=YRbweBW;`l}Zm8Z5D&wJ8QGGPn3#b>Ba|^KsC^eCjMI84)oU!fIwNcvTlCuyVlis zjeTi1dxy4q@V1{Uhx?(ozMrN`K#y#C6|Uy?(4v5c=oA*|zQ>w>}(pNWAXU0XEeK+-JZ6?=atS;QXfBDQ5Z>(!} zj=p*L8(|QyjYCa3wlImUwuaY3imOJ43y)^AH4g&l`_<+lTytO3w7^$v{ua!=C4^ro zbvi@tmo4!IQq+{AMj%iyNEB zd7`Sp8nhkgh7)@rA^-$OxqWFjbL|ffuKN3o7H3clt`AGmyeLQzg$d#)K@w|dt)Y#9 z)|!GKc=yQ2$o+2|J-W;F=&I+QI_TZ`;k^KWCvgnR{_z={Ts`DR%fi)3vwkvZ*4v}@ zXi2m%B-_Er6i?J0gHj*WI=3#PtJI8hCy_B9BJrys?sbBVS$K1AP^Bxo8+n} z4nI%|io3Ge+8^&;FE6j&c?p{I`R}2Ey4ms6TCS2>uCt&(A$_t6=k<0V)mIHG8icai z1OkK!z?A^LGb8X~l+VO*f<$W=HV_h!a-p;b7zH7QKme58%^F*$O>$!thacVX($kM$ z@`o#N{L;SbqQ<1%)EZF4K*2-(KXYjRZ6~sSYJjx{L;!@QzzcKNj1@l|?(NAJhQA$i zc!91-$hKNgPQmxHXc%fk?obEZFa;r=xQ78)Z90-dw54gw0%YHxL+OG7bbSJq_mJIR zkLnj|p^iJSFaQB0lhh^vijRqFel}z9#f>X>K7Z_|d&pB?uywLYs-(r_G)5Pmz`t9L zpnh;ZI-j}-)ko_gs;v6NQWpUK0#Zk6kba^DP*gs~04s(l20&vIYiTb=L}{k5^B?Pr@G`>9lV& zwMQ`U>~5s>R?ZckqaYo>_|h$S9WwKjf1v*bjI11HUMhdJ%6?W-vVnZHN4c(b93O=h zqv*fs2&`)$!edQNYdod#cpnz*=+~qw`Z_lh)}WAnMqhX^eth38IDD3bd{)ILTle=q z4&9YN4bpkisy0fy`Vx0wQ8nt&b=`a6@2diwsha=y{9{KPK1m)whD>t5_w4pV=BADK z`3v8la^E?*U}PcrOkfM|J1_oF0HSAFb8p_8L#|~V|ey=RAshO zYkm)kDYLWpwliKo>)_+IEW94Zh*y^O&zDo!q3%A{Y0n+JtPBH0BH*c! zkOB971ZNA7G)1t+fM#j$GCSa4K&boxlg$I%8yqApA!13Og`q%|1J1(b`T_!s`=tQt zd^n22x~k3J%1T3IdmM-7&dRga8Bu zzu$u!IIyP#PF__QIL5#yhc6OfK#+MYizvw;$p>)q4#cY{aKVJ9OaeFkF}&UsGF5fJ zu!Rg;kndCw_*gwIlVc$Px)ekIB}R2i1I%CuGZer{c@^d=bQ<_r<}1EFgn2jjPF6Gek@Lw-hgGpt&QDM zovEuFa7r=A=OVdWgkper>@Ad4Pb9#JxG$fs$r$#za(vv+SwP8tTT)--80*Ah1(;eu z5F)%u9_>atc<68Y_UQVhvy(Y#?$4_^@Hy}~@Hy}~@c)PXX8@23lmqJLQ?~#B002ov JPDHLkV1fxySM&e? diff --git a/src/styles/img/connector_orange.png b/src/styles/img/connector_orange.png deleted file mode 100644 index c5fbe3dc27cc8593bb721a895f32a5dbd44b11a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1861 zcmV-L2fFx)P)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M%%Sl8*RCwC#nQM$yR~5(qYoEt`&7B8#h8gA20xi!{E!9vpQcS7Z_$UHtrLELf zP>YoYYhv2)!Sn;MYSR~{T1}}DrBG9C#1D`d(^6IQTgDIQTgD=!QMqhxwO* zT|3@{>$;OY&wEzK`YN!!vAU}IMX%(0YkoBws)k1N;+wG=SI|O0OjSf!(Kuz=ibPGe zEooOh5}UYd!&3`j-+1}wX*dIV?w&Vc+g5$aD?JnV;qoZZWFqk(YDdCNK7RGA>CJsT z1@p}<)7}^K@22iVCPP*}j~hDr{q=oz`4-ifO_Oc2YbT$tPES~`OvTyuN0l z_4b()KlJ@@dFaO!hXy(_8Ke1jNNI6jPx1L|RrZ$v+FpL(9BzHGepukvwYxCm7q6jp zl{LNVwDmn>Xcb($UX+VIr2&o=$9y+?eC+4gZ^z#xtc zbZlTWgAGFjV%v60GMRiTm&s4mFYuJli(zu({P z%sTguO((k<`+EA}X$?gLfM6-REorB}_OoM)4~$6ha;bb*5QL3Upb>|Ipqare5EhD} zXrAx;n>^23p3Y<*+qLc3-#0GWA3yx+^(g(e6PX21LexRm4r`a7So>fywm$1>cG4;Z zBvRPZ9iSKoPy`qu5D3D2MW}HbfRTaw<>00;h=)KM!w_Kz3q%A0frvPL!KfV19IhkSP*HWBW2ZvT5Em^Bx!y*k~!u~^ymaY;+1dNK>1OkK!z|8<2 z9uc?~6w+}JLB|n<L1$@B7dP-Cbe)Qa0f@m;X(9#;quCB$;k0*$Y3TYk+u?x|e|myHkmYadcnzPKeTF|hz5gGsqwh_* zyeeU1ud-YN$ElCAGkhr_9vAD zxU|>G*^+KJW(%dGP4wqSTV?GUZ2jBDA$JbT_I|)G7|NzkAv#!1sYTthsUcp6T>SOT zn-|yqb=y2B>+&N^l`#&=l<7``Sni06dYm6 ztV6ZFEtB>4Doa;#{L&^B(-KD?R+(^(-B`L4BCj^B+<#f<_lglIJ~;F%*Ws(TtVTnV zx6~^++eP5KOC3va)pf{dne&KYh=>hhwup@VfZMH?VwS2(M)Kv#Ctrv)inqqgT76>t`=tS=yy+yKA=Oq|G=f29VxETF6) zWe2ci%qcD+BIiw?1!$NcsAU&8=Kuic?QHWima;4W;aLIx;XU@u1G3CJ3QIbNB* z2KZ25BdTZ z{k;&x*mK;*$D1ajyU4JjVd=ahQNsjHU%vs8-o(!=1ScLsei^W>UY;wEaw4mc$kl;9HC zT!LbNxH1aF00{yqa4rY8-qVd>nind>s7$5&s?lSgptxyhS1R00000NkvXXu0mjfhE;A8 diff --git a/src/styles/img/connector_pink.png b/src/styles/img/connector_pink.png deleted file mode 100644 index 54694a9d72ff816955137c1210c91396ef59720c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1754 zcmV<01||84P)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M%U`a$lRCwC#nR|#_R~^Sc=e}m<&fS^Wog^!okVo?pjbIe5AXZRYTU%(&+Eh}A zK?24SB|)e!v zFZ}tbqj;XXBn-n}=~S;IbM7g1l^$=@n~kjxti`IRwmQDf{Sn=%jX)rZzQs#E+UJ)S z4CbBSCux=r|M33xIG=v|&#SpMpa-|Sf@3=i8)5yIQ8VsKB2AV^1F`n!ynO%4)hiB; zT^P@{>{J#CH#zaI|i)qxF#fj0{#&c&!o;djYi+2y59$5ykZ~Mq4f&0~7BoICz3swZ; z{VX8AuS9V}Dd_c$ZJ|wKMQONstTFPqF^)#Ll9PI81qOaD7wl|2^#3ZVj zQ=DH=AhkiE0EKNigL%il<>$vg`(j&)HyYvX%|_fCg$YqJA&wG~I3-O}QmskTRE1&q zq0!ON-6v0;9B^E9?SaRSyZ3zN5CFFYLmcN2A2TIy8Nm%DyuB3)_b#AoZ7*fD(C#KF z2Sk>}h$fTPQJZ9GtixN|o}5t_e=d$w(paMtL#8t_V-O>)B7z`@h@0x<+9+;*vJut? zx`NVu1K%}=zw*;(RE_+)Cib_%-r!)Dd^}<@8g|A%D-)daY8Ycss-?C~ zX@y(hSW?H$eosE`kFGlL(!l{)VpmvoQ+Q8f$k(StiVm=oFt2Y7@7j8Z2-7kUW3 z)I+edhx{kHaqJ4h--@T%8=S&i<_0vSF$%EFF_p`96Eydz;qD9R^?zmHp$A*Tmv;z0 z6;JUT-Q=i|F6zPC+>O1hM7BJ&>g=i=FEAxA%ws6X_jas{9SC!UkKryo7^ zgSWhXF1EJZ;WF0oDOO9B`VkMd+hiMy!t)k_VBWGA4B}*mEkD`nEDSdx{H5pC!*2_H z$?vTl#b-vwer{ZJj9%m2TvvKP5ONzra(+M7U^2e9F_grkw zJN3mjH_|8lG?cCxOvViGscx?^Rc@~@9xk5^260o=lbhaMKYqDk#Gp{pN{iW>(Hg77 zZOt{5wJ+iT6yE&@iOUVa01AVdwFTKIt}|Crm0qx{$rgdML%z6P z5i`sY_c#T&NFzzGY~49O!L=Tl&GgPW`<3xVcATc&G%HFUk)mJe9B`F0sGO-Q$JDV5 zD1%HEln_(r6t9kZ-8r2V(#}a0Z&3z{!&yUZGckRVsjD%(4}~bjY2~PArO^2G3rC+$ wyVhk_1YFJkc{L9{4?Yh*4?Yk6|A>DN08;lzhsFZD2><{907*qoM6N<$g7}b1i~s-t From a119f24b7e703adf47171c81cf0a552e9705530f Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 06:24:54 +0800 Subject: [PATCH 11/14] refactor: remove icons and color properties --- src/components/widgets/NodeStatsWidget.vue | 35 +++++----------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/src/components/widgets/NodeStatsWidget.vue b/src/components/widgets/NodeStatsWidget.vue index 4eba487dd..bc4b274da 100644 --- a/src/components/widgets/NodeStatsWidget.vue +++ b/src/components/widgets/NodeStatsWidget.vue @@ -38,10 +38,6 @@ import Card from '@/components/containers/Card.vue'; import ButtonMore from '@/components/controls/ButtonMore.vue'; import Constants from '../../config/constants'; -import IconOrange from '../../styles/img/connector_orange.png'; -import IconBlue from '../../styles/img/connector_blue.png'; -import IconGreen from '../../styles/img/connector_green.png'; -import IconPink from '../../styles/img/connector_pink.png'; export default { components: { @@ -78,50 +74,35 @@ export default { return [ { name: this.getNameByKey('allNodes'), - count: Array.from(Array(8).keys()).reduce((acc, val) => acc + (data[val] || 0)), - icon: IconBlue + count: Array.from(Array(8).keys()).reduce((acc, val) => acc + (data[val] || 0)) }, { name: Constants.RoleType[1], - count: data[1] || 0, - icon: IconBlue, - color: 'blue' + count: data[1] || 0 }, { name: Constants.RoleType[2], - count: data[2] || 0, - icon: IconPink, - color: 'pink' + count: data[2] || 0 }, { name: Constants.RoleType[3], - count: data[3] || 0, - icon: IconPink, - color: 'pink' + count: data[3] || 0 }, { name: Constants.RoleType[4], - count: data[4] || 0, - icon: IconGreen, - color: 'green' + count: data[4] || 0 }, { name: Constants.RoleType[5], - count: data[5] || 0, - icon: IconGreen, - color: 'green' + count: data[5] || 0 }, { name: Constants.RoleType[6], - count: data[6] || 0, - icon: IconOrange, - color: 'orange' + count: data[6] || 0 }, { name: Constants.RoleType[7], - count: data[7] || 0, - icon: IconOrange, - color: 'orange' + count: data[7] || 0 } ]; }, From 366cc9f8df6d9c38116b7efcb87d312083e3488a Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 06:30:11 +0800 Subject: [PATCH 12/14] fix: rename label text --- src/config/constants.js | 14 +++++++------- src/config/filters.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config/constants.js b/src/config/constants.js index ccd6de56d..9b7487256 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -143,13 +143,13 @@ class Constants { } static RoleType = { - 1: 'Peer node', - 2: 'Api node', - 3: 'Peer Api node', - 4: 'Voting node', - 5: 'Peer Voting node', - 6: 'Api Voting node', - 7: 'Peer Api Voting node' + 1: 'Peer', + 2: 'Api', + 3: 'Peer Api', + 4: 'Voter', + 5: 'Peer Voter', + 6: 'Api Voter', + 7: 'Peer Api Voter' } static ROLE_TYPE_RAW = { diff --git a/src/config/filters.js b/src/config/filters.js index b972cc8d1..a1ba4e3b3 100644 --- a/src/config/filters.js +++ b/src/config/filters.js @@ -282,7 +282,7 @@ export const mosaicRestriction = [ export const nodeRoles = [ { - label: 'All Nodes', + label: 'Show All', icon: '', value: { rolesRaw: null From 5f8c4a3300d501007273260218dad67185c19184 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 06:35:53 +0800 Subject: [PATCH 13/14] feat: add node map "legends" --- src/components/widgets/NodesMapWidget.vue | 137 +++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/src/components/widgets/NodesMapWidget.vue b/src/components/widgets/NodesMapWidget.vue index d5c18e748..9cdb82342 100644 --- a/src/components/widgets/NodesMapWidget.vue +++ b/src/components/widgets/NodesMapWidget.vue @@ -28,6 +28,27 @@ /> + +
+ +
+ +
+
+ + {{ getNodeRoleName(item.rolesRaw) }} ({{ item.count }}) +
+
+ @@ -36,6 +57,14 @@ import Card from '@/components/containers/Card.vue'; import NodesMap from '@/components/NodesMap.vue'; import DropdownFilter from '@/components/controls/DropdownFilter.vue'; +import IconApiVoter from '../../styles/img/pin-api-voter.png'; +import IconApi from '../../styles/img/pin-api.png'; +import IconPeerApiVoter from '../../styles/img/pin-peer-api-voter.png'; +import IconPeerApi from '../../styles/img/pin-peer-api.png'; +import IconPeerVoter from '../../styles/img/pin-peer-voter.png'; +import IconPeer from '../../styles/img/pin-peer.png'; +import IconVoter from '../../styles/img/pin-voter.png'; +import Constants from '../../config/constants'; export default { components: { @@ -113,6 +142,76 @@ export default { filterOptions() { return this.manager.filterOptions; + }, + + getRolesCounter() { + const rolesCounter = { + peer: 0, + apiVoter: 0, + api: 0, + peerApiVoter: 0, + peerApi: 0, + peerVoter: 0, + voter: 0 + }; + + if (this.nodeList.length !== 0) { + this.nodeList.forEach(node => { + if (node.rolesRaw === Constants.ROLE_TYPE_RAW.PEER) + rolesCounter.peer++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.API) + rolesCounter.api++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.PEER_API) + rolesCounter.peerApi++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.VOTER) + rolesCounter.voter++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.PEER_VOTER) + rolesCounter.peerVoter++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.API_VOTER) + rolesCounter.apiVoter++; + else if (node.rolesRaw === Constants.ROLE_TYPE_RAW.PEER_API_VOTER) + rolesCounter.peerApiVoter++; + }); + } + + return rolesCounter; + }, + + mapLegends() { + const rolesCounter = this.getRolesCounter; + + const legends = [{ + rolesRaw: Constants.ROLE_TYPE_RAW.PEER, + iconUrl: IconPeer, + count: rolesCounter.peer + }, + { + rolesRaw: Constants.ROLE_TYPE_RAW.API, + iconUrl: IconApi, + count: rolesCounter.api + }, { + rolesRaw: Constants.ROLE_TYPE_RAW.VOTER, + iconUrl: IconVoter, + count: rolesCounter.voter + }, { + rolesRaw: Constants.ROLE_TYPE_RAW.PEER_VOTER, + iconUrl: IconPeerVoter, + count: rolesCounter.peerVoter + }, { + rolesRaw: Constants.ROLE_TYPE_RAW.API_VOTER, + iconUrl: IconApiVoter, + count: rolesCounter.apiVoter + }, { + rolesRaw: Constants.ROLE_TYPE_RAW.PEER_API, + iconUrl: IconPeerApi, + count: rolesCounter.peerApi + }, { + rolesRaw: Constants.ROLE_TYPE_RAW.PEER_API_VOTER, + iconUrl: IconPeerApiVoter, + count: rolesCounter.peerApiVoter + }]; + + return this.filterIndex === 0 ? legends : legends.filter(legend => legend.rolesRaw === this.filterIndex); } }, @@ -133,12 +232,16 @@ export default { 'Failed to change filter value. "changeFilterValue" is not a function' ); } + }, + + getNodeRoleName(rolesRaw) { + return Constants.RoleType[rolesRaw].replaceAll(' ', ' + '); } } }; - From 10d9975a6b59e65176215e5d6dd410003a783907 Mon Sep 17 00:00:00 2001 From: AnthonyLaw Date: Thu, 13 Jan 2022 06:36:34 +0800 Subject: [PATCH 14/14] fix: removed top right node filter drop down --- src/components/widgets/NodesMapWidget.vue | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/components/widgets/NodesMapWidget.vue b/src/components/widgets/NodesMapWidget.vue index 9cdb82342..c04c33e2d 100644 --- a/src/components/widgets/NodesMapWidget.vue +++ b/src/components/widgets/NodesMapWidget.vue @@ -4,17 +4,6 @@ {{getNameByKey(title)}} -