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

Merge branch 'master' into OZG-6300-OZG-6417-Zusammarbeit-E2E

parents d425410e d71eafe8
No related branches found
No related tags found
No related merge requests found
Showing
with 156 additions and 37 deletions
import { Mock, mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { TextEditorComponent, TextareaEditorComponent } from '@ods/component';
import { MockComponent } from 'ng-mocks';
import { CollaborationRequestFormComponent } from './collaboration-request-form.component';
import { CollaborationRequestFormService } from './collaboration.request.formservice';
describe('CollaborationRequestFormComponent', () => {
let component: CollaborationRequestFormComponent;
let fixture: ComponentFixture<CollaborationRequestFormComponent>;
const formService: Mock<CollaborationRequestFormService> = mock(CollaborationRequestFormService);
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [ReactiveFormsModule],
declarations: [
CollaborationRequestFormComponent,
MockComponent(TextEditorComponent),
MockComponent(TextareaEditorComponent),
],
providers: [
{
provide: CollaborationRequestFormService,
useValue: formService,
},
],
}).compileComponents();
fixture = TestBed.createComponent(CollaborationRequestFormComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component } from '@angular/core';
import { CollaborationRequestFormService } from './collaboration.request.formservice';
@Component({
selector: 'alfa-collaboration-request-form',
templateUrl: './collaboration-request-form.component.html',
providers: [CollaborationRequestFormService],
})
export class CollaborationRequestFormComponent {
constructor(readonly formService: CollaborationRequestFormService) {}
public readonly formServiceClass = CollaborationRequestFormService;
}
import { UntypedFormBuilder } from '@angular/forms';
import { CollaborationRequestFormService } from './collaboration.request.formservice';
describe('CollaborationRequestFormService', () => {
let formService: CollaborationRequestFormService;
const formBuilder: UntypedFormBuilder = new UntypedFormBuilder();
beforeEach(() => {
formService = new CollaborationRequestFormService(formBuilder);
});
it('should create', () => {
expect(formService).toBeTruthy();
});
});
import { CommandResource } from '@alfa-client/command-shared';
import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { Observable, of } from 'rxjs';
@Injectable()
export class CollaborationRequestFormService extends AbstractFormService {
public static readonly FIELD_TITLE = 'titel';
public static readonly FIELD_NACHRICHT = 'nachricht';
constructor(formBuilder: UntypedFormBuilder) {
super(formBuilder);
}
protected initForm(): UntypedFormGroup {
return this.formBuilder.group({
[CollaborationRequestFormService.FIELD_TITLE]: new UntypedFormControl(null),
[CollaborationRequestFormService.FIELD_NACHRICHT]: new UntypedFormControl(null),
});
}
protected doSubmit(): Observable<StateResource<CommandResource>> {
return of();
}
protected getPathPrefix(): string {
return EMPTY_STRING;
}
}
import { CollaborationSharedModule } from '@alfa-client/collaboration-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonComponent, CollaborationIconComponent } from '@ods/system';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TextEditorComponent, TextareaEditorComponent } from '@ods/component';
import {
ButtonComponent,
CloseIconComponent,
CollaborationIconComponent,
SaveIconComponent,
} from '@ods/system';
import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component';
import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
import { CollaborationRequestContainerComponent } from './collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-container.component';
import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-form/collaboration-request-form.component';
@NgModule({
imports: [CommonModule, ButtonComponent, CollaborationIconComponent],
declarations: [CollaborationInVorgangContainerComponent],
imports: [
CommonModule,
ButtonComponent,
SaveIconComponent,
CloseIconComponent,
SearchIconComponent,
CollaborationSharedModule,
CollaborationIconComponent,
TextEditorComponent,
TextareaEditorComponent,
FormsModule,
ReactiveFormsModule,
],
declarations: [
CollaborationInVorgangContainerComponent,
CollaborationRequestContainerComponent,
CollaborationRequestFormComponent,
],
exports: [CollaborationInVorgangContainerComponent],
})
export class CollaborationModule {}
......@@ -6,7 +6,10 @@ import { cva, VariantProps } from 'class-variance-authority';
import { ErrorMessageComponent } from '../error-message/error-message.component';
const textInputVariants = cva(
'w-full h-10 rounded-lg border bg-background-50 px-3 py-2 text-base leading-5 text-text focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
[
'w-full box-border rounded-lg border bg-background-50 px-3 py-2 text-base text-text leading-5',
'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
],
{
variants: {
variant: {
......
......@@ -5,7 +5,10 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { VariantProps, cva } from 'class-variance-authority';
const textareaVariants = cva(
'block w-full rounded-lg border bg-background-50 px-3 py-2 text-base text-text leading-5 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
[
'w-full box-border rounded-lg border bg-background-50 px-3 py-2 text-base text-text leading-5',
'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
],
{
variants: {
variant: {
......
......@@ -21,23 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import {
convertForDataTest,
ConvertForDataTestPipe,
EnumToLabelPipe,
HasLinkPipe,
ToResourceUriPipe,
} from '@alfa-client/tech-shared';
import { convertForDataTest, ConvertForDataTestPipe, EnumToLabelPipe, HasLinkPipe, ToResourceUriPipe } from '@alfa-client/tech-shared';
import { getElementFromFixture } from '@alfa-client/test-utils';
import { PostfachIconComponent } from '@alfa-client/ui';
import { UserProfileInVorgangListItemContainerComponent } from '@alfa-client/user-profile';
import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared';
import {
AktenzeichenComponent,
VorgangNummerComponent,
VorgangStatusDotComponent,
VorgangStatusTextComponent,
} from '@alfa-client/vorgang-shared-ui';
import { AktenzeichenComponent, VorgangNummerComponent, VorgangStatusDotComponent, VorgangStatusTextComponent } from '@alfa-client/vorgang-shared-ui';
import { WiedervorlageListInVorgangListContainerComponent } from '@alfa-client/wiedervorlage';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
......@@ -55,7 +44,7 @@ import { MockComponent, MockModule } from 'ng-mocks';
import { VorgangBescheidStatusComponent } from './vorgang-bescheid-status/vorgang-bescheid-status.component';
import { VorgangCreatedAtComponent } from './vorgang-created-at/vorgang-created-at.component';
import { VorgangListItemComponent } from './vorgang-list-item.component';
import { VorgangNextFristButton } from './vorgang-next-frist-button/vorgang-next-frist-button.component';
import { VorgangNextFristButtonComponent } from './vorgang-next-frist-button/vorgang-next-frist-button.component';
registerLocaleData(localeDe, 'de', localeDeExtra);
......@@ -83,7 +72,7 @@ describe('VorgangListItemComponent', () => {
MockComponent(VorgangStatusDotComponent),
MockComponent(VorgangStatusTextComponent),
MockComponent(WiedervorlageListInVorgangListContainerComponent),
MockComponent(VorgangNextFristButton),
MockComponent(VorgangNextFristButtonComponent),
MockComponent(UserProfileInVorgangListItemContainerComponent),
MockComponent(VorgangCreatedAtComponent),
MockComponent(VorgangBescheidStatusComponent),
......
......@@ -21,31 +21,31 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { FormatToPrettyDatePipe, HasLinkPipe } from '@alfa-client/tech-shared';
import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import localeDeExtra from '@angular/common/locales/extra/de';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { FormatToPrettyDatePipe, HasLinkPipe } from '@alfa-client/tech-shared';
import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared';
import { WiedervorlageIconComponent } from 'libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { WiedervorlageListInVorgangListContainerComponent } from 'libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component';
import { MockComponent } from 'ng-mocks';
import { VorgangNextFristButton } from './vorgang-next-frist-button.component';
import { VorgangNextFristButtonComponent } from './vorgang-next-frist-button.component';
import * as dateUtil from '../../../../../../../tech-shared/src/lib/date.util';
registerLocaleData(localeDe, 'de', localeDeExtra);
describe('VorgangNextFristButton', () => {
let component: VorgangNextFristButton;
let fixture: ComponentFixture<VorgangNextFristButton>;
describe('VorgangNextFristButtonComponent', () => {
let component: VorgangNextFristButtonComponent;
let fixture: ComponentFixture<VorgangNextFristButtonComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
VorgangNextFristButton,
VorgangNextFristButtonComponent,
FormatToPrettyDatePipe,
HasLinkPipe,
MatIcon,
......@@ -56,7 +56,7 @@ describe('VorgangNextFristButton', () => {
});
beforeEach(() => {
fixture = TestBed.createComponent(VorgangNextFristButton);
fixture = TestBed.createComponent(VorgangNextFristButtonComponent);
component = fixture.componentInstance;
component.vorgang = createVorgangResource([VorgangHeaderLinkRel.VORGANG_WITH_EINGANG]);
fixture.detectChanges();
......
......@@ -21,23 +21,21 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { Component, Input, OnInit } from '@angular/core';
import { isISODateInPast } from '@alfa-client/tech-shared';
import { VorgangHeaderLinkRel, VorgangResource } from '@alfa-client/vorgang-shared';
import { VorgangResource } from '@alfa-client/vorgang-shared';
import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'alfa-vorgang-next-frist-button',
templateUrl: './vorgang-next-frist-button.component.html',
styleUrls: ['./vorgang-next-frist-button.component.scss'],
})
export class VorgangNextFristButton implements OnInit {
export class VorgangNextFristButtonComponent implements OnInit {
@Input() vorgang: VorgangResource;
public showWiedervorlagen: boolean = false;
public isOverdue: boolean;
readonly vorgangLinkRel = VorgangHeaderLinkRel;
ngOnInit() {
this.isOverdue = isISODateInPast(this.vorgang.nextFrist as unknown as string);
}
......
......@@ -39,7 +39,7 @@ import { EmptyListComponent } from './vorgang-list-container/vorgang-list/empty-
import { VorgangBescheidStatusComponent } from './vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-bescheid-status/vorgang-bescheid-status.component';
import { VorgangCreatedAtComponent } from './vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component';
import { VorgangListItemComponent } from './vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component';
import { VorgangNextFristButton } from './vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-next-frist-button/vorgang-next-frist-button.component';
import { VorgangNextFristButtonComponent } from './vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-next-frist-button/vorgang-next-frist-button.component';
import { VorgangListComponent } from './vorgang-list-container/vorgang-list/vorgang-list.component';
import { VorgangListPageContainerComponent } from './vorgang-list-page-container/vorgang-list-page-container.component';
import { VorgangFilterMenuContainerComponent } from './vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu-container.component';
......@@ -184,7 +184,7 @@ const routes: Routes = [
VorgangListContainerComponent,
VorgangListPageComponent,
EmptyListComponent,
VorgangNextFristButton,
VorgangNextFristButtonComponent,
VorgangListPageContainerComponent,
VorgangFilterMenuContainerComponent,
VorgangFilterMenuComponent,
......
......@@ -79,7 +79,6 @@
"@storybook/core-server": "^8.1.4",
"@swc-node/register": "1.9.1",
"@swc/core": "~1.5.7",
"@swc/helpers": "~0.5.2",
"@testing-library/jest-dom": "6.4.5",
"@types/file-saver": "2.0.7",
"@types/jest": "29.4.4",
......@@ -15268,7 +15267,8 @@
"version": "0.5.12",
"resolved": "http://nexus.ozg-sh.de/repository/npm-proxy/@swc/helpers/-/helpers-0.5.12.tgz",
"integrity": "sha512-KMZNXiGibsW9kvZAO1Pam2JPTDBm+KSHMMHWdsyI/1DbIZjT2A6Gy3hblVXUMEDvUAKq+e0vL0X0o54owWji7g==",
"devOptional": true,
"optional": true,
"peer": true,
"dependencies": {
"tslib": "^2.4.0"
}
......@@ -24,6 +24,7 @@
"@alfa-client/binary-file": ["libs/binary-file/src/index.ts"],
"@alfa-client/binary-file-shared": ["libs/binary-file-shared/src/index.ts"],
"@alfa-client/collaboration": ["libs/collaboration/src/index.ts"],
"@alfa-client/collaboration-shared": ["libs/collaboration-shared/src/index.ts"],
"@alfa-client/command-shared": ["libs/command-shared/src/index.ts"],
"@alfa-client/environment-shared": ["libs/environment-shared/src/index.ts"],
"@alfa-client/forwarding": ["libs/forwarding/src/index.ts"],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment