Menu searchtools consistent with module search tools. Fixes #17633

administrator/components/com_menus/layouts/joomla/searchtools/default.php

@@ -46,6 +46,42 @@
 ?>
 <div class="js-stools clearfix">
 	<div class="clearfix">
+        <?php
+        if ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Items\Html)
+        {
+	        // We will get the menutype filter & remove it from the form filters
+	        $menuTypeField = $data['view']->filterForm->getField('menutype');
+
+	        // Add the client selector before the form filters.
+	        $clientIdField = $data['view']->filterForm->getField('client_id');
+
+	        if ($clientIdField): ?>
+                <div class="js-stools-container-selector">
+                    <div class="js-stools-field-selector js-stools-client_id">
+				        <?php echo $clientIdField->input; ?>
+                    </div>
+                </div>
+	        <?php endif; ?>
+            <div class="js-stools-container-selector">
+                <div class="js-stools-field-selector js-stools-menutype">
+			        <?php echo $menuTypeField->input; ?>
+                </div>
+            </div>
+	        <?php
+        }
+        elseif ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Menus\Html)
+        {
+	        // Add the client selector before the form filters.
+	        $clientIdField = $data['view']->filterForm->getField('client_id');
+	        ?>
+            <div class="js-stools-container-selector">
+                <div class="js-stools-field-selector js-stools-client_id">
+			        <?php echo $clientIdField->input; ?>
+                </div>
+            </div>
+	        <?php
+        }
+        ?>
 		<div class="js-stools-container-bar">
 			<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
 		</div>