Merge pull request #12 from catenax-ng/TRACEFOSS-1002-approve-to-sent

TRACEFOSS-1002: switched from approved state to sent

Author: fbedarf

src/app/mocks/mock.ts

@@ -23,10 +23,10 @@ import { setupWorker } from 'msw';
 import {
   adminHandler,
   dashboardHandler,
+  errorHandler,
   investigationsHandlers,
   otherPartsHandlers,
   partsHandlers,
-  errorHandler,
 } from './services';
 
 const handlers = [

src/app/mocks/services/investigations-mock/investigations.handler.ts

@@ -54,7 +54,7 @@ export const investigationsHandlers = [
 
     const currentStatus = [
       NotificationStatus.CREATED,
-      NotificationStatus.APPROVED,
+      NotificationStatus.SENT,
       NotificationStatus.ACKNOWLEDGED,
       NotificationStatus.ACCEPTED,
       NotificationStatus.DECLINED,
@@ -92,7 +92,7 @@ export const investigationsHandlers = [
 
     const statusCollection = [
       NotificationStatus.CREATED,
-      NotificationStatus.APPROVED,
+      NotificationStatus.SENT,
       NotificationStatus.RECEIVED,
       NotificationStatus.CLOSED,
       NotificationStatus.CANCELED,
@@ -131,7 +131,7 @@ export const investigationsTestHandlers = [
 
     const currentStatus = [
       NotificationStatus.CREATED,
-      NotificationStatus.APPROVED,
+      NotificationStatus.SENT,
       NotificationStatus.ACKNOWLEDGED,
       NotificationStatus.ACCEPTED,
       NotificationStatus.DECLINED,
@@ -160,7 +160,7 @@ export const investigationsTestHandlers = [
 
     const statusCollection = [
       NotificationStatus.CREATED,
-      NotificationStatus.APPROVED,
+      NotificationStatus.SENT,
       NotificationStatus.RECEIVED,
       NotificationStatus.CLOSED,
       NotificationStatus.CANCELED,

src/app/modules/shared/assembler/investigations.assembler.spec.ts

@@ -43,7 +43,7 @@ describe('InvestigationsAssembler', () => {
               id: 'test-1',
               description: 'test descr',
               createdDate: '2022-07-26T15:09:39.419Z',
-              status: NotificationStatus.APPROVED,
+              status: NotificationStatus.SENT,
               channel: 'SENDER',
               createdBy: '',
               sendTo: '',
@@ -72,7 +72,7 @@ describe('InvestigationsAssembler', () => {
           {
             id: 'test-1',
             description: 'test descr',
-            status: NotificationStatus.APPROVED,
+            status: NotificationStatus.SENT,
             createdDate: new CalendarDateModel('2022-07-26T15:09:39.419Z'),
             createdBy: '',
             sendTo: '',

src/app/modules/shared/components/notification-reason/notification-reason.component.ts

@@ -49,7 +49,7 @@ export class NotificationReasonComponent {
     createdBy,
     sendTo,
   }: Notification) {
-    const { ACCEPTED, APPROVED, CLOSED, CREATED, DECLINED } = NotificationStatus;
+    const { ACCEPTED, SENT, CLOSED, CREATED, DECLINED } = NotificationStatus;
     const { accept, close, decline } = reason;
 
     const senderDirection: TextMessageDirection = isFromSender ? 'right' : 'left';
@@ -59,7 +59,7 @@ export class NotificationReasonComponent {
       reason: description,
       direction: senderDirection,
       user: createdBy,
-      status: [CREATED, APPROVED].includes(status) ? status : APPROVED,
+      status: [CREATED, SENT].includes(status) ? status : SENT,
       date: createdDate,
     };
 

src/app/modules/shared/model/notification.model.ts

@@ -25,7 +25,7 @@ import type { Pagination, PaginationResponse } from '@core/model/pagination.mode
 export enum NotificationStatus {
   ACCEPTED = 'ACCEPTED',
   ACKNOWLEDGED = 'ACKNOWLEDGED',
-  APPROVED = 'APPROVED',
+  APPROVED = 'SENT',
   CANCELED = 'CANCELED',
   CLOSED = 'CLOSED',
   CREATED = 'CREATED',

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

@@ -26,7 +26,7 @@ import { screen, waitFor } from '@testing-library/angular';
 
 describe('CloseNotificationModalComponent', () => {
   it('should create close modal', async () => {
-    await renderCloseModal(NotificationStatus.APPROVED);
+    await renderCloseModal(NotificationStatus.SENT);
     const title = await waitFor(() => screen.getByText('Close of investigation'));
     const hint = await waitFor(() => screen.getByText('Are you sure you want to close this investigation?'));
     const hint2 = await waitFor(() => screen.getByText('Enter the reason for close action.'));
@@ -41,14 +41,14 @@ describe('CloseNotificationModalComponent', () => {
   });
 
   it('should render investigation description', async () => {
-    const { notification } = await renderCloseModal(NotificationStatus.APPROVED);
+    const { notification } = await renderCloseModal(NotificationStatus.SENT);
     const description = await waitFor(() => screen.getByText(notification.description));
 
     expect(description).toBeInTheDocument();
   });
 
   it('should check validation of textarea', async () => {
-    const { fixture } = await renderCloseModal(NotificationStatus.APPROVED);
+    const { fixture } = await renderCloseModal(NotificationStatus.SENT);
     const buttonR = await waitFor(() => screen.getByText('Close'));
     buttonR.click();
 
@@ -65,7 +65,7 @@ describe('CloseNotificationModalComponent', () => {
   });
 
   it('should call close function', async () => {
-    const { fixture } = await renderCloseModal(NotificationStatus.APPROVED);
+    const { fixture } = await renderCloseModal(NotificationStatus.SENT);
 
     const textArea: HTMLTextAreaElement = await waitFor(() => screen.getByTestId('TextAreaComponent-0'));
     textArea.value = 'Some Text Some Text Some Text';

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

@@ -19,13 +19,8 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import { Component, EventEmitter, Input, Output, TemplateRef, ViewChild } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { ToastService } from '@shared/components/toasts/toast.service';
+import { Component, Input } from '@angular/core';
 import { Notification } from '@shared/model/notification.model';
-import { ModalData } from '@shared/modules/modal/core/modal.model';
-import { ModalService } from '@shared/modules/modal/core/modal.service';
-import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-notification-modal-content',

src/app/modules/shared/pipes/format-date.pipe.ts

@@ -21,7 +21,7 @@
 
 import { Inject, OnDestroy, Pipe, PipeTransform } from '@angular/core';
 import { CalendarDateModel } from '@core/model/calendar-date.model';
-import { I18NEXT_SERVICE, ITranslationService, PipeOptions } from 'angular-i18next';
+import { I18NEXT_SERVICE, ITranslationService } from 'angular-i18next';
 import { DateTimeFormatOptions } from 'luxon';
 import type { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';

src/assets/locales/de/common.json

@@ -128,7 +128,7 @@
     "status": {
       "RECEIVED": "Erhalten",
       "CREATED": "Erstellt",
-      "APPROVED": "Zugestellt",
+      "SENT": "Zugestellt",
       "CANCELED": "Abgebrochen",
       "CLOSED": "Abgeschlossen",
       "ACCEPTED": "Akzeptiert",

src/assets/locales/en/common.json

@@ -135,7 +135,7 @@
       "queuedAndRequested": "Queued & Requested"
     },
     "status": {
-      "APPROVED": "Requested",
+      "SENT": "Requested",
       "CANCELED": "Cancelled",
       "CLOSED": "Closed",
       "CREATED": "Queued",