From f4bf3cc338826bf59c0afe230ceb395160ccfe91 Mon Sep 17 00:00:00 2001
From: DmitryBogatko <fadiezjesterhead@gmail.com>
Date: Thu, 3 Dec 2020 09:13:00 +0300
Subject: [PATCH] added starttls email option (#119)

fixed logic of disanling username and password fields
fixed notification modal to use two-way binding

Co-authored-by: d.bogatko <d.bogatko@a1qa.com>
---
 CHANGELOG.md                                           |  5 +++++
 package.json                                           |  2 +-
 .../global/app-settings/app-settings.component.html    | 10 ++++++++--
 .../global/app-settings/app-settings.component.ts      |  1 +
 .../notify-team-modal/notify-team-modal.component.html |  4 ++--
 src/app/shared/models/app-settings.ts                  |  1 +
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a2be91e..65aa3577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.0 (2020-12-02)
+- added starttls email option
+- fixed logic of disanling username and password fields
+- fixed notification modal to use two-way binding
+
 ## 1.0.4 (2020-10-02)
 Changes:
  - Added PDF report for milestone -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/110)
diff --git a/package.json b/package.json
index fac3ffdd..e29b559a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aquality-tracking-ui",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/pages/administration/global/app-settings/app-settings.component.html b/src/app/pages/administration/global/app-settings/app-settings.component.html
index c4642f39..e7a44f3f 100644
--- a/src/app/pages/administration/global/app-settings/app-settings.component.html
+++ b/src/app/pages/administration/global/app-settings/app-settings.component.html
@@ -198,6 +198,11 @@
           <mat-slide-toggle [(ngModel)]="emailSettings.use_auth">Use STMP Authentication</mat-slide-toggle>
         </div>
       </div>
+      <div class="col-sm-12">
+        <div class="col-sm-4 form-group row">
+          <mat-slide-toggle [(ngModel)]="emailSettings.starttls">Use STARTTLS</mat-slide-toggle>
+        </div>
+      </div>
       <div class="col-sm-4 form-group row">
         <div class="col-sm-4">
           <label for="smtpHost" class="label-inline">STMP Host</label>
@@ -225,13 +230,14 @@
             [disabled]="!emailSettings.enabled">
         </div>
       </div>
+      
       <div class="col-sm-4 form-group row">
         <div class="col-sm-4">
           <label for="smtpUser" class="label-inline">STMP User</label>
         </div>
         <div class="col-sm-8">
           <input id="smtpUser" maxlength="100" class="form-control input-sm" [(ngModel)]="emailSettings.user"
-            [disabled]="!emailSettings.enabled">
+            [disabled]="!emailSettings.use_auth">
         </div>
       </div>
       <div class="col-sm-4 form-group row">
@@ -240,7 +246,7 @@
         </div>
         <div class="col-sm-8">
           <input id="smtpPassword" maxlength="100" class="form-control input-sm" type="password"
-            [(ngModel)]="emailSettings.password" [disabled]="!emailSettings.enabled">
+            [(ngModel)]="emailSettings.password" [disabled]="!emailSettings.use_auth">
         </div>
       </div>
 
diff --git a/src/app/pages/administration/global/app-settings/app-settings.component.ts b/src/app/pages/administration/global/app-settings/app-settings.component.ts
index c7498eec..f34f53df 100644
--- a/src/app/pages/administration/global/app-settings/app-settings.component.ts
+++ b/src/app/pages/administration/global/app-settings/app-settings.component.ts
@@ -57,6 +57,7 @@ export class AppSettingsComponent implements OnInit {
     saveEmail() {
         this.emailSettings.enabled = +this.emailSettings.enabled;
         this.emailSettings.use_auth = +this.emailSettings.use_auth;
+        this.emailSettings.starttls = +this.emailSettings.starttls;
         if (this.isEmailPatternValid()) {
             this.emailSettingsService.updateEmailSettings(this.emailSettings);
         } else {
diff --git a/src/app/pages/project/testrun/notify-team-modal/notify-team-modal.component.html b/src/app/pages/project/testrun/notify-team-modal/notify-team-modal.component.html
index 6768a539..4e55ef6c 100644
--- a/src/app/pages/project/testrun/notify-team-modal/notify-team-modal.component.html
+++ b/src/app/pages/project/testrun/notify-team-modal/notify-team-modal.component.html
@@ -15,13 +15,13 @@ <h4 class="modal-title">{{title}}</h4>
                     <div class="col-sm-6">Send To:</div>
                     <div class="col-sm-6  me-drop-parent">
                         <ul class="col-sm-12 bg-light no-padding me-droppable" [dragula]="'notification-bag'"
-                            [dragulaModel]='excludedUsers'>
+                            [(dragulaModel)]='excludedUsers'>
                             <li class="me-draggable" *ngFor="let exuser of excludedUsers">{{exuser.user.user_name}}</li>
                         </ul>
                     </div>
                     <div class="col-sm-6 me-drop-parent">
                         <ul class="col-sm-12 bg-light no-padding me-droppable" [dragula]="'notification-bag'"
-                            [dragulaModel]='includedUsers'>
+                            [(dragulaModel)]='includedUsers'>
                             <li class="me-draggable" *ngFor="let user of includedUsers">{{user.user.user_name}}</li>
                         </ul>
                     </div>
diff --git a/src/app/shared/models/app-settings.ts b/src/app/shared/models/app-settings.ts
index d59542f0..78d331d2 100644
--- a/src/app/shared/models/app-settings.ts
+++ b/src/app/shared/models/app-settings.ts
@@ -30,6 +30,7 @@ export class EmailSettings {
   from_email?: string;
   port?: number;
   use_auth?: number;
+  starttls?: number;
   default_email_pattern?: string;
   base_url?: string;
 }