Merge pull request #122 from Gid733/master

Email validation fixes & multiple audio

Author: renemadsen

eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs

@@ -123,6 +123,14 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                         list.Add(val);
                     }
                     break;
+                case "Audio":
+                    var audioFirst = editRequestField?.FieldValues?.First();
+                    if (audioFirst?.Value != null && audioFirst?.FieldId != null)
+                    {
+                        string val = $"{audioFirst.FieldId}|{audioFirst.Value.ToString()}";
+                        list.Add(val);
+                    }
+                    break;
             }
             return list;
         }

eFormAPI/eFormAPI/Infrastructure/Helpers/SettingsHelper.cs

@@ -41,6 +41,11 @@ public void CreateAdminUser(AdminSetupModel adminSetupModel)
             };
             if (!manager.Users.Any(x => x.Email.Equals(adminUser.Email)))
             {
+                manager.UserValidator = new UserValidator<EformUser, int>(manager)
+                {
+                    AllowOnlyAlphanumericUserNames = false,
+                    RequireUniqueEmail = true
+                };
                 IdentityResult ir = manager.Create(adminUser, adminSetupModel.Password);
                 if (ir != null)
                 {

eform-client/e2e/Page objects/Device users/DeviceUsersPage.ts

@@ -20,6 +20,7 @@ export class DeviceUsersPage {
 
   // actions
   async getRowsNumber(): Promise<number> {
+    await browser.sleep(4000);
     return await $$(data.DeviceUsersPage.rowCountSelector).count();
   }
 

eform-client/e2e/dbData.ts

@@ -7,8 +7,8 @@ export default {
   dataSourceSDK: '(LocalDb)\\SharedInstance',
   initialCatalogueSDK: 'eFormSDK',
   authenticationTypeSDK: 'Integrated Security=True',
-  token: 'abc1234567890abc1234567890abcdef',
   dataSourceMain: '(LocalDb)\\SharedInstance',
+  token: 'abc1234567890abc1234567890abcdef',
   initialCatalogueMain: 'eFormMain',
   authenticationTypeMain: 'Integrated Security=True',
   languageOptions: {

eform-client/e2e/tests/device-users/device-users.add.e2e-spec.ts

@@ -81,6 +81,7 @@ describe('Tests for adding users', function () {
       const initialRowsNumber = await deviceUsersPage.getRowsNumber();
       await deviceUsersPage.newDeviceUserButton.click();
       await browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.addNewUserModal.saveButton));
+      await browser.sleep(4000);
       await deviceUsersPage.addNewUserModal.cancelButton.click();
       await browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.newDeviceUserButton));
       const finalRowsNumber = await deviceUsersPage.getRowsNumber();

eform-client/e2e/tests/main-page/main-page.create-eform.e2e-spec.ts

@@ -89,7 +89,6 @@ describe('Main Page - CREATE', function () {
     it('should create eform with creating 1 tag and using 1 already prepared tag', async () => {
       const initRowNum = await mainPage.getRowNumber();
       await mainPage.newEformBtn.click();
-      await browser.wait(ExpectedConditions.elementToBeClickable(mainPage.createEFormModal.saveEFormBtn));
       try {
         await mainPage.createEFormModal.closeTagInputBtn.isDisplayed();
         await waitFor(mainPage.createEFormModal.closeTagInputBtn);
@@ -120,21 +119,13 @@ describe('Main Page - CREATE', function () {
     it('should create eform while adding 1 already prepared tag', async () => {
       const initRowNum = await mainPage.getRowNumber();
       await mainPage.newEformBtn.click();
-      await waitFor(mainPage.createEFormModal.saveEFormBtn);
       try {
         await mainPage.createEFormModal.closeTagInputBtn.isDisplayed();
         await waitFor(mainPage.createEFormModal.closeTagInputBtn);
         await browser.sleep(1500);
         await mainPage.createEFormModal.closeTagInputBtn.click();
         await browser.sleep(1500);
-        await waitFor(mainPage.createEFormModal.addTagBtn);
-        await browser.sleep(1500);
-        await mainPage.createEFormModal.addTagBtn.click();
       } catch (e) {
-        await waitFor(mainPage.createEFormModal.addTagBtn);
-        await browser.sleep(1500);
-        await mainPage.createEFormModal.addTagBtn.click();
-        await browser.sleep(1500);
       }
       await mainPage.createEFormModal.tagSelector.click();
       await mainPage.createEFormModal.selectTag(data.MainPage.firstTagForAdding);
@@ -150,7 +141,6 @@ describe('Main Page - CREATE', function () {
     it('should create eform while adding more than 2 already prepared tags', async () => {
       const initRowNum = await mainPage.getRowNumber();
       await mainPage.newEformBtn.click();
-      await browser.wait(ExpectedConditions.elementToBeClickable(mainPage.createEFormModal.saveEFormBtn));
       try {
         await mainPage.createEFormModal.closeTagInputBtn.isDisplayed();
         await mainPage.createEFormModal.closeTagInputBtn.click();
@@ -181,6 +171,11 @@ describe('Main Page - CREATE', function () {
       await browser.waitForAngular();
       const initRowNum = await mainPage.getRowNumber();
       await mainPage.newEformBtn.click();
+      try {
+        await mainPage.createEFormModal.closeTagInputBtn.isDisplayed();
+        await mainPage.createEFormModal.closeTagInputBtn.click();
+      } catch (e) {
+      }
       await waitFor(mainPage.createEFormModal.cancelBtn);
       await mainPage.createEFormModal.saveEFormBtn.click();
       await waitFor(mainPage.newEformBtn);

eform-client/protractor.conf.js

@@ -32,10 +32,13 @@ exports.config = {
     'main-page-pairing':'./e2e/tests/main-page/main-page.pairing-eform.e2e-spec.ts'
   },
   SELENIUM_PROMISE_MANAGER: false,
+  ignoreUncaughtExceptions: true,
   capabilities: {
     browserName: 'chrome',
     maxSessions: 1,
-    maxInstances: 1
+    maxInstances: 1,
+    // options for headless mode
+    chromeOptions: {args: ["--headless", "--disable-gpu"]}
   },
   directConnect: true,
   baseUrl:

eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html

@@ -57,7 +57,7 @@
             <element-entityselect [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entityselect>
           </div>
           <div *ngSwitchCase="'Audio'">
-            <element-audio [(fieldValue)]="dataItem.fieldValues[0]"></element-audio>
+            <element-audio [(fieldValues)]="dataItem.fieldValues"></element-audio>
           </div>
           <div *ngSwitchDefault></div>
         </div>

eform-client/src/app/modules/cases/components/case-elements/element-audio/element-audio.component.html

@@ -1,7 +1,12 @@
-<audio controls preload="auto"
-       *ngIf="fieldValueObj.uploadedDataObj && fieldValueObj.uploadedDataObj.fileName"
-       src="/api/audio/eform-audio?fileName={{fieldValueObj.uploadedDataObj.fileName}}">
-  This text displays if the audio tag isn't supported.
-</audio>
-<trumbowyg-editor [(content)]="fieldValueObj.value"></trumbowyg-editor>
+<div *ngFor="let fieldValueObj of fieldValueObjects" style="margin-bottom: 10px;">
+  <audio controls preload="auto"
+         *ngIf="fieldValueObj.uploadedDataObj && fieldValueObj.uploadedDataObj.fileName"
+         src="/api/audio/eform-audio?fileName={{fieldValueObj.uploadedDataObj.fileName}}">
+    This text displays if the audio tag isn't supported.
+  </audio>
+  <trumbowyg-editor [(content)]="fieldValueObj.value"></trumbowyg-editor>
+</div>
+
+
+
 

eform-client/src/app/modules/cases/components/case-elements/element-audio/element-audio.component.ts

@@ -7,15 +7,15 @@ import {CaseFieldValue} from 'app/models';
   styleUrls: ['./element-audio.component.css']
 })
 export class ElementAudioComponent implements OnInit {
-  fieldValueObj: CaseFieldValue = new CaseFieldValue();
+  fieldValueObjects: Array<CaseFieldValue> = [];
 
   @Input()
-  get fieldValue() {
-    return this.fieldValueObj;
+  get fieldValues() {
+    return this.fieldValueObjects;
   }
 
-  set fieldValue(val) {
-    this.fieldValueObj = val;
+  set fieldValues(val) {
+    this.fieldValueObjects = val;
   }
 
   constructor() {