Pre-Angular upgrade fixes (#5709)

* code fixes

* code fixes

* more code fixes

* even more fixes

* add missing typescript for cli

* rollback info drawer test changes

* use npx for cli commands

* restore attach providers
This commit is contained in:
Denys Vuika
2020-05-18 14:02:15 +01:00
committed by GitHub
parent 1def8000f0
commit 347e64fd91
150 changed files with 645 additions and 461 deletions

View File

@@ -21,7 +21,6 @@ import { MaterialModule } from '../material.module';
import { CommonModule } from '@angular/common';
import { AppDetailsCloudComponent } from './components/app-details-cloud.component';
import { AppListCloudComponent } from './components/app-list-cloud.component';
import { AppsProcessCloudService } from './services/apps-process-cloud.service';
import { TemplateModule, CoreModule } from '@alfresco/adf-core';
@NgModule({
@@ -36,9 +35,6 @@ import { TemplateModule, CoreModule } from '@alfresco/adf-core';
AppListCloudComponent,
AppDetailsCloudComponent
],
providers: [
AppsProcessCloudService
],
exports: [
AppListCloudComponent,
AppDetailsCloudComponent

View File

@@ -43,7 +43,6 @@ describe('AppListCloudComponent', () => {
setupTestBed({
imports: [CoreModule.forRoot(), ProcessServiceCloudTestingModule, AppListCloudModule],
providers: [
AppsProcessCloudService,
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
]
});

View File

@@ -16,6 +16,7 @@
*/
export * from './components/app-list-cloud.component';
export * from './components/app-details-cloud.component';
export * from './services/apps-process-cloud.service';
export * from './models/application-instance.model';
export * from './app-list-cloud.module';

View File

@@ -38,7 +38,7 @@ describe('AppsProcessCloudService', () => {
setupTestBed({
imports: [CoreModule.forRoot(), ProcessServiceCloudTestingModule],
providers: [AppsProcessCloudService, AppConfigService,
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } ]
});

View File

@@ -22,7 +22,7 @@ import { AlfrescoApiService, AppConfigService, LogService } from '@alfresco/adf-
import { Oauth2Auth } from '@alfresco/js-api';
import { ApplicationInstanceModel } from '../models/application-instance.model';
@Injectable()
@Injectable({ providedIn: 'root' })
export class AppsProcessCloudService {
deployedApps: ApplicationInstanceModel[];

View File

@@ -113,7 +113,6 @@ describe('AttachFileCloudWidgetComponent', () => {
FormCloudModule,
ContentModule.forRoot()
],
providers: [],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
});

View File

@@ -23,7 +23,6 @@ import {
LogService,
ThumbnailService,
NotificationService,
baseHost,
ContentLinkModel
} from '@alfresco/adf-core';
import { Node, RelatedContentRepresentation } from '@alfresco/js-api';
@@ -35,7 +34,17 @@ import { UploadCloudWidgetComponent } from './upload-cloud.widget';
selector: 'adf-cloud-attach-file-cloud-widget',
templateUrl: './attach-file-cloud-widget.component.html',
styleUrls: ['./attach-file-cloud-widget.component.scss'],
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class AttachFileCloudWidgetComponent extends UploadCloudWidgetComponent

View File

@@ -21,14 +21,24 @@ import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@an
import { Node } from '@alfresco/js-api';
import { Observable, from } from 'rxjs';
import { mergeMap } from 'rxjs/operators';
import { WidgetComponent, baseHost, LogService, FormService, ThumbnailService, ContentLinkModel, NotificationService } from '@alfresco/adf-core';
import { WidgetComponent, LogService, FormService, ThumbnailService, ContentLinkModel, NotificationService } from '@alfresco/adf-core';
import { ProcessCloudContentService } from '../../../services/process-cloud-content.service';
@Component({
selector: 'upload-cloud-widget',
templateUrl: './upload-cloud.widget.html',
styleUrls: ['./upload-cloud.widget.scss'],
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class UploadCloudWidgetComponent extends WidgetComponent implements OnInit {

View File

@@ -19,7 +19,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { DateCloudWidgetComponent } from './date-cloud.widget';
import { setupTestBed, FormFieldModel, FormModel, CoreModule } from '@alfresco/adf-core';
import { FormCloudService } from '../../../services/form-cloud.service';
import moment from 'moment-es6';
describe('DateWidgetComponent', () => {
@@ -33,8 +32,7 @@ describe('DateWidgetComponent', () => {
NoopAnimationsModule,
CoreModule.forRoot()
],
declarations: [DateCloudWidgetComponent],
providers: [FormCloudService]
declarations: [DateCloudWidgetComponent]
});
beforeEach(async(() => {

View File

@@ -23,7 +23,7 @@ import moment from 'moment-es6';
import { Moment } from 'moment';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { MOMENT_DATE_FORMATS, MomentDateAdapter, baseHost, WidgetComponent,
import { MOMENT_DATE_FORMATS, MomentDateAdapter, WidgetComponent,
UserPreferencesService, UserPreferenceValues, FormService } from '@alfresco/adf-core';
@Component({
@@ -33,7 +33,17 @@ import { MOMENT_DATE_FORMATS, MomentDateAdapter, baseHost, WidgetComponent,
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }],
templateUrl: './date-cloud.widget.html',
styleUrls: ['./date-cloud.widget.scss'],
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class DateCloudWidgetComponent extends WidgetComponent implements OnInit, OnDestroy {

View File

@@ -48,8 +48,7 @@ describe('DropdownCloudWidgetComponent', () => {
NoopAnimationsModule,
CoreModule.forRoot()
],
declarations: [DropdownCloudWidgetComponent],
providers: [FormCloudService]
declarations: [DropdownCloudWidgetComponent]
});
beforeEach(async(() => {

View File

@@ -16,7 +16,7 @@
*/
import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
import { baseHost, WidgetComponent, FormService, LogService, FormFieldOption } from '@alfresco/adf-core';
import { WidgetComponent, FormService, LogService, FormFieldOption } from '@alfresco/adf-core';
import { FormCloudService } from '../../../services/form-cloud.service';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
@@ -27,7 +27,17 @@ import { takeUntil } from 'rxjs/operators';
selector: 'dropdown-cloud-widget',
templateUrl: './dropdown-cloud.widget.html',
styleUrls: ['./dropdown-cloud.widget.scss'],
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class DropdownCloudWidgetComponent extends WidgetComponent implements OnInit, OnDestroy {

View File

@@ -16,7 +16,7 @@
*/
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { baseHost, WidgetComponent, IdentityGroupModel } from '@alfresco/adf-core';
import { WidgetComponent, IdentityGroupModel, FormService } from '@alfresco/adf-core';
import { FormControl } from '@angular/forms';
import { filter, takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
@@ -26,7 +26,17 @@ import { Subject } from 'rxjs';
@Component({
selector: 'group-cloud-widget',
templateUrl: './group-cloud.widget.html',
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class GroupCloudWidgetComponent extends WidgetComponent implements OnInit {
@@ -40,6 +50,10 @@ export class GroupCloudWidgetComponent extends WidgetComponent implements OnInit
preSelectGroup: IdentityGroupModel[];
search: FormControl;
constructor(formService: FormService) {
super(formService);
}
ngOnInit() {
if (this.field) {
this.roles = this.field.roles;

View File

@@ -16,7 +16,7 @@
*/
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { baseHost, WidgetComponent, IdentityUserModel } from '@alfresco/adf-core';
import { WidgetComponent, IdentityUserModel, FormService } from '@alfresco/adf-core';
import { FormControl } from '@angular/forms';
import { filter, takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
@@ -26,7 +26,17 @@ import { Subject } from 'rxjs';
@Component({
selector: 'people-cloud-widget',
templateUrl: './people-cloud.widget.html',
host: baseHost,
host: {
'(click)': 'event($event)',
'(blur)': 'event($event)',
'(change)': 'event($event)',
'(focus)': 'event($event)',
'(focusin)': 'event($event)',
'(focusout)': 'event($event)',
'(input)': 'event($event)',
'(invalid)': 'event($event)',
'(select)': 'event($event)'
},
encapsulation: ViewEncapsulation.None
})
export class PeopleCloudWidgetComponent extends WidgetComponent implements OnInit {
@@ -41,6 +51,10 @@ export class PeopleCloudWidgetComponent extends WidgetComponent implements OnIni
preSelectUsers: IdentityUserModel[];
search: FormControl;
constructor(formService: FormService) {
super(formService);
}
ngOnInit() {
if (this.field) {
this.roles = this.field.roles;

View File

@@ -18,12 +18,11 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { TemplateModule, FormBaseModule, PipeModule, CoreModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../material.module';
import { FormCloudComponent } from './components/form-cloud.component';
import { FormDefinitionSelectorCloudComponent } from './components/form-definition-selector-cloud.component';
import { FormDefinitionSelectorCloudService } from './services/form-definition-selector-cloud.service';
import { FormCustomOutcomesComponent } from './components/form-cloud-custom-outcomes.component';
import { ContentNodeSelectorModule } from '@alfresco/adf-content-services';
@@ -40,13 +39,10 @@ import { GroupCloudModule } from '../group/group-cloud.module';
@NgModule({
imports: [
CommonModule,
PipeModule,
TemplateModule,
FlexLayoutModule,
MaterialModule,
FormsModule,
ReactiveFormsModule,
FormBaseModule,
CoreModule,
ContentNodeSelectorModule,
PeopleCloudModule,
@@ -63,9 +59,6 @@ import { GroupCloudModule } from '../group/group-cloud.module';
PeopleCloudWidgetComponent,
GroupCloudWidgetComponent
],
providers: [
FormDefinitionSelectorCloudService
],
entryComponents: [
UploadCloudWidgetComponent,
DropdownCloudWidgetComponent,
@@ -79,7 +72,11 @@ import { GroupCloudModule } from '../group/group-cloud.module';
UploadCloudWidgetComponent,
FormDefinitionSelectorCloudComponent,
FormCustomOutcomesComponent,
AttachFileCloudWidgetComponent
DropdownCloudWidgetComponent,
AttachFileCloudWidgetComponent,
DateCloudWidgetComponent,
PeopleCloudWidgetComponent,
GroupCloudWidgetComponent
]
})
export class FormCloudModule {

View File

@@ -17,10 +17,22 @@
export * from './models/task-variable-cloud.model';
export * from './components/form-cloud-custom-outcomes.component';
export * from './components/form-cloud.component';
export * from './components/form-definition-selector-cloud.component';
export * from './components/cloud-form-rendering.service';
export * from './components/widgets/attach-file/attach-file-cloud-widget.component';
export * from './components/widgets/attach-file/upload-cloud.widget';
export * from './components/widgets/date/date-cloud.widget';
export * from './components/widgets/dropdown/dropdown-cloud.widget';
export * from './components/widgets/group/group-cloud.widget';
export * from './components/widgets/people/people-cloud.widget';
export * from './services/content-cloud-node-selector.service';
export * from './services/form-cloud.service';
export * from './services/form-definition-selector-cloud.service';
export * from './services/content-cloud-node-selector.service';
export * from './services/process-cloud-content.service';
export * from './form-cloud.module';

View File

@@ -17,7 +17,7 @@
import { TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService, CoreModule, setupTestBed, AppConfigService } from '@alfresco/adf-core';
import { AlfrescoApiService, CoreModule, setupTestBed } from '@alfresco/adf-core';
import { FormDefinitionSelectorCloudService } from './form-definition-selector-cloud.service';
declare let jasmine: any;
@@ -63,11 +63,6 @@ describe('Form Definition Selector Cloud Service', () => {
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
],
providers: [
FormDefinitionSelectorCloudService,
AlfrescoApiService,
AppConfigService
]
});

View File

@@ -20,7 +20,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { TemplateModule, PipeModule, CoreModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { MaterialModule } from '../material.module';
import { GroupCloudComponent } from './components/group-cloud.component';
import { InitialGroupNamePipe } from './pipe/group-initial.pipe';
@@ -28,8 +28,6 @@ import { InitialGroupNamePipe } from './pipe/group-initial.pipe';
@NgModule({
imports: [
CommonModule,
PipeModule,
TemplateModule,
FlexLayoutModule,
MaterialModule,
FormsModule,

View File

@@ -23,8 +23,6 @@ import { IdentityGroupModel } from '@alfresco/adf-core';
})
export class InitialGroupNamePipe implements PipeTransform {
constructor() {}
transform(group: IdentityGroupModel): string {
let result = '';
if (group) {

View File

@@ -16,4 +16,5 @@
*/
export * from './components/group-cloud.component';
export * from './pipe/group-initial.pipe';
export * from './group-cloud.module';

View File

@@ -19,15 +19,13 @@ import { NgModule } from '@angular/core';
import { PeopleCloudComponent } from './components/people-cloud.component';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../material.module';
import { TemplateModule, CoreModule, PipeModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@NgModule({
imports: [
CommonModule,
PipeModule,
TemplateModule,
FlexLayoutModule,
MaterialModule,
FormsModule,

View File

@@ -23,7 +23,6 @@ import { ProcessCloudModule } from './process/process-cloud.module';
import { GroupCloudModule } from './group/group-cloud.module';
import { FormCloudModule } from './form/form-cloud.module';
import { TaskFormModule } from './task/task-form/task-form.module';
import { UserPreferenceCloudService } from './services/user-preference-cloud.service';
import {
LocalPreferenceCloudService,
PROCESS_FILTERS_SERVICE_TOKEN,
@@ -52,8 +51,6 @@ import { CloudFormRenderingService } from './form/components/cloud-form-renderin
source: 'assets/adf-process-services-cloud'
}
},
UserPreferenceCloudService,
LocalPreferenceCloudService,
{ provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService },
{ provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService },
FormRenderingService,

View File

@@ -79,7 +79,6 @@ describe('ProcessFiltersCloudComponent', () => {
setupTestBed({
imports: [ProcessServiceCloudTestingModule, ProcessFiltersCloudModule],
providers: [
ProcessFilterCloudService,
{ provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }
]
});

View File

@@ -21,7 +21,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ProcessFiltersCloudComponent } from './components/process-filters-cloud.component';
import { MaterialModule } from '../../material.module';
import { LogService, StorageService, CoreModule, MomentDateAdapter, MOMENT_DATE_FORMATS } from '@alfresco/adf-core';
import { CoreModule, MomentDateAdapter, MOMENT_DATE_FORMATS } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http';
import { EditProcessFilterCloudComponent } from './components/edit-process-filter-cloud.component';
import { ProcessFilterDialogCloudComponent } from './components/process-filter-dialog-cloud.component';
@@ -44,8 +44,6 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
exports: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent],
entryComponents: [ProcessFilterDialogCloudComponent],
providers: [
LogService,
StorageService,
{ provide: DateAdapter, useClass: MomentDateAdapter },
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }
]

View File

@@ -17,6 +17,7 @@
export * from './components/process-filters-cloud.component';
export * from './components/edit-process-filter-cloud.component';
export * from './components/process-filter-dialog-cloud.component';
export * from './models/process-filter-cloud.model';
export * from './services/process-filter-cloud.service';
export * from './process-filters-cloud.module';

View File

@@ -44,9 +44,6 @@ describe('ProcessFilterCloudService', () => {
CoreModule.forRoot()
],
providers: [
ProcessFilterCloudService,
IdentityUserService,
LocalPreferenceCloudService,
{ provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }
]
});

View File

@@ -18,15 +18,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module';
import { DataTableModule, TemplateModule, CoreModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { ProcessHeaderCloudComponent } from './components/process-header-cloud.component';
@NgModule({
imports: [
CommonModule,
MaterialModule,
DataTableModule,
TemplateModule,
CoreModule
],

View File

@@ -19,20 +19,16 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ProcessListCloudComponent } from './components/process-list-cloud.component';
import { MaterialModule } from '../../material.module';
import { DataTableModule, TemplateModule, CoreModule } from '@alfresco/adf-core';
import { ProcessListCloudService } from './services/process-list-cloud.service';
import { CoreModule } from '@alfresco/adf-core';
@NgModule({
imports: [
CommonModule,
MaterialModule,
DataTableModule,
TemplateModule,
CoreModule
],
declarations: [ProcessListCloudComponent],
exports: [ProcessListCloudComponent],
providers: [ProcessListCloudService]
exports: [ProcessListCloudComponent]
})
export class ProcessListCloudModule { }

View File

@@ -21,7 +21,7 @@ import { Observable, throwError } from 'rxjs';
import { ProcessListCloudSortingModel } from '../models/process-list-sorting.model';
import { BaseCloudService } from '../../../services/base-cloud.service';
@Injectable()
@Injectable({ providedIn: 'root' })
export class ProcessListCloudService extends BaseCloudService {
constructor(apiService: AlfrescoApiService,

View File

@@ -23,11 +23,8 @@ import {
AlfrescoApiServiceMock,
AppConfigService,
AppConfigServiceMock,
StorageService,
LogService,
TranslationService,
TranslationMock,
UserPreferencesService,
ContextMenuModule,
CoreModule
} from '@alfresco/adf-core';
@@ -42,10 +39,7 @@ import {
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
StorageService,
LogService,
UserPreferencesService
{ provide: TranslationService, useClass: TranslationMock }
]
})
export class ProcessListCloudTestingModule { }

View File

@@ -17,13 +17,7 @@
import { TestBed } from '@angular/core/testing';
import { of, throwError } from 'rxjs';
import {
setupTestBed,
AlfrescoApiService,
AppConfigService,
LogService,
StorageService
} from '@alfresco/adf-core';
import { setupTestBed } from '@alfresco/adf-core';
import { StartProcessCloudService } from './start-process-cloud.service';
import { fakeProcessPayload } from '../mock/start-process.component.mock';
import { ProcessInstanceCloud } from '../models/process-instance-cloud.model';
@@ -35,8 +29,7 @@ describe('StartProcessCloudService', () => {
let service: StartProcessCloudService;
setupTestBed({
imports: [HttpClientModule],
providers: [StartProcessCloudService, AlfrescoApiService, AppConfigService, LogService, StorageService]
imports: [HttpClientModule]
});
beforeEach(() => {

View File

@@ -20,7 +20,7 @@ import { PreferenceCloudServiceInterface } from './preference-cloud.interface';
import { StorageService } from '@alfresco/adf-core';
import { Observable, of } from 'rxjs';
@Injectable()
@Injectable({ providedIn: 'root' })
export class LocalPreferenceCloudService implements PreferenceCloudServiceInterface {
constructor(private storage: StorageService) { }

View File

@@ -82,8 +82,7 @@ describe('Task Cloud Service', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
],
providers: [ IdentityUserService ]
]
});
beforeEach(async(() => {

View File

@@ -16,15 +16,7 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {
setupTestBed, IdentityUserService,
AlfrescoApiService,
AppConfigService,
LogService,
StorageService,
UserPreferencesService,
IdentityUserModel
} from '@alfresco/adf-core';
import { setupTestBed, IdentityUserService, AlfrescoApiService, IdentityUserModel } from '@alfresco/adf-core';
import { StartTaskCloudComponent } from './start-task-cloud.component';
import { of, throwError } from 'rxjs';
import { taskDetailsMock } from '../mock/task-details.mock';
@@ -56,15 +48,6 @@ describe('StartTaskCloudComponent', () => {
setupTestBed({
imports: [ProcessServiceCloudTestingModule, StartTaskCloudTestingModule],
providers: [
TaskCloudService,
AlfrescoApiService,
AppConfigService,
LogService,
StorageService,
UserPreferencesService,
FormDefinitionSelectorCloudService
],
schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
});

View File

@@ -22,13 +22,7 @@ import { of, throwError } from 'rxjs';
import { taskDetailsMock } from '../mock/task-details.mock';
import { TaskDetailsCloudModel } from '../models/task-details-cloud.model';
import { HttpErrorResponse } from '@angular/common/http';
import {
setupTestBed,
AlfrescoApiService,
AppConfigService,
LogService,
StorageService
} from '@alfresco/adf-core';
import { setupTestBed } from '@alfresco/adf-core';
import { TaskCloudService } from '../../services/task-cloud.service';
describe('StartTaskCloudService', () => {
@@ -37,8 +31,7 @@ describe('StartTaskCloudService', () => {
const fakeAppName: string = 'fake-app';
setupTestBed({
imports: [StartTaskCloudTestingModule],
providers: [TaskCloudService, AlfrescoApiService, AppConfigService, LogService, StorageService]
imports: [StartTaskCloudTestingModule]
});
beforeEach(() => {

View File

@@ -19,18 +19,16 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { MaterialModule } from '../../material.module';
import { TemplateModule, CoreModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { StartTaskCloudComponent } from './components/start-task-cloud.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GroupCloudModule } from '../../group/group-cloud.module';
import { TaskCloudService } from '../services/task-cloud.service';
import { FormCloudModule } from '../../form/form-cloud.module';
import { PeopleCloudModule } from '../../people/people-cloud.module';
@NgModule({
imports: [
CommonModule,
TemplateModule,
FlexLayoutModule,
MaterialModule,
FormsModule,
@@ -41,9 +39,6 @@ import { PeopleCloudModule } from '../../people/people-cloud.module';
PeopleCloudModule
],
declarations: [StartTaskCloudComponent],
providers: [
TaskCloudService
],
exports: [
StartTaskCloudComponent
]

View File

@@ -55,7 +55,6 @@ describe('TaskFiltersCloudComponent', () => {
setupTestBed({
imports: [ProcessServiceCloudTestingModule, TaskFiltersCloudModule],
providers: [
TaskFilterCloudService,
{ provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }
]
});

View File

@@ -22,10 +22,7 @@ import {
AppConfigService,
AppConfigServiceMock,
IdentityUserService,
JwtHelperService,
LogService,
setupTestBed,
StorageService
setupTestBed
} from '@alfresco/adf-core';
import { of } from 'rxjs';
import { TASK_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service';
@@ -58,11 +55,6 @@ describe('TaskFilterCloudService', () => {
HttpClientTestingModule
],
providers: [
TaskFilterCloudService,
IdentityUserService,
LogService,
JwtHelperService,
StorageService,
{ provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService },
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
@@ -243,9 +235,6 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
HttpClientTestingModule
],
providers: [
TaskFilterCloudService,
IdentityUserService,
StorageService,
{ provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }
]
});

View File

@@ -21,7 +21,7 @@ import { CommonModule } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { TaskFiltersCloudComponent } from './components/task-filters-cloud.component';
import { MaterialModule } from '../../material.module';
import { LogService, StorageService, CoreModule, MomentDateAdapter, MOMENT_DATE_FORMATS } from '@alfresco/adf-core';
import { CoreModule, MomentDateAdapter, MOMENT_DATE_FORMATS } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http';
import { EditTaskFilterCloudComponent } from './components/edit-task-filter-cloud.component';
import { TaskFilterDialogCloudComponent } from './components/task-filter-dialog-cloud.component';
@@ -42,8 +42,6 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
declarations: [TaskFiltersCloudComponent, EditTaskFilterCloudComponent, TaskFilterDialogCloudComponent],
exports: [TaskFiltersCloudComponent, EditTaskFilterCloudComponent],
providers: [
LogService,
StorageService,
{ provide: DateAdapter, useClass: MomentDateAdapter },
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }
],

View File

@@ -31,7 +31,7 @@ import {
suspendedTaskDetailsCloudMock,
taskDetailsWithParentTaskIdMock
} from '../mocks/task-details-cloud.mock';
import moment = require('moment');
import moment from 'moment-es6';
describe('TaskHeaderCloudComponent', () => {
let component: TaskHeaderCloudComponent;
@@ -51,8 +51,7 @@ describe('TaskHeaderCloudComponent', () => {
ProcessServiceCloudTestingModule,
TaskHeaderCloudModule,
RouterTestingModule
],
providers: [TaskCloudService]
]
});
beforeEach(() => {

View File

@@ -18,16 +18,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module';
import { DataTableModule, TemplateModule, CardViewModule, CoreModule } from '@alfresco/adf-core';
import { CoreModule } from '@alfresco/adf-core';
import { TaskHeaderCloudComponent } from './components/task-header-cloud.component';
@NgModule({
imports: [
CommonModule,
MaterialModule,
DataTableModule,
TemplateModule,
CardViewModule,
CoreModule
],
declarations: [

View File

@@ -83,8 +83,7 @@ describe('TaskListCloudComponent', () => {
setupTestBed({
imports: [
ProcessServiceCloudTestingModule, TaskListCloudModule
],
providers: [TaskListCloudService]
]
});
beforeEach(() => {

View File

@@ -19,19 +19,15 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module';
import { TaskListCloudComponent } from './components/task-list-cloud.component';
import { DataTableModule, TemplateModule, CoreModule } from '@alfresco/adf-core';
import { TaskListCloudService } from './services/task-list-cloud.service';
import { CoreModule } from '@alfresco/adf-core';
@NgModule({
imports: [
CommonModule,
MaterialModule,
DataTableModule,
TemplateModule,
CoreModule
],
declarations: [TaskListCloudComponent],
exports: [TaskListCloudComponent],
providers: [TaskListCloudService]
exports: [TaskListCloudComponent]
})
export class TaskListCloudModule { }

View File

@@ -24,11 +24,8 @@ import {
AlfrescoApiServiceMock,
AppConfigService,
AppConfigServiceMock,
StorageService,
LogService,
TranslationService,
TranslationMock,
UserPreferencesService,
ContextMenuModule
} from '@alfresco/adf-core';
@@ -42,10 +39,7 @@ import {
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
StorageService,
LogService,
UserPreferencesService
{ provide: TranslationService, useClass: TranslationMock }
]
})
export class TaskListTestingModule {}

View File

@@ -23,11 +23,8 @@ import {
AlfrescoApiServiceMock,
AppConfigService,
AppConfigServiceMock,
StorageService,
LogService,
TranslationService,
TranslationMock,
UserPreferencesService,
ContextMenuModule,
CoreModule
} from '@alfresco/adf-core';
@@ -42,10 +39,7 @@ import {
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
StorageService,
LogService,
UserPreferencesService
{ provide: TranslationService, useClass: TranslationMock }
]
})
export class ProcessServiceCloudTestingModule {}