From 672488d3184ca286e2be0eebb8bd85fa7e36001f Mon Sep 17 00:00:00 2001
From: Fatimah <fatimah.zulfiqar@cern.ch>
Date: Thu, 22 Feb 2024 16:22:56 +0100
Subject: [PATCH] custom_ fields: added missing check

---
 src/lib/forms/widgets/custom_fields/CustomFields.js  | 2 +-
 src/lib/forms/widgets/select/AutocompleteDropdown.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/forms/widgets/custom_fields/CustomFields.js b/src/lib/forms/widgets/custom_fields/CustomFields.js
index 04c4d4b1..19a02ed8 100644
--- a/src/lib/forms/widgets/custom_fields/CustomFields.js
+++ b/src/lib/forms/widgets/custom_fields/CustomFields.js
@@ -87,7 +87,7 @@ export class CustomFields extends Component {
               {fields}
             </AccordionField>
           ))}
-        {discoverFieldsSections && (
+        {discoverFieldsSections && discoverFieldsSections.length > 0  && (
           <DiscoverFieldsSection
             templateLoaders={templateLoaders}
             sections={discoverFieldsSections}
diff --git a/src/lib/forms/widgets/select/AutocompleteDropdown.js b/src/lib/forms/widgets/select/AutocompleteDropdown.js
index 336957f5..cc08a525 100644
--- a/src/lib/forms/widgets/select/AutocompleteDropdown.js
+++ b/src/lib/forms/widgets/select/AutocompleteDropdown.js
@@ -23,7 +23,6 @@ export default class AutocompleteDropdown extends Component {
     } = this.props;
     return (
       <>
-        <FieldLabel htmlFor={fieldPath} icon={icon} label={label} />
         <Field name={fieldPath}>
           {({ form: { values } }) => {
             return (
@@ -31,6 +30,7 @@ export default class AutocompleteDropdown extends Component {
                 clearable={clearable}
                 required={required}
                 fieldPath={fieldPath}
+                label={<FieldLabel htmlFor={fieldPath} icon={icon} label={label} />}
                 multiple={multiple}
                 noQueryMessage={placeholder}
                 placeholder={placeholder}