dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Improved mobile push notification settings

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-01-10 12:28:35 +02:00
parent 83c3a6b3c9
commit 7fd9d2955b
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html
View File

@ -59,39 +59,35 @@
<mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async"> <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
</mat-progress-bar> </mat-progress-bar>
<div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div> <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
<mat-card-content> <mat-card-content formGroupName="SLACK">
<section formGroupName="SLACK"> <mat-form-field class="mat-block" subscriptSizing="dynamic">
<mat-form-field class="mat-block"> <mat-label translate>admin.slack-api-token</mat-label>
<mat-label translate>admin.slack-api-token</mat-label> <input matInput formControlName="botToken"/>
<input matInput formControlName="botToken"/> </mat-form-field>
</mat-form-field>
</section>
</mat-card-content> </mat-card-content>
<mat-card-header> <mat-card-header *ngIf="isSysAdmin()">
<mat-card-title> <mat-card-title>
<span class="mat-headline-5" translate>admin.mobile-settings</span> <span class="mat-headline-5" translate>admin.mobile-settings</span>
</mat-card-title> </mat-card-title>
<span fxFlex></span> <span fxFlex></span>
<!-- <div tb-help="mobileSettings"></div>--> <!-- <div tb-help="mobileSettings"></div>-->
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content formGroupName="MOBILE_APP" *ngIf="isSysAdmin()">
<section formGroupName="MOBILE_APP" style="margin-bottom: 16px;"> <tb-file-input formControlName="firebaseServiceAccountCredentials"
<tb-file-input formControlName="firebaseServiceAccountCredentials" dropLabel="{{ 'admin.select-firebase-service-account-file' | translate }}"
dropLabel="{{ 'admin.select-firebase-service-account-file' | translate }}" label="{{ 'admin.firebase-service-account-file' | translate }}"
label="{{ 'admin.firebase-service-account-file' | translate }}" accept=".json,application/json"
accept=".json,application/json" allowedExtensions="json"
allowedExtensions="json" [existingFileName]="notificationSettingsForm.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName')?.value"
[existingFileName]="notificationSettingsForm.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName')?.value" (fileNameChanged)="notificationSettingsForm?.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName').patchValue($event)">
(fileNameChanged)="notificationSettingsForm?.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName').patchValue($event)"> </tb-file-input>
</tb-file-input>
</section>
<div fxLayout="row" fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end">
<button mat-button mat-raised-button color="primary"
[disabled]="(isLoading$ | async) || notificationSettingsForm.invalid || !notificationSettingsForm.dirty"
type="submit">{{'action.save' | translate}}
</button>
</div>
</mat-card-content> </mat-card-content>
<mat-card-actions fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end">
<button mat-button mat-raised-button color="primary"
[disabled]="(isLoading$ | async) || notificationSettingsForm.invalid || !notificationSettingsForm.dirty"
type="submit">{{'action.save' | translate}}
</button>
</mat-card-actions>
</mat-card> </mat-card>
</fieldset> </fieldset>
</form> </form>

6
ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.scss
View File

@ -14,5 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
:host { :host {
.mat-mdc-card-header {
align-items: center;
}
.mdc-card__actions {
padding: 16px;
}
} }

4
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
View File

@ -305,8 +305,7 @@ export class SentNotificationDialogComponent extends
allowConfigureDeliveryMethod(deliveryMethod: NotificationDeliveryMethod): boolean { allowConfigureDeliveryMethod(deliveryMethod: NotificationDeliveryMethod): boolean {
const tenantAllowConfigureDeliveryMethod = new Set([ const tenantAllowConfigureDeliveryMethod = new Set([
NotificationDeliveryMethod.SLACK, NotificationDeliveryMethod.SLACK
NotificationDeliveryMethod.MOBILE_APP
]); ]);
if (deliveryMethod === NotificationDeliveryMethod.WEB) { if (deliveryMethod === NotificationDeliveryMethod.WEB) {
return false; return false;
@ -329,7 +328,6 @@ export class SentNotificationDialogComponent extends
return '/settings/outgoing-mail'; return '/settings/outgoing-mail';
case NotificationDeliveryMethod.SMS: case NotificationDeliveryMethod.SMS:
case NotificationDeliveryMethod.SLACK: case NotificationDeliveryMethod.SLACK:
case NotificationDeliveryMethod.MOBILE_APP:
return '/settings/notifications'; return '/settings/notifications';
} }
} }

8
ui-ngx/src/app/shared/models/notification.models.ts
View File

@ -379,8 +379,8 @@ export enum NotificationDeliveryMethod {
SMS = 'SMS', SMS = 'SMS',
EMAIL = 'EMAIL', EMAIL = 'EMAIL',
SLACK = 'SLACK', SLACK = 'SLACK',
MICROSOFT_TEAMS = 'MICROSOFT_TEAMS', MOBILE_APP = 'MOBILE_APP',
MOBILE_APP = 'MOBILE_APP' MICROSOFT_TEAMS = 'MICROSOFT_TEAMS'
} }
export const NotificationDeliveryMethodTranslateMap = new Map<NotificationDeliveryMethod, string>([ export const NotificationDeliveryMethodTranslateMap = new Map<NotificationDeliveryMethod, string>([
@ -388,8 +388,8 @@ export const NotificationDeliveryMethodTranslateMap = new Map<NotificationDelive
[NotificationDeliveryMethod.SMS, 'notification.delivery-method.sms'], [NotificationDeliveryMethod.SMS, 'notification.delivery-method.sms'],
[NotificationDeliveryMethod.EMAIL, 'notification.delivery-method.email'], [NotificationDeliveryMethod.EMAIL, 'notification.delivery-method.email'],
[NotificationDeliveryMethod.SLACK, 'notification.delivery-method.slack'], [NotificationDeliveryMethod.SLACK, 'notification.delivery-method.slack'],
[NotificationDeliveryMethod.MICROSOFT_TEAMS, 'notification.delivery-method.microsoft-teams'], [NotificationDeliveryMethod.MOBILE_APP, 'notification.delivery-method.mobile-app'],
[NotificationDeliveryMethod.MOBILE_APP, 'notification.delivery-method.mobile-app'] [NotificationDeliveryMethod.MICROSOFT_TEAMS, 'notification.delivery-method.microsoft-teams']
]); ]);
export enum NotificationRequestStatus { export enum NotificationRequestStatus {