inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3593] remove rxjs-compat layer (#3886)

Browse Source 
* remove rxjs-compat layer

* add rxjs linter

* observable new instead of create

* lint fixes

* disable rxjs-no-subject-value for certain scenarios

* fix auth rxjs
This commit is contained in:
Denys Vuika
2018-10-16 19:45:00 +01:00
committed by Eugenio Romano
parent ccc52d40dd
commit f5a7b07370
29 changed files with 3337 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/form/components/form.component.spec.ts
+12 -12
View File
@@ -172,7 +172,7 @@ describe('FormComponent', () => {
it('should get process variable if is a process task', () => {
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -180,7 +180,7 @@ describe('FormComponent', () => {
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: currentTaskId, processDefinitionId: '10201' });
observer.complete();
});
@@ -195,7 +195,7 @@ describe('FormComponent', () => {
it('should not get process variable if is not a process task', () => {
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -203,7 +203,7 @@ describe('FormComponent', () => {
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: currentTaskId, processDefinitionId: 'null' });
observer.complete();
});
@@ -421,7 +421,7 @@ describe('FormComponent', () => {
it('should fetch and parse form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -457,7 +457,7 @@ describe('FormComponent', () => {
it('should apply readonly state when getting form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ taskId: taskId });
observer.complete();
});
@@ -473,7 +473,7 @@ describe('FormComponent', () => {
it('should fetch and parse form definition by id', () => {
spyOn(formService, 'getFormDefinitionById').and.callFake((currentFormId) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ id: currentFormId });
observer.complete();
});
@@ -505,14 +505,14 @@ describe('FormComponent', () => {
it('should fetch and parse form definition by form name', () => {
spyOn(formService, 'getFormDefinitionByName').and.callFake((currentFormName) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next(currentFormName);
observer.complete();
});
});
spyOn(formService, 'getFormDefinitionById').and.callFake((currentFormName) => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({ name: currentFormName });
observer.complete();
});
@@ -533,7 +533,7 @@ describe('FormComponent', () => {
it('should save task form and raise corresponding event', () => {
spyOn(formService, 'saveTaskForm').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -598,7 +598,7 @@ describe('FormComponent', () => {
it('should complete form form and raise corresponding event', () => {
spyOn(formService, 'completeTaskForm').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -703,7 +703,7 @@ describe('FormComponent', () => {
it('should load form for ecm node', () => {
let metadata = {};
spyOn(nodeService, 'getNodeMetadata').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next({ metadata: metadata });
observer.complete();
})
lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
+2 -2
View File
@@ -89,7 +89,7 @@ describe('DropdownWidgetComponent', () => {
});
spyOn(formService, 'getRestFieldValues').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
@@ -101,7 +101,7 @@ describe('DropdownWidgetComponent', () => {
it('should preserve empty option when loading fields', () => {
let restFieldValue: FormFieldOption = <FormFieldOption> { id: '1', name: 'Option1' };
spyOn(formService, 'getRestFieldValues').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next([restFieldValue]);
observer.complete();
});
lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
+2 -2
View File
@@ -98,7 +98,7 @@ describe('DropdownEditorComponent', () => {
];
spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(restResults);
observer.complete();
})
@@ -121,7 +121,7 @@ describe('DropdownEditorComponent', () => {
column.optionType = 'rest';
spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
+4 -4
View File
@@ -40,7 +40,7 @@ describe('FunctionalGroupWidgetComponent', () => {
widget.field.value = group;
spyOn(formService, 'getWorkflowGroups').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
@@ -128,7 +128,7 @@ describe('FunctionalGroupWidgetComponent', () => {
new GroupModel()
];
spyOn(formService, 'getWorkflowGroups').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(groups);
observer.complete();
})
@@ -148,7 +148,7 @@ describe('FunctionalGroupWidgetComponent', () => {
new GroupModel()
];
spyOn(formService, 'getWorkflowGroups').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(groups);
observer.complete();
})
@@ -165,7 +165,7 @@ describe('FunctionalGroupWidgetComponent', () => {
it('should hide popup when fetching empty group list', () => {
spyOn(formService, 'getWorkflowGroups').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
lib/core/form/components/widgets/people/people.widget.spec.ts
+3 -3
View File
@@ -88,7 +88,7 @@ describe('PeopleWidgetComponent', () => {
});
spyOn(formService, 'getWorkflowUsers').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
@@ -111,7 +111,7 @@ describe('PeopleWidgetComponent', () => {
widget.field.form.readOnly = true;
spyOn(formService, 'getWorkflowUsers').and.returnValue(
Observable.create(observer => {
new Observable(observer => {
observer.next(null);
observer.complete();
})
@@ -166,7 +166,7 @@ describe('PeopleWidgetComponent', () => {
{ id: 1002, firstName: 'Test02', lastName: 'Test02', email: 'test2' }];
beforeEach(async(() => {
spyOn(formService, 'getWorkflowUsers').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getWorkflowUsers').and.returnValue(new Observable(observer => {
observer.next(fakeUserResult);
observer.complete();
}));
lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
+3 -3
View File
@@ -59,7 +59,7 @@ describe('RadioButtonsWidgetComponent', () => {
restUrl: '<url>'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next(null);
observer.complete();
}));
@@ -82,7 +82,7 @@ describe('RadioButtonsWidgetComponent', () => {
let field = widget.field;
spyOn(field, 'updateForm').and.stub();
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next(null);
observer.complete();
}));
@@ -102,7 +102,7 @@ describe('RadioButtonsWidgetComponent', () => {
id: fieldId,
restUrl: '<url>'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next(null);
observer.complete();
}));
lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
+5 -5
View File
@@ -67,7 +67,7 @@ describe('TypeaheadWidgetComponent', () => {
restUrl: 'whateverURL'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next(null);
observer.complete();
}));
@@ -137,7 +137,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should setup initial value', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next([
{ id: '1', name: 'One' },
{ id: '2', name: 'Two' }
@@ -153,7 +153,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should not setup initial value due to missing option', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next([
{ id: '1', name: 'One' },
{ id: '2', name: 'Two' }
@@ -175,7 +175,7 @@ describe('TypeaheadWidgetComponent', () => {
{ id: '2', name: 'Two' }
];
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next(options);
observer.complete();
}));
@@ -185,7 +185,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should update form upon options setup', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.create(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
observer.next([]);
observer.complete();
}));
lib/core/form/services/ecm-model.service.spec.ts
+10 -10
View File
@@ -229,14 +229,14 @@ describe('EcmModelService', () => {
it('Should create an ECM type with properties', (done) => {
spyOn(service, 'createEcmType').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
});
spyOn(service, 'addPropertyToAType').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -251,14 +251,14 @@ describe('EcmModelService', () => {
it('Should return the already existing type', (done) => {
spyOn(service, 'searchEcmType').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({test: 'I-EXIST'});
observer.complete();
});
});
spyOn(service, 'createEcmTypeWithProperties').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -273,14 +273,14 @@ describe('EcmModelService', () => {
it('Should create an ECM type with properties if the ecm Type is not defined already', (done) => {
spyOn(service, 'searchEcmType').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
});
spyOn(service, 'createEcmTypeWithProperties').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -295,14 +295,14 @@ describe('EcmModelService', () => {
it('Should create an ECM model for the activiti if not defined already', (done) => {
spyOn(service, 'searchActivitiEcmModel').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
});
spyOn(service, 'createActivitiEcmModel').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
@@ -317,14 +317,14 @@ describe('EcmModelService', () => {
it('If a model for the activiti is already define has to save the new type', (done) => {
spyOn(service, 'searchActivitiEcmModel').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next({test: 'I-EXIST'});
observer.complete();
});
});
spyOn(service, 'saveFomType').and.callFake(() => {
return Observable.create(observer => {
return new Observable(observer => {
observer.next();
observer.complete();
});
lib/core/form/services/ecm-model.service.ts
+4 -4
View File
@@ -34,7 +34,7 @@ export class EcmModelService {
}
public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable<any> {
return Observable.create(observer => {
return new Observable(observer => {
this.searchActivitiEcmModel().subscribe(
model => {
if (!model) {
@@ -62,7 +62,7 @@ export class EcmModelService {
}
createActivitiEcmModel(formName: string, form: FormModel): Observable<any> {
return Observable.create(observer => {
return new Observable(observer => {
this.createEcmModel(EcmModelService.MODEL_NAME, EcmModelService.MODEL_NAMESPACE).subscribe(
model => {
this.logService.info('model created', model);
@@ -83,7 +83,7 @@ export class EcmModelService {
}
saveFomType(formName: string, form: FormModel): Observable<any> {
return Observable.create(observer => {
return new Observable(observer => {
this.searchEcmType(formName, EcmModelService.MODEL_NAME).subscribe(
ecmType => {
this.logService.info('custom types', ecmType);
@@ -103,7 +103,7 @@ export class EcmModelService {
}
public createEcmTypeWithProperties(formName: string, form: FormModel): Observable<any> {
return Observable.create(observer => {
return new Observable(observer => {
this.createEcmType(formName, EcmModelService.MODEL_NAME, EcmModelService.TYPE_MODEL).subscribe(
typeCreated => {
this.logService.info('type Created', typeCreated);
lib/core/form/services/form.service.ts
+1 -1
View File
@@ -116,7 +116,7 @@ export class FormService {
* @returns The new form
*/
createFormFromANode(formName: string): Observable<any> {
return Observable.create(observer => {
return new Observable(observer => {
this.createForm(formName).subscribe(
form => {
this.ecmModelService.searchEcmType(formName, EcmModelService.MODEL_NAME).subscribe(
lib/core/pagination/infinite-pagination.component.ts
+1
View File
@@ -16,6 +16,7 @@
*/
/* tslint:disable:no-input-rename */
/* tslint:disable:rxjs-no-subject-value */
import {
ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter,
lib/core/services/authentication.service.ts
+6 -6
View File
@@ -27,7 +27,7 @@ import { map, catchError, tap } from 'rxjs/operators';
import { HttpHeaders } from '@angular/common/http';
const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30 ;
const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30;
@Injectable()
export class AuthenticationService {
@@ -50,10 +50,10 @@ export class AuthenticationService {
* @returns True if logged in, false otherwise
*/
isLoggedIn(): boolean {
if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
return false;
}
return this.alfrescoApi.getInstance().isLoggedIn();
if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
return false;
}
return this.alfrescoApi.getInstance().isLoggedIn();
}
/**
@@ -284,7 +284,7 @@ export class AuthenticationService {
}
addTokenToHeader(headersArg?: HttpHeaders): Observable<HttpHeaders> {
return Observable.create(async (observer: Observer<any>) => {
return new Observable((observer: Observer<any>) => {
let headers = headersArg;
if (!headers) {
headers = new HttpHeaders();
lib/core/services/renditions.service.ts
+2 -2
View File
@@ -34,7 +34,7 @@ export class RenditionsService {
/** @deprecated */
isRenditionAvailable(nodeId: string, encoding: string): Observable<boolean> {
return Observable.create((observer) => {
return new Observable((observer) => {
this.getRendition(nodeId, encoding).subscribe(
(res) => {
let isAvailable = true;
@@ -54,7 +54,7 @@ export class RenditionsService {
/** @deprecated */
isConversionPossible(nodeId: string, encoding: string): Observable<boolean> {
return Observable.create((observer) => {
return new Observable((observer) => {
this.getRendition(nodeId, encoding).subscribe(
() => {
observer.next(true);
lib/core/services/translate-loader.service.ts
+1 -1
View File
@@ -121,7 +121,7 @@ export class TranslateLoaderService implements TranslateLoader {
})
];
return Observable.create(observer => {
return new Observable(observer => {
if (batch.length > 0) {
forkJoin(batch).subscribe(