Extension of the Audit Log

AdminApi/src/AdminApi/ClientApp/src/app/components/identity/identity-details/deletion-processes/dp-audit-logs/dp-audit-logs-details/dp-audit-logs-details/dp-audit-logs-details.component.ts

@@ -68,61 +68,6 @@ export class DeletionProcessAuditLogsDetailsComponent implements OnInit {
     }
 
     public getFormattedMessage(messageKey: string, additionalData: Record<string, string>): string {
-        let messageTemplate: string;
-
-        switch (messageKey) {
-            case "StartedByOwner":
-                messageTemplate = "The deletion process was started by the owner. It was automatically approved.";
-                break;
-            case "StartedBySupport":
-                messageTemplate = "The deletion process was started by support. It is now waiting for approval.";
-                break;
-            case "Approved":
-                messageTemplate = "The deletion process was approved.";
-                break;
-            case "Rejected":
-                messageTemplate = "The deletion process was rejected.";
-                break;
-            case "CancelledByOwner":
-                messageTemplate = "The deletion process was cancelled by the owner of the identity.";
-                break;
-            case "CancelledBySupport":
-                messageTemplate = "The deletion process was cancelled by a support employee.";
-                break;
-            case "CancelledAutomatically":
-                messageTemplate = "The deletion process was cancelled automatically, because it wasn't approved by the owner within the approval period.";
-                break;
-            case "ApprovalReminder1Sent":
-                messageTemplate = "The first approval reminder notification has been sent.";
-                break;
-            case "ApprovalReminder2Sent":
-                messageTemplate = "The second approval reminder notification has been sent.";
-                break;
-            case "ApprovalReminder3Sent":
-                messageTemplate = "The third approval reminder notification has been sent.";
-                break;
-            case "GracePeriodReminder1Sent":
-                messageTemplate = "The first grace period reminder notification has been sent.";
-                break;
-            case "GracePeriodReminder2Sent":
-                messageTemplate = "The second grace period reminder notification has been sent.";
-                break;
-            case "GracePeriodReminder3Sent":
-                messageTemplate = "The third grace period reminder notification has been sent.";
-                break;
-            case "DataDeleted":
-                const messages: string[] = [];
-                Object.keys(additionalData).forEach((key) => {
-                    const message = `All ${additionalData[key]} have been deleted.`;
-                    messages.push(message);
-                });
-                messageTemplate = messages.join("\n");
-                break;
-            default:
-                messageTemplate = "Unknown message key.";
-                break;
-        }
-
-        return messageTemplate;
+        return this.identityService.getFormattedMessage(messageKey, additionalData);
     }
 }

AdminApi/src/AdminApi/ClientApp/src/app/components/identity/identity-details/deletion-processes/dp-details/dp-details.component.html

@@ -62,7 +62,7 @@ <h2 class="header-title">{{ header }}</h2>
                     <ng-container matColumnDef="message">
                         <th mat-header-cell *matHeaderCellDef>Message</th>
                         <td mat-cell *matCellDef="let AuditLog" data-label="Message:">
-                            {{ replaceMessageKeyWithCorrespondingText(AuditLog.messageKey) }}
+                            {{ getFormattedMessage(AuditLog.messageKey, AuditLog.additionalData) }}
                         </td>
                     </ng-container>
                     <ng-container matColumnDef="oldStatus">

AdminApi/src/AdminApi/ClientApp/src/app/components/identity/identity-details/deletion-processes/dp-details/dp-details.component.ts

@@ -111,36 +111,7 @@ export class DeletionProcessDetailsComponent {
         });
     }
 
-    public replaceMessageKeyWithCorrespondingText(messageKey: string): string {
-        switch (messageKey) {
-            case "StartedByOwner":
-                return "The deletion process was started by the owner. It was automatically approved.";
-            case "StartedBySupport":
-                return "The deletion process was started by support. It is now waiting for approval.";
-            case "Approved":
-                return "The deletion process was approved.";
-            case "Rejected":
-                return "The deletion process was rejected.";
-            case "CancelledByOwner":
-                return "The deletion process was cancelled by the owner of the identity.";
-            case "CancelledBySupport":
-                return "The deletion process was cancelled by a support employee.";
-            case "CancelledAutomatically":
-                return "The deletion process was cancelled automatically, because it wasn't approved by the owner within the approval period.";
-            case "ApprovalReminder1Sent":
-                return "The first approval reminder notification has been sent.";
-            case "ApprovalReminder2Sent":
-                return "The second approval reminder notification has been sent.";
-            case "ApprovalReminder3Sent":
-                return "The third approval reminder notification has been sent.";
-            case "GracePeriodReminder1Sent":
-                return "The first grace period reminder notification has been sent.";
-            case "GracePeriodReminder2Sent":
-                return "The second grace period reminder notification has been sent.";
-            case "GracePeriodReminder3Sent":
-                return "The third grace period reminder notification has been sent.";
-            default:
-                return "Unknown message key.";
-        }
+    public getFormattedMessage(messageKey: string, additionalData: Record<string, string>): string {
+        return this.identityService.getFormattedMessage(messageKey, additionalData);
     }
 }

AdminApi/src/AdminApi/ClientApp/src/app/services/identity-service/identity.service.ts

@@ -26,6 +26,39 @@ export class IdentityService {
         this.odataUrl = `${environment.odataUrl}/Identities`;
     }
 
+    /* eslint-disable @typescript-eslint/naming-convention */
+    public readonly messageTemplates: Record<string, string> = {
+        StartedByOwner: "The deletion process was started by the owner. It was automatically approved.",
+        StartedBySupport: "The deletion process was started by support. It is now waiting for approval.",
+        Approved: "The deletion process was approved.",
+        Rejected: "The deletion process was rejected.",
+        CancelledByOwner: "The deletion process was cancelled by the owner of the identity.",
+        CancelledBySupport: "The deletion process was cancelled by a support employee.",
+        CancelledAutomatically: "The deletion process was cancelled automatically, because it wasn't approved by the owner within the approval period.",
+        ApprovalReminder1Sent: "The first approval reminder notification has been sent.",
+        ApprovalReminder2Sent: "The second approval reminder notification has been sent.",
+        ApprovalReminder3Sent: "The third approval reminder notification has been sent.",
+        GracePeriodReminder1Sent: "The first grace period reminder notification has been sent.",
+        GracePeriodReminder2Sent: "The second grace period reminder notification has been sent.",
+        GracePeriodReminder3Sent: "The third grace period reminder notification has been sent.",
+        DataDeleted: "All {aggregateType} have been deleted."
+    };
+
+    public getFormattedMessage(messageKey: string, additionalData: Record<string, string>): string {
+        let messageTemplate = this.messageTemplates[messageKey];
+
+        if (!messageTemplate) {
+            return "Unknown message key.";
+        }
+
+        Object.keys(additionalData).forEach((key) => {
+            const placeholder = `{${key}}`;
+            messageTemplate = messageTemplate.replace(new RegExp(placeholder, "g"), additionalData[key]);
+        });
+
+        return messageTemplate;
+    }
+
     public getIdentities(filter: IdentityOverviewFilter, pageNumber: number, pageSize: number): Observable<ODataResponseEnvelope<IdentityOverview[]>> {
         const paginationFilter = `$top=${pageSize}&$skip=${pageNumber * pageSize}&$count=true`;
         return this.http.get<any>(`${this.odataUrl}${this.buildODataFilter(filter, paginationFilter)}${this.buildODataExpand()}`).pipe(