refactor: refactor formcontent

dhis2 · Dec 4, 2024 · f002dea · f002dea
1 parent c71fe90
commit f002dea
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/components/merge/DefaultMergeFormContents.tsx b/src/components/merge/DefaultMergeFormContents.tsx
@@ -9,13 +9,17 @@ import { StandardFormSectionTitle } from '../standardForm'
 export const DefaultMergeFormContents = ({
     children,
     title,
-}: React.PropsWithChildren<{ title?: React.ReactNode }>) => {
+    mergeCompleteElement = <MergeComplete />,
+}: React.PropsWithChildren<{
+    title?: React.ReactNode
+    mergeCompleteElement?: React.ReactElement
+}>) => {
     const { submitting, submitSucceeded } = useFormState({
         subscription: { submitting: true, submitSucceeded: true },
     })
 
     if (submitSucceeded) {
-        return <MergeComplete />
+        return mergeCompleteElement
     }
 
     if (submitting) {
@@ -58,12 +62,13 @@ export const MergeInProgress = () => {
     )
 }
 
-export const MergeComplete = () => {
+export const MergeComplete = ({ children }: React.PropsWithChildren) => {
     return (
         <div>
             <StandardFormSectionTitle>
                 {i18n.t('Merge complete')}
             </StandardFormSectionTitle>
+            {children}
             <LinkButton to="../">{i18n.t('Back to list')}</LinkButton>
         </div>
     )

diff --git a/src/components/merge/MergeFormBase.tsx b/src/components/merge/MergeFormBase.tsx
@@ -1,10 +1,5 @@
-import i18n from '@dhis2/d2-i18n'
-import { Button, ButtonStrip, Card, CircularLoader } from '@dhis2/ui'
 import React from 'react'
 import { Form } from 'react-final-form'
-import { DefaultFormErrorNotice } from '../form/DefaultFormErrorNotice'
-import { LinkButton } from '../LinkButton'
-import { LoadingSpinner } from '../loading/LoadingSpinner'
 import { MergeFormValuesBase } from './mergeSchemaBase'
 
 export type MergeFormBaseProps<TValues> = {

diff --git a/src/pages/indicatorTypes/Merge.tsx b/src/pages/indicatorTypes/Merge.tsx
@@ -2,7 +2,11 @@ import { useDataEngine } from '@dhis2/app-runtime'
 import { FORM_ERROR } from 'final-form'
 import React, { useMemo } from 'react'
 import { StandardFormSectionTitle } from '../../components'
-import { DefaultMergeFormContents, MergeFormBase } from '../../components/merge'
+import {
+    DefaultMergeFormContents,
+    MergeComplete,
+    MergeFormBase,
+} from '../../components/merge'
 import { getDefaults, useLocationWithState } from '../../lib'
 import { IndicatorTypeMergeForm } from './merge/IndicatorTypeMerge'
 import {
@@ -56,6 +60,16 @@ export const Component = () => {
                         Configure indicator type merge
                     </StandardFormSectionTitle>
                 }
+                mergeCompleteElement={
+                    <MergeComplete>
+                        <p>
+                            The indicator types merge operation is complete.
+                            <br /> <br />
+                            All selected indicator types were merged
+                            successfully.
+                        </p>
+                    </MergeComplete>
+                }
             >
                 <IndicatorTypeMergeForm />
             </DefaultMergeFormContents>