From 29cf6b9704749c0fb31300afea16f952405b6dd4 Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Tue, 19 Sep 2023 15:04:10 +0300 Subject: [PATCH 1/2] UI: Set stepper label position to bottom --- .../template/template-notification-dialog.component.html | 2 +- .../template/template-notification-dialog.component.ts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html index 81ca756263..89cca4394a 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html @@ -29,7 +29,7 @@
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts index 983ad4b569..8ddb41fe37 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts @@ -54,7 +54,6 @@ export class TemplateNotificationDialogComponent @ViewChild('notificationTemplateStepper', {static: true}) notificationTemplateStepper: MatStepper; stepperOrientation: Observable; - stepperLabelPosition: Observable<'bottom' | 'end'>; dialogTitle = 'notification.edit-notification-template'; @@ -82,9 +81,6 @@ export class TemplateNotificationDialogComponent this.stepperOrientation = this.breakpointObserver.observe(MediaBreakpoints['gt-sm']) .pipe(map(({matches}) => matches ? 'horizontal' : 'vertical')); - this.stepperLabelPosition = this.breakpointObserver.observe(MediaBreakpoints['gt-md']) - .pipe(map(({matches}) => matches ? 'end' : 'bottom')); - if (isDefinedAndNotNull(this.data?.predefinedType)) { this.hideSelectType = true; this.templateNotificationForm.get('notificationType').setValue(this.data.predefinedType, {emitEvent: false}); From d7800e06a18da1dabc43fbb039ccb1354387e289 Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Tue, 19 Sep 2023 15:17:34 +0300 Subject: [PATCH 2/2] UI: Set label position to bottom --- .../notification/sent/sent-notification-dialog.component.html | 2 +- .../notification/sent/sent-notification-dialog.componet.ts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html index 7358e06d77..2a6c14c421 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html @@ -29,7 +29,7 @@
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts index 57ee325e90..ae5edd4890 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts @@ -63,7 +63,6 @@ export class SentNotificationDialogComponent extends @ViewChild('createNotification', {static: true}) createNotification: MatStepper; stepperOrientation: Observable; - stepperLabelPosition: Observable<'bottom' | 'end'>; isAdd = true; entityType = EntityType; @@ -102,9 +101,6 @@ export class SentNotificationDialogComponent extends this.stepperOrientation = this.breakpointObserver.observe(MediaBreakpoints['gt-sm']) .pipe(map(({matches}) => matches ? 'horizontal' : 'vertical')); - this.stepperLabelPosition = this.breakpointObserver.observe(MediaBreakpoints['gt-md']) - .pipe(map(({matches}) => matches ? 'end' : 'bottom')); - this.notificationRequestForm = this.fb.group({ useTemplate: [false], templateId: [{value: null, disabled: true}, Validators.required],