diff --git a/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html b/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
index 9e057802e..9a7627a47 100644
--- a/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
+++ b/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
@@ -74,7 +74,7 @@
6
- Get the "Storage Container Name" in: All services -> Storage account -> Your_Storage_Account
+ Get the "Storage Container Name" in: All services -> Storage accounts -> Your_Storage_Account
-> Containers. It will be used to configure your tenant.
7
- Get the Storage Account Connection string with key to access Azure "Storage
- Account".
- Find the connection string here: Azure Portal -> Blob Storage account -> Access keys. It will be used to
- configure your tenant.
+ Get the Storage Account Connection string with key to access Azure "Storage Account".
+ Find the connection string here: All services -> Storage accounts -> Your_Storage_Account -> Access keys. It will be used to configure your tenant.
8
- Configure your Azure Subscription to send log to the Event Hub. Go to Subscription and click on "Resource
- providers". Search for "Event Grid", and make sure is registered in the "Resources providers".
+ Configure your Azure Subscription to send log to the Event Hub. Go to Subscription and click on "Resource
+ providers". Search for "Event Grid", and make sure is registered in the "Resources providers".
9
- Create a new Event by clicking in the "Events" -> "Event Subscription"
+ Create a new Event by clicking in the Events -> Event Subscription
10
- Configure the "Event Subscription" to send logs to the Event Hub created previously.
+ Configure the "Event Subscription" to send logs to the Event Hub created previously.
-
+ The input field Event Hub Shared access policies - Connection string refers to Azure's
Event Hub Shared Access Policies - Connection string-primary key: Value obtained in step 3
-
diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
index 9139a77c6..d5d200734 100644
--- a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
+++ b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
@@ -53,3 +53,7 @@
}
}
+
+.utm-box {
+ z-index: auto!important;
+}
diff --git a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
index e7ecc605c..7cd9ac161 100644
--- a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
+++ b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
@@ -2,6 +2,7 @@
[closeOnSelect]="true"
[clearable]="filter.clearable"
[items]="values"
+ [(ngModel)]="model"
[loadingText]="filter.loadingText"
[maxSelectedItems]="filter.maxSelectedItems"
[multiple]="filter.multiple"
diff --git a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
index 746c77fc4..b0438e2d2 100644
--- a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
+++ b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
@@ -1,27 +1,38 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core';
+import {Subject} from "rxjs";
+import {filter, takeUntil} from 'rxjs/operators';
import {DashboardBehavior} from '../../../../../behaviors/dashboard.behavior';
import {ElasticOperatorsEnum} from '../../../../../enums/elastic-operators.enum';
import {ElasticSearchIndexService} from '../../../../../services/elasticsearch/elasticsearch-index.service';
import {DashboardFilterType} from '../../../../../types/filter/dashboard-filter.type';
import {ElasticFilterType} from '../../../../../types/filter/elastic-filter.type';
+import {ChangeFilterValueService} from '../../services/change-filter-value.service';
@Component({
selector: 'app-dashboard-filter-select',
templateUrl: './dashboard-filter-select.component.html',
styleUrls: ['./dashboard-filter-select.component.css']
})
-export class DashboardFilterSelectComponent implements OnInit, OnChanges {
+export class DashboardFilterSelectComponent implements OnInit, OnChanges, OnDestroy {
@Input() filter: DashboardFilterType;
@Input() fullWidth = false;
values: any[];
isLoading = true;
+ model = null;
+ destroy$: Subject = new Subject();
constructor(private elasticSearchIndexService: ElasticSearchIndexService,
+ private changeFilterValueService: ChangeFilterValueService,
private dashboardBehavior: DashboardBehavior) {
}
ngOnInit() {
this.getFieldValues();
+ this.changeFilterValueService.selectedValue$
+ .pipe(
+ takeUntil(this.destroy$),
+ filter(res => res && this.filter.field === res.field))
+ .subscribe(res => this.model = res.value);
}
ngOnChanges(changes: SimpleChanges) {
@@ -30,7 +41,6 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
}
}
-
getFieldValues() {
const req = {
page: 0,
@@ -43,7 +53,6 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
this.values = res.body;
this.isLoading = false;
});
-
}
select($event: any, filter: DashboardFilterType) {
@@ -54,4 +63,9 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
};
this.dashboardBehavior.$filterDashboard.next({filter: [elasticFilter], indexPattern: filter.indexPattern});
}
+
+ ngOnDestroy(): void {
+ this.destroy$.next();
+ this.destroy$.complete();
+ }
}
diff --git a/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts b/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
index 40d3763d4..99e03e760 100644
--- a/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
+++ b/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
providedIn: 'root'
})
export class ChangeFilterValueService {
- private selectedValueSubject = new BehaviorSubject<{ field: any, value: any }>(null);
+ private selectedValueSubject = new BehaviorSubject<{ field: any, value: any }>({field: undefined, value: undefined});
selectedValue$: Observable = this.selectedValueSubject.asObservable();