ACS-8586: Remove internal dependency on PipeModule (#10086)

This commit is contained in:
Denys Vuika
2024-08-12 14:00:46 -04:00
committed by GitHub
parent 9527f067a3
commit 58484dd907
21 changed files with 52 additions and 183 deletions

View File

@@ -26,14 +26,13 @@ import { NodeAspectService } from '../../../aspect-list/services/node-aspect.ser
import { ContentMetadataService } from '../../services/content-metadata.service'; import { ContentMetadataService } from '../../services/content-metadata.service';
import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum'; import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { AlfrescoApiService, AlfrescoApiServiceMock, AuthModule, PipeModule, TranslationMock, TranslationService } from '@alfresco/adf-core'; import { AlfrescoApiService, AlfrescoApiServiceMock, AuthModule, TranslationMock, TranslationService } from '@alfresco/adf-core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { versionCompatibilityFactory } from '../../../version-compatibility/version-compatibility-factory'; import { versionCompatibilityFactory } from '../../../version-compatibility/version-compatibility-factory';
import { VersionCompatibilityService } from '../../../version-compatibility'; import { VersionCompatibilityService } from '../../../version-compatibility';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatTooltipModule } from '@angular/material/tooltip';
import { CategoryService } from '../../../category'; import { CategoryService } from '../../../category';
import { TagService } from '../../../tag'; import { TagService } from '../../../tag';
import { PropertyDescriptorsService } from '../../public-api'; import { PropertyDescriptorsService } from '../../public-api';
@@ -59,9 +58,7 @@ describe('ContentMetadataCardComponent', () => {
AuthModule.forRoot({ useHash: true }), AuthModule.forRoot({ useHash: true }),
HttpClientModule, HttpClientModule,
MatDialogModule, MatDialogModule,
PipeModule,
MatSnackBarModule, MatSnackBarModule,
MatTooltipModule,
ContentMetadataCardComponent ContentMetadataCardComponent
], ],
providers: [ providers: [

View File

@@ -27,7 +27,6 @@ import {
CardViewBaseItemModel, CardViewBaseItemModel,
CardViewComponent, CardViewComponent,
NotificationService, NotificationService,
PipeModule,
TranslationMock, TranslationMock,
TranslationService, TranslationService,
UpdateNotification UpdateNotification
@@ -51,8 +50,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatTooltipModule } from '@angular/material/tooltip';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatChipHarness } from '@angular/material/chips/testing'; import { MatChipHarness } from '@angular/material/chips/testing';
@@ -193,9 +190,6 @@ describe('ContentMetadataComponent', () => {
HttpClientModule, HttpClientModule,
MatDialogModule, MatDialogModule,
MatSnackBarModule, MatSnackBarModule,
MatProgressBarModule,
MatTooltipModule,
PipeModule,
ContentMetadataComponent ContentMetadataComponent
], ],
providers: [ providers: [

View File

@@ -15,16 +15,15 @@
* limitations under the License. * limitations under the License.
*/ */
import { Injectable } from '@angular/core'; import { inject, Injectable } from '@angular/core';
import { Node } from '@alfresco/js-api'; import { Node } from '@alfresco/js-api';
import { CardViewDateItemModel, CardViewTextItemModel, FileSizePipe } from '@alfresco/adf-core'; import { CardViewDateItemModel, CardViewTextItemModel, FileSizePipe, TranslationService } from '@alfresco/adf-core';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class BasicPropertiesService { export class BasicPropertiesService {
private translationService = inject(TranslationService);
constructor(private fileSizePipe: FileSizePipe) {
}
getProperties(node: Node) { getProperties(node: Node) {
const sizeInBytes = node.content ? node.content.sizeInBytes : ''; const sizeInBytes = node.content ? node.content.sizeInBytes : '';
@@ -63,7 +62,7 @@ export class BasicPropertiesService {
label: 'CORE.METADATA.BASIC.SIZE', label: 'CORE.METADATA.BASIC.SIZE',
value: sizeInBytes, value: sizeInBytes,
key: 'content.sizeInBytes', key: 'content.sizeInBytes',
pipes: [{ pipe: this.fileSizePipe }], pipes: [{ pipe: new FileSizePipe(this.translationService) }],
editable: false editable: false
}), }),
new CardViewTextItemModel({ new CardViewTextItemModel({

View File

@@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { Injectable } from '@angular/core'; import { inject, Injectable } from '@angular/core';
import { import {
CardViewItemProperties, CardViewItemProperties,
CardViewItem, CardViewItem,
@@ -30,7 +30,8 @@ import {
MultiValuePipe, MultiValuePipe,
AppConfigService, AppConfigService,
DecimalNumberPipe, DecimalNumberPipe,
LogService LogService,
UserPreferencesService
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { Property, CardViewGroup, OrganisedPropertyGroup } from '../interfaces/content-metadata.interfaces'; import { Property, CardViewGroup, OrganisedPropertyGroup } from '../interfaces/content-metadata.interfaces';
import { of } from 'rxjs'; import { of } from 'rxjs';
@@ -52,14 +53,13 @@ export const RECOGNISED_ECM_TYPES = [D_TEXT, D_MLTEXT, D_DATE, D_DATETIME, D_INT
providedIn: 'root' providedIn: 'root'
}) })
export class PropertyGroupTranslatorService { export class PropertyGroupTranslatorService {
private userPreferenceService = inject(UserPreferencesService);
private appConfig = inject(AppConfigService);
private logService = inject(LogService);
valueSeparator: string; valueSeparator: string;
constructor( constructor() {
private multiValuePipe: MultiValuePipe,
private decimalNumberPipe: DecimalNumberPipe,
private appConfig: AppConfigService,
private logService: LogService
) {
this.valueSeparator = this.appConfig.get<string>('content-metadata.multi-value-pipe-separator'); this.valueSeparator = this.appConfig.get<string>('content-metadata.multi-value-pipe-separator');
} }
@@ -137,7 +137,7 @@ export class PropertyGroupTranslatorService {
cardViewItemProperty = new CardViewIntItemModel( cardViewItemProperty = new CardViewIntItemModel(
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
pipes: [{ pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }]
}) })
); );
break; break;
@@ -146,7 +146,7 @@ export class PropertyGroupTranslatorService {
cardViewItemProperty = new CardViewLongItemModel( cardViewItemProperty = new CardViewLongItemModel(
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
pipes: [{ pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }]
}) })
); );
break; break;
@@ -156,7 +156,10 @@ export class PropertyGroupTranslatorService {
cardViewItemProperty = new CardViewFloatItemModel( cardViewItemProperty = new CardViewFloatItemModel(
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
pipes: [{ pipe: this.decimalNumberPipe }, { pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [
{ pipe: new DecimalNumberPipe(this.userPreferenceService, this.appConfig) },
{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }
]
}) })
); );
break; break;
@@ -165,7 +168,7 @@ export class PropertyGroupTranslatorService {
cardViewItemProperty = new CardViewDateItemModel( cardViewItemProperty = new CardViewDateItemModel(
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
pipes: [{ pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }]
}) })
); );
break; break;
@@ -174,7 +177,7 @@ export class PropertyGroupTranslatorService {
cardViewItemProperty = new CardViewDatetimeItemModel( cardViewItemProperty = new CardViewDatetimeItemModel(
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
pipes: [{ pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }]
}) })
); );
break; break;
@@ -189,7 +192,7 @@ export class PropertyGroupTranslatorService {
Object.assign(propertyDefinition, { Object.assign(propertyDefinition, {
multivalued: isMultiValued, multivalued: isMultiValued,
multiline: isMultiValued, multiline: isMultiValued,
pipes: [{ pipe: this.multiValuePipe, params: [this.valueSeparator] }] pipes: [{ pipe: new MultiValuePipe(), params: [this.valueSeparator] }]
}) })
); );
} }

View File

@@ -17,7 +17,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { DownloadZipDialogComponent } from './download-zip.dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog';
import { PipeModule } from '@alfresco/adf-core';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
@@ -26,14 +25,7 @@ import { CommonModule } from '@angular/common';
@NgModule({ @NgModule({
declarations: [DownloadZipDialogComponent], declarations: [DownloadZipDialogComponent],
imports: [ imports: [CommonModule, MatDialogModule, MatProgressBarModule, MatButtonModule, TranslateModule],
CommonModule,
PipeModule,
MatDialogModule,
MatProgressBarModule,
MatButtonModule,
TranslateModule
],
exports: [DownloadZipDialogComponent] exports: [DownloadZipDialogComponent]
}) })
export class DownloadZipDialogModule {} export class DownloadZipDialogModule {}

View File

@@ -26,10 +26,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatChipHarness, MatChipListboxHarness } from '@angular/material/chips/testing'; import { MatChipHarness, MatChipListboxHarness } from '@angular/material/chips/testing';
import { MatButtonHarness } from '@angular/material/button/testing'; import { MatButtonHarness } from '@angular/material/button/testing';
import { MatIconHarness } from '@angular/material/icon/testing'; import { MatIconHarness } from '@angular/material/icon/testing';
import { MatChipsModule } from '@angular/material/chips'; import { CoreTestingModule } from '@alfresco/adf-core';
import { MatMenuModule } from '@angular/material/menu';
import { MatButtonModule } from '@angular/material/button';
import { TranslateModule } from '@ngx-translate/core';
describe('CardViewArrayItemComponent', () => { describe('CardViewArrayItemComponent', () => {
let loader: HarnessLoader; let loader: HarnessLoader;
@@ -54,7 +51,7 @@ describe('CardViewArrayItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), MatMenuModule, MatButtonModule, MatChipsModule] imports: [CoreTestingModule, CardViewArrayItemComponent]
}); });
fixture = TestBed.createComponent(CardViewArrayItemComponent); fixture = TestBed.createComponent(CardViewArrayItemComponent);
service = TestBed.inject(CardViewUpdateService); service = TestBed.inject(CardViewUpdateService);

View File

@@ -22,21 +22,14 @@ import { CardViewUpdateService } from '../../services/card-view-update.service';
import { CardViewDateItemComponent } from './card-view-dateitem.component'; import { CardViewDateItemComponent } from './card-view-dateitem.component';
import { ClipboardService } from '../../../clipboard/clipboard.service'; import { ClipboardService } from '../../../clipboard/clipboard.service';
import { CardViewDatetimeItemModel } from '../../models/card-view-datetimeitem.model'; import { CardViewDatetimeItemModel } from '../../models/card-view-datetimeitem.model';
import { TranslateModule } from '@ngx-translate/core';
import { AppConfigService } from '../../../app-config/app-config.service'; import { AppConfigService } from '../../../app-config/app-config.service';
import { MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; import { MatDatetimepickerInputEvent } from '@mat-datetimepicker/core';
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatChipHarness } from '@angular/material/chips/testing'; import { MatChipHarness } from '@angular/material/chips/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { TranslationMock } from '../../../mock';
import { TranslationService } from '../../../translation';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatDialogModule } from '@angular/material/dialog';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { addMinutes } from 'date-fns'; import { addMinutes } from 'date-fns';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { CoreTestingModule } from '@alfresco/adf-core';
describe('CardViewDateItemComponent', () => { describe('CardViewDateItemComponent', () => {
let loader: HarnessLoader; let loader: HarnessLoader;
@@ -46,16 +39,7 @@ describe('CardViewDateItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [CoreTestingModule, MatSnackBarModule, CardViewDateItemComponent]
TranslateModule.forRoot(),
NoopAnimationsModule,
HttpClientTestingModule,
MatSnackBarModule,
MatDatepickerModule,
MatDialogModule,
MatTooltipModule
],
providers: [ClipboardService, { provide: TranslationService, useClass: TranslationMock }]
}); });
appConfigService = TestBed.inject(AppConfigService); appConfigService = TestBed.inject(AppConfigService);
appConfigService.config.dateValues = { appConfigService.config.dateValues = {

View File

@@ -20,8 +20,7 @@ import { By } from '@angular/platform-browser';
import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model'; import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model';
import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component'; import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component';
import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewUpdateService } from '../../services/card-view-update.service';
import { TranslateModule } from '@ngx-translate/core'; import { CoreTestingModule } from '@alfresco/adf-core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
describe('CardViewKeyValuePairsItemComponent', () => { describe('CardViewKeyValuePairsItemComponent', () => {
let fixture: ComponentFixture<CardViewKeyValuePairsItemComponent>; let fixture: ComponentFixture<CardViewKeyValuePairsItemComponent>;
@@ -32,8 +31,7 @@ describe('CardViewKeyValuePairsItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [NoopAnimationsModule, TranslateModule.forRoot(), CardViewKeyValuePairsItemComponent], imports: [CoreTestingModule, CardViewKeyValuePairsItemComponent]
providers: [CardViewUpdateService]
}); });
fixture = TestBed.createComponent(CardViewKeyValuePairsItemComponent); fixture = TestBed.createComponent(CardViewKeyValuePairsItemComponent);
cardViewUpdateService = TestBed.inject(CardViewUpdateService); cardViewUpdateService = TestBed.inject(CardViewUpdateService);

View File

@@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser';
import { CardViewMapItemModel } from '../../models/card-view-mapitem.model'; import { CardViewMapItemModel } from '../../models/card-view-mapitem.model';
import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewUpdateService } from '../../services/card-view-update.service';
import { CardViewMapItemComponent } from './card-view-mapitem.component'; import { CardViewMapItemComponent } from './card-view-mapitem.component';
import { TranslateModule } from '@ngx-translate/core'; import { CoreTestingModule } from '@alfresco/adf-core';
describe('CardViewMapItemComponent', () => { describe('CardViewMapItemComponent', () => {
let service: CardViewUpdateService; let service: CardViewUpdateService;
@@ -33,7 +33,7 @@ describe('CardViewMapItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot()] imports: [CoreTestingModule, CardViewMapItemComponent]
}); });
fixture = TestBed.createComponent(CardViewMapItemComponent); fixture = TestBed.createComponent(CardViewMapItemComponent);
service = TestBed.inject(CardViewUpdateService); service = TestBed.inject(CardViewUpdateService);

View File

@@ -25,10 +25,7 @@ import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatSelectHarness } from '@angular/material/select/testing'; import { MatSelectHarness } from '@angular/material/select/testing';
import { MatFormFieldHarness } from '@angular/material/form-field/testing'; import { MatFormFieldHarness } from '@angular/material/form-field/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { CoreTestingModule } from '@alfresco/adf-core';
import { MatSelectModule } from '@angular/material/select';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core';
describe('CardViewSelectItemComponent', () => { describe('CardViewSelectItemComponent', () => {
let loader: HarnessLoader; let loader: HarnessLoader;
@@ -62,7 +59,7 @@ describe('CardViewSelectItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [NoopAnimationsModule, TranslateModule.forRoot(), HttpClientTestingModule, MatSelectModule] imports: [CoreTestingModule, CardViewSelectItemComponent]
}); });
fixture = TestBed.createComponent(CardViewSelectItemComponent); fixture = TestBed.createComponent(CardViewSelectItemComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View File

@@ -25,7 +25,7 @@ import { CardViewItemFloatValidator } from '../../validators/card-view-item-floa
import { CardViewItemIntValidator } from '../../validators/card-view-item-int.validator'; import { CardViewItemIntValidator } from '../../validators/card-view-item-int.validator';
import { CardViewIntItemModel } from '../../models/card-view-intitem.model'; import { CardViewIntItemModel } from '../../models/card-view-intitem.model';
import { CardViewFloatItemModel } from '../../models/card-view-floatitem.model'; import { CardViewFloatItemModel } from '../../models/card-view-floatitem.model';
import { MatChipInputEvent, MatChipsModule } from '@angular/material/chips'; import { MatChipInputEvent } from '@angular/material/chips';
import { ClipboardService } from '../../../clipboard/clipboard.service'; import { ClipboardService } from '../../../clipboard/clipboard.service';
import { DebugElement, SimpleChange } from '@angular/core'; import { DebugElement, SimpleChange } from '@angular/core';
import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface'; import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface';
@@ -111,7 +111,7 @@ describe('CardViewTextItemComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [CoreTestingModule, MatChipsModule] imports: [CoreTestingModule, CardViewTextItemComponent]
}); });
fixture = TestBed.createComponent(CardViewTextItemComponent); fixture = TestBed.createComponent(CardViewTextItemComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View File

@@ -20,7 +20,6 @@ import { By } from '@angular/platform-browser';
import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
import { CardViewComponent } from './card-view.component'; import { CardViewComponent } from './card-view.component';
import { TranslateModule } from '@ngx-translate/core';
import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model'; import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { CardViewSelectItemOption } from '../../interfaces/card-view-selectitem-properties.interface'; import { CardViewSelectItemOption } from '../../interfaces/card-view-selectitem-properties.interface';
@@ -29,36 +28,19 @@ import { CardViewItemDispatcherComponent } from '../card-view-item-dispatcher/ca
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatSelectHarness } from '@angular/material/select/testing'; import { MatSelectHarness } from '@angular/material/select/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar';
import { TranslationService } from '../../../translation';
import { TranslationMock } from '../../../mock';
import { MatTooltipModule } from '@angular/material/tooltip';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatDatepickerModule } from '@angular/material/datepicker'; import { CoreTestingModule } from '@alfresco/adf-core';
import { MatSelectModule } from '@angular/material/select';
describe('CardViewComponent', () => { describe('CardViewComponent', () => {
let loader: HarnessLoader; let loader: HarnessLoader;
let fixture: ComponentFixture<CardViewComponent>; let fixture: ComponentFixture<CardViewComponent>;
let component: CardViewComponent; let component: CardViewComponent;
beforeEach(async () => { beforeEach(() => {
await TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [CoreTestingModule, MatSnackBarModule, MatDialogModule, CardViewComponent]
TranslateModule.forRoot(), });
NoopAnimationsModule,
MatSnackBarModule,
MatTooltipModule,
MatDialogModule,
MatDatepickerModule,
MatSelectModule,
HttpClientTestingModule,
CardViewComponent
],
providers: [{ provide: TranslationService, useClass: TranslationMock }]
}).compileComponents();
fixture = TestBed.createComponent(CardViewComponent); fixture = TestBed.createComponent(CardViewComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View File

@@ -99,7 +99,6 @@ import { MaterialModule } from './material.module';
}), }),
MaterialModule MaterialModule
], ],
providers: [...CORE_PIPES],
exports: [ exports: [
...ABOUT_DIRECTIVES, ...ABOUT_DIRECTIVES,
...VIEWER_DIRECTIVES, ...VIEWER_DIRECTIVES,

View File

@@ -20,17 +20,13 @@ import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model'; import { FormModel } from '../core/form.model';
import { DateTimeWidgetComponent } from './date-time.widget'; import { DateTimeWidgetComponent } from './date-time.widget';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { MatTooltipModule } from '@angular/material/tooltip';
import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldTypes } from '../core/form-field-types';
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatInputHarness } from '@angular/material/input/testing'; import { MatInputHarness } from '@angular/material/input/testing';
import { addMinutes } from 'date-fns'; import { addMinutes } from 'date-fns';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core'; import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';
import { MatMenuModule } from '@angular/material/menu';
import { MatButtonModule } from '@angular/material/button';
import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDatepickerModule } from '@angular/material/datepicker';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
@@ -49,13 +45,10 @@ describe('DateTimeWidgetComponent', () => {
HttpClientTestingModule, HttpClientTestingModule,
NoopAnimationsModule, NoopAnimationsModule,
MatDialogModule, MatDialogModule,
MatMenuModule,
MatFormFieldModule,
MatNativeDatetimeModule, MatNativeDatetimeModule,
MatDatepickerModule, MatDatepickerModule,
MatButtonModule,
MatDatetimepickerModule, MatDatetimepickerModule,
MatTooltipModule DateTimeWidgetComponent
] ]
}); });
fixture = TestBed.createComponent(DateTimeWidgetComponent); fixture = TestBed.createComponent(DateTimeWidgetComponent);

View File

@@ -20,15 +20,10 @@ import { FormFieldTypes } from '../core/form-field-types';
import { FormFieldModel } from '../core/form-field.model'; import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model'; import { FormModel } from '../core/form.model';
import { TextWidgetComponent } from './text.widget'; import { TextWidgetComponent } from './text.widget';
import { FormsModule } from '@angular/forms';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatInputHarness } from '@angular/material/input/testing'; import { MatInputHarness } from '@angular/material/input/testing';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatTooltipModule } from '@angular/material/tooltip';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
describe('TextWidgetComponent', () => { describe('TextWidgetComponent', () => {
@@ -42,15 +37,7 @@ describe('TextWidgetComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [TranslateModule.forRoot(), NoopAnimationsModule, TextWidgetComponent]
TranslateModule.forRoot(),
NoopAnimationsModule,
MatInputModule,
MatFormFieldModule,
MatTooltipModule,
FormsModule,
MatIconModule
]
}); });
fixture = TestBed.createComponent(TextWidgetComponent); fixture = TestBed.createComponent(TextWidgetComponent);
widget = fixture.componentInstance; widget = fixture.componentInstance;

View File

@@ -61,7 +61,6 @@ export const CORE_PIPES = [
*/ */
@NgModule({ @NgModule({
imports: [...CORE_PIPES], imports: [...CORE_PIPES],
providers: [...CORE_PIPES],
exports: [...CORE_PIPES] exports: [...CORE_PIPES]
}) })
export class PipeModule {} export class PipeModule {}

View File

@@ -38,21 +38,11 @@ import { NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { MatFormFieldModule } from '@angular/material/form-field'; import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { MatTooltipModule } from '@angular/material/tooltip';
@Component({ @Component({
selector: 'date-widget', selector: 'date-widget',
standalone: true, standalone: true,
imports: [ imports: [NgIf, TranslateModule, MatFormFieldModule, MatInputModule, MatDatepickerModule, ReactiveFormsModule, ErrorWidgetComponent],
NgIf,
TranslateModule,
MatFormFieldModule,
MatInputModule,
MatDatepickerModule,
MatTooltipModule,
ReactiveFormsModule,
ErrorWidgetComponent
],
providers: [ providers: [
{ provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS }, { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS },
{ provide: DateAdapter, useClass: AdfDateFnsAdapter } { provide: DateAdapter, useClass: AdfDateFnsAdapter }

View File

@@ -18,12 +18,8 @@
import { SimpleChange } from '@angular/core'; import { SimpleChange } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CreateProcessAttachmentComponent } from './create-process-attachment.component'; import { CreateProcessAttachmentComponent } from './create-process-attachment.component';
import { TranslateModule } from '@ngx-translate/core';
import { HttpClientModule } from '@angular/common/http';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core'; import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
import { ProcessTestingModule } from '../../testing/process.testing.module';
declare let jasmine: any; declare let jasmine: any;
@@ -52,13 +48,7 @@ describe('CreateProcessAttachmentComponent', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [ProcessTestingModule, CreateProcessAttachmentComponent],
TranslateModule.forRoot(),
NoopAnimationsModule,
HttpClientModule,
MatButtonModule,
MatIconModule
],
providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }] providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
}); });
fixture = TestBed.createComponent(CreateProcessAttachmentComponent); fixture = TestBed.createComponent(CreateProcessAttachmentComponent);

View File

@@ -26,13 +26,6 @@ import { ProcessContentService } from '../../form/services/process-content.servi
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatMenuItemHarness } from '@angular/material/menu/testing'; import { MatMenuItemHarness } from '@angular/material/menu/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { MatMenuModule } from '@angular/material/menu';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatTooltipModule } from '@angular/material/tooltip';
import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
import { TranslateModule } from '@ngx-translate/core';
describe('TaskAttachmentList', () => { describe('TaskAttachmentList', () => {
let component: TaskAttachmentListComponent; let component: TaskAttachmentListComponent;
@@ -47,15 +40,7 @@ describe('TaskAttachmentList', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [ProcessTestingModule, TaskAttachmentListComponent]
TranslateModule.forRoot(),
HttpClientTestingModule,
MatMenuModule,
NoopAnimationsModule,
MatProgressSpinnerModule,
MatTooltipModule
],
providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
}); });
fixture = TestBed.createComponent(TaskAttachmentListComponent); fixture = TestBed.createComponent(TaskAttachmentListComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View File

@@ -22,13 +22,11 @@ import {
AppConfigServiceMock, AppConfigServiceMock,
FormRenderingService, FormRenderingService,
LocalizedDatePipe, LocalizedDatePipe,
PipeModule,
TemplateModule,
TranslationMock, TranslationMock,
TranslationService TranslationService
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { of, throwError } from 'rxjs'; import { of, throwError } from 'rxjs';
import { MatSelectChange, MatSelectModule } from '@angular/material/select'; import { MatSelectChange } from '@angular/material/select';
import { ProcessService } from '../../services/process.service'; import { ProcessService } from '../../services/process.service';
import { import {
newProcess, newProcess,
@@ -45,11 +43,7 @@ import { MatFormFieldHarness } from '@angular/material/form-field/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing'; import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientTestingModule } from '@angular/common/http/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing';
import { MatInputModule } from '@angular/material/input';
import { MatIconModule } from '@angular/material/icon';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { RestVariable } from '@alfresco/js-api'; import { RestVariable } from '@alfresco/js-api';
import { ActivitiContentService } from '../../../form/services/activiti-alfresco.service'; import { ActivitiContentService } from '../../../form/services/activiti-alfresco.service';
import { AppsProcessService } from '../../../services/apps-process.service'; import { AppsProcessService } from '../../../services/apps-process.service';
@@ -74,20 +68,7 @@ describe('StartProcessComponent', () => {
beforeEach(() => { beforeEach(() => {
getTestBed().configureTestingModule({ getTestBed().configureTestingModule({
imports: [ imports: [TranslateModule.forRoot(), NoopAnimationsModule, HttpClientTestingModule, StartProcessInstanceComponent],
TranslateModule.forRoot(),
TemplateModule,
NoopAnimationsModule,
ReactiveFormsModule,
FormsModule,
HttpClientTestingModule,
MatInputModule,
MatIconModule,
MatSelectModule,
MatAutocompleteModule,
PipeModule,
StartProcessInstanceComponent
],
providers: [ providers: [
LocalizedDatePipe, LocalizedDatePipe,
ActivitiContentService, ActivitiContentService,

View File

@@ -32,11 +32,13 @@ import {
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ProcessFormRenderingService } from '../form/process-form-rendering.service'; import { ProcessFormRenderingService } from '../form/process-form-rendering.service';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
@NgModule({ @NgModule({
imports: [ imports: [
AuthModule.forRoot({ useHash: true }), AuthModule.forRoot({ useHash: true }),
NoopAnimationsModule, NoopAnimationsModule,
HttpClientTestingModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreModule.forRoot(),
ProcessModule.forRoot(), ProcessModule.forRoot(),