Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.html (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.html (working copy) @@ -1 +1,18 @@ -

notification works!

+
+ + + +
+ +
+ + + + +
+ +
+ + + +
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.ts (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/notification/notification.ts (working copy) @@ -1,8 +1,15 @@ -import { Component } from '@angular/core'; +import {Component} from '@angular/core'; +import {NotificationChannels} from '../sub-components/notification-channels/notification-channels'; +import {NotificationSettings} from '../sub-components/notification-settings/notification-settings'; +import {SharedModule} from '../../shared/shared-module'; @Component({ selector: 'app-notification', - imports: [], + imports: [ + SharedModule, + NotificationChannels, + NotificationSettings + ], templateUrl: './notification.html', styleUrl: './notification.scss' }) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/add-notification-channel.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/add-notification-channel.html (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/add-notification-channel.html (working copy) @@ -0,0 +1,197 @@ +

Notification Channel

+ + +
+
+ + + + @if (nChannelForm.get('name')?.invalid && nChannelForm.get('name')?.touched) { + + @if (nChannelForm.get('name')?.errors?.['required']) { + Name is required. + } @else if (nChannelForm.get('name')?.errors) { + Invalid name format. + } + + } + +
+
+ + + + @for (_type of ntype; track _type) { + {{ _type.displayName }} + } + + @if (nChannelForm.get('type')?.invalid && nChannelForm.get('type')?.touched) { + + @if (nChannelForm.get('type')?.errors?.['required']) { + Notification type is required. + } @else { + Invalid notification format. + } + + } + +
+
+ + + Use this Notification for all alerts. +
+ @if (this.nChannelForm.value.type === 'email') { +
+ + + Send a single email to all recipients. +
+
+ + + + @for (_user of adminUsers; track _user) { + {{ _user.username }} + } + + @if (nChannelForm.get('recipients')?.invalid && nChannelForm.get('recipients')?.touched) { + + @if (nChannelForm.get('recipients')?.errors?.['required']) { + Recipient is required. + } @else { + Invalid recipient. + } + + } + +
+
+ +
+ } @else { +
+ + + + @if (nChannelForm.get('url')?.invalid && nChannelForm.get('url')?.touched) { + + @if (nChannelForm.get('url')?.errors?.['required']) { + URL is required. + } @else if (nChannelForm.get('url')?.errors) { + Invalid url format. + } + + } + +
+
+ + + + @for (_method of httpMethods; track _method) { + {{ _method.displayName }} + } + + @if (nChannelForm.get('httpMethod')?.invalid && nChannelForm.get('httpMethod')?.touched) { + + @if (nChannelForm.get('httpMethod')?.errors?.['required']) { + HTTP Method is required. + } @else { + Invalid HTTP method. + } + + } + +
+
+ + + + HTTP Basic Authorization + @if (nChannelForm.get('username')?.invalid && nChannelForm.get('username')?.touched) { + + @if (nChannelForm.get('username')?.errors?.['required']) { + Username is required. + } @else if (nChannelForm.get('username')?.errors) { + Invalid username format. + } + + } + +
+
+ + + + HTTP Basic Authorization + @if (nChannelForm.get('password')?.invalid && nChannelForm.get('password')?.touched) { + + @if (nChannelForm.get('password')?.errors?.['required']) { + Password is required. + } @else if (nChannelForm.get('password')?.errors) { + Invalid password format. + } + + } + +
+
+ +
+ } +
+ + + + + Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.html (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.html (working copy) @@ -1 +1,55 @@ -

notification-channels works!

+
+ + + Notification Channel + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
No. {{ getGlobalSerial(i) }} Channel Name + {{ element.name }} + Channel Type {{ element.type | titlecase }} Default + @if (element.is_default) { + + } @else { + + } + Action +
+ +
+
No results found.
+ +
+ + +
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.scss =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.scss (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.scss (working copy) @@ -0,0 +1,20 @@ +.page-card-1 { + width: 100%; + border-radius: 0; + background-color: inherit; + font-size: 14px !important; + mat-card-header { + color: #1170cf; + } +} + +mat-card-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 4px 10px; +} + +mat-card-title { + font-size: medium; +} Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.ts (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-channels/notification-channels.ts (working copy) @@ -1,11 +1,352 @@ -import { Component } from '@angular/core'; +import {ChangeDetectorRef, Component, inject, OnInit, ViewChild} from '@angular/core'; +import {SharedModule} from '../../../shared/shared-module'; +import {SystemService} from '../../../services/system-service'; +import {MatTableDataSource} from '@angular/material/table'; +import {take, takeUntil} from 'rxjs/operators'; +import {NotificationService} from '../../../services/notification'; +import {Confirmation} from '../../../services/confirmation'; +import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {Subject} from 'rxjs'; +import {MatPaginator} from '@angular/material/paginator'; @Component({ selector: 'app-notification-channels', - imports: [], + imports: [ + SharedModule, + ], templateUrl: './notification-channels.html', styleUrl: './notification-channels.scss' }) -export class NotificationChannels { +export class NotificationChannels implements OnInit { + nChannelColumns: string[] = ['serial', 'name', 'type', 'default', 'action']; + dataSource = new MatTableDataSource([]); + + totalResults = 0; + currentPageNumber: number = -1; + @ViewChild(MatPaginator) paginator!: MatPaginator; + + dialog = inject(MatDialog); + dialogConfig = new MatDialogConfig(); + + constructor( + private systemService: SystemService, + private notification: NotificationService, + private cdRef: ChangeDetectorRef, + private confirmationService: Confirmation + ) { + } + + ngOnInit() { + setTimeout(() => { + this.getNotificationChannels(-1); + }); + this.dataSource.paginator = this.paginator; + } + + getNotificationChannels(pageSize: number = -1) { + this.systemService.getNotificationChannels(pageSize) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result?.data) { + this.totalResults = result.data.total; + this.dataSource = new MatTableDataSource(result.data?.data); + this.dataSource.paginator = this.paginator; + } + this.cdRef.detectChanges(); + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + getGlobalSerial(index: number): number { + if (this.paginator) { + return this.paginator.pageIndex * this.paginator.pageSize + index + 1; + } + return index + 1; + } + + addNotificationChannel(payload: any = {}) { + this.dialogConfig.position = { + bottom: '0px', right: '0px', + } + this.dialogConfig.disableClose = true; + this.dialogConfig.width = '60%'; + this.dialogConfig.height = '80%'; + this.dialogConfig.data = payload; + const dialogRef = this.dialog.open(AddNotificationChannelDialog, this.dialogConfig); + dialogRef.afterClosed().subscribe((isAdded: boolean) => { + if (isAdded) { + this.getNotificationChannels(this.currentPageNumber); + } + }) + } + + deleteNotificationChannel(_channel: any) { + let confirmMsg = `Are you sure you want to delete "${_channel?.name}"? This action cannot be undone.` + this.confirmationService.openConfirmDialog({ + title: `Delete Notification Channel - ${_channel?.name}?`, + message: confirmMsg, + confirmButtonText: 'Yes, Delete It', + cancelButtonText: 'No, Keep It', + confirmButtonColor: 'warn', + cancelButtonColor: 'primary' + }).subscribe(result => { + if (result) { + this.systemService.deleteNotificationChannel(_channel?.id) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && (result?.code === 0)) { + this.getNotificationChannels(this.currentPageNumber); + } else { + this.notification.showError(result?.message); + } + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + } + }) + } + }); + } + } + +@Component({ + selector: 'add-notification-channel', + templateUrl: './add-notification-channel.html', + imports: [SharedModule] +}) +export class AddNotificationChannelDialog implements OnInit { + + nChannelForm: FormGroup; + readonly data = inject(MAT_DIALOG_DATA); + readonly dialogRef = inject(MatDialogRef); + + ntype = [ + {value: 'email', displayName: 'Email'}, + {value: 'webhook', displayName: 'WebHook'}, + ] + + httpMethods = [ + {value: 'POST', displayName: 'POST'}, + {value: 'PUT', displayName: 'PUT'}, + ] + adminUsers: any = []; + + private destroy$ = new Subject(); + + constructor( + private systemService: SystemService, + private formBuilder: FormBuilder, + private cdRef: ChangeDetectorRef, + private notification: NotificationService, + ) { + this.nChannelForm = this.formBuilder.group({ + name: ['', [Validators.required]], + type: ['email', [Validators.required]], + default: [false, [Validators.required]], + singleEmail: [true, [Validators.required]], + recipients: ['', [Validators.required]], + url: ['', [Validators.required]], + httpMethod: ["POST", [Validators.required]], + username: [''], + password: [''], + }); + } + + ngOnInit() { + setTimeout(() => { + this.getAdminUsers(); + }); + this.nChannelForm.get('type')?.valueChanges + .pipe(takeUntil(this.destroy$)) + .subscribe(type => { + this.updateConditionalValidators(type); + }); + this.updateConditionalValidators(this.nChannelForm.get('type')?.value); + + this.nChannelForm.patchValue(this.data); + if (this.data.settings) { + this.nChannelForm.patchValue({ + recipients: this.data.settings?.addresses, + singleEmail: this.data.settings?.singleEmail, + httpMethod: this.data.settings.httpMethod ?? 'POST', + url: this.data.settings?.url, + username: this.data.settings.username ?? '', + password: this.data.settings.password ?? '', + }); + } + } + + getAdminUsers() { + this.adminUsers = []; + this.systemService.getAdminUsers() + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + this.adminUsers = result; + this.cdRef.detectChanges(); + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + testEmail() { + if (this.nChannelForm.invalid) { + console.log(this.nChannelForm.value); + this.nChannelForm.markAllAsTouched(); + return; + } + let payload = { + id: this.data.id ?? 0, + is_default: this.nChannelForm.value.default, + name: this.nChannelForm.value.name, + type: this.nChannelForm.value.type, + settings: { + addresses: this.nChannelForm.value.recipients, + httpMethod: "POST", + singleEmail: this.nChannelForm.value.singleEmail, + uploadImage: true + } + }; + this.systemService.sendTestEmail(payload) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && (result?.code === 0)) { + this.notification.showSuccess('Successfully sent the test email'); + } else { + this.notification.showError(result?.message); + } + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + testWebHook() { + if (this.nChannelForm.invalid) { + console.log(this.nChannelForm.value); + this.nChannelForm.markAllAsTouched(); + return; + } + let payload = { + id: this.data.id ?? 0, + is_default: this.nChannelForm.value.default, + name: this.nChannelForm.value.name, + type: this.nChannelForm.value.type, + settings: { + addresses: this.nChannelForm.value.recipients, + httpMethod: this.nChannelForm.value.httpMethod, + singleEmail: this.nChannelForm.value.singleEmail, + uploadImage: true, + url: this.nChannelForm.value.url, + username: this.nChannelForm.value.username, + password: this.nChannelForm.value.password, + } + }; + this.systemService.sendTestWebhook(payload) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && (result?.code === 0)) { + this.notification.showSuccess('Successfully sent the test webhook'); + } else { + this.notification.showError(result?.message); + } + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + onSubmit() { + if (this.nChannelForm.invalid) { + console.log(this.nChannelForm.value); + this.nChannelForm.markAllAsTouched(); + return; + } + let payload = { + id: this.data.id ?? 0, + is_default: this.nChannelForm.value.default, + name: this.nChannelForm.value.name, + type: this.nChannelForm.value.type, + settings: { + addresses: this.nChannelForm.value.recipients, + httpMethod: this.nChannelForm.value.httpMethod, + singleEmail: this.nChannelForm.value.singleEmail, + uploadImage: true, + url: this.nChannelForm.value.url, + username: this.nChannelForm.value.username, + password: this.nChannelForm.value.password, + } + }; + this.systemService.addNotificationChannel(payload) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && (result?.code === 0)) { + this.notification.showSuccess('Successfully updated the notification channel.'); + this.dialogRef.close(true); + } else { + this.notification.showError(result?.message); + } + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + onCancel() { + this.dialogRef.close(false); + } + + private updateConditionalValidators(type: string): void { + const singleEmailControl = this.nChannelForm.get('singleEmail'); + const recipientsControl = this.nChannelForm.get('recipients'); + const urlControl = this.nChannelForm.get('url'); + const httpMethodControl = this.nChannelForm.get('httpMethod'); + + // Clear all conditional validators first to prevent accumulation + singleEmailControl?.clearValidators(); + recipientsControl?.clearValidators(); + urlControl?.clearValidators(); + httpMethodControl?.clearValidators(); + + if (type === 'email') { + singleEmailControl?.setValidators(Validators.required); + recipientsControl?.setValidators(Validators.required); + } else if (type === 'webhook') { + urlControl?.setValidators(Validators.required); + httpMethodControl?.setValidators(Validators.required); + } + + // Update validity for all controls that had their validators changed + singleEmailControl?.updateValueAndValidity(); + recipientsControl?.updateValueAndValidity(); + urlControl?.updateValueAndValidity(); + httpMethodControl?.updateValueAndValidity(); + } +} Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.html (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.html (working copy) @@ -1 +1,158 @@ -

notification-settings works!

+
+ + + SMTP Settings + + +
+
+ + +
+ +
+ + + + @if (notificationForm.get('host')?.invalid && notificationForm.get('host')?.touched) { + + @if (notificationForm.get('host')?.errors?.['required']) { + SMTP server is required. + } @else if (notificationForm.get('host')?.errors) { + Invalid SMTP server format. + } + + } + +
+ +
+ + + + @if (notificationForm.get('port')?.invalid && notificationForm.get('port')?.touched) { + + @if (notificationForm.get('port')?.errors?.['required']) { + Port number is required. + } @else if (notificationForm.get('port')?.errors) { + Invalid port number, should range from 0-65535. + } + + } + +
+ +
+ + + + @if (notificationForm.get('user')?.invalid && notificationForm.get('user')?.touched) { + + @if (notificationForm.get('user')?.errors?.['required']) { + User is required. + } @else if (notificationForm.get('user')?.errors) { + Invalid user format. + } + + } + +
+ +
+ + + + @if (notificationForm.get('password')?.invalid && notificationForm.get('password')?.touched) { + + @if (notificationForm.get('password')?.errors?.['required']) { + Password is required. + } @else if (notificationForm.get('password')?.errors) { + Invalid password format. + } + + } + +
+ +
+ + + + @if (notificationForm.get('from_address')?.invalid && notificationForm.get('from_address')?.touched) { + + @if (notificationForm.get('from_address')?.errors?.['required']) { + Sender Email is required. + } @else if (notificationForm.get('from_address')?.errors) { + Invalid email format. + } + + } + +
+ +
+ + + + @if (notificationForm.get('from_name')?.invalid && notificationForm.get('from_name')?.touched) { + + @if (notificationForm.get('from_name')?.errors?.['required']) { + Sender Name is required. + } @else if (notificationForm.get('from_name')?.errors) { + Invalid sender name format. + } + + } + +
+ + +
+ + +
Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.scss =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.scss (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.scss (working copy) @@ -0,0 +1,20 @@ +.page-card-1 { + width: 100%; + border-radius: 0; + background-color: inherit; + font-size: 14px !important; + mat-card-header { + color: #1170cf; + } +} + +mat-card-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 4px 10px; +} + +mat-card-title { + font-size: medium; +} Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.ts (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/notification-settings/notification-settings.ts (working copy) @@ -1,11 +1,91 @@ -import { Component } from '@angular/core'; +import {ChangeDetectorRef, Component, OnInit} from '@angular/core'; +import {SharedModule} from '../../../shared/shared-module'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {SystemService} from '../../../services/system-service'; +import {NotificationService} from '../../../services/notification'; +import {take} from 'rxjs/operators'; @Component({ selector: 'app-notification-settings', - imports: [], + imports: [ + SharedModule + ], templateUrl: './notification-settings.html', styleUrl: './notification-settings.scss' }) -export class NotificationSettings { +export class NotificationSettings implements OnInit { + notificationForm: FormGroup; + + constructor( + private formBuilder: FormBuilder, + private cdRef: ChangeDetectorRef, + private systemService: SystemService, + private notification: NotificationService, + ) { + this.notificationForm = this.formBuilder.group({ + "enabled": [false, [Validators.required]], + "host": ["127.0.0.1", [Validators.required]], + "port": [25, [Validators.required, Validators.min(0), Validators.max(65535)]], + "user": ["", [Validators.required]], + "password": ["", [Validators.required]], + "from_address": ["admin@localhost", [Validators.required, Validators.email]], + "from_name": ["admin", [Validators.required]], + }) + } + + ngOnInit() { + setTimeout(() => { + this.getNotificationSettings(); + }); + } + + getNotificationSettings(): void { + this.systemService.getSMTPSettings() + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && result?.data) { + this.notificationForm.patchValue(result?.data); + } + this.cdRef.detectChanges(); + }, + error: (error: { message: string; }) => { + console.log(error); + this.notification.showError(error.message); + this.cdRef.detectChanges(); + } + }) + } + + onSubmit(): void { + const {enabled} = this.notificationForm.value; + + if (enabled && this.notificationForm.invalid) { + console.log(this.notificationForm.value); + this.notificationForm.markAllAsTouched(); + return; + } + + this.updateNotificationSettings(); + } + + + updateNotificationSettings(): void { + this.systemService.updateSMTPSettings(this.notificationForm.value) + .pipe(take(1)) + .subscribe({ + next: (result: any) => { + if (result && (result?.code === 0)) { + this.notification.showSuccess(`SMTP settings updated successfully!`); + this.getNotificationSettings(); + } else { + this.notification.showError(`Failed to update the SMTP settings.`); + } + }, + error: () => { + this.notification.showError(`Failed to update the SMTP settings.`); + } + }) + } } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (revision 2663) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (working copy) @@ -62,4 +62,12 @@ GET_TASK_AND_LOG_URL: `${PREFIX}/cm/get_task_and_log`, DELETE_TASK_URL: `${PREFIX}/api/cm/tasking/Tasks/_delete`, DELETE_ALL_TASKS_URL: `${PREFIX}/api/cm/tasking/Tasks/_perform`, + GET_SMTP_SETTINGS_URL: `${PREFIX}/composer/system/smtp`, + UPDATE_SMTP_SETTINGS_URL: `${PREFIX}/composer/system/smtp/update`, + GET_NOTIFICATION_CHANNELS_URL: `${PREFIX}/composer/notify/channel`, + DELETE_NOTIFICATION_CHANNEL_URL: `${PREFIX}/composer/notify/channel/remove/`, + GET_ADMIN_USERS_URL: `${PREFIX}/api/cm/system/user_mgmt/Administrator/_get_list_data`, + SEND_TEST_EMAIL_URL: `${PREFIX}/composer/notify/channel/test`, + SEND_TEST_WEBHOOK_URL: `${PREFIX}/composer/notify/channel/test`, + ADD_NOTIFICATION_CHANNEL_URL: `${PREFIX}/composer/notify/channel/store`, } as const; // Makes properties readonly Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (revision 2663) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (working copy) @@ -271,5 +271,38 @@ isFormData: true, csrfInFormData: true }); + } + + getSMTPSettings() { + return this.http.get(URLS.GET_SMTP_SETTINGS_URL); + } + + updateSMTPSettings(payload: any) { + return this.http.post(URLS.UPDATE_SMTP_SETTINGS_URL, payload); + } + + getNotificationChannels(pageSize: number = -1) { + return this.http.get(`${URLS.GET_NOTIFICATION_CHANNELS_URL}?page_size=${pageSize}`); } + + deleteNotificationChannel(channelId: number) { + return this.http.post(`${URLS.DELETE_NOTIFICATION_CHANNEL_URL}/${channelId}`, {}); + } + + getAdminUsers() { + return this.http.get(URLS.GET_ADMIN_USERS_URL); + } + + sendTestEmail(payload: any) { + return this.http.post(URLS.SEND_TEST_EMAIL_URL, payload); + } + + sendTestWebhook(payload: any) { + return this.http.post(URLS.SEND_TEST_WEBHOOK_URL, payload); + } + + addNotificationChannel(payload: any) { + return this.http.post(URLS.ADD_NOTIFICATION_CHANNEL_URL, payload); + } + } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (revision 2663) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (working copy) @@ -39,6 +39,7 @@ faSave, faCalendar, faEdit, + faXmarkCircle } from '@fortawesome/free-regular-svg-icons'; import {MatGridListModule} from '@angular/material/grid-list'; import {MatFormFieldModule} from '@angular/material/form-field'; @@ -156,6 +157,7 @@ faIdBadge, faCalendar, faEdit, + faXmarkCircle ); } } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss (revision 2662) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/styles.scss (working copy) @@ -268,6 +268,12 @@ display: flex; justify-content: center; align-items: center; +} + +.button-container-end { + display: flex; + justify-content: end; + align-items: end; } .warning {