Fixes #39630 - REX Job Wizard host autofill when display_fqdn_for_host setting is disabled

webpack/JobWizard/__tests__/integration.test.js

@@ -105,7 +105,7 @@ describe('Job wizard fill', () => {
     });
     expectDispatchedGet({
       key: 'HOST_IDS',
-      params: { search: 'id = 105 or id = 37' },
+      params: { search: 'id ^ (105,37)' },
       url: '/api/hosts',
     });
     expectDispatchedGet({

webpack/JobWizard/autofill.js

@@ -11,6 +11,21 @@ import {
 import { selectHostBookmarks } from './JobWizardSelectors';
 import './JobWizard.scss';
 
+export const buildHostSearchFromIds = hostIds => {
+  const ids = Array.isArray(hostIds) ? hostIds : [hostIds];
+  const isNumericId = id => /^\d+$/.test(String(id));
+  const numericIds = ids.filter(isNumericId);
+  const hostnames = ids.filter(id => !isNumericId(id));
+  const parts = [];
+  if (numericIds.length) {
+    parts.push(`id ^ (${numericIds.join(',')})`);
+  }
+  if (hostnames.length) {
+    parts.push(`name ^ (${hostnames.join(', ')})`);
+  }
+  return parts.join(' or ');
+};
+
 export const useAutoFill = ({
   fills,
   setFills,
@@ -52,9 +67,7 @@ export const useAutoFill = ({
       setFills({});
       if (hostIds) {
         setSelectedBookmark(null);
-        const hostSearch = Array.isArray(hostIds)
-          ? `id = ${hostIds.join(' or id = ')}`
-          : `id = ${hostIds}`;
+        const hostSearch = buildHostSearchFromIds(hostIds);
         dispatch(
           get({
             key: HOST_IDS,
@@ -69,8 +82,9 @@ export const useAutoFill = ({
                   // eslint-disable-next-line camelcase
                   ({ id, name, display_name }) => ({
                     id,
+                    name,
                     // eslint-disable-next-line camelcase
-                    name: display_name || name,
+                    display_name: display_name || name,
                   })
                 ),
               }));

webpack/JobWizard/steps/HostsAndInputs/__tests__/HostsAndInputs.test.js

@@ -163,7 +163,7 @@ describe('Hosts', () => {
     });
     api.get.mock.calls.forEach(call => {
       if (call[0].key === 'HOST_IDS') {
-        expect(call[0].params).toEqual({ search: 'id = host1 or id = host3' });
+        expect(call[0].params).toEqual({ search: 'name ^ (host1, host3)' });
       }
     });