Skip to content
Snippets Groups Projects
Commit cacc0bbb authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-5023-BescheidSchritt3

# Conflicts:
#	alfa-client/libs/binary-file/src/lib/binary-file.module.ts
#	alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
#	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
parents bc287dff c261fccc
Branches
Tags
No related merge requests found
Showing
with 196 additions and 60 deletions
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: [
......
......@@ -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';
......
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,
......
......@@ -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';
......
......@@ -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';
......
{
"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": {}
}
]
}
# design-component
This library was generated with [Nx](https://nx.dev).
## Running unit tests
Run `nx test design-component` to execute the unit tests.
/* 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',
],
};
{
"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
export * from './lib/form/file-upload-editor/file-upload-editor.component';
......@@ -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();
......
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
{
......
globalThis.ngJest = {
testEnvironmentOptions: {
errorOnUnknownElements: true,
errorOnUnknownProperties: true,
},
};
import 'jest-preset-angular/setup-jest';
{
"compilerOptions": {
"target": "es2022"
},
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
],
"extends": "../../tsconfig.base.json"
}
{
"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"]
}
{
"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"]
}
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/libs/design-system",
"lib": {
"entryFile": "src/index.ts"
}
}
{
"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
}
......@@ -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';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment