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

[ADF-3191] Fix userprefrence oauth2 (#3488)

Browse Source 
* remove user preference setting save

* fix host setting test

* remove userPreferences test

* fix title service test

* remove unused imports

* restore input align

* fix service import in test tag rating
This commit is contained in:
Eugenio Romano
2018-06-15 08:32:16 +01:00
committed by GitHub
parent af2cde0791
commit 8966e22487
43 changed files with 417 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/process-services/process-list/components/start-process.component.ts
View File

@@ -15,22 +15,11 @@
* limitations under the License.
*/
import {
Component,
EventEmitter,
Input,
OnChanges,
Output,
SimpleChanges,
ViewChild,
ViewEncapsulation
import { Component, EventEmitter, Input, OnChanges,
Output, SimpleChanges, ViewChild, ViewEncapsulation
} from '@angular/core';
import {
ActivitiContentService,
AppConfigService,
StartFormComponent,
FormRenderingService,
FormValues
import { ActivitiContentService, AppConfigService, AppConfigValues,
StartFormComponent, FormRenderingService, FormValues
} from '@alfresco/adf-core';
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
import { ProcessDefinitionRepresentation } from './../models/process-definition.model';
@@ -138,7 +127,7 @@ export class StartProcessInstanceComponent implements OnChanges {
}
getAlfrescoRepositoryName(): string {
let alfrescoRepositoryName = this.appConfig.get<string>('alfrescoRepositoryName');
let alfrescoRepositoryName = this.appConfig.get<string>(AppConfigValues.ALFRESCO_REPOSITORY_NAME);
if (!alfrescoRepositoryName) {
alfrescoRepositoryName = 'alfresco-1';
}

8
lib/process-services/process-list/services/process-filter.service.spec.ts
View File

@@ -15,11 +15,11 @@
* limitations under the License.
*/
import { async, TestBed } from '@angular/core/testing';
import { async } from '@angular/core/testing';
import { mockError, fakeProcessFilters } from '../../mock';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
import { ProcessFilterService } from './process-filter.service';
import { AlfrescoApiServiceMock, AlfrescoApiService, AppConfigService, StorageService, UserPreferencesService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { AlfrescoApiServiceMock, AlfrescoApiService, AppConfigService, StorageService, setupTestBed, CoreModule } from '@alfresco/adf-core';
declare let jasmine: any;
@@ -28,7 +28,6 @@ describe('Process filter', () => {
let service: ProcessFilterService;
let apiService: AlfrescoApiService;
let alfrescoApi: any;
let userPreferences: UserPreferencesService;
setupTestBed({
imports: [
@@ -37,8 +36,7 @@ describe('Process filter', () => {
});
beforeEach(() => {
userPreferences = TestBed.get(UserPreferencesService);
apiService = new AlfrescoApiServiceMock(new AppConfigService(null), userPreferences, new StorageService() );
apiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService() );
service = new ProcessFilterService(apiService);
alfrescoApi = apiService.getInstance();
});

8
lib/process-services/process-list/services/process.service.spec.ts
View File

@@ -15,13 +15,13 @@
* limitations under the License.
*/
import { async, TestBed } from '@angular/core/testing';
import { async } from '@angular/core/testing';
import { exampleProcess, fakeProcessInstances } from '../../mock';
import { mockError, fakeProcessDef, fakeTasksList } from '../../mock';
import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model';
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
import { ProcessService } from './process.service';
import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigService, StorageService, UserPreferencesService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigService, StorageService, setupTestBed, CoreModule } from '@alfresco/adf-core';
declare let moment: any;
@@ -30,7 +30,6 @@ describe('ProcessService', () => {
let service: ProcessService;
let apiService: AlfrescoApiService;
let alfrescoApi: any;
let userPreferences: UserPreferencesService;
setupTestBed({
imports: [
@@ -39,8 +38,7 @@ describe('ProcessService', () => {
});
beforeEach(() => {
userPreferences = TestBed.get(UserPreferencesService);
apiService = new AlfrescoApiServiceMock(new AppConfigService(null), userPreferences, new StorageService() );
apiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService() );
service = new ProcessService(apiService);
alfrescoApi = apiService.getInstance();
});

14
lib/process-services/task-list/services/task-filter.service.spec.ts
View File

@@ -15,22 +15,17 @@
* limitations under the License.
*/
import { async, TestBed } from '@angular/core/testing';
import {
fakeAppFilter,
fakeAppPromise,
fakeFilters
} from '../../mock';
import { async } from '@angular/core/testing';
import { fakeAppFilter, fakeAppPromise, fakeFilters } from '../../mock';
import { FilterRepresentationModel } from '../models/filter.model';
import { TaskFilterService } from './task-filter.service';
import { AlfrescoApiServiceMock, LogService, AppConfigService, StorageService, setupTestBed, CoreModule, UserPreferencesService } from '@alfresco/adf-core';
import { AlfrescoApiServiceMock, LogService, AppConfigService, StorageService, setupTestBed, CoreModule } from '@alfresco/adf-core';
declare let jasmine: any;
describe('Activiti Task filter Service', () => {
let service: TaskFilterService;
let userPreferences: UserPreferencesService;
setupTestBed({
imports: [
@@ -39,8 +34,7 @@ describe('Activiti Task filter Service', () => {
});
beforeEach(async(() => {
userPreferences = TestBed.get(UserPreferencesService);
service = new TaskFilterService(new AlfrescoApiServiceMock(new AppConfigService(null), userPreferences, new StorageService()), new LogService(new AppConfigService(null)));
service = new TaskFilterService(new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()), new LogService(new AppConfigService(null)));
jasmine.Ajax.install();
}));

8
lib/process-services/task-list/services/tasklist.service.spec.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { async, TestBed } from '@angular/core/testing';
import { async } from '@angular/core/testing';
import { UserProcessModel, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import {
@@ -35,14 +35,13 @@ import {
import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListService } from './tasklist.service';
import { AlfrescoApiServiceMock, LogService, AppConfigService, StorageService, UserPreferencesService } from '@alfresco/adf-core';
import { AlfrescoApiServiceMock, LogService, AppConfigService, StorageService } from '@alfresco/adf-core';
declare let jasmine: any;
describe('Activiti TaskList Service', () => {
let service: TaskListService;
let userPreferences: UserPreferencesService;
setupTestBed({
imports: [
@@ -51,8 +50,7 @@ describe('Activiti TaskList Service', () => {
});
beforeEach(async(() => {
userPreferences = TestBed.get(UserPreferencesService);
service = new TaskListService(new AlfrescoApiServiceMock(new AppConfigService(null), userPreferences, new StorageService() ), new LogService(new AppConfigService(null)));
service = new TaskListService(new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService() ), new LogService(new AppConfigService(null)));
jasmine.Ajax.install();
}));