From 8e94e677793e3503b3324baa46645cb7cebb2dab Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Fri, 25 Nov 2016 17:46:19 +0000 Subject: [PATCH 001/162] #1143 - fix multiple call to the load service --- ...activiti-process-instance-details.component.ts | 15 ++------------- .../activiti-process-instance-tasks.component.ts | 13 ++++++++----- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 6268d81240..264b334c31 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, Input, ViewChild, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; +import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; @@ -31,7 +31,7 @@ declare let componentHandler: any; templateUrl: './activiti-process-instance-details.component.html', styleUrls: ['./activiti-process-instance-details.component.css'] }) -export class ActivitiProcessInstanceDetails implements OnInit, OnChanges { +export class ActivitiProcessInstanceDetails implements OnChanges { @Input() processInstanceId: string; @@ -72,12 +72,6 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges { } } - ngOnInit() { - if (this.processInstanceId) { - this.load(this.processInstanceId); - } - } - ngOnChanges(changes: SimpleChanges) { let processInstanceId = changes['processInstanceId']; if (processInstanceId && !processInstanceId.currentValue) { @@ -102,11 +96,6 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges { this.activitiProcess.getProcess(processId).subscribe( (res: ProcessInstance) => { this.processInstanceDetails = res; - if (this.processInstanceDetails) { - if (this.tasksList) { - this.tasksList.load(this.processInstanceDetails.id); - } - } } ); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index bb3a228bf1..d61db9f023 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, Input, OnInit, ViewChild, Output, EventEmitter } from '@angular/core'; +import { Component, Input, OnInit, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TaskDetailsModel } from 'ng2-activiti-tasklist'; @@ -32,7 +32,7 @@ declare let dialogPolyfill: any; templateUrl: './activiti-process-instance-tasks.component.html', styleUrls: ['./activiti-process-instance-tasks.component.css'] }) -export class ActivitiProcessInstanceTasks implements OnInit { +export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { @Input() processInstanceDetails: ProcessInstance; @@ -84,9 +84,12 @@ export class ActivitiProcessInstanceTasks implements OnInit { this.completedTask$.subscribe((task: TaskDetailsModel) => { this.completedTasks.push(task); }); + } - if (this.processInstanceDetails && this.processInstanceDetails.id) { - this.load(this.processInstanceDetails.id); + ngOnChanges(changes: SimpleChanges) { + let processInstanceDetails = changes['processInstanceDetails']; + if (processInstanceDetails && processInstanceDetails.currentValue) { + this.load(processInstanceDetails.currentValue.id); } } @@ -151,7 +154,6 @@ export class ActivitiProcessInstanceTasks implements OnInit { public clickTask($event: any, task: TaskDetailsModel) { this.selectedTaskId = task.id; - this.taskdetails.loadDetails(task.id); this.showDialog(); } @@ -189,6 +191,7 @@ export class ActivitiProcessInstanceTasks implements OnInit { if (this.dialog) { this.dialog.nativeElement.close(); } + this.selectedTaskId = null; } public onTaskFormCompleted() { From 9e584925f830947703e2a8c5d716a15effb032c9 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Fri, 25 Nov 2016 18:52:38 +0000 Subject: [PATCH 002/162] Fixed test due new changes --- ...process-instance-details.component.spec.ts | 13 +------------ ...i-process-instance-tasks.component.spec.ts | 19 +++++++++---------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index d18a719465..85c45d4392 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -72,12 +72,6 @@ describe('ActivitiProcessInstanceDetails', () => { window['componentHandler'] = componentHandler; }); - it('should load task details when processInstanceId specified', () => { - component.processInstanceId = '123'; - fixture.detectChanges(); - expect(getProcessSpy).toHaveBeenCalled(); - }); - it('should not load task details when no processInstanceId is specified', () => { fixture.detectChanges(); expect(getProcessSpy).not.toHaveBeenCalled(); @@ -89,8 +83,8 @@ describe('ActivitiProcessInstanceDetails', () => { }); it('should display a header when the processInstanceId is provided', async(() => { - component.processInstanceId = '123'; fixture.detectChanges(); + component.ngOnChanges({ 'processInstanceId': new SimpleChange(null, '123') }); fixture.whenStable().then(() => { fixture.detectChanges(); let headerEl: DebugElement = fixture.debugElement.query(By.css('h2')); @@ -118,11 +112,6 @@ describe('ActivitiProcessInstanceDetails', () => { expect(getProcessSpy).toHaveBeenCalledWith('456'); }); - it('should reload tasks list when processInstanceId changed', () => { - component.ngOnChanges({ 'processInstanceId': change }); - expect(component.tasksList.load).toHaveBeenCalled(); - }); - it('should NOT fetch new process details when empty changeset made', () => { component.ngOnChanges({}); expect(getProcessSpy).not.toHaveBeenCalled(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts index 8670f9bcba..bb80c1da69 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; @@ -52,7 +52,7 @@ describe('ActivitiProcessInstanceTasks', () => { { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService ], - schemas: [ NO_ERRORS_SCHEMA ] + schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); })); @@ -103,16 +103,13 @@ describe('ActivitiProcessInstanceTasks', () => { expect(listEl).toBeNull(); }); - it('should call service to get tasks on init', () => { - component.processInstanceDetails = exampleProcessInstance; - fixture.detectChanges(); - expect(getProcessTasksSpy).toHaveBeenCalled(); - }); - it('should display active tasks', () => { - component.processInstanceDetails = exampleProcessInstance; + let change = new SimpleChange(null, exampleProcessInstance); fixture.detectChanges(); + component.ngOnChanges({ 'processInstanceDetails': change }); fixture.whenStable().then(() => { + fixture.detectChanges(); + component.ngOnChanges({ 'processInstanceDetails': change }); let listEl = fixture.debugElement.query(By.css('[data-automation-id="active-tasks"]')); expect(listEl).not.toBeNull(); expect(listEl.queryAll(By.css('li')).length).toBe(1); @@ -120,9 +117,11 @@ describe('ActivitiProcessInstanceTasks', () => { }); it('should display completed tasks', () => { - component.processInstanceDetails = exampleProcessInstance; + let change = new SimpleChange(null, exampleProcessInstance); fixture.detectChanges(); + component.ngOnChanges({ 'processInstanceDetails': change }); fixture.whenStable().then(() => { + fixture.detectChanges(); let listEl = fixture.debugElement.query(By.css('[data-automation-id="completed-tasks"]')); expect(listEl).not.toBeNull(); expect(listEl.queryAll(By.css('li')).length).toBe(1); From 546347b47570c56b657ed9e8feb31a88a838b5fa Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 28 Nov 2016 11:08:27 +0000 Subject: [PATCH 003/162] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 457c2f3b76..76d5ed14b4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,9 @@ **Please check if the PR fulfills these requirements** -- [ ] The commit message follows our [guidelines](https://github.com/Alfresco/alfresco-ng2-components/wiki/Commit-format) -- [ ] Tests for the changes have been added (for bug fixes / features) -- [ ] Docs have been added / updated (for bug fixes / features) - +``` +[ ] The commit message follows our [guidelines](https://github.com/Alfresco/alfresco-ng2-components/wiki/Commit-format) +[ ] Tests for the changes have been added (for bug fixes / features) +[ ] Docs have been added / updated (for bug fixes / features) +``` + + + + - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    -
  • Current path: {{documentList.currentFolderPath}}
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- - -

- -

- - -

- -

- -

- -

- -

- -

- -
Upload
-
-
- -
-
-
- - - -
-
- - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • Current path: {{documentList.currentFolderPath}}
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+ + +

+ +

+ + +

+ +

+ +

+ +

+ +

+ +

+ +
Upload
+
+
+ +
+
+
+ + + +
+
+ + + +
+ +
{ let handler = jasmine.createSpyObj('componentHandler', ['upgradeAllRegistered']); window['componentHandler'] = handler; - dataTable.ngAfterViewChecked(); + dataTable.ngOnInit(); expect(handler.upgradeAllRegistered).toHaveBeenCalled(); }); it('should upgrade MDL components only when component handler present', () => { expect(window['componentHandler']).toBeNull(); - dataTable.ngAfterViewChecked(); + dataTable.ngOnInit(); }); it('should invert "select all" status', () => { diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index 573ba6967a..cd0d2e7547 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -15,16 +15,7 @@ * limitations under the License. */ -import { - Component, - OnInit, - Input, - Output, - EventEmitter, - AfterViewChecked, - TemplateRef -} from '@angular/core'; - +import { Component, OnInit, Input, Output, EventEmitter, TemplateRef } from '@angular/core'; import { DataTableAdapter, DataRow, @@ -42,7 +33,7 @@ declare var componentHandler; styleUrls: ['./datatable.component.css'], templateUrl: './datatable.component.html' }) -export class DataTableComponent implements OnInit, AfterViewChecked { +export class DataTableComponent implements OnInit { @Input() data: DataTableAdapter; @@ -79,9 +70,7 @@ export class DataTableComponent implements OnInit, AfterViewChecked { if (!this.data) { this.data = new ObjectDataTableAdapter([], []); } - } - ngAfterViewChecked() { // workaround for MDL issues with dynamic components if (componentHandler) { componentHandler.upgradeAllRegistered(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index 8315e839a3..14078e6be7 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -272,11 +272,6 @@ describe('DocumentList', () => { expect(documentList.executeContentAction).not.toHaveBeenCalled(); }); - it('should upgrade material design components', () => { - documentList.ngAfterViewChecked(); - expect(componentHandler.upgradeAllRegistered).toHaveBeenCalled(); - }); - it('should subscribe to context action handler', () => { spyOn(documentList, 'displayFolderContent').and.stub(); spyOn(documentList, 'contextActionCallback').and.stub(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 64e8f16c91..fb239ad44a 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -22,7 +22,6 @@ import { Output, EventEmitter, AfterContentInit, - AfterViewChecked, TemplateRef, NgZone, ViewChild, @@ -41,15 +40,13 @@ import { ImageResolver } from './../data/share-datatable-adapter'; -declare var componentHandler; - @Component({ moduleId: module.id, selector: 'alfresco-document-list', styleUrls: ['./document-list.css'], templateUrl: './document-list.html' }) -export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit { +export class DocumentList implements OnInit, AfterContentInit { static SINGLE_CLICK_NAVIGATION: string = 'click'; static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; @@ -196,16 +193,8 @@ export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit return false; } - ngAfterViewChecked() { - // workaround for MDL issues with dynamic components - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - } - isMobile(): boolean { return !!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); - } getNodeActions(node: MinimalNodeEntity): ContentActionModel[] { diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts index ee12c9b5a1..96248783b9 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts @@ -203,8 +203,8 @@ describe('ShareDataTableAdapter', () => { spyOn(console, 'error').and.stub(); let value = adapter.getValue(row, col); - expect(value).toBe(dateValue); - expect(console.error).toHaveBeenCalledWith(`Error parsing date ${value} to format ${col.format}`); + expect(value).toBe('Error'); + expect(console.error).toHaveBeenCalled(); }); it('should generate fallback icon for a file thumbnail with unknown mime type', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index 1754c5f594..f2c7a2078d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -121,15 +121,21 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid if (!col) { throw new Error(this.ERR_COL_NOT_FOUND); } - let value = row.getValue(col.key); + let dataRow: ShareDataRow = row; + let value: any = row.getValue(col.key); + if (dataRow.cache[col.key] !== undefined) { + return dataRow.cache[col.key]; + } if (col.type === 'date') { let datePipe = new DatePipe('en-US'); let format = col.format || this.DEFAULT_DATE_FORMAT; try { - return datePipe.transform(value, format); + let result = datePipe.transform(value, format); + return dataRow.cacheValue(col.key, result); } catch (err) { console.error(`Error parsing date ${value} to format ${format}`); + return 'Error'; } } @@ -174,7 +180,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid } - return value; + return dataRow.cacheValue(col.key, value); } getSorting(): DataSorting { @@ -308,6 +314,7 @@ export class ShareDataRow implements DataRow { static ERR_OBJECT_NOT_FOUND: string = 'Object source not found'; + cache: { [key: string]: any } = {}; isSelected: boolean = false; get node(): NodeMinimalEntry { @@ -320,7 +327,15 @@ export class ShareDataRow implements DataRow { } } + cacheValue(key: string, value: any): any { + this.cache[key] = value; + return value; + } + getValue(key: string): any { + if (this.cache[key] !== undefined) { + return this.cache[key]; + } return ObjectUtils.getValue(this.obj.entry, key); } From 132e6eac96209b608b61ac9ed8855d0e745fec4f Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Mon, 28 Nov 2016 14:49:07 -0800 Subject: [PATCH 007/162] update aws image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b397b82454..b8305f49c6 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ To generate your Alfresco Angular 2 application you can use the following Yeoman To deploy directly on your AWS instance our demo shell click the button below: - + ## Browser Support All components are supported in the following browsers: From 9066ce49e0b50a7cdc01b93ad28323cae7add5ce Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 29 Nov 2016 12:03:24 +0000 Subject: [PATCH 008/162] document-list improvements (#1169) * #1167 document-list improvements - allow setting custom root path - document-list module now re-exports datatable module (no need importing it separately if document-list is already used) - documentation updates and fixes * readme updates and unit test --- .../ng2-alfresco-documentlist/README.md | 36 ++++++------------- .../demo/src/main.ts | 2 -- .../ng2-alfresco-documentlist/index.ts | 1 + .../src/components/document-list.spec.ts | 8 +++++ .../src/components/document-list.ts | 12 +++++++ .../src/data/share-datatable-adapter.ts | 5 ++- .../src/services/document-list.service.ts | 9 +++-- 7 files changed, 43 insertions(+), 30 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 738bd97733..2aaf3da951 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -114,7 +114,6 @@ import { NgModule, Component, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { CoreModule } from 'ng2-alfresco-core'; -import { DataTableModule } from 'ng2-alfresco-datatable'; import { DocumentListModule, DocumentList } from 'ng2-alfresco-documentlist'; import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; @@ -133,7 +132,8 @@ class DocumentListDemo { @ViewChild(DocumentList) documentList: DocumentList; - constructor(private authService: AlfrescoAuthenticationService, private settingsService: AlfrescoSettingsService) { + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService) { settingsService.ecmHost = 'http://localhost:8080'; this.authService.login('admin', 'admin').subscribe( @@ -151,7 +151,6 @@ class DocumentListDemo { imports: [ BrowserModule, CoreModule.forRoot(), - DataTableModule, DocumentListModule.forRoot() ], declarations: [DocumentListDemo], @@ -169,6 +168,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | Name | Type | Default | Description | | --- | --- | --- | --- | +| `rootPath` | string | -root- | Root node path, i.e. `-root-`, `-shared-`, `-my-`, etc. | | `navigate` | boolean | true | Toggles navigation to folder content or file preview | | `navigationMode` | string (click\|dblclick) | dblclick | User interaction for folder navigation or file preview | | `thumbnails` | boolean | false | Show document thumbnails rather than icons | @@ -282,7 +282,7 @@ HTML attributes: | `sr-title` | string | | Screen reader title, used only when `title` is empty | | `key` | string | | Column source key, example: `createdByUser.displayName` | | `sortable` | boolean | false | Toggle sorting ability via column header clicks | -| `class`| string | | CSS class list, example: `full-width ellipsis-cell` | +| `class` | string | | CSS class list, example: `full-width ellipsis-cell` | | `type` | string | text | Column type, text\|date\|number | | `format` | string | | Value format pattern | @@ -414,24 +414,12 @@ into context menu items like shown below: Enabling context menu is very simple: ```ts -import { - CONTEXT_MENU_DIRECTIVES, - CONTEXT_MENU_PROVIDERS -} from 'ng2-alfresco-core'; - -import { - DOCUMENT_LIST_DIRECTIVES, - DOCUMENT_LIST_PROVIDERS -} from 'ng2-alfresco-documentlist'; - @Component({ selector: 'my-view', template: ` ... - `, - directives: [DOCUMENT_LIST_DIRECTIVES, CONTEXT_MENU_DIRECTIVES], - providers: [DOCUMENT_LIST_PROVIDERS, CONTEXT_MENU_PROVIDERS] + ` }) export class MyView { } @@ -464,10 +452,10 @@ DocumentList emits the following events: | Name | Description | | --- | --- | -| nodeClick | emitted when user clicks a list node | -| nodeDblClick | emitted when user double-clicks list node | -| folderChange | emitted once current display folder has changed | -| preview | emitted when user acts upon files with either single or double click (depends on `navigation-mode`), recommended for Viewer components integration | +| `nodeClick` | emitted when user clicks a list node | +| `nodeDblClick` | emitted when user double-clicks list node | +| `folderChange` | emitted once current display folder has changed | +| `preview` | emitted when user acts upon files with either single or double click (depends on `navigation-mode`), recommended for Viewer components integration | ## Advanced usage and customization @@ -691,9 +679,7 @@ You register custom handler called `my-handler` that will be executing `myDocume function each time upon being invoked. ```ts -import { - DocumentActionsService -} from 'ng2-alfresco-documentlist'; +import { DocumentActionsService } from 'ng2-alfresco-documentlist'; export class MyView { @@ -745,7 +731,7 @@ npm run build ### Build the files and keep watching for changes ```sh -$ npm run build:w +npm run build:w ``` ## Running unit tests diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index a094e8b144..0a28fab336 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -19,7 +19,6 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { CoreModule } from 'ng2-alfresco-core'; -import { DataTableModule } from 'ng2-alfresco-datatable'; import { DocumentListModule, DocumentList } from 'ng2-alfresco-documentlist'; import { @@ -217,7 +216,6 @@ class DocumentListDemo implements OnInit { imports: [ BrowserModule, CoreModule.forRoot(), - DataTableModule, DocumentListModule.forRoot() ], declarations: [ DocumentListDemo ], diff --git a/ng2-components/ng2-alfresco-documentlist/index.ts b/ng2-components/ng2-alfresco-documentlist/index.ts index c8c9affce8..5178390abc 100644 --- a/ng2-components/ng2-alfresco-documentlist/index.ts +++ b/ng2-components/ng2-alfresco-documentlist/index.ts @@ -80,6 +80,7 @@ export const DOCUMENT_LIST_PROVIDERS: any[] = [ ...DOCUMENT_LIST_PROVIDERS ], exports: [ + DataTableModule, ...DOCUMENT_LIST_DIRECTIVES ] }) diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index 14078e6be7..81f042cf2c 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -47,6 +47,14 @@ describe('DocumentList', () => { window['componentHandler'] = componentHandler; }); + it('should update root path', () => { + let adapter = documentList.data; + expect(adapter.rootPath).toBe(adapter.DEFAULT_ROOT_PATH); + + documentList.rootPath = '-shared-'; + expect(adapter.rootPath).toBe('-shared-'); + }); + it('should setup default columns', () => { spyOn(documentList, 'setupDefaultColumns').and.callThrough(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index fb239ad44a..58b744497d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -56,6 +56,18 @@ export class DocumentList implements OnInit, AfterContentInit { baseComponentPath = module.id.replace('/components/document-list.js', ''); + @Input() + set rootPath(value: string) { + this.data.rootPath = value || this.data.DEFAULT_ROOT_PATH; + } + + get rootPath(): string { + if (this.data) { + return this.data.rootPath; + } + return null; + } + @Input() fallbackThubnail: string = this.baseComponentPath + '/img/ft_ic_miscellaneous.svg'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index f2c7a2078d..4937ffcf60 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -31,6 +31,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid ERR_ROW_NOT_FOUND: string = 'Row not found'; ERR_COL_NOT_FOUND: string = 'Column not found'; + DEFAULT_ROOT_PATH: string = '-root-'; DEFAULT_DATE_FORMAT: string = 'medium'; DEFAULT_PAGE_SIZE: number = 20; MIN_PAGE_SIZE: number = 5; @@ -52,6 +53,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid thumbnails: boolean = false; dataLoaded: DataLoadedEventEmitter; + rootPath: string = this.DEFAULT_ROOT_PATH; constructor(private documentListService: DocumentListService, private basePath: string, @@ -207,7 +209,8 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid this.documentListService .getFolder(path, { maxItems: this._maxItems, - skipCount: this._skipCount + skipCount: this._skipCount, + rootPath: this.rootPath }) .subscribe(val => { this.loadPage(val); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index a821c4e4fa..632f597a19 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -63,7 +63,12 @@ export class DocumentListService { } private getNodesPromise(folder: string, opts?: any): Promise { - let nodeId = '-root-'; + let rootPath = '-root-'; + + if (opts && opts.rootPath) { + rootPath = opts.rootPath; + } + let params: any = { relativePath: folder, include: ['path', 'properties'] @@ -78,7 +83,7 @@ export class DocumentListService { } } - return this.apiService.getInstance().nodes.getNodeChildren(nodeId, params); + return this.apiService.getInstance().nodes.getNodeChildren(rootPath, params); } deleteNode(nodeId: string): Observable { From 5c401007f28acd7e20729bc745ae1d9661610816 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 29 Nov 2016 13:26:41 +0000 Subject: [PATCH 009/162] user-info fixes and performance improvements (#1171) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #1167 document-list improvements - allow setting custom root path - document-list module now re-exports datatable module (no need importing it separately if document-list is already used) - documentation updates and fixes * readme updates and unit test * user-info fixes and performance improvements - setup live reloads for user-info (demo shell) - optimise user-info template (single *ngIf, [mdl] directive for ‘user-profile-lists’ instead of CPU-hungry `ngAfterViewChecked`) --- demo-shell-ng2/wsrv-config.json | 1 + .../src/components/user-info.component.html | 145 +++++++++--------- .../src/components/user-info.component.ts | 11 +- 3 files changed, 76 insertions(+), 81 deletions(-) diff --git a/demo-shell-ng2/wsrv-config.json b/demo-shell-ng2/wsrv-config.json index bacfda5339..5329327a46 100644 --- a/demo-shell-ng2/wsrv-config.json +++ b/demo-shell-ng2/wsrv-config.json @@ -6,6 +6,7 @@ "node_modules/ng2-alfresco-login/dist/**/*.{html,css,js}", "node_modules/ng2-alfresco-search/dist/**/*.{html,css,js}", "node_modules/ng2-alfresco-upload/dist/**/*.{html,css,js}", + "node_modules/ng2-alfresco-userinfo/dist/**/*.{html,css,js}", "node_modules/ng2-alfresco-viewer/dist/**/*.{html,css,js}", "node_modules/ng2-alfresco-webscript/dist/**/*.{html,css,js}", "node_modules/ng2-activiti-form/dist/**/*.{html,css,js}", diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html index 753230730e..0591a3d99e 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html @@ -1,83 +1,84 @@
-
- user-info-profile-button -
-
@@ -52,35 +53,37 @@
-
+
Process Filters
- + + (filterClick)="onProcessFilterClick($event)" + (onSuccess)="onSuccessProcessFilterList($event)">
Process List
+ [processDefinitionKey]="processFilter.filter.processDefinitionKey" + [name]="processFilter.filter.name" + [state]="processFilter.filter.state" + [sort]="processFilter.filter.sort" + [data]="dataProcesses" + (rowClick)="onProcessRowClick($event)" + (onSuccess)="onSuccessProcessList($event)">
-
+
Process Details
+ (activitiprocesslist)="taskFormCompleted()" + (processCancelled)="processCancelled()">
Start Process @@ -96,14 +99,14 @@
-
+
Report List
+ (reportClick)="onReportClick($event)" + #analyticsreportlist>
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 5ae153cb8e..98125b3730 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -89,6 +89,10 @@ export class ActivitiDemoComponent implements AfterViewInit { taskSchemaColumns: any [] = []; processSchemaColumns: any [] = []; + processTabActivie: boolean = false; + + reportsTabActivie: boolean = false; + taskFilter: FilterRepresentationModel; report: any; processFilter: FilterRepresentationModel; @@ -232,6 +236,14 @@ export class ActivitiDemoComponent implements AfterViewInit { this.loadStencilScriptsInPageFromActiviti(); } + activeProcess() { + this.processTabActivie = true; + } + + activeReports() { + this.reportsTabActivie = true; + } + loadStencilScriptsInPageFromActiviti() { this.apiService.getInstance().activiti.scriptFileApi.getControllers().then(response => { if (response) { diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts index c992b378a8..3e6eca3be6 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts @@ -103,13 +103,13 @@ describe('ActivitiForm', () => { it('should enable custom outcome buttons', () => { let formModel = new FormModel(); - let outcome = new FormOutcomeModel(formModel, { id: 'action1', name: 'Action 1' }); + let outcome = new FormOutcomeModel(formModel, {id: 'action1', name: 'Action 1'}); expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); }); it('should allow controlling [complete] button visibility', () => { let formModel = new FormModel(); - let outcome = new FormOutcomeModel(formModel, { id: '$save', name: FormOutcomeModel.SAVE_ACTION }); + let outcome = new FormOutcomeModel(formModel, {id: '$save', name: FormOutcomeModel.SAVE_ACTION}); formComponent.showSaveButton = true; expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); @@ -120,7 +120,7 @@ describe('ActivitiForm', () => { it('should allow controlling [save] button visibility', () => { let formModel = new FormModel(); - let outcome = new FormOutcomeModel(formModel, { id: '$save', name: FormOutcomeModel.COMPLETE_ACTION }); + let outcome = new FormOutcomeModel(formModel, {id: '$save', name: FormOutcomeModel.COMPLETE_ACTION}); formComponent.showCompleteButton = true; expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); @@ -138,13 +138,58 @@ describe('ActivitiForm', () => { it('should get form by task id on load', () => { spyOn(formComponent, 'getFormByTaskId').and.stub(); - spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({})); + const taskId = '123'; formComponent.taskId = taskId; formComponent.loadForm(); expect(formComponent.getFormByTaskId).toHaveBeenCalledWith(taskId); + }); + + it('should get process variable if is a process task', () => { + spyOn(formService, 'getTaskForm').and.callFake((taskId) => { + return Observable.create(observer => { + observer.next({taskId: taskId}); + observer.complete(); + }); + }); + + spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({})); + spyOn(formService, 'getTask').and.callFake((taskId) => { + return Observable.create(observer => { + observer.next({taskId: taskId, processDefinitionId: '10201'}); + observer.complete(); + }); + }); + const taskId = '123'; + + formComponent.taskId = taskId; + formComponent.loadForm(); + + expect(visibilityService.getTaskProcessVariable).toHaveBeenCalledWith(taskId); + }); + + it('should not get process variable if is not a process task', () => { + spyOn(formService, 'getTaskForm').and.callFake((taskId) => { + return Observable.create(observer => { + observer.next({taskId: taskId}); + observer.complete(); + }); + }); + + spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({})); + spyOn(formService, 'getTask').and.callFake((taskId) => { + return Observable.create(observer => { + observer.next({taskId: taskId, processDefinitionId: 'null'}); + observer.complete(); + }); + }); + const taskId = '123'; + + formComponent.taskId = taskId; + formComponent.loadForm(); + expect(visibilityService.getTaskProcessVariable).toHaveBeenCalledWith(taskId); }); @@ -173,7 +218,7 @@ describe('ActivitiForm', () => { const taskId = ''; let change = new SimpleChange(null, taskId); - formComponent.ngOnChanges({ 'taskId': change }); + formComponent.ngOnChanges({'taskId': change}); expect(formComponent.getFormByTaskId).toHaveBeenCalledWith(taskId); }); @@ -183,7 +228,7 @@ describe('ActivitiForm', () => { const formId = '123'; let change = new SimpleChange(null, formId); - formComponent.ngOnChanges({ 'formId': change }); + formComponent.ngOnChanges({'formId': change}); expect(formComponent.getFormDefinitionByFormId).toHaveBeenCalledWith(formId); }); @@ -193,7 +238,7 @@ describe('ActivitiForm', () => { const formName = '
'; let change = new SimpleChange(null, formName); - formComponent.ngOnChanges({ 'formName': change }); + formComponent.ngOnChanges({'formName': change}); expect(formComponent.getFormDefinitionByFormName).toHaveBeenCalledWith(formName); }); @@ -218,7 +263,7 @@ describe('ActivitiForm', () => { spyOn(formComponent, 'getFormDefinitionByFormId').and.stub(); spyOn(formComponent, 'getFormDefinitionByFormName').and.stub(); - formComponent.ngOnChanges({ 'tag': new SimpleChange(null, 'hello world') }); + formComponent.ngOnChanges({'tag': new SimpleChange(null, 'hello world')}); expect(formComponent.getFormByTaskId).not.toHaveBeenCalled(); expect(formComponent.getFormDefinitionByFormId).not.toHaveBeenCalled(); @@ -228,7 +273,7 @@ describe('ActivitiForm', () => { it('should complete form on custom outcome click', () => { let formModel = new FormModel(); let outcomeName = 'Custom Action'; - let outcome = new FormOutcomeModel(formModel, { id: 'custom1', name: outcomeName }); + let outcome = new FormOutcomeModel(formModel, {id: 'custom1', name: outcomeName}); let saved = false; formComponent.form = formModel; @@ -293,7 +338,7 @@ describe('ActivitiForm', () => { it('should do nothing when clicking outcome for readonly form', () => { let formModel = new FormModel(); const outcomeName = 'Custom Action'; - let outcome = new FormOutcomeModel(formModel, { id: 'custom1', name: outcomeName }); + let outcome = new FormOutcomeModel(formModel, {id: 'custom1', name: outcomeName}); formComponent.form = formModel; spyOn(formComponent, 'completeTaskForm').and.stub(); @@ -312,7 +357,7 @@ describe('ActivitiForm', () => { it('should require loaded form when clicking outcome', () => { let formModel = new FormModel(); const outcomeName = 'Custom Action'; - let outcome = new FormOutcomeModel(formModel, { id: 'custom1', name: outcomeName }); + let outcome = new FormOutcomeModel(formModel, {id: 'custom1', name: outcomeName}); formComponent.readOnly = false; formComponent.form = null; @@ -321,7 +366,7 @@ describe('ActivitiForm', () => { it('should not execute unknown system outcome', () => { let formModel = new FormModel(); - let outcome = new FormOutcomeModel(formModel, { id: 'unknown', name: 'Unknown', isSystem: true }); + let outcome = new FormOutcomeModel(formModel, {id: 'unknown', name: 'Unknown', isSystem: true}); formComponent.form = formModel; expect(formComponent.onOutcomeClicked(outcome)).toBeFalsy(); @@ -329,20 +374,21 @@ describe('ActivitiForm', () => { it('should require custom action name to complete form', () => { let formModel = new FormModel(); - let outcome = new FormOutcomeModel(formModel, { id: 'custom' }); + let outcome = new FormOutcomeModel(formModel, {id: 'custom'}); formComponent.form = formModel; expect(formComponent.onOutcomeClicked(outcome)).toBeFalsy(); - outcome = new FormOutcomeModel(formModel, { id: 'custom', name: 'Custom' }); + outcome = new FormOutcomeModel(formModel, {id: 'custom', name: 'Custom'}); spyOn(formComponent, 'completeTaskForm').and.stub(); expect(formComponent.onOutcomeClicked(outcome)).toBeTruthy(); }); it('should fetch and parse form by task id', () => { + spyOn(formService, 'getTask').and.returnValue(Observable.of({})); spyOn(formService, 'getTaskForm').and.callFake((taskId) => { return Observable.create(observer => { - observer.next({ taskId: taskId }); + observer.next({taskId: taskId}); observer.complete(); }); }); @@ -363,6 +409,7 @@ describe('ActivitiForm', () => { it('should handle error when getting form by task id', () => { const error = 'Some error'; + spyOn(formService, 'getTask').and.returnValue(Observable.of({})); spyOn(formComponent, 'handleError').and.stub(); spyOn(formService, 'getTaskForm').and.callFake((taskId) => { return Observable.throw(error); @@ -373,9 +420,10 @@ describe('ActivitiForm', () => { }); it('should apply readonly state when getting form by task id', () => { + spyOn(formService, 'getTask').and.returnValue(Observable.of({})); spyOn(formService, 'getTaskForm').and.callFake((taskId) => { return Observable.create(observer => { - observer.next({ taskId: taskId }); + observer.next({taskId: taskId}); observer.complete(); }); }); @@ -390,7 +438,7 @@ describe('ActivitiForm', () => { it('should fetch and parse form definition by id', () => { spyOn(formService, 'getFormDefinitionById').and.callFake((formId) => { return Observable.create(observer => { - observer.next({ id: formId }); + observer.next({id: formId}); observer.complete(); }); }); @@ -429,7 +477,7 @@ describe('ActivitiForm', () => { spyOn(formService, 'getFormDefinitionById').and.callFake((formName) => { return Observable.create(observer => { - observer.next({ name: formName }); + observer.next({name: formName}); observer.complete(); }); }); @@ -465,8 +513,8 @@ describe('ActivitiForm', () => { let formModel = new FormModel({ taskId: '123', fields: [ - { id: 'field1' }, - { id: 'field2' } + {id: 'field1'}, + {id: 'field2'} ] }); formComponent.form = formModel; @@ -482,7 +530,7 @@ describe('ActivitiForm', () => { spyOn(formService, 'saveTaskForm').and.callFake(() => Observable.throw(error)); spyOn(formComponent, 'handleError').and.stub(); - formComponent.form = new FormModel({ taskId: '123' }); + formComponent.form = new FormModel({taskId: '123'}); formComponent.saveTaskForm(); expect(formComponent.handleError).toHaveBeenCalledWith(error); @@ -534,8 +582,8 @@ describe('ActivitiForm', () => { let formModel = new FormModel({ taskId: '123', fields: [ - { id: 'field1' }, - { id: 'field2' } + {id: 'field1'}, + {id: 'field2'} ] }); @@ -554,7 +602,7 @@ describe('ActivitiForm', () => { let form = formComponent.parseForm({ id: '', fields: [ - { id: 'field1', type: FormFieldTypes.CONTAINER } + {id: 'field1', type: FormFieldTypes.CONTAINER} ] }); @@ -567,7 +615,7 @@ describe('ActivitiForm', () => { it('should provide outcomes for form definition', () => { spyOn(formComponent, 'getFormDefinitionOutcomes').and.callThrough(); - let form = formComponent.parseForm({ id: '' }); + let form = formComponent.parseForm({id: ''}); expect(formComponent.getFormDefinitionOutcomes).toHaveBeenCalledWith(form); }); @@ -640,7 +688,7 @@ describe('ActivitiForm', () => { let metadata = {}; spyOn(nodeService, 'getNodeMetadata').and.returnValue( Observable.create(observer => { - observer.next({ metadata: metadata }); + observer.next({metadata: metadata}); observer.complete(); }) ); diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index ab99c55e73..e515d5f0ac 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -280,7 +280,6 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { loadForm() { if (this.taskId) { this.getFormByTaskId(this.taskId); - this.visibilityService.getTaskProcessVariable(this.taskId).subscribe(); return; } @@ -295,6 +294,22 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } } + loadFormPorcessVariable(taskId) { + this.formService.getTask(taskId).subscribe( + task => { + if (this.isAProcessTask(task)) { + this.visibilityService.getTaskProcessVariable(taskId).subscribe(); + } + }, + (error) => { + this.handleError(error); + }); + } + + isAProcessTask(taskRepresentation) { + return taskRepresentation.processDefinitionId && taskRepresentation.processDefinitionDeploymentId !== 'null'; + } + setupMaterialComponents(): boolean { // workaround for MDL issues with dynamic components if (componentHandler) { @@ -305,6 +320,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } getFormByTaskId(taskId: string) { + this.loadFormPorcessVariable(this.taskId); let data = this.data; this.formService .getTaskForm(taskId) @@ -411,7 +427,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { */ getFormDefinitionOutcomes(form: FormModel): FormOutcomeModel[] { return [ - new FormOutcomeModel(form, { id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true }) + new FormOutcomeModel(form, {id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true}) ]; } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts index a1981c17b2..cf835494e0 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts @@ -41,7 +41,7 @@ describe('ActivitiStartForm', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [ CoreModule ], + imports: [CoreModule], declarations: [ ActivitiStartForm, FormFieldComponent, @@ -73,26 +73,21 @@ describe('ActivitiStartForm', () => { window['componentHandler'] = componentHandler; }); - it('should load start form on init if processDefinitionId defined', () => { + it('should load start form on change if processDefinitionId defined', () => { component.processDefinitionId = exampleId1; - component.ngOnInit(); + component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2) }); expect(formService.getStartFormDefinition).toHaveBeenCalled(); }); - it('should load not start form on init if no processDefinitionId defined', () => { - component.ngOnInit(); - expect(formService.getStartFormDefinition).not.toHaveBeenCalled(); - }); - it('should load start form when processDefinitionId changed', () => { component.processDefinitionId = exampleId1; - component.ngOnChanges({processDefinitionId: new SimpleChange(exampleId1, exampleId2)}); + component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2) }); expect(formService.getStartFormDefinition).toHaveBeenCalled(); }); it('should not load start form when changes notified but no change to processDefinitionId', () => { component.processDefinitionId = exampleId1; - component.ngOnChanges({otherProp: new SimpleChange(exampleId1, exampleId2)}); + component.ngOnChanges({ otherProp: new SimpleChange(exampleId1, exampleId2) }); expect(formService.getStartFormDefinition).not.toHaveBeenCalled(); }); @@ -113,6 +108,7 @@ describe('ActivitiStartForm', () => { })); component.processDefinitionId = exampleId1; component.ngOnInit(); + component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2) }); fixture.detectChanges(); expect(component.outcomesContainer).toBeTruthy(); }); @@ -128,7 +124,7 @@ describe('ActivitiStartForm', () => { })); component.processDefinitionId = exampleId1; component.showOutcomeButtons = true; - component.ngOnInit(); + component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2) }); fixture.detectChanges(); expect(component.outcomesContainer).toBeTruthy(); }); diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index bbf1cc07ef..ad4e5b74df 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -17,7 +17,7 @@ import { Component, - OnInit, AfterViewChecked, OnChanges, + AfterViewChecked, OnChanges, SimpleChanges, Input, ViewChild, @@ -53,7 +53,7 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic templateUrl: './activiti-start-form.component.html', styleUrls: ['./activiti-form.component.css'] }) -export class ActivitiStartForm extends ActivitiForm implements OnInit, AfterViewChecked, OnChanges { +export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, OnChanges { @Input() processDefinitionId: string; @@ -77,14 +77,6 @@ export class ActivitiStartForm extends ActivitiForm implements OnInit, AfterView formService: FormService, visibilityService: WidgetVisibilityService) { super(formService, visibilityService, null, null); - } - - ngOnInit() { - if (this.processId) { - this.loadStartForm(this.processId); - }else { - this.loadForm(); - } if (this.translate) { this.translate.addTranslationFolder('ng2-activiti-form', 'node_modules/ng2-activiti-form/src'); @@ -94,21 +86,15 @@ export class ActivitiStartForm extends ActivitiForm implements OnInit, AfterView ngOnChanges(changes: SimpleChanges) { let processDefinitionId = changes['processDefinitionId']; if (processDefinitionId && processDefinitionId.currentValue) { + this.visibilityService.cleanProcessVariable(); this.getStartFormDefinition(processDefinitionId.currentValue); return; } let processId = changes['processId']; - if (processId && processId.currentValue) { - this.loadStartForm(processId.currentValue); - return; - } - } - - loadForm() { - if (this.processDefinitionId) { + if (processId && processId.currentValue) { this.visibilityService.cleanProcessVariable(); - this.getStartFormDefinition(this.processDefinitionId); + this.loadStartForm(processId.currentValue); return; } } diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts index 7643a48bca..055737baaa 100644 --- a/ng2-components/ng2-activiti-processlist/index.ts +++ b/ng2-components/ng2-activiti-processlist/index.ts @@ -21,14 +21,17 @@ import { DataTableModule } from 'ng2-alfresco-datatable'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; -import { ActivitiProcessInstanceListComponent } from './src/components/activiti-processlist.component'; -import { ActivitiProcessFilters } from './src/components/activiti-filters.component'; -import { ActivitiProcessInstanceHeader } from './src/components/activiti-process-instance-header.component'; -import { ActivitiProcessInstanceTasks } from './src/components/activiti-process-instance-tasks.component'; -import { ActivitiProcessInstanceVariables } from './src/components/activiti-process-instance-variables.component'; -import { ActivitiComments } from './src/components/activiti-comments.component'; -import { ActivitiProcessInstanceDetails } from './src/components/activiti-process-instance-details.component'; -import { ActivitiStartProcessInstance } from './src/components/activiti-start-process.component'; +import { + ActivitiProcessInstanceListComponent, + ActivitiProcessFilters, + ActivitiProcessInstanceHeader, + ActivitiProcessInstanceTasks, + ActivitiProcessInstanceVariables, + ActivitiProcessComments, + ActivitiProcessInstanceDetails, + ActivitiStartProcessInstance +} from './src/components/index'; + import { ActivitiProcessService } from './src/services/activiti-process.service'; // components @@ -50,7 +53,7 @@ export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [ ActivitiProcessInstanceHeader, ActivitiProcessInstanceTasks, ActivitiProcessInstanceVariables, - ActivitiComments, + ActivitiProcessComments, ActivitiStartProcessInstance ]; diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts index fcc540f7e1..69bfee68ba 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts @@ -43,7 +43,7 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { - activitiService = new ActivitiProcessService(null); + activitiService = new ActivitiProcessService(null, null); filterList = new ActivitiProcessFilters(null, activitiService); }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css similarity index 85% rename from ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css rename to ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css index 69521b25cf..65ef475088 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css @@ -16,3 +16,7 @@ position: relative; top: -2px; } + +.material-icons { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html similarity index 100% rename from ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.html rename to ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts similarity index 91% rename from ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.spec.ts rename to ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts index 80332649b0..c1bd2a1b35 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts @@ -23,7 +23,7 @@ import { Observable } from 'rxjs/Rx'; import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; -import { ActivitiComments } from './activiti-comments.component'; +import { ActivitiProcessComments } from './activiti-process-comments.component'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -31,8 +31,8 @@ describe('ActivitiProcessInstanceComments', () => { let componentHandler: any; let service: ActivitiProcessService; - let component: ActivitiComments; - let fixture: ComponentFixture; + let component: ActivitiProcessComments; + let fixture: ComponentFixture; let getCommentsSpy: jasmine.Spy; let addCommentSpy: jasmine.Spy; @@ -43,7 +43,7 @@ describe('ActivitiProcessInstanceComments', () => { ActivitiFormModule ], declarations: [ - ActivitiComments + ActivitiProcessComments ], providers: [ { provide: AlfrescoTranslationService, useClass: TranslationMock }, @@ -54,7 +54,7 @@ describe('ActivitiProcessInstanceComments', () => { beforeEach(() => { - fixture = TestBed.createComponent(ActivitiComments); + fixture = TestBed.createComponent(ActivitiProcessComments); component = fixture.componentInstance; service = fixture.debugElement.injector.get(ActivitiProcessService); @@ -75,16 +75,16 @@ describe('ActivitiProcessInstanceComments', () => { }); it('should load comments when processInstanceId specified', () => { - component.processInstanceId = '123'; - fixture.detectChanges(); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'processInstanceId': change }); expect(getCommentsSpy).toHaveBeenCalled(); }); it('should emit an error when an error occurs loading comments', () => { let emitSpy = spyOn(component.error, 'emit'); getCommentsSpy.and.returnValue(Observable.throw({})); - component.processInstanceId = '123'; - fixture.detectChanges(); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'processInstanceId': change }); expect(emitSpy).toHaveBeenCalled(); }); @@ -94,8 +94,9 @@ describe('ActivitiProcessInstanceComments', () => { }); it('should display comments when the process has comments', async(() => { - component.processInstanceId = '123'; - fixture.detectChanges(); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'processInstanceId': change }); + fixture.whenStable().then(() => { fixture.detectChanges(); expect(fixture.debugElement.queryAll(By.css('ul.mdl-list li')).length).toBe(3); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts similarity index 85% rename from ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts rename to ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts index 3c6e21ea60..a62fbd2b2c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { Comment } from 'ng2-activiti-tasklist'; @@ -28,11 +28,11 @@ declare let dialogPolyfill: any; @Component({ selector: 'activiti-process-instance-comments', moduleId: module.id, - templateUrl: './activiti-comments.component.html', - styleUrls: ['./activiti-comments.component.css'], + templateUrl: './activiti-process-comments.component.html', + styleUrls: ['./activiti-process-comments.component.css'], providers: [ActivitiProcessService] }) -export class ActivitiComments implements OnInit, OnChanges { +export class ActivitiProcessComments implements OnChanges { @Input() processInstanceId: string; @@ -45,7 +45,8 @@ export class ActivitiComments implements OnInit, OnChanges { comments: Comment [] = []; - private commentObserver: Observer; + commentObserver: Observer; + comment$: Observable; message: string; @@ -62,18 +63,10 @@ export class ActivitiComments implements OnInit, OnChanges { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); } - this.comment$ = new Observable(observer => this.commentObserver = observer).share(); - - } - - ngOnInit() { + this.comment$ = new Observable(observer => this.commentObserver = observer).share(); this.comment$.subscribe((comment: Comment) => { this.comments.push(comment); }); - if (this.processInstanceId) { - this.getProcessComments(this.processInstanceId); - return; - } } ngOnChanges(changes: SimpleChanges) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css index 07eaf92d80..71edb84940 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css @@ -1,3 +1,10 @@ :host { width: 100%; -} \ No newline at end of file +} + +.activiti-process-container { + width: 100%; + min-height: 100px; + overflow: visible; + padding: 10px; +} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html index 135aa4eb0b..30b138e0d5 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html @@ -1,13 +1,14 @@
{{ 'DETAILS.MESSAGES.NONE'|translate }}

{{processInstanceDetails.name}}

- -
-
- -
-
- + +
+
+
+
+ +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index 85c45d4392..d157294d7f 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -21,13 +21,14 @@ import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; -import { ActivitiFormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from 'ng2-activiti-form'; +import { ActivitiFormModule, FormModel, FormService } from 'ng2-activiti-form'; import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; import { ActivitiProcessInstanceDetails } from './activiti-process-instance-details.component'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TranslationMock } from './../assets/translation.service.mock'; import { exampleProcess } from './../assets/activiti-process.model.mock'; +import { ProcessInstance } from '../models/process-instance.model'; describe('ActivitiProcessInstanceDetails', () => { @@ -127,6 +128,15 @@ describe('ActivitiProcessInstanceDetails', () => { fixture.detectChanges(); expect(fixture.nativeElement.innerText).toBe('DETAILS.MESSAGES.NONE'); }); + + it('should display cancel button if process is running', () => { + component.processInstanceDetails = new ProcessInstance({ + ended : null + }); + fixture.detectChanges(); + let buttonEl = fixture.debugElement.query(By.css('[data-automation-id="header-status"] button')); + expect(buttonEl).not.toBeNull(); + }); }); describe('events', () => { @@ -143,12 +153,6 @@ describe('ActivitiProcessInstanceDetails', () => { expect(emitSpy).toHaveBeenCalled(); }); - it('should emit a outcome execution event when task form outcome executed', () => { - let emitSpy: jasmine.Spy = spyOn(component.processCancelled, 'emit'); - component.bubbleProcessCancelled(new FormOutcomeEvent(new FormOutcomeModel(new FormModel()))); - expect(emitSpy).toHaveBeenCalled(); - }); - }); }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 8541ae0974..26efb73e4f 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -20,7 +20,6 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; -import { ActivitiComments } from './activiti-comments.component'; import { ProcessInstance } from '../models/process-instance.model'; declare let componentHandler: any; @@ -42,9 +41,6 @@ export class ActivitiProcessInstanceDetails implements OnChanges { @ViewChild(ActivitiProcessInstanceTasks) tasksList: ActivitiProcessInstanceTasks; - @ViewChild(ActivitiComments) - commentsList: ActivitiComments; - @Input() showTitle: boolean = true; @@ -52,7 +48,7 @@ export class ActivitiProcessInstanceDetails implements OnChanges { showRefreshButton: boolean = true; @Output() - processCancelled: EventEmitter = new EventEmitter(); + processCancelled: EventEmitter = new EventEmitter(); @Output() taskFormCompleted: EventEmitter = new EventEmitter(); @@ -101,11 +97,20 @@ export class ActivitiProcessInstanceDetails implements OnChanges { } } - bubbleProcessCancelled(data: any) { - this.processCancelled.emit(data); - } - bubbleTaskFormCompleted(data: any) { this.taskFormCompleted.emit(data); } + + isRunning(): boolean { + return this.processInstanceDetails && !this.processInstanceDetails.ended; + } + + cancelProcess() { + this.activitiProcess.cancelProcess(this.processInstanceId).subscribe( + (data) => { + this.processCancelled.emit(data); + }, (err) => { + console.error(err); + }); + } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css index 20fbab0626..15b522136a 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css @@ -4,4 +4,8 @@ .activiti-label { font-weight: bolder; -} \ No newline at end of file +} + +.activiti-process-header__value { + color: rgb(68, 138, 255); +} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html index 386989af35..864ff26f1b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html @@ -8,8 +8,8 @@ {{ 'DETAILS.LABELS.STARTED' | translate }}: {{getFormatDate(processInstance.started, 'medium')}}
-
- +
+
{{ 'DETAILS.LABELS.ENDED' | translate }}: diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts index 9b9717e42c..de16f4629c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts @@ -18,12 +18,18 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { + AlfrescoTranslationService, + CoreModule, + AlfrescoAuthenticationService, + AlfrescoSettingsService, + AlfrescoApiService } from 'ng2-alfresco-core'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { TranslationMock } from './../assets/translation.service.mock'; import { exampleProcess } from './../assets/activiti-process.model.mock'; import { ProcessInstance } from './../models/process-instance.model'; +import { ActivitiProcessComments } from './activiti-process-comments.component'; import { ActivitiProcessService } from './../services/activiti-process.service'; describe('ActivitiProcessInstanceHeader', () => { @@ -38,11 +44,15 @@ describe('ActivitiProcessInstanceHeader', () => { CoreModule ], declarations: [ - ActivitiProcessInstanceHeader + ActivitiProcessInstanceHeader, + ActivitiProcessComments ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, - ActivitiProcessService + AlfrescoSettingsService, + AlfrescoAuthenticationService, + AlfrescoApiService, + ActivitiProcessService, + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); @@ -90,13 +100,6 @@ describe('ActivitiProcessInstanceHeader', () => { expect(formValueEl.nativeElement.innerText).toBe('Nov 10, 2016, 3:37:30 AM'); }); - it('should display cancel button if process is running', () => { - component.processInstance.ended = null; - fixture.detectChanges(); - let buttonEl = fixture.debugElement.query(By.css('[data-automation-id="header-status"] button')); - expect(buttonEl).not.toBeNull(); - }); - it('should display ended date if process is ended', () => { component.processInstance.ended = '2016-11-10T03:37:30.010+0000'; fixture.detectChanges(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts index e05df7c313..82e430a866 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts @@ -18,7 +18,6 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ProcessInstance } from '../models/process-instance.model'; -import { ActivitiProcessService } from './../services/activiti-process.service'; import { DatePipe } from '@angular/common'; declare let componentHandler: any; @@ -34,14 +33,10 @@ export class ActivitiProcessInstanceHeader { @Input() processInstance: ProcessInstance; - @Output() - processCancelled: EventEmitter = new EventEmitter(); - @Output() onError: EventEmitter = new EventEmitter(); - constructor(private translate: AlfrescoTranslationService, - private activitiProcess: ActivitiProcessService) { + constructor(private translate: AlfrescoTranslationService) { if (translate) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); @@ -69,14 +64,4 @@ export class ActivitiProcessInstanceHeader { isRunning(): boolean { return this.processInstance && !this.processInstance.ended; } - - cancelProcess() { - this.activitiProcess.cancelProcess(this.processInstance.id).subscribe( - (res) => { - this.processCancelled.emit(res); - }, (err) => { - console.error(err); - this.onError.emit(err); - }); - } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css index 57820a754f..5611dd9942 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css @@ -36,3 +36,14 @@ height: 400px; overflow-y: auto; } + +.no-results { + margin-left: 9px; + font-size: 14px; + font-weight: 400; + letter-spacing: 0; + line-height: 18px; + color: rgba(0, 0, 0, .54); + display: block; + padding: 12px; +} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index 97a617011e..aec79cdaf3 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -24,7 +24,7 @@ -
+
{{ 'DETAILS.TASKS.NO_ACTIVE' | translate }}
@@ -64,7 +64,7 @@
-
+
{{ 'DETAILS.TASKS.NO_COMPLETED' | translate }}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts index f57f4360d6..ac0e534adb 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts @@ -75,25 +75,35 @@ describe('ActivitiStartProcessInstance', () => { describe('process definitions list', () => { it('should call service to fetch process definitions', () => { + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); + expect(getDefinitionsSpy).toHaveBeenCalled(); }); it('should call service to fetch process definitions with appId when provided', () => { - let appId = '123'; - component.appId = appId; + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); - expect(getDefinitionsSpy).toHaveBeenCalledWith(appId); + + expect(getDefinitionsSpy).toHaveBeenCalledWith('123'); }); it('should display the correct number of processes in the select list', () => { + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); + let selectElement = debugElement.query(By.css('select')); expect(selectElement.children.length).toBe(3); }); it('should display the correct process def details', async(() => { + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); + fixture.whenStable().then(() => { let optionEl: HTMLOptionElement = debugElement.queryAll(By.css('select option'))[1].nativeElement; expect(optionEl.value).toBe('my:process1'); @@ -103,7 +113,10 @@ describe('ActivitiStartProcessInstance', () => { it('should indicate an error to the user if process defs cannot be loaded', async(() => { getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.throw({})); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); + fixture.whenStable().then(() => { let errorEl: DebugElement = debugElement.query(By.css('.error-message')); expect(errorEl).not.toBeNull('Expected error message to be present'); @@ -148,7 +161,8 @@ describe('ActivitiStartProcessInstance', () => { beforeEach(() => { component.name = 'My new process'; - fixture.detectChanges(); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); }); it('should call service to start process if required fields provided', async(() => { @@ -235,7 +249,7 @@ describe('ActivitiStartProcessInstance', () => { expect(startBtn.properties['disabled']).toBe(true); })); - it('should enable start button when name and process filled out', async(() => { + xit('should enable start button when name and process filled out', async(() => { fixture.detectChanges(); expect(startBtn.properties['disabled']).toBe(false); })); @@ -246,7 +260,8 @@ describe('ActivitiStartProcessInstance', () => { beforeEach(() => { getDefinitionsSpy.and.returnValue(Observable.of(fakeProcessDefWithForm)); - fixture.detectChanges(); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); component.onProcessDefChange('my:process1'); fixture.detectChanges(); fixture.whenStable(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts index fa77650aab..04cd99885e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiStartForm } from 'ng2-activiti-form'; import { ProcessInstance } from './../models/process-instance.model'; @@ -31,7 +31,7 @@ declare let dialogPolyfill: any; templateUrl: './activiti-start-process.component.html', styleUrls: ['./activiti-start-process.component.css'] }) -export class ActivitiStartProcessInstance implements OnInit, OnChanges { +export class ActivitiStartProcessInstance implements OnChanges { @Input() appId: string; @@ -61,10 +61,6 @@ export class ActivitiStartProcessInstance implements OnInit, OnChanges { } } - ngOnInit() { - this.load(this.appId); - } - ngOnChanges(changes: SimpleChanges) { let appId = changes['appId']; if (appId && (appId.currentValue || appId.currentValue === null)) { @@ -119,7 +115,11 @@ export class ActivitiStartProcessInstance implements OnInit, OnChanges { } isStartFormMissingOrValid() { - return !this.startForm || this.startForm.form.isValid; + if (this.startForm && this.startForm.form && this.startForm.form.isValid) { + return !this.startForm || this.startForm.form.isValid; + } else { + return false; + } } validateForm() { diff --git a/ng2-components/ng2-activiti-processlist/src/components/index.ts b/ng2-components/ng2-activiti-processlist/src/components/index.ts new file mode 100644 index 0000000000..f25e4eff86 --- /dev/null +++ b/ng2-components/ng2-activiti-processlist/src/components/index.ts @@ -0,0 +1,25 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './activiti-processlist.component'; +export * from './activiti-filters.component'; +export * from './activiti-process-instance-header.component'; +export * from './activiti-process-instance-tasks.component'; +export * from './activiti-process-instance-variables.component'; +export * from './activiti-process-comments.component'; +export * from './activiti-process-instance-details.component'; +export * from './activiti-start-process.component'; diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index 44e489f78e..365fe35967 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, AlfrescoAuthenticationService} from 'ng2-alfresco-core'; import { ProcessInstance, ProcessDefinitionRepresentation } from '../models/index'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstanceVariable } from './../models/process-instance-variable.model'; @@ -34,7 +34,7 @@ declare var moment: any; @Injectable() export class ActivitiProcessService { - constructor(public apiService: AlfrescoApiService) { + constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css index 3cff4db999..00d4c682f8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css @@ -13,3 +13,7 @@ .mdl-tooltip { will-change: unset; } + +.material-icons { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css index 3cff4db999..00d4c682f8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css @@ -13,3 +13,7 @@ .mdl-tooltip { will-change: unset; } + +.material-icons { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index 69a4d4c742..55f3c32c87 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -48,6 +48,9 @@ describe('ActivitiFilters', () => { it('should return the filter task list', (done) => { spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); + const appId = '1'; + let change = new SimpleChange(null, appId); + filterList.ngOnChanges({ 'appId': change }); filterList.onSuccess.subscribe((res) => { expect(res).toBeDefined(); @@ -70,7 +73,8 @@ describe('ActivitiFilters', () => { spyOn(filterList.activiti, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise)); spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); - filterList.appName = 'test'; + let change = new SimpleChange(null, 'test'); + filterList.ngOnChanges({ 'appName': change }); filterList.onSuccess.subscribe((res) => { let deployApp: any = filterList.activiti.getDeployedApplications; @@ -83,9 +87,12 @@ describe('ActivitiFilters', () => { }); it('should emit an error with a bad response', (done) => { - filterList.appId = '1'; spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); + const appId = '1'; + let change = new SimpleChange(null, appId); + filterList.ngOnChanges({ 'appId': change }); + filterList.onError.subscribe((err) => { expect(err).toBeDefined(); done(); @@ -95,9 +102,12 @@ describe('ActivitiFilters', () => { }); it('should emit an error with a bad response', (done) => { - filterList.appName = 'fake-app'; spyOn(filterList.activiti, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); + const appId = 'fake-app'; + let change = new SimpleChange(null, appId); + filterList.ngOnChanges({ 'appName': change }); + filterList.onError.subscribe((err) => { expect(err).toBeDefined(); done(); @@ -156,4 +166,12 @@ describe('ActivitiFilters', () => { expect(filterList.getCurrentFilter()).toBe(filter); }); + it('should load Default list when no appid or taskid are provided', () => { + spyOn(filterList, 'getFiltersByAppId').and.stub(); + + let change = new SimpleChange(null, null); + filterList.ngOnChanges({ 'appName': change }); + + expect(filterList.getFiltersByAppId).toHaveBeenCalled(); + }); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index ef217eb30b..13ee60186a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -75,8 +75,6 @@ export class ActivitiFilters implements OnInit, OnChanges { this.filter$.subscribe((filter: FilterRepresentationModel) => { this.filters.push(filter); }); - - this.getFilters(this.appId, this.appName); } ngOnChanges(changes: SimpleChanges) { @@ -86,10 +84,12 @@ export class ActivitiFilters implements OnInit, OnChanges { return; } let appName = changes['appName']; - if (appName && appName.currentValue) { + if (appName && appName !== null && appName.currentValue) { this.getFiltersByAppName(appName.currentValue); return; } + + this.getFiltersByAppId(); } /** diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css index 132a106c54..c618a45766 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css @@ -17,3 +17,7 @@ .mdl-tooltip { will-change: unset; } + +.material-icons { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.css index 8a10de9004..6b3b1c13f4 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.css @@ -3,9 +3,13 @@ } .activiti-task-header__label { - font-weight: bold; + font-weight: bold; } .activiti-task-header__value { - color: rgb(68,138,255); + color: rgb(68, 138, 255); +} + +.material-icons { + cursor: pointer; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index fe40ed2ee3..3db0ce6623 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -69,7 +69,7 @@ describe('ActivitiTaskList', () => { ActivitiTaskList ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + {provide: AlfrescoTranslationService, useClass: TranslationMock}, ActivitiTaskListService ] }).compileComponents(); @@ -115,10 +115,12 @@ describe('ActivitiTaskList', () => { it('should return the filtered task list when the input parameters are passed', (done) => { spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); - component.state = 'open'; - component.processDefinitionKey = null; - component.assignment = 'fake-assignee'; - component.onSuccess.subscribe( (res) => { + + let state = new SimpleChange(null, 'open'); + let processDefinitionKey = new SimpleChange(null, null); + let assignment = new SimpleChange(null, 'fake-assignee'); + + component.onSuccess.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -127,15 +129,19 @@ describe('ActivitiTaskList', () => { done(); }); component.ngOnInit(); + component.ngOnChanges({'state': state, 'processDefinitionKey': processDefinitionKey, 'assignment': assignment}); + fixture.detectChanges(); }); it('should return the filtered task list by processDefinitionKey', (done) => { spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); - component.state = 'open'; - component.processDefinitionKey = 'fakeprocess'; - component.assignment = 'fake-assignee'; - component.onSuccess.subscribe( (res) => { + + let state = new SimpleChange(null, 'open'); + let processDefinitionKey = new SimpleChange(null, 'fakeprocess'); + let assignment = new SimpleChange(null, 'fake-assignee'); + + component.onSuccess.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -143,7 +149,10 @@ describe('ActivitiTaskList', () => { expect(component.data.getRows()[0].getValue('name')).toEqual('No name'); done(); }); + component.ngOnInit(); + component.ngOnChanges({'state': state, 'processDefinitionKey': processDefinitionKey, 'assignment': assignment}); + fixture.detectChanges(); }); it('should return a currentId null when the taskList is empty', () => { @@ -153,15 +162,19 @@ describe('ActivitiTaskList', () => { it('should throw an exception when the response is wrong', (done) => { spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.throw(fakeErrorTaskList)); - component.state = 'open'; - component.assignment = 'fake-assignee'; - component.onError.subscribe( (err) => { + + let state = new SimpleChange(null, 'open'); + let assignment = new SimpleChange(null, 'fake-assignee'); + + component.onError.subscribe((err) => { expect(err).toBeDefined(); expect(err.error).toBe('wrong request'); done(); }); component.ngOnInit(); + component.ngOnChanges({'state': state, 'assignment': assignment}); + fixture.detectChanges(); }); it('should reload tasks when reload() is called', (done) => { @@ -170,7 +183,7 @@ describe('ActivitiTaskList', () => { component.state = 'open'; component.assignment = 'fake-assignee'; component.ngOnInit(); - component.onSuccess.subscribe( (res) => { + component.onSuccess.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -220,7 +233,7 @@ describe('ActivitiTaskList', () => { const appId = '1'; let change = new SimpleChange(null, appId); - component.onSuccess.subscribe( (res) => { + component.onSuccess.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index fa6c2ce96e..7b759535fd 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -83,7 +83,6 @@ export class ActivitiTaskList implements OnInit, OnChanges { if (!this.data) { this.data = this.initDefaultSchemaColumns(); } - this.reload(); } ngOnChanges(changes: SimpleChanges) { From a6e2c1532de91b302d0a30c20e0d14fd51b668d2 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 20 Dec 2016 09:45:30 +0000 Subject: [PATCH 158/162] fix angular version dependencies --- demo-shell-ng2/package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 7368aae627..bc48e9a7cf 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -52,19 +52,19 @@ "alfresco" ], "dependencies": { - "@angular/common": "~2.2.0", - "@angular/compiler": "~2.2.0", - "@angular/core": "~2.2.0", - "@angular/forms": "~2.2.0", - "@angular/http": "~2.2.0", - "@angular/platform-browser": "~2.2.0", - "@angular/platform-browser-dynamic": "~2.2.0", - "@angular/router": "~3.2.0", + "@angular/common": "2.2.0", + "@angular/compiler": "2.2.0", + "@angular/core": "2.2.0", + "@angular/forms": "2.2.0", + "@angular/http": "2.2.0", + "@angular/platform-browser": "2.2.0", + "@angular/platform-browser-dynamic": "2.2.0", + "@angular/router": "3.2.0", "systemjs": "0.19.40", "core-js": "^2.4.1", "reflect-metadata": "^0.1.8", "rxjs": "5.0.1", - "zone.js": "^0.7.2", + "zone.js": "0.7.2", "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", From 94781c370fe73745f0a2d587f9dee881a11e4152 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Tue, 20 Dec 2016 11:46:24 +0000 Subject: [PATCH 159/162] #1331 Add date required validation (#1338) --- .../widgets/core/form-field-validator.spec.ts | 24 +++++++++++++++++++ .../widgets/core/form-field-validator.ts | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts index 245fdf1b6a..576b393d25 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts @@ -134,6 +134,30 @@ describe('FormFieldValidator', () => { expect(validator.validate(field)).toBeFalsy(); }); + it('should succeed for date', () => { + let field = new FormFieldModel(new FormModel(), { + type: FormFieldTypes.DATE, + value: '2016-12-31', + required: true + }); + + expect(validator.validate(field)).toBeTruthy(); + }); + + it('should fail for date', () => { + let field = new FormFieldModel(new FormModel(), { + type: FormFieldTypes.DATE, + value: null, + required: true + }); + + field.value = null; + expect(validator.validate(field)).toBeFalsy(); + + field.value = ''; + expect(validator.validate(field)).toBeFalsy(); + }); + it('should succeed for text', () => { let field = new FormFieldModel(new FormModel(), { type: FormFieldTypes.TEXT, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts index 79dcf67d82..12f84889b4 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts @@ -39,7 +39,8 @@ export class RequiredFieldValidator implements FormFieldValidator { FormFieldTypes.RADIO_BUTTONS, FormFieldTypes.UPLOAD, FormFieldTypes.AMOUNT, - FormFieldTypes.DYNAMIC_TABLE + FormFieldTypes.DYNAMIC_TABLE, + FormFieldTypes.DATE ]; isSupported(field: FormFieldModel): boolean { From ccc477619c66638a6b468e71f761d9692cadd09d Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 20 Dec 2016 13:58:49 +0000 Subject: [PATCH 160/162] generate JS sourcemap during the UMD build (#1339) --- ng2-components/ng2-activiti-analytics/gulpfile.ts | 3 +++ ng2-components/ng2-activiti-analytics/package.json | 1 + ng2-components/ng2-activiti-diagrams/gulpfile.ts | 3 +++ ng2-components/ng2-activiti-diagrams/package.json | 1 + ng2-components/ng2-activiti-form/gulpfile.ts | 3 +++ ng2-components/ng2-activiti-form/package.json | 1 + ng2-components/ng2-activiti-processlist/gulpfile.ts | 3 +++ ng2-components/ng2-activiti-processlist/package.json | 1 + ng2-components/ng2-activiti-tasklist/gulpfile.ts | 3 +++ ng2-components/ng2-activiti-tasklist/package.json | 1 + ng2-components/ng2-alfresco-core/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-core/package.json | 1 + ng2-components/ng2-alfresco-datatable/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-datatable/package.json | 1 + ng2-components/ng2-alfresco-documentlist/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-documentlist/package.json | 1 + ng2-components/ng2-alfresco-login/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-login/package.json | 1 + ng2-components/ng2-alfresco-search/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-search/package.json | 1 + ng2-components/ng2-alfresco-tag/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-tag/package.json | 1 + ng2-components/ng2-alfresco-upload/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-upload/package.json | 1 + ng2-components/ng2-alfresco-userinfo/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-userinfo/package.json | 1 + ng2-components/ng2-alfresco-viewer/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-viewer/package.json | 1 + ng2-components/ng2-alfresco-webscript/gulpfile.ts | 3 +++ ng2-components/ng2-alfresco-webscript/package.json | 1 + 30 files changed, 60 insertions(+) diff --git a/ng2-components/ng2-activiti-analytics/gulpfile.ts b/ng2-components/ng2-activiti-analytics/gulpfile.ts index d19d897b6d..57011140d1 100755 --- a/ng2-components/ng2-activiti-analytics/gulpfile.ts +++ b/ng2-components/ng2-activiti-analytics/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -286,6 +287,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -293,6 +295,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 2c5fcdaeea..1dfcd46d11 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -83,6 +83,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-activiti-diagrams/gulpfile.ts b/ng2-components/ng2-activiti-diagrams/gulpfile.ts index 3fa0d3f1cc..b6a49ebe06 100755 --- a/ng2-components/ng2-activiti-diagrams/gulpfile.ts +++ b/ng2-components/ng2-activiti-diagrams/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -285,6 +286,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -292,6 +294,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 849a080cef..3eb776ff86 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -76,6 +76,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-activiti-form/gulpfile.ts b/ng2-components/ng2-activiti-form/gulpfile.ts index a912a280bf..ac6b7cc738 100755 --- a/ng2-components/ng2-activiti-form/gulpfile.ts +++ b/ng2-components/ng2-activiti-form/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -285,6 +286,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -292,6 +294,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index de9a156fe8..61ec94c25a 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -83,6 +83,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-activiti-processlist/gulpfile.ts b/ng2-components/ng2-activiti-processlist/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-activiti-processlist/gulpfile.ts +++ b/ng2-components/ng2-activiti-processlist/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 801fc68cfd..c85947ce12 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -83,6 +83,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-activiti-tasklist/gulpfile.ts b/ng2-components/ng2-activiti-tasklist/gulpfile.ts index 1d5eccb9b0..8ee0b6db9d 100755 --- a/ng2-components/ng2-activiti-tasklist/gulpfile.ts +++ b/ng2-components/ng2-activiti-tasklist/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -283,6 +284,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -290,6 +292,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 498f4980c2..41c140563c 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -88,6 +88,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-core/gulpfile.ts b/ng2-components/ng2-alfresco-core/gulpfile.ts index 05f339785b..2da9864930 100755 --- a/ng2-components/ng2-alfresco-core/gulpfile.ts +++ b/ng2-components/ng2-alfresco-core/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -283,6 +284,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -290,6 +292,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 178e8db3db..c6e07781db 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -94,6 +94,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-datatable/gulpfile.ts b/ng2-components/ng2-alfresco-datatable/gulpfile.ts index 1637cf0a9d..6c4696d881 100755 --- a/ng2-components/ng2-alfresco-datatable/gulpfile.ts +++ b/ng2-components/ng2-alfresco-datatable/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 7119f4f6b9..0a3278900d 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -80,6 +80,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-documentlist/gulpfile.ts b/ng2-components/ng2-alfresco-documentlist/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-documentlist/gulpfile.ts +++ b/ng2-components/ng2-alfresco-documentlist/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 23a26f56fc..00d8f6c8b3 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -89,6 +89,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-login/gulpfile.ts b/ng2-components/ng2-alfresco-login/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-login/gulpfile.ts +++ b/ng2-components/ng2-alfresco-login/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 2e832958ba..35b70a3ebd 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -91,6 +91,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-search/gulpfile.ts b/ng2-components/ng2-alfresco-search/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-search/gulpfile.ts +++ b/ng2-components/ng2-alfresco-search/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 2f09660525..b88cd4e3ab 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -88,6 +88,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-tag/gulpfile.ts b/ng2-components/ng2-alfresco-tag/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-tag/gulpfile.ts +++ b/ng2-components/ng2-alfresco-tag/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index e2097ccb4c..21534ee6bf 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -68,6 +68,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-upload/gulpfile.ts b/ng2-components/ng2-alfresco-upload/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-upload/gulpfile.ts +++ b/ng2-components/ng2-alfresco-upload/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 66e55d7e27..cff1b8dd96 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -89,6 +89,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-userinfo/gulpfile.ts b/ng2-components/ng2-alfresco-userinfo/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-userinfo/gulpfile.ts +++ b/ng2-components/ng2-alfresco-userinfo/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index c1b0dc22d6..66cab6c5d4 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -67,6 +67,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-viewer/gulpfile.ts b/ng2-components/ng2-alfresco-viewer/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-viewer/gulpfile.ts +++ b/ng2-components/ng2-alfresco-viewer/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 93a9f0c0a9..1ae86e1956 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -83,6 +83,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-webscript/gulpfile.ts b/ng2-components/ng2-alfresco-webscript/gulpfile.ts index 7340a5d68c..8524a10c96 100755 --- a/ng2-components/ng2-alfresco-webscript/gulpfile.ts +++ b/ng2-components/ng2-alfresco-webscript/gulpfile.ts @@ -9,6 +9,7 @@ import * as Builder from 'systemjs-builder'; var autoprefixer = require('autoprefixer'); import * as cssnano from 'cssnano'; import * as filter from 'gulp-filter'; +import * as sourcemaps from 'gulp-sourcemaps'; var APP_SRC = `.`; var CSS_PROD_BUNDLE = 'main.css'; @@ -282,6 +283,7 @@ gulp.task('build.js.prod', () => { let result = gulp.src(src) .pipe(plugins.plumber()) .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) + .pipe(sourcemaps.init()) .pipe(tsProject()) .once('error', function (e: any) { this.once('finish', () => process.exit(1)); @@ -289,6 +291,7 @@ gulp.task('build.js.prod', () => { return result.js .pipe(plugins.template()) + .pipe(sourcemaps.write()) .pipe(gulp.dest('src')) .on('error', (e: any) => { console.log(e); diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 14e61b5975..f6d01dffc9 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -68,6 +68,7 @@ "gulp-plumber": "^1.1.0", "gulp-postcss": "^6.2.0", "gulp-replace": "^0.5.4", + "gulp-sourcemaps": "^1.9.1", "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", From de0ac1e80529bdb0514feb696e00b2ecc964ecb6 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 14:07:01 +0000 Subject: [PATCH 161/162] 1.0.0 (#1337) --- demo-shell-ng2/package.json | 32 +++++++++---------- .../ng2-activiti-analytics/demo/package.json | 8 ++--- .../ng2-activiti-analytics/package.json | 8 ++--- .../ng2-activiti-diagrams/demo/package.json | 6 ++-- .../ng2-activiti-diagrams/package.json | 6 ++-- .../ng2-activiti-form/demo/package.json | 6 ++-- ng2-components/ng2-activiti-form/package.json | 6 ++-- .../demo/package.json | 10 +++--- .../ng2-activiti-processlist/package.json | 10 +++--- .../ng2-activiti-tasklist/demo/package.json | 8 ++--- .../ng2-activiti-tasklist/package.json | 10 +++--- ng2-components/ng2-alfresco-core/package.json | 4 +-- .../ng2-alfresco-datatable/demo/package.json | 6 ++-- .../ng2-alfresco-datatable/package.json | 6 ++-- .../demo/package.json | 8 ++--- .../ng2-alfresco-documentlist/package.json | 8 ++--- .../ng2-alfresco-login/demo/package.json | 6 ++-- .../ng2-alfresco-login/package.json | 6 ++-- .../ng2-alfresco-search/demo/package.json | 6 ++-- .../ng2-alfresco-search/package.json | 6 ++-- .../ng2-alfresco-tag/demo/package.json | 6 ++-- ng2-components/ng2-alfresco-tag/package.json | 6 ++-- .../ng2-alfresco-upload/demo/package.json | 6 ++-- .../ng2-alfresco-upload/package.json | 6 ++-- .../ng2-alfresco-userinfo/demo/package.json | 8 ++--- .../ng2-alfresco-userinfo/package.json | 6 ++-- .../ng2-alfresco-viewer/demo/package.json | 6 ++-- .../ng2-alfresco-viewer/package.json | 6 ++-- .../ng2-alfresco-webscript/demo/package.json | 8 ++--- .../ng2-alfresco-webscript/package.json | 8 ++--- 30 files changed, 116 insertions(+), 116 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index bc48e9a7cf..4ee42eb7e5 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -1,7 +1,7 @@ { "name": "Alfresco-Angular2-Demo", "description": "Demo shell for Alfresco Angular2 components", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings dist", @@ -75,21 +75,21 @@ "ng2-charts": "1.1.0", "raphael": "^2.2.6", "md-date-time-picker": "^2.2.0", - "alfresco-js-api": "^0.5.0", - "ng2-activiti-analytics": "0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0", - "ng2-alfresco-documentlist": "0.5.0", - "ng2-alfresco-login": "0.5.0", - "ng2-alfresco-search": "0.5.0", - "ng2-alfresco-upload": "0.5.0", - "ng2-alfresco-viewer": "0.5.0", - "ng2-activiti-form": "0.5.0", - "ng2-activiti-tasklist": "0.5.0", - "ng2-alfresco-userinfo": "0.5.0", - "ng2-activiti-processlist": "0.5.0", - "ng2-alfresco-webscript": "0.5.0", - "ng2-alfresco-tag": "0.5.0", + "alfresco-js-api": "^1.0.0", + "ng2-activiti-analytics": "1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-alfresco-documentlist": "1.0.0", + "ng2-alfresco-login": "1.0.0", + "ng2-alfresco-search": "1.0.0", + "ng2-alfresco-upload": "1.0.0", + "ng2-alfresco-viewer": "1.0.0", + "ng2-activiti-form": "1.0.0", + "ng2-activiti-tasklist": "1.0.0", + "ng2-alfresco-userinfo": "1.0.0", + "ng2-activiti-processlist": "1.0.0", + "ng2-alfresco-webscript": "1.0.0", + "ng2-alfresco-tag": "1.0.0", "dialog-polyfill": "^0.4.3", "element.scrollintoviewifneeded-polyfill": "^1.0.1" }, diff --git a/ng2-components/ng2-activiti-analytics/demo/package.json b/ng2-components/ng2-activiti-analytics/demo/package.json index 1f80e77f18..17a7b119eb 100644 --- a/ng2-components/ng2-activiti-analytics/demo/package.json +++ b/ng2-components/ng2-activiti-analytics/demo/package.json @@ -57,10 +57,10 @@ "moment": "2.15.1", "raphael": "^2.2.6", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-activiti-diagrams": "0.5.0", - "ng2-activiti-analytics": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-activiti-diagrams": "1.0.0", + "ng2-activiti-analytics": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 1dfcd46d11..4db8b4ea3e 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -1,7 +1,7 @@ { "name": "ng2-activiti-analytics", "description": "Activiti Angular2 Analytics Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -61,10 +61,10 @@ "ng2-charts": "1.1.0", "moment": "2.15.1", "raphael": "^2.2.6", - "alfresco-js-api": "^0.5.0", + "alfresco-js-api": "^1.0.0", "ng2-translate": "2.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-activiti-diagrams": "0.5.0" + "ng2-alfresco-core": "1.0.0", + "ng2-activiti-diagrams": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-diagrams/demo/package.json b/ng2-components/ng2-activiti-diagrams/demo/package.json index 7403321b8e..d00651baa9 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/package.json +++ b/ng2-components/ng2-activiti-diagrams/demo/package.json @@ -41,15 +41,15 @@ "@angular/platform-browser-dynamic": "2.2.2", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", - "alfresco-js-api": "^0.5.0", + "alfresco-js-api": "^1.0.0", "core-js": "^2.4.1", "dialog-polyfill": "^0.4.3", "element.scrollintoviewifneeded-polyfill": "^1.0.1", "intl": "1.2.4", "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", - "ng2-activiti-diagrams": "^0.5.0", - "ng2-alfresco-core": "0.5.0", + "ng2-activiti-diagrams": "^1.0.0", + "ng2-alfresco-core": "1.0.0", "ng2-translate": "2.5.0", "raphael": "^2.2.6", "reflect-metadata": "^0.1.3", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 3eb776ff86..613f2d6238 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -1,7 +1,7 @@ { "name": "ng2-activiti-diagrams", "description": "Activiti Angular2 Diagrams Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -56,8 +56,8 @@ "chart.js": "^2.1.4", "ng2-charts": "1.1.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-form/demo/package.json b/ng2-components/ng2-activiti-form/demo/package.json index e27c429160..c907bf29b1 100644 --- a/ng2-components/ng2-activiti-form/demo/package.json +++ b/ng2-components/ng2-activiti-form/demo/package.json @@ -54,9 +54,9 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-activiti-form": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-activiti-form": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 61ec94c25a..214d9d8415 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -1,7 +1,7 @@ { "name": "ng2-activiti-form", "description": "Alfresco Activiti Form Component for Angular 2", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -62,8 +62,8 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json index 019199e97c..2541196076 100644 --- a/ng2-components/ng2-activiti-processlist/demo/package.json +++ b/ng2-components/ng2-activiti-processlist/demo/package.json @@ -48,11 +48,11 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-activiti-tasklist": "0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0", - "ng2-activiti-processlist": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-activiti-tasklist": "1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-activiti-processlist": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index c85947ce12..857c38e317 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -1,7 +1,7 @@ { "name": "ng2-activiti-processlist", "description": "Show active processes from the Activiti BPM suite", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -61,10 +61,10 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-activiti-tasklist": "0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-activiti-tasklist": "1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json index 594da81ec8..f7a2e764d0 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/package.json +++ b/ng2-components/ng2-activiti-tasklist/demo/package.json @@ -41,10 +41,10 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0", - "ng2-activiti-tasklist": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-activiti-tasklist": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 41c140563c..8fe6233ed0 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -1,7 +1,7 @@ { "name": "ng2-activiti-tasklist", "description": "Activiti Angular2 Task List Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -66,10 +66,10 @@ "moment": "2.15.1", "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-activiti-form": "0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-activiti-form": "1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index c6e07781db..c7c28b73e1 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-core", "description": "Alfresco Angular 2 Components core", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -64,7 +64,7 @@ "@angular/platform-browser-dynamic": "2.2.2", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", - "alfresco-js-api": "^0.5.0", + "alfresco-js-api": "^1.0.0", "core-js": "^2.4.1", "dialog-polyfill": "^0.4.3", "element.scrollintoviewifneeded-polyfill": "^1.0.1", diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json index 368346a9f5..46bb5d35a9 100644 --- a/ng2-components/ng2-alfresco-datatable/demo/package.json +++ b/ng2-components/ng2-alfresco-datatable/demo/package.json @@ -45,9 +45,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 0a3278900d..2bc80f3fce 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-datatable", "description": "Alfresco Angular2 DataTable Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -60,8 +60,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index fa7c396760..25058acba4 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -34,10 +34,10 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0", - "ng2-alfresco-documentlist": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-alfresco-documentlist": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 00d8f6c8b3..f0a363db13 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-documentlist", "description": "Alfresco Angular2 Document List Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -68,9 +68,9 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json index 0ecb5857b8..5183270c57 100644 --- a/ng2-components/ng2-alfresco-login/demo/package.json +++ b/ng2-components/ng2-alfresco-login/demo/package.json @@ -67,9 +67,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-login": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-login": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 35b70a3ebd..0cd475305b 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-login", "description": "Alfresco Angular2 Login Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -66,8 +66,8 @@ "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", "@angular/router": "3.0.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", "ng2-translate": "2.5.0", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json index d2b870855b..53777a69db 100644 --- a/ng2-components/ng2-alfresco-search/demo/package.json +++ b/ng2-components/ng2-alfresco-search/demo/package.json @@ -67,9 +67,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-search": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-search": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index b88cd4e3ab..d7fad98030 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-search", "description": "Alfresco Angular2 Search Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -68,8 +68,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-tag/demo/package.json b/ng2-components/ng2-alfresco-tag/demo/package.json index 277af366f6..6eb6e76e31 100644 --- a/ng2-components/ng2-alfresco-tag/demo/package.json +++ b/ng2-components/ng2-alfresco-tag/demo/package.json @@ -39,9 +39,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-tag": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-tag": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 21534ee6bf..939049f305 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-tag", "description": "Alfresco tag component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -47,8 +47,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json index e0ad2abcca..d1138629f9 100644 --- a/ng2-components/ng2-alfresco-upload/demo/package.json +++ b/ng2-components/ng2-alfresco-upload/demo/package.json @@ -67,9 +67,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-upload": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-upload": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index cff1b8dd96..cd3bf5ee4d 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-upload", "description": "Alfresco Angular2 Upload Component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -69,8 +69,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-userinfo/demo/package.json b/ng2-components/ng2-alfresco-userinfo/demo/package.json index c6677a8ddd..a27a8c1b86 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/demo/package.json @@ -39,10 +39,10 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-login": "0.5.0", - "ng2-alfresco-userinfo": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-login": "1.0.0", + "ng2-alfresco-userinfo": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index 66cab6c5d4..88c953a9cf 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-userinfo", "description": "Alfresco User Info component", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -47,8 +47,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json index 702ac0730f..e1bbf9e8d5 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/package.json +++ b/ng2-components/ng2-alfresco-viewer/demo/package.json @@ -39,9 +39,9 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-viewer": "0.5.0", + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-viewer": "1.0.0", "pdfjs-dist": "1.5.404" }, "devDependencies": { diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 1ae86e1956..c12263a666 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-viewer", "description": "Alfresco documents viewer", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -62,8 +62,8 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", "pdfjs-dist": "1.5.404" }, "devDependencies": { diff --git a/ng2-components/ng2-alfresco-webscript/demo/package.json b/ng2-components/ng2-alfresco-webscript/demo/package.json index 39495838c1..5c65503cdf 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/package.json +++ b/ng2-components/ng2-alfresco-webscript/demo/package.json @@ -39,10 +39,10 @@ "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0", - "ng2-alfresco-webscript": "^0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-alfresco-webscript": "^1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index f6d01dffc9..b32ac39b40 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-webscript", "description": "Alfresco webscript executor", - "version": "0.5.0", + "version": "1.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", @@ -47,9 +47,9 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "ng2-translate": "2.5.0", - "alfresco-js-api": "^0.5.0", - "ng2-alfresco-core": "0.5.0", - "ng2-alfresco-datatable": "0.5.0" + "alfresco-js-api": "^1.0.0", + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", From 82fbfd27d72b3d1602aea912e294b79be44d8aef Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 16:14:25 +0000 Subject: [PATCH 162/162] update dependencies demo shell --- demo-shell-ng2/package.json | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 4ee42eb7e5..ce2e1f0464 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -52,19 +52,21 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.2.0", - "@angular/compiler": "2.2.0", - "@angular/core": "2.2.0", - "@angular/forms": "2.2.0", - "@angular/http": "2.2.0", - "@angular/platform-browser": "2.2.0", - "@angular/platform-browser-dynamic": "2.2.0", - "@angular/router": "3.2.0", - "systemjs": "0.19.40", + "@angular/common": "2.2.2", + "@angular/compiler": "2.2.2", + "@angular/compiler-cli": "2.2.2", + "@angular/core": "2.2.2", + "@angular/forms": "2.2.2", + "@angular/http": "2.2.2", + "@angular/platform-browser": "2.2.2", + "@angular/platform-browser-dynamic": "2.2.2", + "@angular/router": "3.2.2", + "@angular/upgrade": "2.2.2", + "systemjs": "0.19.27", "core-js": "^2.4.1", "reflect-metadata": "^0.1.8", - "rxjs": "5.0.1", - "zone.js": "0.7.2", + "rxjs": "5.0.0-beta.12", + "zone.js": "^0.6.23", "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "ng2-translate": "2.5.0",