From 9b61f98988054e3a148d3a43758cd961afa7dacb Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 25 Oct 2024 16:57:42 +0200
Subject: [PATCH 1/4] fix: string adjustment

---
 i18n/en.pot                                           | 11 ++++-------
 .../WidgetAssignee/DisplayMode.component.js           |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 9b56b6db68..a5500f1058 100644
--- a/i18n/en.pot
+++ b/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-10T14:29:59.249Z\n"
-"PO-Revision-Date: 2024-10-10T14:29:59.249Z\n"
+"POT-Creation-Date: 2024-10-25T14:57:43.514Z\n"
+"PO-Revision-Date: 2024-10-25T14:57:43.514Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1071,9 +1071,6 @@ msgstr "Create new event"
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Search for a {{trackedEntityName}} in {{programName}}"
 
-msgid "Back to list"
-msgstr "Back to list"
-
 msgid "No tracked entity types available"
 msgstr "No tracked entity types available"
 
@@ -1089,8 +1086,8 @@ msgstr "Edit"
 msgid "No one is assigned to this event"
 msgstr "No one is assigned to this event"
 
-msgid "You don't have access to assign an assignee"
-msgstr "You don't have access to assign an assignee"
+msgid "You don't have access to assign a user to this event"
+msgstr "You don't have access to assign a user to this event"
 
 msgid "Assign"
 msgstr "Assign"
diff --git a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
index e0b2ebb2dd..a80b6c990e 100644
--- a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
+++ b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
@@ -63,7 +63,7 @@ const DisplayModePlain = ({ assignee, onEdit, writeAccess, avatarId, classes }:
         <div className={classes.wrapper}>
             {i18n.t('No one is assigned to this event')}
             <ConditionalTooltip
-                content={i18n.t("You don't have access to assign an assignee")}
+                content={i18n.t("You don't have access to assign a user to this event")}
                 enabled={!writeAccess}
             >
                 <Button

From 8cfb4a655a45420f714d4c12d5d91ce4a90475c9 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 25 Oct 2024 19:50:36 +0200
Subject: [PATCH 2/4] fix: disable button and add tooltip

---
 i18n/en.pot                                   |  7 +++--
 .../Actions/Actions.component.js              |  2 ++
 .../Actions/Actions.container.js              |  3 +++
 .../Actions/Delete/Delete.component.js        | 12 ++++++---
 .../Actions/Delete/delete.types.js            |  1 +
 .../WidgetEnrollment/Actions/actions.types.js |  1 +
 .../WidgetEnrollment/hooks/useAuthorities.js  | 27 +++++++++++++++++++
 7 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js

diff --git a/i18n/en.pot b/i18n/en.pot
index a5500f1058..2abc5dec9d 100644
--- a/i18n/en.pot
+++ b/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-25T14:57:43.514Z\n"
-"PO-Revision-Date: 2024-10-25T14:57:43.514Z\n"
+"POT-Creation-Date: 2024-10-25T17:42:56.394Z\n"
+"PO-Revision-Date: 2024-10-25T17:42:56.394Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1136,6 +1136,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"
 
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js
index d95f39c8fb..e3e08de57d 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js
+++ b/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}
                             />
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
index 79df428da7..84b330bad5 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
+++ b/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 '../hooks/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 { canCasacdeDeleteEnrollment } = useAuthorities();
     const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({
         teiId: enrollment.trackedEntity,
         programId: enrollment.program,
@@ -52,6 +54,7 @@ export const Actions = ({
             onUpdate={updateMutation}
             onUpdateStatus={handleUpdateStatus}
             onDelete={deleteMutation}
+            canCascadeDeleteEnrollment={canCasacdeDeleteEnrollment}
             loading={updateLoading || deleteLoading || updateStatusLoading}
             onUpdateOwnership={updateEnrollmentOwnership}
             isTransferLoading={isTransferLoading}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
index d301326dc7..b15f78e972 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
@@ -1,4 +1,5 @@
 // @flow
+import React, { useState, useMemo } 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 = useMemo(() => !canCascadeDeleteEnrollment, [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>
     );
 };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js
index 7cd649b391..71b637983f 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js
+++ b/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,
 |};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js
index e6da45629d..b40adc2282 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js
+++ b/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,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js
new file mode 100644
index 0000000000..d15dd9a226
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js
@@ -0,0 +1,27 @@
+// @flow
+import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';
+
+const auth = Object.freeze({
+    F_ENROLLMENT_CASCADE_DELETE: 'F_ENROLLMENT_CASCADE_DELETE',
+    ALL: 'ALL',
+});
+
+export const useAuthorities = () => {
+    const queryKey = ['authorities'];
+    const queryFn = {
+        resource: 'me.json',
+        params: {
+            fields: 'authorities',
+        },
+    };
+    const queryOptions = {
+        select: ({ authorities }) =>
+            authorities &&
+            authorities.some(authority => authority === auth.ALL || authority === auth.F_ENROLLMENT_CASCADE_DELETE),
+    };
+    const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
+
+    return {
+        canCasacdeDeleteEnrollment: Boolean(data),
+    };
+};

From 9fbbe24ad5bfdbb05b49674e8a10af98dd137fc4 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 25 Oct 2024 20:18:09 +0200
Subject: [PATCH 3/4] fix: revert wrong commit

---
 i18n/en.pot                                               | 8 ++++----
 .../components/WidgetAssignee/DisplayMode.component.js    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 461abf8bed..5fb403e3d7 100644
--- a/i18n/en.pot
+++ b/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-25T17:42:56.394Z\n"
-"PO-Revision-Date: 2024-10-25T17:42:56.394Z\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..."
@@ -1083,8 +1083,8 @@ msgstr "Edit"
 msgid "No one is assigned to this event"
 msgstr "No one is assigned to this event"
 
-msgid "You don't have access to assign a user to this event"
-msgstr "You don't have access to assign a user to this event"
+msgid "You don't have access to assign an assignee"
+msgstr "You don't have access to assign an assignee"
 
 msgid "Assign"
 msgstr "Assign"
diff --git a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
index a80b6c990e..e0b2ebb2dd 100644
--- a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
+++ b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js
@@ -63,7 +63,7 @@ const DisplayModePlain = ({ assignee, onEdit, writeAccess, avatarId, classes }:
         <div className={classes.wrapper}>
             {i18n.t('No one is assigned to this event')}
             <ConditionalTooltip
-                content={i18n.t("You don't have access to assign a user to this event")}
+                content={i18n.t("You don't have access to assign an assignee")}
                 enabled={!writeAccess}
             >
                 <Button

From b094ddbaf166ede52ba3c70812e49a753c19e8f6 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Mon, 28 Oct 2024 16:21:18 +0100
Subject: [PATCH 4/4] fix: create generic authorities hook

---
 .../Actions/Actions.container.js              |  6 ++---
 .../Actions/Delete/Delete.component.js        |  4 +--
 .../WidgetEventEdit.container.js              |  6 ++---
 .../components/WidgetEventEdit/hooks/index.js |  2 --
 .../WidgetEventEdit/hooks/useAuthorities.js   | 27 -------------------
 .../OverflowMenu/OverflowMenu.container.js    |  6 ++---
 .../WidgetProfile/OverflowMenu/hooks/index.js |  2 --
 .../OverflowMenu/hooks/useAuthorities.js      | 27 -------------------
 .../authority}/useAuthorities.js              | 13 ++++-----
 9 files changed, 18 insertions(+), 75 deletions(-)
 delete mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
 delete mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js
 delete mode 100644 src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/index.js
 delete mode 100644 src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/useAuthorities.js
 rename src/core_modules/capture-core/{components/WidgetEnrollment/hooks => utils/authority}/useAuthorities.js (54%)

diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
index 84b330bad5..b7ad956d52 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
@@ -4,7 +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 '../hooks/useAuthorities';
+import { useAuthorities } from '../../../utils/authority/useAuthorities';
 
 export const Actions = ({
     enrollment = {},
@@ -21,7 +21,7 @@ export const Actions = ({
 }: Props) => {
     const { updateMutation, updateLoading } = useUpdateEnrollment(refetchEnrollment, refetchTEI, onError, onSuccess);
     const { deleteMutation, deleteLoading } = useDeleteEnrollment(onDelete, onError, onSuccess);
-    const { canCasacdeDeleteEnrollment } = useAuthorities();
+    const { hasAuthority } = useAuthorities({ authorities: ['F_ENROLLMENT_CASCADE_DELETE'] });
     const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({
         teiId: enrollment.trackedEntity,
         programId: enrollment.program,
@@ -54,7 +54,7 @@ export const Actions = ({
             onUpdate={updateMutation}
             onUpdateStatus={handleUpdateStatus}
             onDelete={deleteMutation}
-            canCascadeDeleteEnrollment={canCasacdeDeleteEnrollment}
+            canCascadeDeleteEnrollment={hasAuthority}
             loading={updateLoading || deleteLoading || updateStatusLoading}
             onUpdateOwnership={updateEnrollmentOwnership}
             isTransferLoading={isTransferLoading}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
index b15f78e972..f870ed9197 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js
@@ -1,5 +1,5 @@
 // @flow
-import React, { useState, useMemo } from 'react';
+import React, { useState } from 'react';
 import {
     IconDelete16,
     MenuItem,
@@ -16,7 +16,7 @@ import { ConditionalTooltip } from '../../../Tooltips/ConditionalTooltip/';
 
 export const Delete = ({ canCascadeDeleteEnrollment, enrollment, onDelete }: Props) => {
     const [toggle, setToggle] = useState(false);
-    const disabled = useMemo(() => !canCascadeDeleteEnrollment, [canCascadeDeleteEnrollment]);
+    const disabled = !canCascadeDeleteEnrollment;
     const tooltipContent = i18n.t('You do not have access to delete this enrollment');
 
     return (
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
index f953852223..b39bb89c7c 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/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 ?
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
deleted file mode 100644
index edcfc4f241..0000000000
--- a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// @flow
-export { useAuthorities } from './useAuthorities';
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js
deleted file mode 100644
index 78de4ab612..0000000000
--- a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';
-
-const auth = Object.freeze({
-    F_UNCOMPLETE_EVENT: 'F_UNCOMPLETE_EVENT',
-    ALL: 'ALL',
-});
-
-export const useAuthorities = () => {
-    const queryKey = ['authorities'];
-    const queryFn = {
-        resource: 'me.json',
-        params: {
-            fields: 'authorities',
-        },
-    };
-    const queryOptions = {
-        select: ({ authorities }) =>
-            authorities &&
-            authorities.some(authority => authority === auth.ALL || authority === auth.F_UNCOMPLETE_EVENT),
-    };
-    const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
-
-    return {
-        canEditCompletedEvent: Boolean(data),
-    };
-};
diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
index f2b4fca631..031f7fd462 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js
+++ b/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}
diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/index.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/index.js
deleted file mode 100644
index edcfc4f241..0000000000
--- a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// @flow
-export { useAuthorities } from './useAuthorities';
diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/useAuthorities.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/useAuthorities.js
deleted file mode 100644
index 7cebeaeaa6..0000000000
--- a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/useAuthorities.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';
-
-const auth = Object.freeze({
-    F_TEI_CASCADE_DELETE: 'F_TEI_CASCADE_DELETE',
-    ALL: 'ALL',
-});
-
-export const useAuthorities = () => {
-    const queryKey = ['authorities'];
-    const queryFn = {
-        resource: 'me.json',
-        params: {
-            fields: 'authorities',
-        },
-    };
-    const queryOptions = {
-        select: ({ authorities }) =>
-            authorities &&
-            authorities.some(authority => authority === auth.ALL || authority === auth.F_TEI_CASCADE_DELETE),
-    };
-    const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
-
-    return {
-        canCascadeDeleteTei: Boolean(data),
-    };
-};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js b/src/core_modules/capture-core/utils/authority/useAuthorities.js
similarity index 54%
rename from src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js
rename to src/core_modules/capture-core/utils/authority/useAuthorities.js
index d15dd9a226..0bea301f9e 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useAuthorities.js
+++ b/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_ENROLLMENT_CASCADE_DELETE: 'F_ENROLLMENT_CASCADE_DELETE',
     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_ENROLLMENT_CASCADE_DELETE),
+        select: ({ authorities: userAuthorities }) =>
+            userAuthorities &&
+            authorities.some(
+                authority => userAuthorities.includes(auth.ALL) || userAuthorities.includes(authority),
+            ),
     };
     const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
 
     return {
-        canCasacdeDeleteEnrollment: Boolean(data),
+        hasAuthority: Boolean(data),
     };
 };