Refs #39369 - wizard, Fix bookmark sending logic and position

Author: MariaAga

webpack/JobWizard/steps/HostsAndInputs/HostSearch.js

@@ -10,14 +10,22 @@ export const HostSearch = ({ value, setValue, onBookmarkMatch }) => {
 
   const handleSearchChange = search => {
     setValue(search);
+    onBookmarkMatch(null);
+  };
+
+  const handleBookmarkSearch = query => {
     const matched = bookmarks.find(
-      bookmark => bookmark.query && bookmark.query.trim() === search.trim()
-    );
-    onBookmarkMatch(
-      matched
-        ? { id: matched.id, name: matched.name, query: matched.query }
-        : null
+      bookmark => bookmark.query && bookmark.query.trim() === query.trim()
     );
+    if (matched) {
+      onBookmarkMatch({
+        id: matched.id,
+        name: matched.name,
+        query: matched.query,
+      });
+    } else {
+      onBookmarkMatch(null);
+    }
   };
 
   return (
@@ -31,8 +39,9 @@ export const HostSearch = ({ value, setValue, onBookmarkMatch }) => {
             searchQuery: value,
           },
         }}
-        onSearch={null}
+        onSearch={handleBookmarkSearch}
         onSearchChange={handleSearchChange}
+        bookmarksPosition="right"
       />
     </div>
   );

webpack/JobWizard/submit.js

@@ -2,6 +2,14 @@ import { post } from 'foremanReact/redux/API';
 import { repeatTypes, JOB_INVOCATION } from './JobWizardConstants';
 import { buildHostQuery } from './steps/HostsAndInputs/buildHostQuery';
 
+const hasExplicitTargets = selectedTargets =>
+  selectedTargets.hosts.length > 0 ||
+  selectedTargets.hostCollections.length > 0 ||
+  selectedTargets.hostGroups.length > 0;
+
+const shouldSendBookmark = (selectedBookmark, selectedTargets) =>
+  selectedBookmark && !hasExplicitTargets(selectedTargets);
+
 export const submit = ({
   jobTemplateID,
   templateValues,
@@ -111,8 +119,10 @@ export const submit = ({
       concurrency_control: {
         concurrency_level: concurrencyLevel,
       },
-      bookmark_id: selectedBookmark ? selectedBookmark.id : null,
-      search_query: selectedBookmark
+      bookmark_id: shouldSendBookmark(selectedBookmark, selectedTargets)
+        ? selectedBookmark.id
+        : null,
+      search_query: shouldSendBookmark(selectedBookmark, selectedTargets)
         ? null
         : buildHostQuery(selectedTargets, hostsSearchQuery),
       description_format: description,