Commit daf15c3c authored by Mike Greiling's avatar Mike Greiling

rename and organize vue components

parent 4809ded8
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
import _ from 'underscore'; import _ from 'underscore';
import statusCodes from '../../lib/utils/http_status'; import statusCodes from '../../lib/utils/http_status';
import MonitoringService from '../services/monitoring_service'; import MonitoringService from '../services/monitoring_service';
import monitoringRow from './monitoring_row.vue'; import GraphRow from './graph_row.vue';
import monitoringState from './monitoring_state.vue'; import EmptyState from './empty_state.vue';
import MonitoringStore from '../stores/monitoring_store'; import MonitoringStore from '../stores/monitoring_store';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
}, },
components: { components: {
monitoringRow, GraphRow,
monitoringState, EmptyState,
}, },
methods: { methods: {
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
this.updatedAspectRatios = 0; this.updatedAspectRatios = 0;
} }
}, },
}, },
created() { created() {
...@@ -132,7 +131,7 @@ ...@@ -132,7 +131,7 @@
<h4>{{groupData.group}}</h4> <h4>{{groupData.group}}</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<monitoring-row <graph-row
v-for="(row, index) in groupData.metrics" v-for="(row, index) in groupData.metrics"
:key="index" :key="index"
:row-data="row" :row-data="row"
...@@ -144,7 +143,7 @@ ...@@ -144,7 +143,7 @@
</div> </div>
</div> </div>
</div> </div>
<monitoring-state <empty-state
:selected-state="state" :selected-state="state"
:documentation-path="documentationPath" :documentation-path="documentationPath"
:settings-path="settingsPath" :settings-path="settingsPath"
......
<script> <script>
import d3 from 'd3'; import d3 from 'd3';
import monitoringLegends from './monitoring_legends.vue'; import GraphLegend from './graph/legend.vue';
import monitoringFlag from './monitoring_flag.vue'; import GraphFlag from './graph/flag.vue';
import monitoringDeployment from './monitoring_deployment.vue'; import GraphDeployment from './graph/deployment.vue';
import MonitoringMixin from '../mixins/monitoring_mixins'; import MonitoringMixin from '../mixins/monitoring_mixins';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import measurements from '../utils/measurements'; import measurements from '../utils/measurements';
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
export default { export default {
props: { props: {
columnData: { graphData: {
type: Object, type: Object,
required: true, required: true,
}, },
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
}, },
components: { components: {
monitoringLegends, GraphLegend,
monitoringFlag, GraphFlag,
monitoringDeployment, GraphDeployment,
}, },
computed: { computed: {
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
methods: { methods: {
draw() { draw() {
const breakpointSize = bp.getBreakpointSize(); const breakpointSize = bp.getBreakpointSize();
const query = this.columnData.queries[0]; const query = this.graphData.queries[0];
this.margin = measurements.large.margin; this.margin = measurements.large.margin;
if (breakpointSize === 'xs' || breakpointSize === 'sm') { if (breakpointSize === 'xs' || breakpointSize === 'sm') {
this.graphHeight = 300; this.graphHeight = 300;
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
} }
this.data = query.result[0].values; this.data = query.result[0].values;
this.unitOfDisplay = query.unit || ''; this.unitOfDisplay = query.unit || '';
this.yAxisLabel = this.columnData.y_label || 'Values'; this.yAxisLabel = this.graphData.y_label || 'Values';
this.legendTitle = query.label || 'Average'; this.legendTitle = query.label || 'Average';
this.graphWidth = this.$refs.baseSvg.clientWidth - this.graphWidth = this.$refs.baseSvg.clientWidth -
this.margin.left - this.margin.right; this.margin.left - this.margin.right;
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
:class="classType"> :class="classType">
<h5 <h5
class="text-center graph-title"> class="text-center graph-title">
{{columnData.title}} {{graphData.title}}
</h5> </h5>
<div <div
class="prometheus-svg-container" class="prometheus-svg-container"
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
class="y-axis" class="y-axis"
transform="translate(70, 20)"> transform="translate(70, 20)">
</g> </g>
<monitoring-legends <graph-legend
:graph-width="graphWidth" :graph-width="graphWidth"
:graph-height="graphHeight" :graph-height="graphHeight"
:margin="margin" :margin="margin"
...@@ -268,13 +268,13 @@ ...@@ -268,13 +268,13 @@
stroke-width="2" stroke-width="2"
transform="translate(-5, 20)"> transform="translate(-5, 20)">
</path> </path>
<monitoring-deployment <graph-deployment
:show-deploy-info="showDeployInfo" :show-deploy-info="showDeployInfo"
:deployment-data="reducedDeploymentData" :deployment-data="reducedDeploymentData"
:graph-height="graphHeight" :graph-height="graphHeight"
:graph-height-offset="graphHeightOffset" :graph-height-offset="graphHeightOffset"
/> />
<monitoring-flag <graph-flag
v-if="showFlag" v-if="showFlag"
:current-x-coordinate="currentXCoordinate" :current-x-coordinate="currentXCoordinate"
:current-y-coordinate="currentYCoordinate" :current-y-coordinate="currentYCoordinate"
......
<script> <script>
import { dateFormat, timeFormat } from '../utils/date_time_formatters'; import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
export default { export default {
props: { props: {
......
<script> <script>
import { dateFormat, timeFormat } from '../utils/date_time_formatters'; import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
export default { export default {
props: { props: {
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
}; };
</script> </script>
<template> <template>
<g <g
class="axis-label-container"> class="axis-label-container">
<line <line
class="label-x-axis-line" class="label-x-axis-line"
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
:width="yLabelWidth" :width="yLabelWidth"
:height="yLabelHeight"> :height="yLabelHeight">
</rect> </rect>
<text <text
class="label-axis-text y-label-text" class="label-axis-text y-label-text"
text-anchor="middle" text-anchor="middle"
:transform="textTransform" :transform="textTransform"
......
<script> <script>
import monitoringColumn from './monitoring_column.vue'; import Graph from './graph.vue';
export default { export default {
props: { props: {
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
}, },
}, },
components: { components: {
monitoringColumn, Graph,
}, },
computed: { computed: {
bootstrapClass() { bootstrapClass() {
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
<template> <template>
<div class="prometheus-row row"> <div class="prometheus-row row">
<monitoring-column <graph
v-for="(column, index) in rowData" v-for="(graphData, index) in rowData"
:column-data="column" :graph-data="graphData"
:class-type="bootstrapClass" :class-type="bootstrapClass"
:key="index" :key="index"
:update-aspect-ratio="updateAspectRatio" :update-aspect-ratio="updateAspectRatio"
......
import Vue from 'vue'; import Vue from 'vue';
import Monitoring from './components/monitoring.vue'; import Dashboard from './components/dashboard.vue';
document.addEventListener('DOMContentLoaded', () => new Vue({ document.addEventListener('DOMContentLoaded', () => new Vue({
el: '#prometheus-graphs', el: '#prometheus-graphs',
components: { components: {
'monitoring-dashboard': Monitoring, Dashboard,
}, },
render: createElement => createElement('monitoring-dashboard'), render: createElement => createElement('dashboard'),
})); }));
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