Repository: ignite Updated Branches: refs/heads/master 1ad9b9c4a -> 6f39115e3
IGNITE-9565 Web Console: Fixed charts update logic. Fixed minor CSS issues. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f39115e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f39115e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f39115e Branch: refs/heads/master Commit: 6f39115e3b4295c3cd8d1c517d3cd2204dd12e2e Parents: 1ad9b9c Author: Alexander Kalinin <verba...@yandex.ru> Authored: Fri Sep 28 18:04:39 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Fri Sep 28 18:04:39 2018 +0700 ---------------------------------------------------------------------- .../ignite-chart-series-selector/template.pug | 2 +- .../app/components/ignite-chart/controller.js | 4 ++-- .../frontend/app/components/ignite-chart/style.scss | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f39115e/modules/web-console/frontend/app/components/ignite-chart-series-selector/template.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/ignite-chart-series-selector/template.pug b/modules/web-console/frontend/app/components/ignite-chart-series-selector/template.pug index fec0d9a..203f12f 100644 --- a/modules/web-console/frontend/app/components/ignite-chart-series-selector/template.pug +++ b/modules/web-console/frontend/app/components/ignite-chart-series-selector/template.pug @@ -24,6 +24,6 @@ button.btn-ignite.btn-ignite--link-dashed-secondary( bs-on-before-show='$ctrl.onShow' data-multiple='true' ng-transclude - ng-show='$ctrl.charts.length' + ng-disabled='!($ctrl.charts.length)' ) svg(ignite-icon='gear').icon http://git-wip-us.apache.org/repos/asf/ignite/blob/6f39115e/modules/web-console/frontend/app/components/ignite-chart/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/ignite-chart/controller.js b/modules/web-console/frontend/app/components/ignite-chart/controller.js index 5ae536e..79156fc 100644 --- a/modules/web-console/frontend/app/components/ignite-chart/controller.js +++ b/modules/web-console/frontend/app/components/ignite-chart/controller.js @@ -93,8 +93,8 @@ export class IgniteChartController { if (this.chart && _.get(changes, 'refreshRate.currentValue')) this.onRefreshRateChanged(_.get(changes, 'refreshRate.currentValue')); - // TODO: Investigate other signaling for resetting component state. - if (changes.chartDataPoint && _.isNil(changes.chartDataPoint.currentValue)) { + if ((changes.chartDataPoint && _.isNil(changes.chartDataPoint.currentValue)) || + (changes.chartHistory && _.isEmpty(changes.chartHistory.currentValue))) { this.clearDatasets(); return; http://git-wip-us.apache.org/repos/asf/ignite/blob/6f39115e/modules/web-console/frontend/app/components/ignite-chart/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/ignite-chart/style.scss b/modules/web-console/frontend/app/components/ignite-chart/style.scss index be0fb6d..3a07bd5 100644 --- a/modules/web-console/frontend/app/components/ignite-chart/style.scss +++ b/modules/web-console/frontend/app/components/ignite-chart/style.scss @@ -41,9 +41,25 @@ ignite-chart { line-height: 36px; } + ignite-chart-series-selector { + margin: 0 2px; + } + > div { + &:first-child { + width: calc(100% - 120px); + white-space: nowrap; + } + display: flex; align-items: center; + flex-wrap: nowrap; + flex-grow: 0; + + .chart-text { + overflow: hidden; + text-overflow: ellipsis; + } } }
