foreman_rh_cloud 13.0.9 → 13.0.10

data/webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.js

@@ -8,19 +8,12 @@ import {
   TabContent,
   TabPane,
   Icon,
-  noop,
 } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './navContainer.scss';
-import FullScreenModal from '../FullScreenModal';
 import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 
-const NavContainer = ({
-  items,
-  showFullScreen,
-  toggleFullScreen,
-  terminalProps,
-}) => {
+const NavContainer = ({ items }) => {
   const subscriptionConnectionEnabled = useSelector(
     selectSubscriptionConnectionEnabled
   );
@@ -50,11 +43,6 @@ const NavContainer = ({
       <div className="dashboard">
         <Nav bsClass="nav nav-tabs nav-tabs-pf">{navItems}</Nav>
         <TabContent animation>{tabComponents}</TabContent>
-        <FullScreenModal
-          showFullScreen={showFullScreen}
-          toggleFullScreen={toggleFullScreen}
-          terminalProps={terminalProps}
-        />
       </div>
     </TabContainer>
   );
@@ -69,23 +57,10 @@ NavContainer.propTypes = {
       onClick: PropTypes.func,
     })
   ),
-  showFullScreen: PropTypes.bool,
-  toggleFullScreen: PropTypes.func,
-  terminalProps: PropTypes.shape({
-    exitCode: PropTypes.string,
-    logs: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.string,
-    ]),
-    error: PropTypes.string,
-  }),
 };
 
 NavContainer.defaultProps = {
   items: [],
-  showFullScreen: false,
-  toggleFullScreen: noop,
-  terminalProps: {},
 };
 
 export default NavContainer;

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap

@@ -24,7 +24,7 @@ exports[`PageTitle rendering render without Props 1`] = `
       dropdownItems={
         Array [
           <DropdownItem
-            href="/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
+            href="/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AHostInventoryReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
             ouiaId="tasks-history-button"
             rel="noopener noreferrer"
             target="_blank"
@@ -32,7 +32,7 @@ exports[`PageTitle rendering render without Props 1`] = `
             Actions history
           </DropdownItem>,
           <DropdownItem
-            href="/links/manual/?root_url=https%3A%2F%2Faccess.redhat.com%2Fdocumentation%2Fen-us%2Fred_hat_insights%2F2023%2Fhtml%2Fred_hat_insights_remediations_guide%2Fhost-communication-with-insights_red-hat-insights-remediation-guide%23uploading-satellite-host-inventory-to-insights_configuring-satellite-cloud-connector"
+            href="/links/manual/?root_url=https%3A%2F%2Fdocs.redhat.com%2Fen%2Fdocumentation%2Fred_hat_lightspeed%2F1-latest%2Fhtml-single%2Fred_hat_lightspeed_remediations_guide%2Findex"
             ouiaId="inventory-documentation-button"
             rel="noopener noreferrer"
             target="_blank"

data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -2,10 +2,12 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Grid, Button, Icon } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 import './tabHeader.scss';
 
 const TabHeader = ({
@@ -18,10 +20,23 @@ const TabHeader = ({
   const subscriptionConnectionEnabled = useSelector(
     selectSubscriptionConnectionEnabled
   );
+  const isIop = Boolean(useIopConfig());
   const buttonGenerateLabel = subscriptionConnectionEnabled
     ? __('Generate and upload report')
     : __('Generate report');
 
+  const isUploadDisabled = !isIop && !subscriptionConnectionEnabled;
+  const isButtonDisabled = isExitCodeLoading(exitCode) || isUploadDisabled;
+  const tooltipContent = __(
+    'Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content.'
+  );
+
+  const generateButton = onRestart ? (
+    <Button bsStyle="primary" onClick={onRestart} disabled={isButtonDisabled}>
+      {buttonGenerateLabel}
+    </Button>
+  ) : null;
+
   return (
     <Grid.Row className="tab-header">
       <Grid.Col sm={6}>
@@ -29,15 +44,13 @@ const TabHeader = ({
       </Grid.Col>
       <Grid.Col sm={6}>
         <div className="tab-action-buttons">
-          {onRestart ? (
-            <Button
-              bsStyle="primary"
-              onClick={onRestart}
-              disabled={isExitCodeLoading(exitCode)}
-            >
-              {buttonGenerateLabel}
-            </Button>
-          ) : null}
+          {generateButton && isUploadDisabled ? (
+            <Tooltip content={tooltipContent}>
+              <div style={{ display: 'inline-block' }}>{generateButton}</div>
+            </Tooltip>
+          ) : (
+            generateButton
+          )}
           {onDownload ? (
             <Button onClick={onDownload} disabled={downloadButtonDisabled()}>
               {__('Download Report')} <Icon name="download" />

data/webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/TabHeader.test.js

@@ -4,13 +4,21 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { screen, render } from '@testing-library/react';
 import { noop } from 'foremanReact/common/helpers';
+import * as ConfigHooks from '../../../../common/Hooks/ConfigHooks';
 import TabHeader from '../TabHeader';
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock('../../../../common/Hooks/ConfigHooks');
+
 describe('TabHeader', () => {
-  test('when subscription connection is enabled', () => {
+  beforeEach(() => {
+    ConfigHooks.useIopConfig = jest.fn();
+  });
+
+  test('when subscription connection is enabled and not IoP', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(false);
     const renderOptions = {
       API: {
         INVENTORY_SETTINGS: {
@@ -20,16 +28,19 @@ describe('TabHeader', () => {
     };
     const store = mockStore(renderOptions);
 
-    render(
+    const { container } = render(
       <Provider store={store}>
         <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
       </Provider>
     );
     expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
     expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
   });
 
-  test('when subscription connection is not enabled', () => {
+  test('when subscription connection is not enabled and not IoP - button is disabled with tooltip', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(false);
     const renderOptions = {
       API: {
         INVENTORY_SETTINGS: {
@@ -39,7 +50,7 @@ describe('TabHeader', () => {
     };
     const store = mockStore(renderOptions);
 
-    render(
+    const { container } = render(
       <Provider store={store}>
         <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
       </Provider>
@@ -47,5 +58,57 @@ describe('TabHeader', () => {
 
     expect(screen.queryAllByText('Generate report')).toHaveLength(1);
     expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(true);
+
+    // Verify button is wrapped in a div for tooltip (Patternfly requirement)
+    // The tooltip content prop is passed but not rendered in the DOM until hover
+    const wrapper = button.parentElement;
+    expect(wrapper.tagName).toBe('DIV');
+    expect(wrapper.style.display).toBe('inline-block');
+  });
+
+  test('when subscription connection is not enabled but IoP is enabled - button is enabled', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(true);
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: false },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    const { container } = render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate report')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
+  });
+
+  test('when IoP is enabled and subscription connection is enabled - button is enabled', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(true);
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    const { container } = render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
   });
 });

data/webpack/ForemanInventoryUpload/Components/TaskHistory/TaskHistory.js

@@ -0,0 +1,140 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  DataList,
+  DataListItem,
+  DataListItemRow,
+  DataListItemCells,
+  DataListCell,
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  Title,
+} from '@patternfly/react-core';
+import {
+  CheckCircleIcon,
+  ExclamationCircleIcon,
+  ExclamationTriangleIcon,
+} from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import './taskHistory.scss';
+
+const TaskHistory = ({ tasks, title }) => {
+  if (!tasks || tasks.length === 0) {
+    return (
+      <EmptyState>
+        <EmptyStateIcon icon={CheckCircleIcon} />
+        <Title headingLevel="h4" size="lg" ouiaId="task-history-empty-title">
+          {__('No task history')}
+        </Title>
+        <EmptyStateBody>
+          {__('Previous tasks will appear here.')}
+        </EmptyStateBody>
+      </EmptyState>
+    );
+  }
+
+  const getResultIcon = result => {
+    if (result === 'success') {
+      return <CheckCircleIcon className="task-history-icon-success" />;
+    }
+    if (result === 'error') {
+      return <ExclamationCircleIcon className="task-history-icon-error" />;
+    }
+    if (result === 'warning') {
+      return <ExclamationTriangleIcon className="task-history-icon-warning" />;
+    }
+    return null;
+  };
+
+  const formatDuration = seconds => {
+    if (!Number.isFinite(seconds) || seconds < 0) {
+      return __('N/A');
+    }
+    const mins = Math.floor(seconds / 60);
+    const secs = Math.floor(seconds % 60);
+    if (mins > 0) {
+      return `${mins}m ${secs}s`;
+    }
+    return `${secs}s`;
+  };
+
+  const getResultLabel = result => {
+    if (result === 'success') return __('Success');
+    if (result === 'error') return __('Failed');
+    if (result === 'warning') return __('Warning');
+    return result || __('Unknown');
+  };
+
+  return (
+    <div className="task-history-container">
+      {title && (
+        <Title headingLevel="h3" size="md" ouiaId="task-history-title">
+          {title}
+        </Title>
+      )}
+      <DataList aria-label="task history" className="task-history-list">
+        {tasks.map(task => (
+          <DataListItem key={task.id} aria-labelledby={`task-${task.id}`}>
+            <DataListItemRow>
+              <DataListItemCells
+                dataListCells={[
+                  <DataListCell key="icon" className="task-history-icon-cell">
+                    {getResultIcon(task.result)}
+                  </DataListCell>,
+                  <DataListCell key="time" className="task-history-time-cell">
+                    <RelativeDateTime date={task.started_at} />
+                  </DataListCell>,
+                  <DataListCell
+                    key="result"
+                    className="task-history-result-cell"
+                  >
+                    {getResultLabel(task.result)}
+                  </DataListCell>,
+                  <DataListCell
+                    key="duration"
+                    className="task-history-duration-cell"
+                  >
+                    {formatDuration(task.duration)}
+                  </DataListCell>,
+                  <DataListCell key="link" className="task-history-link-cell">
+                    <a href={`/foreman_tasks/tasks/${task.id}`}>
+                      {__('Details')}
+                    </a>
+                  </DataListCell>,
+                ]}
+              />
+            </DataListItemRow>
+          </DataListItem>
+        ))}
+      </DataList>
+    </div>
+  );
+};
+
+TaskHistory.propTypes = {
+  tasks: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      label: PropTypes.string,
+      action: PropTypes.string,
+      state: PropTypes.string,
+      result: PropTypes.string,
+      progress: PropTypes.number,
+      started_at: PropTypes.string,
+      ended_at: PropTypes.string,
+      duration: PropTypes.number,
+      humanized: PropTypes.object,
+      report_file_path: PropTypes.string,
+    })
+  ),
+  title: PropTypes.string,
+};
+
+TaskHistory.defaultProps = {
+  tasks: [],
+  title: null,
+};
+
+export default TaskHistory;

data/webpack/ForemanInventoryUpload/Components/TaskHistory/index.js

@@ -0,0 +1 @@
+export { default } from './TaskHistory';

data/webpack/ForemanInventoryUpload/Components/TaskHistory/taskHistory.scss

@@ -0,0 +1,40 @@
+.task-history-container {
+  margin-top: 2rem;
+
+  .task-history-list {
+    margin-top: 1rem;
+  }
+
+  .task-history-icon-cell {
+    width: 40px;
+  }
+
+  .task-history-time-cell {
+    flex: 2;
+  }
+
+  .task-history-result-cell {
+    flex: 1;
+  }
+
+  .task-history-duration-cell {
+    flex: 1;
+  }
+
+  .task-history-link-cell {
+    flex: 1;
+    text-align: right;
+  }
+
+  .task-history-icon-success {
+    color: var(--pf-global--success-color--100);
+  }
+
+  .task-history-icon-error {
+    color: var(--pf-global--danger-color--100);
+  }
+
+  .task-history-icon-warning {
+    color: var(--pf-global--warning-color--100);
+  }
+}