diff --git a/frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.ts b/frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.ts index 467261ea2..9539a0f6f 100644 --- a/frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.ts +++ b/frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.ts @@ -117,7 +117,7 @@ export class EventTimelineComponent implements OnInit, AfterViewInit { return 'utm_tmlabel_user_selected'; } } else { - return 'utm_tmlabel_not_found'; + return 'utm_tmlabel_not_found_selected'; } } diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index a030c473c..a56619aa7 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -71,15 +71,12 @@ export class AppComponent implements OnInit { this.offline = false; if (this.router.url === '/') { this.hideOnline = false; - this.utmToastService.showSuccess('Connection to the UTMStack API was successful.'); } setTimeout(() => { this.hideOnline = true; }, 3000); } else if (result != null && !result && !this.offline) { this.offline = true; - this.utmToastService.showError('Error trying to connect to API', 'An error occurred while trying to connect to the API, ' + - 'please check the UTMStack API connection and try again.'); } }); this.router.events.subscribe(evt => { @@ -125,8 +122,6 @@ export class AppComponent implements OnInit { } }, error => { this.offline = true; - this.utmToastService.showError('Error trying to connect to API', 'An error occurred while trying to connect to the API, ' + - 'please check the UTMStack API connection and try again.'); }); } diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.html b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.html index 5a27d957a..cd8307b45 100644 --- a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.html +++ b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.html @@ -81,7 +81,7 @@ [disabled]="!reportId" class="btn utm-button utm-button-primary ml-2"> - {{report ? 'Edit' : 'Create'}} compliance + {{report ? 'Edit' : 'Create'}} schedule diff --git a/frontend/src/app/compliance/shared/components/utm-cp-cron-editor/utm-cp-cron-editor.component.scss b/frontend/src/app/compliance/shared/components/utm-cp-cron-editor/utm-cp-cron-editor.component.scss index 0cfe0c7b8..983baa687 100644 --- a/frontend/src/app/compliance/shared/components/utm-cp-cron-editor/utm-cp-cron-editor.component.scss +++ b/frontend/src/app/compliance/shared/components/utm-cp-cron-editor/utm-cp-cron-editor.component.scss @@ -1,18 +1,4 @@ -/*.margin-bottom{ - margin-bottom: 1.8em; -} - -@media (min-width: 576px) { - .flex-basics-30 { - flex-basis: 32%; - } - - .flex-basics-50 { - flex-basis: 48%; - } -}*/ - .badge.badge-lg.badge-circle { width: 2rem; height: 2rem; diff --git a/frontend/src/app/logstash/logstash-pipelines/logstash-pipelines.component.html b/frontend/src/app/logstash/logstash-pipelines/logstash-pipelines.component.html index 40f92362e..4666563d5 100644 --- a/frontend/src/app/logstash/logstash-pipelines/logstash-pipelines.component.html +++ b/frontend/src/app/logstash/logstash-pipelines/logstash-pipelines.component.html @@ -32,7 +32,8 @@