mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-1968] [IE11] The login page is not loading and import fix (#2679)
* fix viewer script export insights and diagram remove requires svg fix new data adapter path dist working with diagrams commented out change use of minimatch fix unused import remove unused component fix test new import moment es6 and throw rxjs fix import analytics test fix imports rxjs new pacakging * fix after rebase * fix test upload services * exclude temporarily button event test * restore commented demo shell files * fix process spy
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
import { Component } from '@angular/core';
|
||||
import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { ProcessService } from './../services/process.service';
|
||||
import { ProcessAuditDirective } from './process-audit.directive';
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { SimpleChange } from '@angular/core';
|
||||
import { AppsProcessService } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
|
||||
import { ProcessFilterService } from '../services/process-filter.service';
|
||||
import { ProcessFiltersComponent } from './process-filters.component';
|
||||
@@ -47,12 +47,12 @@ describe('ActivitiFilters', () => {
|
||||
resolve(fakeGlobalFilter);
|
||||
});
|
||||
|
||||
let fakeErrorFilterList = {
|
||||
let mockErrorFilterList = {
|
||||
error: 'wrong request'
|
||||
};
|
||||
|
||||
let fakeErrorFilterPromise = new Promise(function (resolve, reject) {
|
||||
reject(fakeErrorFilterList);
|
||||
let mockErrorFilterPromise = new Promise(function (resolve, reject) {
|
||||
reject(mockErrorFilterList);
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -120,7 +120,7 @@ describe('ActivitiFilters', () => {
|
||||
});
|
||||
|
||||
it('should emit an error with a bad response', (done) => {
|
||||
spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
|
||||
spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
|
||||
|
||||
const appId = '1';
|
||||
let change = new SimpleChange(null, appId, true);
|
||||
@@ -135,7 +135,7 @@ describe('ActivitiFilters', () => {
|
||||
});
|
||||
|
||||
it('should emit an error with a bad response', (done) => {
|
||||
spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
|
||||
spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
|
||||
|
||||
const appId = 'fake-app';
|
||||
let change = new SimpleChange(null, appId, true);
|
||||
|
@@ -18,7 +18,8 @@
|
||||
import { AppsProcessService } from '@alfresco/adf-core';
|
||||
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
|
||||
import { ProcessInstanceFilterRepresentation } from 'alfresco-js-api';
|
||||
import { Observable, Observer } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { Observer } from 'rxjs/Observer';
|
||||
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
|
||||
import { ProcessFilterService } from './../services/process-filter.service';
|
||||
|
||||
|
@@ -19,10 +19,10 @@ import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { MaterialModule } from '../../material.module';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
|
||||
import { FormModule, FormService } from '@alfresco/adf-core';
|
||||
import { TaskListModule } from '../../task-list';
|
||||
import { FormModule } from '@alfresco/adf-core';
|
||||
import { TaskListModule } from '../../task-list/task-list.module';
|
||||
|
||||
import { ProcessInstance } from '../models/process-instance.model';
|
||||
import { exampleProcess, exampleProcessNoName } from './../../mock';
|
||||
@@ -32,7 +32,6 @@ import { ProcessInstanceDetailsComponent } from './process-instance-details.comp
|
||||
describe('ProcessInstanceDetailsComponent', () => {
|
||||
|
||||
let service: ProcessService;
|
||||
let formService: FormService;
|
||||
let component: ProcessInstanceDetailsComponent;
|
||||
let fixture: ComponentFixture<ProcessInstanceDetailsComponent>;
|
||||
let getProcessSpy: jasmine.Spy;
|
||||
@@ -59,7 +58,6 @@ describe('ProcessInstanceDetailsComponent', () => {
|
||||
fixture = TestBed.createComponent(ProcessInstanceDetailsComponent);
|
||||
component = fixture.componentInstance;
|
||||
service = fixture.debugElement.injector.get(ProcessService);
|
||||
formService = fixture.debugElement.injector.get(FormService);
|
||||
|
||||
getProcessSpy = spyOn(service, 'getProcess').and.returnValue(Observable.of(exampleProcess));
|
||||
});
|
||||
|
@@ -26,7 +26,6 @@ import { ProcessInstanceHeaderComponent } from './process-instance-header.compon
|
||||
|
||||
describe('ProcessInstanceHeaderComponent', () => {
|
||||
|
||||
let service: ProcessService;
|
||||
let component: ProcessInstanceHeaderComponent;
|
||||
let fixture: ComponentFixture<ProcessInstanceHeaderComponent>;
|
||||
|
||||
@@ -46,10 +45,8 @@ describe('ProcessInstanceHeaderComponent', () => {
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
fixture = TestBed.createComponent(ProcessInstanceHeaderComponent);
|
||||
component = fixture.componentInstance;
|
||||
service = TestBed.get(ProcessService);
|
||||
|
||||
component.processInstance = new ProcessInstance(exampleProcess);
|
||||
});
|
||||
|
@@ -15,10 +15,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
|
||||
import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
|
||||
import { TaskDetailsModel } from '../../task-list';
|
||||
|
||||
@@ -31,7 +31,6 @@ describe('ProcessInstanceTasksComponent', () => {
|
||||
|
||||
let component: ProcessInstanceTasksComponent;
|
||||
let fixture: ComponentFixture<ProcessInstanceTasksComponent>;
|
||||
let debugElement: DebugElement;
|
||||
let service: ProcessService;
|
||||
let getProcessTasksSpy: jasmine.Spy;
|
||||
|
||||
@@ -54,7 +53,6 @@ describe('ProcessInstanceTasksComponent', () => {
|
||||
|
||||
fixture = TestBed.createComponent(ProcessInstanceTasksComponent);
|
||||
component = fixture.componentInstance;
|
||||
debugElement = fixture.debugElement;
|
||||
service = fixture.debugElement.injector.get(ProcessService);
|
||||
getProcessTasksSpy = spyOn(service, 'getProcessTasks').and.returnValue(Observable.of([new TaskDetailsModel(taskDetailsMock)]));
|
||||
|
||||
|
@@ -19,7 +19,8 @@ import { LogService } from '@alfresco/adf-core';
|
||||
import { DatePipe } from '@angular/common';
|
||||
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material';
|
||||
import { Observable, Observer } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { Observer } from 'rxjs/Observer';
|
||||
import { TaskDetailsEvent, TaskDetailsModel } from '../../task-list';
|
||||
import { ProcessInstance } from '../models/process-instance.model';
|
||||
import { ProcessService } from './../services/process.service';
|
||||
|
@@ -18,7 +18,7 @@
|
||||
import { SimpleChange } from '@angular/core';
|
||||
import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
|
||||
import { MatProgressSpinnerModule } from '@angular/material';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { ProcessInstanceListComponent } from './process-list.component';
|
||||
|
||||
import { AppConfigService } from '@alfresco/adf-core';
|
||||
@@ -281,13 +281,13 @@ describe('ProcessInstanceListComponent', () => {
|
||||
|
||||
it('should throw an exception when the response is wrong', fakeAsync(() => {
|
||||
let emitSpy: jasmine.Spy = spyOn(component.error, 'emit');
|
||||
let fakeError = 'Fake server error';
|
||||
getProcessInstancesSpy.and.returnValue(Observable.throw(fakeError));
|
||||
let mockError = 'Fake server error';
|
||||
getProcessInstancesSpy.and.returnValue(Observable.throw(mockError));
|
||||
component.appId = 1;
|
||||
component.state = 'open';
|
||||
fixture.detectChanges();
|
||||
tick();
|
||||
expect(emitSpy).toHaveBeenCalledWith(fakeError);
|
||||
expect(emitSpy).toHaveBeenCalledWith(mockError);
|
||||
}));
|
||||
|
||||
it('should emit onSuccess event when reload() called', fakeAsync(() => {
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { DebugElement, SimpleChange } from '@angular/core';
|
||||
import { SimpleChange } from '@angular/core';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import {
|
||||
MatButtonModule,
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
MatSelectModule
|
||||
} from '@angular/material';
|
||||
import { FormModule, FormService } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
|
||||
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
|
||||
import { ProcessService } from '../services/process.service';
|
||||
@@ -40,7 +40,6 @@ describe('StartProcessInstanceComponent', () => {
|
||||
let getDefinitionsSpy: jasmine.Spy;
|
||||
let getStartFormDefinitionSpy: jasmine.Spy;
|
||||
let startProcessSpy: jasmine.Spy;
|
||||
let debugElement: DebugElement;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
@@ -65,7 +64,6 @@ describe('StartProcessInstanceComponent', () => {
|
||||
|
||||
fixture = TestBed.createComponent(StartProcessInstanceComponent);
|
||||
component = fixture.componentInstance;
|
||||
debugElement = fixture.debugElement;
|
||||
processService = fixture.debugElement.injector.get(ProcessService);
|
||||
formService = fixture.debugElement.injector.get(FormService);
|
||||
|
||||
|
@@ -24,9 +24,9 @@ import { FormModule } from '@alfresco/adf-core';
|
||||
import { MaterialModule } from '../material.module';
|
||||
|
||||
import { CardViewModule, CardViewUpdateService, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core';
|
||||
import { TaskListModule } from '../task-list';
|
||||
import { PeopleModule } from '../people';
|
||||
import { CommentsModule } from '../comments';
|
||||
import { TaskListModule } from '../task-list/task-list.module';
|
||||
import { PeopleModule } from '../people/people.module';
|
||||
import { CommentsModule } from '../comments/comments.module';
|
||||
|
||||
import { ProcessAuditDirective } from './components/process-audit.directive';
|
||||
import { ProcessFiltersComponent } from './components/process-filters.component';
|
||||
|
@@ -34,5 +34,3 @@ export * from './models/process-definition.model';
|
||||
export * from './models/process-instance.model';
|
||||
export * from './models/process-instance-filter.model';
|
||||
export * from './models/process-instance-variable.model';
|
||||
|
||||
export * from './process-list.module';
|
||||
|
@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
|
||||
import { async } from '@angular/core/testing';
|
||||
import { AlfrescoApi } from 'alfresco-js-api';
|
||||
import { AlfrescoApiService } from '@alfresco/adf-core';
|
||||
import { fakeError, fakeProcessFilters } from '../../mock';
|
||||
import { mockError, fakeProcessFilters } from '../../mock';
|
||||
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
|
||||
import { ProcessFilterService } from './process-filter.service';
|
||||
|
||||
@@ -116,12 +116,12 @@ describe('Process filter', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
getFilters = getFilters.and.returnValue(Promise.reject(fakeError));
|
||||
getFilters = getFilters.and.returnValue(Promise.reject(mockError));
|
||||
|
||||
service.getProcessFilters(null).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -144,12 +144,12 @@ describe('Process filter', () => {
|
||||
}));
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
createFilter = createFilter.and.returnValue(Promise.reject(fakeError));
|
||||
createFilter = createFilter.and.returnValue(Promise.reject(mockError));
|
||||
|
||||
service.addProcessFilter(filter).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
|
@@ -19,6 +19,7 @@ import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
|
||||
import 'rxjs/add/observable/throw';
|
||||
|
||||
@Injectable()
|
||||
export class ProcessFilterService {
|
||||
|
@@ -20,7 +20,7 @@ import { async } from '@angular/core/testing';
|
||||
import { AlfrescoApi } from 'alfresco-js-api';
|
||||
import { AlfrescoApiService } from '@alfresco/adf-core';
|
||||
import { exampleProcess, fakeProcessInstances } from '../../mock';
|
||||
import { fakeError, fakeProcessDef, fakeTasksList } 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';
|
||||
@@ -101,11 +101,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
getProcessInstances = getProcessInstances.and.returnValue(Promise.reject(fakeError));
|
||||
getProcessInstances = getProcessInstances.and.returnValue(Promise.reject(mockError));
|
||||
service.getProcessInstances(null).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -152,11 +152,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
getProcessInstance = getProcessInstance.and.returnValue(Promise.reject(fakeError));
|
||||
getProcessInstance = getProcessInstance.and.returnValue(Promise.reject(mockError));
|
||||
service.getProcess(null).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -215,12 +215,12 @@ describe('ProcessService', () => {
|
||||
}));
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
startNewProcessInstance = startNewProcessInstance.and.returnValue(Promise.reject(fakeError));
|
||||
startNewProcessInstance = startNewProcessInstance.and.returnValue(Promise.reject(mockError));
|
||||
|
||||
service.startProcess(processDefId, processName).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -265,11 +265,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
deleteProcessInstance = deleteProcessInstance.and.returnValue(Promise.reject(fakeError));
|
||||
deleteProcessInstance = deleteProcessInstance.and.returnValue(Promise.reject(mockError));
|
||||
service.cancelProcess(null).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -327,11 +327,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
getProcessDefinitions = getProcessDefinitions.and.returnValue(Promise.reject(fakeError));
|
||||
getProcessDefinitions = getProcessDefinitions.and.returnValue(Promise.reject(mockError));
|
||||
service.getProcessDefinitions().subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -396,11 +396,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
listTasks = listTasks.and.returnValue(Promise.reject(fakeError));
|
||||
listTasks = listTasks.and.returnValue(Promise.reject(mockError));
|
||||
service.getProcessTasks(processId).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -447,11 +447,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
getVariablesSpy = getVariablesSpy.and.returnValue(Promise.reject(fakeError));
|
||||
getVariablesSpy = getVariablesSpy.and.returnValue(Promise.reject(mockError));
|
||||
service.getProcessInstanceVariables(null).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -484,11 +484,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
createOrUpdateProcessInstanceVariablesSpy = createOrUpdateProcessInstanceVariablesSpy.and.returnValue(Promise.reject(fakeError));
|
||||
createOrUpdateProcessInstanceVariablesSpy = createOrUpdateProcessInstanceVariablesSpy.and.returnValue(Promise.reject(mockError));
|
||||
service.createOrUpdateProcessInstanceVariables('123', updatedVariables).subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
@@ -513,11 +513,11 @@ describe('ProcessService', () => {
|
||||
});
|
||||
|
||||
it('should pass on any error that is returned by the API', async(() => {
|
||||
deleteProcessInstanceVariableSpy = deleteProcessInstanceVariableSpy.and.returnValue(Promise.reject(fakeError));
|
||||
deleteProcessInstanceVariableSpy = deleteProcessInstanceVariableSpy.and.returnValue(Promise.reject(mockError));
|
||||
service.deleteProcessInstanceVariable('123', 'myVar').subscribe(
|
||||
() => {},
|
||||
(res) => {
|
||||
expect(res).toBe(fakeError);
|
||||
expect(res).toBe(mockError);
|
||||
}
|
||||
);
|
||||
}));
|
||||
|
@@ -23,6 +23,7 @@ import { ProcessFilterParamRepresentationModel } from '../models/filter-process.
|
||||
import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
|
||||
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
|
||||
import { ProcessInstance } from '../models/process-instance.model';
|
||||
import 'rxjs/add/observable/throw';
|
||||
|
||||
declare let moment: any;
|
||||
|
||||
|
Reference in New Issue
Block a user