diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 466eb711a5..4a12e18d8f 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -33,7 +33,9 @@ "@angular/platform-browser-dynamic": "4.4.5", "@angular/router": "4.4.5", "@ngx-translate/core": "7.0.0", + "alfresco-js-api": "1.9.0", "chart.js": "2.5.0", + "classlist.js": "1.1.20150312", "core-js": "2.4.1", "custom-event-polyfill": "0.3.0", "dialog-polyfill": "0.4.7", @@ -44,7 +46,6 @@ "minimatch": "3.0.4", "moment": "2.15.1", "ng2-3d-editor": "0.0.18", - "alfresco-js-api": "1.9.0", "ng2-activiti-analytics": "1.9.0", "ng2-activiti-diagrams": "1.9.0", "ng2-activiti-form": "1.9.0", diff --git a/demo-shell-ng2/src/app/components/activiti/activiti.component.html b/demo-shell-ng2/src/app/components/activiti/activiti.component.html index 570447f948..c66622fce5 100644 --- a/demo-shell-ng2/src/app/components/activiti/activiti.component.html +++ b/demo-shell-ng2/src/app/components/activiti/activiti.component.html @@ -17,7 +17,7 @@ [appId]="appId" [hasIcon]="false" (filterClick)="onTaskFilterClick($event)" - (onSuccess)="onSuccessTaskFilterList($event)" + (success)="onSuccessTaskFilterList($event)" #activitifilter> @@ -37,7 +37,7 @@ [data]="dataTasks" [landingTaskId]="currentTaskId" (rowClick)="onTaskRowClick($event)" - (onSuccess)="onSuccessTaskList($event)" + (success)="onSuccessTaskList($event)" (row-click)="onRowClick($event)" (row-dblclick)="onTaskRowDblClick($event)" #activititasklist> @@ -123,7 +123,7 @@ [filterParam]="{index: 0}" [appId]="appId" (filterClick)="onProcessFilterClick($event)" - (onSuccess)="onSuccessProcessFilterList($event)"> + (success)="onSuccessProcessFilterList($event)"> @@ -139,7 +139,7 @@ [data]="dataProcesses" (rowClick)="onProcessRowClick($event)" (row-dblclick)="onProcessRowDblClick($event)" - (onSuccess)="onSuccessProcessList($event)"> + (success)="onSuccessProcessList($event)"> diff --git a/demo-shell-ng2/src/app/components/login/login.component.html b/demo-shell-ng2/src/app/components/login/login.component.html index 4f76ebc2f9..7e01cb04ab 100644 --- a/demo-shell-ng2/src/app/components/login/login.component.html +++ b/demo-shell-ng2/src/app/components/login/login.component.html @@ -53,8 +53,8 @@ [showLoginActions]="showFooter" [showRememberMe]="showFooter" copyrightText="© 2016 Alfresco Software, Inc. All Rights Reserved. (customised text)" - (onSuccess)="onLogin($event)" - (onError)="onError($event)"> + (success)="onLogin($event)" + (error)="onError($event)">

+ (success)= "logData($event)"> diff --git a/demo-shell-ng2/src/polyfills.ts b/demo-shell-ng2/src/polyfills.ts index 53bdaf1b86..a609b61fdf 100644 --- a/demo-shell-ng2/src/polyfills.ts +++ b/demo-shell-ng2/src/polyfills.ts @@ -19,25 +19,25 @@ */ /** IE9, IE10 and IE11 requires all of the following polyfills. **/ -// import 'core-js/es6/symbol'; -// import 'core-js/es6/object'; -// import 'core-js/es6/function'; -// import 'core-js/es6/parse-int'; -// import 'core-js/es6/parse-float'; -// import 'core-js/es6/number'; -// import 'core-js/es6/math'; -// import 'core-js/es6/string'; -// import 'core-js/es6/date'; -// import 'core-js/es6/array'; -// import 'core-js/es6/regexp'; -// import 'core-js/es6/map'; -// import 'core-js/es6/set'; +import 'core-js/es6/symbol'; +import 'core-js/es6/object'; +import 'core-js/es6/function'; +import 'core-js/es6/parse-int'; +import 'core-js/es6/parse-float'; +import 'core-js/es6/number'; +import 'core-js/es6/math'; +import 'core-js/es6/string'; +import 'core-js/es6/date'; +import 'core-js/es6/array'; +import 'core-js/es6/regexp'; +import 'core-js/es6/map'; +import 'core-js/es6/set'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. + import 'classlist.js'; // Run `npm install --save classlist.js`. /** IE10 and IE11 requires the following to support `@angular/animation`. */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + import 'web-animations-js'; // Run `npm install --save web-animations-js`. /** Evergreen browsers require these. **/ @@ -65,4 +65,4 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. * Date, currency, decimal and percent pipes. * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 */ -// import 'intl'; // Run `npm install --save intl`. +import 'intl'; // Run `npm install --save intl`. diff --git a/docs/accordion.component.md b/docs/accordion.component.md index 6d2493c86b..75d42e6de0 100644 --- a/docs/accordion.component.md +++ b/docs/accordion.component.md @@ -75,7 +75,7 @@ the following example: + (success)="onSuccessProcessFilterList($event)"> diff --git a/docs/analytics-generator.component.md b/docs/analytics-generator.component.md index 8fe69e6bcd..e9be5b6f73 100644 --- a/docs/analytics-generator.component.md +++ b/docs/analytics-generator.component.md @@ -34,5 +34,5 @@ The component generates and shows the charts | Name | Description | | --- | --- | -| onSuccess | Raised when the charts are loaded | -| onError | Raised when an error occurs during the loading | \ No newline at end of file +| success | Raised when the charts are loaded | +| error | Raised when an error occurs during the loading | \ No newline at end of file diff --git a/docs/analytics-report-list.component.md b/docs/analytics-report-list.component.md index 43165fb0ad..fbc41f1356 100644 --- a/docs/analytics-report-list.component.md +++ b/docs/analytics-report-list.component.md @@ -34,6 +34,6 @@ The component shows the list of all the available reports | Name | Description | | --- | --- | -| onSuccess | The event is emitted when the report list is loaded | -| onError | The event is emitted when an error occurs during the loading | +| success | The event is emitted when the report list is loaded | +| error | The event is emitted when an error occurs during the loading | | reportClick | The event is emitted when the report in the list is selected | diff --git a/docs/analytics.component.md b/docs/analytics.component.md index 07df2745bc..e68a295baa 100644 --- a/docs/analytics.component.md +++ b/docs/analytics.component.md @@ -47,7 +47,7 @@ You can also hide chart parameters UI by setting the `hideParameters` to `true`: | Name | Description | | --- | --- | -| onSuccess | The event is emitted when the report parameters are loaded | -| onError | The event is emitted when an error occurs during the loading | +| success | The event is emitted when the report parameters are loaded | +| error | The event is emitted when an error occurs during the loading | | reportSaved | The event is emitted when a report is saved | | reportDeleted | The event is emitted when a report is deleted | \ No newline at end of file diff --git a/docs/diagram.component.md b/docs/diagram.component.md index ac9cc9473b..2f66583c80 100644 --- a/docs/diagram.component.md +++ b/docs/diagram.component.md @@ -45,5 +45,5 @@ The below component shows the diagram of a running process instance with the act | Name | Description | | --- | --- | -| onSuccess | Raised when the diagrams elements are loaded | -| onError | Raised when an error occurs during loading | \ No newline at end of file +| success | Raised when the diagrams elements are loaded | +| error | Raised when an error occurs during loading | \ No newline at end of file diff --git a/docs/form.component.md b/docs/form.component.md index 203358c584..d77f30f070 100644 --- a/docs/form.component.md +++ b/docs/form.component.md @@ -141,7 +141,7 @@ and store the form field as metadata. The param nameNode is optional. | formCompleted | [FormModel](https://github.com/Alfresco/alfresco-ng2-components/blob/master/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts) | Invoked when form is submitted with `Complete` outcome. | | formDataRefreshed | [FormModel](https://github.com/Alfresco/alfresco-ng2-components/blob/master/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts) | Invoked when form values are refreshed due to a data property change | | executeOutcome | [FormOutcomeEvent](https://github.com/Alfresco/alfresco-ng2-components/blob/master/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome-event.model.ts) | Invoked when any outcome is executed, default behaviour can be prevented via `event.preventDefault()` | -| onError | any | Invoked at any error | +| error | any | Invoked at any error | ## Details diff --git a/docs/login.component.md b/docs/login.component.md index a386217ec3..4daf2dd036 100644 --- a/docs/login.component.md +++ b/docs/login.component.md @@ -53,8 +53,8 @@ Authenticates to Alfresco Content Services and Alfresco Process Services. | Name | Description | | --- | --- | -| onSuccess | Raised when the login is done | -| onError | Raised when the login fails | +| success | Raised when the login is done | +| error | Raised when the login fails | | executeSubmit | Raised when the form is submitted | ## Details @@ -66,8 +66,8 @@ Authenticates to Alfresco Content Services and Alfresco Process Services. ```html + (success)="mySuccessMethod($event)" + (error)="myErrorMethod($event)"> ``` diff --git a/docs/process-filters.component.md b/docs/process-filters.component.md index f4d27c98ff..e6d44087f5 100644 --- a/docs/process-filters.component.md +++ b/docs/process-filters.component.md @@ -41,8 +41,8 @@ If both `appId` and `appName` are specified then `appName` will take precedence | Name | Description | | --- | --- | -| onSuccess | Raised when the list of filters has been successfully loaded from the server | -| onError | Raised when an error occurs | +| success | Raised when the list of filters has been successfully loaded from the server | +| error | Raised when an error occurs | | filterClick | Raised when the user selects a filter from the list | ## Details diff --git a/docs/process-list.component.md b/docs/process-list.component.md index 0c19f462c0..82a5df4026 100644 --- a/docs/process-list.component.md +++ b/docs/process-list.component.md @@ -38,9 +38,14 @@ This component renders a list containing all the process instances matched by th ### Events -- **rowClick**: Emitted when a row in the process list is clicked -- **onSuccess**: Emitted when the list of process instances has been loaded successfully from the server -- **onError**: Emitted when an error is encountered loading the list of process instances from the server +| Name | Description | +| --- | --- | +| rowClick | Emitted when a row in the process list is clicked | +| success | Emitted when the list of process instances has been loaded successfully from the server | +| error | Emitted when an error is encountered loading the list of process instances from the server | + + + ## Details diff --git a/docs/task-details.component.md b/docs/task-details.component.md index a1e1867fb1..1bc57e9430 100644 --- a/docs/task-details.component.md +++ b/docs/task-details.component.md @@ -52,7 +52,7 @@ Shows the details of the task id passed in input | formCompleted | Raised when form is submitted with `Complete` outcome. | | taskCreated | Raised when a checklist task is created. | | executeOutcome | Raised when any outcome is executed, default behaviour can be prevented via `event.preventDefault()` | -| onError | Raised at any error | +| error | Raised at any error | ## Details diff --git a/docs/task-filters.component.md b/docs/task-filters.component.md index 92a86a7f3a..fe9eab3801 100644 --- a/docs/task-filters.component.md +++ b/docs/task-filters.component.md @@ -40,8 +40,8 @@ If both `appId` and `appName` are specified then `appName` will take precedence | Name | Description | | --- | --- | | filterClick | Raised when the filter in the list is clicked | -| onSuccess | Raised when the list is loaded | -| onError | Raised if there is an error during the loading | +| success | Raised when the list is loaded | +| error | Raised if there is an error during the loading | ## Details diff --git a/docs/task-list.component.md b/docs/task-list.component.md index 2dae4c3168..6e790fab6b 100644 --- a/docs/task-list.component.md +++ b/docs/task-list.component.md @@ -45,7 +45,7 @@ You can also use HTML-based schema declaration like shown below: | Name | Description | | --- | --- | -| onSuccess | Raised when the task list is loaded | +| success | Raised when the task list is loaded | | rowClick | Raised when the task in the list is clicked | | rowsSelected | Raised when the a row is selected/unselected | diff --git a/docs/upload-button.component.md b/docs/upload-button.component.md index 6995654acd..f9908a42cb 100644 --- a/docs/upload-button.component.md +++ b/docs/upload-button.component.md @@ -24,7 +24,7 @@ [multipleFiles]="false" [acceptedFilesType]=".jpg,.gif,.png,.svg" [versioning]="false" - (onSuccess)="customMethod($event)"> + (success)="customMethod($event)"> ``` @@ -50,7 +50,7 @@ | Name | Description | | --- | --- | -| onSuccess | Raised when the file is uploaded | +| success | Raised when the file is uploaded | ## Details diff --git a/docs/upload-drag-area.component.md b/docs/upload-drag-area.component.md index 9fa874bfe5..f6e8264706 100644 --- a/docs/upload-drag-area.component.md +++ b/docs/upload-drag-area.component.md @@ -17,7 +17,7 @@ Adds a drag and drop area to upload files to Alfresco. ## Basic Usage ```html - +

DRAG HERE
@@ -50,4 +50,4 @@ export class AppComponent { | Name | Description | | --- | --- | -| onSuccess | Raised when the file is uploaded | +| success | Raised when the file is uploaded | diff --git a/docs/webscript.component.md b/docs/webscript.component.md index ce85e7b76a..275b2dab59 100644 --- a/docs/webscript.component.md +++ b/docs/webscript.component.md @@ -25,7 +25,7 @@ [servicePath]="string" [showData]="boolean" [contentType]="JSON | HTML | DATATABLE | TEXT" - (onSuccess)= "logData($event)"> + (success)= "logData($event)"> ``` @@ -63,8 +63,14 @@ export class AppComponent { | scriptPath | string | alfresco | path to Web Script (as defined by Web Script) | | contentType | string | service | path where Web Script service is mapped default value | | contentType | string | TEXT | how to handle the data received from the web script JSON , HTML , DATATABLE or TEXT | -| onSuccess | event | | You can get the plain data from the webscript through the **onSuccess** event parameter and use it as you need in your application | -| showData | booleann | true | render the webscript data | +| showData | boolean | true | render the webscript data | + + +### Events + +| Name | Description | +| --- | --- | +| success | You can get the plain data from the webscript through the **success** event parameter and use it as you need in your application | **contentType** {string} ***data*** {string} data containing the plain value you get from the webscipt as an output parameter @@ -162,11 +168,11 @@ This sample Web Scripts reside in your Alfresco Server. You can access the folde [scriptPath]="'Sample/folder/JSON_EXAMPLE'" [contentType]="'HTML'" [showData]="false" - (onSuccess)="logDataExample($event)"> + (success)="logDataExample($event)"> ``` -You can get the plain data from the webscript through the **onSuccess** event parameter and use it as you need in your application +You can get the plain data from the webscript through the **success** event parameter and use it as you need in your application ```ts logDataExample(data) { diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index e86a536ba4..adfce98871 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -62,7 +62,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts index ce4943db8e..a19e1b08fe 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts @@ -92,7 +92,7 @@ describe('AnalyticsGeneratorComponent', () => { }); it('Should render the Process definition overview report ', (done) => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(3); @@ -134,7 +134,7 @@ describe('AnalyticsGeneratorComponent', () => { }); it('Should render the Process definition overview report when onchanges is called ', (done) => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(3); @@ -176,7 +176,7 @@ describe('AnalyticsGeneratorComponent', () => { }); it('Should render the Task overview report ', (done) => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(3); @@ -260,7 +260,7 @@ describe('AnalyticsGeneratorComponent', () => { }); it('Should emit onError event with a 404 response ', (done) => { - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts index bdcd70b21e..754464f6c5 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts @@ -35,10 +35,10 @@ export class AnalyticsGeneratorComponent implements OnChanges { reportParamQuery: ReportQuery = undefined; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); reports: Chart[]; @@ -83,10 +83,10 @@ export class AnalyticsGeneratorComponent implements OnChanges { if (this.reports) { this.selectFirstReport(); } - this.onSuccess.emit(res); + this.success.emit(res); }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts index 6a6b0d7be7..387dadfb23 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts @@ -93,7 +93,7 @@ describe('AnalyticsReportHeatMapComponent', () => { it('should render the dropdown with the metric options', async(() => { component.report = { totalCountsPercentages: { 'sid-fake-id': 10, 'fake-start-event': 30 } }; - component.onSuccess.subscribe(() => { + component.success.subscribe(() => { fixture.whenStable().then(() => { let dropDown: any = element.querySelector('#select-metrics'); expect(dropDown).toBeDefined(); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts index 6d080e6fe2..d03b920e66 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts @@ -29,10 +29,10 @@ export class AnalyticsReportHeatMapComponent implements OnInit { report: any; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); field: any = {}; @@ -53,7 +53,7 @@ export class AnalyticsReportHeatMapComponent implements OnInit { this.analyticsService.getMetricValues().subscribe( (opts: any[]) => { this.field.options = opts; - this.onSuccess.emit(opts); + this.success.emit(opts); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts index 706244409c..892efb7a3b 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts @@ -113,7 +113,7 @@ describe('AnalyticsReportListComponent', () => { responseText: reportList }); - component.onSuccess.subscribe(() => { + component.success.subscribe(() => { fixture.detectChanges(); expect(element.querySelector('#report-list-0 .activiti-filters__entry-icon').innerHTML).toBe('assignment'); expect(element.querySelector('#report-list-0 > span').innerHTML).toBe('Fake Test Process definition heat map'); @@ -124,13 +124,12 @@ describe('AnalyticsReportListComponent', () => { expect(component.isReportsEmpty()).toBeFalsy(); done(); }); - }); it('Report render the report list relative to a single app', (done) => { fixture.detectChanges(); - component.onSuccess.subscribe(() => { + component.success.subscribe(() => { fixture.detectChanges(); expect(element.querySelector('#report-list-0 .activiti-filters__entry-icon').innerHTML).toBe('assignment'); expect(element.querySelector('#report-list-0 > span').innerHTML).toBe('Fake Test Process definition heat map'); @@ -152,7 +151,7 @@ describe('AnalyticsReportListComponent', () => { it('Report emit an error with a empty response', (done) => { fixture.detectChanges(); - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); @@ -190,7 +189,7 @@ describe('AnalyticsReportListComponent', () => { expect(component.reports.length).toEqual(1); component.reload(); - component.onSuccess.subscribe(() => { + component.success.subscribe(() => { expect(component.reports.length).toEqual(5); done(); }); @@ -208,7 +207,7 @@ describe('AnalyticsReportListComponent', () => { component.reload(2002); - component.onSuccess.subscribe(() => { + component.success.subscribe(() => { expect(component.reports.length).toEqual(5); expect(component.currentReport).toBeDefined(); expect(component.currentReport).not.toBeNull(); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts index ab06c02c14..cb89979bbc 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts @@ -44,10 +44,10 @@ export class AnalyticsReportListComponent implements OnInit { reportClick: EventEmitter = new EventEmitter(); @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); private reportObserver: Observer; report$: Observable; @@ -98,11 +98,11 @@ export class AnalyticsReportListComponent implements OnInit { if (this.selectFirst) { this.selectFirstReport(); } - this.onSuccess.emit(res); + this.success.emit(res); } }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } @@ -118,7 +118,7 @@ export class AnalyticsReportListComponent implements OnInit { response.forEach((report) => { this.reportObserver.next(report); }); - this.onSuccess.emit(response); + this.success.emit(response); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts index cf538487ac..8b791f6995 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts @@ -81,17 +81,17 @@ describe('AnalyticsReportParametersComponent', () => { it('Should initialize the Report form with a Form Group ', (done) => { let fakeReportParam = new ReportParametersModel(analyticParamsMock.reportDefParamTask); - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); expect(component.reportForm.get('taskGroup')).toBeDefined(); expect(component.reportForm.get('taskGroup').get('taskName')).toBeDefined(); done(); }); - component.onSuccessReportParams.emit(fakeReportParam); + component.successReportParams.emit(fakeReportParam); }); it('Should render a dropdown with all the status when the definition parameter type is \'status\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); let dropDown: any = element.querySelector('#select-status'); expect(element.querySelector('h4').textContent.trim()).toEqual('Fake Task overview status'); @@ -116,7 +116,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should render a number with the default value when the definition parameter type is \'integer\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); let numberElement: any = element.querySelector('#slowProcessInstanceInteger'); expect(numberElement.value).toEqual('10'); @@ -136,7 +136,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should render a duration component when the definition parameter type is \'duration\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); let numberElement: any = element.querySelector('#duration'); expect(numberElement.value).toEqual('0'); @@ -163,7 +163,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should save an Params object when the submit is performed', () => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res.dateRange.startDate).toEqual('2016-09-01T00:00:00.000Z'); expect(res.dateRange.endDate).toEqual('2016-10-05T00:00:00.000Z'); expect(res.status).toEqual('All'); @@ -206,7 +206,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should render a checkbox with the value true when the definition parameter type is \'boolean\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); let checkElement: any = element.querySelector('#typeFiltering-input'); expect(checkElement.checked).toBeTruthy(); @@ -225,7 +225,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should render a date range components when the definition parameter type is \'dateRange\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { let dateElement: any = element.querySelector('adf-date-range-widget'); expect(dateElement).toBeDefined(); done(); @@ -244,7 +244,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should render a dropdown with all the RangeInterval when the definition parameter type is \'dateRangeInterval\' ', (done) => { - component.onSuccessReportParams.subscribe(() => { + component.successReportParams.subscribe(() => { fixture.detectChanges(); let dropDown: any = element.querySelector('#select-dateRangeInterval'); expect(dropDown).toBeDefined(); @@ -270,7 +270,7 @@ describe('AnalyticsReportParametersComponent', () => { it('Should render a dropdown with all the process definition when the definition parameter type is \'processDefinition\' and the' + ' reportId change', (done) => { - component.onSuccessParamOpt.subscribe(() => { + component.successParamOpt.subscribe(() => { fixture.detectChanges(); let dropDown: any = element.querySelector('#select-processDefinitionId'); expect(dropDown).toBeDefined(); @@ -303,7 +303,7 @@ describe('AnalyticsReportParametersComponent', () => { it('Should render a dropdown with all the process definition when the definition parameter type is \'processDefinition\' and the' + ' appId change', (done) => { - component.onSuccessParamOpt.subscribe(() => { + component.successParamOpt.subscribe(() => { fixture.detectChanges(); let dropDown: any = element.querySelector('#select-processDefinitionId'); expect(dropDown).toBeDefined(); @@ -336,7 +336,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should create an empty valid form when there are no parameters definitions', () => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(component.reportForm).toBeDefined(); expect(component.reportForm.valid).toEqual(true); expect(component.reportForm.controls).toEqual({}); @@ -354,7 +354,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should load the task list when a process definition is selected', () => { - component.onSuccessReportParams.subscribe((res) => { + component.successReportParams.subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(2); expect(res[0].id).toEqual('Fake task name 1'); @@ -375,7 +375,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should emit an error with a 404 response when the options response is not found', (done) => { - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); @@ -399,7 +399,7 @@ describe('AnalyticsReportParametersComponent', () => { }); it('Should emit an error with a 404 response when the report parameters response is not found', (done) => { - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index c060418fb0..2734da2e84 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -55,16 +55,16 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On hideComponent: boolean = false; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Output() - onEdit = new EventEmitter(); + edit = new EventEmitter(); @Output() - onFormValueChanged = new EventEmitter(); + formValueChanged = new EventEmitter(); @Output() saveReportSuccess = new EventEmitter(); @@ -77,9 +77,9 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On onDropdownChanged = new EventEmitter(); - onSuccessReportParams = new EventEmitter(); + successReportParams = new EventEmitter(); - onSuccessParamOpt = new EventEmitter(); + successParamOpt = new EventEmitter(); reportParameters: ReportParametersModel; @@ -113,7 +113,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On } }); - this.paramOpts = this.onSuccessReportParams.subscribe((report: ReportParametersModel) => { + this.paramOpts = this.successReportParams.subscribe((report: ReportParametersModel) => { if (report.hasParameters()) { this.retrieveParameterOptions(report.definition.parameters, this.appId); this.generateFormGroupFromParameter(report.definition.parameters); @@ -193,14 +193,14 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On (res: ReportParametersModel) => { this.reportParameters = res; if (this.reportParameters.hasParameters()) { - this.onSuccessReportParams.emit(res); + this.successReportParams.emit(res); } else { this.reportForm = this.formBuilder.group({}); - this.onSuccess.emit(); + this.success.emit(); } }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } @@ -210,10 +210,10 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On this.analyticsService.getParamValuesByType(param.type, appId, reportId, processDefinitionId).subscribe( (opts: ParameterValueModel[]) => { param.options = opts; - this.onSuccessParamOpt.emit(opts); + this.successParamOpt.emit(opts); }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); }); @@ -227,11 +227,11 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On public submit(values: any) { this.reportParamQuery = this.convertFormValuesToReportParamQuery(values); - this.onSuccess.emit(this.reportParamQuery); + this.success.emit(this.reportParamQuery); } onValueChanged(values: any) { - this.onFormValueChanged.emit(values); + this.formValueChanged.emit(values); if (this.reportForm && this.reportForm.valid) { this.submit(values); } @@ -306,10 +306,10 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On this.reportParamsSub = this.analyticsService.updateReport(this.reportParameters.id, this.reportParameters.name).subscribe( (res: ReportParametersModel) => { this.editDisable(); - this.onEdit.emit(this.reportParameters.name); + this.edit.emit(this.reportParameters.name); }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index 113a21c4c8..bcc03e7881 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -1,11 +1,11 @@
+ (edit)="onEditReport($event)"> { }); it('Should render the Start Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -101,7 +101,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Timer Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -127,7 +127,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Signal Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -152,7 +152,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Message Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -177,7 +177,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -202,7 +202,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the End Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -223,7 +223,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the End Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -260,7 +260,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the User Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -289,7 +289,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Manual Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -318,7 +318,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -347,7 +347,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Mail Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(true).toBe(true); @@ -363,7 +363,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Camel Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -392,7 +392,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Mule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -417,7 +417,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Alfresco Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -447,7 +447,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Google Drive Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -477,7 +477,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Rest Call Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -507,7 +507,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Box Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -537,7 +537,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Receive Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -566,7 +566,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Script Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -595,7 +595,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Business Rule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -637,7 +637,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Exclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -662,7 +662,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Inclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -687,7 +687,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Parallel Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -712,7 +712,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Event Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -759,7 +759,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Intermediate catching time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -792,7 +792,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -825,7 +825,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -858,7 +858,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -903,7 +903,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Boundary time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -936,7 +936,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -969,7 +969,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1002,7 +1002,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1035,7 +1035,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1080,7 +1080,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Throw time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1109,7 +1109,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1142,7 +1142,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1175,7 +1175,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1208,7 +1208,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1253,7 +1253,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1275,7 +1275,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Event Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1309,7 +1309,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Pool', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1331,7 +1331,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Pool with Lanes', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1368,7 +1368,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the flow', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1403,7 +1403,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Start Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1424,7 +1424,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Start Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1445,7 +1445,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Start Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1466,7 +1466,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Timer Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1492,7 +1492,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Start Timer Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1518,7 +1518,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Start Timer Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1544,7 +1544,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Signal Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1569,7 +1569,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Start Signal Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1594,7 +1594,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Start Signal Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1619,7 +1619,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Message Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1644,7 +1644,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Start Message Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1669,7 +1669,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Start Message Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1694,7 +1694,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Start Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1719,7 +1719,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Start Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1744,7 +1744,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Start Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1769,7 +1769,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the End Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1790,7 +1790,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active End Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1811,7 +1811,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed End Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1832,7 +1832,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the End Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1857,7 +1857,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active End Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1882,7 +1882,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed End Error Event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).toBeDefined(); @@ -1919,7 +1919,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the User Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1948,7 +1948,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active User Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -1977,7 +1977,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed User Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2006,7 +2006,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Manual Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2035,7 +2035,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Manual Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2064,7 +2064,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Manual Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2093,7 +2093,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2122,7 +2122,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2151,7 +2151,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2180,7 +2180,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Mail Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(true).toBe(true); @@ -2196,7 +2196,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Camel Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2225,7 +2225,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Camel Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2254,7 +2254,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Camel Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2283,7 +2283,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Mule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2308,7 +2308,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Mule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2333,7 +2333,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Mule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2358,7 +2358,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Alfresco Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2388,7 +2388,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Alfresco Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2418,7 +2418,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Alfresco Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2448,7 +2448,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Google Drive Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2478,7 +2478,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Google Drive Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2508,7 +2508,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Google Drive Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2538,7 +2538,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Rest Call Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2568,7 +2568,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Rest Call Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2598,7 +2598,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Rest Call Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2628,7 +2628,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Service Box Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2658,7 +2658,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Service Box Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2688,7 +2688,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Service Box Publish Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2718,7 +2718,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Receive Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2747,7 +2747,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Receive Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2776,7 +2776,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Receive Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2805,7 +2805,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Script Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2834,7 +2834,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Script Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2863,7 +2863,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Script Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2892,7 +2892,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Business Rule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2921,7 +2921,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Business Rule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2950,7 +2950,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Business Rule Task', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -2992,7 +2992,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Exclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3017,7 +3017,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Exclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3042,7 +3042,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Exclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3067,7 +3067,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Inclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3092,7 +3092,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Inclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3117,7 +3117,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Inclusive Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3142,7 +3142,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Parallel Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3167,7 +3167,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Parallel Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3192,7 +3192,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Parallel Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3217,7 +3217,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Event Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3252,7 +3252,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Event Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3287,7 +3287,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Event Gateway', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3334,7 +3334,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Intermediate catching time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3367,7 +3367,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Intermediate catching time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3404,7 +3404,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Intermediate catching time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3441,7 +3441,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3474,7 +3474,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Intermediate catching error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3511,7 +3511,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Intermediate catching error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3548,7 +3548,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3581,7 +3581,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate Active catching signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3618,7 +3618,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Intermediate catching signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3655,7 +3655,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Intermediate catching signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3688,7 +3688,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Intermediate catching signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3725,7 +3725,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Intermediate catching signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3774,7 +3774,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Boundary time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3807,7 +3807,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Boundary time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3844,7 +3844,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Boundary time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3881,7 +3881,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3914,7 +3914,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Boundary error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3951,7 +3951,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Boundary error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -3988,7 +3988,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4021,7 +4021,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Boundary signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4058,7 +4058,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Boundary signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4095,7 +4095,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4128,7 +4128,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4165,7 +4165,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4202,7 +4202,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4235,7 +4235,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4272,7 +4272,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Boundary signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4321,7 +4321,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Throw time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4350,7 +4350,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Throw time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4383,7 +4383,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Throw time event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4416,7 +4416,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4449,7 +4449,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Throw error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4486,7 +4486,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Throw error event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4523,7 +4523,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4556,7 +4556,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Throw signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4593,7 +4593,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Throw signal event', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4630,7 +4630,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4663,7 +4663,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4700,7 +4700,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4737,7 +4737,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4770,7 +4770,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4807,7 +4807,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Throw signal message', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4856,7 +4856,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4878,7 +4878,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4900,7 +4900,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4922,7 +4922,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Event Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4944,7 +4944,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Active Event Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -4966,7 +4966,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Completed Event Subprocess', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -5000,7 +5000,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the Pool', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -5022,7 +5022,7 @@ describe('Test ng2-activiti-diagrams ', () => { })); it('Should render the Pool with Lanes', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); @@ -5059,7 +5059,7 @@ describe('Test ng2-activiti-diagrams ', () => { }); it('Should render the flow', async(() => { - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { fixture.detectChanges(); fixture.whenStable().then(() => { expect(res).not.toBeNull(); diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts index 8ea03500a4..030fdd3cbd 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts @@ -49,10 +49,10 @@ export class DiagramComponent implements OnChanges { height: number = 500; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); PADDING_WIDTH: number = 60; PADDING_HEIGHT: number = 60; @@ -81,10 +81,10 @@ export class DiagramComponent implements OnChanges { this.raphaelService.setting(this.diagram.diagramWidth + this.PADDING_WIDTH, this.diagram.diagramHeight + this.PADDING_HEIGHT); this.setMetricValueToDiagramElement(this.diagram, this.metricPercentages, this.metricType); - this.onSuccess.emit(res); + this.success.emit(res); }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } @@ -96,10 +96,10 @@ export class DiagramComponent implements OnChanges { this.raphaelService.setting(this.diagram.diagramWidth + this.PADDING_WIDTH, this.diagram.diagramHeight + this.PADDING_HEIGHT); this.setMetricValueToDiagramElement(this.diagram, this.metricPercentages, this.metricType); - this.onSuccess.emit(res); + this.success.emit(res); }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts index 0d49f5bfe2..c2e32064e9 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-end-event.component.ts @@ -29,7 +29,7 @@ export class DiagramEndEventComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: '', radius: ''}; iconFillColor: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts index 1439afab6b..3bffa377e6 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-event.component.ts @@ -34,7 +34,7 @@ export class DiagramEventComponent implements OnInit { iconFillColor: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts index 964a90c275..38e2a78360 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/events/diagram-start-event.component.ts @@ -29,7 +29,7 @@ export class DiagramStartEventComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: '', radius: ''}; iconFillColor: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts index 0d1bb7e74a..903f89be37 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-event-gateway.component.ts @@ -29,7 +29,7 @@ export class DiagramEventGatewayComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; centerPentagon: any = {}; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts index a807d9c288..4d3d17851d 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-exclusive-gateway.component.ts @@ -29,7 +29,7 @@ export class DiagramExclusiveGatewayComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts index 25d997105c..040182e5f5 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.ts @@ -29,7 +29,7 @@ export class DiagramGatewayComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts index 38fb998c7b..e64854a999 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-inclusive-gateway.component.ts @@ -29,7 +29,7 @@ export class DiagramInclusiveGatewayComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts index 4580038136..104a8f7017 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-parallel-gateway.component.ts @@ -29,7 +29,7 @@ export class DiagramParallelGatewayComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts index 55d5103c71..dcec7654c6 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-container-icon-event.component.ts @@ -34,7 +34,7 @@ export class DiagramContainerIconEventTaskComponent { fillColor: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef) {} } diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts index 2bf0fcfa49..d7f7395ddc 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-alfresco-publish-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconAlfrescoPublishTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts index 3afd6f022d..48a3438269 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-box-publish-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconBoxPublishTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts index 3ab75a1f10..7e55830f62 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-business-rule-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconBusinessRuleTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts index d96efbc4c2..35ca243092 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-camel-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconCamelTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts index 647af5237f..ffe1cbb554 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-error.component.ts @@ -31,7 +31,7 @@ export class DiagramIconErrorComponent implements OnInit { fillColor: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts index 547121a793..bcc02e635e 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-google-drive-publish-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconGoogleDrivePublishTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts index 6e64a04ed7..6736c4f99f 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-manual-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconManualTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts index 84712f4e68..29aa734f36 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-message.component.ts @@ -28,7 +28,7 @@ export class DiagramIconMessageComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts index a919f148b1..57ef794b54 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-mule-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconMuleTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts index 4937d74793..29f687094a 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-receive-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconReceiveTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts index b73a1b0945..d54d2dc0dd 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-rest-call-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconRestCallTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts index 00f1cdb3dc..333fc80448 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-script-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconScriptTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts index 9ebe6b9732..82d25e68e8 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-send-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconSendTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts index 93788f805e..22b67697fa 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-service-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconServiceTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts index 7b49ab0185..02dde90533 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-signal.component.ts @@ -31,7 +31,7 @@ export class DiagramIconSignalComponent implements OnInit { fillColor: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts index d560716f06..1ee61ae04b 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-timer.component.ts @@ -28,7 +28,7 @@ export class DiagramIconTimerComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts index c4ed402306..7543139810 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/icons/diagram-icon-user-task.component.ts @@ -28,7 +28,7 @@ export class DiagramIconUserTaskComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); position: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts index dd44c6b567..579ea5f9dd 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.ts @@ -29,7 +29,7 @@ export class DiagramIntermediateCatchingEventComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); center: any = {}; options: any = {stroke: '', fillColors: '', fillOpacity: '', strokeWidth: 1}; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts index 085341ed76..51fa84e066 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconAlfrescoPublishDirective extends RaphaelBase implements text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-box-publish.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-box-publish.component.ts index 01b169d17e..2af5a3d715 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-box-publish.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-box-publish.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconBoxPublishDirective extends RaphaelBase implements OnIni text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-business-rule.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-business-rule.component.ts index 05dd0af738..9c3b603255 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-business-rule.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-business-rule.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconBusinessRuleDirective extends RaphaelBase implements OnI text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-camel.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-camel.component.ts index 0b23472b9d..b171ef8239 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-camel.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-camel.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconCamelDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-error.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-error.component.ts index fa82ba0560..ed2a0ebc1a 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-error.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-error.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconErrorDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts index 78aaa58c46..4d8b5cb62b 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconGoogleDrivePublishDirective extends RaphaelBase implemen text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-manual.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-manual.component.ts index e815000f33..1ed8d88b54 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-manual.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-manual.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconManualDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-message.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-message.component.ts index 448499600f..73ada394f6 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-message.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-message.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconMessageDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-mule.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-mule.component.ts index ee5c141177..c3eeb8779b 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-mule.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-mule.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconMuleDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-receive.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-receive.component.ts index e12fe50cb6..74d764bf06 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-receive.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-receive.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconReceiveDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-rest-call.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-rest-call.component.ts index 1c6b31bec9..927f176767 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-rest-call.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-rest-call.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconRestCallDirective extends RaphaelBase implements OnInit text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-script.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-script.component.ts index dd3cec6758..434a87dc28 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-script.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-script.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconScriptDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-send.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-send.component.ts index d039596395..c19b224137 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-send.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-send.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconSendDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-service.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-service.component.ts index 814a043e3a..b58c8d2001 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-service.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-service.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconServiceDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-signal.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-signal.component.ts index 94b8c9d624..ae48813aa0 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-signal.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-signal.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconSignalDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-timer.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-timer.component.ts index af4d687473..9a5b90bfd3 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-timer.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-timer.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconTimerDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-user.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-user.component.ts index 0fc871aaa8..c26a12abea 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-user.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/icons/raphael-icon-user.component.ts @@ -32,7 +32,7 @@ export class RaphaelIconUserDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Input() strokeWidth: number; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-circle.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-circle.component.ts index f89f3409a6..d2335d2b16 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-circle.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-circle.component.ts @@ -47,7 +47,7 @@ export class RaphaelCircleDirective extends RaphaelBase implements OnInit { elementId: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-cross.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-cross.component.ts index 8b34b08e75..02d14d6b57 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-cross.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-cross.component.ts @@ -44,7 +44,7 @@ export class RaphaelCrossDirective extends RaphaelBase implements OnInit { fillOpacity: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts index 06efda2a6c..fb6271f655 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts @@ -31,7 +31,7 @@ export class RaphaelFlowArrowDirective extends RaphaelBase implements OnInit { flow: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); ARROW_WIDTH = 4; SEQUENCEFLOW_STROKE = 1.5; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts index 67172fdeb8..4cd63f5582 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts @@ -39,7 +39,7 @@ export class RaphaelMultilineTextDirective extends RaphaelBase implements OnInit elementWidth: number; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); TEXT_PADDING = 3; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-pentagon.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-pentagon.component.ts index 7695b87522..aea306ff97 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-pentagon.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-pentagon.component.ts @@ -41,7 +41,7 @@ export class RaphaelPentagonDirective extends RaphaelBase implements OnInit { strokeLinejoin: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-plus.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-plus.component.ts index 7edbe08eae..71c4aeb987 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-plus.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-plus.component.ts @@ -38,7 +38,7 @@ export class RaphaelPlusDirective extends RaphaelBase implements OnInit { fillOpacity: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rect.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rect.component.ts index 7763e26c96..ab081cbfbb 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rect.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rect.component.ts @@ -53,7 +53,7 @@ export class RaphaelRectDirective extends RaphaelBase implements OnInit { elementId: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts index 8fc2e8fbce..3627a55b15 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts @@ -47,7 +47,7 @@ export class RaphaelRhombusDirective extends RaphaelBase implements OnInit { elementId: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-text.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-text.component.ts index 8bf53c0b09..c38a9693ef 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-text.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-text.component.ts @@ -35,7 +35,7 @@ export class RaphaelTextDirective extends RaphaelBase implements OnInit { text: string; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef, raphaelService: RaphaelService) { diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts index 0edbcb565c..7d14322829 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.ts @@ -29,7 +29,7 @@ export class DiagramEventSubprocessComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); rectLeftCorner: any; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts index 886d558d1b..352290f166 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.ts @@ -29,7 +29,7 @@ export class DiagramSubprocessComponent implements OnInit { data: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); rectLeftCorner: any; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts index 25adaf5073..ad7e9f7760 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lane.component.ts @@ -28,7 +28,7 @@ export class DiagramLaneComponent implements OnInit { lane: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); rectLeftCorner: any; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts index 90c79bfb0c..cb2f2f7ff1 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-lanes.component.ts @@ -28,7 +28,7 @@ export class DiagramLanesComponent implements OnInit { lanes: any []; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef) {} diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts index 5f22132ac0..04b93c9fef 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pool.component.ts @@ -28,7 +28,7 @@ export class DiagramPoolComponent implements OnInit { pool: any; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); rectLeftCorner: any; width: any; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts index 2d1497d2dc..f049dffcfb 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/swimlanes/diagram-pools.component.ts @@ -28,7 +28,7 @@ export class DiagramPoolsComponent implements OnInit { pools: any []; @Output() - onError = new EventEmitter(); + error = new EventEmitter(); constructor(public elementRef: ElementRef) {} diff --git a/ng2-components/ng2-activiti-diagrams/tslint.json b/ng2-components/ng2-activiti-diagrams/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-activiti-diagrams/tslint.json +++ b/ng2-components/ng2-activiti-diagrams/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 9a8adc6347..64da0d00d8 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -61,7 +61,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-activiti-form/tslint.json b/ng2-components/ng2-activiti-form/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-activiti-form/tslint.json +++ b/ng2-components/ng2-activiti-form/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index fdc7cefe07..d30aeeb7af 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -64,7 +64,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts index 12e3fc47ff..7462097294 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts @@ -67,7 +67,7 @@ describe('ActivitiFilters', () => { let change = new SimpleChange(null, appId, true); filterList.ngOnChanges({ 'appId': change }); - filterList.onSuccess.subscribe((res) => { + filterList.success.subscribe((res) => { expect(res).toBeDefined(); expect(filterList.filters).toBeDefined(); expect(filterList.filters.length).toEqual(3); @@ -88,7 +88,7 @@ describe('ActivitiFilters', () => { expect(filterList.currentFilter).toBeUndefined(); - filterList.onSuccess.subscribe((res) => { + filterList.success.subscribe((res) => { filterList.selectRunningFilter(); expect(filterList.currentFilter.name).toEqual('Running'); done(); @@ -109,7 +109,7 @@ describe('ActivitiFilters', () => { let change = new SimpleChange(null, 'test', true); filterList.ngOnChanges({ 'appName': change }); - filterList.onSuccess.subscribe((res) => { + filterList.success.subscribe((res) => { let deployApp: any = appsProcessService.getDeployedApplicationsByName; expect(deployApp.calls.count()).toEqual(1); expect(res).toBeDefined(); @@ -126,7 +126,7 @@ describe('ActivitiFilters', () => { let change = new SimpleChange(null, appId, true); filterList.ngOnChanges({ 'appId': change }); - filterList.onError.subscribe((err) => { + filterList.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); @@ -141,7 +141,7 @@ describe('ActivitiFilters', () => { let change = new SimpleChange(null, appId, true); filterList.ngOnChanges({ 'appName': change }); - filterList.onError.subscribe((err) => { + filterList.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts index 5b4e6c3c88..b78cc2f0d0 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts @@ -36,10 +36,10 @@ export class ProcessFiltersComponent implements OnInit, OnChanges { filterClick: EventEmitter = new EventEmitter(); @Output() - onSuccess: EventEmitter = new EventEmitter(); + success: EventEmitter = new EventEmitter(); @Output() - onError: EventEmitter = new EventEmitter(); + error: EventEmitter = new EventEmitter(); @Input() appId: number; @@ -96,10 +96,10 @@ export class ProcessFiltersComponent implements OnInit, OnChanges { }); this.selectProcessFilter(this.filterParam); - this.onSuccess.emit(resDefault); + this.success.emit(resDefault); }, (errDefault: any) => { - this.onError.emit(errDefault); + this.error.emit(errDefault); } ); } else { @@ -109,11 +109,11 @@ export class ProcessFiltersComponent implements OnInit, OnChanges { }); this.selectProcessFilter(this.filterParam); - this.onSuccess.emit(res); + this.success.emit(res); } }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } @@ -129,7 +129,7 @@ export class ProcessFiltersComponent implements OnInit, OnChanges { this.selectProcessFilter(this.filterParam); }, (err) => { - this.onError.emit(err); + this.error.emit(err); }); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-list.component.spec.ts index b3b945584c..8bdd9ae340 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-list.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-list.component.spec.ts @@ -83,7 +83,7 @@ describe('ProcessInstanceListComponent', () => { }); it('should emit onSuccess event when process instances loaded', fakeAsync(() => { - let emitSpy = spyOn(component.onSuccess, 'emit'); + let emitSpy = spyOn(component.success, 'emit'); component.appId = 1; component.state = 'open'; component.processDefinitionKey = null; @@ -102,7 +102,7 @@ describe('ProcessInstanceListComponent', () => { component.appId = 1; component.state = 'open'; component.processDefinitionKey = null; - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -118,7 +118,7 @@ describe('ProcessInstanceListComponent', () => { component.appId = 1; component.state = 'open'; component.processDefinitionKey = null; - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -135,7 +135,7 @@ describe('ProcessInstanceListComponent', () => { component.state = 'open'; component.processDefinitionKey = null; component.sort = 'name-desc'; - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -152,7 +152,7 @@ describe('ProcessInstanceListComponent', () => { component.state = 'open'; component.processDefinitionKey = null; component.sort = 'started-asc'; - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -169,7 +169,7 @@ describe('ProcessInstanceListComponent', () => { component.state = 'open'; component.processDefinitionKey = null; component.sort = 'started-desc'; - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -186,7 +186,7 @@ describe('ProcessInstanceListComponent', () => { component.appId = 1; component.state = 'open'; component.processDefinitionKey = 'fakeprocess'; - component.onSuccess.subscribe( (res) => { + component.success.subscribe( (res) => { expect(component.data.getRows()[0].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:36:14 PM'); expect(component.data.getRows()[1].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:37:25 PM'); done(); @@ -200,7 +200,7 @@ describe('ProcessInstanceListComponent', () => { }); it('should throw an exception when the response is wrong', fakeAsync(() => { - let emitSpy: jasmine.Spy = spyOn(component.onError, 'emit'); + let emitSpy: jasmine.Spy = spyOn(component.error, 'emit'); let fakeError = 'Fake server error'; getProcessInstancesSpy.and.returnValue(Observable.throw(fakeError)); component.appId = 1; @@ -216,7 +216,7 @@ describe('ProcessInstanceListComponent', () => { component.processDefinitionKey = null; fixture.detectChanges(); tick(); - let emitSpy = spyOn(component.onSuccess, 'emit'); + let emitSpy = spyOn(component.success, 'emit'); component.reload(); tick(); expect(emitSpy).toHaveBeenCalledWith(fakeProcessInstances); @@ -230,7 +230,7 @@ describe('ProcessInstanceListComponent', () => { ] ); component.state = 'open'; - component.onSuccess.subscribe( (res) => { + component.success.subscribe( (res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -311,7 +311,7 @@ describe('ProcessInstanceListComponent', () => { const appId = '1'; let change = new SimpleChange(null, appId, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -327,7 +327,7 @@ describe('ProcessInstanceListComponent', () => { const processDefinitionKey = 'fakeprocess'; let change = new SimpleChange(null, processDefinitionKey, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -343,7 +343,7 @@ describe('ProcessInstanceListComponent', () => { const state = 'open'; let change = new SimpleChange(null, state, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -359,7 +359,7 @@ describe('ProcessInstanceListComponent', () => { const sort = 'created-desc'; let change = new SimpleChange(null, sort, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -376,7 +376,7 @@ describe('ProcessInstanceListComponent', () => { let change = new SimpleChange(null, sort, true); let sortSpy = spyOn(component.data, 'setSorting'); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(sortSpy).toHaveBeenCalledWith(new DataSorting('started', 'asc')); done(); @@ -390,7 +390,7 @@ describe('ProcessInstanceListComponent', () => { const name = 'FakeTaskName'; let change = new SimpleChange(null, name, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-list.component.ts index de870795ea..167fc6d769 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-list.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-list.component.ts @@ -56,10 +56,10 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit rowClick: EventEmitter = new EventEmitter(); @Output() - onSuccess: EventEmitter = new EventEmitter(); + success: EventEmitter = new EventEmitter(); @Output() - onError: EventEmitter = new EventEmitter(); + error: EventEmitter = new EventEmitter(); currentInstanceId: string; isLoading: boolean = true; @@ -144,11 +144,11 @@ export class ProcessInstanceListComponent implements OnChanges, AfterContentInit let instancesRow = this.createDataRow(response); this.renderInstances(instancesRow); this.selectFirst(); - this.onSuccess.emit(response); + this.success.emit(response); this.isLoading = false; }, error => { - this.onError.emit(error); + this.error.emit(error); this.isLoading = false; }); } diff --git a/ng2-components/ng2-activiti-processlist/tslint.json b/ng2-components/ng2-activiti-processlist/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-activiti-processlist/tslint.json +++ b/ng2-components/ng2-activiti-processlist/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index c79866c54b..9a703766a1 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -67,7 +67,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html index 543fcbc77f..1d8f276af5 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html @@ -33,7 +33,7 @@ + (dateChanged)="onDateChanged($event)">
{{'START_TASK.FORM.DATE.ERROR'|translate}}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html index 3002402f7f..e46444baf8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html @@ -40,7 +40,7 @@ (formCompleted)='onFormCompleted($event)' (formContentClicked)='onFormContentClick($event)' (formLoaded)='onFormLoaded($event)' - (onError)='onFormError($event)' + (error)='onFormError($event)' (executeOutcome)='onFormExecuteOutcome($event)'>

Please select a Task

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts index 25fb96c03d..c030613a10 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts @@ -221,7 +221,7 @@ describe('TaskDetailsComponent', () => { }); it('should emit an error event if an error occurs fetching the next task', () => { - let emitSpy: jasmine.Spy = spyOn(component.onError, 'emit'); + let emitSpy: jasmine.Spy = spyOn(component.error, 'emit'); getTasksSpy.and.returnValue(Observable.throw({})); component.onComplete(); expect(emitSpy).toHaveBeenCalled(); @@ -256,7 +256,7 @@ describe('TaskDetailsComponent', () => { }); it('should emit an error event when form error occurs', () => { - let emitSpy: jasmine.Spy = spyOn(component.onError, 'emit'); + let emitSpy: jasmine.Spy = spyOn(component.error, 'emit'); component.onFormError({}); expect(emitSpy).toHaveBeenCalled(); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts index 5af4dc854d..ad0c75b73c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts @@ -120,7 +120,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges { taskDeleted: EventEmitter = new EventEmitter(); @Output() - onError: EventEmitter = new EventEmitter(); + error: EventEmitter = new EventEmitter(); @Output() executeOutcome: EventEmitter = new EventEmitter(); @@ -269,7 +269,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges { this.reset(); } }, (error) => { - this.onError.emit(error); + this.error.emit(error); }); } @@ -312,7 +312,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges { onFormError(error: any): void { this.errorDialogRef = this.dialog.open(this.errorDialog, {width: '500px'}); - this.onError.emit(error); + this.error.emit(error); } onFormExecuteOutcome(event: FormOutcomeEvent): void { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts index 3f015212e0..e547afe7d3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts @@ -95,7 +95,7 @@ describe('TaskFiltersComponent', () => { let change = new SimpleChange(null, appId, true); component.ngOnChanges({ 'appId': change }); - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); done(); }); @@ -108,7 +108,7 @@ describe('TaskFiltersComponent', () => { let change = new SimpleChange(null, appId, true); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.filters).toBeDefined(); expect(component.filters.length).toEqual(3); @@ -133,7 +133,7 @@ describe('TaskFiltersComponent', () => { let change = new SimpleChange(null, 'test', true); component.ngOnChanges({ 'appName': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { let deployApp: any = appsProcessService.getDeployedApplicationsByName; expect(deployApp.calls.count()).toEqual(1); expect(res).toBeDefined(); @@ -152,7 +152,7 @@ describe('TaskFiltersComponent', () => { fixture.detectChanges(); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.currentFilter).toBeDefined(); expect(component.currentFilter.name).toEqual('FakeInvolvedTasks'); @@ -171,7 +171,7 @@ describe('TaskFiltersComponent', () => { fixture.detectChanges(); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.currentFilter).toBeDefined(); expect(component.currentFilter.name).toEqual('FakeMyTasks1'); @@ -191,7 +191,7 @@ describe('TaskFiltersComponent', () => { fixture.detectChanges(); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.currentFilter).toBeDefined(); expect(component.currentFilter.name).toEqual('FakeInvolvedTasks'); @@ -211,7 +211,7 @@ describe('TaskFiltersComponent', () => { fixture.detectChanges(); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.currentFilter).toBeDefined(); expect(component.currentFilter.name).toEqual('FakeMyTasks2'); @@ -231,7 +231,7 @@ describe('TaskFiltersComponent', () => { fixture.detectChanges(); component.ngOnChanges({ 'appId': change }); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.currentFilter).toBeDefined(); expect(component.currentFilter.name).toEqual('FakeInvolvedTasks'); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts index 2bf6c0d7fc..42c7401d2d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts @@ -35,10 +35,10 @@ export class TaskFiltersComponent implements OnInit, OnChanges { filterClick: EventEmitter = new EventEmitter(); @Output() - onSuccess: EventEmitter = new EventEmitter(); + success: EventEmitter = new EventEmitter(); @Output() - onError: EventEmitter = new EventEmitter(); + error: EventEmitter = new EventEmitter(); @Input() appId: number; @@ -110,10 +110,10 @@ export class TaskFiltersComponent implements OnInit, OnChanges { }); this.selectTaskFilter(this.filterParam, this.filters); - this.onSuccess.emit(resDefault); + this.success.emit(resDefault); }, (errDefault: any) => { - this.onError.emit(errDefault); + this.error.emit(errDefault); } ); } else { @@ -123,11 +123,11 @@ export class TaskFiltersComponent implements OnInit, OnChanges { }); this.selectTaskFilter(this.filterParam, this.filters); - this.onSuccess.emit(res); + this.success.emit(res); } }, (err: any) => { - this.onError.emit(err); + this.error.emit(err); } ); } @@ -143,7 +143,7 @@ export class TaskFiltersComponent implements OnInit, OnChanges { this.selectTaskFilter(this.filterParam, this.filters); }, (err) => { - this.onError.emit(err); + this.error.emit(err); }); } @@ -163,7 +163,7 @@ export class TaskFiltersComponent implements OnInit, OnChanges { filteredFilterList.push(filter); }, (err) => { - this.onError.emit(err); + this.error.emit(err); }, () => { if (filteredFilterList.length > 0) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts index 22be0e97f5..4112c1c6b2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts @@ -155,7 +155,7 @@ describe('TaskListComponent', () => { let processDefinitionKey = new SimpleChange(null, null, true); let assignment = new SimpleChange(null, 'fake-assignee', true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -199,7 +199,7 @@ describe('TaskListComponent', () => { let processDefinitionKey = new SimpleChange(null, 'fakeprocess', true); let assignment = new SimpleChange(null, 'fake-assignee', true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -224,7 +224,7 @@ describe('TaskListComponent', () => { let processInstanceId = new SimpleChange(null, 'fakeprocessId', true); let assignment = new SimpleChange(null, 'fake-assignee', true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -249,7 +249,7 @@ describe('TaskListComponent', () => { let state = new SimpleChange(null, 'all', true); let processInstanceId = new SimpleChange(null, 'fakeprocessId', true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -282,7 +282,7 @@ describe('TaskListComponent', () => { let state = new SimpleChange(null, 'open', true); let assignment = new SimpleChange(null, 'fake-assignee', true); - component.onError.subscribe((err) => { + component.error.subscribe((err) => { expect(err).toBeDefined(); expect(err.error).toBe('wrong request'); done(); @@ -303,7 +303,7 @@ describe('TaskListComponent', () => { component.state = 'open'; component.assignment = 'fake-assignee'; component.ngAfterContentInit(); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -386,7 +386,7 @@ describe('TaskListComponent', () => { const landingTaskId = '888'; let change = new SimpleChange(null, landingTaskId, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.data.getRows().length).toEqual(2); @@ -412,7 +412,7 @@ describe('TaskListComponent', () => { const appId = '1'; let change = new SimpleChange(null, appId, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -433,7 +433,7 @@ describe('TaskListComponent', () => { const processDefinitionKey = 'fakeprocess'; let change = new SimpleChange(null, processDefinitionKey, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -455,7 +455,7 @@ describe('TaskListComponent', () => { const state = 'open'; let change = new SimpleChange(null, state, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -477,7 +477,7 @@ describe('TaskListComponent', () => { const sort = 'desc'; let change = new SimpleChange(null, sort, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -499,7 +499,7 @@ describe('TaskListComponent', () => { const name = 'FakeTaskName'; let change = new SimpleChange(null, name, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); @@ -521,7 +521,7 @@ describe('TaskListComponent', () => { const assignment = 'assignee'; let change = new SimpleChange(null, assignment, true); - component.onSuccess.subscribe((res) => { + component.success.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts index d862f94890..e406217b4f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts @@ -75,10 +75,10 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit { rowsSelected: EventEmitter = new EventEmitter(); @Output() - onSuccess: EventEmitter = new EventEmitter(); + success: EventEmitter = new EventEmitter(); @Output() - onError: EventEmitter = new EventEmitter(); + error: EventEmitter = new EventEmitter(); currentInstanceId: string; selectedInstances: any[]; @@ -118,10 +118,10 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit { let instancesRow = this.createDataRow(tasks.data); this.renderInstances(instancesRow); this.selectTask(this.landingTaskId); - this.onSuccess.emit(tasks); + this.success.emit(tasks); this.isLoading = false; }, (error) => { - this.onError.emit(error); + this.error.emit(error); this.isLoading = false; }); } diff --git a/ng2-components/ng2-activiti-tasklist/tslint.json b/ng2-components/ng2-activiti-tasklist/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-activiti-tasklist/tslint.json +++ b/ng2-components/ng2-activiti-tasklist/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index e6dedb0325..6cd796e872 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -69,7 +69,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html index 7da6f043c9..18804edcb5 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html @@ -26,7 +26,7 @@ @@ -52,7 +52,7 @@ diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts index e5232de284..977bfedd65 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts @@ -83,10 +83,10 @@ describe('PaginationComponent', () => { .createSpy('ngAfterViewInit').and .callThrough(); - spyOn(component.onChangePageNumber, 'emit'); - spyOn(component.onChangePageSize, 'emit'); - spyOn(component.onNextPage, 'emit'); - spyOn(component.onPrevPage, 'emit'); + spyOn(component.changePageNumber, 'emit'); + spyOn(component.changePageSize, 'emit'); + spyOn(component.nextPage, 'emit'); + spyOn(component.prevPage, 'emit'); this.fixture = fixture; this.component = component; @@ -172,7 +172,7 @@ describe('PaginationComponent', () => { component.goNext(); - const { emit: { calls } } = component.onNextPage; + const { emit: { calls } } = component.nextPage; const { skipCount } = calls.mostRecent().args[0]; expect(skipCount).toBe(75); @@ -183,7 +183,7 @@ describe('PaginationComponent', () => { component.goPrevious(); - const { emit: { calls } } = component.onPrevPage; + const { emit: { calls } } = component.prevPage; const { skipCount } = calls.mostRecent().args[0]; expect(skipCount).toBe(25); @@ -191,9 +191,9 @@ describe('PaginationComponent', () => { it('changes page size', () => { const { component } = this; - component.changePageSize(50); + component.onChangePageSize(50); - const { emit: { calls } } = component.onChangePageSize; + const { emit: { calls } } = component.changePageSize; const { maxItems } = calls.mostRecent().args[0]; expect(maxItems).toBe(50); @@ -202,9 +202,9 @@ describe('PaginationComponent', () => { it('changes page number', () => { const { component } = this; - component.changePageNumber(5); + component.onChangePageNumber(5); - const { emit: { calls } } = component.onChangePageNumber; + const { emit: { calls } } = component.changePageNumber; const { skipCount } = calls.mostRecent().args[0]; expect(skipCount).toBe(100); diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts index df1086e60b..e023474682 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts @@ -64,20 +64,20 @@ export class PaginationComponent implements OnInit { @Input() pagination: Pagination; - @Output('change') - onChange: EventEmitter = new EventEmitter(); + @Output() + change: EventEmitter = new EventEmitter(); - @Output('changePageNumber') - onChangePageNumber: EventEmitter = new EventEmitter(); + @Output() + changePageNumber: EventEmitter = new EventEmitter(); - @Output('changePageSize') - onChangePageSize: EventEmitter = new EventEmitter(); + @Output() + changePageSize: EventEmitter = new EventEmitter(); - @Output('nextPage') - onNextPage: EventEmitter = new EventEmitter(); + @Output() + nextPage: EventEmitter = new EventEmitter(); - @Output('prevPage') - onPrevPage: EventEmitter = new EventEmitter(); + @Output() + prevPage: EventEmitter = new EventEmitter(); ngOnInit() { if (!this.pagination) { @@ -154,7 +154,7 @@ export class PaginationComponent implements OnInit { }); } - changePageNumber(pageNumber: number) { + onChangePageNumber(pageNumber: number) { const { pagination: { maxItems } } = this; this.handlePaginationEvent(PaginationComponent.ACTIONS.CHANGE_PAGE_NUMBER, { @@ -163,7 +163,7 @@ export class PaginationComponent implements OnInit { }); } - changePageSize(maxItems: number) { + onChangePageSize(maxItems: number) { this.handlePaginationEvent(PaginationComponent.ACTIONS.CHANGE_PAGE_SIZE, { skipCount: 0, maxItems @@ -179,32 +179,32 @@ export class PaginationComponent implements OnInit { } = PaginationComponent.ACTIONS; const { - onChange, - onChangePageNumber, - onChangePageSize, - onNextPage, - onPrevPage, + change, + changePageNumber, + changePageSize, + nextPage, + prevPage, pagination } = this; const data = Object.assign({}, pagination, params); if (action === NEXT_PAGE) { - onNextPage.emit(data); + nextPage.emit(data); } if (action === PREV_PAGE) { - onPrevPage.emit(data); + prevPage.emit(data); } if (action === CHANGE_PAGE_NUMBER) { - onChangePageNumber.emit(data); + changePageNumber.emit(data); } if (action === CHANGE_PAGE_SIZE) { - onChangePageSize.emit(data); + changePageSize.emit(data); } - onChange.emit(params); + change.emit(params); } } diff --git a/ng2-components/ng2-alfresco-core/tslint.json b/ng2-components/ng2-alfresco-core/tslint.json index 3e47a8ba4e..4279380153 100644 --- a/ng2-components/ng2-alfresco-core/tslint.json +++ b/ng2-components/ng2-alfresco-core/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true + "adf-class-name": true, + "adf-prefix-name": true } } diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index d1cff43c67..c880111fa0 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -59,7 +59,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-datatable/tslint.json b/ng2-components/ng2-alfresco-datatable/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-datatable/tslint.json +++ b/ng2-components/ng2-alfresco-datatable/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 0ed22df7e9..b3c86055cd 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -68,7 +68,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index 53658fe4d5..2ff99bcfcd 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -19,7 +19,7 @@ import { AfterContentInit, Component, ContentChild, ElementRef, EventEmitter, HostListener, Input, NgZone, OnChanges, OnInit, Output, SimpleChanges, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, Pagination, PersonEntry } from 'alfresco-js-api'; +import { DeletedNodesPaging, MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, Pagination, PersonEntry } from 'alfresco-js-api'; import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from 'ng2-alfresco-core'; import { DataCellEvent, DataColumn, DataRowActionEvent, DataSorting, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { Observable, Subject } from 'rxjs/Rx'; @@ -485,7 +485,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni maxItems: this.pageSize, skipCount: this.skipCount }; - this.apiService.nodesApi.getDeletedNodes(options).then((page: NodePaging) => { + this.apiService.nodesApi.getDeletedNodes(options).then((page: DeletedNodesPaging) => { this.onPageLoaded(page); }); } diff --git a/ng2-components/ng2-alfresco-documentlist/tslint.json b/ng2-components/ng2-alfresco-documentlist/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-documentlist/tslint.json +++ b/ng2-components/ng2-alfresco-documentlist/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 779c54abe6..29edb826fb 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -70,7 +70,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.html b/ng2-components/ng2-alfresco-login/src/components/login.component.html index 4246ebc114..74b77f7e78 100644 --- a/ng2-components/ng2-alfresco-login/src/components/login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/login.component.html @@ -21,7 +21,7 @@
-
warning diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts index 860d9de51b..e217937bcc 100644 --- a/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts @@ -41,8 +41,20 @@ describe('LoginComponent', () => { let usernameInput, passwordInput; - const getLoginErrorElement = () => element.querySelector('#login-error'); - const getLoginErrorMessage = () => element.querySelector('#login-error .login-error-message').innerText; + const getLoginErrorElement = () => { + return element.querySelector('#login-error'); + }; + + const getLoginErrorMessage = () => { + let errorMessage = undefined; + let errorElement = element.querySelector('#login-error .login-error-message'); + + if (errorElement) { + return errorElement.innerText; + } + + return errorMessage; + }; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -55,8 +67,8 @@ describe('LoginComponent', () => { LoginComponent ], providers: [ - { provide: AlfrescoAuthenticationService, useClass: AuthenticationMock }, - { provide: AlfrescoTranslationService, useClass: TranslationMock } + {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock}, + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); @@ -79,8 +91,8 @@ describe('LoginComponent', () => { fixture.detectChanges(); }); - function loginWithCredentials(username, password) { - component.providers = 'ECM'; + function loginWithCredentials(username, password, providers: string = 'ECM') { + component.providers = providers; usernameInput.value = username; passwordInput.value = password; @@ -111,7 +123,10 @@ describe('LoginComponent', () => { }); it('should be changed to the "checking key" after a login attempt', () => { - spyOn(authService, 'login').and.returnValue({ subscribe: () => { } }); + spyOn(authService, 'login').and.returnValue({ + subscribe: () => { + } + }); loginWithCredentials('fake-username', 'fake-password'); @@ -151,7 +166,10 @@ describe('LoginComponent', () => { }); it('should be taken into consideration during login attempt', () => { - spyOn(authService, 'login').and.returnValue({ subscribe: () => { } }); + spyOn(authService, 'login').and.returnValue({ + subscribe: () => { + } + }); component.rememberMe = false; loginWithCredentials('fake-username', 'fake-password'); @@ -345,217 +363,142 @@ describe('LoginComponent', () => { expect(element.querySelector('input[type="password"]').value).toEqual('fake-change-password'); }); - it('should return success true after the login have succeeded', () => { + it('should return success event after the login have succeeded', (done) => { component.providers = 'ECM'; - expect(component.error).toBe(false); - expect(component.success).toBe(false); + expect(component.isError).toBe(false); - usernameInput.value = 'fake-username'; - passwordInput.value = 'fake-password'; + component.success.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(false); + done(); + }); - fixture.detectChanges(); + loginWithCredentials('fake-username', 'fake-password'); - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(false); - expect(component.success).toBe(true); }); - it('should return error with a wrong username', () => { + it('should return error with a wrong username', (done) => { component.providers = 'ECM'; - expect(component.error).toBe(false); - expect(component.success).toBe(false); - usernameInput.value = 'fake-wrong-username'; - passwordInput.value = 'fake-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + loginWithCredentials('fake-wrong-username', 'fake-password'); }); - it('should return error with a wrong password', () => { + it('should return error with a wrong password', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-username'; - passwordInput.value = 'fake-wrong-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + loginWithCredentials('fake-username', 'fake-wrong-password'); }); - it('should return error with a wrong username and password', () => { + it('should return error with a wrong username and password', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-wrong-username'; - passwordInput.value = 'fake-wrong-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + loginWithCredentials('fake-wrong-username', 'fake-wrong-password'); }); - it('should return CORS error when server CORS error occurs', () => { + it('should return CORS error when server CORS error occurs', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-username-CORS-error'; - passwordInput.value = 'fake-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'); + loginWithCredentials('fake-username-CORS-error', 'fake-password'); }); - it('should return CSRF error when server CSRF error occurs', () => { + it('should return CSRF error when server CSRF error occurs', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-username-CSRF-error'; - passwordInput.value = 'fake-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CSRF'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CSRF'); + loginWithCredentials('fake-username-CSRF-error', 'fake-password'); }); - it('should return ECOM read-oly error when error occurs', () => { + it('should return ECOM read-oly error when error occurs', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-username-ECM-access-error'; - passwordInput.value = 'fake-password'; + component.error.subscribe(() => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ECM-LICENSE'); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ECM-LICENSE'); + loginWithCredentials('fake-username-ECM-access-error', 'fake-password'); }); - it('should emit onSuccess event after the login has succeeded', () => { - spyOn(component.onSuccess, 'emit'); + it('should emit success event after the login has succeeded', (done) => { component.providers = 'ECM'; - expect(component.error).toBe(false); - expect(component.success).toBe(false); + component.success.subscribe((event) => { + fixture.detectChanges(); - usernameInput.value = 'fake-username'; - passwordInput.value = 'fake-password'; + expect(component.isError).toBe(false); + expect(event).toEqual( + new LoginSuccessEvent({type: 'type', ticket: 'ticket'}, 'fake-username', 'fake-password') + ); + done(); + }); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); - - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(false); - expect(component.success).toBe(true); - expect(component.onSuccess.emit).toHaveBeenCalledWith( - new LoginSuccessEvent({ type: 'type', ticket: 'ticket' }, 'fake-username', 'fake-password') - ); + loginWithCredentials('fake-username', 'fake-password'); }); - it('should emit onError event after the login has failed', () => { - spyOn(component.onError, 'emit'); - + it('should emit error event after the login has failed', (done) => { component.providers = 'ECM'; - expect(component.success).toBe(false); - expect(component.error).toBe(false); - usernameInput.value = 'fake-username'; - passwordInput.value = 'fake-wrong-password'; + component.error.subscribe((error) => { + fixture.detectChanges(); - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); + expect(error).toEqual( + new LoginErrorEvent('Fake server error') + ); + done(); + }); - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); - expect(component.onError.emit).toHaveBeenCalledWith( - new LoginErrorEvent('Fake server error') - ); + loginWithCredentials('fake-username', 'fake-wrong-password'); }); it('should render the password in clear when the toggleShowPassword is call', () => { @@ -578,28 +521,17 @@ describe('LoginComponent', () => { expect(element.querySelector('#password').type).toEqual('password'); }); - it('should emit onError event when the providers is undefined', () => { - spyOn(component.onError, 'emit'); + it('should emit error event when the providers is undefined', (done) => { + component.error.subscribe((error) => { + fixture.detectChanges(); - expect(component.success).toBe(false); - expect(component.error).toBe(false); + expect(component.isError).toBe(true); + expect(getLoginErrorElement()).toBeDefined(); + expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS'); + expect(error).toEqual(new LoginErrorEvent('LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS')); + done(); + }); - usernameInput.value = 'fake-username'; - passwordInput.value = 'fake-password'; - - usernameInput.dispatchEvent(new Event('input')); - passwordInput.dispatchEvent(new Event('input')); - - fixture.detectChanges(); - - element.querySelector('button').click(); - - fixture.detectChanges(); - - expect(component.error).toBe(true); - expect(component.success).toBe(false); - expect(getLoginErrorElement()).toBeDefined(); - expect(getLoginErrorMessage()).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS'); - expect(component.onError.emit).toHaveBeenCalledWith(new LoginErrorEvent('LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS')); + loginWithCredentials('fake-username', 'fake-password', null); }); }); diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.ts index 57b94688c9..fd3597fa65 100644 --- a/ng2-components/ng2-alfresco-login/src/components/login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/login.component.ts @@ -77,18 +77,17 @@ export class LoginComponent implements OnInit { successRoute: string = null; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Output() executeSubmit = new EventEmitter(); form: FormGroup; - error: boolean = false; + isError: boolean = false; errorMsg: string; - success: boolean = false; actualLoginStep: any = LoginSteps.Landing; LoginSteps: any = LoginSteps; rememberMe: boolean = true; @@ -157,7 +156,6 @@ export class LoginComponent implements OnInit { * @param data */ onValueChanged(data: any) { - this.success = false; this.disableError(); for (let field in this.formError) { if (field) { @@ -185,8 +183,7 @@ export class LoginComponent implements OnInit { .subscribe( (token: any) => { this.actualLoginStep = LoginSteps.Welcome; - this.success = true; - this.onSuccess.emit(new LoginSuccessEvent(token, values.username, values.password)); + this.success.emit(new LoginSuccessEvent(token, values.username, values.password)); if (this.successRoute) { this.router.navigate([this.successRoute]); } @@ -195,7 +192,7 @@ export class LoginComponent implements OnInit { this.actualLoginStep = LoginSteps.Landing; this.displayErrorMessage(err); this.enableError(); - this.onError.emit(new LoginErrorEvent(err)); + this.error.emit(new LoginErrorEvent(err)); }, () => this.logService.info('Login done') ); @@ -233,7 +230,7 @@ export class LoginComponent implements OnInit { this.enableError(); let messageProviders: any; messageProviders = this.translateService.get(this.errorMsg); - this.onError.emit(new LoginErrorEvent(messageProviders.value)); + this.error.emit(new LoginErrorEvent(messageProviders.value)); return false; } return true; @@ -337,7 +334,7 @@ export class LoginComponent implements OnInit { * Disable the error flag */ private disableError() { - this.error = false; + this.isError = false; this.initFormError(); } @@ -345,7 +342,7 @@ export class LoginComponent implements OnInit { * Enable the error flag */ private enableError() { - this.error = true; + this.isError = true; } private hasCustomFiledsValidation(): boolean { diff --git a/ng2-components/ng2-alfresco-login/tslint.json b/ng2-components/ng2-alfresco-login/tslint.json index 3e47a8ba4e..4279380153 100644 --- a/ng2-components/ng2-alfresco-login/tslint.json +++ b/ng2-components/ng2-alfresco-login/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true + "adf-class-name": true, + "adf-prefix-name": true } } diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 541c3b8cad..e453b1d6ab 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -69,7 +69,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts index 5364e296af..e178b6482a 100644 --- a/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts @@ -186,7 +186,6 @@ describe('SearchComponent', () => { }); it('should display search results when a search term is provided', (done) => { - let searchService = TestBed.get(SearchService); spyOn(searchService, 'getQueryNodesPromise').and.returnValue(Promise.resolve(result)); component.searchTerm = ''; diff --git a/ng2-components/ng2-alfresco-search/tslint.json b/ng2-components/ng2-alfresco-search/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-search/tslint.json +++ b/ng2-components/ng2-alfresco-search/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-social/package.json b/ng2-components/ng2-alfresco-social/package.json index ced70f8fbc..d4e7ec0c85 100644 --- a/ng2-components/ng2-alfresco-social/package.json +++ b/ng2-components/ng2-alfresco-social/package.json @@ -47,7 +47,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-social/tslint.json b/ng2-components/ng2-alfresco-social/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-social/tslint.json +++ b/ng2-components/ng2-alfresco-social/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index d7762935bf..0077627e78 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -47,7 +47,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-tag/tslint.json b/ng2-components/ng2-alfresco-tag/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-tag/tslint.json +++ b/ng2-components/ng2-alfresco-tag/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 1b61795924..972e2a2618 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -69,7 +69,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index 52abeb7701..8956f5bc1a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -173,7 +173,7 @@ describe('UploadButtonComponent', () => { it('should call uploadFile with the default root folder', () => { component.rootFolderId = '-root-'; component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; - component.onSuccess = null; + component.success = null; spyOn(component, 'getFolderNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission)); @@ -189,7 +189,7 @@ describe('UploadButtonComponent', () => { it('should call uploadFile with a custom root folder', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.rootFolderId = '-my-'; - component.onSuccess = null; + component.success = null; spyOn(component, 'getFolderNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission)); component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) }); @@ -212,13 +212,13 @@ describe('UploadButtonComponent', () => { component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) }); fixture.detectChanges(); - component.onSuccess.subscribe(e => { + component.success.subscribe(e => { expect(e.value).toEqual('File uploaded'); done(); }); spyOn(component, 'uploadFiles').and.callFake(() => { - component.onSuccess.emit({ + component.success.emit({ value: 'File uploaded' }); }); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 18e1baaa12..ed2903a117 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -79,10 +79,10 @@ export class UploadButtonComponent implements OnInit, OnChanges, NodePermissionS rootFolderId: string = '-root-'; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); @Output() - onError = new EventEmitter(); + error = new EventEmitter(); @Output() createFolder = new EventEmitter(); @@ -162,7 +162,7 @@ export class UploadButtonComponent implements OnInit, OnChanges, NodePermissionS if (latestFilesAdded.length > 0) { this.uploadService.addToQueue(...latestFilesAdded); - this.uploadService.uploadFilesInTheQueue(this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.success); if (this.showNotificationBar) { this.showUndoNotificationBar(latestFilesAdded); } @@ -222,7 +222,7 @@ export class UploadButtonComponent implements OnInit, OnChanges, NodePermissionS if (this.rootFolderId) { this.getFolderNode(this.rootFolderId).subscribe( res => this.permissionValue.next(this.hasCreatePermission(res)), - error => this.onError.emit(error) + error => this.error.emit(error) ); } } diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html index d027a83076..7bb719f070 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html @@ -1,7 +1,7 @@
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 11fa65503b..27fb13690e 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -190,7 +190,7 @@ describe('UploadDragAreaComponent', () => { it('should upload the list of files dropped', (done) => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; - component.onSuccess = null; + component.success = null; component.showNotificationBar = false; uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); @@ -208,7 +208,7 @@ describe('UploadDragAreaComponent', () => { it('should show the loading messages in the notification bar when the files are dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; - component.onSuccess = null; + component.success = null; component.showNotificationBar = true; uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); component.showUndoNotificationBar = jasmine.createSpy('_showUndoNotificationBar'); @@ -224,7 +224,7 @@ describe('UploadDragAreaComponent', () => { it('should upload a file when dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/document-library-fake'; - component.onSuccess = null; + component.success = null; fixture.detectChanges(); spyOn(uploadService, 'uploadFilesInTheQueue'); @@ -247,7 +247,7 @@ describe('UploadDragAreaComponent', () => { it('should upload a file with a custom root folder ID when dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/document-library-fake'; component.rootFolderId = '-my-'; - component.onSuccess = null; + component.success = null; fixture.detectChanges(); spyOn(uploadService, 'uploadFilesInTheQueue'); @@ -285,7 +285,7 @@ describe('UploadDragAreaComponent', () => { fixture.detectChanges(); spyOn(uploadService, 'uploadFilesInTheQueue').and.returnValue(Promise.resolve(fakeItem)); - component.onSuccess.subscribe((val) => { + component.success.subscribe((val) => { expect(val).not.toBeNull(); }); @@ -302,7 +302,7 @@ describe('UploadDragAreaComponent', () => { it('should show notification bar when a file is dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/document-library-fake'; component.rootFolderId = '-my-'; - component.onSuccess = null; + component.success = null; fixture.detectChanges(); spyOn(uploadService, 'uploadFilesInTheQueue'); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index d8b9a58fa8..3fd3f8b211 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -73,7 +73,7 @@ export class UploadDragAreaComponent implements NodePermissionSubject { parentId: string; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); constructor(private uploadService: UploadService, private translateService: AlfrescoTranslationService, @@ -93,7 +93,7 @@ export class UploadDragAreaComponent implements NodePermissionSubject { parentId: this.parentId || this.rootFolderId })); this.uploadService.addToQueue(...fileModels); - this.uploadService.uploadFilesInTheQueue(this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.success); let latestFilesAdded = this.uploadService.getQueue(); if (this.showNotificationBar) { this.showUndoNotificationBar(latestFilesAdded); @@ -115,7 +115,7 @@ export class UploadDragAreaComponent implements NodePermissionSubject { path: item.fullPath.replace(item.name, '') }); this.uploadService.addToQueue(fileModel); - this.uploadService.uploadFilesInTheQueue(this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.success); }); if (this.showNotificationBar) { this.showUndoNotificationBar(item); @@ -144,7 +144,7 @@ export class UploadDragAreaComponent implements NodePermissionSubject { let latestFilesAdded = this.uploadService.getQueue(); this.showUndoNotificationBar(latestFilesAdded); } - this.uploadService.uploadFilesInTheQueue(this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.success); }); } } @@ -213,7 +213,7 @@ export class UploadDragAreaComponent implements NodePermissionSubject { private uploadFiles(files: FileModel[]): void { if (files.length) { this.uploadService.addToQueue(...files); - this.uploadService.uploadFilesInTheQueue(this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.success); let latestFilesAdded = this.uploadService.getQueue(); if (this.showNotificationBar) { this.showUndoNotificationBar(latestFilesAdded); diff --git a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts index 4029cd3c31..194c5d129a 100644 --- a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts +++ b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts @@ -29,13 +29,13 @@ export class FileDraggableDirective implements OnInit, OnDestroy { enabled: boolean = true; @Output() - onFilesDropped: EventEmitter = new EventEmitter(); + filesDropped: EventEmitter = new EventEmitter(); @Output() - onFilesEntityDropped: EventEmitter = new EventEmitter(); + filesEntityDropped: EventEmitter = new EventEmitter(); @Output() - onFolderEntityDropped: EventEmitter = new EventEmitter(); + folderEntityDropped: EventEmitter = new EventEmitter(); private cssClassName: string = 'file-draggable__input-focus'; private element: HTMLElement; @@ -75,20 +75,20 @@ export class FileDraggableDirective implements OnInit, OnDestroy { let item = items[i].webkitGetAsEntry(); if (item) { if (item.isFile) { - this.onFilesEntityDropped.emit(item); + this.filesEntityDropped.emit(item); } else if (item.isDirectory) { - this.onFolderEntityDropped.emit(item); + this.folderEntityDropped.emit(item); } } } else { let files = FileUtils.toFileArray(event.dataTransfer.files); - this.onFilesDropped.emit(files); + this.filesDropped.emit(files); } } } else { // safari or FF let files = FileUtils.toFileArray(event.dataTransfer.files); - this.onFilesDropped.emit(files); + this.filesDropped.emit(files); } this.element.classList.remove(this.cssClassName); diff --git a/ng2-components/ng2-alfresco-upload/tslint.json b/ng2-components/ng2-alfresco-upload/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-upload/tslint.json +++ b/ng2-components/ng2-alfresco-upload/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index 2cb929d9de..d22ea8203e 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -47,7 +47,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-userinfo/tslint.json b/ng2-components/ng2-alfresco-userinfo/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-userinfo/tslint.json +++ b/ng2-components/ng2-alfresco-userinfo/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index a5144b5d35..936e346177 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -63,7 +63,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-viewer/tslint.json b/ng2-components/ng2-alfresco-viewer/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-viewer/tslint.json +++ b/ng2-components/ng2-alfresco-viewer/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index dc26ea6ea6..4f52e5de5b 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -48,7 +48,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts index 27a5493cc1..3cbe45e4c0 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts @@ -25,7 +25,7 @@ import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; * [contextRoot]="string" * [servicePath]="string" * [contentType]="JSON|HTML|DATATABLE" - * (onSuccess)="customMethod($event)> + * (success)="customMethod($event)> * * * This component, provide a get webscript viewer @@ -36,7 +36,7 @@ import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; * @InputParam {string} servicePath path where Web Script service is mapped default value 'service' * @InputParam {string} contentType JSON | HTML | DATATABLE | TEXT * - * @Output - onSuccess - The event is emitted when the data are recived + * @Output - success - The event is emitted when the data are recived * * @returns {WebscriptComponent} . */ @@ -65,7 +65,7 @@ export class WebscriptComponent implements OnChanges { contentType: string = 'TEXT'; @Output() - onSuccess = new EventEmitter(); + success = new EventEmitter(); data: any = undefined; showError: boolean = false; @@ -90,7 +90,7 @@ export class WebscriptComponent implements OnChanges { } } - this.onSuccess.emit(this.data); + this.success.emit(this.data); resolve(); }, (error) => { diff --git a/ng2-components/ng2-alfresco-webscript/tslint.json b/ng2-components/ng2-alfresco-webscript/tslint.json index 3e47a8ba4e..ee899d32c5 100644 --- a/ng2-components/ng2-alfresco-webscript/tslint.json +++ b/ng2-components/ng2-alfresco-webscript/tslint.json @@ -152,6 +152,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true - } + "adf-class-name": true, + "adf-prefix-name": true + } } diff --git a/ng2-components/package.json b/ng2-components/package.json index b9440a24f6..ed6230c03f 100644 --- a/ng2-components/package.json +++ b/ng2-components/package.json @@ -100,7 +100,7 @@ "@types/hammerjs": "2.0.35", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", - "adf-tslint-rules": "0.0.3", + "adf-tslint-rules": "0.0.4", "angular2-template-loader": "0.6.2", "autoprefixer": "6.5.4", "codelyzer": "3.1.2", diff --git a/ng2-components/tslint.json b/ng2-components/tslint.json index 4dfa36054b..119b4e8818 100644 --- a/ng2-components/tslint.json +++ b/ng2-components/tslint.json @@ -153,6 +153,7 @@ "templates-use-public": true, "invoke-injectable": true, "adf-file-name": true, - "adf-class-name": true + "adf-class-name": true, + "adf-prefix-name": true } }