Revert "feat: temp"

This reverts commit 0ae1eea.
dhis2 · Nov 3, 2023 · 3ad55f0 · 3ad55f0
1 parent 172c864
commit 3ad55f0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/core_modules/capture-core/components/D2Form/D2Form.component.js b/src/core_modules/capture-core/components/D2Form/D2Form.component.js
@@ -92,6 +92,7 @@ class D2Form extends React.PureComponent<PropsForPureComponent> {
             formBuilderId={this.getFormBuilderId(section.id)}
             sectionId={section.id}
             applyCustomFormClass={false}
+            data-test="d2-form-component"
             {...passOnProps}
         />
     )
@@ -105,6 +106,7 @@ class D2Form extends React.PureComponent<PropsForPureComponent> {
             formId={this.getFormId()}
             formBuilderId={this.getFormBuilderId(section.id)}
             sectionId={section.id}
+            data-test="d2-form-component"
             applyCustomFormClass={!!section.customForm}
             {...passOnProps}
         />
@@ -167,7 +169,6 @@ export const D2FormComponent = (props: Props) => {
         <D2Form
             ref={handleRef}
             {...passOnProps}
-            data-test="d2-form-component"
         />
     );
 };
diff --git a/src/core_modules/capture-core/components/D2Form/D2Form.types.js b/src/core_modules/capture-core/components/D2Form/D2Form.types.js
@@ -10,7 +10,6 @@ export type OwnProps = $ReadOnly<{|
   formFoundation: RenderFoundation,
   id: string,
   formHorizontal?: boolean,
-  'data-test'?: string,
   getCustomContent?: (beforeSectionId: string) => React.Node,
   ...FormRef
 |}>

diff --git a/src/core_modules/capture-core/components/D2Form/D2Section.component.js b/src/core_modules/capture-core/components/D2Form/D2Section.component.js
@@ -73,7 +73,7 @@ class D2SectionPlain extends React.PureComponent<Props> {
     }
 
     renderSection(sectionProps) {
-        const { sectionMetaData, applyCustomFormClass, classes, sectionId, ...passOnProps } = sectionProps;
+        const { sectionMetaData, classes, sectionId, ...passOnProps } = sectionProps;
 
         if (!sectionMetaData.showContainer || this.props.formHorizontal) {
             return (
@@ -87,9 +87,7 @@ class D2SectionPlain extends React.PureComponent<Props> {
             );
         }
         return (
-            <div
-                className={applyCustomFormClass ? this.props.classes.containerCustomForm : ''}
-            >
+            <div>
                 <Section
                     header={this.renderSectionHeader()}
                     description={this.renderSectionDescription()}
@@ -111,13 +109,19 @@ class D2SectionPlain extends React.PureComponent<Props> {
     }
 
     render() {
-        const { isHidden, ...passOnProps } = this.props;
+        const { isHidden, applyCustomFormClass, ...passOnProps } = this.props;
 
         if (isHidden) {
             return null;
         }
 
-        return this.renderSection(passOnProps);
+        return (<div
+            className={applyCustomFormClass ? this.props.classes.containerCustomForm : ''}
+        >
+            {
+                this.renderSection(passOnProps)
+            }
+        </div>);
     }
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -17160,13 +17160,6 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.5.3:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 [email protected]:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"