inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1383 from Alfresco/dev-mvitale-1370

Browse Source 
Remove use of deprecated Services
This commit is contained in:
Mario Romano
2017-01-04 19:42:41 +00:00
committed by GitHub
parent 83fa409aeb 896c57fa53
commit 9ba2033dd0
29 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
demo-shell-ng2/app/app.component.ts
View File

@@ -20,8 +20,8 @@ import { Router } from '@angular/router';
import { import {
AlfrescoTranslationService, AlfrescoTranslationService,
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
StorageService StorageService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -38,9 +38,9 @@ export class AppComponent {
ecmHost: string = 'http://' + window.location.hostname + ':8080'; ecmHost: string = 'http://' + window.location.hostname + ':8080';
bpmHost: string = 'http://' + window.location.hostname + ':9999'; bpmHost: string = 'http://' + window.location.hostname + ':9999';
constructor(public auth: AlfrescoAuthenticationService, constructor(public authService: AuthService,
public router: Router, public router: Router,
public alfrescoSettingsService: AlfrescoSettingsService, public settingsService: SettingsService,
private translate: AlfrescoTranslationService, private translate: AlfrescoTranslationService,
private storage: StorageService) { private storage: StorageService) {
this.setEcmHost(); this.setEcmHost();
@@ -60,11 +60,11 @@ export class AppComponent {
isLoggedIn(): boolean { isLoggedIn(): boolean {
this.redirectToLoginPageIfNotLoggedIn(); this.redirectToLoginPageIfNotLoggedIn();
return this.auth.isLoggedIn(); return this.authService.isLoggedIn();
} }
redirectToLoginPageIfNotLoggedIn(): void { redirectToLoginPageIfNotLoggedIn(): void {
if (!this.isLoginPage() && !this.auth.isLoggedIn()) { if (!this.isLoginPage() && !this.authService.isLoggedIn()) {
this.router.navigate(['/login']); this.router.navigate(['/login']);
} }
} }
@@ -75,7 +75,7 @@ export class AppComponent {
onLogout(event) { onLogout(event) {
event.preventDefault(); event.preventDefault();
this.auth.logout() this.authService.logout()
.subscribe( .subscribe(
() => { () => {
this.navigateToLogin(); this.navigateToLogin();
@@ -118,25 +118,25 @@ export class AppComponent {
private setEcmHost() { private setEcmHost() {
if (this.storage.hasItem(`ecmHost`)) { if (this.storage.hasItem(`ecmHost`)) {
this.alfrescoSettingsService.ecmHost = this.storage.getItem(`ecmHost`); this.settingsService.ecmHost = this.storage.getItem(`ecmHost`);
this.ecmHost = this.storage.getItem(`ecmHost`); this.ecmHost = this.storage.getItem(`ecmHost`);
} else { } else {
this.alfrescoSettingsService.ecmHost = this.ecmHost; this.settingsService.ecmHost = this.ecmHost;
} }
} }
private setBpmHost() { private setBpmHost() {
if (this.storage.hasItem(`bpmHost`)) { if (this.storage.hasItem(`bpmHost`)) {
this.alfrescoSettingsService.bpmHost = this.storage.getItem(`bpmHost`); this.settingsService.bpmHost = this.storage.getItem(`bpmHost`);
this.bpmHost = this.storage.getItem(`bpmHost`); this.bpmHost = this.storage.getItem(`bpmHost`);
} else { } else {
this.alfrescoSettingsService.bpmHost = this.bpmHost; this.settingsService.bpmHost = this.bpmHost;
} }
} }
private setProvider() { private setProvider() {
if (this.storage.hasItem(`providers`)) { if (this.storage.hasItem(`providers`)) {
this.alfrescoSettingsService.setProviders(this.storage.getItem(`providers`)); this.settingsService.setProviders(this.storage.getItem(`providers`));
} }
} }
} }

6
demo-shell-ng2/app/components/files/files.component.ts
View File

@@ -17,7 +17,7 @@
import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { Component, OnInit, Optional, ViewChild } from '@angular/core';
import { ActivatedRoute, Params, Router } from '@angular/router'; import { ActivatedRoute, Params, Router } from '@angular/router';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AuthService } from 'ng2-alfresco-core';
import { import {
DocumentActionsService, DocumentActionsService,
DocumentList, DocumentList,
@@ -49,7 +49,7 @@ export class FilesComponent implements OnInit {
documentList: DocumentList; documentList: DocumentList;
constructor(private documentActions: DocumentActionsService, constructor(private documentActions: DocumentActionsService,
public auth: AlfrescoAuthenticationService, public authService: AuthService,
private formService: FormService, private formService: FormService,
private router: Router, private router: Router,
@Optional() private route: ActivatedRoute) { @Optional() private route: ActivatedRoute) {
@@ -106,7 +106,7 @@ export class FilesComponent implements OnInit {
} }
}); });
} }
if (this.auth.isBpmLoggedIn()) { if (this.authService.isBpmLoggedIn()) {
this.formService.getProcessDefinitions().subscribe( this.formService.getProcessDefinitions().subscribe(
defs => this.setupBpmActions(defs || []), defs => this.setupBpmActions(defs || []),
err => console.log(err) err => console.log(err)

6
demo-shell-ng2/app/components/search/search-bar.component.ts
View File

@@ -17,7 +17,7 @@
import { Component, EventEmitter, Output } from '@angular/core'; import { Component, EventEmitter, Output } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AuthService } from 'ng2-alfresco-core';
import { MinimalNodeEntity } from 'alfresco-js-api'; import { MinimalNodeEntity } from 'alfresco-js-api';
@Component({ @Component({
@@ -34,11 +34,11 @@ export class SearchBarComponent {
expand = new EventEmitter(); expand = new EventEmitter();
constructor(public router: Router, constructor(public router: Router,
public auth: AlfrescoAuthenticationService) { public authService: AuthService) {
} }
isLoggedIn(): boolean { isLoggedIn(): boolean {
return this.auth.isLoggedIn(); return this.authService.isLoggedIn();
} }
/** /**

12
demo-shell-ng2/app/components/setting/setting.component.ts
View File

@@ -16,7 +16,7 @@
*/ */
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; import { SettingsService, StorageService } from 'ng2-alfresco-core';
@Component({ @Component({
selector: 'alfresco-setting-demo', selector: 'alfresco-setting-demo',
@@ -28,23 +28,23 @@ export class SettingComponent {
ecmHost: string; ecmHost: string;
bpmHost: string; bpmHost: string;
constructor(public alfrescoSettingsService: AlfrescoSettingsService, constructor(public settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
this.ecmHost = this.alfrescoSettingsService.ecmHost; this.ecmHost = this.settingsService.ecmHost;
this.bpmHost = this.alfrescoSettingsService.bpmHost; this.bpmHost = this.settingsService.bpmHost;
} }
public onChangeECMHost(event: KeyboardEvent): void { public onChangeECMHost(event: KeyboardEvent): void {
console.log((<HTMLInputElement>event.target).value); console.log((<HTMLInputElement>event.target).value);
this.ecmHost = (<HTMLInputElement>event.target).value; this.ecmHost = (<HTMLInputElement>event.target).value;
this.alfrescoSettingsService.ecmHost = this.ecmHost; this.settingsService.ecmHost = this.ecmHost;
this.storage.setItem(`ecmHost`, this.ecmHost); this.storage.setItem(`ecmHost`, this.ecmHost);
} }
public onChangeBPMHost(event: KeyboardEvent): void { public onChangeBPMHost(event: KeyboardEvent): void {
console.log((<HTMLInputElement>event.target).value); console.log((<HTMLInputElement>event.target).value);
this.bpmHost = (<HTMLInputElement>event.target).value; this.bpmHost = (<HTMLInputElement>event.target).value;
this.alfrescoSettingsService.bpmHost = this.bpmHost; this.settingsService.bpmHost = this.bpmHost;
this.storage.setItem(`bpmHost`, this.bpmHost); this.storage.setItem(`bpmHost`, this.bpmHost);
} }

6
ng2-components/ng2-activiti-analytics/demo/src/main.ts
View File

@@ -18,7 +18,7 @@
import { NgModule, Component, OnInit } from '@angular/core'; import { NgModule, Component, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { AnalyticsModule } from 'ng2-activiti-analytics'; import { AnalyticsModule } from 'ng2-activiti-analytics';
@Component({ @Component({
@@ -60,8 +60,8 @@ export class AnalyticsDemoComponent implements OnInit {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.bpmHost = this.host; settingsService.bpmHost = this.host;
settingsService.setProviders('BPM'); settingsService.setProviders('BPM');

6
ng2-components/ng2-activiti-diagrams/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { DiagramsModule } from 'ng2-activiti-diagrams'; import { DiagramsModule } from 'ng2-activiti-diagrams';
@Component({ @Component({
@@ -50,8 +50,8 @@ export class DiagramDemoComponent {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.bpmHost = this.host; settingsService.bpmHost = this.host;
settingsService.setProviders('BPM'); settingsService.setProviders('BPM');

4
ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts
View File

@@ -25,11 +25,11 @@ export class DiagramsService {
constructor(private authService: AuthService, constructor(private authService: AuthService,
private http: Http, private http: Http,
private alfrescoSettingsService: SettingsService) { private settingsService: SettingsService) {
} }
getProcessDefinitionModel(processDefinitionId: string): Observable<any> { getProcessDefinitionModel(processDefinitionId: string): Observable<any> {
let url = `${this.alfrescoSettingsService.getBPMApiBaseUrl()}/app/rest/process-definitions/${processDefinitionId}/model-json`; let url = `${this.settingsService.getBPMApiBaseUrl()}/app/rest/process-definitions/${processDefinitionId}/model-json`;
let options = this.getRequestOptions(); let options = this.getRequestOptions();
return this.http return this.http
.get(url, options) .get(url, options)

6
ng2-components/ng2-activiti-form/demo/src/main.ts
View File

@@ -18,7 +18,7 @@
import { NgModule, Component, OnInit } from '@angular/core'; import { NgModule, Component, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiFormModule } from 'ng2-activiti-form';
@Component({ @Component({
@@ -49,8 +49,8 @@ export class FormDemoComponent implements OnInit {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.bpmHost = this.host; settingsService.bpmHost = this.host;
settingsService.setProviders('BPM'); settingsService.setProviders('BPM');

6
ng2-components/ng2-activiti-processlist/demo/src/main.ts
View File

@@ -28,7 +28,7 @@ import {
ActivitiStartProcessInstance, ActivitiStartProcessInstance,
ProcessInstance ProcessInstance
} from 'ng2-activiti-processlist'; } from 'ng2-activiti-processlist';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
const currentProcessIdNew = '__NEW__'; const currentProcessIdNew = '__NEW__';
@@ -160,8 +160,8 @@ class MyDemoApp implements OnInit {
dataProcesses: ObjectDataTableAdapter; dataProcesses: ObjectDataTableAdapter;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.bpmHost = this.host; settingsService.bpmHost = this.host;
settingsService.setProviders('BPM'); settingsService.setProviders('BPM');

8
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts
View File

@@ -21,8 +21,8 @@ import { By } from '@angular/platform-browser';
import { import {
AlfrescoTranslationService, AlfrescoTranslationService,
CoreModule, CoreModule,
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService } from 'ng2-alfresco-core'; AlfrescoApiService } from 'ng2-alfresco-core';
import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
@@ -48,8 +48,8 @@ describe('ActivitiProcessInstanceHeader', () => {
ActivitiProcessComments ActivitiProcessComments
], ],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService, AlfrescoApiService,
ActivitiProcessService, ActivitiProcessService,
{provide: AlfrescoTranslationService, useClass: TranslationMock} {provide: AlfrescoTranslationService, useClass: TranslationMock}

6
ng2-components/ng2-activiti-tasklist/demo/src/main.ts
View File

@@ -26,7 +26,7 @@ import {
ActivitiTaskList ActivitiTaskList
} from 'ng2-activiti-tasklist'; } from 'ng2-activiti-tasklist';
import { CoreModule } from 'ng2-alfresco-core'; import { CoreModule } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
@Component({ @Component({
@@ -144,8 +144,8 @@ class MyDemoApp implements OnInit {
dataTasks: ObjectDataTableAdapter; dataTasks: ObjectDataTableAdapter;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.bpmHost = this.host; settingsService.bpmHost = this.host;
settingsService.setProviders('BPM'); settingsService.setProviders('BPM');

2
ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts
View File

@@ -17,7 +17,7 @@
import { SettingsService } from './settings.service'; import { SettingsService } from './settings.service';
describe('AlfrescoSettingsService', () => { describe('SettingsService', () => {
let service: SettingsService; let service: SettingsService;

4
ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist'; import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist';
import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslationService } from 'ng2-alfresco-core';
@Component({ @Component({
selector: 'alfresco-app-demo', selector: 'alfresco-app-demo',
@@ -129,7 +129,7 @@ class DocumentListDemo implements OnInit {
constructor(private authService: AuthService, constructor(private authService: AuthService,
private settingsService: SettingsService, private settingsService: SettingsService,
private translateService: AlfrescoTranslateService, private translateService: AlfrescoTranslationService,
private documentActions: DocumentActionsService, private documentActions: DocumentActionsService,
private storage: StorageService) { private storage: StorageService) {

8
ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts
View File

@@ -20,8 +20,8 @@ import { NodePaging } from './../models/document-library.model';
import { PageNode } from './document-library.model.mock'; import { PageNode } from './document-library.model.mock';
import { DocumentListService } from './../services/document-list.service'; import { DocumentListService } from './../services/document-list.service';
import { import {
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoContentService, AlfrescoContentService,
AlfrescoApiService AlfrescoApiService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -33,8 +33,8 @@ export class DocumentListServiceMock extends DocumentListService {
getFolderRejectError: string = 'Error'; getFolderRejectError: string = 'Error';
constructor( constructor(
settings?: AlfrescoSettingsService, settings?: SettingsService,
authService?: AlfrescoAuthenticationService, authService?: AuthService,
contentService?: AlfrescoContentService, contentService?: AlfrescoContentService,
apiService?: AlfrescoApiService apiService?: AlfrescoApiService
) { ) {

6
ng2-components/ng2-alfresco-login/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { LoginModule } from 'ng2-alfresco-login'; import { LoginModule } from 'ng2-alfresco-login';
@Component({ @Component({
@@ -73,8 +73,8 @@ export class AppComponent {
public disableCsrf: boolean = false; public disableCsrf: boolean = false;
constructor(public auth: AlfrescoAuthenticationService, constructor(public authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;

10
ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
View File

@@ -18,8 +18,8 @@
import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -43,10 +43,10 @@ describe('AlfrescoLogin', () => {
], ],
declarations: [AlfrescoLoginComponent], declarations: [AlfrescoLoginComponent],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService, AlfrescoApiService,
{provide: AlfrescoAuthenticationService, useClass: AuthenticationMock}, {provide: AuthService, useClass: AuthenticationMock},
{provide: AlfrescoTranslationService, useClass: TranslationMock} {provide: AlfrescoTranslationService, useClass: TranslationMock}
] ]
}).compileComponents(); }).compileComponents();

8
ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
View File

@@ -19,8 +19,8 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { import {
AlfrescoTranslationService, AlfrescoTranslationService,
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService SettingsService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
import { FormSubmitEvent } from '../models/form-submit-event.model'; import { FormSubmitEvent } from '../models/form-submit-event.model';
@@ -79,8 +79,8 @@ export class AlfrescoLoginComponent implements OnInit {
* @param translate * @param translate
*/ */
constructor(private _fb: FormBuilder, constructor(private _fb: FormBuilder,
public authService: AlfrescoAuthenticationService, public authService: AuthService,
public settingsService: AlfrescoSettingsService, public settingsService: SettingsService,
private translate: AlfrescoTranslationService) { private translate: AlfrescoTranslationService) {
translate.addTranslationFolder('ng2-alfresco-login', 'node_modules/ng2-alfresco-login/src'); translate.addTranslationFolder('ng2-alfresco-login', 'node_modules/ng2-alfresco-login/src');

8
ng2-components/ng2-alfresco-search/demo/src/main.ts
View File

@@ -23,8 +23,8 @@ import { CoreModule } from 'ng2-alfresco-core';
import { SearchModule } from 'ng2-alfresco-search'; import { SearchModule } from 'ng2-alfresco-search';
import { import {
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoTranslationService AlfrescoTranslationService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -57,8 +57,8 @@ class SearchDemo implements OnInit {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
translation: AlfrescoTranslationService) { translation: AlfrescoTranslationService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;

6
ng2-components/ng2-alfresco-tag/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component, Input, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { TagModule } from 'ng2-alfresco-tag'; import { TagModule } from 'ng2-alfresco-tag';
@Component({ @Component({
@@ -59,8 +59,8 @@ class TagDemo implements OnInit {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;

8
ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
View File

@@ -17,8 +17,8 @@
import { ReflectiveInjector } from '@angular/core'; import { ReflectiveInjector } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
StorageService StorageService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -32,9 +32,9 @@ describe('Tag service', () => {
beforeEach(() => { beforeEach(() => {
injector = ReflectiveInjector.resolveAndCreate([ injector = ReflectiveInjector.resolveAndCreate([
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
AlfrescoAuthenticationService, AuthService,
TagService, TagService,
StorageService StorageService
]); ]);

6
ng2-components/ng2-alfresco-upload/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { UploadModule } from 'ng2-alfresco-upload'; import { UploadModule } from 'ng2-alfresco-upload';
@Component({ @Component({
@@ -113,8 +113,8 @@ export class MyDemoApp implements OnInit {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;
settingsService.setProviders('ECM'); settingsService.setProviders('ECM');

6
ng2-components/ng2-alfresco-userinfo/demo/src/main.ts
View File

@@ -21,7 +21,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo';
import { CoreModule } from 'ng2-alfresco-core'; import { CoreModule } from 'ng2-alfresco-core';
import { LoginModule } from 'ng2-alfresco-login'; import { LoginModule } from 'ng2-alfresco-login';
import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; import { AuthService, SettingsService } from 'ng2-alfresco-core';
@Component({ @Component({
selector: 'alfresco-app-demo', selector: 'alfresco-app-demo',
@@ -92,8 +92,8 @@ class UserInfoDemo implements OnInit {
public disableCsrf: boolean = false; public disableCsrf: boolean = false;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService) { private settingsService: SettingsService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;
settingsService.bpmHost = this.bpmHost; settingsService.bpmHost = this.bpmHost;
} }

6
ng2-components/ng2-alfresco-viewer/demo/src/main.ts
View File

@@ -18,7 +18,7 @@
import { NgModule, Component } from '@angular/core'; import { NgModule, Component } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { ViewerModule } from 'ng2-alfresco-viewer'; import { ViewerModule } from 'ng2-alfresco-viewer';
@Component({ @Component({
@@ -54,8 +54,8 @@ class MyDemoApp {
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;
settingsService.setProviders('ECM'); settingsService.setProviders('ECM');

8
ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts
View File

@@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { ImgViewerComponent } from './imgViewer.component'; import { ImgViewerComponent } from './imgViewer.component';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Img viewer component ', () => {
], ],
declarations: [ImgViewerComponent], declarations: [ImgViewerComponent],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService AlfrescoApiService
] ]
}).compileComponents(); }).compileComponents();

8
ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts
View File

@@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { MediaPlayerComponent } from './mediaPlayer.component'; import { MediaPlayerComponent } from './mediaPlayer.component';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Media player component ', () => {
], ],
declarations: [MediaPlayerComponent], declarations: [MediaPlayerComponent],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService AlfrescoApiService
] ]
}).compileComponents(); }).compileComponents();

8
ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts
View File

@@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { NotSupportedFormat } from './notSupportedFormat.component'; import { NotSupportedFormat } from './notSupportedFormat.component';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Not Supported Format View component', () => {
], ],
declarations: [NotSupportedFormat], declarations: [NotSupportedFormat],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService AlfrescoApiService
] ]
}).compileComponents(); }).compileComponents();

8
ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts
View File

@@ -21,8 +21,8 @@ import { PdfViewerComponent } from './pdfViewer.component';
import { EventMock } from '../assets/event.mock'; import { EventMock } from '../assets/event.mock';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -41,8 +41,8 @@ describe('Test ng2-alfresco-viewer PdfViewer component', () => {
], ],
declarations: [PdfViewerComponent], declarations: [PdfViewerComponent],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService, AlfrescoApiService,
RenderingQueueServices RenderingQueueServices
] ]

8
ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts
View File

@@ -25,8 +25,8 @@ import { ViewerComponent } from './viewer.component';
import { EventMock } from '../assets/event.mock'; import { EventMock } from '../assets/event.mock';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { import {
AlfrescoAuthenticationService, AuthService,
AlfrescoSettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
CoreModule CoreModule
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@@ -53,8 +53,8 @@ describe('Test ng2-alfresco-viewer ViewerComponent', () => {
ImgViewerComponent ImgViewerComponent
], ],
providers: [ providers: [
AlfrescoSettingsService, SettingsService,
AlfrescoAuthenticationService, AuthService,
AlfrescoApiService, AlfrescoApiService,
RenderingQueueServices RenderingQueueServices
] ]

6
ng2-components/ng2-alfresco-webscript/demo/src/main.ts
View File

@@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable'; import { DataTableModule } from 'ng2-alfresco-datatable';
import { WebScriptModule } from 'ng2-alfresco-webscript'; import { WebScriptModule } from 'ng2-alfresco-webscript';
@@ -62,8 +62,8 @@ class WebscriptDemo implements OnInit {
scriptArgs: string = ''; scriptArgs: string = '';
ticket: string; ticket: string;
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AuthService,
private settingsService: AlfrescoSettingsService, private settingsService: SettingsService,
private storage: StorageService) { private storage: StorageService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;