Commit af925ecf authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Added specs for rendered output, changed the background for stable tracks

parent 443a34e8
<script> <script>
import { convertToSentenceCase } from '~/lib/utils/text_utility'; import { convertToSentenceCase } from '~/lib/utils/text_utility';
import { s__ } from '~/locale';
export default { export default {
props: { props: {
...@@ -74,6 +75,10 @@ export default { ...@@ -74,6 +75,10 @@ export default {
yAxisLabelSentenceCase() { yAxisLabelSentenceCase() {
return `${convertToSentenceCase(this.yAxisLabel)} (${this.unitOfDisplay})`; return `${convertToSentenceCase(this.yAxisLabel)} (${this.unitOfDisplay})`;
}, },
timeString() {
return s__('PrometheusDashboard|Time');
},
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -131,7 +136,7 @@ export default { ...@@ -131,7 +136,7 @@ export default {
:y="yPosition" :y="yPosition"
dy=".35em" dy=".35em"
> >
Time {{ timeString }}
</text> </text>
</g> </g>
</template> </template>
...@@ -17,6 +17,13 @@ export default { ...@@ -17,6 +17,13 @@ export default {
required: true, required: true,
}, },
}, },
methods: {
isStable(track) {
return {
'prometheus-table-row-highlight': track.trackName !== 'Canary' && track.renderCanary,
};
},
},
}; };
</script> </script>
<template> <template>
...@@ -26,6 +33,7 @@ export default { ...@@ -26,6 +33,7 @@ export default {
v-for="(series, index) in timeSeries" v-for="(series, index) in timeSeries"
:key="index" :key="index"
v-if="series.shouldRenderLegend" v-if="series.shouldRenderLegend"
:class="isStable(series)"
> >
<td> <td>
<strong v-if="series.renderCanary">{{ series.trackName }}</strong> <strong v-if="series.renderCanary">{{ series.trackName }}</strong>
...@@ -53,7 +61,9 @@ export default { ...@@ -53,7 +61,9 @@ export default {
:track="track" :track="track"
:key="`track-line-${trackIndex}`"/> :key="`track-line-${trackIndex}`"/>
<td :key="`track-info-${trackIndex}`"> <td :key="`track-info-${trackIndex}`">
<track-info :track="track" /> <track-info
class="legend-metric-title"
:track="track" />
</td> </td>
</template> </template>
</tr> </tr>
......
...@@ -7,10 +7,10 @@ export default { ...@@ -7,10 +7,10 @@ export default {
required: true, required: true,
}, },
}, },
methods: { computed: {
strokeDashArray(type) { stylizedLine() {
if (type === 'dashed') return '6, 3'; if (this.track.lineStyle === 'dashed') return '6, 3';
if (type === 'dotted') return '3, 3'; if (this.track.lineStyle === 'dotted') return '3, 3';
return null; return null;
}, },
}, },
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
width="15" width="15"
height="6"> height="6">
<line <line
:stroke-dasharray="strokeDashArray(track.lineStyle)" :stroke-dasharray="stylizedLine"
:stroke="track.lineColor" :stroke="track.lineColor"
stroke-width="4" stroke-width="4"
:x1="0" :x1="0"
......
...@@ -802,3 +802,8 @@ $border-color-settings: #e1e1e1; ...@@ -802,3 +802,8 @@ $border-color-settings: #e1e1e1;
Modals Modals
*/ */
$modal-body-height: 134px; $modal-body-height: 134px;
/*
Prometheus
*/
$prometheus-table-row-highlight-color: $theme-gray-100;
...@@ -481,6 +481,11 @@ ...@@ -481,6 +481,11 @@
vertical-align: top; vertical-align: top;
} }
} }
.legend-metric-title {
font-size: 12px;
vertical-align: middle;
}
} }
.prometheus-svg-container { .prometheus-svg-container {
...@@ -570,6 +575,10 @@ ...@@ -570,6 +575,10 @@
} }
} }
.prometheus-table-row-highlight {
background-color: $prometheus-table-row-highlight-color;
}
// EE-only // EE-only
.cluster-health-graphs { .cluster-health-graphs {
.prometheus-state { .prometheus-state {
......
...@@ -28,4 +28,17 @@ describe('TrackInfo component', () => { ...@@ -28,4 +28,17 @@ describe('TrackInfo component', () => {
expect(vm.summaryMetrics).toEqual('Avg: 0.000 · Max: 0.000'); expect(vm.summaryMetrics).toEqual('Avg: 0.000 · Max: 0.000');
}); });
}); });
describe('Rendered output', () => {
beforeEach(() => {
vm = mountComponent(Component, { track: timeSeries[0] });
});
it('contains metric tag and the summary metrics', () => {
const metricTag = vm.$el.querySelector('strong');
expect(metricTag.textContent.trim()).toEqual(vm.track.metricTag);
expect(vm.$el.textContent).toContain('Avg: 0.000 · Max: 0.000');
});
});
}); });
...@@ -20,16 +20,33 @@ describe('TrackLine component', () => { ...@@ -20,16 +20,33 @@ describe('TrackLine component', () => {
}); });
describe('Computed props', () => { describe('Computed props', () => {
beforeEach(() => { it('stylizedLine for dashed lineStyles', () => {
vm = mountComponent(Component, { track: timeSeries[0] }); vm = mountComponent(Component, { track: { ...timeSeries[0], lineStyle: 'dashed' } });
expect(vm.stylizedLine).toEqual('6, 3');
}); });
it('strokeDashArray', () => { it('stylizedLine for dotted lineStyles', () => {
const dashedArray = vm.strokeDashArray('dashed'); vm = mountComponent(Component, { track: { ...timeSeries[0], lineStyle: 'dotted' } });
const dottedArray = vm.strokeDashArray('dotted');
expect(vm.stylizedLine).toEqual('3, 3');
});
});
describe('Rendered output', () => {
it('has an svg with a line', () => {
vm = mountComponent(Component, { track: { ...timeSeries[0] } });
const svgEl = vm.$el.querySelector('svg');
const lineEl = vm.$el.querySelector('svg line');
expect(svgEl.getAttribute('width')).toEqual('15');
expect(svgEl.getAttribute('height')).toEqual('6');
expect(dashedArray).toEqual('6, 3'); expect(lineEl.getAttribute('stroke-width')).toEqual('4');
expect(dottedArray).toEqual('3, 3'); expect(lineEl.getAttribute('x1')).toEqual('0');
expect(lineEl.getAttribute('x2')).toEqual('15');
expect(lineEl.getAttribute('y1')).toEqual('2');
expect(lineEl.getAttribute('y2')).toEqual('2');
}); });
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment