feat: show remove button conditionally

EyeSeeTea · Nov 28, 2024 · 1a5e33a · 1a5e33a
1 parent 05a544d
commit 1a5e33a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git 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-11-12T13:57:18.029Z\n"
-"PO-Revision-Date: 2024-11-12T13:57:18.029Z\n"
+"POT-Creation-Date: 2024-11-27T21:40:09.970Z\n"
+"PO-Revision-Date: 2024-11-27T21:40:09.970Z\n"
 
 msgid "Low"
 msgstr ""
@@ -162,7 +162,10 @@ msgstr ""
 msgid "Create Risk Assessment"
 msgstr ""
 
-msgid "Add new Assessment"
+msgid "Edit Risk Assessment"
+msgstr ""
+
+msgid "Add new Grade"
 msgstr ""
 
 msgid "Risk assessment incomplete"

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-11-12T13:57:18.029Z\n"
+"POT-Creation-Date: 2024-11-27T21:40:09.970Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,7 +161,10 @@ msgstr ""
 msgid "Create Risk Assessment"
 msgstr ""
 
-msgid "Add new Assessment"
+msgid "Edit Risk Assessment"
+msgstr ""
+
+msgid "Add new Grade"
 msgstr ""
 
 msgid "Risk assessment incomplete"

diff --git a/src/webapp/components/form/Form.tsx b/src/webapp/components/form/Form.tsx
@@ -52,6 +52,7 @@ export const Form: React.FC<FormProps> = React.memo(props => {
                             handleAddNew={handleAddNew}
                             addNewField={section.addNewField}
                             handleRemove={handleRemove}
+                            removeOption={section.removeOption}
                         />
                     );
                 })}

diff --git a/src/webapp/components/form/FormSection.tsx b/src/webapp/components/form/FormSection.tsx
@@ -24,6 +24,7 @@ type FormSectionProps = {
     handleAddNew?: () => void;
     addNewField?: AddNewFieldState;
     handleRemove?: (id: string) => void;
+    removeOption?: boolean;
 };
 
 export const FormSection: React.FC<FormSectionProps> = React.memo(
@@ -41,6 +42,7 @@ export const FormSection: React.FC<FormSectionProps> = React.memo(
         handleAddNew,
         addNewField,
         handleRemove,
+        removeOption = false,
     }) => {
         return (
             <FormSectionContainer>
@@ -91,7 +93,7 @@ export const FormSection: React.FC<FormSectionProps> = React.memo(
                                 );
                             })}
 
-                            {handleRemove && (
+                            {removeOption && handleRemove && (
                                 <ButtonContainer>
                                     <Button onClick={() => handleRemove(id)}>Remove</Button>
                                 </ButtonContainer>

diff --git a/src/webapp/components/form/FormSectionsState.ts b/src/webapp/components/form/FormSectionsState.ts
@@ -22,7 +22,7 @@ export type FormSectionState = {
     subsections?: FormSectionState[];
     onClickInfo?: (id: string) => void;
     addNewField?: AddNewFieldState;
-    onRemove?: () => void;
+    removeOption?: boolean;
 };
 
 // HELPERS:

diff --git a/src/webapp/pages/form-page/incident-action/mapIncidentActionToInitialFormState.ts b/src/webapp/pages/form-page/incident-action/mapIncidentActionToInitialFormState.ts
@@ -300,6 +300,7 @@ export function mapSingleIncidentResponseActionToInitialFormState(
             verificationOptions: verificationOptions,
         },
         isIncidentManager: isIncidentManager,
+        isSingleIncidentResponseAction: true,
         index: 0,
     });
 
@@ -323,8 +324,15 @@ function getResponseActionSection(options: {
     };
     isIncidentManager: boolean;
     index: number;
+    isSingleIncidentResponseAction?: boolean;
 }) {
-    const { incidentResponseAction, options: formOptions, index, isIncidentManager } = options;
+    const {
+        incidentResponseAction,
+        options: formOptions,
+        index,
+        isIncidentManager,
+        isSingleIncidentResponseAction,
+    } = options;
     const { searchAssignROOptions, statusOptions, verificationOptions } = formOptions;
 
     const responseActionSection: FormSectionState = {
@@ -420,6 +428,7 @@ function getResponseActionSection(options: {
                 disabled: false,
             },
         ],
+        removeOption: isSingleIncidentResponseAction ? false : true,
     };
 
     return responseActionSection;

diff --git a/src/webapp/pages/form-page/risk-assessment/mapRiskAssessmentToInitialFormState.ts b/src/webapp/pages/form-page/risk-assessment/mapRiskAssessmentToInitialFormState.ts
@@ -834,7 +834,7 @@ function getRiskAssessmentCustomQuestionSection(
                 width: "100%",
             },
         ],
-
+        removeOption: true,
         direction: "row",
         subsections: [],
     };