fix protractor report

fix validation
fix log deprecated
fix ADF-3576 Single required dropdown column dynamicgrid aps-form row editor not saving

lib/core/form/components/widgets/core/form.model.ts

@@ -201,9 +201,7 @@ export class FormModel {
             }
         }
 
-        if (errorsField.length > 0) {
-            this._isValid = false;
-        }
+        this._isValid = errorsField.length > 0 ? false : true;
 
         if (this.formService) {
             validateFormEvent.isValid = this._isValid;

lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.html

@@ -8,7 +8,7 @@
             [(ngModel)]="value"
             [required]="column.required"
             [disabled]="!column.editable"
-            (selectionChange)="onValueChanged(row, column, $event)">
+            (ngModelChange)="onValueChanged(row, column, $event)">
             <mat-option></mat-option>
             <mat-option *ngFor="let opt of options" [value]="opt.name" [id]="opt.id">{{opt.name}}</mat-option>
         </mat-select>

lib/core/services/settings.service.ts

@@ -72,7 +72,7 @@ export class SettingsService {
 
     /** @deprecated in 1.7.0 */
     public setProviders(providers: string) {
-        this.logService.log(`SettingsService.aetProviders is deprecated. Use the app-config.json`);
+        this.logService.log(`SettingsService.setProviders is deprecated. Use the app-config.json`);
         if (providers) {
             this.storage.setItem(AppConfigValues.PROVIDERS, providers);
         }

lib/core/viewer/components/viewer.component.html

@@ -142,8 +142,6 @@
         </ng-container>
 
         <div fxLayout="row" fxFlex="1 1 auto">
-            showSidebar 1 {{showSidebar}}
-
             <ng-container *ngIf="allowSidebar && showSidebar">
                 showSidebar {{showSidebar}}
                 <div class="adf-viewer__sidebar" [ngClass]="'adf-viewer__sidebar__right'" fxFlexOrder="4"  id="adf-right-sidebar" >

lib/process-services/task-list/components/task-details.component.html

@@ -124,7 +124,7 @@
             <div *ngIf="showHeaderContent" class="adf-task-details-core-sidebar-checklist">
                 <div *ngIf="showChecklist">
                     <adf-checklist #activitichecklist
-                                   [readOnly]="readOnlyForm"
+                                   [readOnly]="internalReadOnlyForm"
                                    [taskId]="taskDetails.id"
                                    [assignee]="taskDetails?.assignee?.id"
                                    (checklistTaskCreated)="onChecklistTaskCreated($event)"

lib/process-services/task-list/components/task-details.component.ts

@@ -175,6 +175,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
 
     showAssignee: boolean = false;
     showAttachForm: boolean = false;
+    internalReadOnlyForm: boolean = false;
 
     private peopleSearchObserver: Observer<UserProcessModel[]>;
     public errorDialogRef: MatDialogRef<TemplateRef<any>>;
@@ -306,7 +307,9 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
 
                     let endDate: any = res.endDate;
                     if (endDate && !isNaN(endDate.getTime())) {
-                        this.readOnlyForm = true;
+                        this.internalReadOnlyForm = true;
+                    } else {
+                        this.internalReadOnlyForm = this.readOnlyForm
                     }
 
                     if (this.taskDetails && this.taskDetails.involvedPeople) {

protractor.conf.js

@@ -9,6 +9,7 @@ const TestConfig = require('./e2e/test.config');
 var argv = require('yargs').argv;
 
 const fs = require('fs');
+const rimraf = require('rimraf');
 
 const projectRoot = path.resolve(__dirname);
 
@@ -25,7 +26,7 @@ var NAME_TEST = process.env.NAME_TEST ? true : false
 var specsToRun = './**/' + FOLDER + '**/*.e2e.ts';
 
 if (process.env.NAME_TEST) {
-    specsToRun =   './e2e/**/' + process.env.NAME_TEST;
+    specsToRun = './e2e/**/' + process.env.NAME_TEST;
 }
 
 var args_options = [];
@@ -38,6 +39,15 @@ if (BROWSER_RUN === 'true') {
 
 var downloadFolder = path.join(__dirname, 'e2e/downloads');
 
+var buildNumber = () => {
+    let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+    if (!buildNumber) {
+        process.env.TRAVIS_BUILD_NUMBER = Date.now();
+    }
+
+    return process.env.TRAVIS_BUILD_NUMBER;
+}
+
 exports.config = {
     allScriptsTimeout: 60000,
 
@@ -135,7 +145,7 @@ exports.config = {
 
     },
 
-    onComplete: async function () {
+    afterLaunch: async function () {
         var retryCount = 1;
         if (argv.retry) {
             retryCount = ++argv.retry;
@@ -145,7 +155,6 @@ exports.config = {
 
         console.log(filenameReport);
 
-        let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
         let saveScreenshot = process.env.SAVE_SCREENSHOT;
 
         let alfrescoJsApi = new AlfrescoApi({
@@ -155,31 +164,31 @@ exports.config = {
         alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
 
         if (saveScreenshot === 'true') {
-            if (!buildNumber) {
-                buildNumber = Date.now();
-            }
+
 
             let files = fs.readdirSync(path.join(__dirname, './e2e-output/screenshots'));
 
             if (files && files.length > 0) {
 
                 try {
-                    folder = await alfrescoJsApi.nodes.addNode('-my-', {
-                        'name': 'screenshot',
-                        'relativePath': `Builds/${buildNumber}`,
-                        'nodeType': 'cm:folder'
-                    }, {}, {
-                        'overwrite': true
-                    });
+                    folder = await
+                        alfrescoJsApi.nodes.addNode('-my-', {
+                            'name': `retry-${retryCount}`,
+                            'relativePath': `Builds/${buildNumber()}/screenshot`,
+                            'nodeType': 'cm:folder'
+                        }, {}, {
+                            'overwrite': true
+                        });
                 } catch (error) {
                     console.log('Folder screenshot already present');
 
-                    folder = await alfrescoJsApi.nodes.getNode('-my-', {
-                        'relativePath': `Builds/${buildNumber}/screenshot`,
-                        'nodeType': 'cm:folder'
-                    }, {}, {
-                        'overwrite': true
-                    });
+                    folder = await
+                        alfrescoJsApi.nodes.getNode('-my-', {
+                            'relativePath': `Builds/${buildNumber()}/screenshot/retry-${retryCount}`,
+                            'nodeType': 'cm:folder'
+                        }, {}, {
+                            'overwrite': true
+                        });
                 }
 
                 for (const fileName of files) {
@@ -187,29 +196,30 @@ exports.config = {
                     let pathFile = path.join(__dirname, './e2e-output/screenshots', fileName);
                     let file = fs.createReadStream(pathFile);
 
-                    await alfrescoJsApi.upload.uploadFile(
-                        file,
-                        '',
-                        folder.entry.id,
-                        null,
-                        {
-                            'name': file.name,
-                            'nodeType': 'cm:content'
-                        }
-                    );
+                    await
+                        alfrescoJsApi.upload.uploadFile(
+                            file,
+                            '',
+                            folder.entry.id,
+                            null,
+                            {
+                                'name': file.name,
+                                'nodeType': 'cm:content'
+                            }
+                        );
                 }
             }
         }
 
-        testConfig = {
+        testConfigReport = {
             reportTitle: 'Protractor Test Execution Report',
             outputPath: `${projectRoot}/e2e-output/junit-report`,
             outputFilename: filenameReport,
-            screenshotPath: '`${projectRoot}/e2e-output/screenshots/`',
+            screenshotPath: `${projectRoot}/e2e-output/screenshots/`,
             screenshotsOnlyOnFailure: true,
         };
 
-        new htmlReporter().from(`${projectRoot}/e2e-output/junit-report/results.xml`, testConfig);
+        new htmlReporter().from(`${projectRoot}/e2e-output/junit-report/results.xml`, testConfigReport);
 
         let pathFile = path.join(__dirname, './e2e-output/junit-report', filenameReport + '.html');
         let reportFile = fs.createReadStream(pathFile);
@@ -217,44 +227,50 @@ exports.config = {
         let reportFolder;
 
         try {
-            reportFolder = await alfrescoJsApi.nodes.addNode('-my-', {
-                'name': 'report',
-                'relativePath': `Builds/${buildNumber}`,
-                'nodeType': 'cm:folder'
-            }, {}, {
-                'overwrite': true
-            });
+            reportFolder = await
+                alfrescoJsApi.nodes.addNode('-my-', {
+                    'name': 'report',
+                    'relativePath': `Builds/${buildNumber()}`,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
         } catch (error) {
             console.log('Folder report already present' + error);
 
-            reportFolder = await alfrescoJsApi.nodes.getNode('-my-', {
-                'relativePath': `Builds/${buildNumber}/report`,
-                'nodeType': 'cm:folder'
-            }, {}, {
-                'overwrite': true
-            });
+            reportFolder = await
+                alfrescoJsApi.nodes.getNode('-my-', {
+                    'relativePath': `Builds/${buildNumber()}/report`,
+                    'nodeType': 'cm:folder'
+                }, {}, {
+                    'overwrite': true
+                });
 
         }
 
         try {
-            await alfrescoJsApi.upload.uploadFile(
-                reportFile,
-                '',
-                reportFolder.entry.id,
-                null,
-                {
-                    'name': reportFile.name,
-                    'nodeType': 'cm:content'
-                }
-            );
+            await
+                alfrescoJsApi.upload.uploadFile(
+                    reportFile,
+                    '',
+                    reportFolder.entry.id,
+                    null,
+                    {
+                        'name': reportFile.name,
+                        'nodeType': 'cm:content'
+                    }
+                );
 
         } catch (error) {
             console.log('error' + error);
 
         }
-    },
 
-    afterLaunch() {
+        rimraf(`${projectRoot}/e2e-output/screenshots/`, function () { console.log('done delete screenshot'); });
+
         return retry.afterLaunch(3);
     }
 };
+
+
+