From 584b165943fb9f92efe36fff6feea41b3b9b7ad6 Mon Sep 17 00:00:00 2001 From: Cano Date: Tue, 29 Sep 2020 12:51:45 +0200 Subject: [PATCH 1/3] [ADF-5258] Update Generator to ADF 4.1.0 --- app/templates/adf-cli-acs-aps-template/package.json | 12 ++++++------ app/templates/adf-cli-acs-template/package.json | 10 +++++----- .../adf-cli-activiti-acs-template/package.json | 12 ++++++------ .../adf-cli-activiti-cloud-acs-template/package.json | 12 ++++++------ .../adf-cli-activiti-cloud-template/package.json | 12 ++++++------ app/templates/adf-cli-activiti-template/package.json | 12 ++++++------ app/templates/adf-cli-aps-template/package.json | 12 ++++++------ package-lock.json | 2 +- package.json | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/templates/adf-cli-acs-aps-template/package.json b/app/templates/adf-cli-acs-aps-template/package.json index 63bb6676..2f732ede 100644 --- a/app/templates/adf-cli-acs-aps-template/package.json +++ b/app/templates/adf-cli-acs-aps-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-acs-aps-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Content and Process Services with APS 1", "description": "ACS APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-acs-template/package.json b/app/templates/adf-cli-acs-template/package.json index b4684f51..7de0799a 100644 --- a/app/templates/adf-cli-acs-template/package.json +++ b/app/templates/adf-cli-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-acs-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Content Services", "description": "ACS ADF Application with Angular CLI", "license": "MIT", @@ -17,10 +17,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-acs-template/package.json b/app/templates/adf-cli-activiti-acs-template/package.json index 20c75d6e..0fd3845d 100644 --- a/app/templates/adf-cli-activiti-acs-template/package.json +++ b/app/templates/adf-cli-activiti-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-acs-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Content and Process Services with Activiti", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services-cloud": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-cloud-acs-template/package.json b/app/templates/adf-cli-activiti-cloud-acs-template/package.json index 55d68201..2a965085 100644 --- a/app/templates/adf-cli-activiti-cloud-acs-template/package.json +++ b/app/templates/adf-cli-activiti-cloud-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-cloud-acs-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Content and Process Services with Activiti Cloud", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services-cloud": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-cloud-template/package.json b/app/templates/adf-cli-activiti-cloud-template/package.json index 4a84ee01..a3deb634 100644 --- a/app/templates/adf-cli-activiti-cloud-template/package.json +++ b/app/templates/adf-cli-activiti-cloud-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-cloud-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Process Services with Activiti Cloud", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services-cloud": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-template/package.json b/app/templates/adf-cli-activiti-template/package.json index dd44ed11..46280595 100644 --- a/app/templates/adf-cli-activiti-template/package.json +++ b/app/templates/adf-cli-activiti-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Process Services with Activiti", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services-cloud": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-aps-template/package.json b/app/templates/adf-cli-aps-template/package.json index 0b6c3c08..1ec22c13 100644 --- a/app/templates/adf-cli-aps-template/package.json +++ b/app/templates/adf-cli-aps-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-aps-template", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "blueprint": "Process Services with APS 1", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.0.0", - "@alfresco/adf-process-services": "4.0.0", - "@alfresco/adf-core": "4.0.0", - "@alfresco/adf-extensions": "4.0.0", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-process-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/package-lock.json b/package-lock.json index f062c205..7f671e5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-alfresco-adf-app", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ca31cf87..4ada118f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-alfresco-adf-app", - "version": "4.0.0", + "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", "description": "ADF application generator for Yeoman", "author": "Alfresco Software, Ltd.", "main": "app/index.js", From 2b5e2c73caee32d259d0e0b1a341b796fd3ff86a Mon Sep 17 00:00:00 2001 From: Cano Date: Thu, 8 Oct 2020 14:20:32 +0200 Subject: [PATCH 2/3] Fix unit test --- app/templates/adf-cli-acs-aps-template/package.json | 12 ++++++------ app/templates/adf-cli-acs-template/package.json | 10 +++++----- .../adf-cli-activiti-acs-template/package.json | 12 ++++++------ .../adf-cli-activiti-cloud-acs-template/package.json | 12 ++++++------ .../src/app/tasks/tasks.component.spec.ts | 3 ++- .../adf-cli-activiti-cloud-template/package.json | 12 ++++++------ app/templates/adf-cli-activiti-template/package.json | 12 ++++++------ app/templates/adf-cli-aps-template/package.json | 12 ++++++------ package-lock.json | 2 +- package.json | 2 +- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/app/templates/adf-cli-acs-aps-template/package.json b/app/templates/adf-cli-acs-aps-template/package.json index 2f732ede..3e3701c5 100644 --- a/app/templates/adf-cli-acs-aps-template/package.json +++ b/app/templates/adf-cli-acs-aps-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-acs-aps-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Content and Process Services with APS 1", "description": "ACS APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-acs-template/package.json b/app/templates/adf-cli-acs-template/package.json index 7de0799a..32688cfa 100644 --- a/app/templates/adf-cli-acs-template/package.json +++ b/app/templates/adf-cli-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-acs-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Content Services", "description": "ACS ADF Application with Angular CLI", "license": "MIT", @@ -17,10 +17,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-acs-template/package.json b/app/templates/adf-cli-activiti-acs-template/package.json index 0fd3845d..24d3c9d1 100644 --- a/app/templates/adf-cli-activiti-acs-template/package.json +++ b/app/templates/adf-cli-activiti-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-acs-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Content and Process Services with Activiti", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services-cloud": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-cloud-acs-template/package.json b/app/templates/adf-cli-activiti-cloud-acs-template/package.json index 2a965085..9e40dde8 100644 --- a/app/templates/adf-cli-activiti-cloud-acs-template/package.json +++ b/app/templates/adf-cli-activiti-cloud-acs-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-cloud-acs-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Content and Process Services with Activiti Cloud", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services-cloud": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-cloud-acs-template/src/app/tasks/tasks.component.spec.ts b/app/templates/adf-cli-activiti-cloud-acs-template/src/app/tasks/tasks.component.spec.ts index 1bab9bca..8fa837fd 100644 --- a/app/templates/adf-cli-activiti-cloud-acs-template/src/app/tasks/tasks.component.spec.ts +++ b/app/templates/adf-cli-activiti-cloud-acs-template/src/app/tasks/tasks.component.spec.ts @@ -34,7 +34,8 @@ describe('TasksComponent', () => { } }, isEcmBpmConfiguration: () => false, - isEcmConfiguration: () => false + isEcmConfiguration: () => false, + isEcmLoggedIn: () => false }; beforeEach(() => { diff --git a/app/templates/adf-cli-activiti-cloud-template/package.json b/app/templates/adf-cli-activiti-cloud-template/package.json index a3deb634..c279dea3 100644 --- a/app/templates/adf-cli-activiti-cloud-template/package.json +++ b/app/templates/adf-cli-activiti-cloud-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-cloud-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Process Services with Activiti Cloud", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services-cloud": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-activiti-template/package.json b/app/templates/adf-cli-activiti-template/package.json index 46280595..90cf87f9 100644 --- a/app/templates/adf-cli-activiti-template/package.json +++ b/app/templates/adf-cli-activiti-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-activiti-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Process Services with Activiti", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services-cloud": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services-cloud": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/app/templates/adf-cli-aps-template/package.json b/app/templates/adf-cli-aps-template/package.json index 1ec22c13..7f36f679 100644 --- a/app/templates/adf-cli-aps-template/package.json +++ b/app/templates/adf-cli-aps-template/package.json @@ -1,6 +1,6 @@ { "name": "adf-cli-aps-template", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "blueprint": "Process Services with APS 1", "description": "APS ADF Application with Angular CLI", "license": "MIT", @@ -17,11 +17,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-process-services": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-core": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/adf-extensions": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", - "@alfresco/js-api": "4.1.0-e012f46a7ad6d45ba797f25d1cabedaab8c75d1d", + "@alfresco/adf-content-services": "4.1.0-beta6", + "@alfresco/adf-process-services": "4.1.0-beta6", + "@alfresco/adf-core": "4.1.0-beta6", + "@alfresco/adf-extensions": "4.1.0-beta6", + "@alfresco/js-api": "4.1.0-beta1", "@angular/animations": "10.0.6", "@angular/cdk": "10.0.2", "@angular/common": "10.0.6", diff --git a/package-lock.json b/package-lock.json index 7f671e5f..7514621d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-alfresco-adf-app", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4ada118f..3ceeebf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-alfresco-adf-app", - "version": "4.1.0-c06310d13c91b3f187baf2218aad23be2bb98eea", + "version": "4.1.0-beta6", "description": "ADF application generator for Yeoman", "author": "Alfresco Software, Ltd.", "main": "app/index.js", From daf6042bbd7cb1140c1bf72d058a26523c110727 Mon Sep 17 00:00:00 2001 From: Cano Date: Sun, 11 Oct 2020 23:12:01 +0200 Subject: [PATCH 3/3] Fix e2e tests --- .travis.yml | 10 +- .../src/app.config.json | 120 +++++---- .../adf-cli-acs-template/src/app.config.json | 120 +++++---- .../src/app.config.json | 240 +++++++++--------- .../src/app.config.json | 192 +++++++------- .../adf-cli-aps-template/src/app.config.json | 120 +++++---- e2e/lite-server-proxy.js | 2 +- e2e/sidebar_component.e2e.ts | 10 +- 8 files changed, 427 insertions(+), 387 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5681dfb1..f4d91371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,19 +66,19 @@ matrix: #E2e tests - stage: E2e tests name: adf-cli-acs-template - script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-acs-template + script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-acs-template --spec sidebar_component.e2e.ts - stage: E2e tests name: adf-cli-aps-template - script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-aps-template --spec sidebar_component.e2e.ts + script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-aps-template --spec sidebar_component.e2e.ts - stage: E2e tests name: adf-cli-acs-aps-template - script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-acs-aps-template + script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-acs-aps-template --spec sidebar_component.e2e.ts - stage: E2e tests name: adf-cli-activiti-template - script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -u "$E2E_SSO_USERNAME" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-template --spec sidebar_component.e2e.ts + script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-template --spec sidebar_component.e2e.ts - stage: E2e tests name: adf-cli-activiti-acs-template - script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -u "$E2E_SSO_USERNAME" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-acs-template --spec sidebar_component.e2e.ts + script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-acs-template --spec sidebar_component.e2e.ts - stage: Release name: Release diff --git a/app/templates/adf-cli-acs-aps-template/src/app.config.json b/app/templates/adf-cli-acs-aps-template/src/app.config.json index 403b3aa3..0e2d6c88 100644 --- a/app/templates/adf-cli-acs-aps-template/src/app.config.json +++ b/app/templates/adf-cli-acs-aps-template/src/app.config.json @@ -1,56 +1,68 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", - "ecmHost": "http://{hostname}{:port}", - "bpmHost": "http://{hostname}{:port}", - "providers" : "ALL", - "application": { - "name": "Alfresco ADF Application" - }, - "languages": [ - { - "key": "en", - "label": "English" - }, - { - "key": "fr", - "label": "French" - }, - { - "key": "de", - "label": "German" - }, - { - "key": "it", - "label": "Italian" - }, - { - "key": "es", - "label": "Spanish" - }, - { - "key": "ja", - "label": "Japanese" - }, - { - "key": "nl", - "label": "Dutch" - }, - { - "key": "pt-BR", - "label": "Brazilian Portuguese" - }, - { - "key": "nb", - "label": "Norwegian" - }, - { - "key": "ru", - "label": "Russian" - }, - { - "key": "zh-CN", - "label": "Simplified Chinese" - } - ], - "logLevel" : "trace" + "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "ecmHost": "{protocol}//{hostname}{:port}", + "bpmHost": "{protocol}//{hostname}{:port}", + "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "providers": "ALL", + "application": { + "name": "Alfresco ADF Application" + }, + "authType": "OAUTH", + "oauth2": { + "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "clientId": "activiti", + "scope": "openid", + "secret": "", + "implicitFlow": false, + "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", + "redirectUri": "/", + "redirectUriLogout": "/logout" + }, + "languages": [ + { + "key": "en", + "label": "English" + }, + { + "key": "fr", + "label": "French" + }, + { + "key": "de", + "label": "German" + }, + { + "key": "it", + "label": "Italian" + }, + { + "key": "es", + "label": "Spanish" + }, + { + "key": "ja", + "label": "Japanese" + }, + { + "key": "nl", + "label": "Dutch" + }, + { + "key": "pt-BR", + "label": "Brazilian Portuguese" + }, + { + "key": "nb", + "label": "Norwegian" + }, + { + "key": "ru", + "label": "Russian" + }, + { + "key": "zh-CN", + "label": "Simplified Chinese" + } + ], + "logLevel": "trace" } diff --git a/app/templates/adf-cli-acs-template/src/app.config.json b/app/templates/adf-cli-acs-template/src/app.config.json index 2d9551df..e9b366ef 100644 --- a/app/templates/adf-cli-acs-template/src/app.config.json +++ b/app/templates/adf-cli-acs-template/src/app.config.json @@ -1,56 +1,68 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", - "ecmHost": "http://{hostname}{:port}", - "bpmHost": "http://{hostname}{:port}", - "providers" : "ECM", - "application": { - "name": "Alfresco ADF Application" - }, - "languages": [ - { - "key": "en", - "label": "English" - }, - { - "key": "fr", - "label": "French" - }, - { - "key": "de", - "label": "German" - }, - { - "key": "it", - "label": "Italian" - }, - { - "key": "es", - "label": "Spanish" - }, - { - "key": "ja", - "label": "Japanese" - }, - { - "key": "nl", - "label": "Dutch" - }, - { - "key": "pt-BR", - "label": "Brazilian Portuguese" - }, - { - "key": "nb", - "label": "Norwegian" - }, - { - "key": "ru", - "label": "Russian" - }, - { - "key": "zh-CN", - "label": "Simplified Chinese" - } - ], - "logLevel" : "trace" + "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "ecmHost": "{protocol}//{hostname}{:port}", + "bpmHost": "{protocol}//{hostname}{:port}", + "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "providers": "ECM", + "application": { + "name": "Alfresco ADF Application" + }, + "authType": "OAUTH", + "oauth2": { + "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "clientId": "activiti", + "scope": "openid", + "secret": "", + "implicitFlow": false, + "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", + "redirectUri": "/", + "redirectUriLogout": "/logout" + }, + "languages": [ + { + "key": "en", + "label": "English" + }, + { + "key": "fr", + "label": "French" + }, + { + "key": "de", + "label": "German" + }, + { + "key": "it", + "label": "Italian" + }, + { + "key": "es", + "label": "Spanish" + }, + { + "key": "ja", + "label": "Japanese" + }, + { + "key": "nl", + "label": "Dutch" + }, + { + "key": "pt-BR", + "label": "Brazilian Portuguese" + }, + { + "key": "nb", + "label": "Norwegian" + }, + { + "key": "ru", + "label": "Russian" + }, + { + "key": "zh-CN", + "label": "Simplified Chinese" + } + ], + "logLevel": "trace" } diff --git a/app/templates/adf-cli-activiti-cloud-template/src/app.config.json b/app/templates/adf-cli-activiti-cloud-template/src/app.config.json index 3278ff10..7cbb819d 100644 --- a/app/templates/adf-cli-activiti-cloud-template/src/app.config.json +++ b/app/templates/adf-cli-activiti-cloud-template/src/app.config.json @@ -1,136 +1,142 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", - "ecmHost": "{protocol}//{hostname}{:port}", - "bpmHost": "{protocol}//{hostname}{:port}", - "identityHost": "{protocol}//{hostname}{:port}/auth/admin/realms/activiti", - "providers": "BPM", - "application": { - "name": "Alfresco ADF Application" + "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "ecmHost": "{protocol}//{hostname}{:port}", + "bpmHost": "{protocol}//{hostname}{:port}", + "identityHost": "{protocol}//{hostname}{:port}/auth/admin/realms/activiti", + "providers": "BPM", + "application": { + "name": "Alfresco ADF Application" + }, + "authType": "OAUTH", + "oauth2": { + "host": "{protocol}//{hostname}{:port}/auth/realms/activiti", + "clientId": "activiti", + "scope": "openid", + "secret": "", + "implicitFlow": false, + "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", + "redirectUri": "/", + "redirectUriLogout": "/logout" + }, + "languages": [ + { + "key": "en", + "label": "English" }, - "authType": "OAUTH", - "oauth2": { - "host": "{protocol}//{hostname}{:port}/auth/realms/activiti", - "clientId": "activiti", - "scope": "openid", - "secret": "", - "implicitFlow": false, - "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", - "redirectUri": "/", - "redirectUriLogout": "/logout" + { + "key": "fr", + "label": "French" }, - "languages": [ - { - "key": "en", - "label": "English" - }, - { - "key": "fr", - "label": "French" - }, - { - "key": "de", - "label": "German" - }, + { + "key": "de", + "label": "German" + }, + { + "key": "it", + "label": "Italian" + }, + { + "key": "es", + "label": "Spanish" + }, + { + "key": "ja", + "label": "Japanese" + }, + { + "key": "nl", + "label": "Dutch" + }, + { + "key": "pt-BR", + "label": "Brazilian Portuguese" + }, + { + "key": "nb", + "label": "Norwegian" + }, + { + "key": "ru", + "label": "Russian" + }, + { + "key": "zh-CN", + "label": "Simplified Chinese" + } + ], + "logLevel": "trace", + "adf-cloud-task-list": { + "presets": { + "default": [ { - "key": "it", - "label": "Italian" + "key": "entry.id", + "type": "text", + "title": "Id", + "sortable": true }, { - "key": "es", - "label": "Spanish" + "key": "entry.name", + "type": "text", + "title": "Name", + "sortable": true, + "cssClass": "full-width name-column ellipsis-cell" }, { - "key": "ja", - "label": "Japanese" + "key": "entry.status", + "type": "text", + "title": "Status", + "sortable": true }, { - "key": "nl", - "label": "Dutch" - }, + "key": "entry.priority", + "type": "text", + "title": "Priority", + "sortable": true + } + ] + } + }, + "adf-cloud-task-header": { + "presets": { + "properties": [ + "description", + "assignee", + "status", + "priority", + "created" + ] + } + }, + "adf-cloud-process-list": { + "presets": { + "default": [ { - "key": "pt-BR", - "label": "Brazilian Portuguese" + "key": "entry.id", + "type": "text", + "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.ID", + "sortable": true }, { - "key": "nb", - "label": "Norwegian" + "key": "entry.name", + "type": "text", + "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.NAME", + "sortable": true }, { - "key": "ru", - "label": "Russian" + "key": "entry.status", + "type": "text", + "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.STATUS", + "sortable": true }, { - "key": "zh-CN", - "label": "Simplified Chinese" + "key": "entry.startDate", + "type": "date", + "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.START_DATE", + "sortable": true, + "format": "timeAgo" } - ], - "logLevel": "trace", - "adf-cloud-task-list": { - "presets": { - "default": [ - { - "key": "entry.id", - "type": "text", - "title": "Id", - "sortable": true - }, - { - "key": "entry.name", - "type": "text", - "title": "Name", - "sortable": true, - "cssClass": "full-width name-column ellipsis-cell" - }, - { - "key": "entry.status", - "type": "text", - "title": "Status", - "sortable": true - }, - { - "key": "entry.priority", - "type": "text", - "title": "Priority", - "sortable": true - } - ] - } - }, - "adf-cloud-task-header": { - "presets": { - "properties" : [ "description", "assignee", "status", "priority", "created"] - } - }, - "adf-cloud-process-list": { - "presets": { - "default": [ - { - "key": "entry.id", - "type": "text", - "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.ID", - "sortable": true - }, - { - "key": "entry.name", - "type": "text", - "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.NAME", - "sortable": true - }, - { - "key": "entry.status", - "type": "text", - "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.STATUS", - "sortable": true - }, - { - "key": "entry.startDate", - "type": "date", - "title": "ADF_CLOUD_PROCESS_LIST.PROPERTIES.START_DATE", - "sortable": true, - "format": "timeAgo" - } - ] - } - }, - "alfresco-deployed-apps": [] + ] + } + }, + "alfresco-deployed-apps": [] } diff --git a/app/templates/adf-cli-activiti-template/src/app.config.json b/app/templates/adf-cli-activiti-template/src/app.config.json index 5b5957f6..6ba899a2 100644 --- a/app/templates/adf-cli-activiti-template/src/app.config.json +++ b/app/templates/adf-cli-activiti-template/src/app.config.json @@ -1,105 +1,111 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", - "ecmHost": "{protocol}//{hostname}{:port}", - "bpmHost": "{protocol}//{hostname}{:port}", - "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco", - "providers": "BPM", - "application": { - "name": "Alfresco ADF Application" + "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "ecmHost": "{protocol}//{hostname}{:port}", + "bpmHost": "{protocol}//{hostname}{:port}", + "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "providers": "BPM", + "application": { + "name": "Alfresco ADF Application" + }, + "authType": "OAUTH", + "oauth2": { + "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "clientId": "activiti", + "scope": "openid", + "secret": "", + "implicitFlow": false, + "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", + "redirectUri": "/", + "redirectUriLogout": "/logout" + }, + "languages": [ + { + "key": "en", + "label": "English" }, - "authType": "OAUTH", - "oauth2": { - "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco", - "clientId": "activiti", - "scope": "openid", - "secret": "", - "implicitFlow": false, - "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", - "redirectUri": "/", - "redirectUriLogout": "/logout" + { + "key": "fr", + "label": "French" }, - "languages": [ - { - "key": "en", - "label": "English" - }, - { - "key": "fr", - "label": "French" - }, - { - "key": "de", - "label": "German" - }, - { - "key": "it", - "label": "Italian" - }, - { - "key": "es", - "label": "Spanish" - }, - { - "key": "ja", - "label": "Japanese" - }, - { - "key": "nl", - "label": "Dutch" - }, + { + "key": "de", + "label": "German" + }, + { + "key": "it", + "label": "Italian" + }, + { + "key": "es", + "label": "Spanish" + }, + { + "key": "ja", + "label": "Japanese" + }, + { + "key": "nl", + "label": "Dutch" + }, + { + "key": "pt-BR", + "label": "Brazilian Portuguese" + }, + { + "key": "nb", + "label": "Norwegian" + }, + { + "key": "ru", + "label": "Russian" + }, + { + "key": "zh-CN", + "label": "Simplified Chinese" + } + ], + "logLevel": "trace", + "adf-cloud-task-list": { + "presets": { + "default": [ { - "key": "pt-BR", - "label": "Brazilian Portuguese" + "key": "entry.id", + "type": "text", + "title": "Id", + "sortable": true }, { - "key": "nb", - "label": "Norwegian" + "key": "entry.name", + "type": "text", + "title": "Name", + "sortable": true, + "cssClass": "full-width name-column ellipsis-cell" }, { - "key": "ru", - "label": "Russian" + "key": "entry.status", + "type": "text", + "title": "Status", + "sortable": true }, { - "key": "zh-CN", - "label": "Simplified Chinese" - } - ], - "logLevel": "trace", - "adf-cloud-task-list": { - "presets": { - "default": [ - { - "key": "entry.id", - "type": "text", - "title": "Id", - "sortable": true - }, - { - "key": "entry.name", - "type": "text", - "title": "Name", - "sortable": true, - "cssClass": "full-width name-column ellipsis-cell" - }, - { - "key": "entry.status", - "type": "text", - "title": "Status", - "sortable": true - }, - { - "key": "entry.priority", - "type": "text", - "title": "Priority", - "sortable": true - } - ] + "key": "entry.priority", + "type": "text", + "title": "Priority", + "sortable": true } - }, - "adf-cloud-task-header": { - "presets": { - "properties" : [ "description", "assignee", "status", "priority", "created"] - } - }, - "alfresco-deployed-apps": [] + ] + } + }, + "adf-cloud-task-header": { + "presets": { + "properties": [ + "description", + "assignee", + "status", + "priority", + "created" + ] + } + }, + "alfresco-deployed-apps": [] } diff --git a/app/templates/adf-cli-aps-template/src/app.config.json b/app/templates/adf-cli-aps-template/src/app.config.json index cd05ffb8..e26d5881 100644 --- a/app/templates/adf-cli-aps-template/src/app.config.json +++ b/app/templates/adf-cli-aps-template/src/app.config.json @@ -1,56 +1,68 @@ { - "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", - "ecmHost": "http://{hostname}{:port}", - "bpmHost": "http://{hostname}{:port}", - "providers" : "BPM", - "application": { - "name": "Alfresco ADF Application" - }, - "languages": [ - { - "key": "en", - "label": "English" - }, - { - "key": "fr", - "label": "French" - }, - { - "key": "de", - "label": "German" - }, - { - "key": "it", - "label": "Italian" - }, - { - "key": "es", - "label": "Spanish" - }, - { - "key": "ja", - "label": "Japanese" - }, - { - "key": "nl", - "label": "Dutch" - }, - { - "key": "pt-BR", - "label": "Brazilian Portuguese" - }, - { - "key": "nb", - "label": "Norwegian" - }, - { - "key": "ru", - "label": "Russian" - }, - { - "key": "zh-CN", - "label": "Simplified Chinese" - } - ], - "logLevel" : "trace" + "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json", + "ecmHost": "{protocol}//{hostname}{:port}", + "bpmHost": "{protocol}//{hostname}{:port}", + "identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "providers": "BPM", + "application": { + "name": "Alfresco ADF Application" + }, + "authType": "OAUTH", + "oauth2": { + "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco", + "clientId": "activiti", + "scope": "openid", + "secret": "", + "implicitFlow": false, + "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html", + "redirectUri": "/", + "redirectUriLogout": "/logout" + }, + "languages": [ + { + "key": "en", + "label": "English" + }, + { + "key": "fr", + "label": "French" + }, + { + "key": "de", + "label": "German" + }, + { + "key": "it", + "label": "Italian" + }, + { + "key": "es", + "label": "Spanish" + }, + { + "key": "ja", + "label": "Japanese" + }, + { + "key": "nl", + "label": "Dutch" + }, + { + "key": "pt-BR", + "label": "Brazilian Portuguese" + }, + { + "key": "nb", + "label": "Norwegian" + }, + { + "key": "ru", + "label": "Russian" + }, + { + "key": "zh-CN", + "label": "Simplified Chinese" + } + ], + "logLevel": "trace" } diff --git a/e2e/lite-server-proxy.js b/e2e/lite-server-proxy.js index 54b8d17b..1bf83f8a 100644 --- a/e2e/lite-server-proxy.js +++ b/e2e/lite-server-proxy.js @@ -3,7 +3,7 @@ var HOST = process.env.URL_HOST_ADF; let proxy = require('http-proxy-middleware'); -let targetProxy = 'http://' + (PROXY_HOST_ADF || HOST); +let targetProxy = 'https://' + (PROXY_HOST_ADF || HOST); let fallback = require('connect-history-api-fallback'); console.log('targetProxy +===========' + targetProxy); diff --git a/e2e/sidebar_component.e2e.ts b/e2e/sidebar_component.e2e.ts index a0cea7f2..21b5f52d 100644 --- a/e2e/sidebar_component.e2e.ts +++ b/e2e/sidebar_component.e2e.ts @@ -18,7 +18,6 @@ import { browser } from 'protractor'; import TestConfig = require('./test.config'); import { LoginPage } from './loginPage'; -import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AdfAppPage } from './app.po'; describe('Content Services Viewer', () => { @@ -26,17 +25,9 @@ describe('Content Services Viewer', () => { const loginPage = new LoginPage(); const loginURL = TestConfig.adf.url + TestConfig.adf.port + '/login'; const page = new AdfAppPage(); - let alfrescoJsApi: AlfrescoApi; beforeAll(async (done) => { - alfrescoJsApi = new AlfrescoApi({ - provider: 'ECM', - hostEcm: TestConfig.adf.url - }); - - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - browser.driver.get(loginURL); await loginPage.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); @@ -50,3 +41,4 @@ describe('Content Services Viewer', () => { }); }); +