CM-232: use IDs in mutation label (#11)

openimis · Jul 24, 2023 · b212763 · b212763
1 parent beb3e3e
commit b212763
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/components/groups-management/TaskGroupsSearcher.js b/src/components/groups-management/TaskGroupsSearcher.js
@@ -62,7 +62,7 @@ function TaskGroupsSearcher({
       deleteTaskGroup(
         taskGroupToDelete,
         formatMessageWithValues('taskGroup.delete.mutationLabel', {
-          code: taskGroupToDelete.code,
+          id: taskGroupToDelete?.id,
         }),
       );
       setDeletedTaskGroupsUuids([...deletedTaskGroupsUuids, taskGroupToDelete.id]);

diff --git a/src/pages/TaskGroupPage.js b/src/pages/TaskGroupPage.js
@@ -54,25 +54,33 @@ function TaskGroupPage({
     if (taskGroup?.id) {
       dispatch(updateTaskGroup(
         editedTaskGroup,
-        formatMessageWithValues('taskGroup.update.mutationLabel', titleParams(editedTaskGroup)),
+        formatMessageWithValues('taskGroup.update.mutationLabel', {
+          id: editedTaskGroup?.id,
+        }),
       ));
     } else {
       dispatch(createTaskGroup(
         editedTaskGroup,
-        formatMessageWithValues('taskGroup.create.mutationLabel', titleParams(editedTaskGroup)),
+        formatMessageWithValues('taskGroup.create.mutationLabel', {
+          id: editedTaskGroup?.id,
+        }),
       ));
     }
   };
 
   const deleteTaskGroupCallback = () => dispatch(deleteTaskGroup(
     taskGroup,
-    formatMessageWithValues('taskGroup.delete.mutationLabel', titleParams(taskGroup)),
+    formatMessageWithValues('taskGroup.delete.mutationLabel', {
+      id: taskGroup?.id,
+    }),
   ));
 
   const openDeleteTaskGroupConfirmDialog = () => {
     setConfirmedAction(() => deleteTaskGroupCallback);
     coreConfirm(
-      formatMessageWithValues('taskGroup.delete.confirm.title', titleParams(editedTaskGroup)),
+      formatMessageWithValues('taskGroup.delete.confirm.title', {
+        id: taskGroup?.id,
+      }),
       formatMessage('taskGroup.delete.confirm.message'),
     );
   };

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -38,9 +38,9 @@
   "tasksManagement.taskGroup.completionPolicy.N": "N",
   "tasksManagement.taskGroup.delete.confirm.title": "Delete task group {code}",
   "tasksManagement.taskGroup.delete.confirm.message": "Are you sure you want to delete the task group?",
-  "tasksManagement.taskGroup.delete.mutationLabel": "Delete task group {code}",
-  "tasksManagement.taskGroup.update.mutationLabel": "Update task group {code}",
-  "tasksManagement.taskGroup.create.mutationLabel": "Create task group {code}",
+  "tasksManagement.taskGroup.delete.mutationLabel": "Delete task group {id}",
+  "tasksManagement.taskGroup.update.mutationLabel": "Update task group {id}",
+  "tasksManagement.taskGroup.create.mutationLabel": "Create task group {id}",
   "tasksManagement.TaskExecutorsPicker.label": "Task Executors",
   "tasksManagement.TaskExecutorsPicker.placeholder": "Search for Task Executor...",
   "tasksManagement.taskGroup.placeholder": "Not assigned",