From b2e72b62d741300b4fc75351ddfab45cd6976868 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 16 Aug 2024 21:45:40 +0200
Subject: [PATCH 1/7] feat: respect block entry form

---
 i18n/en.pot                                      |  7 +++++--
 .../WidgetEventEdit/WidgetEventEdit.container.js | 16 +++++++++++++---
 .../WidgetEventEdit/constants/status.const.js    | 10 ++++++++++
 .../metaData/Program/ProgramStage.js             |  9 +++++++++
 .../factory/programStage/ProgramStageFactory.js  |  1 +
 .../quickStoreOperations/storePrograms.js        |  2 +-
 .../storageControllers/cache.types.js            |  1 +
 7 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/constants/status.const.js

diff --git a/i18n/en.pot b/i18n/en.pot
index a24932402c..d4d7db36f5 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-08-08T11:49:13.423Z\n"
-"PO-Revision-Date: 2024-08-08T11:49:13.423Z\n"
+"POT-Creation-Date: 2024-08-16T18:52:32.077Z\n"
+"PO-Revision-Date: 2024-08-16T18:52:32.077Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1353,6 +1353,9 @@ msgstr "Scheduled date cannot be changed for {{ eventStatus }} events"
 msgid "Event completed"
 msgstr "Event completed"
 
+msgid "You can't edit this event due to program settings"
+msgstr "You can't edit this event due to program settings"
+
 msgid "Back to all stages and events"
 msgstr "Back to all stages and events"
 
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 147934a992..95b2bb5eb3 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -31,6 +31,7 @@ import { OverflowButton } from '../Buttons';
 import { EventChangelogWrapper } from './EventChangelogWrapper';
 import { FEATURES, useFeature } from '../../../capture-core-utils';
 import { inMemoryFileStore } from '../DataEntry/file/inMemoryFileStore';
+import { eventStatuses } from './constants/status.const';
 
 const styles = {
     header: {
@@ -99,6 +100,14 @@ export const WidgetEventEditPlain = ({
     const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
 
     const eventAccess = getProgramEventAccess(programId, stageId);
+    console.log('stage', stage);
+    const blockEntryForm = stage.blockEntryForm && eventStatus === eventStatuses.COMPLETED;
+    const disableEdit = !eventAccess?.write || blockEntryForm;
+
+    const tooltipContent = blockEntryForm ?
+        i18n.t('You can\'t edit this event due to program settings') :
+        i18n.t('You don\'t have access to edit this event');
+
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     const { programCategory } = useCategoryCombinations(programId);
     if (error) {
@@ -117,14 +126,14 @@ export const WidgetEventEditPlain = ({
                 {currentPageMode === dataEntryKeys.VIEW && (
                     <div className={classes.menuActions}>
                         <ConditionalTooltip
-                            content={i18n.t('You don\'t have access to edit this event')}
-                            enabled={!eventAccess?.write}
+                            content={tooltipContent}
+                            enabled={disableEdit}
                             wrapperClassName={classes.tooltip}
                         >
                             <Button
                                 small
                                 secondary
-                                disabled={!eventAccess?.write}
+                                disabled={disableEdit}
                                 icon={<IconEdit24 />}
                                 onClick={() => dispatch(startShowEditEventDataEntry(orgUnit, programCategory))}
                             >
@@ -225,3 +234,4 @@ export const WidgetEventEditPlain = ({
     ) : <LoadingMaskElementCenter />;
 };
 export const WidgetEventEdit: ComponentType<ComponentProps> = withStyles(styles)(WidgetEventEditPlain);
+
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/constants/status.const.js b/src/core_modules/capture-core/components/WidgetEventEdit/constants/status.const.js
new file mode 100644
index 0000000000..2778eaa359
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/constants/status.const.js
@@ -0,0 +1,10 @@
+// @flow
+
+export const eventStatuses = Object.freeze({
+    ACTIVE: 'ACTIVE',
+    COMPLETED: 'COMPLETED',
+    VISITED: 'VISITED',
+    SCHEDULE: 'SCHEDULE',
+    OVERDUE: 'OVERDUE',
+    SKIPPED: 'SKIPPED',
+});
diff --git a/src/core_modules/capture-core/metaData/Program/ProgramStage.js b/src/core_modules/capture-core/metaData/Program/ProgramStage.js
index be8714768e..226cf9d313 100644
--- a/src/core_modules/capture-core/metaData/Program/ProgramStage.js
+++ b/src/core_modules/capture-core/metaData/Program/ProgramStage.js
@@ -12,6 +12,7 @@ export class ProgramStage {
     _id: string;
     _name: string;
     _access: { data: { write: boolean } };
+    _blockEntryForm: boolean;
     _untranslatedName: string;
     _stageForm: RenderFoundation;
     _relationshipTypes: Array<RelationshipType>;
@@ -41,6 +42,14 @@ export class ProgramStage {
         this._stageForm = stageForm;
     }
 
+    get blockEntryForm(): boolean {
+        return this._blockEntryForm;
+    }
+
+    set blockEntryForm(blockEntryForm: boolean) {
+        this._blockEntryForm = blockEntryForm;
+    }
+
     get id(): string {
         return this._id;
     }
diff --git a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/programStage/ProgramStageFactory.js b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/programStage/ProgramStageFactory.js
index 532b40086a..4241f27b2d 100644
--- a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/programStage/ProgramStageFactory.js
+++ b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/programStage/ProgramStageFactory.js
@@ -196,6 +196,7 @@ export class ProgramStageFactory {
             _stage.generatedByEnrollmentDate = !!cachedProgramStage.generatedByEnrollmentDate;
             _stage.reportDateToUse = cachedProgramStage.reportDateToUse;
             _stage.minDaysFromStart = cachedProgramStage.minDaysFromStart;
+            _stage.blockEntryForm = !!cachedProgramStage.blockEntryForm;
             _stage.repeatable = cachedProgramStage.repeatable;
             _stage.stageForm = new RenderFoundation((_form) => {
                 _form.id = cachedProgramStage.id;
diff --git a/src/core_modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js b/src/core_modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js
index 529cb771b1..080f4fcbb3 100644
--- a/src/core_modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js
+++ b/src/core_modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js
@@ -89,7 +89,7 @@ const fieldsParam = 'id,displayName,displayShortName,description,programType,sty
 'categoryCombo[id,displayName,isDefault,categories[id,displayName]],' +
 'userRoles[id,displayName],' +
 // eslint-disable-next-line max-len
-'programStages[id,access,autoGenerateEvent,openAfterEnrollment,hideDueDate,allowGenerateNextVisit,remindCompleted,repeatable,generatedByEnrollmentDate,reportDateToUse,minDaysFromStart,name,displayName,description,displayExecutionDateLabel,displayDueDateLabel,formType,featureType,validationStrategy,enableUserAssignment,style,dataEntryForm[id,htmlCode]' +
+'programStages[id,access,autoGenerateEvent,openAfterEnrollment,hideDueDate,allowGenerateNextVisit,remindCompleted,repeatable,generatedByEnrollmentDate,reportDateToUse,blockEntryForm,minDaysFromStart,name,displayName,description,displayExecutionDateLabel,displayDueDateLabel,formType,featureType,validationStrategy,enableUserAssignment,style,dataEntryForm[id,htmlCode]' +
 'programStageSections[id,displayName,displayDescription,sortOrder,dataElements[id]],' +
 // eslint-disable-next-line max-len
 'programStageDataElements[compulsory,displayInReports,renderOptionsAsRadio,allowFutureDate,renderType[*],dataElement[id]]]' +
diff --git a/src/core_modules/capture-core/storageControllers/cache.types.js b/src/core_modules/capture-core/storageControllers/cache.types.js
index 121534f5ab..d41cb0fa9e 100644
--- a/src/core_modules/capture-core/storageControllers/cache.types.js
+++ b/src/core_modules/capture-core/storageControllers/cache.types.js
@@ -102,6 +102,7 @@ export type CachedDataEntryForm = {
 export type CachedProgramStage = {
     id: string,
     access: Object,
+    blockEntryForm: boolean,
     name: string,
     displayName: string,
     description: ?string,

From 79fd7cac53c75d3f77913fcb487dba2ffb8c8ba9 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Sun, 18 Aug 2024 20:19:50 +0200
Subject: [PATCH 2/7] feat: respect block entry form and authorities

---
 i18n/en.pot                                   |  7 ++---
 .../WidgetEventEdit.container.js              | 11 +++-----
 .../components/WidgetEventEdit/hooks/index.js |  2 ++
 .../WidgetEventEdit/hooks/useAuthorities.js   | 27 +++++++++++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js

diff --git a/i18n/en.pot b/i18n/en.pot
index d4d7db36f5..b80cf06bb0 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-08-16T18:52:32.077Z\n"
-"PO-Revision-Date: 2024-08-16T18:52:32.077Z\n"
+"POT-Creation-Date: 2024-08-18T18:19:51.651Z\n"
+"PO-Revision-Date: 2024-08-18T18:19:51.651Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1353,9 +1353,6 @@ msgstr "Scheduled date cannot be changed for {{ eventStatus }} events"
 msgid "Event completed"
 msgstr "Event completed"
 
-msgid "You can't edit this event due to program settings"
-msgstr "You can't edit this event due to program settings"
-
 msgid "Back to all stages and events"
 msgstr "Back to all stages and events"
 
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 95b2bb5eb3..b0e99cb693 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -32,6 +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';
 
 const styles = {
     header: {
@@ -100,14 +101,10 @@ export const WidgetEventEditPlain = ({
     const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
 
     const eventAccess = getProgramEventAccess(programId, stageId);
-    console.log('stage', stage);
-    const blockEntryForm = stage.blockEntryForm && eventStatus === eventStatuses.COMPLETED;
+    const { canEditCompletedEvent } = useAuthorities();
+    const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED;
     const disableEdit = !eventAccess?.write || blockEntryForm;
 
-    const tooltipContent = blockEntryForm ?
-        i18n.t('You can\'t edit this event due to program settings') :
-        i18n.t('You don\'t have access to edit this event');
-
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     const { programCategory } = useCategoryCombinations(programId);
     if (error) {
@@ -126,7 +123,7 @@ export const WidgetEventEditPlain = ({
                 {currentPageMode === dataEntryKeys.VIEW && (
                     <div className={classes.menuActions}>
                         <ConditionalTooltip
-                            content={tooltipContent}
+                            content={i18n.t('You don\'t have access to edit this event')}
                             enabled={disableEdit}
                             wrapperClassName={classes.tooltip}
                         >
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
new file mode 100644
index 0000000000..edcfc4f241
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js
@@ -0,0 +1,2 @@
+// @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
new file mode 100644
index 0000000000..78de4ab612
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js
@@ -0,0 +1,27 @@
+// @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),
+    };
+};

From f6559b166065b505ac965be887124610ed32f4cc Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Wed, 21 Aug 2024 21:27:42 +0200
Subject: [PATCH 3/7] fix: tooltip

---
 i18n/en.pot                                                | 7 +++++--
 .../WidgetEventEdit/WidgetEventEdit.container.js           | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index b80cf06bb0..0f1ef49bb7 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-08-18T18:19:51.651Z\n"
-"PO-Revision-Date: 2024-08-18T18:19:51.651Z\n"
+"POT-Creation-Date: 2024-08-21T19:20:51.149Z\n"
+"PO-Revision-Date: 2024-08-21T19:20:51.149Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1353,6 +1353,9 @@ msgstr "Scheduled date cannot be changed for {{ eventStatus }} events"
 msgid "Event completed"
 msgstr "Event completed"
 
+msgid "The event cannot be edited after it has been completed"
+msgstr "The event cannot be edited after it has been completed"
+
 msgid "Back to all stages and events"
 msgstr "Back to all stages and events"
 
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 b0e99cb693..f953852223 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -105,6 +105,10 @@ export const WidgetEventEditPlain = ({
     const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED;
     const disableEdit = !eventAccess?.write || blockEntryForm;
 
+    const tooltipContent = blockEntryForm ?
+        i18n.t('The event cannot be edited after it has been completed') :
+        i18n.t('You don\'t have access to edit this event');
+
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     const { programCategory } = useCategoryCombinations(programId);
     if (error) {
@@ -123,7 +127,7 @@ export const WidgetEventEditPlain = ({
                 {currentPageMode === dataEntryKeys.VIEW && (
                     <div className={classes.menuActions}>
                         <ConditionalTooltip
-                            content={i18n.t('You don\'t have access to edit this event')}
+                            content={tooltipContent}
                             enabled={disableEdit}
                             wrapperClassName={classes.tooltip}
                         >

From f5c7b917a6e5a0ad9e1e80ce0d7781f68b70eb90 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Thu, 22 Aug 2024 17:59:42 +0200
Subject: [PATCH 4/7] feat: cypress test for disabled edit event button

---
 .../EnrollmentEditEventPageForm.feature       |  9 ++++++++-
 .../EnrollmentEditEventPageForm.js            | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
index 72271b0594..a2450ef9e3 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
@@ -100,7 +100,14 @@ Scenario: User can see disabled scheduled date for active event
     When the user clicks on the edit button
     Then the user see the following text: Enrollment: Edit Event
     Then the user see the schedule date field with tooltip: Scheduled date cannot be changed for Active events
-    
+
+Scenario: The user can not enter edit mode for completed events
+    Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=nUVwTLuQ6FT&orgUnitId=DiszpKrYNg8
+    And the user see the following text: Enrollment: View Event
+    Then the edit button should be disabled
+    When the user hovers over the disabled edit button
+    Then the user should see the tooltip: The event cannot be edited after it has been completed
+        
 Scenario: User can edit the event and complete the enrollment
     Given you land on the enrollment event page with selected Malaria Entity by having typed #/enrollmentEventEdit?eventId=MHR4Zj6KLz0&orgUnitId=DiszpKrYNg8
     And the enrollment status is active
diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
index bd82268d44..946844d261 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -204,3 +204,23 @@ And('you open the Birth stage event', () => {
         });
 });
 
+Then('the edit button should be disabled', () => {
+    cy.get('[data-test="widget-enrollment-event"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(1)
+        .should('be.disabled');
+});
+
+When('the user hovers over the disabled edit button', () => {
+    cy.get('[data-test="widget-enrollment-event"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(1)
+        .trigger('mouseover');
+});
+
+Then(/^the user should see the tooltip: (.*)$/, (tooltipContent) => {
+    cy.get('[data-test="dhis2-uicore-tooltip-content"]')
+        .contains(tooltipContent)
+        .should('exist');
+});
+

From c7c58f2f0b563cc3bf0f39e3e439546c2e3b45fb Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 23 Aug 2024 12:12:17 +0200
Subject: [PATCH 5/7] fix: set tracker auto test restricted

---
 .../EnrollmentEditEventPageForm.feature                        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
index a2450ef9e3..72dcf820dc 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
@@ -100,7 +100,8 @@ Scenario: User can see disabled scheduled date for active event
     When the user clicks on the edit button
     Then the user see the following text: Enrollment: Edit Event
     Then the user see the schedule date field with tooltip: Scheduled date cannot be changed for Active events
-
+    
+@user:trackerAutoTestRestricted
 Scenario: The user can not enter edit mode for completed events
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=nUVwTLuQ6FT&orgUnitId=DiszpKrYNg8
     And the user see the following text: Enrollment: View Event

From 462e6783f2455a7be4d5dadc949b10a915fb94c2 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Fri, 23 Aug 2024 14:08:37 +0200
Subject: [PATCH 6/7] fix: cypress test

---
 .../EnrollmentEditEventPageForm.js                          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
index 946844d261..56d8cfe187 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -215,12 +215,12 @@ When('the user hovers over the disabled edit button', () => {
     cy.get('[data-test="widget-enrollment-event"]')
         .find('[data-test="dhis2-uicore-button"]')
         .eq(1)
+        .parent()
         .trigger('mouseover');
 });
 
 Then(/^the user should see the tooltip: (.*)$/, (tooltipContent) => {
     cy.get('[data-test="dhis2-uicore-tooltip-content"]')
-        .contains(tooltipContent)
-        .should('exist');
+        .should('be.visible')
+        .and('contain', tooltipContent);
 });
-

From 48a08b1a757fc267b2d14766dca17c53efd3b9de Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Tue, 27 Aug 2024 09:19:03 +0200
Subject: [PATCH 7/7] feat: cy test for disabled button

---
 .../EnrollmentEditEventPageForm.feature            |  6 ++----
 .../EnrollmentEditEventPageForm.js                 | 14 --------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
index 72dcf820dc..594b821007 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
@@ -102,13 +102,11 @@ Scenario: User can see disabled scheduled date for active event
     Then the user see the schedule date field with tooltip: Scheduled date cannot be changed for Active events
     
 @user:trackerAutoTestRestricted
-Scenario: The user can not enter edit mode for completed events
+Scenario: The user cannot enter edit mode for completed events
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=nUVwTLuQ6FT&orgUnitId=DiszpKrYNg8
     And the user see the following text: Enrollment: View Event
     Then the edit button should be disabled
-    When the user hovers over the disabled edit button
-    Then the user should see the tooltip: The event cannot be edited after it has been completed
-        
+
 Scenario: User can edit the event and complete the enrollment
     Given you land on the enrollment event page with selected Malaria Entity by having typed #/enrollmentEventEdit?eventId=MHR4Zj6KLz0&orgUnitId=DiszpKrYNg8
     And the enrollment status is active
diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
index 56d8cfe187..bd8c7855fc 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -210,17 +210,3 @@ Then('the edit button should be disabled', () => {
         .eq(1)
         .should('be.disabled');
 });
-
-When('the user hovers over the disabled edit button', () => {
-    cy.get('[data-test="widget-enrollment-event"]')
-        .find('[data-test="dhis2-uicore-button"]')
-        .eq(1)
-        .parent()
-        .trigger('mouseover');
-});
-
-Then(/^the user should see the tooltip: (.*)$/, (tooltipContent) => {
-    cy.get('[data-test="dhis2-uicore-tooltip-content"]')
-        .should('be.visible')
-        .and('contain', tooltipContent);
-});