Merge pull request #28 from catenax-ng/fix/TRACEFOSS-1092-missing-validation

TRACEFOSS-1092: aligned validations in FE and BE

Author: ds-ext-dskrzypczak

sonar-project.properties

@@ -5,6 +5,7 @@ sonar.organization=eclipse-tractusx
 sonar.sources=./src
 sonar.tests=./src
 sonar.exclusions=**/*.spec.ts, src/app/mocks/**/*, src/tests/**/*, src/mockServiceWorker.js, scripts/**/*, **/mocked.keycloak.service.ts, src/test.ts
+sonar.cpd.exclusions=**/*.spec.ts,src/app/mocks/**/*
 sonar.test.inclusions=**/*.spec.ts
 sonar.language=ts
 

src/app/modules/shared/modules/notification/modal/accept/accept-notification-modal.component.spec.ts

@@ -23,6 +23,7 @@ import { NotificationStatus } from '@shared/model/notification.model';
 import { AcceptNotificationModalComponent } from '@shared/modules/notification/modal/accept/accept-notification-modal.component';
 import { renderAcceptModal } from '@shared/modules/notification/modal/modalTestHelper.spec';
 import { fireEvent, screen, waitFor } from '@testing-library/angular';
+import { getRandomText } from '../../../../../../mocks/services/text-generator.helper';
 
 describe('AcceptNotificationModalComponent', () => {
   it('should create accept modal', async () => {
@@ -56,7 +57,17 @@ describe('AcceptNotificationModalComponent', () => {
     expect(errorMessage_1).toBeInTheDocument();
 
     fireEvent.input(textArea, { target: { value: 'Some Text' } });
+    const errorMessage_2 = await waitFor(() => screen.getByText('errorMessage.minLength'));
+    expect(errorMessage_2).toBeInTheDocument();
+
+    fireEvent.input(textArea, { target: { value: getRandomText(1500) } });
+    const errorMessage_3 = await waitFor(() => screen.getByText('errorMessage.maxLength'));
+    expect(errorMessage_3).toBeInTheDocument();
+
+    fireEvent.input(textArea, { target: { value: 'Some longer text with at least 15 chars' } });
     expect(errorMessage_1).not.toBeInTheDocument();
+    expect(errorMessage_2).not.toBeInTheDocument();
+    expect(errorMessage_3).not.toBeInTheDocument();
   });
 
   it('should call close function', async () => {

src/app/modules/shared/modules/notification/modal/accept/accept-notification-modal.component.ts

@@ -46,7 +46,7 @@ export class AcceptNotificationModalComponent {
 
   public show(notification: Notification): void {
     this.notification = notification;
-    this.textAreaControl.setValidators([Validators.required]);
+    this.textAreaControl.setValidators([Validators.required, Validators.maxLength(1000), Validators.minLength(15)]);
 
     const onConfirm = (isConfirmed: boolean) => {
       const reason = this.formGroup.get('reason').value;

src/app/modules/shared/modules/notification/modal/close/close-notification-modal.component.spec.ts

@@ -23,6 +23,7 @@ import { NotificationStatus } from '@shared/model/notification.model';
 import { CloseNotificationModalComponent } from '@shared/modules/notification/modal/close/close-notification-modal.component';
 import { renderCloseModal } from '@shared/modules/notification/modal/modalTestHelper.spec';
 import { fireEvent, screen, waitFor } from '@testing-library/angular';
+import { getRandomText } from '../../../../../../mocks/services/text-generator.helper';
 
 describe('CloseNotificationModalComponent', () => {
   it('should create close modal', async () => {
@@ -54,9 +55,19 @@ describe('CloseNotificationModalComponent', () => {
 
     const errorMessage_1 = await waitFor(() => screen.getByText('errorMessage.required'));
     expect(errorMessage_1).toBeInTheDocument();
+
     fireEvent.input(textArea, { target: { value: 'Some Text' } });
+    const errorMessage_2 = await waitFor(() => screen.getByText('errorMessage.minLength'));
+    expect(errorMessage_2).toBeInTheDocument();
+
+    fireEvent.input(textArea, { target: { value: getRandomText(1500) } });
+    const errorMessage_3 = await waitFor(() => screen.getByText('errorMessage.maxLength'));
+    expect(errorMessage_3).toBeInTheDocument();
 
+    fireEvent.input(textArea, { target: { value: 'Some longer text with at least 15 chars' } });
     expect(errorMessage_1).not.toBeInTheDocument();
+    expect(errorMessage_2).not.toBeInTheDocument();
+    expect(errorMessage_3).not.toBeInTheDocument();
   });
 
   it('should call close function', async () => {

src/app/modules/shared/modules/notification/modal/close/close-notification-modal.component.ts

@@ -46,7 +46,7 @@ export class CloseNotificationModalComponent {
 
   public show(notification: Notification): void {
     this.notification = notification;
-    this.textAreaControl.setValidators([Validators.required]);
+    this.textAreaControl.setValidators([Validators.required, Validators.maxLength(1000), Validators.minLength(15)]);
 
     const onConfirm = (isConfirmed: boolean) => {
       const reason = this.formGroup.get('reason').value;

src/app/modules/shared/modules/notification/modal/decline/decline-notification-modal.component.spec.ts

@@ -22,6 +22,7 @@
 import { NotificationStatus } from '@shared/model/notification.model';
 import { renderDeclineModal } from '@shared/modules/notification/modal/modalTestHelper.spec';
 import { fireEvent, screen, waitFor } from '@testing-library/angular';
+import { getRandomText } from '../../../../../../mocks/services/text-generator.helper';
 
 describe('DeclineNotificationModalComponent', () => {
   it('should create close modal', async () => {
@@ -56,8 +57,17 @@ describe('DeclineNotificationModalComponent', () => {
     expect(errorMessage_1).toBeInTheDocument();
 
     fireEvent.input(textArea, { target: { value: 'Some Text' } });
+    const errorMessage_2 = await waitFor(() => screen.getByText('errorMessage.minLength'));
+    expect(errorMessage_2).toBeInTheDocument();
 
+    fireEvent.input(textArea, { target: { value: getRandomText(1500) } });
+    const errorMessage_3 = await waitFor(() => screen.getByText('errorMessage.maxLength'));
+    expect(errorMessage_3).toBeInTheDocument();
+
+    fireEvent.input(textArea, { target: { value: 'Some longer text with at least 15 chars' } });
     expect(errorMessage_1).not.toBeInTheDocument();
+    expect(errorMessage_2).not.toBeInTheDocument();
+    expect(errorMessage_3).not.toBeInTheDocument();
   });
 
   it('should call close function', async () => {

src/app/modules/shared/modules/notification/modal/decline/decline-notification-modal.component.ts

@@ -46,7 +46,7 @@ export class DeclineNotificationModalComponent {
 
   public show(notification: Notification): void {
     this.notification = notification;
-    this.textAreaControl.setValidators([Validators.required]);
+    this.textAreaControl.setValidators([Validators.required, Validators.maxLength(1000), Validators.minLength(15)]);
 
     const onConfirm = (isConfirmed: boolean) => {
       const reason = this.formGroup.get('reason').value;