fix: [DHIS2-17843] Disable delete enrollment button when user does not have authority

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
-"PO-Revision-Date: 2024-10-14T14:53:34.553Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
+"PO-Revision-Date: 2024-10-25T18:18:11.518Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1133,6 +1133,9 @@ msgstr "Mark as cancelled"
 msgid "Mark incomplete"
 msgstr "Mark incomplete"
 
+msgid "You do not have access to delete this enrollment"
+msgstr "You do not have access to delete this enrollment"
+
 msgid "Delete enrollment"
 msgstr "Delete enrollment"
 

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js

@@ -39,6 +39,7 @@ export const ActionsPlain = ({
     onUpdate,
     onDelete,
     onUpdateOwnership,
+    canCascadeDeleteEnrollment,
     isTransferLoading,
     onAddNew,
     loading,
@@ -115,6 +116,7 @@ export const ActionsPlain = ({
                                 onUpdate={handleOnUpdateStatus}
                             />
                             <Delete
+                                canCascadeDeleteEnrollment={canCascadeDeleteEnrollment}
                                 enrollment={enrollment}
                                 onDelete={handleOnDelete}
                             />

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js

@@ -4,6 +4,7 @@ import { ActionsComponent } from './Actions.component';
 import type { Props } from './actions.types';
 import { useUpdateEnrollment, useDeleteEnrollment } from '../dataMutation/dataMutation';
 import { useUpdateOwnership } from './Transfer/hooks';
+import { useAuthorities } from '../../../utils/authority/useAuthorities';
 
 export const Actions = ({
     enrollment = {},
@@ -20,6 +21,7 @@ export const Actions = ({
 }: Props) => {
     const { updateMutation, updateLoading } = useUpdateEnrollment(refetchEnrollment, refetchTEI, onError, onSuccess);
     const { deleteMutation, deleteLoading } = useDeleteEnrollment(onDelete, onError, onSuccess);
+    const { hasAuthority } = useAuthorities({ authorities: ['F_ENROLLMENT_CASCADE_DELETE'] });
     const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({
         teiId: enrollment.trackedEntity,
         programId: enrollment.program,
@@ -52,6 +54,7 @@ export const Actions = ({
             onUpdate={updateMutation}
             onUpdateStatus={handleUpdateStatus}
             onDelete={deleteMutation}
+            canCascadeDeleteEnrollment={hasAuthority}
             loading={updateLoading || deleteLoading || updateStatusLoading}
             onUpdateOwnership={updateEnrollmentOwnership}
             isTransferLoading={isTransferLoading}

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js

@@ -1,4 +1,5 @@
 // @flow
+import React, { useState } from 'react';
 import {
     IconDelete16,
     MenuItem,
@@ -9,18 +10,21 @@ import {
     ButtonStrip,
     Button,
 } from '@dhis2/ui';
-import React, { useState } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import type { Props } from './delete.types';
+import { ConditionalTooltip } from '../../../Tooltips/ConditionalTooltip/';
 
-export const Delete = ({ enrollment, onDelete }: Props) => {
+export const Delete = ({ canCascadeDeleteEnrollment, enrollment, onDelete }: Props) => {
     const [toggle, setToggle] = useState(false);
+    const disabled = !canCascadeDeleteEnrollment;
+    const tooltipContent = i18n.t('You do not have access to delete this enrollment');
 
     return (
-        <div>
+        <ConditionalTooltip content={tooltipContent} enabled={disabled}>
             <MenuItem
                 dense
                 dataTest="widget-enrollment-actions-delete"
+                disabled={disabled}
                 icon={<IconDelete16 />}
                 destructive
                 label={i18n.t('Delete')}
@@ -54,6 +58,6 @@ export const Delete = ({ enrollment, onDelete }: Props) => {
                     </ModalActions>
                 </Modal>
             )}
-        </div>
+        </ConditionalTooltip>
     );
 };

src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js

@@ -1,6 +1,7 @@
 // @flow
 
 export type Props = {|
+    canCascadeDeleteEnrollment: boolean,
     enrollment: Object,
     onDelete: (arg: Object) => void,
 |};

src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js

@@ -32,6 +32,7 @@ export type PlainProps = {|
     onDelete: (arg: Object) => void,
     onAddNew: (arg: Object) => void,
     onUpdateOwnership: UpdateEnrollmentOwnership,
+    canCascadeDeleteEnrollment: boolean,
     isTransferLoading: boolean,
     loading: boolean,
     canAddNew: boolean,

src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js

@@ -32,7 +32,7 @@ import { EventChangelogWrapper } from './EventChangelogWrapper';
 import { FEATURES, useFeature } from '../../../capture-core-utils';
 import { inMemoryFileStore } from '../DataEntry/file/inMemoryFileStore';
 import { eventStatuses } from './constants/status.const';
-import { useAuthorities } from './hooks';
+import { useAuthorities } from '../../utils/authority/useAuthorities';
 
 const styles = {
     header: {
@@ -101,8 +101,8 @@ export const WidgetEventEditPlain = ({
     const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
 
     const eventAccess = getProgramEventAccess(programId, stageId);
-    const { canEditCompletedEvent } = useAuthorities();
-    const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED;
+    const { hasAuthority } = useAuthorities({ authorities: ['F_UNCOMPLETE_EVENT'] });
+    const blockEntryForm = stage.blockEntryForm && !hasAuthority && eventStatus === eventStatuses.COMPLETED;
     const disableEdit = !eventAccess?.write || blockEntryForm;
 
     const tooltipContent = blockEntryForm ?

src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js

@@ -1,8 +1,8 @@
 // @flow
 import React from 'react';
+import { useAuthorities } from 'capture-core/utils/authority/useAuthorities';
 import type { Props } from './OverflowMenu.types';
 import { OverflowMenuComponent } from './OverflowMenu.component';
-import { useAuthorities } from './hooks';
 
 export const OverflowMenu = ({
     trackedEntityTypeName,
@@ -13,13 +13,13 @@ export const OverflowMenu = ({
     teiId,
     programAPI,
 }: Props) => {
-    const { canCascadeDeleteTei } = useAuthorities();
+    const { hasAuthority } = useAuthorities({ authorities: ['F_TEI_CASCADE_DELETE'] });
 
     return (
         <OverflowMenuComponent
             trackedEntityTypeName={trackedEntityTypeName}
             canWriteData={canWriteData}
-            canCascadeDeleteTei={canCascadeDeleteTei}
+            canCascadeDeleteTei={hasAuthority}
             trackedEntity={trackedEntity}
             onDeleteSuccess={onDeleteSuccess}
             displayChangelog={displayChangelog}

src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js → src/core_modules/capture-core/utils/authority/useAuthorities.js

@@ -2,11 +2,10 @@
 import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';
 
 const auth = Object.freeze({
-    F_UNCOMPLETE_EVENT: 'F_UNCOMPLETE_EVENT',
     ALL: 'ALL',
 });
 
-export const useAuthorities = () => {
+export const useAuthorities = ({ authorities }: { authorities: Array<string> }) => {
     const queryKey = ['authorities'];
     const queryFn = {
         resource: 'me.json',
@@ -15,13 +14,15 @@ export const useAuthorities = () => {
         },
     };
     const queryOptions = {
-        select: ({ authorities }) =>
-            authorities &&
-            authorities.some(authority => authority === auth.ALL || authority === auth.F_UNCOMPLETE_EVENT),
+        select: ({ authorities: userAuthorities }) =>
+            userAuthorities &&
+            authorities.some(
+                authority => userAuthorities.includes(auth.ALL) || userAuthorities.includes(authority),
+            ),
     };
     const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
 
     return {
-        canEditCompletedEvent: Boolean(data),
+        hasAuthority: Boolean(data),
     };
 };