feat(section list actions): disable "Delete" action without delete auth

dhis2 · Mar 18, 2024 · 824d1cb · 824d1cb
1 parent 429c0cb
commit 824d1cb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/components/sectionList/listActions/DefaultListActions.tsx b/src/components/sectionList/listActions/DefaultListActions.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { BaseListModel } from '../../../lib'
-import { canEditModel } from '../../../lib/models/access'
+import { canEditModel, canDeleteModel } from '../../../lib/models/access'
 import { ListActions, ActionEdit, ActionMore } from './SectionListActions'
 
 type DefaultListActionProps = {
@@ -16,12 +16,15 @@ export const DefaultListActions = ({
     onOpenSharingClick,
     onDeleteClick,
 }: DefaultListActionProps) => {
+    const deleteAccess = canDeleteModel(model)
     const editAccess = canEditModel(model)
+
     return (
         <ListActions>
             <ActionEdit modelId={model.id} />
             <ActionMore
                 modelId={model.id}
+                deleteAccess={deleteAccess}
                 editAccess={editAccess}
                 onShowDetailsClick={() => onShowDetailsClick(model)}
                 onOpenSharingClick={() => onOpenSharingClick(model.id)}

diff --git a/src/components/sectionList/listActions/SectionListActions.tsx b/src/components/sectionList/listActions/SectionListActions.tsx
@@ -32,13 +32,15 @@ export const ActionEdit = ({ modelId }: { modelId: string }) => {
 
 type ActionMoreProps = {
     modelId: string
+    deleteAccess: boolean
     editAccess: boolean
     onShowDetailsClick: () => void
     onOpenSharingClick: () => void
     onDeleteClick: () => void
 }
 export const ActionMore = ({
     modelId,
+    deleteAccess,
     editAccess,
     onOpenSharingClick,
     onShowDetailsClick,
@@ -104,17 +106,23 @@ export const ActionMore = ({
                             ></MenuItem>
                         </TooltipWrapper>
 
-                        <MenuItem
-                            dense
-                            label={i18n.t('Delete')}
-                            icon={<IconDelete16 />}
-                            onClick={() => {
-                                onDeleteClick()
-                                setOpen(false)
-                            }}
-                            target="_blank"
-                            href={href}
-                        />
+                        <TooltipWrapper
+                            condition={!deleteAccess}
+                            content={TOOLTIPS.noEditAccess}
+                        >
+                            <MenuItem
+                                dense
+                                disabled={!deleteAccess}
+                                label={i18n.t('Delete')}
+                                icon={<IconDelete16 />}
+                                onClick={() => {
+                                    onDeleteClick()
+                                    setOpen(false)
+                                }}
+                                target="_blank"
+                                href={href}
+                            />
+                        </TooltipWrapper>
                     </FlyoutMenu>
                 </Popover>
             )}

diff --git a/src/lib/constants/tooltips.ts b/src/lib/constants/tooltips.ts
@@ -2,4 +2,5 @@ import i18n from '@dhis2/d2-i18n'
 
 export const TOOLTIPS = {
     noEditAccess: i18n.t('You do not have access to edit this item.'),
+    noDeleteAccess: i18n.t('You do not have access to delete this item.'),
 }
diff --git a/src/lib/models/access.ts b/src/lib/models/access.ts
@@ -1,10 +1,14 @@
 import type { Access, BaseIdentifiableObject } from '../../types/generated'
 
 export const hasWriteAccess = (access: Partial<Access>) => !!access.write
+export const hasDeleteAccess = (access: Partial<Access>) => !!access.delete
 
 export const canEditModel = (model: Pick<BaseIdentifiableObject, 'access'>) =>
     hasWriteAccess(model.access)
 
+export const canDeleteModel = (model: Pick<BaseIdentifiableObject, 'access'>) =>
+    hasDeleteAccess(model.access)
+
 export type ParsedAccessPart = {
     read: boolean
     write: boolean