Fix after rebase of bootstrap changes

ComPlat · Oct 17, 2024 · 7baf5a0 · 7baf5a0
1 parent 122b7c8
commit 7baf5a0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/app/packs/src/components/searchModal/forms/SearchResult.js b/app/packs/src/components/searchModal/forms/SearchResult.js
@@ -170,7 +170,7 @@ const SearchResult = ({ handleClear }) => {
         <OverlayTrigger delayShow={500} placement="top" overlay={tooltip}>
           <div className="d-inline-flex align-items-center">
             <i className={`${iconClass} pe-1`} />
-            <span class="fs-3">
+            <span className="fs-3">
               ({tabResult.total_elements})
             </span>
           </div>

diff --git a/app/packs/src/components/searchModal/forms/TextSearch.js b/app/packs/src/components/searchModal/forms/TextSearch.js
@@ -181,25 +181,11 @@ const TextSearch = () => {
                 )
               }
             </div>
-            <SearchButtonToolbar store={searchStore} />
-          </div>
-        </Accordion.Collapse>
-      </Accordion.Item>
-      <Accordion.Item eventKey={1} className={`${panelVars.invisibleClassName}${activeResultAccordionClass}`}>
-        <h2 className="accordion-header">
-          <AccordeonHeaderButtonForSearchForm
-            title={panelVars.resultTitle}
-            eventKey={1}
-            callback={togglePanel(searchStore)}
-          />
-        </h2>
-        <Accordion.Collapse eventKey={1}>
-          <div className="accordion-body">
-            <Form className="d-flex align-items-start gap-5">
-              <SearchResult handleClear={() => handleClear(searchStore)} />
+            <Form className="d-flex align-items-center gap-5">
+              <SearchButtonToolbar store={searchStore} />
               {
                 searchStore.searchType == 'detail' && (
-                  <Form.Group className="d-flex align-items-baseline gap-5">
+                  <Form.Group className="d-flex align-items-baseline gap-4">
                     <span>Change search operator for numeric Fields:</span>
                     <Form.Check
                       type="radio"
@@ -226,6 +212,20 @@ const TextSearch = () => {
           </div>
         </Accordion.Collapse>
       </Accordion.Item>
+      <Accordion.Item eventKey={1} className={`${panelVars.invisibleClassName}${activeResultAccordionClass}`}>
+        <h2 className="accordion-header">
+          <AccordeonHeaderButtonForSearchForm
+            title={panelVars.resultTitle}
+            eventKey={1}
+            callback={togglePanel(searchStore)}
+          />
+        </h2>
+        <Accordion.Collapse eventKey={1}>
+          <div className="accordion-body">
+            <SearchResult handleClear={() => handleClear(searchStore)} />
+          </div>
+        </Accordion.Collapse>
+      </Accordion.Item>
     </Accordion>
   );
 }