foreman_rh_cloud 13.0.8 → 13.0.10

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);
+  }
+}

data/webpack/ForemanInventoryUpload/Components/TaskProgress/TaskProgress.js

@@ -0,0 +1,340 @@
+/* eslint-disable max-lines */
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import {
+  Progress,
+  ProgressVariant,
+  Card,
+  CardTitle,
+  CardBody,
+  DescriptionList,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListDescription,
+  Button,
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  Title,
+  Flex,
+  FlexItem,
+  Tooltip,
+} from '@patternfly/react-core';
+import { ClockIcon, DownloadIcon } from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import { API } from 'foremanReact/redux/API';
+import { addToast } from 'foremanReact/components/ToastsList';
+import { useDispatch, useSelector } from 'react-redux';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
+import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
+import './taskProgress.scss';
+
+const TaskProgress = ({
+  task,
+  title,
+  emptyMessage,
+  organizationId,
+  taskType,
+  onTaskStart,
+}) => {
+  const dispatch = useDispatch();
+  const [isLoading, setIsLoading] = useState(false);
+  const [lastTaskId, setLastTaskId] = useState(null);
+
+  // Clear lastTaskId when the task data updates to match it
+  useEffect(() => {
+    if (lastTaskId && task?.id === lastTaskId) {
+      setLastTaskId(null);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [task?.id, lastTaskId]);
+
+  // Track when a new task starts so we can show optimistic UI
+  // Show optimistic UI if we've started a new task but haven't received the updated task data yet
+  const isStartingNewTask = lastTaskId && task?.id !== lastTaskId;
+
+  // Check IoP mode and subscription connection settings
+  const subscriptionConnectionEnabled = useSelector(
+    selectSubscriptionConnectionEnabled
+  );
+  const isIop = Boolean(useIopConfig());
+  const isUploadDisabled = !isIop && !subscriptionConnectionEnabled;
+  const uploadDisabledTooltip = __(
+    'Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content.'
+  );
+
+  // Helper to render action buttons for generate tasks
+  const renderGenerateButtons = (buttonsDisabled, ouiaIdSuffix = '') => {
+    if (taskType !== 'generate' || !organizationId) return null;
+
+    return (
+      <>
+        <FlexItem>
+          {isUploadDisabled ? (
+            <Tooltip content={uploadDisabledTooltip}>
+              <span>
+                <Button
+                  ouiaId={`generate-and-upload-disabled-button${ouiaIdSuffix}`}
+                  variant="primary"
+                  onClick={() => handleGenerateReport(false)}
+                  isDisabled
+                >
+                  {__('Generate and upload report')}
+                </Button>
+              </span>
+            </Tooltip>
+          ) : (
+            <Button
+              ouiaId={`generate-and-upload-button${ouiaIdSuffix}`}
+              variant="primary"
+              onClick={() => handleGenerateReport(false)}
+              isDisabled={buttonsDisabled}
+            >
+              {__('Generate and upload report')}
+            </Button>
+          )}
+        </FlexItem>
+        <FlexItem>
+          <Button
+            ouiaId={`generate-report-button${ouiaIdSuffix}`}
+            variant="secondary"
+            onClick={() => handleGenerateReport(true)}
+            isDisabled={buttonsDisabled}
+          >
+            {__('Generate report')}
+          </Button>
+        </FlexItem>
+      </>
+    );
+  };
+
+  const handleGenerateReport = async disconnected => {
+    setIsLoading(true);
+    try {
+      const { data } = await API.post(
+        inventoryUrl(`${organizationId}/reports`),
+        {
+          disconnected,
+        }
+      );
+
+      // Validate API response
+      if (!data || !data.id) {
+        throw new Error(__('Invalid response from server'));
+      }
+
+      // Update last task ID only if it's a new task
+      if (data.id !== task?.id) {
+        setLastTaskId(data.id);
+      }
+
+      // Trigger immediate poll to update UI faster
+      if (onTaskStart) {
+        onTaskStart();
+      }
+
+      // Use Foreman's toast notification with task link
+      const message = disconnected
+        ? __('Report generation started')
+        : __('Report generation and upload started');
+
+      dispatch(
+        addToast({
+          type: 'success',
+          message,
+          link: (
+            <a href={`/foreman_tasks/tasks/${data.id}`}>{__('View task')}</a>
+          ),
+        })
+      );
+    } catch (error) {
+      dispatch(
+        addToast({
+          sticky: true,
+          type: 'error',
+          message: error.message,
+        })
+      );
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleDownloadReport = () => {
+    window.location.href = `/api/v2/organizations/${organizationId}/rh_cloud/report`;
+  };
+
+  if (!task) {
+    return (
+      <EmptyState>
+        <EmptyStateIcon icon={ClockIcon} />
+        <Title headingLevel="h4" size="lg" ouiaId="task-progress-empty-title">
+          {__('No recent tasks')}
+        </Title>
+        <EmptyStateBody>
+          {emptyMessage || __('No tasks have been run yet.')}
+        </EmptyStateBody>
+        <Flex className="task-progress-actions">
+          {renderGenerateButtons(isLoading)}
+        </Flex>
+      </EmptyState>
+    );
+  }
+
+  const getProgressVariant = () => {
+    if (task.state !== 'stopped') return ProgressVariant.info;
+    if (task.result === 'success') return ProgressVariant.success;
+    if (task.result === 'error') return ProgressVariant.danger;
+    if (task.result === 'warning') return ProgressVariant.warning;
+    return ProgressVariant.info;
+  };
+
+  const getStateLabel = () => {
+    if (task.state === 'running') return __('Running');
+    if (task.state === 'paused') return __('Paused');
+    if (task.state === 'stopped') {
+      if (task.result === 'success') return __('Completed');
+      if (task.result === 'error') return __('Failed');
+      if (task.result === 'warning') return __('Completed with warnings');
+      return __('Stopped');
+    }
+    return task.state;
+  };
+
+  const formatDuration = seconds => {
+    if (
+      seconds === null ||
+      seconds === undefined ||
+      typeof seconds !== 'number' ||
+      Number.isNaN(seconds) ||
+      seconds < 0
+    ) {
+      return '';
+    }
+    const mins = Math.floor(seconds / 60);
+    const secs = Math.floor(seconds % 60);
+    if (mins > 0) {
+      return `${mins}m ${secs}s`;
+    }
+    return `${secs}s`;
+  };
+
+  const isTaskRunning = task.state === 'running' || task.state === 'paused';
+
+  // Buttons should be disabled if loading, task is running, or we're waiting for new task data
+  const areButtonsDisabled = isLoading || isTaskRunning || isStartingNewTask;
+
+  // Show 100% for completed tasks, otherwise use reported progress
+  // If starting a new task, show 0% to give immediate feedback
+  let progressValue = 0;
+  if (isStartingNewTask) {
+    progressValue = 0;
+  } else if (task.state === 'stopped') {
+    progressValue = 100;
+  } else {
+    progressValue = task.progress || 0;
+  }
+
+  // Override state label and variant when starting new task
+  const displayStateLabel = isStartingNewTask ? __('Running') : getStateLabel();
+  const displayVariant = isStartingNewTask
+    ? ProgressVariant.info
+    : getProgressVariant();
+
+  return (
+    <Card className="task-progress-card" ouiaId="task-progress-card">
+      {title && <CardTitle>{title}</CardTitle>}
+      <CardBody>
+        <Progress
+          value={progressValue}
+          title={displayStateLabel}
+          variant={displayVariant}
+          measureLocation="outside"
+          aria-label="task-progress"
+        />
+        <DescriptionList
+          isHorizontal
+          className="task-progress-details"
+          ouiaId="task-progress-details"
+        >
+          <DescriptionListGroup>
+            <DescriptionListTerm>{__('Started')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {!isStartingNewTask && task.started_at && (
+                <RelativeDateTime date={task.started_at} />
+              )}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{__('Duration')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {!isStartingNewTask && formatDuration(task.duration)}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+          <DescriptionListGroup>
+            <DescriptionListTerm>{__('Report saved to')}</DescriptionListTerm>
+            <DescriptionListDescription>
+              {!isStartingNewTask && task.report_file_path}
+            </DescriptionListDescription>
+          </DescriptionListGroup>
+        </DescriptionList>
+        <Flex className="task-progress-actions">
+          <FlexItem>
+            <Button
+              ouiaId="view-task-details-button"
+              component="a"
+              href={`/foreman_tasks/tasks/${task.id}`}
+              variant="link"
+              isInline
+            >
+              {__('View task details')}
+            </Button>
+          </FlexItem>
+          <FlexItem>
+            <Button
+              ouiaId="download-report-button"
+              variant="secondary"
+              onClick={handleDownloadReport}
+              icon={<DownloadIcon />}
+              isDisabled={!task.report_file_path || areButtonsDisabled}
+            >
+              {__('Download report')}
+            </Button>
+          </FlexItem>
+          {renderGenerateButtons(areButtonsDisabled, '-task-view')}
+        </Flex>
+      </CardBody>
+    </Card>
+  );
+};
+
+TaskProgress.propTypes = {
+  task: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    state: PropTypes.string.isRequired,
+    result: PropTypes.string,
+    progress: PropTypes.number,
+    started_at: PropTypes.string,
+    ended_at: PropTypes.string,
+    duration: PropTypes.number,
+    report_file_path: PropTypes.string,
+  }),
+  title: PropTypes.string,
+  emptyMessage: PropTypes.string,
+  organizationId: PropTypes.number,
+  taskType: PropTypes.oneOf(['generate', 'upload']),
+  onTaskStart: PropTypes.func,
+};
+
+TaskProgress.defaultProps = {
+  task: null,
+  title: null,
+  emptyMessage: null,
+  organizationId: null,
+  taskType: null,
+  onTaskStart: null,
+};
+
+export default TaskProgress;

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

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

data/webpack/ForemanInventoryUpload/Components/TaskProgress/taskProgress.scss

@@ -0,0 +1,8 @@
+.task-progress-card {
+  margin-bottom: 1rem;
+
+  .task-progress-details {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+  }
+}

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -7,13 +7,13 @@ export const inventoryUrl = path =>
 export const getInventoryDocsUrl = () =>
   foremanUrl(
     `/links/manual/?root_url=${URI.encode(
-      'https://access.redhat.com/documentation/en-us/red_hat_insights/2023/html/red_hat_insights_remediations_guide/host-communication-with-insights_red-hat-insights-remediation-guide#uploading-satellite-host-inventory-to-insights_configuring-satellite-cloud-connector'
+      'https://docs.redhat.com/en/documentation/red_hat_lightspeed/1-latest/html-single/red_hat_lightspeed_remediations_guide/index'
     )}`
   );
 
 export const getActionsHistoryUrl = () =>
   foremanUrl(
-    '/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
+    '/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AHostInventoryReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
   );
 
 export const isExitCodeLoading = exitCode => {

data/webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js

@@ -1,12 +1,10 @@
 import { combineReducers } from 'redux';
 import { reducers as accountListReducers } from './Components/AccountList';
-import { reducers as dashboardReducers } from './Components/Dashboard';
 import { reducers as filterReducers } from './Components/InventoryFilter';
 
 export default {
   inventoryUpload: combineReducers({
     ...accountListReducers,
-    ...dashboardReducers,
     ...filterReducers,
   }),
 };

data/webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap

@@ -2,4 +2,4 @@
 
 exports[`ForemanInventoryUpload helpers should return inventory Url 1`] = `"/foreman_inventory_upload/test_path"`;
 
-exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/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"`;
+exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/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"`;

data/webpack/ForemanRhCloudPages.js

@@ -1,4 +1,3 @@
-/* eslint-disable spellcheck/spell-checker */
 import React from 'react';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerRoutes as foremanRegisterRoutes } from 'foremanReact/routes/RoutingService';

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTable.test.js

@@ -1,26 +1,18 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 import InsightsTable from '../InsightsTable';
 import { tableProps } from './fixtures';
 
-jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
-  useForemanContext: () => ({
-    metadata: {
-      foreman_rh_cloud: {
-        iop: true,
-      },
-    },
-  }),
-  useForemanSettings: () => ({
-    perPage: 20,
-  }),
-}));
+jest.mock('../../../../common/Hooks/ConfigHooks');
 
-const fixtures = {
-  'render with Props': tableProps,
-};
+const { renderWithStore } = rtlHelpers;
 
 describe('InsightsTable', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(InsightsTable, fixtures));
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders without crashing', () => {
+    renderWithStore(<InsightsTable {...tableProps} />);
+  });
 });

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js

@@ -25,11 +25,11 @@ export const modifyRows = (
   ).map(({ id, host_id, hostname, title, resolutions, reboot }) => {
     hostsIdsToSubmit.add(host_id);
     const selectedResolution = resolutions[0]?.id;
-    /* eslint-disable spellcheck/spell-checker */
 
     // For IoP:
     // All of the values will be plain strings
     // {
+    // eslint-disable-next-line spellcheck/spell-checker
     //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d", <-- this refers to a host by insights ID
     //  rule_id: "hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE",
     //  resolution_type: "less_secure",
@@ -41,7 +41,6 @@ export const modifyRows = (
     // rule_id refers to an InsightsRule
     // resolution_type and resolution_id both refer to an InsightsResolution (InsightsHit.find(xx).rule.resolutions)
 
-    /* eslint-enable spellcheck/spell-checker */
     resolutionToSubmit.push({
       hit_id: isIop ? host_id : id,
       rule_id: id,

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js

@@ -18,11 +18,10 @@ import TableEmptyState from '../../../common/table/EmptyState';
 import './RemediationModal.scss';
 import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 
-/* eslint-disable spellcheck/spell-checker */
-
 // Sample iopData:
 // const iopTestData = Immutable([
 //   {
+//     eslint-disable-next-line spellcheck/spell-checker
 //     hostid: 'c7c6727e-2966-4f7c-87f1-20ef14db7a2d',
 //     host_name: 'advisor-test.local',
 //     rulename: 'hardening_cryptopol_krb5|NO_CPOL_KRB5',
@@ -38,6 +37,7 @@ import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 //     description: 'Decreased security: krb5 crypto-policies overridden',
 //   },
 //   {
+//     eslint-disable-next-line spellcheck/spell-checker
 //     hostid: 'c7c6727e-2966-4f7c-87f1-20ef14db7a2d',
 //     host_name: 'advisor-test.local',
 //     rulename: 'hardening_logging_auditd|HARDENING_LOGGING_5_AUDITD',
@@ -54,8 +54,6 @@ import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 //   },
 // ]);
 
-/* eslint-enable spellcheck/spell-checker */
-
 const RemediationModal = ({
   iopData,
   selectedIds,