#1370 Remove use of AlfrescoSettingsService

This commit is contained in:
mauriziovitale84
2017-01-04 13:30:43 +00:00
parent 61b94488d8
commit 58af422d62
27 changed files with 62 additions and 62 deletions

View File

@@ -21,7 +21,7 @@ import { Router } from '@angular/router';
import {
AlfrescoTranslationService,
AlfrescoAuthenticationService,
AlfrescoSettingsService,
SettingsService,
StorageService
} from 'ng2-alfresco-core';
@@ -40,7 +40,7 @@ export class AppComponent {
constructor(public auth: AlfrescoAuthenticationService,
public router: Router,
public alfrescoSettingsService: AlfrescoSettingsService,
public settingsService: SettingsService,
private translate: AlfrescoTranslationService,
private storage: StorageService) {
this.setEcmHost();
@@ -118,25 +118,25 @@ export class AppComponent {
private setEcmHost() {
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`);
} else {
this.alfrescoSettingsService.ecmHost = this.ecmHost;
this.settingsService.ecmHost = this.ecmHost;
}
}
private setBpmHost() {
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`);
} else {
this.alfrescoSettingsService.bpmHost = this.bpmHost;
this.settingsService.bpmHost = this.bpmHost;
}
}
private setProvider() {
if (this.storage.hasItem(`providers`)) {
this.alfrescoSettingsService.setProviders(this.storage.getItem(`providers`));
this.settingsService.setProviders(this.storage.getItem(`providers`));
}
}
}

View File

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

View File

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

View File

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

View File

@@ -25,11 +25,11 @@ export class DiagramsService {
constructor(private authService: AuthService,
private http: Http,
private alfrescoSettingsService: SettingsService) {
private settingsService: SettingsService) {
}
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();
return this.http
.get(url, options)

View File

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

View File

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

View File

@@ -22,7 +22,7 @@ import {
AlfrescoTranslationService,
CoreModule,
AlfrescoAuthenticationService,
AlfrescoSettingsService,
SettingsService,
AlfrescoApiService } from 'ng2-alfresco-core';
import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
@@ -48,7 +48,7 @@ describe('ActivitiProcessInstanceHeader', () => {
ActivitiProcessComments
],
providers: [
AlfrescoSettingsService,
SettingsService,
AlfrescoAuthenticationService,
AlfrescoApiService,
ActivitiProcessService,

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -20,7 +20,7 @@ import { ImgViewerComponent } from './imgViewer.component';
import { DebugElement } from '@angular/core';
import {
AlfrescoAuthenticationService,
AlfrescoSettingsService,
SettingsService,
AlfrescoApiService,
CoreModule
} from 'ng2-alfresco-core';
@@ -39,7 +39,7 @@ describe('Test ng2-alfresco-viewer Img viewer component ', () => {
],
declarations: [ImgViewerComponent],
providers: [
AlfrescoSettingsService,
SettingsService,
AlfrescoAuthenticationService,
AlfrescoApiService
]

View File

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

View File

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

View File

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

View File

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

View File

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