From 510ae48b8bd311aee78bbfcbbe6ede7d74fb1ddb Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 18 Feb 2025 11:08:33 +0100
Subject: [PATCH] OZG-5977 fix imports/tests
---
alfa-client/libs/binary-file/src/index.ts | 2 ++
...multi-file-upload-editor.component.spec.ts | 2 +-
.../multi-file-upload-editor.component.ts | 6 ++---
.../multi-file-upload-list-item.component.ts | 4 +--
.../multi-file-upload-list.component.ts | 4 +--
.../kommentar-form.component.spec.ts | 25 +++++++++++++++----
.../pipe/to-embedded-resource.pipe.spec.ts | 6 ++---
7 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/alfa-client/libs/binary-file/src/index.ts b/alfa-client/libs/binary-file/src/index.ts
index 0de3c8e566..6c705b5883 100644
--- a/alfa-client/libs/binary-file/src/index.ts
+++ b/alfa-client/libs/binary-file/src/index.ts
@@ -28,4 +28,6 @@ export * from './lib/binary-file-uri-container/binary-file-uri-container.compone
export * from './lib/binary-file.module';
export * from './lib/binary-file2-container/binary-file2-container.component';
export * from './lib/horizontal-binary-file-list/horizontal-binary-file-list.component';
+export * from './lib/multi-file-upload-editor/multi-file-upload-editor.component';
+export * from './lib/multi-file-upload-list-container/multi-file-upload-list-container.component';
export * from './lib/vertical-binary-file-list/vertical-binary-file-list.component';
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
index d853b3ad0f..f6418ff633 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.spec.ts
@@ -64,9 +64,9 @@ describe('MultiFileUploadEditorComponent', () => {
await TestBed.configureTestingModule({
declarations: [
MultiFileUploadEditorComponent,
+ ConvertForDataTestPipe,
MockComponent(SpinnerIconComponent),
MockComponent(FileUploadButtonComponent),
- ConvertForDataTestPipe,
],
providers: [
{
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
index e7cb960516..69efe8e398 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.ts
@@ -24,7 +24,7 @@
import { BinaryFileModule } from '@alfa-client/binary-file';
import { BinaryFileService, FileUploadType } from '@alfa-client/binary-file-shared';
import { KOMMENTAR_UPLOADED_ATTACHMENTS } from '@alfa-client/kommentar-shared';
-import { TechSharedModule } from '@alfa-client/tech-shared';
+import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
import { AsyncPipe } from '@angular/common';
import { Component, HostListener, inject, Input } from '@angular/core';
import { ControlContainer, FormGroupDirective, ReactiveFormsModule } from '@angular/forms';
@@ -40,13 +40,13 @@ import { Observable } from 'rxjs';
viewProviders: [{ provide: ControlContainer, useExisting: FormGroupDirective }],
standalone: true,
imports: [
+ AsyncPipe,
FileUploadButtonComponent,
AttachmentIconComponent,
SpinnerIconComponent,
ReactiveFormsModule,
- TechSharedModule,
BinaryFileModule,
- AsyncPipe,
+ ConvertForDataTestPipe,
],
})
export class MultiFileUploadEditorComponent extends FormControlEditorAbstractComponent {
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
index 8c0fe26c61..78ac718278 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list-item/multi-file-upload-list-item.component.ts
@@ -1,6 +1,6 @@
import { BinaryFileModule } from '@alfa-client/binary-file';
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
-import { StateResource, TechSharedModule } from '@alfa-client/tech-shared';
+import { StateResource } from '@alfa-client/tech-shared';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { AttachmentComponent, AttachmentWrapperComponent } from '@ods/system';
@@ -13,7 +13,7 @@ export interface FileToDelete {
selector: 'ods-multi-file-upload-list-item',
standalone: true,
templateUrl: './multi-file-upload-list-item.component.html',
- imports: [AttachmentComponent, AttachmentWrapperComponent, TechSharedModule, BinaryFileModule],
+ imports: [AttachmentComponent, AttachmentWrapperComponent, BinaryFileModule],
})
export class MultiFileUploadListItemComponent {
@Input() uploadStateResource: StateResource<BinaryFileResource>;
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
index b8c37249f5..cc9392083a 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-list-container/multi-file-upload-list/multi-file-upload-list.component.ts
@@ -1,6 +1,6 @@
import { BinaryFileModule } from '@alfa-client/binary-file';
import { BinaryFileResource, UploadFile } from '@alfa-client/binary-file-shared';
-import { doOnValidStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
+import { doOnValidStateResource, StateResource } from '@alfa-client/tech-shared';
import { AsyncPipe } from '@angular/common';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormGroupDirective, UntypedFormArray, UntypedFormControl } from '@angular/forms';
@@ -19,7 +19,7 @@ export const _horizontalClasses: string = 'flex flex-row flex-wrap';
selector: 'ods-multi-file-upload-list',
standalone: true,
templateUrl: './multi-file-upload-list.component.html',
- imports: [AsyncPipe, TechSharedModule, BinaryFileModule, MultiFileUploadListItemComponent],
+ imports: [AsyncPipe, BinaryFileModule, MultiFileUploadListItemComponent],
})
export class MultiFileUploadListComponent implements OnInit {
@Input() parentFormArrayName: string;
diff --git a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
index 6915da935f..f6b0dd9fe0 100644
--- a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
+++ b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
@@ -21,11 +21,28 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { BinaryFileAttachmentContainerComponent } from '@alfa-client/binary-file';
+import {
+ BinaryFileAttachmentContainerComponent,
+ MultiFileUploadEditorComponent,
+ MultiFileUploadListContainerComponent,
+} from '@alfa-client/binary-file';
import { CommandResource } from '@alfa-client/command-shared';
-import { KOMMENTAR_UPLOADED_ATTACHMENTS, KommentarLinkRel, KommentarListLinkRel, KommentarListResource, KommentarService, } from '@alfa-client/kommentar-shared';
+import {
+ KOMMENTAR_UPLOADED_ATTACHMENTS,
+ KommentarLinkRel,
+ KommentarListLinkRel,
+ KommentarListResource,
+ KommentarService,
+} from '@alfa-client/kommentar-shared';
import { createEmptyStateResource, createErrorStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, getElementComponentFromFixtureByCss, Mock, mock, triggerEvent, useFromMock, } from '@alfa-client/test-utils';
+import {
+ existsAsHtmlElement,
+ getElementComponentFromFixtureByCss,
+ Mock,
+ mock,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
import { OzgcloudStrokedButtonWithSpinnerComponent, TextAreaEditorComponent } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
@@ -35,8 +52,6 @@ import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createBinaryFileListResource } from '../../../../../binary-file-shared/test/binary-file';
import { createSuccessfullyDoneCommandStateResource } from '../../../../../command-shared/test/command';
-import { MultiFileUploadEditorComponent } from '../../../../../design-component/src/lib/form/multi-file-upload-editor/multi-file-upload-editor.component';
-import { MultiFileUploadListContainerComponent } from '../../../../../design-component/src/lib/form/multi-file-upload-list-container/multi-file-upload-list-container.component';
import { createKommentarListResource, createKommentarResource } from '../../../../../kommentar-shared/test/kommentar';
import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
import { createProblemDetail } from '../../../../../tech-shared/test/error';
diff --git a/alfa-client/libs/tech-shared/src/lib/pipe/to-embedded-resource.pipe.spec.ts b/alfa-client/libs/tech-shared/src/lib/pipe/to-embedded-resource.pipe.spec.ts
index 3ca6895ace..5420e99921 100644
--- a/alfa-client/libs/tech-shared/src/lib/pipe/to-embedded-resource.pipe.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/pipe/to-embedded-resource.pipe.spec.ts
@@ -46,19 +46,19 @@ describe('ToEmbeddedResourcesPipe', () => {
it('should return an empty array on null as listResource', () => {
const result: unknown[] = pipe.transform(null, DummyListLinkRel.LIST);
- expect(result).toBe([]);
+ expect(result).toEqual([]);
});
it('should return empty array on null as linkel', () => {
const result: unknown[] = pipe.transform(listResource, null);
- expect(result).toBe([]);
+ expect(result).toEqual([]);
});
it('should return empty array non existing resources', () => {
const result: unknown[] = pipe.transform(toResource({}), DummyListLinkRel.LIST);
- expect(result).toBe([]);
+ expect(result).toEqual([]);
});
});
});
--
GitLab