New notification type - task closed

tolgee · Jan 29, 2025 · d3bc103 · d3bc103
1 parent e962fab
commit d3bc103
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/backend/data/src/main/kotlin/io/tolgee/constants/NotificationType.kt b/backend/data/src/main/kotlin/io/tolgee/constants/NotificationType.kt
@@ -3,6 +3,7 @@ package io.tolgee.constants
 enum class NotificationType {
   TASK_ASSIGNED,
   TASK_COMPLETED,
+  TASK_CLOSED,
   MFA_ENABLED,
   MFA_DISABLED,
   PASSWORD_CHANGED,

diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/TaskService.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/TaskService.kt
@@ -558,12 +558,17 @@ class TaskService(
   }
 
   private fun createNotificationIfApplicable(task: Task) {
-    if (task.state != TaskState.DONE) return
+    val notificationType = when (task.state) {
+      TaskState.DONE -> NotificationType.TASK_COMPLETED
+      TaskState.CLOSED -> NotificationType.TASK_CLOSED
+      else -> return
+    }
+
     val author = task.author ?: return
 
     notificationService.save(
       Notification().apply {
-        type = NotificationType.TASK_COMPLETED
+        type = notificationType
         user = author
         project = task.project
         originatingUser = authenticationFacade.authenticatedUserEntity

diff --git a/webapp/src/component/layout/Notifications/NotificationTypeMap.tsx b/webapp/src/component/layout/Notifications/NotificationTypeMap.tsx
@@ -1,5 +1,6 @@
 import { TaskAssignedItem } from 'tg.component/layout/Notifications/TaskAssignedItem';
 import { TaskCompletedItem } from 'tg.component/layout/Notifications/TaskCompletedItem';
+import { TaskClosedItem } from 'tg.component/layout/Notifications/TaskClosedItem';
 import { MfaEnabledItem } from 'tg.component/layout/Notifications/MfaEnabledItem';
 import { MfaDisabledItem } from 'tg.component/layout/Notifications/MfaDisabledItem';
 import { PasswordChangedItem } from 'tg.component/layout/Notifications/PasswordChangedItem';
@@ -15,6 +16,7 @@ type NotificationsComponentMap = Record<
 export const notificationComponents: NotificationsComponentMap = {
   TASK_ASSIGNED: TaskAssignedItem,
   TASK_COMPLETED: TaskCompletedItem,
+  TASK_CLOSED: TaskClosedItem,
   MFA_ENABLED: MfaEnabledItem,
   MFA_DISABLED: MfaDisabledItem,
   PASSWORD_CHANGED: PasswordChangedItem,

diff --git a/webapp/src/component/layout/Notifications/TaskClosedItem.tsx b/webapp/src/component/layout/Notifications/TaskClosedItem.tsx
@@ -0,0 +1,19 @@
+import { default as React, FunctionComponent } from 'react';
+import { T } from '@tolgee/react';
+import {
+  TaskItem,
+  TaskItemProps,
+} from 'tg.component/layout/Notifications/TaskItem';
+
+type TaskClosedItemProps = TaskItemProps;
+
+export const TaskClosedItem: FunctionComponent<TaskClosedItemProps> = ({
+  notification,
+  ...props
+}) => {
+  return (
+    <TaskItem notification={notification} {...props}>
+      <T keyName="notifications-task-closed" />
+    </TaskItem>
+  );
+};
diff --git a/webapp/src/service/apiSchema.generated.ts b/webapp/src/service/apiSchema.generated.ts
@@ -2930,6 +2930,7 @@ export interface components {
       type:
         | "TASK_ASSIGNED"
         | "TASK_COMPLETED"
+        | "TASK_CLOSED"
         | "MFA_ENABLED"
         | "MFA_DISABLED"
         | "PASSWORD_CHANGED";