linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add grafana icon to links, refactor svgs, link to ResourceDetail component (#1482) 

This PR started out as a PR to link to our Resource Detail dashboard in 
addition to grafana in the resource list pages, but I decided to refactor 
the way we deal with our svgs since I was here.

This branch:
- modifies the GrafanaLink component to consist of the grafana icon 
that links to grafana adds links to the ResourceDetail page in all our metrics tables
- adds a jsx component we can use to wrap svgs so that we don't get 
annoying 404s on images that we have to handle
- remove the relative paths hack for images
- removes unused svg files in /img
This commit is contained in:
Risha Mars 2018-08-17 15:12:33 -07:00 committed by GitHub
parent 3e73c096e9
commit d1ab629953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 604 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/app/css/styles.css
View File

@ -143,27 +143,6 @@ h2, h3, h4, h5, h6 {
padding: 8px 0;
}
/* fancy borders */
.border-container {
padding: var(--base-width);
background-repeat: space;
margin-bottom: calc(var(--base-width)*2);
}
.border-container-content {
overflow: hidden;
padding: var(--base-width);
background-color: white;
}
.border-container.border-bad {
background-image: url(./../img/red_check.png);
}
.border-container.border-good {
background-image: url(./../img/green_check.png);
}
.border-container.border-neutral {
background-image: url(./../img/grey_check.png);
}
.error-message-container {
overflow: auto;
width: 100%;

127
web/app/css/svg-wrappers.css Normal file
View File

@ -0,0 +1,127 @@
/* image styles for images in SvgWrappers.jsx */
.grafana-st0{fill:url(#SVGID_1_grafana);}
/* linkerd logo only */
.linkerd-logo-only {
& .st0{fill:url(#SVGID_1_);}
& .st1{fill:url(#SVGID_2_);}
& .st2{fill:#2BEDA7;}
& .st3{fill:url(#SVGID_3_);}
& .st4{fill:url(#SVGID_4_);}
& .st5{fill:url(#SVGID_5_);}
& .st6{fill:url(#SVGID_6_);}
& .st7{fill:url(#SVGID_7_);}
& .st8{fill:url(#SVGID_8_);}
}
/* linkerd word logo */
.linkerd-word-logo {
& .st0{fill:#FF576B;}
& .st1{fill:#6D6E71;}
& .st2{fill:#FFFFFF;}
& .st3{fill:url(#SVGID_1_);}
& .st4{fill:url(#SVGID_2_);}
& .st5{fill:#2BEDA7;}
& .st6{fill:url(#SVGID_3_);}
& .st7{fill:url(#SVGID_4_);}
& .st8{fill:url(#SVGID_5_);}
& .st9{fill:url(#SVGID_6_);}
& .st10{fill:url(#SVGID_7_);}
& .st11{fill:url(#SVGID_8_);}
& .st12{fill:url(#SVGID_9_);}
& .st13{fill:url(#SVGID_10_);}
& .st14{fill:url(#SVGID_11_);}
& .st15{fill:url(#SVGID_12_);}
& .st16{fill:url(#SVGID_13_);}
& .st17{fill:url(#SVGID_14_);}
& .st18{fill:url(#SVGID_15_);}
& .st19{fill:url(#SVGID_16_);}
& .st20{fill:url(#SVGID_17_);}
& .st21{fill:url(#SVGID_18_);}
& .st22{fill:url(#SVGID_19_);}
& .st23{fill:url(#SVGID_20_);}
& .st24{fill:url(#SVGID_21_);}
& .st25{fill:url(#SVGID_22_);}
& .st26{fill:url(#SVGID_23_);}
& .st27{fill:url(#SVGID_24_);}
& .st28{filter:url(#Adobe_OpacityMaskFilter);}
& .st29{mask:url(#mask-2_6_);}
& .st30{fill:#018AFD;}
& .st31{fill:#00A2FD;}
& .st32{fill:#06C0FD;}
& .st33{fill:#03B5FD;}
& .st34{fill:#0074FD;}
& .st35{fill:#005CFD;}
& .st36{filter:url(#Adobe_OpacityMaskFilter_1_);}
& .st37{mask:url(#mask-4_6_);fill:#003CFD;}
& .st38{fill:#0E13FD;}
& .st39{filter:url(#Adobe_OpacityMaskFilter_2_);}
& .st40{mask:url(#mask-2_5_);fill:#FFFFFF;}
& .st41{filter:url(#Adobe_OpacityMaskFilter_3_);}
& .st42{mask:url(#mask-4_5_);fill:#003CFD;}
& .st43{filter:url(#Adobe_OpacityMaskFilter_4_);}
& .st44{mask:url(#mask-2_1_);fill:#FFFFFF;}
& .st45{filter:url(#Adobe_OpacityMaskFilter_5_);}
& .st46{mask:url(#mask-4_4_);fill:#FFFFFF;}
& .st47{fill:#018BFE;}
& .st48{fill:#02C2FE;}
& .st49{fill:#04B6FE;}
& .st50{fill:#0095FE;}
& .st51{fill:#0074FE;}
& .st52{fill:#005CFE;}
& .st53{fill:#003DFE;}
& .st54{fill:#0E13FE;}
& .st55{filter:url(#Adobe_OpacityMaskFilter_6_);}
& .st56{mask:url(#mask-2_7_);}
& .st57{filter:url(#Adobe_OpacityMaskFilter_7_);}
& .st58{mask:url(#mask-2_2_);fill:#FFFFFF;}
& .st59{filter:url(#Adobe_OpacityMaskFilter_8_);}
& .st60{mask:url(#mask-4_3_);fill:#003CFD;}
& .st61{filter:url(#Adobe_OpacityMaskFilter_9_);}
& .st62{mask:url(#mask-4_7_);fill:#003CFD;}
& .st63{filter:url(#Adobe_OpacityMaskFilter_10_);}
& .st64{mask:url(#mask-4_1_);fill:#003CFD;}
& .st65{fill:url(#SVGID_25_);}
& .st66{fill:url(#SVGID_26_);}
& .st67{fill:url(#SVGID_27_);}
& .st68{fill:url(#SVGID_28_);}
& .st69{fill:url(#SVGID_29_);}
& .st70{fill:url(#SVGID_30_);}
& .st71{fill:url(#SVGID_31_);}
& .st72{fill:url(#SVGID_32_);}
& .st73{fill:url(#SVGID_33_);}
& .st74{fill:url(#SVGID_34_);}
& .st75{fill:url(#SVGID_35_);}
& .st76{fill:url(#SVGID_36_);}
& .st77{fill:url(#SVGID_37_);}
& .st78{fill:url(#SVGID_38_);}
& .st79{fill:url(#SVGID_39_);}
& .st80{fill:url(#SVGID_40_);}
& .st81{fill:url(#SVGID_41_);}
& .st82{fill:url(#SVGID_42_);}
& .st83{fill:url(#SVGID_43_);}
& .st84{fill:url(#SVGID_44_);}
& .st85{fill:url(#SVGID_45_);}
& .st86{fill:url(#SVGID_46_);}
& .st87{fill:url(#SVGID_47_);}
& .st88{fill:url(#SVGID_48_);}
& .st89{fill:url(#SVGID_49_);}
& .st90{fill:url(#SVGID_50_);}
& .st91{fill:url(#SVGID_51_);}
& .st92{fill:url(#SVGID_52_);}
& .st93{fill:url(#SVGID_53_);}
& .st94{fill:url(#SVGID_54_);}
& .st95{fill:url(#SVGID_55_);}
& .st96{fill:url(#SVGID_56_);}
& .st97{fill:url(#SVGID_57_);}
& .st98{fill:url(#SVGID_58_);}
& .st99{fill:url(#SVGID_59_);}
& .st100{fill:url(#SVGID_60_);}
& .st101{fill:url(#SVGID_61_);}
& .st102{fill:url(#SVGID_62_);}
& .st103{fill:url(#SVGID_63_);}
& .st104{fill:url(#SVGID_64_);}
& .st105{display:none;}
& .st106{display:inline;}
}

BIN
web/app/img/green_check.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 153 B

BIN
web/app/img/grey_check.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 145 B

77
web/app/img/logo-only.svg
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="linkerd-logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 138.9 129.2" style="enable-background:new 0 0 138.9 129.2;" xml:space="preserve">
<style type="text/css">
.st0{fill:url(#SVGID_1_);}
.st1{fill:url(#SVGID_2_);}
.st2{fill:#2BEDA7;}
.st3{fill:url(#SVGID_3_);}
.st4{fill:url(#SVGID_4_);}
.st5{fill:url(#SVGID_5_);}
.st6{fill:url(#SVGID_6_);}
.st7{fill:url(#SVGID_7_);}
.st8{fill:url(#SVGID_8_);}
</style>
<g>
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="130.52" y1="24.5322" x2="130.52" y2="79.4914">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<polygon class="st0" points="125.9,24.5 125.9,74.2 135.1,79.5 135.1,29.8 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.7799" y1="24.5335" x2="7.7799" y2="79.4947">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<polygon class="st1" points="3.2,79.5 12.4,74.2 12.4,24.5 3.2,29.8 "/>
</g>
<g>
<polygon class="st2" points="48.1,79 90.2,103.3 90.2,92.8 50.8,70 48.1,71.5 48.1,71.5 "/>
<path class="st2" d="M92.6,117.4L48.1,91.7v10.6l11.9,6.9l-14.3,8.3c-1,0.6-1,1.9,0,2.5l7,4l16.5-9.5l16.5,9.5l7-4
C93.6,119.4,93.6,118,92.6,117.4z"/>
</g>
<g>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="130.52" y1="48.8613" x2="130.52" y2="99.6342">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st3" d="M125.9,54.1v44c0,1.1,1.2,1.8,2.2,1.3l6.3-3.6c0.4-0.3,0.7-0.7,0.7-1.3V48.9L125.9,54.1z"/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="110.3679" y1="60.4958" x2="110.3679" y2="111.2687">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st4" d="M108,111.1l5.9-3.4c0.7-0.4,1.1-1.1,1.1-1.9V60.5l-9.2,5.3v44C105.8,110.9,107,111.6,108,111.1z"/>
<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="90.216" y1="72.1296" x2="90.216" y2="123.959">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st5" d="M85.6,124l8.4-4.9c0.4-0.3,0.7-0.7,0.7-1.3V72.1l-9.2,5.3V124z"/>
<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.0885" y1="72.1297" x2="48.0885" y2="123.9582">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st6" d="M44.2,119.1l8.4,4.9V77.4l-9.2-5.3v45.7C43.5,118.4,43.8,118.8,44.2,119.1z"/>
<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="27.9367" y1="60.4955" x2="27.9367" y2="111.2685">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st7" d="M24.4,107.7l5.9,3.4c1,0.6,2.2-0.1,2.2-1.3v-44l-9.2-5.3v45.3C23.4,106.6,23.8,107.3,24.4,107.7z"/>
<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="7.7849" y1="48.8605" x2="7.7849" y2="99.6335">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st8" d="M4.3,96l5.9,3.4c1,0.6,2.2-0.1,2.2-1.3v-44l-9.2-5.3v45.3C3.2,94.9,3.6,95.6,4.3,96z"/>
</g>
<g>
<path class="st2" d="M135.1,29.8l-9.2-5.3l-16.5,9.5l-11-6.3l14.3-8.3c1-0.6,1-1.9,0-2.5l-5.9-3.4c-0.7-0.4-1.5-0.4-2.2,0
l-15.4,8.9l-11-6.3l14.3-8.3c1-0.6,1-1.9,0-2.5l-5.9-3.4c-0.7-0.4-1.5-0.4-2.2,0l-15.4,8.9L53.7,1.9c-0.7-0.4-1.5-0.4-2.2,0
l-5.9,3.4c-1,0.6-1,1.9,0,2.5l80.3,46.3l9.2-5.3l-16.5-9.5L135.1,29.8z"/>
<path class="st2" d="M31.4,13.5l-5.9,3.4c-1,0.6-1,1.9,0,2.5l80.3,46.3l9.2-5.3l-81.4-47C32.9,13.1,32.1,13.1,31.4,13.5z"/>
<polygon class="st2" points="3.2,29.8 19.7,39.3 3.2,48.9 12.4,54.2 28.9,44.6 39.8,51 23.4,60.5 32.5,65.8 49,56.3 60,62.6
43.5,72.1 52.7,77.4 69.1,67.9 85.6,77.4 94.8,72.1 12.4,24.5 "/>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
web/app/img/red_check.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 149 B

BIN
web/app/img/reversed_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
web/app/img/sidebar-bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 74 KiB

197
web/app/img/word-logo.svg
View File

@ -1,197 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 1092.4 233.7" style="enable-background:new 0 0 1092.4 233.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF576B;}
.st1{fill:#6D6E71;}
.st2{fill:#FFFFFF;}
.st3{fill:url(#SVGID_1_);}
.st4{fill:url(#SVGID_2_);}
.st5{fill:#2BEDA7;}
.st6{fill:url(#SVGID_3_);}
.st7{fill:url(#SVGID_4_);}
.st8{fill:url(#SVGID_5_);}
.st9{fill:url(#SVGID_6_);}
.st10{fill:url(#SVGID_7_);}
.st11{fill:url(#SVGID_8_);}
.st12{fill:url(#SVGID_9_);}
.st13{fill:url(#SVGID_10_);}
.st14{fill:url(#SVGID_11_);}
.st15{fill:url(#SVGID_12_);}
.st16{fill:url(#SVGID_13_);}
.st17{fill:url(#SVGID_14_);}
.st18{fill:url(#SVGID_15_);}
.st19{fill:url(#SVGID_16_);}
.st20{fill:url(#SVGID_17_);}
.st21{fill:url(#SVGID_18_);}
.st22{fill:url(#SVGID_19_);}
.st23{fill:url(#SVGID_20_);}
.st24{fill:url(#SVGID_21_);}
.st25{fill:url(#SVGID_22_);}
.st26{fill:url(#SVGID_23_);}
.st27{fill:url(#SVGID_24_);}
.st28{filter:url(#Adobe_OpacityMaskFilter);}
.st29{mask:url(#mask-2_6_);}
.st30{fill:#018AFD;}
.st31{fill:#00A2FD;}
.st32{fill:#06C0FD;}
.st33{fill:#03B5FD;}
.st34{fill:#0074FD;}
.st35{fill:#005CFD;}
.st36{filter:url(#Adobe_OpacityMaskFilter_1_);}
.st37{mask:url(#mask-4_6_);fill:#003CFD;}
.st38{fill:#0E13FD;}
.st39{filter:url(#Adobe_OpacityMaskFilter_2_);}
.st40{mask:url(#mask-2_5_);fill:#FFFFFF;}
.st41{filter:url(#Adobe_OpacityMaskFilter_3_);}
.st42{mask:url(#mask-4_5_);fill:#003CFD;}
.st43{filter:url(#Adobe_OpacityMaskFilter_4_);}
.st44{mask:url(#mask-2_1_);fill:#FFFFFF;}
.st45{filter:url(#Adobe_OpacityMaskFilter_5_);}
.st46{mask:url(#mask-4_4_);fill:#FFFFFF;}
.st47{fill:#018BFE;}
.st48{fill:#02C2FE;}
.st49{fill:#04B6FE;}
.st50{fill:#0095FE;}
.st51{fill:#0074FE;}
.st52{fill:#005CFE;}
.st53{fill:#003DFE;}
.st54{fill:#0E13FE;}
.st55{filter:url(#Adobe_OpacityMaskFilter_6_);}
.st56{mask:url(#mask-2_7_);}
.st57{filter:url(#Adobe_OpacityMaskFilter_7_);}
.st58{mask:url(#mask-2_2_);fill:#FFFFFF;}
.st59{filter:url(#Adobe_OpacityMaskFilter_8_);}
.st60{mask:url(#mask-4_3_);fill:#003CFD;}
.st61{filter:url(#Adobe_OpacityMaskFilter_9_);}
.st62{mask:url(#mask-4_7_);fill:#003CFD;}
.st63{filter:url(#Adobe_OpacityMaskFilter_10_);}
.st64{mask:url(#mask-4_1_);fill:#003CFD;}
.st65{fill:url(#SVGID_25_);}
.st66{fill:url(#SVGID_26_);}
.st67{fill:url(#SVGID_27_);}
.st68{fill:url(#SVGID_28_);}
.st69{fill:url(#SVGID_29_);}
.st70{fill:url(#SVGID_30_);}
.st71{fill:url(#SVGID_31_);}
.st72{fill:url(#SVGID_32_);}
.st73{fill:url(#SVGID_33_);}
.st74{fill:url(#SVGID_34_);}
.st75{fill:url(#SVGID_35_);}
.st76{fill:url(#SVGID_36_);}
.st77{fill:url(#SVGID_37_);}
.st78{fill:url(#SVGID_38_);}
.st79{fill:url(#SVGID_39_);}
.st80{fill:url(#SVGID_40_);}
.st81{fill:url(#SVGID_41_);}
.st82{fill:url(#SVGID_42_);}
.st83{fill:url(#SVGID_43_);}
.st84{fill:url(#SVGID_44_);}
.st85{fill:url(#SVGID_45_);}
.st86{fill:url(#SVGID_46_);}
.st87{fill:url(#SVGID_47_);}
.st88{fill:url(#SVGID_48_);}
.st89{fill:url(#SVGID_49_);}
.st90{fill:url(#SVGID_50_);}
.st91{fill:url(#SVGID_51_);}
.st92{fill:url(#SVGID_52_);}
.st93{fill:url(#SVGID_53_);}
.st94{fill:url(#SVGID_54_);}
.st95{fill:url(#SVGID_55_);}
.st96{fill:url(#SVGID_56_);}
.st97{fill:url(#SVGID_57_);}
.st98{fill:url(#SVGID_58_);}
.st99{fill:url(#SVGID_59_);}
.st100{fill:url(#SVGID_60_);}
.st101{fill:url(#SVGID_61_);}
.st102{fill:url(#SVGID_62_);}
.st103{fill:url(#SVGID_63_);}
.st104{fill:url(#SVGID_64_);}
.st105{display:none;}
.st106{display:inline;}
</style>
<g id="Layer_1">
<g>
<path class="st2" d="M300.7,164.6v-97c0-4.6,3.9-8.5,8.7-8.5c4.6,0,8.4,3.9,8.4,8.5v91.1h44.8c4.1,0,7.7,3.2,7.7,7.3
c0,4.3-3.6,7.7-7.7,7.7h-52.7C303.9,173.6,300.7,170.4,300.7,164.6z"/>
<path class="st2" d="M403.5,165.9V67.5c0-4.6,3.9-8.5,8.7-8.5c4.6,0,8.4,3.9,8.4,8.5v98.4c0,4.6-3.8,8.5-8.4,8.5
C407.4,174.5,403.5,170.5,403.5,165.9z"/>
<path class="st2" d="M538.7,170l-60.4-83.7v79.6c0,4.6-3.8,8.5-8.4,8.5c-4.8,0-8.7-3.9-8.7-8.5V70.3c0-6.1,4.9-11.3,11.3-11.3
c3.6,0,7,1.7,9,4.6l59.2,81.5V67.5c0-4.6,3.8-8.5,8.4-8.5c4.8,0,8.7,3.9,8.7,8.5v96.3c0,5.8-4.8,10.6-10.6,10.6
C543.7,174.5,540.6,172.9,538.7,170z"/>
<path class="st2" d="M683.5,166.3c0,4.4-3.4,8.2-7.8,8.2c-2.2,0-4.3-0.5-6-2.4l-43.3-47.6l-10.9,11.6v29.8c0,4.6-3.8,8.5-8.5,8.5
c-4.6,0-8.5-3.9-8.5-8.5V67.5c0-4.6,3.9-8.5,8.5-8.5c4.8,0,8.5,3.9,8.5,8.5v49.1l50.1-55.1c1.7-1.9,3.8-2.6,6-2.6
c4.3,0,8,3.4,8,7.8c0,2-0.5,3.9-2.2,5.5l-39.6,42.1l43.5,46.4C682.6,162.4,683.5,164.4,683.5,166.3z"/>
<path class="st2" d="M717.9,164.6V68.9c0-5.8,3.2-9,9.2-9h60.4c4.1,0,7.7,3.4,7.7,7.7c0,4.1-3.6,7.3-7.7,7.3H735v33.3h51.3
c4.1,0,7.7,3.2,7.7,7.3c0,4.3-3.6,7.7-7.7,7.7H735v35.5h52.5c4.1,0,7.7,3.2,7.7,7.3c0,4.3-3.6,7.7-7.7,7.7h-60.4
C721.2,173.6,717.9,170.4,717.9,164.6z"/>
<path class="st2" d="M915.7,166.6c0,3.6-3.2,7.8-8,7.8c-2.9,0-5.6-1.4-7.2-3.6l-28.5-41.1h-24v36.2c0,4.6-3.8,8.5-8.4,8.5
c-4.8,0-8.7-3.9-8.7-8.5v-97c0-5.8,3.2-9,9.2-9h38.7c21.7,0,36.5,14,36.5,35c0,19.1-11.9,30-25.4,32.7l24,33.8
C915,162.5,915.7,163.9,915.7,166.6z M848,114.8h28.6c12.3,0,21.1-8,21.1-20c0-11.9-8.9-20-21.1-20H848V114.8z"/>
<path class="st2" d="M951.7,164.6V68.9c0-5.8,3.2-9,9.2-9h31.4c35.5,0,59,24.2,59,57c0,32.9-23.5,56.8-59,56.8h-31.4
C954.9,173.6,951.7,170.4,951.7,164.6z M992.3,158.6c26.3,0,41.4-18.8,41.4-41.8c0-23.4-14.7-41.9-41.4-41.9h-23.5v83.7H992.3z"/>
</g>
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="239.7491" y1="43.1393" x2="239.7491" y2="146.622">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<polygon class="st3" points="231.1,43.1 231.1,136.7 248.4,146.6 248.4,53.1 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="8.6421" y1="43.1418" x2="8.6421" y2="146.628">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<polygon class="st4" points="0,146.6 17.3,136.7 17.3,43.1 0,53.1 "/>
</g>
<g>
<polygon class="st5" points="84.5,145.7 163.9,191.5 163.9,171.6 89.6,128.7 84.5,131.6 84.5,131.7 "/>
<path class="st5" d="M168.4,218l-83.9-48.4v19.9l22.4,12.9L80,218c-1.8,1-1.8,3.7,0,4.7l13.2,7.6l31-17.9l31,17.9l13.2-7.6
C170.2,221.7,170.2,219.1,168.4,218z"/>
</g>
<g>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="239.7491" y1="88.9486" x2="239.7491" y2="184.5487">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st6" d="M231.1,98.9v82.9c0,2.1,2.3,3.4,4.1,2.4l11.8-6.8c0.8-0.5,1.4-1.4,1.4-2.4V88.9L231.1,98.9z"/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="201.8047" y1="110.8552" x2="201.8047" y2="206.4553">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st7" d="M197.3,206.1l11.1-6.4c1.3-0.7,2-2.1,2-3.5v-85.3l-17.2,10v82.9C193.2,205.8,195.4,207.1,197.3,206.1z"/>
<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="163.8609" y1="132.7605" x2="163.8609" y2="230.3498">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st8" d="M155.2,230.3l15.9-9.2c0.8-0.5,1.4-1.4,1.4-2.4v-86.1l-17.2,10V230.3z"/>
<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="84.539" y1="132.7606" x2="84.539" y2="230.3483">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st9" d="M77.3,221.2l15.9,9.2v-87.6l-17.2-10v86.1C75.9,219.8,76.4,220.7,77.3,221.2z"/>
<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="46.5953" y1="110.8545" x2="46.5953" y2="206.455">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st10" d="M40,199.7l11.1,6.4c1.8,1,4.1-0.3,4.1-2.4v-82.9l-17.2-10v85.3C38,197.6,38.7,198.9,40,199.7z"/>
<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.6514" y1="88.9471" x2="8.6514" y2="184.5475">
<stop offset="0" style="stop-color:#2BEDA7"/>
<stop offset="1" style="stop-color:#018AFD"/>
</linearGradient>
<path class="st11" d="M2.1,177.8l11.1,6.4c1.8,1,4.1-0.3,4.1-2.4V98.9L0,88.9v85.3C0,175.7,0.8,177,2.1,177.8z"/>
</g>
<g>
<path class="st5" d="M248.4,53.1l-17.3-10l-31,17.9l-20.7-11.9l27-15.6c1.8-1,1.8-3.7,0-4.7l-11.1-6.4c-1.3-0.7-2.8-0.7-4.1,0
l-29,16.7l-20.7-11.9l27-15.6c1.8-1,1.8-3.7,0-4.7l-11.1-6.4c-1.3-0.7-2.8-0.7-4.1,0l-29,16.7l-29-16.8c-1.3-0.7-2.8-0.7-4.1,0
L80,6.9c-1.8,1-1.8,3.7,0,4.7l151.1,87.3l17.2-10l-31-17.9L248.4,53.1z"/>
<path class="st5" d="M53.2,22.4L42,28.8c-1.8,1-1.8,3.7,0,4.7l151.1,87.3l17.3-10L57.3,22.4C56,21.7,54.4,21.7,53.2,22.4z"/>
<polygon class="st5" points="0,53.1 31.1,71 0,89 17.3,98.9 48.3,81 69,92.9 38,110.9 55.2,120.8 86.3,102.9 106.9,114.8
75.9,132.8 93.2,142.7 124.2,124.8 155.2,142.7 172.5,132.8 17.3,43.1 "/>
</g>
</g>
</g>
<g id="nyt_x5F_exporter_x5F_info" class="st105">
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 9.2 KiB

4
web/app/js/components/GrafanaLink.jsx
View File

@ -1,3 +1,4 @@
import { grafanaIcon } from './util/SvgWrappers.jsx';
import PropTypes from 'prop-types';
import React from 'react';
@ -7,7 +8,8 @@ const GrafanaLink = ({PrefixedLink, name, namespace, resource}) => {
to={`/dashboard/db/linkerd-${resource}?var-namespace=${namespace}&var-${resource}=${name}`}
deployment="grafana"
targetBlank={true}>
{name}&nbsp;&nbsp;<i className="fa fa-external-link" />
&nbsp;&nbsp;
{grafanaIcon}
</PrefixedLink>
);
};

51
web/app/js/components/MetricsTable.jsx
View File

@ -52,7 +52,9 @@ const meshedColumn = {
render: p => p.meshedPods + "/" + p.totalPods
};
const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceColumn, PrefixedLink, showGrafanaLink) => {
const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceColumn, PrefixedLink) => {
let isAuthorityTable = resource === "authority";
let nsColumn = [
{
title: formatTitle("Namespace"),
@ -68,6 +70,20 @@ const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceCol
}
];
let grafanaLinkColumn = [
{
title: formatTitle("Dash", "Grafana Dashboard"),
key: "grafanaDashboard",
className: "numeric",
render: row => !row.added ? null : (
<GrafanaLink
name={row.name}
namespace={row.namespace}
resource={resource}
PrefixedLink={PrefixedLink} />
)}
];
let columns = [
{
title: formatTitle(friendlyTitle(resource).singular),
@ -78,20 +94,14 @@ const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceCol
let nameContents;
if (resource === "namespace") {
nameContents = <PrefixedLink to={"/namespaces/" + row.name}>{row.name}</PrefixedLink>;
} else if (!row.added) {
} else if (!row.added || isAuthorityTable) {
nameContents = row.name;
} else {
if (showGrafanaLink) {
nameContents = (
<GrafanaLink
name={row.name}
namespace={row.namespace}
resource={resource}
PrefixedLink={PrefixedLink} />
);
} else {
nameContents = row.name;
}
nameContents = (
<PrefixedLink to={"/namespaces/" + row.namespace + "/" + resource + "s/" + row.name}>
{row.name}
</PrefixedLink>
);
}
return (
<React.Fragment>
@ -152,8 +162,9 @@ const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceCol
];
// don't add the meshed column on a Authority MetricsTable
if (resource !== "authority") {
if (!isAuthorityTable) {
columns.splice(1, 0, meshedColumn);
columns = _.concat(columns, grafanaLinkColumn);
}
if (!showNamespaceColumn) {
@ -166,8 +177,7 @@ const columnDefinitions = (resource, namespaces, onFilterClick, showNamespaceCol
/** @extends React.Component */
export class MetricsTableBase extends BaseTable {
static defaultProps = {
showGrafanaLink: true,
showNamespaceColumn: true,
showNamespaceColumn: true
}
static propTypes = {
@ -176,7 +186,6 @@ export class MetricsTableBase extends BaseTable {
}).isRequired,
metrics: PropTypes.arrayOf(processedMetricsPropType.isRequired).isRequired,
resource: PropTypes.string.isRequired,
showGrafanaLink: PropTypes.bool,
showNamespaceColumn: PropTypes.bool
}
@ -230,18 +239,12 @@ export class MetricsTableBase extends BaseTable {
showNsColumn = false;
}
let showGrafanaLink = this.props.showGrafanaLink;
if (resource === "authority") {
showGrafanaLink = false;
}
let columns = _.compact(columnDefinitions(
resource,
namespaceFilterText,
this.onFilterDropdownVisibleChange,
showNsColumn,
this.api.PrefixedLink,
showGrafanaLink
this.api.PrefixedLink
));
let locale = {

11
web/app/js/components/Sidebar.jsx
View File

@ -1,15 +1,14 @@
import _ from 'lodash';
import ApiHelpers from './util/ApiHelpers.jsx';
import { Link } from 'react-router-dom';
import logo from './../../img/logo-only.svg';
import PropTypes from 'prop-types';
import React from 'react';
import ReactRouterPropTypes from 'react-router-prop-types';
import SocialLinks from './SocialLinks.jsx';
import Version from './Version.jsx';
import { withContext } from './util/AppContext.jsx';
import wordLogo from './../../img/word-logo.svg';
import { Icon, Layout, Menu } from 'antd';
import { linkerdLogoOnly, linkerdWordLogo } from './util/SvgWrappers.jsx';
import './../../css/sidebar.css';
class Sidebar extends React.Component {
@ -133,13 +132,7 @@ class Sidebar extends React.Component {
<div className={`sidebar-menu-header ${this.state.collapsed ? "collapsed" : ""}`}>
<PrefixedLink to="/servicemesh">
<img
alt="Linkerd logo"
src={this.state.collapsed ? logo : wordLogo}
onError={e => {
// awful hack to deal with the fact that we don't serve assets off absolute paths
e.target.src = e.target.src.replace(/(.*)(\/[a-zA-Z]*)(\/dist)(.*)/, "$1$3$4");
}} />
{this.state.collapsed ? linkerdLogoOnly : linkerdWordLogo}
</PrefixedLink>
</div>

310
web/app/js/components/util/SvgWrappers.jsx Normal file
View File

@ -0,0 +1,310 @@
import React from 'react';
import './../../../css/svg-wrappers.css';
export const grafanaIcon = (
<svg
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="15px"
height="15px"
viewBox="0 0 351 365"
style={{"enableBackground:": "new 0 0 351 365"}}
xmlSpace="preserve">
<g id="Layer_1_1_" />
<linearGradient id="SVGID_1_grafana" gradientUnits="userSpaceOnUse" x1="175.5" y1="445.4948" x2="175.5" y2="114.0346">
<stop offset="0" style={{"stopColor":"#FFF100"}} />
<stop offset="1" style={{"stopColor":"#F05A28"}} />
</linearGradient>
<path
className="grafana-st0"
d="M342,161.2c-0.6-6.1-1.6-13.1-3.6-20.9c-2-7.7-5-16.2-9.4-25c-4.4-8.8-10.1-17.9-17.5-26.8 c-2.9-3.5-6.1-6.9-9.5-10.2c5.1-20.3-6.2-37.9-6.2-37.9c-19.5-1.2-31.9,6.1-36.5,9.4c-0.8-0.3-1.5-0.7-2.3-1 c-3.3-1.3-6.7-2.6-10.3-3.7c-3.5-1.1-7.1-2.1-10.8-3c-3.7-0.9-7.4-1.6-11.2-2.2c-0.7-0.1-1.3-0.2-2-0.3 c-8.5-27.2-32.9-38.6-32.9-38.6c-27.3,17.3-32.4,41.5-32.4,41.5s-0.1,0.5-0.3,1.4c-1.5,0.4-3,0.9-4.5,1.3c-2.1,0.6-4.2,1.4-6.2,2.2 c-2.1,0.8-4.1,1.6-6.2,2.5c-4.1,1.8-8.2,3.8-12.2,6c-3.9,2.2-7.7,4.6-11.4,7.1c-0.5-0.2-1-0.4-1-0.4c-37.8-14.4-71.3,2.9-71.3,2.9 c-3.1,40.2,15.1,65.5,18.7,70.1c-0.9,2.5-1.7,5-2.5,7.5c-2.8,9.1-4.9,18.4-6.2,28.1c-0.2,1.4-0.4,2.8-0.5,4.2 C18.8,192.7,8.5,228,8.5,228c29.1,33.5,63.1,35.6,63.1,35.6c0,0,0.1-0.1,0.1-0.1c4.3,7.7,9.3,15,14.9,21.9c2.4,2.9,4.8,5.6,7.4,8.3 c-10.6,30.4,1.5,55.6,1.5,55.6c32.4,1.2,53.7-14.2,58.2-17.7c3.2,1.1,6.5,2.1,9.8,2.9c10,2.6,20.2,4.1,30.4,4.5 c2.5,0.1,5.1,0.2,7.6,0.1l1.2,0l0.8,0l1.6,0l1.6-0.1l0,0.1c15.3,21.8,42.1,24.9,42.1,24.9c19.1-20.1,20.2-40.1,20.2-44.4l0,0 c0,0,0-0.1,0-0.3c0-0.4,0-0.6,0-0.6l0,0c0-0.3,0-0.6,0-0.9c4-2.8,7.8-5.8,11.4-9.1c7.6-6.9,14.3-14.8,19.9-23.3 c0.5-0.8,1-1.6,1.5-2.4c21.6,1.2,36.9-13.4,36.9-13.4c-3.6-22.5-16.4-33.5-19.1-35.6l0,0c0,0-0.1-0.1-0.3-0.2 c-0.2-0.1-0.2-0.2-0.2-0.2c0,0,0,0,0,0c-0.1-0.1-0.3-0.2-0.5-0.3c0.1-1.4,0.2-2.7,0.3-4.1c0.2-2.4,0.2-4.9,0.2-7.3l0-1.8l0-0.9 l0-0.5c0-0.6,0-0.4,0-0.6l-0.1-1.5l-0.1-2c0-0.7-0.1-1.3-0.2-1.9c-0.1-0.6-0.1-1.3-0.2-1.9l-0.2-1.9l-0.3-1.9 c-0.4-2.5-0.8-4.9-1.4-7.4c-2.3-9.7-6.1-18.9-11-27.2c-5-8.3-11.2-15.6-18.3-21.8c-7-6.2-14.9-11.2-23.1-14.9 c-8.3-3.7-16.9-6.1-25.5-7.2c-4.3-0.6-8.6-0.8-12.9-0.7l-1.6,0l-0.4,0c-0.1,0-0.6,0-0.5,0l-0.7,0l-1.6,0.1c-0.6,0-1.2,0.1-1.7,0.1 c-2.2,0.2-4.4,0.5-6.5,0.9c-8.6,1.6-16.7,4.7-23.8,9c-7.1,4.3-13.3,9.6-18.3,15.6c-5,6-8.9,12.7-11.6,19.6c-2.7,6.9-4.2,14.1-4.6,21 c-0.1,1.7-0.1,3.5-0.1,5.2c0,0.4,0,0.9,0,1.3l0.1,1.4c0.1,0.8,0.1,1.7,0.2,2.5c0.3,3.5,1,6.9,1.9,10.1c1.9,6.5,4.9,12.4,8.6,17.4 c3.7,5,8.2,9.1,12.9,12.4c4.7,3.2,9.8,5.5,14.8,7c5,1.5,10,2.1,14.7,2.1c0.6,0,1.2,0,1.7,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9-0.1 c0.5,0,1-0.1,1.5-0.1c0.1,0,0.3,0,0.4-0.1l0.5-0.1c0.3,0,0.6-0.1,0.9-0.1c0.6-0.1,1.1-0.2,1.7-0.3c0.6-0.1,1.1-0.2,1.6-0.4 c1.1-0.2,2.1-0.6,3.1-0.9c2-0.7,4-1.5,5.7-2.4c1.8-0.9,3.4-2,5-3c0.4-0.3,0.9-0.6,1.3-1c1.6-1.3,1.9-3.7,0.6-5.3 c-1.1-1.4-3.1-1.8-4.7-0.9c-0.4,0.2-0.8,0.4-1.2,0.6c-1.4,0.7-2.8,1.3-4.3,1.8c-1.5,0.5-3.1,0.9-4.7,1.2c-0.8,0.1-1.6,0.2-2.5,0.3 c-0.4,0-0.8,0.1-1.3,0.1c-0.4,0-0.9,0-1.2,0c-0.4,0-0.8,0-1.2,0c-0.5,0-1,0-1.5-0.1c0,0-0.3,0-0.1,0l-0.2,0l-0.3,0 c-0.2,0-0.5,0-0.7-0.1c-0.5-0.1-0.9-0.1-1.4-0.2c-3.7-0.5-7.4-1.6-10.9-3.2c-3.6-1.6-7-3.8-10.1-6.6c-3.1-2.8-5.8-6.1-7.9-9.9 c-2.1-3.8-3.6-8-4.3-12.4c-0.3-2.2-0.5-4.5-0.4-6.7c0-0.6,0.1-1.2,0.1-1.8c0,0.2,0-0.1,0-0.1l0-0.2l0-0.5c0-0.3,0.1-0.6,0.1-0.9 c0.1-1.2,0.3-2.4,0.5-3.6c1.7-9.6,6.5-19,13.9-26.1c1.9-1.8,3.9-3.4,6-4.9c2.1-1.5,4.4-2.8,6.8-3.9c2.4-1.1,4.8-2,7.4-2.7 c2.5-0.7,5.1-1.1,7.8-1.4c1.3-0.1,2.6-0.2,4-0.2c0.4,0,0.6,0,0.9,0l1.1,0l0.7,0c0.3,0,0,0,0.1,0l0.3,0l1.1,0.1 c2.9,0.2,5.7,0.6,8.5,1.3c5.6,1.2,11.1,3.3,16.2,6.1c10.2,5.7,18.9,14.5,24.2,25.1c2.7,5.3,4.6,11,5.5,16.9c0.2,1.5,0.4,3,0.5,4.5 l0.1,1.1l0.1,1.1c0,0.4,0,0.8,0,1.1c0,0.4,0,0.8,0,1.1l0,1l0,1.1c0,0.7-0.1,1.9-0.1,2.6c-0.1,1.6-0.3,3.3-0.5,4.9 c-0.2,1.6-0.5,3.2-0.8,4.8c-0.3,1.6-0.7,3.2-1.1,4.7c-0.8,3.1-1.8,6.2-3,9.3c-2.4,6-5.6,11.8-9.4,17.1 c-7.7,10.6-18.2,19.2-30.2,24.7c-6,2.7-12.3,4.7-18.8,5.7c-3.2,0.6-6.5,0.9-9.8,1l-0.6,0l-0.5,0l-1.1,0l-1.6,0l-0.8,0 c0.4,0-0.1,0-0.1,0l-0.3,0c-1.8,0-3.5-0.1-5.3-0.3c-7-0.5-13.9-1.8-20.7-3.7c-6.7-1.9-13.2-4.6-19.4-7.8 c-12.3-6.6-23.4-15.6-32-26.5c-4.3-5.4-8.1-11.3-11.2-17.4c-3.1-6.1-5.6-12.6-7.4-19.1c-1.8-6.6-2.9-13.3-3.4-20.1l-0.1-1.3l0-0.3 l0-0.3l0-0.6l0-1.1l0-0.3l0-0.4l0-0.8l0-1.6l0-0.3c0,0,0,0.1,0-0.1l0-0.6c0-0.8,0-1.7,0-2.5c0.1-3.3,0.4-6.8,0.8-10.2 c0.4-3.4,1-6.9,1.7-10.3c0.7-3.4,1.5-6.8,2.5-10.2c1.9-6.7,4.3-13.2,7.1-19.3c5.7-12.2,13.1-23.1,22-31.8c2.2-2.2,4.5-4.2,6.9-6.2 c2.4-1.9,4.9-3.7,7.5-5.4c2.5-1.7,5.2-3.2,7.9-4.6c1.3-0.7,2.7-1.4,4.1-2c0.7-0.3,1.4-0.6,2.1-0.9c0.7-0.3,1.4-0.6,2.1-0.9 c2.8-1.2,5.7-2.2,8.7-3.1c0.7-0.2,1.5-0.4,2.2-0.7c0.7-0.2,1.5-0.4,2.2-0.6c1.5-0.4,3-0.8,4.5-1.1c0.7-0.2,1.5-0.3,2.3-0.5 c0.8-0.2,1.5-0.3,2.3-0.5c0.8-0.1,1.5-0.3,2.3-0.4l1.1-0.2l1.2-0.2c0.8-0.1,1.5-0.2,2.3-0.3c0.9-0.1,1.7-0.2,2.6-0.3 c0.7-0.1,1.9-0.2,2.6-0.3c0.5-0.1,1.1-0.1,1.6-0.2l1.1-0.1l0.5-0.1l0.6,0c0.9-0.1,1.7-0.1,2.6-0.2l1.3-0.1c0,0,0.5,0,0.1,0l0.3,0 l0.6,0c0.7,0,1.5-0.1,2.2-0.1c2.9-0.1,5.9-0.1,8.8,0c5.8,0.2,11.5,0.9,17,1.9c11.1,2.1,21.5,5.6,31,10.3 c9.5,4.6,17.9,10.3,25.3,16.5c0.5,0.4,0.9,0.8,1.4,1.2c0.4,0.4,0.9,0.8,1.3,1.2c0.9,0.8,1.7,1.6,2.6,2.4c0.9,0.8,1.7,1.6,2.5,2.4 c0.8,0.8,1.6,1.6,2.4,2.5c3.1,3.3,6,6.6,8.6,10c5.2,6.7,9.4,13.5,12.7,19.9c0.2,0.4,0.4,0.8,0.6,1.2c0.2,0.4,0.4,0.8,0.6,1.2 c0.4,0.8,0.8,1.6,1.1,2.4c0.4,0.8,0.7,1.5,1.1,2.3c0.3,0.8,0.7,1.5,1,2.3c1.2,3,2.4,5.9,3.3,8.6c1.5,4.4,2.6,8.3,3.5,11.7 c0.3,1.4,1.6,2.3,3,2.1c1.5-0.1,2.6-1.3,2.6-2.8C342.6,170.4,342.5,166.1,342,161.2z" />
</svg>
);
export const linkerdLogoOnly = (
<svg id="linkerd-logo" className="linkerd-logo-only" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138.9 129.2">
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="130.52"
y1="24.532"
x2="130.52"
y2="79.491">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<polygon
className="st0"
points="125.9,24.5 125.9,74.2 135.1,79.5 135.1,29.8" />
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="7.78"
y1="24.534"
x2="7.78"
y2="79.495">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<polygon
className="st1"
points="3.2,79.5 12.4,74.2 12.4,24.5 3.2,29.8" />
<g>
<polygon
className="st2"
points="48.1,79 90.2,103.3 90.2,92.8 50.8,70 48.1,71.5 48.1,71.5" />
<path
className="st2"
d="M92.6,117.4L48.1,91.7v10.6l11.9,6.9l-14.3,8.3c-1,0.6-1,1.9,0,2.5l7,4l16.5-9.5l16.5,9.5l7-4 C93.6,119.4,93.6,118,92.6,117.4z" />
</g>
<g>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="130.52"
y1="48.861"
x2="130.52"
y2="99.634">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st3"
d="M125.9,54.1v44c0,1.1,1.2,1.8,2.2,1.3l6.3-3.6c0.4-0.3,0.7-0.7,0.7-1.3V48.9L125.9,54.1z" />
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="110.368"
y1="60.496"
x2="110.368"
y2="111.269">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st4"
d="M108,111.1l5.9-3.4c0.7-0.4,1.1-1.1,1.1-1.9V60.5l-9.2,5.3v44C105.8,110.9,107,111.6,108,111.1z" />
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="90.216"
y1="72.13"
x2="90.216"
y2="123.959">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st5"
d="M85.6,124l8.4-4.9c0.4-0.3,0.7-0.7,0.7-1.3V72.1l-9.2,5.3V124z" />
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="48.089"
y1="72.13"
x2="48.089"
y2="123.958">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st6"
d="M44.2,119.1l8.4,4.9V77.4l-9.2-5.3v45.7C43.5,118.4,43.8,118.8,44.2,119.1z" />
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="27.937"
y1="60.495"
x2="27.937"
y2="111.269">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st7"
d="M24.4,107.7l5.9,3.4c1,0.6,2.2-0.1,2.2-1.3v-44l-9.2-5.3v45.3C23.4,106.6,23.8,107.3,24.4,107.7z" />
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="7.785"
y1="48.861"
x2="7.785"
y2="99.633">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st8"
d="M4.3,96l5.9,3.4c1,0.6,2.2-0.1,2.2-1.3v-44l-9.2-5.3v45.3C3.2,94.9,3.6,95.6,4.3,96z" />
</g>
<g>
<path
className="st2"
d="M135.1,29.8l-9.2-5.3l-16.5,9.5l-11-6.3l14.3-8.3c1-0.6,1-1.9,0-2.5l-5.9-3.4c-0.7-0.4-1.5-0.4-2.2,0 l-15.4,8.9l-11-6.3l14.3-8.3c1-0.6,1-1.9,0-2.5l-5.9-3.4c-0.7-0.4-1.5-0.4-2.2,0l-15.4,8.9L53.7,1.9c-0.7-0.4-1.5-0.4-2.2,0 l-5.9,3.4c-1,0.6-1,1.9,0,2.5l80.3,46.3l9.2-5.3l-16.5-9.5L135.1,29.8z" />
<path
className="st2"
d="M31.4,13.5l-5.9,3.4c-1,0.6-1,1.9,0,2.5l80.3,46.3l9.2-5.3l-81.4-47C32.9,13.1,32.1,13.1,31.4,13.5z" />
<polygon
className="st2"
points="3.2,29.8 19.7,39.3 3.2,48.9 12.4,54.2 28.9,44.6 39.8,51 23.4,60.5 32.5,65.8 49,56.3 60,62.6 43.5,72.1 52.7,77.4 69.1,67.9 85.6,77.4 94.8,72.1 12.4,24.5" />
</g>
</svg>
);
export const linkerdWordLogo = (
<svg className="linkerd-word-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1092.4 233.7">
<g id="Layer_1">
<path
className="st2"
d="M300.7,164.6v-97c0-4.6,3.9-8.5,8.7-8.5c4.6,0,8.4,3.9,8.4,8.5v91.1h44.8c4.1,0,7.7,3.2,7.7,7.3 c0,4.3-3.6,7.7-7.7,7.7h-52.7C303.9,173.6,300.7,170.4,300.7,164.6z" />
<path
className="st2"
d="M403.5,165.9V67.5c0-4.6,3.9-8.5,8.7-8.5c4.6,0,8.4,3.9,8.4,8.5v98.4c0,4.6-3.8,8.5-8.4,8.5 C407.4,174.5,403.5,170.5,403.5,165.9z" />
<path
className="st2"
d="M538.7,170l-60.4-83.7v79.6c0,4.6-3.8,8.5-8.4,8.5c-4.8,0-8.7-3.9-8.7-8.5V70.3c0-6.1,4.9-11.3,11.3-11.3 c3.6,0,7,1.7,9,4.6l59.2,81.5V67.5c0-4.6,3.8-8.5,8.4-8.5c4.8,0,8.7,3.9,8.7,8.5v96.3c0,5.8-4.8,10.6-10.6,10.6 C543.7,174.5,540.6,172.9,538.7,170z" />
<path
className="st2"
d="M683.5,166.3c0,4.4-3.4,8.2-7.8,8.2c-2.2,0-4.3-0.5-6-2.4l-43.3-47.6l-10.9,11.6v29.8c0,4.6-3.8,8.5-8.5,8.5 c-4.6,0-8.5-3.9-8.5-8.5V67.5c0-4.6,3.9-8.5,8.5-8.5c4.8,0,8.5,3.9,8.5,8.5v49.1l50.1-55.1c1.7-1.9,3.8-2.6,6-2.6 c4.3,0,8,3.4,8,7.8c0,2-0.5,3.9-2.2,5.5l-39.6,42.1l43.5,46.4C682.6,162.4,683.5,164.4,683.5,166.3z" />
<path
className="st2"
d="M717.9,164.6V68.9c0-5.8,3.2-9,9.2-9h60.4c4.1,0,7.7,3.4,7.7,7.7c0,4.1-3.6,7.3-7.7,7.3H735v33.3h51.3 c4.1,0,7.7,3.2,7.7,7.3c0,4.3-3.6,7.7-7.7,7.7H735v35.5h52.5c4.1,0,7.7,3.2,7.7,7.3c0,4.3-3.6,7.7-7.7,7.7h-60.4 C721.2,173.6,717.9,170.4,717.9,164.6z" />
<path
className="st2"
d="M915.7,166.6c0,3.6-3.2,7.8-8,7.8c-2.9,0-5.6-1.4-7.2-3.6l-28.5-41.1h-24v36.2c0,4.6-3.8,8.5-8.4,8.5 c-4.8,0-8.7-3.9-8.7-8.5v-97c0-5.8,3.2-9,9.2-9h38.7c21.7,0,36.5,14,36.5,35c0,19.1-11.9,30-25.4,32.7l24,33.8 C915,162.5,915.7,163.9,915.7,166.6z M848,114.8h28.6c12.3,0,21.1-8,21.1-20c0-11.9-8.9-20-21.1-20H848V114.8z" />
<path
className="st2"
d="M951.7,164.6V68.9c0-5.8,3.2-9,9.2-9h31.4c35.5,0,59,24.2,59,57c0,32.9-23.5,56.8-59,56.8h-31.4 C954.9,173.6,951.7,170.4,951.7,164.6z M992.3,158.6c26.3,0,41.4-18.8,41.4-41.8c0-23.4-14.7-41.9-41.4-41.9h-23.5v83.7H992.3z" />
<g>
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="239.749"
y1="43.139"
x2="239.749"
y2="146.622">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<polygon
className="st3"
points="231.1,43.1 231.1,136.7 248.4,146.6 248.4,53.1" />
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="8.642"
y1="43.142"
x2="8.642"
y2="146.628">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<polygon
className="st4"
points="0,146.6 17.3,136.7 17.3,43.1 0,53.1" />
<g>
<polygon
className="st5"
points="84.5,145.7 163.9,191.5 163.9,171.6 89.6,128.7 84.5,131.6 84.5,131.7" />
<path
className="st5"
d="M168.4,218l-83.9-48.4v19.9l22.4,12.9L80,218c-1.8,1-1.8,3.7,0,4.7l13.2,7.6l31-17.9l31,17.9l13.2-7.6 C170.2,221.7,170.2,219.1,168.4,218z" />
</g>
<g>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="239.749"
y1="88.949"
x2="239.749"
y2="184.549">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st6"
d="M231.1,98.9v82.9c0,2.1,2.3,3.4,4.1,2.4l11.8-6.8c0.8-0.5,1.4-1.4,1.4-2.4V88.9L231.1,98.9z" />
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="201.805"
y1="110.855"
x2="201.805"
y2="206.455">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st7"
d="M197.3,206.1l11.1-6.4c1.3-0.7,2-2.1,2-3.5v-85.3l-17.2,10v82.9C193.2,205.8,195.4,207.1,197.3,206.1z" />
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="163.861"
y1="132.761"
x2="163.861"
y2="230.35">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st8"
d="M155.2,230.3l15.9-9.2c0.8-0.5,1.4-1.4,1.4-2.4v-86.1l-17.2,10V230.3z" />
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="84.539"
y1="132.761"
x2="84.539"
y2="230.348">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st9"
d="M77.3,221.2l15.9,9.2v-87.6l-17.2-10v86.1C75.9,219.8,76.4,220.7,77.3,221.2z" />
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="46.595"
y1="110.855"
x2="46.595"
y2="206.455">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st10"
d="M40,199.7l11.1,6.4c1.8,1,4.1-0.3,4.1-2.4v-82.9l-17.2-10v85.3C38,197.6,38.7,198.9,40,199.7z" />
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="8.651"
y1="88.947"
x2="8.651"
y2="184.548">
<stop offset="0" stopColor="#2beda7" />
<stop offset="1" stopColor="#018afd" />
</linearGradient>
<path
className="st11"
d="M2.1,177.8l11.1,6.4c1.8,1,4.1-0.3,4.1-2.4V98.9L0,88.9v85.3C0,175.7,0.8,177,2.1,177.8z" />
</g>
<g>
<path
className="st5"
d="M248.4,53.1l-17.3-10l-31,17.9l-20.7-11.9l27-15.6c1.8-1,1.8-3.7,0-4.7l-11.1-6.4c-1.3-0.7-2.8-0.7-4.1,0 l-29,16.7l-20.7-11.9l27-15.6c1.8-1,1.8-3.7,0-4.7l-11.1-6.4c-1.3-0.7-2.8-0.7-4.1,0l-29,16.7l-29-16.8c-1.3-0.7-2.8-0.7-4.1,0 L80,6.9c-1.8,1-1.8,3.7,0,4.7l151.1,87.3l17.2-10l-31-17.9L248.4,53.1z" />
<path
className="st5"
d="M53.2,22.4L42,28.8c-1.8,1-1.8,3.7,0,4.7l151.1,87.3l17.3-10L57.3,22.4C56,21.7,54.4,21.7,53.2,22.4z" />
<polygon
className="st5"
points="0,53.1 31.1,71 0,89 17.3,98.9 48.3,81 69,92.9 38,110.9 55.2,120.8 86.3,102.9 106.9,114.8 75.9,132.8 93.2,142.7 124.2,124.8 155.2,142.7 172.5,132.8 17.3,43.1" />
</g>
</g>
</g>
</svg>
)
;

4
web/app/package.json
View File

@ -30,8 +30,8 @@
"sinon": "^4.1.2",
"sinon-chai": "^2.14.0",
"sinon-stub-promise": "^4.0.0",
"webpack": "^4.1.12",
"webpack-dev-server": "^3.1.4",
"webpack": "^4.16.5",
"webpack-dev-server": "^3.1.5",
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {

8
web/app/test/MetricsTableTest.js
View File

@ -29,7 +29,7 @@ describe('Tests for <MetricsTableBase>', () => {
expect(table).to.have.length(1);
expect(table.props().dataSource).to.have.length(1);
expect(table.props().columns).to.have.length(9);
expect(table.props().columns).to.have.length(10);
});
it('omits the namespace column for the namespace resource', () => {
@ -43,7 +43,7 @@ describe('Tests for <MetricsTableBase>', () => {
const table = component.find(BaseTable);
expect(table).to.have.length(1);
expect(table.props().columns).to.have.length(8);
expect(table.props().columns).to.have.length(9);
});
it('omits the namespace column when showNamespaceColumn is false', () => {
@ -58,10 +58,10 @@ describe('Tests for <MetricsTableBase>', () => {
const table = component.find(BaseTable);
expect(table).to.have.length(1);
expect(table.props().columns).to.have.length(8);
expect(table.props().columns).to.have.length(9);
});
it('omits meshed column for authority resource', () => {
it('omits meshed column and grafana column for authority resource', () => {
const component = shallow(
<MetricsTableBase
{...defaultProps}

243
web/app/yarn.lock
View File

@ -78,140 +78,140 @@
version "15.5.2"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.2.tgz#3c6b8dceb2906cc87fe4358e809f9d20c8d59be1"
"@webassemblyjs/ast@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.12.tgz#a9acbcb3f25333c4edfa1fdf3186b1ccf64e6664"
"@webassemblyjs/ast@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.13.tgz#81155a570bd5803a30ec31436bc2c9c0ede38f25"
dependencies:
"@webassemblyjs/helper-module-context" "1.5.12"
"@webassemblyjs/helper-wasm-bytecode" "1.5.12"
"@webassemblyjs/wast-parser" "1.5.12"
"@webassemblyjs/helper-module-context" "1.5.13"
"@webassemblyjs/helper-wasm-bytecode" "1.5.13"
"@webassemblyjs/wast-parser" "1.5.13"
debug "^3.1.0"
mamacro "^0.0.3"
"@webassemblyjs/floating-point-hex-parser@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz#0f36044ffe9652468ce7ae5a08716a4eeff9cd9c"
"@webassemblyjs/floating-point-hex-parser@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz#29ce0baa97411f70e8cce68ce9c0f9d819a4e298"
"@webassemblyjs/helper-api-error@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz#05466833ff2f9d8953a1a327746e1d112ea62aaf"
"@webassemblyjs/helper-api-error@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz#e49b051d67ee19a56e29b9aa8bd949b5b4442a59"
"@webassemblyjs/helper-buffer@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz#1f0de5aaabefef89aec314f7f970009cd159c73d"
"@webassemblyjs/helper-buffer@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz#873bb0a1b46449231137c1262ddfd05695195a1e"
dependencies:
debug "^3.1.0"
"@webassemblyjs/helper-code-frame@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz#3cdc1953093760d1c0f0caf745ccd62bdb6627c7"
"@webassemblyjs/helper-code-frame@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz#1bd2181b6a0be14e004f0fe9f5a660d265362b58"
dependencies:
"@webassemblyjs/wast-printer" "1.5.12"
"@webassemblyjs/wast-printer" "1.5.13"
"@webassemblyjs/helper-fsm@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz#6bc1442b037f8e30f2e57b987cee5c806dd15027"
"@webassemblyjs/helper-fsm@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz#cdf3d9d33005d543a5c5e5adaabf679ffa8db924"
"@webassemblyjs/helper-module-context@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz#b5588ca78b33b8a0da75f9ab8c769a3707baa861"
"@webassemblyjs/helper-module-context@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz#dc29ddfb51ed657655286f94a5d72d8a489147c5"
dependencies:
debug "^3.1.0"
mamacro "^0.0.3"
"@webassemblyjs/helper-wasm-bytecode@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz#d12a3859db882a448891a866a05d0be63785b616"
"@webassemblyjs/helper-wasm-bytecode@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz#03245817f0a762382e61733146f5773def15a747"
"@webassemblyjs/helper-wasm-section@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz#ff9fe1507d368ad437e7969d25e8c1693dac1884"
"@webassemblyjs/helper-wasm-section@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz#efc76f44a10d3073b584b43c38a179df173d5c7d"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-buffer" "1.5.12"
"@webassemblyjs/helper-wasm-bytecode" "1.5.12"
"@webassemblyjs/wasm-gen" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-buffer" "1.5.13"
"@webassemblyjs/helper-wasm-bytecode" "1.5.13"
"@webassemblyjs/wasm-gen" "1.5.13"
debug "^3.1.0"
"@webassemblyjs/ieee754@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz#ee9574bc558888f13097ce3e7900dff234ea19a4"
"@webassemblyjs/ieee754@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz#573e97c8c12e4eebb316ca5fde0203ddd90b0364"
dependencies:
ieee754 "^1.1.11"
"@webassemblyjs/leb128@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.12.tgz#0308eec652765ee567d8a5fa108b4f0b25b458e1"
"@webassemblyjs/leb128@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.13.tgz#ab52ebab9cec283c1c1897ac1da833a04a3f4cee"
dependencies:
leb "^0.3.0"
long "4.0.0"
"@webassemblyjs/utf8@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.12.tgz#d5916222ef314bf60d6806ed5ac045989bfd92ce"
"@webassemblyjs/utf8@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.13.tgz#6b53d2cd861cf94fa99c1f12779dde692fbc2469"
"@webassemblyjs/wasm-edit@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz#821c9358e644a166f2c910e5af1b46ce795a17aa"
"@webassemblyjs/wasm-edit@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz#c9cef5664c245cf11b3b3a73110c9155831724a8"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-buffer" "1.5.12"
"@webassemblyjs/helper-wasm-bytecode" "1.5.12"
"@webassemblyjs/helper-wasm-section" "1.5.12"
"@webassemblyjs/wasm-gen" "1.5.12"
"@webassemblyjs/wasm-opt" "1.5.12"
"@webassemblyjs/wasm-parser" "1.5.12"
"@webassemblyjs/wast-printer" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-buffer" "1.5.13"
"@webassemblyjs/helper-wasm-bytecode" "1.5.13"
"@webassemblyjs/helper-wasm-section" "1.5.13"
"@webassemblyjs/wasm-gen" "1.5.13"
"@webassemblyjs/wasm-opt" "1.5.13"
"@webassemblyjs/wasm-parser" "1.5.13"
"@webassemblyjs/wast-printer" "1.5.13"
debug "^3.1.0"
"@webassemblyjs/wasm-gen@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz#0b7ccfdb93dab902cc0251014e2e18bae3139bcb"
"@webassemblyjs/wasm-gen@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz#8e6ea113c4b432fa66540189e79b16d7a140700e"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-wasm-bytecode" "1.5.12"
"@webassemblyjs/ieee754" "1.5.12"
"@webassemblyjs/leb128" "1.5.12"
"@webassemblyjs/utf8" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-wasm-bytecode" "1.5.13"
"@webassemblyjs/ieee754" "1.5.13"
"@webassemblyjs/leb128" "1.5.13"
"@webassemblyjs/utf8" "1.5.13"
"@webassemblyjs/wasm-opt@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz#bd758a8bc670f585ff1ae85f84095a9e0229cbc9"
"@webassemblyjs/wasm-opt@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz#147aad7717a7ee4211c36b21a5f4c30dddf33138"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-buffer" "1.5.12"
"@webassemblyjs/wasm-gen" "1.5.12"
"@webassemblyjs/wasm-parser" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-buffer" "1.5.13"
"@webassemblyjs/wasm-gen" "1.5.13"
"@webassemblyjs/wasm-parser" "1.5.13"
debug "^3.1.0"
"@webassemblyjs/wasm-parser@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz#7b10b4388ecf98bd7a22e702aa62ec2f46d0c75e"
"@webassemblyjs/wasm-parser@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz#6f46516c5bb23904fbdf58009233c2dd8a54c72f"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-api-error" "1.5.12"
"@webassemblyjs/helper-wasm-bytecode" "1.5.12"
"@webassemblyjs/ieee754" "1.5.12"
"@webassemblyjs/leb128" "1.5.12"
"@webassemblyjs/utf8" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-api-error" "1.5.13"
"@webassemblyjs/helper-wasm-bytecode" "1.5.13"
"@webassemblyjs/ieee754" "1.5.13"
"@webassemblyjs/leb128" "1.5.13"
"@webassemblyjs/utf8" "1.5.13"
"@webassemblyjs/wast-parser@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz#9cf5ae600ecae0640437b5d4de5dd6b6088d0d8b"
"@webassemblyjs/wast-parser@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz#5727a705d397ae6a3ae99d7f5460acf2ec646eea"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/floating-point-hex-parser" "1.5.12"
"@webassemblyjs/helper-api-error" "1.5.12"
"@webassemblyjs/helper-code-frame" "1.5.12"
"@webassemblyjs/helper-fsm" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/floating-point-hex-parser" "1.5.13"
"@webassemblyjs/helper-api-error" "1.5.13"
"@webassemblyjs/helper-code-frame" "1.5.13"
"@webassemblyjs/helper-fsm" "1.5.13"
long "^3.2.0"
mamacro "^0.0.3"
"@webassemblyjs/wast-printer@1.5.12":
version "1.5.12"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz#563ca4d01b22d21640b2463dc5e3d7f7d9dac520"
"@webassemblyjs/wast-printer@1.5.13":
version "1.5.13"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz#bb34d528c14b4f579e7ec11e793ec50ad7cd7c95"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/wast-parser" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/wast-parser" "1.5.13"
long "^3.2.0"
abab@^1.0.3:
@ -2923,6 +2923,14 @@ enhanced-resolve@^4.0.0:
memory-fs "^0.4.0"
tapable "^1.0.0"
enhanced-resolve@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.4.0"
tapable "^1.0.0"
enquire.js@^2.1.1, enquire.js@^2.1.6:
version "2.1.6"
resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814"
@ -3180,6 +3188,13 @@ eslint-scope@^3.7.1:
esrecurse "^4.1.0"
estraverse "^4.1.1"
eslint-scope@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
dependencies:
esrecurse "^4.1.0"
estraverse "^4.1.1"
eslint@^4.12.1:
version "4.13.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
@ -4746,10 +4761,6 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"
leb@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
left-pad@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
@ -4928,6 +4939,10 @@ lolex@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362"
long@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
long@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@ -7778,9 +7793,9 @@ socket.io@1.7.3:
socket.io-client "1.7.3"
socket.io-parser "2.3.1"
sockjs-client@1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
sockjs-client@1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
dependencies:
debug "^2.6.6"
eventsource "0.1.6"
@ -8559,9 +8574,9 @@ webpack-dev-middleware@^1.12.0:
range-parser "^1.0.3"
time-stamp "^2.0.0"
webpack-dev-server@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz#9a08d13c4addd1e3b6d8ace116e86715094ad5b4"
webpack-dev-server@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.5.tgz#87477252e1ac6789303fb8cd3e585fa5d508a401"
dependencies:
ansi-html "0.0.7"
array-includes "^3.0.3"
@ -8584,7 +8599,7 @@ webpack-dev-server@^3.1.4:
selfsigned "^1.9.1"
serve-index "^1.7.2"
sockjs "0.3.19"
sockjs-client "1.1.4"
sockjs-client "1.1.5"
spdy "^3.4.1"
strip-ansi "^3.0.0"
supports-color "^5.1.0"
@ -8608,22 +8623,22 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
webpack@^4.1.12:
version "4.12.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.12.0.tgz#14758e035ae69747f68dd0edf3c5a572a82bdee9"
webpack@^4.16.5:
version "4.16.5"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.5.tgz#29fb39462823d7eb8aefcab8b45f7f241db0d092"
dependencies:
"@webassemblyjs/ast" "1.5.12"
"@webassemblyjs/helper-module-context" "1.5.12"
"@webassemblyjs/wasm-edit" "1.5.12"
"@webassemblyjs/wasm-opt" "1.5.12"
"@webassemblyjs/wasm-parser" "1.5.12"
"@webassemblyjs/ast" "1.5.13"
"@webassemblyjs/helper-module-context" "1.5.13"
"@webassemblyjs/wasm-edit" "1.5.13"
"@webassemblyjs/wasm-opt" "1.5.13"
"@webassemblyjs/wasm-parser" "1.5.13"
acorn "^5.6.2"
acorn-dynamic-import "^3.0.0"
ajv "^6.1.0"
ajv-keywords "^3.1.0"
chrome-trace-event "^1.0.0"
enhanced-resolve "^4.0.0"
eslint-scope "^3.7.1"
enhanced-resolve "^4.1.0"
eslint-scope "^4.0.0"
json-parse-better-errors "^1.0.2"
loader-runner "^2.3.0"
loader-utils "^1.1.0"