katello 4.5.0 → 4.6.0.rc1

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js

@@ -12,7 +12,6 @@ import {
   Skeleton,
   Split,
   SplitItem,
-  Spinner,
 } from '@patternfly/react-core';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -358,14 +357,12 @@ export const PackagesTab = () => {
             />
           </ActionListItem>
           <ActionListItem>
-            {actionInProgress ? <Spinner size="lg" style={{ marginLeft: '1em', marginTop: '4px' }} /> : (
-              <Dropdown
-                toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
-                isOpen={isBulkActionOpen}
-                isPlain
-                dropdownItems={dropdownRemoveItems}
-              />
-            )}
+            <Dropdown
+              toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+              isOpen={isBulkActionOpen}
+              isPlain
+              dropdownItems={dropdownRemoveItems}
+            />
           </ActionListItem>
         </ActionList>
       </SplitItem>
@@ -387,6 +384,8 @@ export const PackagesTab = () => {
     </Split>
   );
 
+  const resetFilters = () => setPackageStatusSelected(PACKAGE_STATUS);
+
   return (
     <div>
       <div id="packages-tab">
@@ -409,6 +408,7 @@ export const PackagesTab = () => {
             selectedCount,
             selectNone,
             areAllRowsSelected,
+            resetFilters,
           }
           }
           ouiaId="host-packages-table"
@@ -425,6 +425,8 @@ export const PackagesTab = () => {
           variant={TableVariant.compact}
           {...selectAll}
           displaySelectAllCheckbox={showActions}
+          requestKey={HOST_PACKAGES_KEY}
+          alwaysShowActionButtons={false}
         >
           <Thead>
             <Tr>

data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js

@@ -111,6 +111,29 @@ EnabledIcon.propTypes = {
   isOverridden: PropTypes.bool.isRequired,
 };
 
+const ArchRestrictedIcon = ({ archRestricted }) => (
+  <Tooltip
+    position="right"
+    content={<FormattedMessage
+      id="arch-restricted-tooltip"
+      defaultMessage={__('Architecture restricted to {archRestricted}. If host architecture does not match, the repository will not be available on this host.')}
+      values={{ archRestricted }}
+    />}
+  >
+    <Label color="orange" className="arch-restricted-label" style={{ marginLeft: '8px' }}>
+      {__(archRestricted)}
+    </Label>
+  </Tooltip>
+);
+
+ArchRestrictedIcon.propTypes = {
+  archRestricted: PropTypes.string,
+};
+
+ArchRestrictedIcon.defaultProps = {
+  archRestricted: null,
+};
+
 const OsRestrictedIcon = ({ osRestricted }) => (
   <Tooltip
     position="right"
@@ -154,7 +177,7 @@ const RepositorySetsTab = () => {
     contentViewName,
     lifecycleEnvironmentName,
   } = contentFacet;
-  const nonLibraryHost = contentViewDefault === false &&
+  const nonLibraryHost = contentViewDefault === false ||
     lifecycleEnvironmentLibrary === false;
   const simpleContentAccess = (Number(subscriptionStatus) === 5);
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
@@ -174,9 +197,15 @@ const RepositorySetsTab = () => {
 
   const [alertShowing, setAlertShowing] = useState(false);
   const emptyContentTitle = __('No repository sets to show.');
-  const emptyContentBody = __('Repository sets will appear here when available.');
+  const emptyContentBody = __('Repository sets will appear here after enabling Red Hat repositories or creating custom products.');
   const emptySearchTitle = __('No matching repository sets found');
   const emptySearchBody = __('Try changing your search query.');
+  const showPrimaryAction = true;
+  const showSecondaryAction = true;
+  const primaryActionTitle = __('Enable Red Hat repositories');
+  const secondaryActionTitle = __('Create a custom product');
+  const primaryActionLink = '/redhat_repositories';
+  const secondaryActionLink = '/products/new';
   const errorSearchTitle = __('Problem searching repository sets');
   const columnHeaders = useMemo(() => [
     __('Repository'),
@@ -233,6 +262,10 @@ const RepositorySetsTab = () => {
 
   const hostDetailsStatus = useSelector(state => selectHostDetailsStatus(state));
 
+  const resetFilters = () => {
+    setStatusSelected(STATUS_LABEL);
+    setToggleGroupState(defaultToggleGroupState);
+  };
   useEffect(() => {
     // wait until host details are loaded to set alertShowing
     if (hostDetailsStatus === STATUS.RESOLVED) {
@@ -306,13 +339,13 @@ const RepositorySetsTab = () => {
   cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
 
   const dropdownItems = [
-    <DropdownItem aria-label="bulk_enable" key="bulk_enable" component="button" onClick={enableRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem aria-label="bulk_enable" key="bulk_enable" ouiaId="bulk_enable" component="button" onClick={enableRepoSets} isDisabled={selectedCount === 0}>
       {__('Override to enabled')}
     </DropdownItem>,
-    <DropdownItem aria-label="bulk_disable" key="bulk_disable" component="button" onClick={disableRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem aria-label="bulk_disable" key="bulk_disable" ouiaId="bulk_disable" component="button" onClick={disableRepoSets} isDisabled={selectedCount === 0}>
       {__('Override to disabled')}
     </DropdownItem>,
-    <DropdownItem aria-label="bulk_reset_default" key="bulk_reset_default" component="button" onClick={resetToDefaultRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem aria-label="bulk_reset_default" key="bulk_reset_default" ouiaId="bulk_reset_default" component="button" onClick={resetToDefaultRepoSets} isDisabled={selectedCount === 0}>
       {__('Reset to default')}
     </DropdownItem>,
   ];
@@ -342,6 +375,7 @@ const RepositorySetsTab = () => {
       <SplitItem>
         <SelectableDropdown
           id="status-dropdown"
+          ouiaId="status-dropdown"
           title={STATUS_LABEL}
           showTitle={false}
           items={Object.values(STATUSES)}
@@ -362,6 +396,7 @@ const RepositorySetsTab = () => {
               isOpen={isBulkActionOpen}
               isPlain
               dropdownItems={dropdownItems}
+              ouiaId="repository-sets-bulk-actions"
             />
           </ActionListItem>
         </ActionList>
@@ -403,6 +438,7 @@ const RepositorySetsTab = () => {
             <Alert
               variant="info"
               className="repo-sets-alert"
+              ouiaId="repo-sets-alert"
               isInline
               title={
                 <FormattedMessage
@@ -415,7 +451,7 @@ const RepositorySetsTab = () => {
                   }}
                 />
               }
-              actionClose={<AlertActionCloseButton onClose={() => setAlertShowing(false)} />}
+              actionClose={<AlertActionCloseButton ouiaId="alert-close-button" onClose={() => setAlertShowing(false)} />}
             />
           }
         </div>
@@ -435,6 +471,13 @@ const RepositorySetsTab = () => {
             emptySearchBody,
             activeFilters,
             defaultFilters,
+            showPrimaryAction,
+            showSecondaryAction,
+            primaryActionLink,
+            secondaryActionLink,
+            primaryActionTitle,
+            secondaryActionTitle,
+            resetFilters,
           }
           }
           ouiaId="host-repository-sets-table"
@@ -449,10 +492,12 @@ const RepositorySetsTab = () => {
           rowsCount={results?.length}
           variant={TableVariant.compact}
           {...selectAll}
+          requestKey={REPOSITORY_SETS_KEY}
           displaySelectAllCheckbox={canDoContentOverrides}
+          alwaysShowActionButtons={false}
         >
           <Thead>
-            <Tr>
+            <Tr ouiaId="header-tr">
               <Th key="select-all" />
               <SortableColumnHeaders
                 columnHeaders={columnHeaders}
@@ -473,11 +518,13 @@ const RepositorySetsTab = () => {
                 contentUrl: repoPath,
                 product: { name: productName, id: productId },
                 osRestricted,
+                archRestricted,
               } = repoSet;
               const { isEnabled, isOverridden } =
                 getEnabledValue({ enabled, enabledContentOverride });
+              const showArchRestricted = archRestricted !== 'noarch';
               return (
-                <Tr key={id}>
+                <Tr key={id} ouiaId={`tr-${rowIndex}`}>
                   {canDoContentOverrides ? (
                     <Td select={{
                       disable: !isSelectable(id),
@@ -499,6 +546,9 @@ const RepositorySetsTab = () => {
                   </Td>
                   <Td>
                     <span><EnabledIcon key={`enabled-icon-${id}`} {...{ isEnabled, isOverridden }} /></span>
+                    {showArchRestricted &&
+                      <span><ArchRestrictedIcon key={`arch-restricted-icon-${id}`} {...{ archRestricted }} /></span>
+                    }
                     {osRestricted &&
                       <span><OsRestrictedIcon key={`os-restricted-icon-${id}`} {...{ osRestricted }} /></span>
                     }

data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js

@@ -22,6 +22,7 @@ import { useRexJobPolling } from '../RemoteExecutionHooks';
 import { hasRequiredPermissions as can,
   missingRequiredPermissions as cannot,
   userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
+import { HOST_TRACES_KEY } from './HostTracesConstants';
 
 const invokeRexJobs = ['create_job_invocations'];
 const createBookmarks = ['create_bookmarks'];
@@ -201,6 +202,7 @@ const TracesTab = () => {
           lastCompletedAppRestart, lastCompletedBulkRestart]}
         displaySelectAllCheckbox={showActions}
         {...selectAll}
+        requestKey={HOST_TRACES_KEY}
       >
         <Thead>
           <Tr>

data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js

@@ -577,7 +577,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the default content view ', async (done) => {
+test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -598,14 +598,41 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  expect(queryByLabelText('Installable Errata')).not.toBeInTheDocument();
+  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Toggle Group shows if it\'s the library environment but non-default content view', async (done) => {
+  const options = renderOptions({
+    ...contentFacetAttributes,
+    lifecycle_environment_library: true,
+  });
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const mockErrata = makeMockErrata({});
+  // return errata data results when we look for errata
+  const scope = nockInstance
+    .get(hostErrata)
+    .query(defaultQuery)
+    .reply(200, mockErrata);
+
+  const {
+    queryByLabelText,
+    getAllByText,
+  } = renderWithRedux(<ErrataTab />, options);
+
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
+  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the  library environment', async (done) => {
+test('Toggle Group does not show if it\'s the default content view and library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
+    content_view_default: true,
     lifecycle_environment_library: true,
   });
   // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello

data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySets.fixtures.json

@@ -42,6 +42,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/empty_repo",
       "osRestricted": null,
+      "archRestricted": "noarch",
       "override": "default",
       "overrides": [],
       "enabled_content_override": null
@@ -77,6 +78,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/partha_multi-errata",
       "osRestricted": "rhel-7",
+      "archRestricted": "x86_64",
       "override": "0",
       "overrides": [
         {
@@ -110,6 +112,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/Pull_Provider/yggdrasil",
       "osRestricted": null,
+      "archRestricted": "noarch",
       "override": "1",
       "overrides": [
         {

data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js

@@ -8,6 +8,7 @@ import mockRepoSetData from './repositorySets.fixtures.json';
 import mockBookmarkData from './bookmarks.fixtures.json';
 import mockContentOverride from './contentOverrides.fixtures.json';
 
+
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
   userPermissionsFromHostDetails: () => ({
@@ -46,7 +47,7 @@ const autocompleteUrl = '/repository_sets/auto_complete_search';
 const repositorySetBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_product_contents');
 const contentOverride = foremanApi.getApiUrl('/hosts/1/subscriptions/content_override');
 
-const defaultQuery = {
+const limitToEnvQuery = {
   content_access_mode_env: true,
   content_access_mode_all: true,
   host_id: 1,
@@ -56,8 +57,8 @@ const defaultQuery = {
   sort_by: 'name',
   sort_order: 'asc',
 };
-const libraryQuery = {
-  ...defaultQuery,
+const showAllQuery = {
+  ...limitToEnvQuery,
   content_access_mode_env: false,
 };
 
@@ -86,7 +87,7 @@ test('Can call API for repository sets and show basic table', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const { getByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -110,7 +111,7 @@ test('Can handle no repository sets being present', async (done) => {
 
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, noResults);
 
   const { queryByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -126,7 +127,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -141,7 +142,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the default content view ', async (done) => {
+test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     content_view_default: true,
@@ -150,7 +151,7 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(libraryQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -160,21 +161,46 @@ test('Toggle Group does not show if it\'s the default content view ', async (don
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
-  expect(queryByLabelText('Limit to environment')).not.toBeInTheDocument();
+  expect(queryByLabelText('Limit to environment')).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Toggle Group shows if it\'s the library environment but a non-default content view', async (done) => {
+  const options = renderOptions({
+    ...contentFacetAttributes,
+    lifecycle_environment_library: true,
+  });
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  // return errata data results when we look for errata
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(limitToEnvQuery)
+    .reply(200, mockRepoSetData);
+
+  const {
+    queryByLabelText,
+    getByText,
+  } = renderWithRedux(<RepositorySetsTab />, options);
+
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+  expect(queryByLabelText('Limit to environment')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group does not show if it\'s the library environment', async (done) => {
+test('Toggle Group does not show if it\'s the library environment and default content view', async (done) => {
   const options = renderOptions({
     ...contentFacetAttributes,
     lifecycle_environment_library: true,
+    content_view_default: true,
   });
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(libraryQuery)
+    .query(showAllQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -195,7 +221,7 @@ test('Can toggle with the Toggle Group ', async (done) => {
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const {
@@ -215,7 +241,7 @@ test('Can override to disabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const overrides = JSON.parse(JSON.stringify(mockContentOverride));
   overrides.results[0].enabled_content_override = false;
@@ -253,7 +279,7 @@ test('Can override to enabled', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const overrides = JSON.parse(JSON.stringify(mockContentOverride));
   overrides.results[1].enabled_content_override = true;
@@ -292,7 +318,7 @@ test('Can reset to default', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const overrides = JSON.parse(JSON.stringify(mockContentOverride));
   overrides.results[1].enabled_content_override = null;
@@ -331,7 +357,7 @@ test('Can override in bulk', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
   const contentOverrideScope = nockInstance
     .put(contentOverride)
@@ -359,12 +385,12 @@ test('Can filter by status', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const scope2 = nockInstance
     .get(hostRepositorySets)
-    .query({ ...defaultQuery, status: 'overridden' })
+    .query({ ...limitToEnvQuery, status: 'overridden' })
     .reply(200, { ...mockRepoSetData, results: [secondRepoSet] });
 
   const {
@@ -389,11 +415,11 @@ test('Can filter by status', async (done) => {
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
-test('Can display osRestricted as a label', async (done) => {
+test('Can display restrictions as labels', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(hostRepositorySets)
-    .query(defaultQuery)
+    .query(limitToEnvQuery)
     .reply(200, mockRepoSetData);
 
   const { getByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -401,6 +427,8 @@ test('Can display osRestricted as a label', async (done) => {
   await patientlyWaitFor(() => expect(getByText(secondRepoSet.contentUrl)).toBeInTheDocument());
   expect(secondRepoSet.osRestricted).not.toBeNull();
   expect(getByText(secondRepoSet.osRestricted)).toBeInTheDocument();
+  expect(secondRepoSet.archRestricted).not.toBeNull();
+  expect(getByText(secondRepoSet.archRestricted)).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });

data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, waitFor, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
-import nock, { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 import { HOST_TRACES_KEY, TRACES_SEARCH_QUERY } from '../TracesTab/HostTracesConstants';
@@ -74,7 +74,6 @@ describe('With tracer installed', () => {
     assertNockRequest(searchDelayScope);
     assertNockRequest(autoSearchScope);
     assertNockRequest(bookmarkScope);
-    nock.cleanAll();
   });
 
   test('Can call API for traces and show on screen on page load', async (done) => {
@@ -345,10 +344,6 @@ describe('With tracer installed', () => {
       [firstTrace] = results;
     });
 
-    afterEach(() => {
-      nock.cleanAll();
-    });
-
     test('Does not allow selection of session type traces', async (done) => {
       const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
 
@@ -374,10 +369,6 @@ describe('With tracer installed', () => {
 });
 
 describe('Without tracer installed', () => {
-  afterEach(() => {
-    nock.cleanAll();
-  });
-
   test('Shows Enable Tracer empty state', async () => {
     const { queryByText } = renderWithRedux(<TracesTab />, renderOptions(false));
 

data/webpack/components/extensions/HostDetails/hostDetailsHelpers.js

@@ -35,7 +35,7 @@ export const userPermissionsFromHostDetails = ({ hostDetails }) => {
 
 // requiredPermissions is an array
 // userPermissions is an object, e.g. { view_hosts: true }
-export const hasRequiredPermissions = (requiredPermissions = [], userPermissions) => {
+export const hasRequiredPermissions = (requiredPermissions = [], userPermissions = {}) => {
   const permittedActions = Object.keys(userPermissions).filter(key => userPermissions[key]);
   return requiredPermissions.every(permission => permittedActions.includes(permission));
 };

data/webpack/components/extensions/RegistrationCommands/index.js

@@ -7,32 +7,20 @@ import LifecycleEnvironment from './fields/LifecycleEnvironment';
 import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
 import Force from './fields/Force';
 
-const RegistrationCommands = ({
+export const RegistrationCommands = ({
   organizationId,
   hostGroupId,
   pluginValues,
   pluginData,
   onChange,
-  handleInvalidField,
   isLoading,
 }) => {
   useEffect(() => {
-    onChange({ activationKeys: [], lifecycleEnvironmentId: '' });
+    onChange({ lifecycleEnvironmentId: '' });
   }, [onChange, organizationId, hostGroupId]);
 
   return (
     <>
-      <ActivationKeys
-        activationKeys={pluginData?.activationKeys}
-        organizationId={organizationId}
-        selectedKeys={(pluginValues?.activationKeys || [])}
-        hostGroupActivationKeys={pluginData?.hostGroupActivationKeys}
-        hostGroupId={hostGroupId}
-        pluginValues={pluginValues}
-        onChange={onChange}
-        handleInvalidField={handleInvalidField}
-        isLoading={isLoading}
-      />
       <LifecycleEnvironment
         pluginValues={pluginValues}
         lifecycleEnvironments={pluginData?.lifecycleEnvironments}
@@ -63,7 +51,6 @@ RegistrationCommands.propTypes = {
   pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   pluginData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   onChange: PropTypes.func,
-  handleInvalidField: PropTypes.func,
   isLoading: PropTypes.bool,
 };
 
@@ -74,7 +61,52 @@ RegistrationCommands.defaultProps = {
   pluginData: {},
   isLoading: false,
   onChange: noop,
-  handleInvalidField: noop,
 };
 
-export default RegistrationCommands;
+export const RegistrationActivationKeys = ({
+  organizationId,
+  hostGroupId,
+  pluginValues,
+  pluginData,
+  onChange,
+  handleInvalidField,
+  isLoading,
+}) => {
+  useEffect(() => {
+    onChange({ activationKeys: [] });
+  }, [onChange, organizationId, hostGroupId]);
+
+  return (
+    <ActivationKeys
+      activationKeys={pluginData?.activationKeys}
+      organizationId={organizationId}
+      selectedKeys={(pluginValues?.activationKeys || [])}
+      hostGroupActivationKeys={pluginData?.hostGroupActivationKeys}
+      hostGroupId={hostGroupId}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      handleInvalidField={handleInvalidField}
+      isLoading={isLoading}
+    />
+  );
+};
+
+RegistrationActivationKeys.propTypes = {
+  organizationId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  pluginData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  onChange: PropTypes.func,
+  handleInvalidField: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+RegistrationActivationKeys.defaultProps = {
+  organizationId: undefined,
+  hostGroupId: undefined,
+  pluginValues: {},
+  pluginData: {},
+  isLoading: false,
+  onChange: noop,
+  handleInvalidField: noop,
+};