Add ability to generate report without uploading

app/controllers/concerns/inventory_upload/report_actions.rb

@@ -10,7 +10,7 @@ def initialize(**params)
       end
     end
 
-    def start_report_generation(organization_id)
+    def start_report_generation(organization_id, disconnected)
       ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id)
     end
 

app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -21,8 +21,9 @@ def last
 
     def generate
       organization_id = params[:organization_id]
+      disconnected = params[:disconnected]
 
-      start_report_generation(organization_id)
+      start_report_generation(organization_id, disconnected)
 
       render json: {
         action_status: 'success',

lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -5,7 +5,7 @@ def self.output_label(label)
         "report_for_#{label}"
       end
 
-      def plan(base_folder, organization_id)
+      def plan(base_folder, organization_id, disconnected)
         sequence do
           super(
             GenerateReportJob.output_label(organization_id),
@@ -18,7 +18,7 @@ def plan(base_folder, organization_id)
             base_folder,
             ForemanInventoryUpload.facts_archive_name(organization_id),
             organization_id
-          )
+          ) unless disconnected
         end
       end
 

webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -40,6 +40,40 @@ export const stopAccountStatusPolling = pollingProcessID => dispatch => {
   });
 };
 
+export const restartDisconnected = (accountID, activeTab) => async dispatch => {
+  let processController = null;
+  let processStatusName = null;
+  let disconnected = true
+
+  if (activeTab === 'uploading') {
+    processController = 'uploads';
+    processStatusName = 'upload_report_status';
+  } else {
+    processController = 'reports';
+    processStatusName = 'generate_report_status';
+  }
+
+  try {
+    await API.post(inventoryUrl(`${accountID}/${processController}`));
+    dispatch({
+      type: INVENTORY_PROCESS_RESTART,
+      payload: {
+        accountID,
+        disconnected,
+        processStatusName,
+      },
+    });
+  } catch (error) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message: error.message,
+      })
+    );
+  }
+};
+
 export const restartProcess = (accountID, activeTab) => async dispatch => {
   let processController = null;
   let processStatusName = null;

webpack/ForemanInventoryUpload/Components/Dashboard/index.js

@@ -2,7 +2,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as actions from './DashboardActions';
-import { restartProcess } from '../AccountList/AccountListActions';
+import { restartProcess, restartDisconnected } from '../AccountList/AccountListActions';
 import reducer from './DashboardReducer';
 
 import Dashboard from './Dashboard';
@@ -25,7 +25,7 @@ const mapStateToProps = (state, { accountID }) => ({
 
 // map action dispatchers to props
 const mapDispatchToProps = dispatch =>
-  bindActionCreators({ ...actions, restartProcess }, dispatch);
+  bindActionCreators({ ...actions, restartProcess, restartDisconnected }, dispatch);
 
 // export reducers
 export const reducers = { dashboard: reducer };

webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js

@@ -4,13 +4,15 @@ export const exitCode = 'exit 0';
 export const logs = ['No running process'];
 export const completed = 0;
 export const restartProcess = noop;
+export const restartDisconnected = noop;
 export const error = null;
 export const scheduled = '2019-08-21T16:14:16.520+03:00';
 export const props = {
   exitCode,
   logs,
   completed,
   restartProcess,
+  restartDisconnected,
   error,
   scheduled,
 };

webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js

@@ -12,13 +12,15 @@ const ReportGenerate = ({
   completed,
   error,
   restartProcess,
+  restartDisconnected,
   toggleFullScreen,
   scheduled,
 }) => (
   <TabContainer className="report-generate">
     <TabHeader
       exitCode={exitCode}
       onRestart={restartProcess}
+      restartDisconnected={restartDisconnected}
       toggleFullScreen={toggleFullScreen}
     />
     <TabBody
@@ -39,6 +41,7 @@ ReportGenerate.propTypes = {
   ]),
   completed: PropTypes.number,
   error: PropTypes.string,
+  restartDisconnected: PropTypes.func,
   restartProcess: PropTypes.func,
   toggleFullScreen: PropTypes.func,
   scheduled: PropTypes.string,
@@ -50,6 +53,7 @@ ReportGenerate.defaultProps = {
   completed: 0,
   error: null,
   restartProcess: noop,
+  restartDisconnected: noop,
   toggleFullScreen: noop,
   scheduled: null,
 };

webpack/ForemanInventoryUpload/Components/ReportUpload/ReportUpload.fixtures.js

@@ -5,6 +5,7 @@ export const exitCode = 'exit 0';
 export const logs = ['No running process'];
 export const completed = 0;
 export const restartProcess = noop;
+export const restartDisconnected = noop;
 export const downloadReports = noop;
 export const error = null;
 export const props = {
@@ -13,6 +14,7 @@ export const props = {
   logs,
   completed,
   restartProcess,
+  restartDisconnected,
   downloadReports,
   error,
 };

webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -1,26 +1,57 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Grid, Button, Icon } from 'patternfly-react';
+import { Grid, Button, Icon, DropdownItem, Dropdown, DropdownToggle, DropdownToggleAction } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 import './tabHeader.scss';
 
-const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
+const onActionToggle = () => {
+  setIsActionOpen(prev => !prev);
+};
+
+const dropdownItems = [
+  <DropdownItem
+    aria-label="restart_disconnected"
+    ouiaId="restart_disconnected"
+    key="restart_disconnected"
+    component="button"
+    onClick={restartDisconnected}
+    isDisabled={isExitCodeLoading(exitCode)}
+  >
+    {__('Restart without uploading')}
+  </DropdownItem>,
+];
+
+const TabHeader = ({ exitCode, onRestart, onDownload, restartDisconnected, toggleFullScreen }) => (
   <Grid.Row className="tab-header">
     <Grid.Col sm={6}>
       <p>{sprintf(__('Exit Code: %s'), exitCode)}</p>
     </Grid.Col>
     <Grid.Col sm={6}>
       <div className="tab-action-buttons">
         {onRestart ? (
-          <Button
-            bsStyle="primary"
-            onClick={onRestart}
-            disabled={isExitCodeLoading(exitCode)}
-          >
-            {__('Restart')}
-          </Button>
+          <Dropdown
+          aria-label="restart_dropdown"
+          ouiaId="restart_dropdown"
+          toggle={
+            <DropdownToggle
+              aria-label="restart_report_toggle"
+              ouiaId="restart_report_toggle"
+              splitButtonItems={[
+                <DropdownToggleAction key="action" aria-label="bulk_actions" onClick={onRestart}>
+                  {__('Restart')}
+                </DropdownToggleAction>,
+              ]}
+              splitButtonVariant="action"
+              toggleVariant="primary"
+              onToggle={onActionToggle}
+              isDisabled={isExitCodeLoading(exitCode)}
+            />
+        }
+          isOpen={isActionOpen}
+          dropdownItems={dropdownItems}
+        />
         ) : null}
         {onDownload ? (
           <Button onClick={onDownload}>