katello 4.3.0.rc4 → 4.4.0.rc2

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

@@ -20,9 +20,10 @@ import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { enableRepoSetRepo, disableRepoSetRepo, resetRepoSetRepo, getHostRepositorySets } from './RepositorySetsActions';
 import { selectRepositorySetsStatus } from './RepositorySetsSelectors';
 import { selectHostDetailsStatus } from '../../HostDetailsSelectors.js';
-import { useBulkSelect } from '../../../../../components/Table/TableHooks';
+import { useBulkSelect, useUrlParams } from '../../../../../components/Table/TableHooks';
 import { REPOSITORY_SETS_KEY } from './RepositorySetsConstants.js';
 import './RepositorySetsTab.scss';
+import hostIdNotReady from '../../HostDetailsActions';
 
 const getEnabledValue = ({ enabled, enabledContentOverride }) => {
   const isOverridden = (enabledContentOverride !== null);
@@ -78,11 +79,12 @@ const RepositorySetsTab = () => {
     lifecycleEnvironmentLibrary === false;
   const simpleContentAccess = (Number(subscriptionStatus) === 5);
   const dispatch = useDispatch();
+  const { searchParam, show } = useUrlParams();
   const toggleGroupStates = ['noLimit', 'limitToEnvironment'];
   const [noLimit, limitToEnvironment] = toggleGroupStates;
   const defaultToggleGroupState = nonLibraryHost ? limitToEnvironment : noLimit;
   const [toggleGroupState, setToggleGroupState] =
-    useState(defaultToggleGroupState);
+    useState(show ?? defaultToggleGroupState);
   const [alertShowing, setAlertShowing] = useState(false);
   const emptyContentTitle = __('No repository sets to show.');
   const emptyContentBody = __('Repository sets will appear here when available.');
@@ -101,7 +103,7 @@ const RepositorySetsTab = () => {
         content_access_mode_all: simpleContentAccess,
         host_id: hostId,
         ...params,
-      }) : null),
+      }) : hostIdNotReady),
     [hostId, toggleGroupState, limitToEnvironment, simpleContentAccess],
   );
 
@@ -115,6 +117,7 @@ const RepositorySetsTab = () => {
     results,
     metadata,
     isSelectable: () => false,
+    initialSearchQuery: searchParam || '',
   });
 
   const hostDetailsStatus = useSelector(state => selectHostDetailsStatus(state));
@@ -241,18 +244,18 @@ const RepositorySetsTab = () => {
         </div>
         <TableWrapper
           {...{
-                metadata,
-                emptyContentTitle,
-                emptyContentBody,
-                emptySearchTitle,
-                emptySearchBody,
-                status,
-                searchQuery,
-                updateSearchQuery,
-                selectedCount,
-                selectNone,
-                toggleGroup,
-                }
+            metadata,
+            emptyContentTitle,
+            emptyContentBody,
+            emptySearchTitle,
+            emptySearchBody,
+            status,
+            searchQuery,
+            updateSearchQuery,
+            selectedCount,
+            selectNone,
+            toggleGroup,
+          }
           }
           activeFilters={[toggleGroupState]}
           defaultFilters={[defaultToggleGroupState]}
@@ -291,12 +294,12 @@ const RepositorySetsTab = () => {
                 <Tbody key={`${id}_${repoPath}`}>
                   <Tr>
                     <Td select={{
-                        disable: !isSelectable(id),
-                        isSelected: isSelected(id),
-                        onSelect: (event, selected) => selectOne(selected, id),
-                        rowIndex,
-                        variant: 'checkbox',
-                        }}
+                      disable: !isSelectable(id),
+                      isSelected: isSelected(id),
+                      onSelect: (event, selected) => selectOne(selected, id),
+                      rowIndex,
+                      variant: 'checkbox',
+                    }}
                     />
                     <Td>
                       <span>{repoName}</span>
@@ -313,30 +316,30 @@ const RepositorySetsTab = () => {
                     <Td
                       key={`rowActions-${id}`}
                       actions={{
-                          items: [
-                            {
-                              title: __('Override to disabled'),
-                              isDisabled: isOverridden && !isEnabled,
-                              onClick: () => overrideToDisabled({ labels: [label] }),
-                            },
-                            {
-                              title: __('Override to enabled'),
-                              isDisabled: isOverridden && isEnabled,
-                              onClick: () => overrideToEnabled({ labels: [label] }),
-                            },
-                            {
-                              title: __('Reset to default'),
-                              isDisabled: !isOverridden,
-                              onClick: () => resetToDefault({ labels: [label] }),
-                            },
-                          ],
-                        }}
+                        items: [
+                          {
+                            title: __('Override to disabled'),
+                            isDisabled: isOverridden && !isEnabled,
+                            onClick: () => overrideToDisabled({ labels: [label] }),
+                          },
+                          {
+                            title: __('Override to enabled'),
+                            isDisabled: isOverridden && isEnabled,
+                            onClick: () => overrideToEnabled({ labels: [label] }),
+                          },
+                          {
+                            title: __('Reset to default'),
+                            isDisabled: !isOverridden,
+                            onClick: () => resetToDefault({ labels: [label] }),
+                          },
+                        ],
+                      }}
                     />
                   </Tr>
                 </Tbody>
-                );
-              })
-              }
+              );
+            })
+            }
           </>
         </TableWrapper>
       </div>

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

@@ -1,7 +1,7 @@
 #repo-sets-tab .content-header .repo-sets-alert {
-  margin: 15px 24px;
+  margin: 16px 24px;
 }
 
-#repo-sets-tab .content-header > .repo-sets-blurb {
-  margin: 15px 24px;
+#repo-sets-tab .content-header>.repo-sets-blurb {
+  margin: 16px 24px;
 }

data/webpack/components/extensions/HostDetails/Tabs/{EnableTracerModal.js → TracesTab/EnableTracerModal.js}

@@ -15,7 +15,8 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { useSelector, useDispatch } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import { installTracerPackage } from './HostTracesActions';
-import { katelloPackageInstallUrl } from './customizedRexUrlHelpers';
+import { katelloPackageInstallUrl } from '../customizedRexUrlHelpers';
+import { KATELLO_TRACER_PACKAGE } from './HostTracesConstants';
 
 const EnableTracerModal = ({ isOpen, setIsOpen }) => {
   const title = __('Enable Tracer');
@@ -43,7 +44,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
     <DropdownItem key={`option_${text}`} onClick={() => setSelectedOption(text)}>{text}</DropdownItem>
   ));
 
-  const customizedRexUrl = katelloPackageInstallUrl({ hostname });
+  const customizedRexUrl = katelloPackageInstallUrl({ hostname, packages: KATELLO_TRACER_PACKAGE });
 
   const getEnableTracerButton = () => {
     const [viaRex] = dropdownOptions;

data/webpack/components/extensions/HostDetails/Tabs/{HostTracesActions.js → TracesTab/HostTracesActions.js}

@@ -3,8 +3,8 @@ import {
   HOST_TRACES_KEY,
   KATELLO_TRACER_PACKAGE,
 } from './HostTracesConstants';
-import { installPackage } from './RemoteExecutionActions';
-import { foremanApi } from '../../../../services/api';
+import { installPackage } from '../RemoteExecutionActions';
+import { foremanApi } from '../../../../../services/api';
 
 export const getHostTraces = (hostId, params) => get({
   type: API_OPERATIONS.GET,

data/webpack/components/extensions/HostDetails/Tabs/{TracesTab.js → TracesTab/TracesTab.js}

@@ -1,18 +1,21 @@
 import React, { useState, useCallback } from 'react';
-import { Skeleton, Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
-  DropdownItem, KebabToggle } from '@patternfly/react-core';
+import {
+  Skeleton, Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
+  DropdownItem, KebabToggle,
+} from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { useSelector, useDispatch } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import EnableTracerEmptyState from './EnableTracerEmptyState';
-import TableWrapper from '../../../Table/TableWrapper';
-import { useBulkSelect } from '../../../Table/TableHooks';
+import TableWrapper from '../../../../Table/TableWrapper';
+import { useBulkSelect, useUrlParams } from '../../../../Table/TableHooks';
 import { getHostTraces } from './HostTracesActions';
-import { resolveTraces } from './RemoteExecutionActions';
+import { resolveTraces } from '../RemoteExecutionActions';
 import { selectHostTracesStatus } from './HostTracesSelectors';
-import { resolveTraceUrl } from './customizedRexUrlHelpers';
+import { resolveTraceUrl } from '../customizedRexUrlHelpers';
 import './TracesTab.scss';
+import hostIdNotReady from '../../HostDetailsActions';
 
 const TracesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
@@ -29,9 +32,10 @@ const TracesTab = () => {
   const emptySearchBody = __('Try changing your search settings.');
   const fetchItems = useCallback(
     params =>
-      (hostId ? getHostTraces(hostId, params) : null),
+      (hostId ? getHostTraces(hostId, params) : hostIdNotReady),
     [hostId],
   );
+  const { searchParam } = useUrlParams();
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
   const toggleBulkAction = () => setIsBulkActionOpen(prev => !prev);
   const response = useSelector(state => selectAPIResponse(state, 'HOST_TRACES'));
@@ -44,6 +48,7 @@ const TracesTab = () => {
     results,
     metadata: meta,
     isSelectable: result => !!result.restart_command,
+    initialSearchQuery: searchParam || '',
   });
 
 
@@ -111,19 +116,19 @@ const TracesTab = () => {
       <h3>{__('Tracer helps administrators identify applications that need to be restarted after a system is patched.')}</h3>
       <TableWrapper
         {...{
-                emptyContentTitle,
-                emptyContentBody,
-                emptySearchTitle,
-                emptySearchBody,
-                status,
-                searchQuery,
-                updateSearchQuery,
-                selectedCount,
-                selectNone,
-                fetchItems,
-                actionButtons,
-                }
-          }
+          emptyContentTitle,
+          emptyContentBody,
+          emptySearchTitle,
+          emptySearchBody,
+          status,
+          searchQuery,
+          updateSearchQuery,
+          selectedCount,
+          selectNone,
+          fetchItems,
+          actionButtons,
+        }
+        }
         metadata={meta}
         autocompleteEndpoint={`/hosts/${hostId}/traces/auto_complete_search`}
         foremanApiAutoComplete
@@ -143,49 +148,49 @@ const TracesTab = () => {
         </Thead>
         <Tbody>
           {results?.map((result, rowIndex) => {
-          const {
-            id,
-            application,
-            helper,
-            app_type: appType,
-          } = result;
-          const resolveDisabled = !isSelectable(id);
-          let rowDropdownItems = [
-            { title: 'Restart via remote execution', onClick: () => onRestartApp(id) },
-            {
-              component: 'a', href: resolveTraceUrl({ hostname, search: tracesSearchQuery(id) }), title: 'Restart via customized remote execution',
-            },
-          ];
-          if (resolveDisabled) {
-            rowDropdownItems = [
-              { isDisabled: true, title: __('Traces that require logout cannot be restarted remotely') },
+            const {
+              id,
+              application,
+              helper,
+              app_type: appType,
+            } = result;
+            const resolveDisabled = !isSelectable(id);
+            let rowDropdownItems = [
+              { title: 'Restart via remote execution', onClick: () => onRestartApp(id) },
+              {
+                component: 'a', href: resolveTraceUrl({ hostname, search: tracesSearchQuery(id) }), title: 'Restart via customized remote execution',
+              },
             ];
-          }
-          return (
-            <Tr key={id} >
-              <Td select={{
-                disable: resolveDisabled,
-                props: {
-                  'aria-label': `check-${application}`,
-                },
-                isSelected: isSelected(id),
-                onSelect: (event, selected) => selectOne(selected, id),
-                rowIndex,
-                variant: 'checkbox',
-              }}
-              />
-              <Td>{application}</Td>
-              <Td>{appType}</Td>
-              <Td>{helper}</Td>
-              <Td
-                actions={{
-                  items: rowDropdownItems,
+            if (resolveDisabled) {
+              rowDropdownItems = [
+                { isDisabled: true, title: __('Traces that require logout cannot be restarted remotely') },
+              ];
+            }
+            return (
+              <Tr key={id} >
+                <Td select={{
+                  disable: resolveDisabled,
+                  props: {
+                    'aria-label': `check-${application}`,
+                  },
+                  isSelected: isSelected(id),
+                  onSelect: (event, selected) => selectOne(selected, id),
+                  rowIndex,
+                  variant: 'checkbox',
                 }}
-              />
-            </Tr>
-          );
-         })
-         }
+                />
+                <Td>{application}</Td>
+                <Td>{appType}</Td>
+                <Td>{helper}</Td>
+                <Td
+                  actions={{
+                    items: rowDropdownItems,
+                  }}
+                />
+              </Tr>
+            );
+          })
+          }
         </Tbody>
       </TableWrapper>
     </div>

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

@@ -0,0 +1,11 @@
+#traces-tab {
+  margin: 16px 0;
+
+  h3 {
+    margin: 0 24px 16px;
+  }
+}
+
+#traces-alert {
+  margin: 16px 24px;
+}

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

@@ -3,9 +3,9 @@ import { isEqual } from 'lodash';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_ERRATA_KEY, ERRATA_SEARCH_QUERY } from '../../HostErrata/HostErrataConstants';
+import { HOST_ERRATA_KEY, ERRATA_SEARCH_QUERY } from '../ErrataTab/HostErrataConstants';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
-import { ErrataTab } from '../ErrataTab';
+import { ErrataTab } from '../ErrataTab/ErrataTab.js';
 import mockErrataData from './errata.fixtures.json';
 import mockResolveErrataTask from './resolveErrata.fixtures.json';
 
@@ -81,11 +81,10 @@ let searchDelayScope;
 let autoSearchScope;
 
 beforeEach(() => {
-  // jest.resetModules();
   const { results } = mockErrataData;
   [firstErrata, , thirdErrata] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {
@@ -813,7 +812,7 @@ test('apply button chooses katello agent if enabled', async (done) => {
     <ErrataTab />,
     options,
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
 
   getByLabelText('Select row 0').click();
@@ -855,7 +854,7 @@ test('Can bulk apply via katello agent', async (done) => {
     <ErrataTab />,
     options,
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
 
   getByLabelText('Select row 0').click();
@@ -874,7 +873,7 @@ test('Can bulk apply via katello agent', async (done) => {
 
 test('Can select all, exclude and bulk apply via katello agent', async (done) => {
   // This is the same test as above,
-  // but using the table action bar instead of the Restart app button
+  // but using the table action bar instead of the Apply button
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
   const { results } = mockErrata;
@@ -902,12 +901,12 @@ test('Can select all, exclude and bulk apply via katello agent', async (done) =>
     <ErrataTab />,
     options,
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   const selectAllCheckbox = getByLabelText('Select all');
   selectAllCheckbox.click();
 
-  getByLabelText('Select row 0').click(); // de select
+  getByLabelText('Select row 0').click(); // deselect
 
   const actionMenu = getByLabelText('bulk_actions');
   actionMenu.click();
@@ -948,7 +947,7 @@ test('Apply button chooses remote execution', async (done) => {
     <ErrataTab />,
     options,
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
 
   getByLabelText('Select row 0').click();
@@ -981,9 +980,9 @@ test('Can bulk apply via remote execution', async (done) => {
   // eslint-disable-next-line camelcase
   const jobInvocationBody = ({ job_invocation: { inputs, feature, search_query } }) =>
     inputs[ERRATA_SEARCH_QUERY] === `errata_id ^ (${results[0].errata_id},${results[1].errata_id})` &&
-     feature === REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL &&
-     // eslint-disable-next-line camelcase
-     search_query === `name ^ (${hostName})`;
+    feature === REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH &&
+    // eslint-disable-next-line camelcase
+    search_query === `name ^ (${hostName})`;
 
   const resolveErrataScope = nockInstance
     .post(jobInvocations, jobInvocationBody)
@@ -993,7 +992,7 @@ test('Can bulk apply via remote execution', async (done) => {
     <ErrataTab />,
     renderOptions(),
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
 
   getByLabelText('Select row 0').click();
@@ -1038,7 +1037,7 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
     <ErrataTab />,
     renderOptions(),
   );
-    // Assert that the errata are now showing on the screen, but wait for them to appear.
+  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   const selectAllCheckbox = getByLabelText('Select all');
   selectAllCheckbox.click();
@@ -1076,7 +1075,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   getByLabelText('Select row 0').click();
   getByLabelText('Select row 1').click();
   const errata = `${results[0].errata_id},${results[1].errata_id}`;
-  const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL;
+  const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH;
   const actionMenu = getByLabelText('bulk_actions');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via customized remote execution');
@@ -1176,7 +1175,7 @@ test('Can apply a single erratum to the host via customized remote execution', a
   const mockErrata = makeMockErrata({});
   const { results } = mockErrata;
   const { errata_id: errataId } = results[0];
-  const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL;
+  const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH;
   const scope = nockInstance
     .get(hostErrata)
     .query(defaultQuery)