diff --git a/alfa-client/apps/admin/src/app/app.module.ts b/alfa-client/apps/admin/src/app/app.module.ts
index 5036e2f54cfd969333b209f909b99becb1f99971..089a1851424f1c2eca17a73b15d0b0ad3f132588 100644
--- a/alfa-client/apps/admin/src/app/app.module.ts
+++ b/alfa-client/apps/admin/src/app/app.module.ts
@@ -1,8 +1,11 @@
+import { AdminSettingsModule } from '@admin-client/admin-settings';
import { ApiRootModule } from '@alfa-client/api-root-shared';
import { EnvironmentModule } from '@alfa-client/environment-shared';
+import { TechSharedModule } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
@@ -10,19 +13,16 @@ import { EffectsModule } from '@ngrx/effects';
import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { TestbtnComponent } from 'design-system';
-import { environment } from '../environments/environment';
-import { AppComponent } from './app.component';
-import { appRoutes } from './app.routes';
-import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
-import { AdminSettingsModule } from '@admin-client/admin-settings';
+import { TestbtnComponent } from '@ods/system';
import { OAuthModule } from 'angular-oauth2-oidc';
import { HttpUnauthorizedInterceptor } from 'libs/authentication/src/lib/http-unauthorized.interceptor';
+import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
+import { environment } from '../environments/environment';
import { OrganisationseinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
+import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
-import { TechSharedModule } from '@alfa-client/tech-shared';
+import { AppComponent } from './app.component';
+import { appRoutes } from './app.routes';
@NgModule({
declarations: [
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index 7abd2bdd6880a7c588842b478ce91fee1bde1e32..e5ac1c986daaa155d4dbfd2a46a85fbfa428aa1d 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -11,7 +11,7 @@ import {
RadioButtonCardComponent,
SpinnerIconComponent,
TestbtnComponent,
-} from 'design-system';
+} from '@ods/system';
import { BescheidDialogExampleComponent } from './components/bescheid-dialog/bescheid-dialog.component';
import { BescheidPaperComponent } from './components/bescheid-paper/bescheid-paper.component';
diff --git a/alfa-client/apps/demo/src/app/components/cdk-demo/custom-stepper.component.ts b/alfa-client/apps/demo/src/app/components/cdk-demo/custom-stepper.component.ts
index 107fda7ed02b667e06e7cab3fec4cda3243db1fd..e7c05f02630bff453741036073ad8c5ed600a4fd 100644
--- a/alfa-client/apps/demo/src/app/components/cdk-demo/custom-stepper.component.ts
+++ b/alfa-client/apps/demo/src/app/components/cdk-demo/custom-stepper.component.ts
@@ -1,8 +1,7 @@
-import { Component } from '@angular/core';
import { CdkStepper, CdkStepperModule } from '@angular/cdk/stepper';
import { NgTemplateOutlet } from '@angular/common';
-import { TestbtnComponent } from 'design-system';
-
+import { Component } from '@angular/core';
+import { TestbtnComponent } from '@ods/system';
@Component({
standalone: true,
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
index e85d0377e20cd4118114e7481e637d06d09c88c3..8d28326a15b9737f9f3b719af7025ec85435a4d9 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file.module.ts
@@ -30,7 +30,7 @@ import {
CloseIconComponent,
IconComponent,
SpinnerIconComponent,
-} from 'design-system';
+} from '@ods/system';
import { BinaryFileAttachmentContainerComponent } from './binary-file-attachment-container/binary-file-attachment-container.component';
import { BinaryFileContainerComponent } from './binary-file-container/binary-file-container.component';
import { BinaryFileComponent } from './binary-file-container/binary-file/binary-file.component';
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
index 24f782a78cf14bbc2479df5fa1845c7a4d814820..cfc82643b49b57a8251c25fcc30c1f42e35abb0a 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
@@ -3,7 +3,7 @@ import { BinaryFileLinkRel, BinaryFileResource } from '@alfa-client/binary-file-
import { SpinnerComponent } from '@alfa-client/ui';
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
-import { AttachmentComponent, CloseIconComponent, IconComponent } from 'design-system';
+import { AttachmentComponent, CloseIconComponent, IconComponent } from '@ods/system';
import { createBinaryFileResource } from 'libs/binary-file-shared/test/binary-file';
import { FileSizePlainPipe } from 'libs/tech-shared/src/lib/pipe/file-size-plain.pipe';
import { MockComponent, MockPipe } from 'ng-mocks';
diff --git a/alfa-client/libs/design-component/.eslintrc.json b/alfa-client/libs/design-component/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..d7eea6e63619bb4f93196655793dddbc519ad3bd
--- /dev/null
+++ b/alfa-client/libs/design-component/.eslintrc.json
@@ -0,0 +1,33 @@
+{
+ "extends": ["../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts"],
+ "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+ "rules": {
+ "@angular-eslint/directive-selector": [
+ "error",
+ {
+ "type": "attribute",
+ "prefix": "ods",
+ "style": "camelCase"
+ }
+ ],
+ "@angular-eslint/component-selector": [
+ "error",
+ {
+ "type": "element",
+ "prefix": "ods",
+ "style": "kebab-case"
+ }
+ ]
+ }
+ },
+ {
+ "files": ["*.html"],
+ "extends": ["plugin:@nx/angular-template"],
+ "rules": {}
+ }
+ ]
+}
diff --git a/alfa-client/libs/design-component/README.md b/alfa-client/libs/design-component/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..592f9f94c13847de3b9f618f3b18e7d2e3ad0ef2
--- /dev/null
+++ b/alfa-client/libs/design-component/README.md
@@ -0,0 +1,7 @@
+# design-component
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test design-component` to execute the unit tests.
diff --git a/alfa-client/libs/design-component/jest.config.ts b/alfa-client/libs/design-component/jest.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..2f4cb398aaefead27ce001eeed1d3075221d6e11
--- /dev/null
+++ b/alfa-client/libs/design-component/jest.config.ts
@@ -0,0 +1,22 @@
+/* eslint-disable */
+export default {
+ displayName: 'design-component',
+ preset: '../../jest.preset.js',
+ setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+ coverageDirectory: '../../coverage/libs/design-component',
+ transform: {
+ '^.+\\.(ts|mjs|js|html)$': [
+ 'jest-preset-angular',
+ {
+ tsconfig: '<rootDir>/tsconfig.spec.json',
+ stringifyContentPathRegex: '\\.(html|svg)$',
+ },
+ ],
+ },
+ transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+ snapshotSerializers: [
+ 'jest-preset-angular/build/serializers/no-ng-attributes',
+ 'jest-preset-angular/build/serializers/ng-snapshot',
+ 'jest-preset-angular/build/serializers/html-comment',
+ ],
+};
diff --git a/alfa-client/libs/design-component/project.json b/alfa-client/libs/design-component/project.json
new file mode 100644
index 0000000000000000000000000000000000000000..debe8b48a5967c37420ac2eb8f8bc35c6d36c932
--- /dev/null
+++ b/alfa-client/libs/design-component/project.json
@@ -0,0 +1,38 @@
+{
+ "name": "design-component",
+ "$schema": "../../node_modules/nx/schemas/project-schema.json",
+ "sourceRoot": "libs/design-component/src",
+ "prefix": "ods",
+ "tags": [],
+ "projectType": "library",
+ "targets": {
+ "test": {
+ "executor": "@nx/jest:jest",
+ "outputs": [
+ "{workspaceRoot}/coverage/{projectRoot}"
+ ],
+ "options": {
+ "jestConfig": "libs/design-component/jest.config.ts",
+ "passWithNoTests": true
+ },
+ "configurations": {
+ "ci": {
+ "ci": true,
+ "codeCoverage": true
+ }
+ }
+ },
+ "lint": {
+ "executor": "@nx/eslint:lint",
+ "outputs": [
+ "{options.outputFile}"
+ ],
+ "options": {
+ "lintFilePatterns": [
+ "libs/design-component/**/*.ts",
+ "libs/design-component/**/*.html"
+ ]
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/alfa-client/libs/design-component/src/index.ts b/alfa-client/libs/design-component/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..72d1c0c5131339ff9a97af910b9e30cb2142f643
--- /dev/null
+++ b/alfa-client/libs/design-component/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/form/file-upload-editor/file-upload-editor.component';
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
similarity index 100%
rename from alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.html
rename to alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
similarity index 84%
rename from alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.spec.ts
rename to alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
index bc564d8a8dbb121396404ee5924e20bfe640a475..84fcd005f96d6c1d9dbe246fa14dbd4ceaf11546 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.spec.ts
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ConvertForDataTestPipe, createEmptyStateResource } from '@alfa-client/tech-shared';
+import { createEmptyStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import {
AbstractControl,
@@ -35,14 +35,14 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from 'design-system';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from '@ods/system';
+import { ValidationErrorComponent } from 'libs/ui/src/lib/ui/validation-error/validation-error.component';
import { MockComponent } from 'ng-mocks';
-import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
-import { FileUploadFieldComponent } from './file-upload-field.component';
+import { FileUploadEditorComponent } from './file-upload-editor.component';
-describe('FileUploadFieldComponent', () => {
- let component: FileUploadFieldComponent;
- let fixture: ComponentFixture<FileUploadFieldComponent>;
+describe('FileUploadEditorComponent', () => {
+ let component: FileUploadEditorComponent;
+ let fixture: ComponentFixture<FileUploadEditorComponent>;
const fb = new UntypedFormBuilder();
const formGroupDirective = new FormGroupDirective([], []);
formGroupDirective.form = fb.group({
@@ -52,8 +52,7 @@ describe('FileUploadFieldComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- FileUploadFieldComponent,
- ConvertForDataTestPipe,
+ FileUploadEditorComponent,
MockComponent(ValidationErrorComponent),
MockComponent(SpinnerIconComponent),
MockComponent(IconComponent),
@@ -80,7 +79,7 @@ describe('FileUploadFieldComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(FileUploadFieldComponent);
+ fixture = TestBed.createComponent(FileUploadEditorComponent);
component = fixture.componentInstance;
component.parentFormArrayName = 'attachments';
component.uploadInProgress = createEmptyStateResource();
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.ts b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
similarity index 67%
rename from alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.ts
rename to alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
index ba04fdf9cc38d4e19635cd41aed29012fcc97f7c..f46fb01b23bf9cb35e80895168969e2f8f8433cf 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component.ts
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.ts
@@ -1,28 +1,33 @@
-import {
- Component,
- EventEmitter,
- HostListener,
- Input,
- OnInit,
- Output,
-} from '@angular/core';
+import { StateResource, TechSharedModule } from '@alfa-client/tech-shared';
+import { FormControlEditorAbstractComponent } from '@alfa-client/ui';
+import { NgForOf } from '@angular/common';
+import { Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core';
import {
ControlContainer,
+ FormGroupDirective,
+ ReactiveFormsModule,
UntypedFormArray,
UntypedFormControl,
- FormGroupDirective,
} from '@angular/forms';
-import { StateResource } from '@alfa-client/tech-shared';
-import { uniqueId } from 'lodash-es';
import { Resource } from '@ngxp/rest';
-import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from '@ods/system';
+import { uniqueId } from 'lodash-es';
@Component({
- selector: 'ozgcloud-file-upload-field',
- templateUrl: './file-upload-field.component.html',
+ selector: 'ods-file-upload-editor',
+ templateUrl: './file-upload-editor.component.html',
viewProviders: [{ provide: ControlContainer, useExisting: FormGroupDirective }],
+ standalone: true,
+ imports: [
+ FileUploadButtonComponent,
+ IconComponent,
+ SpinnerIconComponent,
+ ReactiveFormsModule,
+ NgForOf,
+ TechSharedModule,
+ ],
})
-export class FileUploadFieldComponent
+export class FileUploadEditorComponent
extends FormControlEditorAbstractComponent
implements OnInit
{
diff --git a/alfa-client/libs/design-component/src/test-setup.ts b/alfa-client/libs/design-component/src/test-setup.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ef358fbdf02a6bfc0ca9a7c2f5c73766b01ef584
--- /dev/null
+++ b/alfa-client/libs/design-component/src/test-setup.ts
@@ -0,0 +1,7 @@
+globalThis.ngJest = {
+ testEnvironmentOptions: {
+ errorOnUnknownElements: true,
+ errorOnUnknownProperties: true,
+ },
+};
+import 'jest-preset-angular/setup-jest';
diff --git a/alfa-client/libs/design-component/tsconfig.json b/alfa-client/libs/design-component/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b706589dab1a61d0c9a4f928e271f5e996c3466
--- /dev/null
+++ b/alfa-client/libs/design-component/tsconfig.json
@@ -0,0 +1,16 @@
+{
+ "compilerOptions": {
+ "target": "es2022"
+ },
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.lib.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ }
+ ],
+ "extends": "../../tsconfig.base.json"
+}
diff --git a/alfa-client/libs/design-component/tsconfig.lib.json b/alfa-client/libs/design-component/tsconfig.lib.json
new file mode 100644
index 0000000000000000000000000000000000000000..92987370e0ee1a0ee9444862c6101947f3274f5f
--- /dev/null
+++ b/alfa-client/libs/design-component/tsconfig.lib.json
@@ -0,0 +1,17 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../dist/out-tsc",
+ "declaration": true,
+ "declarationMap": true,
+ "inlineSources": true,
+ "types": []
+ },
+ "angularCompilerOptions": {
+ "skipTemplateCodegen": true,
+ "strictMetadataEmit": true,
+ "enableResourceInlining": true
+ },
+ "exclude": ["src/**/*.spec.ts", "src/test-setup.ts", "jest.config.ts", "src/**/*.test.ts"],
+ "include": ["src/**/*.ts"]
+}
diff --git a/alfa-client/libs/design-component/tsconfig.spec.json b/alfa-client/libs/design-component/tsconfig.spec.json
new file mode 100644
index 0000000000000000000000000000000000000000..7870b7c011681fb77d6114001f44d3eeca69975b
--- /dev/null
+++ b/alfa-client/libs/design-component/tsconfig.spec.json
@@ -0,0 +1,11 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../dist/out-tsc",
+ "module": "commonjs",
+ "target": "es2016",
+ "types": ["jest", "node"]
+ },
+ "files": ["src/test-setup.ts"],
+ "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/alfa-client/libs/design-system/ng-package.json b/alfa-client/libs/design-system/ng-package.json
deleted file mode 100644
index 3af87707a4d057cac46dede1721f1d3a1df7b3a1..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/ng-package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
- "dest": "../../dist/libs/design-system",
- "lib": {
- "entryFile": "src/index.ts"
- }
-}
diff --git a/alfa-client/libs/design-system/package.json b/alfa-client/libs/design-system/package.json
deleted file mode 100644
index 1e3e01a978365ed85846ba7e70bf0c20e0cc325b..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "design-system",
- "version": "0.0.1",
- "peerDependencies": {
- "@angular/common": "^16.2.0",
- "@angular/core": "^16.2.0"
- },
- "dependencies": {
- "tslib": "^2.3.0"
- },
- "sideEffects": false
-}
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/single-file-upload-editor/single-file-upload-editor.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/editor/single-file-upload-editor/single-file-upload-editor.component.spec.ts
index 43994bb263c60f7228841aae4f26126b0c3f31cb..2eba01b53838b248b42c2dad8a202c6abb443911 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/single-file-upload-editor/single-file-upload-editor.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/editor/single-file-upload-editor/single-file-upload-editor.component.spec.ts
@@ -7,7 +7,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FileUploadButtonComponent, SpinnerIconComponent } from 'design-system';
+import { FileUploadButtonComponent, SpinnerIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
import { SingleFileUploadEditorComponent } from './single-file-upload-editor.component';
diff --git a/alfa-client/libs/ui/src/lib/ui/ui.module.ts b/alfa-client/libs/ui/src/lib/ui/ui.module.ts
index ceccb6e1ab7de556509984addf63815369dbbb81..bd2345d9fafc9886fa820c41ef3ffba9202a5d11 100644
--- a/alfa-client/libs/ui/src/lib/ui/ui.module.ts
+++ b/alfa-client/libs/ui/src/lib/ui/ui.module.ts
@@ -47,8 +47,8 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatTabsModule } from '@angular/material/tabs';
import { RouterModule } from '@angular/router';
+import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from '@ods/system';
import { de } from 'date-fns/locale';
-import { FileUploadButtonComponent, IconComponent, SpinnerIconComponent } from 'design-system';
import { AppIconComponent } from '../icon/app-icon/app-icon.component';
import { PostfachIconComponent } from '../icon/postfach-icon/postfach-icon.component';
import { HttpConnectionTimeoutInterceptor } from '../interceptor/http-connection-timeout.interceptor';
@@ -100,7 +100,6 @@ import { SpinnerTransparencyComponent } from './spinner-transparency/spinner-tra
import { SpinnerComponent } from './spinner/spinner.component';
import { SubnavigationComponent } from './subnavigation/subnavigation.component';
import { ValidationErrorComponent } from './validation-error/validation-error.component';
-import { FileUploadFieldComponent } from './editor/file-upload-field/file-upload-field.component';
@NgModule({
declarations: [
@@ -125,7 +124,6 @@ import { FileUploadFieldComponent } from './editor/file-upload-field/file-upload
InternalServerErrorDialogComponent,
FileUploadEditorComponent,
SingleFileUploadEditorComponent,
- FileUploadFieldComponent,
MatTooltipDirective,
MatTooltipDisabledDirective,
MatTooltipClassDirective,
@@ -182,7 +180,7 @@ import { FileUploadFieldComponent } from './editor/file-upload-field/file-upload
MatButtonToggleModule,
FileUploadButtonComponent,
SpinnerIconComponent,
- IconComponent
+ IconComponent,
],
exports: [
MatButtonModule,
@@ -232,7 +230,6 @@ import { FileUploadFieldComponent } from './editor/file-upload-field/file-upload
InternalServerErrorDialogComponent,
FileUploadEditorComponent,
SingleFileUploadEditorComponent,
- FileUploadFieldComponent,
MatTooltipDirective,
MatTooltipDisabledDirective,
MatTooltipClassDirective,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component.spec.ts
index 5d4f0bfaf8d034f7fc740cbc6eaaa65778c34320..99eef01ffafb1d700f41fd18a10436253c2de367 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-antrag-bescheiden/vorgang-detail-bescheiden-antrag-bescheiden.component.spec.ts
@@ -3,7 +3,7 @@ import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { DateEditorComponent } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
-import { IconComponent, RadioButtonCardComponent } from 'design-system';
+import { IconComponent, RadioButtonCardComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { BescheidenFormService } from '../../../bescheiden.formservice';
import { VorgangDetailBescheidenAntragBescheidenComponent } from './vorgang-detail-bescheiden-antrag-bescheiden.component';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component.spec.ts
index 52c3db50aad87d18f1714e12014ccfd43f3892b3..1705d6459f4061830c276782e7d388d665575311 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-bescheid-versenden/vorgang-detail-bescheiden-bescheid-versenden.component.spec.ts
@@ -3,7 +3,7 @@ import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
-import { RadioButtonCardComponent } from 'design-system';
+import { RadioButtonCardComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { BescheidenFormService } from '../../../bescheiden.formservice';
import { VorgangDetailBescheidenBescheidVersendenComponent } from './vorgang-detail-bescheiden-bescheid-versenden.component';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
index 69daff33144814855e96932e5e7a07e87ba010d1..58333a2dc251f41b4b20766e3c7882ce5c088416 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
@@ -1,5 +1,5 @@
<div [formGroup]="formService.form" class="mt-4">
- <ozgcloud-file-upload-field
+ <ods-file-upload-editor
[attr.data-test-id]="'vorgang-bescheiden-upload-editor' + formServiceClass.FIELD_ATTACHMENTS"
[parentFormArrayName]="formServiceClass.FIELD_ATTACHMENTS"
[uploadInProgress]="uploadInProgress$ | async"
@@ -7,5 +7,5 @@
[fileLinkList]="getFileLinkList()"
label="Attachment hochladen"
>
- </ozgcloud-file-upload-field>
+ </ods-file-upload-editor>
</div>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
index b516cda11f0853911d07cd6f12c8e8bd6f0dc802..e463406befda8957cd2a565d20f07a1ebeaf5aeb 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
@@ -9,8 +9,8 @@ import {
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
+import { FileUploadEditorComponent } from '@ods/component';
import { cold } from 'jest-marbles';
-import { FileUploadFieldComponent } from 'libs/ui/src/lib/ui/editor/file-upload-field/file-upload-field.component';
import { MockComponent, MockPipe } from 'ng-mocks';
import { EMPTY, Observable, Subscription, of } from 'rxjs';
import { createBescheidResource } from '../../../../../../../../../bescheid-shared/src/test/bescheid';
@@ -39,7 +39,7 @@ describe('VorgangDetailBescheidenDokumentHochladenComponent', () => {
declarations: [
VorgangDetailBescheidenAttachmentHochladenComponent,
MockComponent(BinaryFileAttachmentContainerComponent),
- MockComponent(FileUploadFieldComponent),
+ MockComponent(FileUploadEditorComponent),
MockPipe(HasLinkPipe),
],
imports: [ReactiveFormsModule],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
index 79731c5661bc0d85b66cb78fd6eaabdfa2c6f839..d0d6bb3254e4c5129d251bd0033eaca8980ea505 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
@@ -14,7 +14,7 @@ import {
ButtonComponent,
IconComponent,
SpinnerIconComponent,
-} from 'design-system';
+} from '@ods/system';
import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.spec.ts
index f5f153d70de00ceca824e53e1f3c3b3f5b14df02..98455e1671b95601e6f3020c4732e770cd1292a0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.spec.ts
@@ -7,7 +7,7 @@ import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
import faker from '@faker-js/faker';
import { ResourceUri } from '@ngxp/rest';
-import { SpinnerIconComponent } from 'design-system';
+import { SpinnerIconComponent } from '@ods/system';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { createBescheidStateResource } from '../../../../../../../../../bescheid-shared/src/test/bescheid';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 837545e68b34902a10953df5d1b9961e71ce504d..cc4c4cd8027dd41689d7937837fa7992023ab248 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -40,6 +40,7 @@ import { WiedervorlageModule } from '@alfa-client/wiedervorlage';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
+import { FileUploadEditorComponent } from '@ods/component';
import {
AttachmentComponent,
BescheidGenerateIconComponent,
@@ -48,7 +49,7 @@ import {
IconComponent,
RadioButtonCardComponent,
SpinnerIconComponent,
-} from 'design-system';
+} from '@ods/system';
import { AktenzeichenEditDialogComponent } from './aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component';
import { AktenzeichenEditableComponent } from './aktenzeichen-editable/aktenzeichen-editable.component';
import { AbschliessenButtonComponent } from './buttons/abschliessen-button/abschliessen-button.component';
@@ -136,6 +137,7 @@ const routes: Routes = [
BescheidUploadIconComponent,
BescheidGenerateIconComponent,
AttachmentComponent,
+ FileUploadEditorComponent,
],
declarations: [
VorgangDetailPageComponent,
diff --git a/alfa-client/nx.json b/alfa-client/nx.json
index 848237a025ee7fb9252b85e090a073afd6929346..972e0ca235126465a95f3927eef852f1eee0e3f6 100644
--- a/alfa-client/nx.json
+++ b/alfa-client/nx.json
@@ -14,7 +14,8 @@
},
"@nx/angular:library": {
"linter": "eslint",
- "unitTestRunner": "jest"
+ "unitTestRunner": "jest",
+ "styleext": "scss"
},
"@nrwl/schematics:component": {
"styleext": "scss"
diff --git a/alfa-client/tsconfig.base.json b/alfa-client/tsconfig.base.json
index 1f7364bba7606a74a3d102427b82bb77ac3049cb..485fa33d9e73493edfbf2a27dcdea991191ad1f8 100644
--- a/alfa-client/tsconfig.base.json
+++ b/alfa-client/tsconfig.base.json
@@ -54,7 +54,8 @@
"@alfa-client/wiedervorlage": ["libs/wiedervorlage/src/index.ts"],
"@alfa-client/wiedervorlage-shared": ["libs/wiedervorlage-shared/src/index.ts"],
"authentication": ["libs/authentication/src/index.ts"],
- "design-system": ["libs/design-system/src/index.ts"]
+ "@ods/component": ["libs/design-component/src/index.ts"],
+ "@ods/system": ["libs/design-system/src/index.ts"]
}
},
"exclude": ["node_modules", "tmp"]