+
tenant-profile.no-queue
diff --git a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.scss b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.scss
index 9702d807a6..189badf9fd 100644
--- a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.scss
+++ b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.scss
@@ -13,15 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@import '../../../../../../scss/constants';
:host {
.tb-tenant-profile-queues {
- &.mat-padding {
- padding: 8px;
- @media #{$mat-gt-sm} {
- padding: 16px;
- }
+ .mat-expansion-panel-body {
+ padding-bottom: 0 !important;
}
}
diff --git a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
index abcde44419..a403f8e82e 100644
--- a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
@@ -14,16 +14,16 @@
/// limitations under the License.
///
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { Component, forwardRef, Input, OnDestroy } from '@angular/core';
import {
AbstractControl,
ControlValueAccessor,
FormArray,
FormBuilder,
- FormControl,
FormGroup,
NG_VALIDATORS,
NG_VALUE_ACCESSOR,
+ ValidationErrors,
Validator,
Validators
} from '@angular/forms';
@@ -32,6 +32,7 @@ import { AppState } from '@app/core/core.state';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { Subscription } from 'rxjs';
import { QueueInfo } from '@shared/models/queue.models';
+import { UtilsService } from '@core/services/utils.service';
@Component({
selector: 'tb-tenant-profile-queues',
@@ -50,7 +51,7 @@ import { QueueInfo } from '@shared/models/queue.models';
}
]
})
-export class TenantProfileQueuesComponent implements ControlValueAccessor, OnInit, Validator {
+export class TenantProfileQueuesComponent implements ControlValueAccessor, Validator, OnDestroy {
tenantProfileQueuesFormGroup: FormGroup;
newQueue = false;
@@ -67,11 +68,12 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
@Input()
disabled: boolean;
- private valueChangeSubscription: Subscription = null;
+ private valueChangeSubscription$: Subscription = null;
private propagateChange = (v: any) => { };
constructor(private store: Store
,
+ private utils: UtilsService,
private fb: FormBuilder) {
}
@@ -79,6 +81,12 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
this.propagateChange = fn;
}
+ ngOnDestroy() {
+ if (this.valueChangeSubscription$) {
+ this.valueChangeSubscription$.unsubscribe();
+ }
+ }
+
registerOnTouched(fn: any): void {
}
@@ -88,7 +96,7 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
});
}
- queuesFormArray(): FormArray {
+ get queuesFormArray(): FormArray {
return this.tenantProfileQueuesFormGroup.get('queues') as FormArray;
}
@@ -102,8 +110,8 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
}
writeValue(queues: Array | null): void {
- if (this.valueChangeSubscription) {
- this.valueChangeSubscription.unsubscribe();
+ if (this.valueChangeSubscription$) {
+ this.valueChangeSubscription$.unsubscribe();
}
const queuesControls: Array = [];
if (queues) {
@@ -117,7 +125,7 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
} else {
this.tenantProfileQueuesFormGroup.enable({emitEvent: false});
}
- this.valueChangeSubscription = this.tenantProfileQueuesFormGroup.valueChanges.subscribe(() => {
+ this.valueChangeSubscription$ = this.tenantProfileQueuesFormGroup.valueChanges.subscribe(value => {
this.updateModel();
});
}
@@ -163,14 +171,18 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, OnIni
}
}
- public validate(c: FormControl) {
- return (this.tenantProfileQueuesFormGroup.valid) ? null : {
+ public validate(c: AbstractControl): ValidationErrors | null {
+ return this.tenantProfileQueuesFormGroup.valid ? null : {
queues: {
valid: false,
},
};
}
+ getName(value) {
+ return this.utils.customTranslation(value, value);
+ }
+
private updateModel() {
const queues: Array = this.tenantProfileQueuesFormGroup.get('queues').value;
this.propagateChange(queues);
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.html
index 81ca768911..5cf574a0e4 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.html
@@ -16,17 +16,8 @@
-->
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
index 4b511037e7..789ba8590a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
@@ -68,13 +68,13 @@
{{'tenant.isolated-tb-rule-engine-details' | translate}}