foreman_rh_cloud 13.0.8 → 13.0.10

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/ListItemStatus.js

@@ -5,21 +5,17 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { getStatusIconByRegex } from './ListItemStatusHelper';
 
 const ListItemStatus = ({ account }) => {
-  const generatingStatusIcon = getStatusIconByRegex(
-    account.generate_report_status
-  );
-  const uploadingStatusIcon = getStatusIconByRegex(
-    account.upload_report_status
-  );
+  const generatedStatusIcon = getStatusIconByRegex(account.generated_status);
+  const uploadedStatusIcon = getStatusIconByRegex(account.uploaded_status);
   return (
     <Grid hasGutter className="status">
       <GridItem span={6} className="item">
-        <p>{__('Generating')}</p>
-        {generatingStatusIcon}
+        <p>{__('Generated')}</p>
+        {generatedStatusIcon}
       </GridItem>
       <GridItem span={6} className="item">
-        <p>{__('Uploading')}</p>
-        {uploadingStatusIcon}
+        <p>{__('Uploaded')}</p>
+        {uploadedStatusIcon}
       </GridItem>
     </Grid>
   );
@@ -27,15 +23,15 @@ const ListItemStatus = ({ account }) => {
 
 ListItemStatus.propTypes = {
   account: PropTypes.shape({
-    generate_report_status: PropTypes.string,
-    upload_report_status: PropTypes.string,
+    generated_status: PropTypes.string,
+    uploaded_status: PropTypes.string,
   }),
 };
 
 ListItemStatus.defaultProps = {
   account: {
-    generate_report_status: 'unknown',
-    uploupload_report_statusading: 'unknown',
+    generated_status: 'unknown',
+    uploaded_status: 'unknown',
   },
 };
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/ListItemStatusHelper.js

@@ -14,17 +14,22 @@ export const getStatusIconByRegex = status => {
     return STATUS_ICONS.unknown;
   }
 
-  const statusCopy = status.toLowerCase();
-  if (statusCopy.indexOf('exit 0') !== -1) {
+  const statusLower = status.toLowerCase();
+
+  // Success states
+  if (statusLower === 'success') {
     return STATUS_ICONS.success;
   }
 
+  // Running states
   if (
-    statusCopy.indexOf('running') !== -1 ||
-    statusCopy.indexOf('restarting') !== -1
+    statusLower === 'running' ||
+    statusLower === 'pending' ||
+    statusLower === 'scheduled'
   ) {
     return STATUS_ICONS.running;
   }
 
+  // Failure states (error, warning, or anything else)
   return STATUS_ICONS.failure;
 };

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/__snapshots__/ListItemStatus.test.js.snap

@@ -10,7 +10,7 @@ exports[`ListItemStatus rendering render with Props 1`] = `
     span={6}
   >
     <p>
-      Generating
+      Generated
     </p>
     <CheckIcon />
   </GridItem>
@@ -19,7 +19,7 @@ exports[`ListItemStatus rendering render with Props 1`] = `
     span={6}
   >
     <p>
-      Uploading
+      Uploaded
     </p>
     <Spinner
       size="sm"
@@ -38,7 +38,7 @@ exports[`ListItemStatus rendering render without Props 1`] = `
     span={6}
   >
     <p>
-      Generating
+      Generated
     </p>
     <span>
       --
@@ -49,7 +49,7 @@ exports[`ListItemStatus rendering render without Props 1`] = `
     span={6}
   >
     <p>
-      Uploading
+      Uploaded
     </p>
     <span>
       --

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountList.test.js.snap

@@ -7,35 +7,41 @@ exports[`AccountList rendering render with props 1`] = `
   <ListItem
     account={
       Object {
-        "generate_report_status": "running",
+        "generated_status": "running",
         "id": 1,
-        "upload_report_status": "running",
+        "uploaded_status": "running",
       }
     }
-    key="0"
+    defaultExpanded={true}
+    key="Account1"
     label="Account1"
+    onTaskStart={[Function]}
   />
   <ListItem
     account={
       Object {
-        "generate_report_status": "failure",
+        "generated_status": "failure",
         "id": 2,
-        "upload_report_status": "unknown",
+        "uploaded_status": "unknown",
       }
     }
-    key="1"
+    defaultExpanded={false}
+    key="Account2"
     label="Account2"
+    onTaskStart={[Function]}
   />
   <ListItem
     account={
       Object {
-        "generate_report_status": "running",
+        "generated_status": "running",
         "id": 3,
-        "upload_report_status": "success",
+        "uploaded_status": "success",
       }
     }
-    key="2"
+    defaultExpanded={false}
+    key="Account3"
     label="Account3"
+    onTaskStart={[Function]}
   />
 </Accordion>
 `;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListActions.test.js.snap

@@ -13,19 +13,19 @@ Array [
         },
         "accounts": Object {
           "Account1": Object {
-            "generate_report_status": "running",
+            "generated_status": "running",
             "id": 1,
-            "upload_report_status": "running",
+            "uploaded_status": "running",
           },
           "Account2": Object {
-            "generate_report_status": "failure",
+            "generated_status": "failure",
             "id": 2,
-            "upload_report_status": "unknown",
+            "uploaded_status": "unknown",
           },
           "Account3": Object {
-            "generate_report_status": "running",
+            "generated_status": "running",
             "id": 3,
-            "upload_report_status": "success",
+            "uploaded_status": "success",
           },
         },
       },
@@ -58,7 +58,7 @@ Array [
     Object {
       "payload": Object {
         "accountID": "some-account-ID",
-        "processStatusName": "generate_report_status",
+        "processStatusName": "generated_status",
       },
       "type": "INVENTORY_PROCESS_RESTART",
     },

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap

@@ -10,19 +10,19 @@ Object {
   },
   "accounts": Object {
     "Account1": Object {
-      "generate_report_status": "running",
+      "generated_status": "running",
       "id": 1,
-      "upload_report_status": "running",
+      "uploaded_status": "running",
     },
     "Account2": Object {
-      "generate_report_status": "failure",
+      "generated_status": "failure",
       "id": 2,
-      "upload_report_status": "unknown",
+      "uploaded_status": "unknown",
     },
     "Account3": Object {
-      "generate_report_status": "running",
+      "generated_status": "running",
       "id": 3,
-      "upload_report_status": "success",
+      "uploaded_status": "success",
     },
   },
   "error": null,

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap

@@ -3,19 +3,19 @@
 exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
-    "generate_report_status": "running",
+    "generated_status": "running",
     "id": 1,
-    "upload_report_status": "running",
+    "uploaded_status": "running",
   },
   "Account2": Object {
-    "generate_report_status": "failure",
+    "generated_status": "failure",
     "id": 2,
-    "upload_report_status": "unknown",
+    "uploaded_status": "unknown",
   },
   "Account3": Object {
-    "generate_report_status": "running",
+    "generated_status": "running",
     "id": 3,
-    "upload_report_status": "success",
+    "uploaded_status": "success",
   },
 }
 `;
@@ -26,19 +26,19 @@ exports[`AccountList selectors should return AccountsList 1`] = `
 Object {
   "accounts": Object {
     "Account1": Object {
-      "generate_report_status": "running",
+      "generated_status": "running",
       "id": 1,
-      "upload_report_status": "running",
+      "uploaded_status": "running",
     },
     "Account2": Object {
-      "generate_report_status": "failure",
+      "generated_status": "failure",
       "id": 2,
-      "upload_report_status": "unknown",
+      "uploaded_status": "unknown",
     },
     "Account3": Object {
-      "generate_report_status": "running",
+      "generated_status": "running",
       "id": 3,
-      "upload_report_status": "success",
+      "uploaded_status": "success",
     },
   },
   "pollingProcessID": 0,

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js

@@ -1,149 +1,56 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
-import ReportGenerate from '../ReportGenerate';
-import ReportUpload from '../ReportUpload';
-import NavContainer from '../NavContainer';
+import TaskProgress from '../TaskProgress';
 import './dashboard.scss';
 
-class Dashboard extends React.Component {
-  componentDidMount() {
-    const { startPolling, fetchLogs, accountID } = this.props;
-    fetchLogs(accountID);
-    const pollingProcessID = setInterval(() => fetchLogs(accountID), 5000);
-    startPolling(accountID, pollingProcessID);
-  }
-
-  componentWillUnmount() {
-    const { stopPolling, pollingProcessID, accountID } = this.props;
-    stopPolling(accountID, pollingProcessID);
-  }
-
-  handleDownload = () => {
-    const { downloadReports, accountID } = this.props;
-    downloadReports(accountID);
-  };
-
-  handleRestart = () => {
-    const { restartProcess, accountID, activeTab } = this.props;
-    restartProcess(accountID, activeTab);
-  };
-
-  handleTabChange = async tabName => {
-    const { setActiveTab, accountID, fetchLogs } = this.props;
-    await setActiveTab(accountID, tabName);
-    fetchLogs(accountID);
-  };
-
-  handleToggleFullScreen = () => {
-    const { toggleFullScreen, accountID } = this.props;
-    toggleFullScreen(accountID);
-  };
-
-  render() {
-    const {
-      uploading,
-      generating,
-      account,
-      showFullScreen,
-      activeTab,
-    } = this.props;
-    const downloadButtonDisabled = () => account.report_file_paths.length === 0;
+const Dashboard = ({ account, onTaskStart }) => {
+  // Defensive handling for missing or malformed account data
+  if (!account) {
     return (
-      <NavContainer
-        items={[
-          {
-            icon: 'database',
-            name: __('Generating'),
-            component: ReportGenerate,
-            props: {
-              ...generating,
-              restartProcess: this.handleRestart,
-              exitCode: account.generate_report_status,
-              downloadReports: this.handleDownload,
-              downloadButtonDisabled,
-              toggleFullScreen: this.handleToggleFullScreen,
-            },
-            onClick: () => this.handleTabChange('generating'),
-          },
-          {
-            icon: 'cloud-upload',
-            name: __('Uploading'),
-            component: ReportUpload,
-            props: {
-              ...uploading,
-              exitCode: account.upload_report_status,
-              toggleFullScreen: this.handleToggleFullScreen,
-            },
-            onClick: () => this.handleTabChange('uploading'),
-          },
-        ]}
-        toggleFullScreen={this.handleToggleFullScreen}
-        showFullScreen={showFullScreen}
-        terminalProps={this.props[activeTab]}
+      <TaskProgress
+        task={null}
+        title={__('Report Generation')}
+        emptyMessage={__('No account data available.')}
+        organizationId={null}
+        taskType="generate"
+        onTaskStart={onTaskStart}
       />
     );
   }
-}
+
+  return (
+    <TaskProgress
+      task={account.generate_task || null}
+      title={__('Report Generation')}
+      emptyMessage={__('No report generation tasks have been run yet.')}
+      organizationId={account.id || null}
+      taskType="generate"
+      onTaskStart={onTaskStart}
+    />
+  );
+};
 
 Dashboard.propTypes = {
-  accountID: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-    .isRequired,
-  startPolling: PropTypes.func,
-  fetchLogs: PropTypes.func,
-  stopPolling: PropTypes.func,
-  setActiveTab: PropTypes.func,
-  uploading: PropTypes.shape({
-    exitCode: PropTypes.string,
-    logs: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.string,
-    ]),
-    completed: PropTypes.number,
-    files: PropTypes.arrayOf(PropTypes.string),
-    error: PropTypes.string,
-  }),
-  generating: PropTypes.shape({
-    exitCode: PropTypes.string,
-    logs: PropTypes.oneOfType([
-      PropTypes.arrayOf(PropTypes.string),
-      PropTypes.string,
-    ]),
-    completed: PropTypes.number,
-    error: PropTypes.string,
-  }),
-  restartProcess: PropTypes.func,
-  downloadReports: PropTypes.func,
-  pollingProcessID: PropTypes.number,
   account: PropTypes.shape({
-    generate_report_status: PropTypes.string,
-    upload_report_status: PropTypes.string,
-    report_file_paths: PropTypes.arrayOf(PropTypes.string),
+    id: PropTypes.number,
+    generate_task: PropTypes.shape({
+      id: PropTypes.string,
+      state: PropTypes.string,
+      result: PropTypes.string,
+      progress: PropTypes.number,
+      started_at: PropTypes.string,
+      ended_at: PropTypes.string,
+      duration: PropTypes.number,
+      report_file_path: PropTypes.string,
+    }),
   }),
-  showFullScreen: PropTypes.bool,
-  toggleFullScreen: PropTypes.func,
-  activeTab: PropTypes.string,
+  onTaskStart: PropTypes.func,
 };
 
 Dashboard.defaultProps = {
-  uploading: {},
-  generating: {},
-  startPolling: noop,
-  fetchLogs: noop,
-  stopPolling: noop,
-  setActiveTab: noop,
-  restartProcess: noop,
-  downloadReports: noop,
-  pollingProcessID: 0,
-  account: {
-    generate_report_status: 'unknown',
-    upload_report_status: 'unknown',
-    report_file_paths: [],
-  },
-  showFullScreen: false,
-  toggleFullScreen: noop,
-  activeTab: 'generating',
+  account: null,
+  onTaskStart: null,
 };
 
 export default Dashboard;

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

@@ -1,24 +1,67 @@
 import React from 'react';
-import { shallow, testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { shallow } from '@theforeman/test';
 import Dashboard from '../Dashboard';
-import { props } from '../Dashboard.fixtures';
-
-const fixtures = {
-  'with props': props,
-};
 
 describe('Dashboard', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(Dashboard, fixtures));
-
-  it('componentWillUnmount should call "stopPolling"', () => {
-    const stopPolling = jest.fn();
-    const modifiedProps = {
-      ...props,
-      stopPolling,
+  it('should render TaskProgress component with correct props', () => {
+    const account = {
+      id: 1,
+      generate_task: {
+        id: 'task-1',
+        state: 'running',
+        result: null,
+        progress: 50,
+      },
     };
-    const wrapper = shallow(<Dashboard {...modifiedProps} />);
-    wrapper.unmount();
-    expect(stopPolling).toBeCalled();
+    const onTaskStart = jest.fn();
+
+    const wrapper = shallow(
+      <Dashboard account={account} onTaskStart={onTaskStart} />
+    );
+
+    const taskProgress = wrapper.find('TaskProgress');
+    expect(taskProgress).toHaveLength(1);
+    expect(taskProgress.prop('task')).toEqual(account.generate_task);
+    expect(taskProgress.prop('title')).toBe('Report Generation');
+    expect(taskProgress.prop('organizationId')).toBe(1);
+    expect(taskProgress.prop('taskType')).toBe('generate');
+    expect(taskProgress.prop('onTaskStart')).toBe(onTaskStart);
+  });
+
+  it('should handle missing account gracefully', () => {
+    const wrapper = shallow(<Dashboard account={null} onTaskStart={null} />);
+
+    const taskProgress = wrapper.find('TaskProgress');
+    expect(taskProgress).toHaveLength(1);
+    expect(taskProgress.prop('task')).toBeNull();
+    expect(taskProgress.prop('organizationId')).toBeNull();
+    expect(taskProgress.prop('emptyMessage')).toBe(
+      'No account data available.'
+    );
+  });
+
+  it('should handle missing generate_task gracefully', () => {
+    const account = { id: 1, generate_task: null };
+    const wrapper = shallow(<Dashboard account={account} onTaskStart={null} />);
+
+    const taskProgress = wrapper.find('TaskProgress');
+    expect(taskProgress).toHaveLength(1);
+    expect(taskProgress.prop('task')).toBeNull();
+    expect(taskProgress.prop('organizationId')).toBe(1);
+  });
+
+  it('should handle missing account.id gracefully', () => {
+    const account = {
+      generate_task: {
+        id: 'task-1',
+        state: 'running',
+      },
+    };
+    const wrapper = shallow(<Dashboard account={account} onTaskStart={null} />);
+
+    const taskProgress = wrapper.find('TaskProgress');
+    expect(taskProgress).toHaveLength(1);
+    expect(taskProgress.prop('organizationId')).toBeNull();
+    expect(taskProgress.prop('task')).toEqual(account.generate_task);
   });
 });

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

@@ -1,34 +1 @@
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-
-import * as actions from './DashboardActions';
-import { restartProcess } from '../AccountList/AccountListActions';
-import reducer from './DashboardReducer';
-
-import Dashboard from './Dashboard';
-import {
-  selectUploading,
-  selectGenerating,
-  selectPollingProcessID,
-  selectActiveTab,
-  selectShowFullScreen,
-} from './DashboardSelectors';
-
-// map state to props
-const mapStateToProps = (state, { accountID }) => ({
-  uploading: selectUploading(state, accountID),
-  generating: selectGenerating(state, accountID),
-  pollingProcessID: selectPollingProcessID(state, accountID),
-  activeTab: selectActiveTab(state, accountID),
-  showFullScreen: selectShowFullScreen(state, accountID),
-});
-
-// map action dispatchers to props
-const mapDispatchToProps = dispatch =>
-  bindActionCreators({ ...actions, restartProcess }, dispatch);
-
-// export reducers
-export const reducers = { dashboard: reducer };
-
-// export connected component
-export default connect(mapStateToProps, mapDispatchToProps)(Dashboard);
+export { default } from './Dashboard';

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -33,7 +33,6 @@ Object {
           "error": null,
           "pollingProcessID": 0,
         },
-        "dashboard": Object {},
         "inventoryFilter": Object {
           "filterTerm": "some-org",
         },

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;