Implement soft deletes for crash notes

atd-vzd/metadata/databases/default/tables/public_crash_notes.yaml

@@ -10,50 +10,55 @@ insert_permissions:
     permission:
       check: {}
       columns:
-        - id
+        - crash_pk
         - created_at
-        - updated_at
         - date
+        - id
+        - is_deleted
         - text
-        - crash_pk
+        - updated_at
         - user_email
   - role: vz-admin
     permission:
       check: {}
       columns:
-        - id
+        - crash_pk
         - created_at
-        - updated_at
         - date
+        - id
+        - is_deleted
         - text
-        - crash_pk
+        - updated_at
         - user_email
 select_permissions:
   - role: editor
     permission:
       columns:
         - crash_pk
-        - id
-        - text
-        - user_email
         - created_at
         - date
+        - id
+        - is_deleted
+        - text
         - updated_at
+        - user_email
       filter: {}
   - role: readonly
     permission:
       columns:
         - crash_pk
-        - id
-        - text
-        - user_email
         - created_at
         - date
+        - id
+        - is_deleted
+        - text
         - updated_at
+        - user_email
       filter: {}
   - role: vz-admin
     permission:
       columns:
+        - is_deleted
         - crash_pk
         - id
         - text
@@ -66,6 +71,7 @@ update_permissions:
   - role: editor
     permission:
       columns:
+        - is_deleted
         - crash_pk
         - id
         - text
@@ -79,12 +85,13 @@ update_permissions:
     permission:
       columns:
         - crash_pk
-        - id
-        - text
-        - user_email
         - created_at
         - date
+        - id
+        - is_deleted
+        - text
         - updated_at
+        - user_email
       filter: {}
       check: null
 delete_permissions:

atd-vzd/migrations/default/1725055783150_crash_notes_is_deleted/down.sql

@@ -0,0 +1,2 @@
+alter table public.crash_notes 
+drop column if exists is_deleted;

atd-vzd/migrations/default/1725055783150_crash_notes_is_deleted/up.sql

@@ -0,0 +1,2 @@
+alter table public.crash_notes add column is_deleted bool
+ not null default false;

atd-vze/src/Components/Notes/Notes.js

@@ -12,7 +12,7 @@ const Notes = ({
   notes,
   INSERT_NOTE,
   UPDATE_NOTE,
-  DELETE_NOTE,
+  SOFT_DELETE_NOTE,
   refetch,
 }) => {
   // add a state variable to manage value when new note is entered
@@ -30,7 +30,7 @@ const Notes = ({
   // declare mutation functions
   const [addNote] = useMutation(INSERT_NOTE);
   const [editNote] = useMutation(UPDATE_NOTE);
-  const [deleteNote] = useMutation(DELETE_NOTE);
+  const [deleteNote] = useMutation(SOFT_DELETE_NOTE);
   const fieldConfig = notesDataMap[0];
 
   // function to handle add button click
@@ -154,8 +154,8 @@ const Notes = ({
             {/* display user input row for users with edit permissions*/}
             {!isReadOnly(roles) && (
               <tr>
-                <td></td>
-                <td></td>
+                <td />
+                <td />
                 <td>
                   <Input
                     type="textarea"
@@ -176,7 +176,7 @@ const Notes = ({
                     Add
                   </Button>
                 </td>
-                <td></td>
+                <td />
               </tr>
             )}
             {/* iterate through each row in notes table */}
@@ -222,7 +222,7 @@ const Notes = ({
                       </td>
                     ) : (
                       // else if user has edit permissions and is not editing render empty cell
-                      !isReadOnly(roles) && !isEditing && <td></td>
+                      !isReadOnly(roles) && !isEditing && <td />
                     )}
                     {/* display delete button if row was created by current user,
                   user has edit permissions, and user is not currently editing */}
@@ -234,14 +234,13 @@ const Notes = ({
                           modalBody={
                             <div>
                               Are you sure you want to delete this note?
-                              <p className="mt-2 text-truncate">{row.text}</p>
                             </div>
                           }
                         />
                       </td>
                     ) : (
                       // else if user has edit permissions and is not editing render empty cell
-                      !isReadOnly(roles) && !isEditing && <td></td>
+                      !isReadOnly(roles) && !isEditing && <td />
                     )}
                     {/* display save button if user is editing */}
                     {!isReadOnly(roles) && isEditing && (

atd-vze/src/queries/crashNotes.js

@@ -1,9 +1,17 @@
 import { gql } from "apollo-boost";
 
 export const INSERT_NOTE = gql`
-  mutation InsertNote($note: String!, $parentRecordId: Int!, $userEmail: String) {
+  mutation InsertNote(
+    $note: String!
+    $parentRecordId: Int!
+    $userEmail: String
+  ) {
     insert_crash_notes(
-      objects: { text: $note, crash_pk: $parentRecordId, user_email: $userEmail }
+      objects: {
+        text: $note
+        crash_pk: $parentRecordId
+        user_email: $userEmail
+      }
     ) {
       returning {
         crash_pk
@@ -26,13 +34,14 @@ export const UPDATE_NOTE = gql`
   }
 `;
 
-export const DELETE_NOTE = gql`
-  mutation DeleteNote($id: Int!) {
-    delete_crash_notes_by_pk(id: $id) {
-      crash_pk
-      text
-      date
-      user_email
+export const SOFT_DELETE_NOTE = gql`
+  mutation SoftDeleteNote($id: Int!) {
+    update_crash_notes_by_pk(
+      pk_columns: { id: $id }
+      _set: { is_deleted: true }
+    ) {
+      id
+      is_deleted
     }
   }
 `;

atd-vze/src/queries/crashes.js

@@ -172,7 +172,10 @@ export const GET_CRASH = gql`
           }
         }
       }
-      crash_notes(order_by: { date: desc }) {
+      crash_notes(
+        where: { is_deleted: { _eq: false } }
+        order_by: { date: desc }
+      ) {
         id
         created_at
         updated_at

atd-vze/src/views/Crashes/Crash.js

@@ -39,7 +39,7 @@ import { UPDATE_CRASH, GET_CRASH } from "../../queries/crashes";
 import {
   INSERT_NOTE,
   UPDATE_NOTE,
-  DELETE_NOTE,
+  SOFT_DELETE_NOTE,
 } from "../../queries/crashNotes";
 
 function Crash(props) {
@@ -286,7 +286,7 @@ function Crash(props) {
             notes={crashRecord?.crash?.crash_notes}
             INSERT_NOTE={INSERT_NOTE}
             UPDATE_NOTE={UPDATE_NOTE}
-            DELETE_NOTE={DELETE_NOTE}
+            SOFT_DELETE_NOTE={SOFT_DELETE_NOTE}
             refetch={crashRefetch}
           />
         </Col>