Fixes #37572 - Extract logic and simplify initial AK selection (Katel…

…lo#11119)

webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js

@@ -62,12 +62,6 @@ const ActivationKeys = ({
     );
   }, [handleInvalidField, hostGroupId, hostGroupActivationKeys, pluginValues]);
 
-  useEffect(() => {
-    if (activationKeys?.length === 1) {
-      onChange({ activationKeys: [activationKeys[0].name] });
-    }
-  }, [activationKeys, onChange]);
-
   return (
     <FormGroup
       onFocus={() => setHasInteraction(true)}

webpack/components/extensions/RegistrationCommands/helpers.js

@@ -0,0 +1,15 @@
+export const determineInitialAKSelection = (activationKeys, initialAKSelection) => {
+  // If we've received the initialAKSelection from the URL, and it's a valid activation key, use it
+  if (initialAKSelection &&
+    (activationKeys ?? []).some(ak => ak.name === initialAKSelection)) {
+    return { activationKeys: initialAKSelection.split(',') };
+  }
+  // If there's only one activation key, use it
+  if (activationKeys?.length === 1) {
+    return { activationKeys: [activationKeys[0].name] };
+  }
+  // Otherwise, don't select any activation keys
+  return { activationKeys: [] };
+};
+
+export default determineInitialAKSelection;

webpack/components/extensions/RegistrationCommands/index.js

@@ -2,6 +2,7 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { noop } from 'foremanReact/common/helpers';
 import { useUrlParams } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
+import { determineInitialAKSelection } from './helpers';
 
 import ActivationKeys from './fields/ActivationKeys';
 import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
@@ -51,15 +52,8 @@ export const RegistrationActivationKeys = ({
 }) => {
   const { initialAKSelection } = useUrlParams();
   useEffect(() => {
-    onChange({ activationKeys: [] });
-  }, [onChange, organizationId, hostGroupId]);
-
-  useEffect(() => {
-    if (initialAKSelection &&
-       (pluginData?.activationKeys ?? []).some(ak => ak.name === initialAKSelection)) {
-      onChange({ activationKeys: initialAKSelection.split(',') });
-    }
-  }, [initialAKSelection, onChange, pluginData?.activationKeys]);
+    onChange(determineInitialAKSelection(pluginData?.activationKeys, initialAKSelection));
+  }, [initialAKSelection, onChange, pluginData?.activationKeys, organizationId, hostGroupId]);
 
   return (
     <ActivationKeys