diff options
author | Jose Vargas <jvargas@gitlab.com> | 2018-09-25 16:43:43 -0500 |
---|---|---|
committer | Jose Vargas <jvargas@gitlab.com> | 2018-09-25 18:15:30 -0500 |
commit | 6ff8146dc23bd1c008a347ab7c4bfbfd8c2486a9 (patch) | |
tree | e19792355e1adb932308835947160e23f48df43b | |
parent | efedd968fb35a1113414885b48798c2723c7578d (diff) | |
download | gitlab-ce-6ff8146dc23bd1c008a347ab7c4bfbfd8c2486a9.tar.gz |
Change forceRedraw key formatjivl-fix-monitoring-dashboard-resizing-navbar
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 6 | ||||
-rw-r--r-- | spec/javascripts/monitoring/dashboard_spec.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 228eff006f7..67338aa96c3 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -98,12 +98,12 @@ export default { state: 'gettingStarted', showEmptyState: true, hoverData: {}, - updateDashboardKeyNumber: 0, + elWidth: 0, }; }, computed: { forceRedraw() { - return `dashboard-key-${this.updateDashboardKeyNumber}`; + return this.elWidth; }, }, created() { @@ -165,7 +165,7 @@ export default { }); }, resize() { - this.updateDashboardKeyNumber += 1; + this.elWidth = this.$el.clientWidth; }, hoverChanged(data) { this.hoverData = data; diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js index a1953382531..f0d53b2d8d7 100644 --- a/spec/javascripts/monitoring/dashboard_spec.js +++ b/spec/javascripts/monitoring/dashboard_spec.js @@ -150,7 +150,7 @@ describe('Dashboard', () => { propsData: { ...propsData, hasMetrics: true, showPanels: false }, }); - expect(component.forceRedraw).toEqual('dashboard-key-0'); + expect(component.forceRedraw).toEqual(0); const navSidebarEl = document.querySelector('.nav-sidebar'); navSidebarEl.classList.add('nav-sidebar-collapsed'); @@ -161,7 +161,7 @@ describe('Dashboard', () => { return Vue.nextTick(); }) .then(() => { - expect(component.forceRedraw).toEqual('dashboard-key-1'); + expect(component.forceRedraw).toEqual(component.elWidth); done(); }) .catch(done.fail); |