Single naming convention for core services (#1363)

* remove temporary file from repo * fix: alfresco-api.service * new: auth.service.ts - new auth.service.ts implementation - deprecation warning for AlfrescoAuthenticationService - fix ‘clean-build’ typo - extra vscode settings for ‘.d.ts’ files * use AuthService internally * new: content.service.ts - deprecation warning for AlfrescoContentService - use new ContentService internally * new: settings.service.ts - new SettingsService - deprecation warning for AlfrescoSettingsService - using new SettingsService internally * new: translate.service and translate-loader.service - custom TranslateLoader becomes AlfrescoTranslateLoader - custom TranslateService becomes AlfrescoTranslateService - deprecation notices for old service and loader implementations * fix: document list * fix: search * fix: tag also fixes #1364 * fix: activiti form * fix: activiti tasklist, improve unit tests * fix: activiti processlist, unit tests improvements * fix: diagram component * fix: analytics component * fix: upload component - fix numerous issues with unit tests (hidden by ‘any’ type) - test improvements * fix: webscript * fix: userinfo unit tests * code fixes * fix 'beforeAll' issue * tasklist unit testing improvements * fix: form unit tests * fix: unit tests
2025-07-31 17:38:48 +00:00 · 2017-01-03 10:46:27 +00:00
parent 92fc7d1df3
commit facafbd55c
122 changed files with 1376 additions and 1392 deletions
--- a/ng2-components/ng2-activiti-analytics/karma-test-shim.js
+++ b/ng2-components/ng2-activiti-analytics/karma-test-shim.js
@@ -1,7 +1,7 @@
 // Tun on full stack traces in errors to help debugging
 Error.stackTraceLimit = Infinity;

-jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
+// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;

 __karma__.loaded = function() {};

--- 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
@@ -15,17 +15,18 @@
 * limitations under the License.
 */

+import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { CoreModule } from 'ng2-alfresco-core';
+import { Observable } from 'rxjs/Rx';
+import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { DiagramsModule } from 'ng2-activiti-diagrams';
 import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component';
 import { WIDGET_DIRECTIVES } from '../components/widgets/index';
 import { AnalyticsService } from '../services/analytics.service';
-import { DebugElement }    from '@angular/core';

 declare let jasmine: any;

-describe('Test ng2-activiti-analytics-report-heat-map', () => {
+describe('AnalyticsReportHeatMapComponent', () => {

    let componentHandler: any;
    let component: any;
@@ -44,8 +45,8 @@ describe('Test ng2-activiti-analytics-report-heat-map', () => {
    beforeEach(async(() => {
        TestBed.configureTestingModule({
            imports: [
-                CoreModule,
-                DiagramsModule
+                CoreModule.forRoot(),
+                DiagramsModule.forRoot()
            ],
            declarations: [
                AnalyticsReportHeatMapComponent,
@@ -55,6 +56,11 @@ describe('Test ng2-activiti-analytics-report-heat-map', () => {
                AnalyticsService
            ]
        }).compileComponents();
+
+        let translateService = TestBed.get(AlfrescoTranslateService);
+        spyOn(translateService, 'addTranslationFolder').and.stub();
+        spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
+
    }));

    beforeEach(() => {
--- 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
@@ -16,7 +16,7 @@
 */

 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { AlfrescoTranslationService } from 'ng2-alfresco-core';
+import { AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { FormGroup, FormBuilder, FormControl } from '@angular/forms';

@@ -43,11 +43,11 @@ export class AnalyticsReportHeatMapComponent implements  OnInit {
    currentMetricColors: string;
    metricType: string;

-    constructor(private translate: AlfrescoTranslationService,
+    constructor(private translateService: AlfrescoTranslateService,
                private analyticsService: AnalyticsService,
                private formBuilder: FormBuilder) {
-        if (translate) {
-            translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
+        if (translateService) {
+            translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
        }
    }

--- 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
@@ -15,15 +15,16 @@
 * limitations under the License.
 */

+import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { CoreModule } from 'ng2-alfresco-core';
+import { Observable } from 'rxjs/Rx';
+import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
 import { AnalyticsService } from '../services/analytics.service';
-import { DebugElement }    from '@angular/core';

 declare let jasmine: any;

-describe('Test ng2-activiti-analytics Report list', () => {
+describe('AnalyticsReportListComponent', () => {

    let reportList = [
        {'id': 2002, 'name': 'Fake Test Process definition heat map'},
@@ -35,7 +36,7 @@ describe('Test ng2-activiti-analytics Report list', () => {

    let reportSelected = {'id': 2003, 'name': 'Fake Test Process definition overview'};

-    let component: any;
+    let component: AnalyticsReportListComponent;
    let fixture: ComponentFixture<AnalyticsReportListComponent>;
    let debug: DebugElement;
    let element: HTMLElement;
@@ -43,7 +44,7 @@ describe('Test ng2-activiti-analytics Report list', () => {
    beforeEach(async(() => {
        TestBed.configureTestingModule({
            imports: [
-                CoreModule
+                CoreModule.forRoot()
            ],
            declarations: [
                AnalyticsReportListComponent
@@ -52,6 +53,10 @@ describe('Test ng2-activiti-analytics Report list', () => {
                AnalyticsService
            ]
        }).compileComponents();
+
+        let translateService = TestBed.get(AlfrescoTranslateService);
+        spyOn(translateService, 'addTranslationFolder').and.stub();
+        spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
    }));

    beforeEach(() => {
--- 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
@@ -16,11 +16,9 @@
 */

 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { Observer, Observable } from 'rxjs/Rx';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportParametersModel } from '../models/report.model';
-import { Observer } from 'rxjs/Observer';
-import { Observable } from 'rxjs/Observable';

@Component({
    moduleId: module.id,
@@ -46,8 +44,7 @@ export class AnalyticsReportListComponent implements  OnInit {

    reports: ReportParametersModel[] = [];

-    constructor(private auth: AlfrescoAuthenticationService,
-                private analyticsService: AnalyticsService) {
+    constructor(private analyticsService: AnalyticsService) {

        this.report$ = new Observable<ReportParametersModel>(observer => this.reportObserver = observer).share();
    }
--- 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
@@ -16,25 +16,23 @@
 */

 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import {
-    CoreModule
-} from 'ng2-alfresco-core';
+import { DebugElement, SimpleChange } from '@angular/core';
+import { Observable } from 'rxjs/Rx';
+import * as moment from 'moment';
+import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';

 import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component';
 import { WIDGET_DIRECTIVES } from '../components/widgets/index';
-
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportParametersModel } from '../models/report.model';
-import * as moment from 'moment';
-import { DebugElement, SimpleChange } from '@angular/core';
 import * as analyticParamsMock from '../assets/analyticsParamsReportComponent.mock';

 declare let jasmine: any;
 declare let mdDateTimePicker: any;

-describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
+describe('AnalyticsReportParametersComponent', () => {

-    let component: any;
+    let component: AnalyticsReportParametersComponent;
    let fixture: ComponentFixture<AnalyticsReportParametersComponent>;
    let debug: DebugElement;
    let element: HTMLElement;
@@ -44,7 +42,7 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
    beforeEach(async(() => {
        TestBed.configureTestingModule({
            imports: [
-                CoreModule
+                CoreModule.forRoot()
            ],
            declarations: [
                AnalyticsReportParametersComponent,
@@ -54,6 +52,15 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
                AnalyticsService
            ]
        }).compileComponents();
+
+        let translateService = TestBed.get(AlfrescoTranslateService);
+        spyOn(translateService, 'addTranslationFolder').and.stub();
+        spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
+
+        componentHandler = jasmine.createSpyObj('componentHandler', [
+            'upgradeAllRegistered'
+        ]);
+        window['componentHandler'] = componentHandler;
    }));

    beforeEach(() => {
@@ -62,10 +69,6 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
        debug = fixture.debugElement;
        element = fixture.nativeElement;
        fixture.detectChanges();
-        componentHandler = jasmine.createSpyObj('componentHandler', [
-            'upgradeAllRegistered'
-        ]);
-        window['componentHandler'] = componentHandler;
    });

    describe('Rendering tests', () => {
@@ -323,9 +326,9 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
                responseText: analyticParamsMock.reportDefParamProcessDefOptionsApp
            });

-            let appId = 1;
+            let appId = '1';
            component.appId = appId;
-            component.reportId = 1;
+            component.reportId = '1';
            let change = new SimpleChange(null, appId);
            component.ngOnChanges({ 'appId': change });

@@ -341,7 +344,7 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => {
                expect(res[1].name).toEqual('Fake task name 2');
            });

-            component.reportId = 100;
+            component.reportId = '100';
            component.reportParameters = new ReportParametersModel(analyticParamsMock.reportDefParamTask);
            component.onProcessDefinitionChanges(analyticParamsMock.fieldProcessDef);

--- 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
@@ -16,7 +16,7 @@
 */

 import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core';
-import { AlfrescoTranslationService } from 'ng2-alfresco-core';
+import { AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model';
 import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
@@ -70,11 +70,11 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On
    private paramOpts;
    private isEditable: boolean = false;

-    constructor(private translate: AlfrescoTranslationService,
+    constructor(private translateService: AlfrescoTranslateService,
                private analyticsService: AnalyticsService,
                private formBuilder: FormBuilder ) {
-        if (translate) {
-            translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
+        if (translateService) {
+            translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
        }
    }

--- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts
@@ -16,9 +16,10 @@
 */

 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import {
-    CoreModule
-} from 'ng2-alfresco-core';
+import { DebugElement, SimpleChange } from '@angular/core';
+import { Observable } from 'rxjs/Rx';
+import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts';
+import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { DiagramsModule } from 'ng2-activiti-diagrams';

 import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
@@ -26,11 +27,9 @@ import { AnalyticsComponent } from '../components/analytics.component';
 import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component';
 import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component';
 import { WIDGET_DIRECTIVES } from '../components/widgets/index';
-import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts';
 import { Chart } from '../models/chart.model';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportQuery } from '../models/report.model';
-import { DebugElement, SimpleChange } from '@angular/core';
 import * as analyticMock from '../assets/analyticsComponent.mock';

 export const ANALYTICS_DIRECTIVES: any[] = [
@@ -47,7 +46,7 @@ export const ANALYTICS_PROVIDERS: any[] = [
 declare let jasmine: any;
 declare let mdDateTimePicker: any;

-describe('Test ng2-activiti-analytics Report ', () => {
+describe('AnalyticsComponent', () => {

    let component: any;
    let fixture: ComponentFixture<AnalyticsComponent>;
@@ -59,8 +58,8 @@ describe('Test ng2-activiti-analytics Report ', () => {
    beforeEach(async(() => {
        TestBed.configureTestingModule({
            imports: [
-                CoreModule,
-                DiagramsModule
+                CoreModule.forRoot(),
+                DiagramsModule.forRoot()
            ],
            declarations: [
                ...ANALYTICS_DIRECTIVES,
@@ -70,6 +69,10 @@ describe('Test ng2-activiti-analytics Report ', () => {
                ...ANALYTICS_PROVIDERS
            ]
        }).compileComponents();
+
+        let translateService = TestBed.get(AlfrescoTranslateService);
+        spyOn(translateService, 'addTranslationFolder').and.stub();
+        spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
    }));

    beforeEach(() => {
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts
@@ -16,7 +16,7 @@
 */

 import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslationService } from 'ng2-alfresco-core';
+import { AlfrescoTranslateService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportQuery } from '../models/report.model';
 import { Chart } from '../models/chart.model';
@@ -68,11 +68,11 @@ export class AnalyticsComponent implements OnChanges {
        }
    };

-    constructor(private translate: AlfrescoTranslationService,
+    constructor(private translateService: AlfrescoTranslateService,
                private analyticsService: AnalyticsService) {
        console.log('AnalyticsComponent');
-        if (translate) {
-            translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
+        if (translateService) {
+            translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src');
        }
    }

--- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts
+++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts
@@ -16,18 +16,16 @@
 */

 import { Injectable } from '@angular/core';
-import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 import { Response } from '@angular/http';
+import { AlfrescoApiService } from 'ng2-alfresco-core';
 import { ReportParametersModel, ParameterValueModel } from '../models/report.model';
 import { Chart, PieChart, TableChart, BarChart, HeatMapChart, MultiBarChart } from '../models/chart.model';

@Injectable()
 export class AnalyticsService {

-    constructor(private authService: AlfrescoAuthenticationService,
-                public apiService: AlfrescoApiService,
-                private alfrescoSettingsService: AlfrescoSettingsService) {
+    constructor(public apiService: AlfrescoApiService) {
    }

    /**