From a51c83e6361bd1949dfbc5f0004f4aedce402d0d Mon Sep 17 00:00:00 2001 From: Kyle Shanks Date: Fri, 7 Jul 2023 12:19:25 -0400 Subject: [PATCH] [C-2341] Update tracks table to display tracks marked as deleted as deleted (#3712) --- .../components/tracks-table/TracksTable.tsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/web/src/components/tracks-table/TracksTable.tsx b/packages/web/src/components/tracks-table/TracksTable.tsx index 4dda70bb59..a528e3194f 100644 --- a/packages/web/src/components/tracks-table/TracksTable.tsx +++ b/packages/web/src/components/tracks-table/TracksTable.tsx @@ -188,7 +188,8 @@ export const TracksTable = ({ ] ?? { isUserAccessTBD: false, doesUserHaveAccess: true } const isLocked = !isUserAccessTBD && !doesUserHaveAccess const index = cellInfo.row.index - const deleted = track.is_delete || track.user?.is_deactivated + const deleted = + track.is_delete || track._marked_deleted || !!track.user?.is_deactivated const renderLocked = () => { return ( @@ -311,7 +312,8 @@ export const TracksTable = ({ track.track_id ] ?? { isUserAccessTBD: false, doesUserHaveAccess: true } const isLocked = !isUserAccessTBD && !doesUserHaveAccess - const deleted = track.is_delete || !!track.user?.is_deactivated + const deleted = + track.is_delete || track._marked_deleted || !!track.user?.is_deactivated const isOwner = track.owner_id === userId if (isLocked || deleted || isOwner) { return
@@ -345,7 +347,8 @@ export const TracksTable = ({ track.track_id ] ?? { isUserAccessTBD: false, doesUserHaveAccess: true } const isLocked = !isUserAccessTBD && !doesUserHaveAccess - const deleted = track.is_delete || track.user?.is_deactivated + const deleted = + track.is_delete || track._marked_deleted || !!track.user?.is_deactivated const isOwner = track.owner_id === userId if (isLocked || deleted || isOwner) { return
@@ -382,7 +385,8 @@ export const TracksTable = ({ track.track_id ] ?? { isUserAccessTBD: false, doesUserHaveAccess: true } const isLocked = !isUserAccessTBD && !doesUserHaveAccess - const deleted = track.is_delete || !!track.user?.is_deactivated + const deleted = + track.is_delete || track._marked_deleted || !!track.user?.is_deactivated return (