mirror of https://github.com/status-im/consul.git
ui: Use ember-on-resize-modifier to fix bug with sidebar (#9761)
* Use ember-on-resize-modifier to fix bug with sidebar * Fix recursive height by dynamically setting fixed height * Refactor
This commit is contained in:
parent
b9d22f48cd
commit
1b5087f6e5
|
@ -1,5 +1,3 @@
|
||||||
{{on-window 'resize' (action this.getIconPositions)}}
|
|
||||||
|
|
||||||
{{#if (gt @lines.length 0)}}
|
{{#if (gt @lines.length 0)}}
|
||||||
<svg
|
<svg
|
||||||
{{did-insert this.getIconPositions}}
|
{{did-insert this.getIconPositions}}
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
{{on-window 'resize' (action this.calculate)}}
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
{{did-insert (action this.calculate)}}
|
{{on-resize this.calculate}}
|
||||||
{{did-update (action this.calculate) @topology.Upstreams @topology.Downstreams}}
|
|
||||||
class="topology-container consul-topology-metrics"
|
class="topology-container consul-topology-metrics"
|
||||||
>
|
>
|
||||||
{{#if (gt @topology.Downstreams.length 0)}}
|
{{#if (gt @topology.Downstreams.length 0)}}
|
||||||
<div id="downstream-container">
|
<div
|
||||||
|
id="downstream-container"
|
||||||
|
{{did-insert this.setHeight 'downstream-lines'}}
|
||||||
|
{{did-update this.setHeight 'downstream-lines' @topology.Downstreams}}
|
||||||
|
>
|
||||||
<div>
|
<div>
|
||||||
<p>{{@dc}}</p>
|
<p>{{@dc}}</p>
|
||||||
<span>
|
<span>
|
||||||
|
@ -83,7 +84,11 @@
|
||||||
{{#if (gt @topology.Upstreams.length 0)}}
|
{{#if (gt @topology.Upstreams.length 0)}}
|
||||||
<div id="upstream-column">
|
<div id="upstream-column">
|
||||||
{{#each-in (group-by "Datacenter" @topology.Upstreams) as |dc upstreams|}}
|
{{#each-in (group-by "Datacenter" @topology.Upstreams) as |dc upstreams|}}
|
||||||
<div id="upstream-container">
|
<div
|
||||||
|
id="upstream-container"
|
||||||
|
{{did-insert this.setHeight 'upstream-lines'}}
|
||||||
|
{{did-update this.setHeight 'upstream-lines' @topology.Upstreams}}
|
||||||
|
>
|
||||||
<p>{{dc}}</p>
|
<p>{{dc}}</p>
|
||||||
{{#each upstreams as |item|}}
|
{{#each upstreams as |item|}}
|
||||||
<TopologyMetrics::Card
|
<TopologyMetrics::Card
|
||||||
|
|
|
@ -67,6 +67,16 @@ export default class TopologyMetrics extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
// =actions
|
// =actions
|
||||||
|
@action
|
||||||
|
setHeight(el, item) {
|
||||||
|
if (el) {
|
||||||
|
const container = el.getBoundingClientRect();
|
||||||
|
document.getElementById(`${item[0]}`).setAttribute('style', `height:${container.height}px`);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.calculate();
|
||||||
|
}
|
||||||
|
|
||||||
@action
|
@action
|
||||||
calculate() {
|
calculate() {
|
||||||
if (this.args.isRemoteDC) {
|
if (this.args.isRemoteDC) {
|
||||||
|
@ -78,8 +88,8 @@ export default class TopologyMetrics extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculate viewBox dimensions
|
// Calculate viewBox dimensions
|
||||||
this.downView = document.querySelector('#downstream-lines').getBoundingClientRect();
|
this.downView = document.getElementById('downstream-lines').getBoundingClientRect();
|
||||||
this.upView = document.querySelector('#upstream-lines').getBoundingClientRect();
|
this.upView = document.getElementById('upstream-lines').getBoundingClientRect();
|
||||||
|
|
||||||
// Get Card elements positions
|
// Get Card elements positions
|
||||||
const downCards = [...document.querySelectorAll('#downstream-container .card')];
|
const downCards = [...document.querySelectorAll('#downstream-container .card')];
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#downstream-lines,
|
#downstream-lines,
|
||||||
#upstream-lines {
|
#upstream-lines {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
|
||||||
}
|
}
|
||||||
#downstream-lines {
|
#downstream-lines {
|
||||||
margin-left: -20px;
|
margin-left: -20px;
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
{{on-window 'resize' (action this.getIconPositions)}}
|
|
||||||
|
|
||||||
{{#if (gt @lines.length 0)}}
|
{{#if (gt @lines.length 0)}}
|
||||||
<svg
|
<svg
|
||||||
{{did-insert this.getIconPositions}}
|
{{did-insert this.getIconPositions}}
|
||||||
|
|
Loading…
Reference in New Issue