From e5ac242055989f9e94ccf130b22014bdb5e3e51a Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Mon, 25 Sep 2023 14:21:54 +0200
Subject: [PATCH] fix: remove effects of 'Prevent adding new events to stage'
 action from the form

---
 .../ErrorText/ErrorText.component.js          | 20 ----------
 .../ErrorText/ErrorText.types.js              |  5 ---
 .../ErrorText/index.js                        |  2 -
 .../FinishButtons/FinishButtons.component.js  | 38 ++++---------------
 .../FinishButtons/finishButtons.types.js      |  4 --
 .../Validated/Validated.component.js          | 10 +----
 .../Validated/Validated.container.js          |  8 +---
 .../Validated/validated.types.js              |  1 -
 8 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
 delete mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
 delete mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js

diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
deleted file mode 100644
index a885a48a6d..0000000000
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// @flow
-import React from 'react';
-import i18n from '@dhis2/d2-i18n';
-import { NoticeBox } from '@dhis2/ui';
-import type { Props } from './ErrorText.types';
-
-export const ErrorText = ({ stageName }: Props) => (
-    <>
-        <br />
-        <NoticeBox error>
-            <span>
-                {i18n.t("You can't add any more {{ programStageName }} events", {
-                    programStageName: stageName,
-                    interpolation: { escapeValue: false },
-                })}
-            </span>
-        </NoticeBox>
-        <br />
-    </>
-);
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
deleted file mode 100644
index 07785c7e1a..0000000000
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export type Props = {|
-    stageName: string,
-|};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js
deleted file mode 100644
index 2b26086840..0000000000
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// @flow
-export { ErrorText } from './ErrorText.component';
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
index 1c0a36c1c8..465f807ace 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
@@ -3,7 +3,6 @@ import React, { type ComponentType } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { withStyles } from '@material-ui/core';
 import { Button, spacersNum } from '@dhis2/ui';
-import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { withCancelButton } from '../../DataEntry/withCancelButton';
 import { addEventSaveTypes } from '../DataEntry/addEventSaveTypes';
 import type { InputProps, Props } from './finishButtons.types';
@@ -18,40 +17,17 @@ const styles = {
     },
 };
 
-const FinishButtonsPlain = ({ onSave, cancelButton, hiddenProgramStage, stageName, classes }: Props) => (
+const FinishButtonsPlain = ({ onSave, cancelButton, classes }: Props) => (
     <div className={classes.container}>
         <div className={classes.button}>
-            <ConditionalTooltip
-                content={i18n.t("You can't add any more {{ programStageName }} events", {
-                    programStageName: stageName,
-                    interpolation: { escapeValue: false },
-                })}
-                enabled={hiddenProgramStage}
-            >
-                <Button
-                    disabled={hiddenProgramStage}
-                    onClick={() => onSave(addEventSaveTypes.COMPLETE)}
-                    primary
-                >
-                    {i18n.t('Complete')}
-                </Button>
-            </ConditionalTooltip>
+            <Button onClick={() => onSave(addEventSaveTypes.COMPLETE)} primary>
+                {i18n.t('Complete')}
+            </Button>
         </div>
         <div className={classes.button}>
-            <ConditionalTooltip
-                content={i18n.t("You can't add any more {{ programStageName }} events", {
-                    programStageName: stageName,
-                    interpolation: { escapeValue: false },
-                })}
-                enabled={hiddenProgramStage}
-            >
-                <Button
-                    disabled={hiddenProgramStage}
-                    onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}
-                >
-                    {i18n.t('Save without completing')}
-                </Button>
-            </ConditionalTooltip>
+            <Button onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}>
+                {i18n.t('Save without completing')}
+            </Button>
         </div>
         {cancelButton}
     </div>
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
index 079708e30a..dd3acb8e32 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
@@ -6,14 +6,10 @@ export type InputProps = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     onCancel: () => void,
     id: string,
-    hiddenProgramStage: boolean,
-    stageName: string,
 |};
 
 export type Props = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     cancelButton: Element<any>,
-    hiddenProgramStage: boolean,
-    stageName: string,
     ...CssClasses,
 |};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
index 4f784d2b9a..4e3f2f96ef 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
@@ -6,7 +6,6 @@ import { Widget } from '../../Widget';
 import { DataEntry } from '../DataEntry';
 import { FinishButtons } from '../FinishButtons';
 import { SavingText } from '../SavingText';
-import { ErrorText } from '../ErrorText';
 import type { Props } from './validated.types';
 
 const styles = () => ({
@@ -24,7 +23,6 @@ const ValidatedPlain = ({
     onSave,
     onCancel,
     orgUnit,
-    hiddenProgramStage,
     id,
     ...passOnProps
 }: Props) => (
@@ -48,14 +46,8 @@ const ValidatedPlain = ({
                     onSave={onSave}
                     onCancel={onCancel}
                     id={id}
-                    hiddenProgramStage={hiddenProgramStage}
-                    stageName={stage.name}
                 />
-                {hiddenProgramStage ? (
-                    <ErrorText stageName={stage.name} />
-                ) : (
-                    <SavingText programName={programName} stageName={stage.name} orgUnitName={orgUnit.name} />
-                )}
+                <SavingText programName={programName} stageName={stage.name} orgUnitName={orgUnit.name} />
             </div>
         )}
     </Widget>
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
index c0245b477f..3d85e67cbf 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
@@ -1,6 +1,6 @@
 // @flow
 import React, { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { withAskToCreateNew, withSaveHandler } from '../../DataEntry';
 import { useLifecycle } from './useLifecycle';
 import { useClientFormattedRulesExecutionDependencies } from './useClientFormattedRulesExecutionDependencies';
@@ -29,11 +29,6 @@ export const Validated = ({
 }: ContainerProps) => {
     const dataEntryId = 'enrollmentEvent';
     const itemId = 'newEvent';
-    const rulesEffectsHiddenProgram = useSelector(
-        ({ rulesEffectsHiddenProgramStageDesc }) =>
-            rulesEffectsHiddenProgramStageDesc && rulesEffectsHiddenProgramStageDesc[`${dataEntryId}-${itemId}`],
-    );
-    const hiddenProgramStage = rulesEffectsHiddenProgram && rulesEffectsHiddenProgram[stage.id];
 
     const rulesExecutionDependenciesClientFormatted =
         useClientFormattedRulesExecutionDependencies(rulesExecutionDependencies, program);
@@ -132,7 +127,6 @@ export const Validated = ({
             programName={program.name}
             orgUnit={orgUnit}
             rulesExecutionDependenciesClientFormatted={rulesExecutionDependenciesClientFormatted}
-            hiddenProgramStage={hiddenProgramStage}
         />
     );
 };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
index 932e61a6d8..a5194d88af 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
@@ -25,6 +25,5 @@ export type Props = {|
     formRef: (formInstance: any) => void,
     dataEntryFieldRef: (instance: any, id: string) => void,
     rulesExecutionDependenciesClientFormatted: RulesExecutionDependenciesClientFormatted,
-    hiddenProgramStage: boolean,
     ...CssClasses,
 |};