Skip to content
Snippets Groups Projects
Commit 510ae48b authored by Martin's avatar Martin
Browse files

OZG-5977 fix imports/tests

parent 4cca5e4a
Branches
Tags
1 merge request!67OZG-5977 add multi option to file upload button
......@@ -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';
......@@ -64,9 +64,9 @@ describe('MultiFileUploadEditorComponent', () => {
await TestBed.configureTestingModule({
declarations: [
MultiFileUploadEditorComponent,
ConvertForDataTestPipe,
MockComponent(SpinnerIconComponent),
MockComponent(FileUploadButtonComponent),
ConvertForDataTestPipe,
],
providers: [
{
......
......@@ -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 {
......
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>;
......
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;
......
......@@ -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';
......
......@@ -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([]);
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment