feat: refactor event edit permissions and authority management

Author: henrikmv

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: 2026-08-13T14:51:01.572Z\n"
-"PO-Revision-Date: 2026-08-13T14:51:01.572Z\n"
+"POT-Creation-Date: 2026-08-14T16:34:23.443Z\n"
+"PO-Revision-Date: 2026-08-14T16:34:23.443Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."

src/core_modules/capture-core/components/EventOverflowMenu/MenuItems/DeleteMenuItem.tsx

@@ -36,7 +36,7 @@ export const DeleteActionButton = ({
     const { isWithinValidPeriod: isEventWithinValidPeriod } = isValidPeriod(occurredAtClient, expiryPeriod ?? null);
 
     const {
-        canEditCompletedEvent,
+        isFormBlockedByCompletion,
         canEditEvent,
     } = useEventEditPermissions({
         programId,
@@ -53,7 +53,7 @@ export const DeleteActionButton = ({
                 interpolation: { escapeValue: false },
             });
         }
-        if (!canEditCompletedEvent) {
+        if (isFormBlockedByCompletion) {
             return i18n.t('This event has been completed');
         }
         return i18n.t('This event is outside the edit period');

src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.container.tsx

@@ -268,8 +268,8 @@ const EnrollmentEditEventPageWithContextPlain = ({
 
     const eventAccess = getProgramEventAccess(programId, stageId ?? null);
     const {
-        canEditExpiredEvent,
-        canEditCompletedEvent,
+        isEventBlockedByExpiry,
+        isFormBlockedByCompletion,
     } = useEventEditPermissions({
         programId,
         stage: programStage,
@@ -312,8 +312,8 @@ const EnrollmentEditEventPageWithContextPlain = ({
             program={program}
             currentStageId={stageId}
             trackedEntityInactive={trackedEntityInactive}
-            canEditExpiredEvent={canEditExpiredEvent}
-            canEditCompletedEvent={canEditCompletedEvent}
+            isEventBlockedByExpiry={isEventBlockedByExpiry}
+            isFormBlockedByCompletion={isFormBlockedByCompletion}
         >
             <EnrollmentEditEventPageComponent
                 pageLayout={pageLayout}

src/core_modules/capture-core/components/Pages/ViewEvent/ViewEventComponent/ViewEvent.component.tsx

@@ -98,8 +98,8 @@ export const ViewEventPlain = (props: Props & WithStyles<typeof getStyles>) => {
     const completedAt = useSelector((state: any) => state.viewEventPage.loadedValues?.eventContainer?.event?.completedAt);
 
     const {
-        canEditExpiredEvent,
-        canEditCompletedEvent,
+        isEventBlockedByExpiry,
+        isFormBlockedByCompletion,
         canEditEvent,
     } = useEventEditPermissions({
         programId,
@@ -122,8 +122,8 @@ export const ViewEventPlain = (props: Props & WithStyles<typeof getStyles>) => {
                 />
                 <ViewEventReadOnlyBadge
                     eventAccess={eventAccess}
-                    canEditExpiredEvent={canEditExpiredEvent}
-                    canEditCompletedEvent={canEditCompletedEvent}
+                    isEventBlockedByExpiry={isEventBlockedByExpiry}
+                    isFormBlockedByCompletion={isFormBlockedByCompletion}
                 />
             </div>
             <div className={classes.contentContainer}>

src/core_modules/capture-core/components/Pages/ViewEvent/ViewEventReadOnlyBadge/ViewEventReadOnlyBadge.component.tsx

@@ -3,19 +3,19 @@ import { ReadOnlyBadge } from '../../../ReadOnlyBadge';
 
 type Props = {
     eventAccess: { read: boolean; write: boolean };
-    canEditExpiredEvent: boolean;
-    canEditCompletedEvent: boolean;
+    isEventBlockedByExpiry: boolean;
+    isFormBlockedByCompletion: boolean;
 };
 
 export const ViewEventReadOnlyBadge = ({
     eventAccess,
-    canEditExpiredEvent,
-    canEditCompletedEvent,
+    isEventBlockedByExpiry,
+    isFormBlockedByCompletion,
 }: Props) => (
     <ReadOnlyBadge
         programWriteAccess={eventAccess.write}
-        canEditExpiredEvent={canEditExpiredEvent}
-        canEditCompletedEvent={canEditCompletedEvent}
+        isEventBlockedByExpiry={isEventBlockedByExpiry}
+        isFormBlockedByCompletion={isFormBlockedByCompletion}
         inlineLabel
     />
 );

src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentAccessContext/EnrollmentAccessContext.tsx

@@ -18,8 +18,8 @@ export type EnrollmentAccessContextValue = {
     showWidgetBadge: boolean;
     trackedEntityInactive: boolean;
     canToggleTrackedEntityStatus: boolean;
-    canEditExpiredEvent?: boolean;
-    canEditCompletedEvent?: boolean;
+    isEventBlockedByExpiry?: boolean;
+    isFormBlockedByCompletion?: boolean;
 };
 
 const fallback: EnrollmentAccessContextValue = {
@@ -44,8 +44,8 @@ type ProviderProps = {
     program?: TrackerProgram;
     currentStageId?: string;
     trackedEntityInactive?: boolean;
-    canEditExpiredEvent?: boolean;
-    canEditCompletedEvent?: boolean;
+    isEventBlockedByExpiry?: boolean;
+    isFormBlockedByCompletion?: boolean;
     children: React.ReactNode;
 };
 
@@ -64,8 +64,8 @@ const computeContextValue = (
     program: TrackerProgram,
     currentStageId: string | undefined,
     trackedEntityInactive: boolean,
-    canEditExpiredEvent?: boolean,
-    canEditCompletedEvent?: boolean,
+    isEventBlockedByExpiry?: boolean,
+    isFormBlockedByCompletion?: boolean,
 ): EnrollmentAccessContextValue => {
     const { rawStageWriteAccessById, stageReadAccessById } = buildStageAccessMaps(program);
     const rawProgramWriteAccess = Boolean(program.access?.data?.write);
@@ -98,17 +98,17 @@ const computeContextValue = (
         showWidgetBadge: !isEventPage && !allWriteAccessMissing,
         trackedEntityInactive,
         canToggleTrackedEntityStatus: rawTrackedEntityTypeWriteAccess,
-        canEditExpiredEvent,
-        canEditCompletedEvent,
+        isEventBlockedByExpiry,
+        isFormBlockedByCompletion,
     };
 };
 
 export const EnrollmentAccessProvider = ({
     program,
     currentStageId,
     trackedEntityInactive = false,
-    canEditExpiredEvent,
-    canEditCompletedEvent,
+    isEventBlockedByExpiry,
+    isFormBlockedByCompletion,
     children,
 }: ProviderProps) => {
     const value = useMemo<EnrollmentAccessContextValue>(
@@ -117,8 +117,8 @@ export const EnrollmentAccessProvider = ({
                 program,
                 currentStageId,
                 trackedEntityInactive,
-                canEditExpiredEvent,
-                canEditCompletedEvent,
+                isEventBlockedByExpiry,
+                isFormBlockedByCompletion,
             )
             : {
                 ...fallback,
@@ -136,8 +136,8 @@ export const EnrollmentAccessProvider = ({
             program,
             currentStageId,
             trackedEntityInactive,
-            canEditExpiredEvent,
-            canEditCompletedEvent,
+            isEventBlockedByExpiry,
+            isFormBlockedByCompletion,
         ],
     );
 

src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/EnrollmentReadOnlyBadge/EnrollmentReadOnlyBadge.component.tsx

@@ -12,16 +12,16 @@ export const EnrollmentReadOnlyBadge = () => {
         anyStageReadAccess,
         trackedEntityTypeName,
         trackedEntityInactive,
-        canEditExpiredEvent,
-        canEditCompletedEvent,
+        isEventBlockedByExpiry,
+        isFormBlockedByCompletion,
     } = useEnrollmentAccessContext();
 
     if (isEventPage) {
         return (
             <ReadOnlyBadge
                 programStageWriteAccess={currentStageWriteAccess}
-                canEditExpiredEvent={canEditExpiredEvent}
-                canEditCompletedEvent={canEditCompletedEvent}
+                isEventBlockedByExpiry={isEventBlockedByExpiry}
+                isFormBlockedByCompletion={isFormBlockedByCompletion}
                 trackedEntityName={trackedEntityTypeName}
                 trackedEntityInactive={trackedEntityInactive}
                 inlineLabel

src/core_modules/capture-core/components/ReadOnlyBadge/ReadOnlyBadge.tsx

@@ -36,26 +36,26 @@ const getReadOnlyMessage = ({
     access,
     trackedEntityName,
     multipleStages,
-    canEditExpiredEvent,
-    canEditCompletedEvent,
+    isEventBlockedByExpiry,
+    isFormBlockedByCompletion,
     trackedEntityInactive,
 }: ReadOnlyMessageInput): string => {
     if (trackedEntityInactive) return getDeactivatedMessage(trackedEntityName);
     if (!access.program && !access.trackedEntityType && !access.programStage) return getEnrollmentMessage();
     if (!access.program) return getProgramMessage();
     if (!access.trackedEntityType) return getTrackedEntityMessage(trackedEntityName);
     if (!access.programStage) return getProgramStageMessage(multipleStages);
-    if (!canEditExpiredEvent) return getExpiredMessage();
-    if (!canEditCompletedEvent) return getCompletedEventMessage();
+    if (isEventBlockedByExpiry) return getExpiredMessage();
+    if (isFormBlockedByCompletion) return getCompletedEventMessage();
     return '';
 };
 
 const ReadOnlyBadgePlain = ({
     programWriteAccess = true,
     trackedEntityTypeWriteAccess = true,
     programStageWriteAccess = true,
-    canEditExpiredEvent = true,
-    canEditCompletedEvent = true,
+    isEventBlockedByExpiry = false,
+    isFormBlockedByCompletion = false,
     multipleStages = false,
     trackedEntityName,
     trackedEntityInactive = false,
@@ -71,8 +71,8 @@ const ReadOnlyBadgePlain = ({
         access,
         trackedEntityName,
         multipleStages,
-        canEditExpiredEvent,
-        canEditCompletedEvent,
+        isEventBlockedByExpiry,
+        isFormBlockedByCompletion,
         trackedEntityInactive,
     });
     if (!message) return null;

src/core_modules/capture-core/components/ReadOnlyBadge/ReadOnlyBadge.types.ts

@@ -2,8 +2,8 @@ export type Props = {
     programWriteAccess?: boolean;
     trackedEntityTypeWriteAccess?: boolean;
     programStageWriteAccess?: boolean;
-    canEditExpiredEvent?: boolean;
-    canEditCompletedEvent?: boolean;
+    isEventBlockedByExpiry?: boolean;
+    isFormBlockedByCompletion?: boolean;
     multipleStages?: boolean;
     trackedEntityName?: string;
     trackedEntityInactive?: boolean;
@@ -20,7 +20,7 @@ export type ReadOnlyMessageInput = {
     access: Access;
     trackedEntityName: string | undefined;
     multipleStages: boolean;
-    canEditExpiredEvent: boolean;
-    canEditCompletedEvent: boolean;
+    isEventBlockedByExpiry: boolean;
+    isFormBlockedByCompletion: boolean;
     trackedEntityInactive: boolean;
 };

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

@@ -3,7 +3,8 @@ 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';
+import { useAuthority } from '../../../utils/authority/useAuthority';
+import { Authorities } from '../../../utils/authority/authorities';
 
 export const Actions = ({
     enrollment = {},
@@ -21,7 +22,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 { hasAuthority } = useAuthority(Authorities.ENROLLMENT_CASCADE_DELETE);
     const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({
         teiId: enrollment.trackedEntity,
         programId: enrollment.program,