[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
2025-07-24 17:32:15 +00:00 · 2017-11-22 10:33:56 +00:00
parent 39737b3df6
commit f629f48d16
316 changed files with 1548 additions and 1678 deletions
--- a/lib/process-services/task-list/components/checklist.component.spec.ts
+++ b/lib/process-services/task-list/components/checklist.component.spec.ts
@@ -35,7 +35,7 @@ describe('ChecklistComponent', () => {
    let checklistComponent: ChecklistComponent;
    let fixture: ComponentFixture<ChecklistComponent>;
    let element: HTMLElement;
-    let showChecklistDialog, closeCheckDialogButton;
+    let showChecklistDialog;

    beforeEach(async(() => {
        TestBed.configureTestingModule({
@@ -77,7 +77,6 @@ describe('ChecklistComponent', () => {

            fixture.detectChanges();
            showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
-            closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
        });

        it('should NOT show add checklist button', () => {
@@ -98,7 +97,6 @@ describe('ChecklistComponent', () => {

            fixture.detectChanges();
            showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
-            closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
        });

        it('should show add checklist button', () => {
@@ -118,7 +116,6 @@ describe('ChecklistComponent', () => {

            fixture.detectChanges();
            showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
-            closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
        });

        it('should show dialog when clicked on add', () => {
--- a/lib/process-services/task-list/components/checklist.component.ts
+++ b/lib/process-services/task-list/components/checklist.component.ts
@@ -17,7 +17,8 @@

 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 { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListService } from './../services/tasklist.service';

--- a/lib/process-services/task-list/components/start-task.component.spec.ts
+++ b/lib/process-services/task-list/components/start-task.component.spec.ts
@@ -18,7 +18,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '../../material.module';
 import { PeopleProcessService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import { startTaskMock } from '../../mock';
 import { StartTaskModel } from '../models/start-task.model';
 import { TaskListService } from '../services/tasklist.service';
@@ -35,8 +35,6 @@ describe('StartTaskComponent', () => {
    let getFormlistSpy: jasmine.Spy;
    let getWorkflowUsersSpy: jasmine.Spy;
    let createNewTaskSpy: jasmine.Spy;
-    let attachFormSpy: jasmine.Spy;
-    let assignUserSpy: jasmine.Spy;
    let fakeForms =    [
        {
            id: 123,
@@ -173,7 +171,7 @@ describe('StartTaskComponent', () => {
                    assignee: null
                }
            ));
-            attachFormSpy = spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
+            spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
                {
                    id: 91,
                    name: 'fakeName',
@@ -234,7 +232,7 @@ describe('StartTaskComponent', () => {
                    assignee: null
                }
            ));
-            assignUserSpy = spyOn(service, 'assignTaskByUserId').and.returnValue(Observable.of(
+            spyOn(service, 'assignTaskByUserId').and.returnValue(Observable.of(
                {
                    id: 91,
                    name: 'fakeName',
--- a/lib/process-services/task-list/components/start-task.component.ts
+++ b/lib/process-services/task-list/components/start-task.component.ts
@@ -15,13 +15,13 @@
 * limitations under the License.
 */

-import { LogService, MOMENT_DATE_FORMATS,
-    MomentDateAdapter, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core';
+import { LogService, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
-import * as moment from 'moment';
+import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
+import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '@alfresco/adf-core';
+import moment from 'moment-es6';
 import { Moment } from 'moment';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import { Form } from '../models/form.model';
 import { StartTaskModel } from '../models/start-task.model';
 import { TaskDetailsModel } from '../models/task-details.model';
@@ -32,13 +32,13 @@ import { TaskListService } from './../services/tasklist.service';
    templateUrl: './start-task.component.html',
    styleUrls: ['./start-task.component.scss'],
    providers: [
-        {provide: DateAdapter, useClass: MomentDateAdapter},
-        {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}],
+        { provide: DateAdapter, useClass: MomentDateAdapter },
+        { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }],
    encapsulation: ViewEncapsulation.None
 })
 export class StartTaskComponent implements OnInit {

-    public  FORMAT_DATE: string = 'DD/MM/YYYY';
+    public FORMAT_DATE: string = 'DD/MM/YYYY';

    @Input()
    appId: number;
@@ -72,16 +72,15 @@ export class StartTaskComponent implements OnInit {
     * @param translate
     * @param taskService
     */
-    constructor(
-        private taskService: TaskListService,
-        private peopleService: PeopleProcessService,
-        private dateAdapter: DateAdapter<Moment>,
-        private preferences: UserPreferencesService,
-        private logService: LogService) {
+    constructor(private taskService: TaskListService,
+                private peopleService: PeopleProcessService,
+                private dateAdapter: DateAdapter<Moment>,
+                private preferences: UserPreferencesService,
+                private logService: LogService) {
    }

    ngOnInit() {
-        this.preferences.locale$.subscribe( (locale) => {
+        this.preferences.locale$.subscribe((locale) => {
            this.dateAdapter.setLocale(locale);
        });
        this.loadFormsTask();
--- a/lib/process-services/task-list/components/task-audit.directive.spec.ts
+++ b/lib/process-services/task-list/components/task-audit.directive.spec.ts
@@ -22,7 +22,7 @@ import {
    fakeAsync,
    TestBed
 } from '@angular/core/testing';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import { TaskListService } from './../services/tasklist.service';
 import { TaskAuditDirective } from './task-audit.directive';

--- a/lib/process-services/task-list/components/task-details.component.spec.ts
+++ b/lib/process-services/task-list/components/task-details.component.spec.ts
@@ -19,7 +19,7 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatButtonModule, MatInputModule } from '@angular/material';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';

 import { FormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from '@alfresco/adf-core';
 import { CommentProcessService, LogService } from '@alfresco/adf-core';
@@ -47,10 +47,8 @@ describe('TaskDetailsComponent', () => {
    let component: TaskDetailsComponent;
    let fixture: ComponentFixture<TaskDetailsComponent>;
    let getTaskDetailsSpy: jasmine.Spy;
-    let getFormSpy: jasmine.Spy;
    let getTasksSpy: jasmine.Spy;
    let assignTaskSpy: jasmine.Spy;
-    let getFormTaskSpy: jasmine.Spy;
    let completeTaskSpy: jasmine.Spy;
    let logService: LogService;
    let commentProcessService: CommentProcessService;
@@ -87,9 +85,9 @@ describe('TaskDetailsComponent', () => {
        commentProcessService = TestBed.get(CommentProcessService);

        getTaskDetailsSpy = spyOn(service, 'getTaskDetails').and.returnValue(Observable.of(taskDetailsMock));
-        getFormSpy = spyOn(formService, 'getTaskForm').and.returnValue(Observable.of(taskFormMock));
+        spyOn(formService, 'getTaskForm').and.returnValue(Observable.of(taskFormMock));
        taskDetailsMock.processDefinitionId = null;
-        getFormTaskSpy = spyOn(formService, 'getTask').and.returnValue(Observable.of(taskDetailsMock));
+        spyOn(formService, 'getTask').and.returnValue(Observable.of(taskDetailsMock));

        getTasksSpy = spyOn(service, 'getTasks').and.returnValue(Observable.of(tasksMock));
        assignTaskSpy = spyOn(service, 'assignTask').and.returnValue(Observable.of(fakeUser));
--- a/lib/process-services/task-list/components/task-details.component.ts
+++ b/lib/process-services/task-list/components/task-details.component.ts
@@ -28,7 +28,8 @@ import { Component,
    ViewChild
 } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material';
-import { Observable, Observer } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/adf-core';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskDetailsModel } from '../models/task-details.model';
--- a/lib/process-services/task-list/components/task-filters.component.spec.ts
+++ b/lib/process-services/task-list/components/task-filters.component.spec.ts
@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppConfigService, AppsProcessService } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
 import { TaskListService } from '../services/tasklist.service';
 import { TaskFilterService } from '../services/task-filter.service';
@@ -52,12 +52,12 @@ describe('TaskFiltersComponent', () => {
        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);
    });

    let component: TaskFiltersComponent;
@@ -92,7 +92,7 @@ describe('TaskFiltersComponent', () => {
    });

    it('should emit an error with a bad response', (done) => {
-        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
+        spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));

        const appId = '1';
        let change = new SimpleChange(null, appId, true);
--- a/lib/process-services/task-list/components/task-filters.component.ts
+++ b/lib/process-services/task-list/components/task-filters.component.ts
@@ -17,7 +17,8 @@

 import { AppsProcessService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-import { Observable, Observer } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
 import { TaskFilterService } from './../services/task-filter.service';
 import { TaskListService } from './../services/tasklist.service';
--- a/lib/process-services/task-list/components/task-header.component.spec.ts
+++ b/lib/process-services/task-list/components/task-header.component.spec.ts
@@ -15,13 +15,12 @@
 * limitations under the License.
 */

-import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { CardViewUpdateService, UserProcessModel } from '@alfresco/adf-core';
 import { BpmUserService } from '@alfresco/adf-core';
 import { MaterialModule } from '../../material.module';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import {
    completedTaskDetailsMock,
    taskDetailsMock,
@@ -39,9 +38,7 @@ describe('TaskHeaderComponent', () => {
    let service: TaskListService;
    let component: TaskHeaderComponent;
    let fixture: ComponentFixture<TaskHeaderComponent>;
-    let debugElement: DebugElement;
    let userBpmService: BpmUserService;
-    let getCurrentUserInfoSpy: jasmine.Spy;

    let fakeBpmAssignedUser = {
        id: 1001,
@@ -78,8 +75,7 @@ describe('TaskHeaderComponent', () => {
        component = fixture.componentInstance;
        service = TestBed.get(TaskListService);
        userBpmService = TestBed.get(BpmUserService);
-        debugElement = fixture.debugElement;
-        getCurrentUserInfoSpy = spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmAssignedUser));
+        spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmAssignedUser));
        component.taskDetails = new TaskDetailsModel(taskDetailsMock);
    });

--- a/lib/process-services/task-list/components/task-list.component.spec.ts
+++ b/lib/process-services/task-list/components/task-list.component.spec.ts
@@ -78,7 +78,7 @@ describe('TaskListComponent', () => {
        ]
    };

-    let fakeErrorTaskList = {
+    let mockErrorTaskList = {
        error: 'wrong request'
    };

@@ -124,7 +124,6 @@ describe('TaskListComponent', () => {

    let component: TaskListComponent;
    let fixture: ComponentFixture<TaskListComponent>;
-    let taskListService: TaskListService;
    let appConfig: AppConfigService;

    beforeEach(async(() => {
@@ -149,7 +148,6 @@ describe('TaskListComponent', () => {
        fixture = TestBed.createComponent(TaskListComponent);
        component = fixture.componentInstance;

-        taskListService = TestBed.get(TaskListService);
        appConfig.config = Object.assign(appConfig.config, {
            'adf-task-list': {
                'presets': {
@@ -385,7 +383,7 @@ describe('TaskListComponent', () => {
        jasmine.Ajax.requests.mostRecent().respondWith({
            'status': 404,
            contentType: 'application/json',
-            responseText: JSON.stringify(fakeErrorTaskList)
+            responseText: JSON.stringify(mockErrorTaskList)
        });
    });

--- a/lib/process-services/task-list/components/task-list.component.ts
+++ b/lib/process-services/task-list/components/task-list.component.ts
@@ -18,7 +18,7 @@
 import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
 import { AppConfigService, DataColumnListComponent } from '@alfresco/adf-core';
 import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskListModel } from '../models/task-list.model';
 import { taskPresetsDefaultModel } from '../models/task-preset.model';
--- a/lib/process-services/task-list/public-api.ts
+++ b/lib/process-services/task-list/public-api.ts
@@ -33,5 +33,3 @@ export * from './models/task-details.model';
 export * from './models/task-details.event';
 export * from './models/user-event.model';
 export * from './models/start-task.model';
-
-export * from './task-list.module';
--- a/lib/process-services/task-list/services/process-upload.service.ts
+++ b/lib/process-services/task-list/services/process-upload.service.ts
@@ -17,7 +17,8 @@

 import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/throw';

@Injectable()
 export class ProcessUploadService extends UploadService {
--- a/lib/process-services/task-list/services/task-filter.service.ts
+++ b/lib/process-services/task-list/services/task-filter.service.ts
@@ -17,9 +17,11 @@

 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable, Subject } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Subject } from 'rxjs/Subject';
 import { FilterRepresentationModel } from '../models/filter.model';
 import { TaskListModel } from '../models/task-list.model';
+import 'rxjs/add/observable/throw';

@Injectable()
 export class TaskFilterService {
--- a/lib/process-services/task-list/services/tasklist.service.spec.ts
+++ b/lib/process-services/task-list/services/tasklist.service.spec.ts
@@ -17,10 +17,10 @@

 import { async, TestBed } from '@angular/core/testing';
 import { UserProcessModel } from '@alfresco/adf-core';
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
 import {
    fakeCompletedTaskList,
-    fakeErrorTaskList,
+    mockErrorTaskList,
    fakeFilter,
    fakeFormList,
    fakeOpenTaskList,
@@ -125,7 +125,7 @@ xdescribe('Activiti TaskList Service', () => {
            jasmine.Ajax.requests.mostRecent().respondWith({
                'status': 404,
                contentType: 'application/json',
-                responseText: JSON.stringify(fakeErrorTaskList)
+                responseText: JSON.stringify(mockErrorTaskList)
            });
        });

--- a/lib/process-services/task-list/services/tasklist.service.ts
+++ b/lib/process-services/task-list/services/tasklist.service.ts
@@ -17,11 +17,13 @@

 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { Observable, Subject } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Subject } from 'rxjs/Subject';
 import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { Form } from '../models/form.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListModel } from '../models/task-list.model';
+import 'rxjs/add/observable/throw';

@Injectable()
 export class TaskListService {
--- a/lib/process-services/task-list/task-list.module.ts
+++ b/lib/process-services/task-list/task-list.module.ts
@@ -25,8 +25,8 @@ import { CardViewModule, DataColumnModule,  DataTableModule, DirectiveModule, In
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';

 import { MaterialModule } from '../material.module';
-import { PeopleModule } from '../people';
-import { CommentsModule } from '../comments';
+import { PeopleModule } from '../people/people.module';
+import { CommentsModule } from '../comments/comments.module';
 import { ProcessUploadService } from './services/process-upload.service';
 import { TaskListService } from './services/tasklist.service';
 import { TaskFilterService } from './services/task-filter.service';