-
+
diff --git a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html index 0fa7f1d18..b5d8ddfa1 100644 --- a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html +++ b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html @@ -1,15 +1,22 @@ - -
-
-
-
-
-
-
-
{{dataPoint.title}}
-
{{dataPoint.count}}
-
+ +
+
+
+
+
+
+
+
+
{{dataPoint.title}}
+
{{dataPoint.count}}
+
- +
+ + + + diff --git a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts index 6d0f3b1c7..a199ae31e 100644 --- a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts +++ b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts @@ -108,6 +108,8 @@ export class DashboardTileComponent implements OnInit, AfterViewInit, OnChanges this.options.title.text = this.data.displayTitle; this.options.subtitle.text = this.data.count.toString(); + this.options.accessibility.description = this.data.acessibilityText; + const data = this.getDataSet(); this.options.tooltip.enabled = data.length === 3; (this.options.series[0] as SeriesPieOptions).data = data; diff --git a/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html b/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html index b33954473..5afdeb385 100644 --- a/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html +++ b/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html @@ -9,13 +9,11 @@ -
-
- - {{showControls ? '' : 'Show Controls'}} -
-
+
-
- + diff --git a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts index a199ae31e..6d0f3b1c7 100644 --- a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts +++ b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.ts @@ -108,8 +108,6 @@ export class DashboardTileComponent implements OnInit, AfterViewInit, OnChanges this.options.title.text = this.data.displayTitle; this.options.subtitle.text = this.data.count.toString(); - this.options.accessibility.description = this.data.acessibilityText; - const data = this.getDataSet(); this.options.tooltip.enabled = data.length === 3; (this.options.series[0] as SeriesPieOptions).data = data; diff --git a/src/SfxWeb/src/app/modules/clustermap/section-overview/section-overview.component.html b/src/SfxWeb/src/app/modules/clustermap/section-overview/section-overview.component.html index e58771651..ef4ff5e10 100644 --- a/src/SfxWeb/src/app/modules/clustermap/section-overview/section-overview.component.html +++ b/src/SfxWeb/src/app/modules/clustermap/section-overview/section-overview.component.html @@ -9,18 +9,18 @@
-
{{repairInfo.inProgress}}/{{repairInfo.recent}}
-
{{info.statusTypeCounts[constants.Disabled]}}/{{info.statusTypeCounts[constants.Disabling]}}
-
+
{{info.statusTypeCounts[constants.Down]}}
diff --git a/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.ts b/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.ts index 77de59488..c2eae3386 100644 --- a/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.ts +++ b/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.ts @@ -80,7 +80,6 @@ export class DetailListComponent implements OnInit, OnDestroy { displayPath: this.displayPath }); - this.liveAnnouncer.announce(`There are ${this.sortedFilteredList.length} items in the search result`); }); } diff --git a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.html b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.html index 99c607e0c..1aff640f0 100644 --- a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.html +++ b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.html @@ -1,5 +1,5 @@ -
+
@@ -7,8 +7,7 @@
  • @@ -16,7 +15,7 @@
  • diff --git a/src/SfxWeb/src/app/shared/component/navbar/navbar.component.html b/src/SfxWeb/src/app/shared/component/navbar/navbar.component.html index 5486e4661..c556de188 100644 --- a/src/SfxWeb/src/app/shared/component/navbar/navbar.component.html +++ b/src/SfxWeb/src/app/shared/component/navbar/navbar.component.html @@ -1,21 +1,22 @@
    -
    -
    - -
    -

    - - {{type}} - {{name}} - - -

    -
    -
    - {{tab.name}} - -
    +
    +
    +

    + + {{type}} + {{name}} + + +

    +
    + {{tab.name}} + +
    +
    +
    +
    -
    +
    diff --git a/src/SfxWeb/src/app/shared/component/navbar/navbar.component.scss b/src/SfxWeb/src/app/shared/component/navbar/navbar.component.scss index c89dc8d0b..28e96cb17 100644 --- a/src/SfxWeb/src/app/shared/component/navbar/navbar.component.scss +++ b/src/SfxWeb/src/app/shared/component/navbar/navbar.component.scss @@ -11,6 +11,9 @@ .detail-view-title-bar { padding-bottom: 18px; position: relative; + display: flex; + justify-content: space-between; + flex-wrap: wrap; .detail-view-title { overflow: hidden; @@ -33,14 +36,11 @@ .detail-view-navbar-tab { white-space: nowrap; text-overflow: ellipsis; - - a { - text-align: right; - text-decoration: none; - text-transform: capitalize; - color: var(--font-accent-color); - font-size: var(--font-size-large); - } + text-align: right; + text-decoration: none; + text-transform: capitalize; + color: var(--font-accent-color); + font-size: var(--font-size-large); .tab-superscript { display: inline-block; diff --git a/src/SfxWeb/src/app/shared/component/refresh-rate/refresh-rate.component.ts b/src/SfxWeb/src/app/shared/component/refresh-rate/refresh-rate.component.ts index c4074faf2..ef0eae28b 100644 --- a/src/SfxWeb/src/app/shared/component/refresh-rate/refresh-rate.component.ts +++ b/src/SfxWeb/src/app/shared/component/refresh-rate/refresh-rate.component.ts @@ -1,3 +1,4 @@ +import { LiveAnnouncer } from '@angular/cdk/a11y'; import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; @Component({ @@ -27,6 +28,8 @@ export class RefreshRateComponent { 5: '5', }; + constructor(private liveAnnouncer: LiveAnnouncer) { } + changed() { this.change(this.refreshRate); } @@ -38,13 +41,11 @@ export class RefreshRateComponent { if (emitValue){ this.rateChange.emit(this.displayRate); } + + this.liveAnnouncer.announce(`The refresh rate is ${this.displayRate}`) } forceRefresh() { this.forceRefreshed.emit(); } - - - constructor() { } - } diff --git a/src/SfxWeb/src/app/shared/component/toggle/toggle.component.scss b/src/SfxWeb/src/app/shared/component/toggle/toggle.component.scss index 72b224e22..b30467c40 100644 --- a/src/SfxWeb/src/app/shared/component/toggle/toggle.component.scss +++ b/src/SfxWeb/src/app/shared/component/toggle/toggle.component.scss @@ -43,7 +43,8 @@ $border-radius: 50px; width: 18px; left: 4px; bottom: 1px; - background-color: white; + box-sizing: border-box; + border: 9px solid; -webkit-transition: .25s; transition: .25s; border-radius: $border-radius; diff --git a/src/SfxWeb/src/styles.scss b/src/SfxWeb/src/styles.scss index a18d2a49a..af4575f7d 100644 --- a/src/SfxWeb/src/styles.scss +++ b/src/SfxWeb/src/styles.scss @@ -672,3 +672,8 @@ table.detail-list { padding-left: 10px; box-shadow: var(--primary-box-shadow); } + + +.hidden { + visibility: hidden; +} From 6f56f5a1ef011b7a2037a57a9b0942ea92c8a8a4 Mon Sep 17 00:00:00 2001 From: jeffj6123 Date: Wed, 1 Jun 2022 11:06:12 -0700 Subject: [PATCH 6/9] wip --- .../dashboard-tile.component.html | 7 +++- .../detail-list/detail-list.component.html | 2 +- .../event-store-timeline.component.html | 2 +- .../event-store/event-store.component.html | 2 +- .../event-store/event-store.component.scss | 2 +- .../advanced-option.component.html | 2 +- .../advanced-option.component.ts | 33 ++++++++++++++-- .../refresh-rate/refresh-rate.component.scss | 39 +++++++++++++++++++ .../cluster/metrics/metrics.component.html | 2 +- .../cluster/metrics/metrics.component.scss | 6 +++ 10 files changed, 87 insertions(+), 10 deletions(-) diff --git a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html index 44acf622f..da88a369c 100644 --- a/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html +++ b/src/SfxWeb/src/app/modules/charts/dashboard-tile/dashboard-tile.component.html @@ -17,6 +17,11 @@
    - + +
    + +
    +     +     diff --git a/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.html b/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.html index 0a51775fd..c68911418 100644 --- a/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.html +++ b/src/SfxWeb/src/app/modules/detail-list-templates/detail-list/detail-list.component.html @@ -101,7 +101,7 @@
    -
    diff --git a/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html b/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html index 5afdeb385..a909a6e1d 100644 --- a/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html +++ b/src/SfxWeb/src/app/modules/event-store/event-store-timeline/event-store-timeline.component.html @@ -47,7 +47,7 @@
    -
    • diff --git a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.scss b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.scss index ce186f118..9cf5311be 100644 --- a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.scss +++ b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.scss @@ -23,6 +23,13 @@ tr { label { margin-bottom: 0px; width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + >:last-child { + margin-left: auto; + } } input { diff --git a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.ts b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.ts index 3bbd9f91e..c04b85eb7 100644 --- a/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.ts +++ b/src/SfxWeb/src/app/shared/component/advanced-option/advanced-option.component.ts @@ -10,15 +10,6 @@ import { Utils } from 'src/app/Utils/Utils'; import { TelemetryService } from 'src/app/services/telemetry.service'; import { environment } from 'src/environments/environment'; -// let isParent = (element: Element, s: Element) => { -// let el = element; -// do { -// if (Element.prototype.matches.call(element, s)) return element; -// el = (element.parentElement || element.parentNode) as Element; -// } while (element !== null && element.nodeType === 1); -// return null; -// }; - @Component({ selector: 'app-advanced-option', templateUrl: './advanced-option.component.html', @@ -56,17 +47,25 @@ export class AdvancedOptionComponent implements OnInit { @HostListener("document:click", ["$event"]) handleClickEvent(event: PointerEvent) { - if(this.dropdown.isOpen() && !event.target['closest']("#container")) { + try { + if(this.dropdown.isOpen() && !event.target['closest']("#container")) { this.dropdown.close(); + } + } catch(e) { + console.log(e) } } @HostListener("document:keyup", ["$event"]) handleEscapeKey(event: KeyboardEvent) { - if (event.key == "Escape") { - if (this.dropdown.isOpen() && this.tooltips.toArray().every(tooltip => !tooltip.isOpen())) { - this.dropdown.close(); + try { + if (event.key == "Escape") { + if (this.dropdown.isOpen() && this.tooltips.toArray().every(tooltip => !tooltip.isOpen())) { + this.dropdown.close(); + } } + } catch(e) { + console.log(e) } } diff --git a/src/SfxWeb/src/app/views/cluster/base/base.component.html b/src/SfxWeb/src/app/views/cluster/base/base.component.html index 33e450c63..4a7d8e585 100644 --- a/src/SfxWeb/src/app/views/cluster/base/base.component.html +++ b/src/SfxWeb/src/app/views/cluster/base/base.component.html @@ -1,5 +1,5 @@ - +