Merged in bugfix/SHIBUI-2421 (pull request #623)

Fixed preview button when no response received
TIER · Oct 31, 2022 · 1de8714 · 1de8714
2 parents 3b8f4db + e32e865
commit 1de8714
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ui/src/app/form/component/templates/FieldTemplate.js b/ui/src/app/form/component/templates/FieldTemplate.js
@@ -19,7 +19,7 @@ export function FieldTemplate ({
 
     return (
         <>{!props.hidden ?
-            <Form.Group className="mb-3">
+            <Form.Group className="mb-3" id={`${id}-group`}>
                 <div>
                     {children}
                 </div>

diff --git a/ui/src/app/metadata/hoc/FilterTargetPreview.js b/ui/src/app/metadata/hoc/FilterTargetPreview.js
@@ -35,7 +35,7 @@ export function FilterTargetPreview ({ entityId, children }) {
 
     return (
         <React.Fragment>
-            {children(preview, loading, data)}
+            {children(data ? preview : null, loading, data)}
             <Modal show={show} onHide={handleClose} dialogClassName="modal-xl">
                 <Modal.Header closeButton>
                     <Modal.Title><Translate value="label.preview-provider">Preview XML</Translate></Modal.Title>