fixed: records in analysis step cannot be deleted (#3470)

Co-authored-by: Stefano Ricci <SteRiccio@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Jun 4, 2024 · a5c57bb · a5c57bb
1 parent 8a452ed
commit a5c57bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/core/auth/authorizer.js b/core/auth/authorizer.js
@@ -90,7 +90,7 @@ export const canEditRecord = (user, record) => {
   return level === keys.all || (level === keys.own && Record.getOwnerUuid(record) === User.getUuid(user))
 }
 
-export const canDeleteRecord = canEditRecord
+export const canDeleteRecord = (user, record) => canEditRecord(user, record) && !Record.isInAnalysisStep(record)
 
 export const canCleanseRecords = _hasSurveyPermission(permissions.recordCleanse)
 

diff --git a/webapp/views/App/views/Data/Records/Records.scss b/webapp/views/App/views/Data/Records/Records.scss
@@ -29,5 +29,9 @@
         width: 100%;
       }
     }
+    .action-buttons-col {
+      display: flex;
+      width: 100%;
+    }
   }
 }
diff --git a/webapp/views/App/views/Data/Records/useColumns.js b/webapp/views/App/views/Data/Records/useColumns.js
@@ -145,6 +145,7 @@ export const useColumns = ({ categoryItemsByCodeDefUuid, navigateToRecord, onRec
       },
       {
         key: 'action-buttons',
+        className: 'action-buttons-col',
         renderItem: ({ item: record, itemPosition }) => {
           const canEdit = Authorizer.canEditRecord(user, record)
           const canDelete = Authorizer.canDeleteRecord(user, record)