Browse Source

send email rule node and mail server improvements

pull/2893/head
YevhenBondarenko 6 years ago
parent
commit
a810933982
  1. 2
      rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
  2. 4
      ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
  3. 10
      ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts

2
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js

File diff suppressed because one or more lines are too long

4
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html

@ -90,8 +90,8 @@
<tb-checkbox formControlName="enableProxy" style="display: block; padding-bottom: 16px;"> <tb-checkbox formControlName="enableProxy" style="display: block; padding-bottom: 16px;">
{{ 'admin.enable-proxy' | translate }} {{ 'admin.enable-proxy' | translate }}
</tb-checkbox> </tb-checkbox>
<div *ngIf="enableProxy()"> <div *ngIf="mailSettings.get('enableProxy').value">
<div fxLayout.gt-sm="row"> <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">
<mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60"> <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60">
<mat-label translate>admin.proxy-host</mat-label> <mat-label translate>admin.proxy-host</mat-label>
<input matInput required formControlName="proxyHost"> <input matInput required formControlName="proxyHost">

10
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts

@ -53,6 +53,7 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
(adminSettings) => { (adminSettings) => {
this.adminSettings = adminSettings; this.adminSettings = adminSettings;
this.mailSettings.reset(this.adminSettings.jsonValue); this.mailSettings.reset(this.adminSettings.jsonValue);
this.enableProxyChanged();
} }
); );
} }
@ -70,7 +71,7 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
Validators.maxLength(6)]], Validators.maxLength(6)]],
enableTls: ['false'], enableTls: ['false'],
tlsVersion: [], tlsVersion: [],
enableProxy: ['false', []], enableProxy: [false, []],
proxyHost: ['', [Validators.required]], proxyHost: ['', [Validators.required]],
proxyPort: ['', [Validators.required, Validators.min(1), Validators.max(65535)]], proxyPort: ['', [Validators.required, Validators.min(1), Validators.max(65535)]],
proxyUser: [''], proxyUser: [''],
@ -80,9 +81,13 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
}); });
this.registerDisableOnLoadFormControl(this.mailSettings.get('smtpProtocol')); this.registerDisableOnLoadFormControl(this.mailSettings.get('smtpProtocol'));
this.registerDisableOnLoadFormControl(this.mailSettings.get('enableTls')); this.registerDisableOnLoadFormControl(this.mailSettings.get('enableTls'));
this.registerDisableOnLoadFormControl(this.mailSettings.get('enableProxy'));
this.mailSettings.get('enableProxy').valueChanges.subscribe(() => {
this.enableProxyChanged();
});
} }
enableProxy(): boolean { enableProxyChanged(): void {
let enableProxy: boolean = this.mailSettings.get('enableProxy').value; let enableProxy: boolean = this.mailSettings.get('enableProxy').value;
if (enableProxy) { if (enableProxy) {
this.mailSettings.get('proxyHost').enable(); this.mailSettings.get('proxyHost').enable();
@ -91,7 +96,6 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
this.mailSettings.get('proxyHost').disable(); this.mailSettings.get('proxyHost').disable();
this.mailSettings.get('proxyPort').disable(); this.mailSettings.get('proxyPort').disable();
} }
return enableProxy;
} }
sendTestMail(): void { sendTestMail(): void {

Loading…
Cancel
Save