foreman_rh_cloud 3.0.18.1 → 4.0.21.1

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonConstants.js

@@ -1,3 +1,3 @@
-export const INVENTORY_SYNC_REQUEST = 'INVENTORY_SYNC_REQUEST';
-export const INVENTORY_SYNC_SUCCESS = 'INVENTORY_SYNC_SUCCESS';
-export const INVENTORY_SYNC_ERROR = 'INVENTORY_SYNC_ERROR';
+export const INVENTORY_SYNC = 'INVENTORY_SYNC';
+
+export const INVENTORY_SYNC_TASK_UPDATE = 'INVENTORY_SYNC_TASK_UPDATE';

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonSelectors.js

@@ -1,13 +1,7 @@
-import { selectForemanInventoryUpload } from '../../../../../ForemanRhCloudSelectors';
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { INVENTORY_SYNC_TASK_UPDATE } from './SyncButtonConstants';
 
-export const selectInventorySync = state =>
-  selectForemanInventoryUpload(state).inventorySync;
-
-export const selectStatus = state => selectInventorySync(state).status;
-
-export const selectError = state => selectInventorySync(state).error;
-
-export const selectSyncHosts = state => selectInventorySync(state).syncHosts;
-
-export const selectDisconnectHosts = state =>
-  selectInventorySync(state).disconnectHosts;
+export const selectTaskStatus = state => {
+  const { result } = selectAPIResponse(state, INVENTORY_SYNC_TASK_UPDATE);
+  return typeof result === 'string' ? result.toUpperCase() : null;
+};

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonFixtures.js

@@ -1,9 +1 @@
-export const syncHosts = 1;
-
-export const disconnectHosts = 0;
-
-export const successResponse = { data: { syncHosts, disconnectHosts } };
-
-export const status = 'RESOLVED';
-
-export const error = 'some-error';
+export const successResponse = { data: { task: { id: 1 } } };

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonSelectors.test.js

@@ -1,35 +1,26 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { inventoryStateWrapper } from '../../../../../../ForemanRhCloudTestHelpers';
-import {
-  status,
-  error,
-  syncHosts,
-  disconnectHosts,
-} from './SyncButtonFixtures';
-import {
-  selectInventorySync,
-  selectStatus,
-  selectError,
-  selectSyncHosts,
-  selectDisconnectHosts,
-} from '../SyncButtonSelectors';
+import { selectTaskStatus } from '../SyncButtonSelectors';
 
-const state = inventoryStateWrapper({
-  inventorySync: {
-    status,
-    error,
-    syncHosts,
-    disconnectHosts,
+const state = {
+  API: {
+    INVENTORY_SYNC_TASK_UPDATE: {
+      response: {
+        endedAt: '2021-03-08T14:27:30.718+02:00',
+        output: {
+          host_statuses: {
+            sync: 0,
+            disconnect: 2,
+          },
+        },
+        result: 'pending',
+      },
+      status: 'RESOLVED',
+    },
   },
-});
+};
 
 const fixtures = {
-  'should return InventorySync': () => selectInventorySync(state),
-  'should return InventorySync status': () => selectStatus(state),
-  'should return InventorySync error': () => selectError(state),
-  'should return InventorySync SyncHosts': () => selectSyncHosts(state),
-  'should return InventorySync disconnectHosts': () =>
-    selectDisconnectHosts(state),
+  'should return InventorySync status': () => selectTaskStatus(state),
 };
 
 describe('SyncButton selectors', () =>

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonSelectors.test.js.snap

@@ -1,18 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SyncButton selectors should return InventorySync 1`] = `
-Object {
-  "disconnectHosts": 0,
-  "error": "some-error",
-  "status": "RESOLVED",
-  "syncHosts": 1,
-}
-`;
-
-exports[`SyncButton selectors should return InventorySync SyncHosts 1`] = `1`;
-
-exports[`SyncButton selectors should return InventorySync disconnectHosts 1`] = `0`;
-
-exports[`SyncButton selectors should return InventorySync error 1`] = `"some-error"`;
-
-exports[`SyncButton selectors should return InventorySync status 1`] = `"RESOLVED"`;
+exports[`SyncButton selectors should return InventorySync status 1`] = `"PENDING"`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/integrations.test.js.snap

@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SyncButton integration test Successful task was triggered on the server resulting in an info toast and polling on the task: handleSync was called 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": <Toast
+            disconnectHosts={2}
+            syncHosts={0}
+          />,
+          "sticky": true,
+          "type": "success",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "errorToast": [Function],
+      "interval": 3000,
+      "type": "API_GET",
+      "url": "/foreman_inventory_upload/tasks/1",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": <span>
+            Inventory sync has started:
+             
+            <a
+              href="/foreman_tasks/tasks/1"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              view the task page for more details
+            </a>
+          </span>,
+          "sticky": false,
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "errorToast": [Function],
+      "type": "API_POST",
+      "url": "/foreman_inventory_upload/tasks",
+    },
+  ],
+]
+`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/integrations.test.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import { IntegrationTestHelper } from '@theforeman/test';
+import * as API from 'foremanReact/redux/API';
+import { noop } from 'foremanReact/common/helpers';
+import SyncButton from '../index';
+import { successResponse } from './SyncButtonFixtures';
+import {
+  INVENTORY_SYNC,
+  INVENTORY_SYNC_TASK_UPDATE,
+} from '../SyncButtonConstants';
+
+jest.spyOn(API, 'post');
+jest.spyOn(API, 'get');
+
+describe('SyncButton integration test', () => {
+  it('Successful task was triggered on the server resulting in an info toast and polling on the task', async () => {
+    API.post.mockImplementation(({ handleSuccess = noop, key, ...action }) => {
+      if (key === INVENTORY_SYNC) {
+        handleSuccess(successResponse);
+      }
+      return { type: 'API_POST', ...action };
+    });
+    API.get.mockImplementation(({ handleSuccess = noop, key, ...action }) => {
+      if (key === INVENTORY_SYNC_TASK_UPDATE) {
+        handleSuccess(
+          {
+            data: {
+              endedAt: '2021-03-22T15:59:02.468+02:00',
+              output: {
+                host_statuses: {
+                  sync: 0,
+                  disconnect: 2,
+                },
+              },
+              result: 'success',
+            },
+          },
+          jest.fn
+        );
+      }
+      return { type: 'API_GET', ...action };
+    });
+
+    const integrationTestHelper = new IntegrationTestHelper();
+    const wrapper = integrationTestHelper.mount(<SyncButton />);
+    const instance = wrapper.find('SyncButton').instance();
+    instance.props.handleSync();
+    await IntegrationTestHelper.flushAllPromises();
+    integrationTestHelper.takeActionsSnapshot('handleSync was called');
+  });
+});

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js

@@ -2,21 +2,18 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as actions from './SyncButtonActions';
-import reducer from './SyncButtonReducer';
 import SyncButton from './SyncButton';
 import { selectCloudToken } from '../../../InventorySettings/InventorySettingsSelectors';
-import { selectStatus } from './SyncButtonSelectors';
+import { selectTaskStatus } from './SyncButtonSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
   cloudToken: selectCloudToken(state),
-  status: selectStatus(state),
+  status: selectTaskStatus(state),
 });
 
 // map action dispatchers to props
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
-export const reducers = { inventorySync: reducer };
-
 // export connected component
 export default connect(mapStateToProps, mapDispatchToProps)(SyncButton);

data/webpack/ForemanInventoryUpload/Components/Terminal/Terminal.js

@@ -72,7 +72,7 @@ class Terminal extends React.Component {
     return (
       <Grid.Col sm={12}>
         <div
-          className="terminal"
+          className="rh-cloud-inventory-terminal"
           ref={this.terminal}
           onScroll={this.handleScroll}
         >

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

@@ -29,6 +29,6 @@ describe('Terminal', () => {
     const text = 'some-string-log';
     const modifiedProps = { ...props, logs: text };
     const wrapper = mount(<Terminal {...modifiedProps} />);
-    expect(wrapper.find('.terminal p').text()).toEqual(text);
+    expect(wrapper.find('.rh-cloud-inventory-terminal p').text()).toEqual(text);
   });
 });

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

@@ -7,7 +7,7 @@ exports[`Terminal rendering render with props 1`] = `
   sm={12}
 >
   <div
-    className="terminal"
+    className="rh-cloud-inventory-terminal"
     onScroll={[Function]}
   >
     <Grid
@@ -65,7 +65,7 @@ exports[`Terminal rendering render without Props 1`] = `
   sm={12}
 >
   <div
-    className="terminal"
+    className="rh-cloud-inventory-terminal"
     onScroll={[Function]}
   >
     <Grid

data/webpack/ForemanInventoryUpload/Components/Terminal/terminal.scss

@@ -1,34 +1,32 @@
-.rh-cloud-inventory-page {
-  .terminal {
-    height: 200px;
-    background-color: #222;
-    padding: 10px 0;
-    margin-bottom: 20px;
-    overflow-y: scroll;
-    overflow-x: hidden;
+.rh-cloud-inventory-terminal {
+  height: 200px;
+  background-color: #222;
+  padding: 10px 0;
+  margin-bottom: 20px;
+  overflow-y: scroll;
+  overflow-x: hidden;
 
-    p {
-      font-family: monospace;
-      font-size: 16px;
-      color: #22da26;
-      overflow-wrap: anywhere;
+  p {
+    font-family: monospace;
+    font-size: 16px;
+    color: #22da26;
+    overflow-wrap: anywhere;
 
-      &.terminal_error {
-        color: #f00;
-      }
+    &.terminal_error {
+      color: #f00;
     }
+  }
 
-    &::-webkit-scrollbar {
-      width: 12px;
-      height: 12px;
-      background: #aaa;
-    }
+  &::-webkit-scrollbar {
+    width: 12px;
+    height: 12px;
+    background: #aaa;
+  }
 
-    &::-webkit-scrollbar-thumb {
-      background: #222;
-      border-radius: 6px;
-      border: 3px solid transparent;
-      background-clip: content-box;
-    }
+  &::-webkit-scrollbar-thumb {
+    background: #222;
+    border-radius: 6px;
+    border: 3px solid transparent;
+    background-clip: content-box;
   }
 }

data/webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js

@@ -2,13 +2,11 @@ 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';
-import { reducers as inventorySyncReducers } from './Components/PageHeader/components/SyncButton';
 
 export default {
   inventoryUpload: combineReducers({
     ...accountListReducers,
     ...dashboardReducers,
     ...filterReducers,
-    ...inventorySyncReducers,
   }),
 };

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

@@ -6,7 +6,7 @@ import { Table, TableHeader, TableBody } from '@patternfly/react-table';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import SelectAllAlert from './SelectAllAlert';
 import { columns } from './InsightsTableConstants';
-import TableEmptyState from './components/EmptyState';
+import TableEmptyState from '../../../common/table/EmptyState';
 import {
   modifySelectedRows,
   getSortColumnIndex,

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors.js

@@ -76,3 +76,6 @@ export const selectItemCount = state =>
 
 export const selectHasToken = state =>
   selectAPIResponse(state, INSIGHTS_HITS_API_KEY).hasToken;
+
+export const selectExperimental = state =>
+  selectAPIResponse(state, INSIGHTS_HITS_API_KEY).isExperimentalMode;

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

@@ -61,6 +61,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     expandId="expandable-toggle"
     gridBreakPoint="grid-md"
     isStickyHeader={false}
+    isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
     ouiaSafe={true}
@@ -137,6 +138,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
         "currPage": "Current page",
         "items": "",
         "itemsPerPage": "Items per page",
+        "ofWord": "of",
         "optionsToggle": "Items per page",
         "page": "",
         "paginationTitle": "Pagination",

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

@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { isEmpty } from 'lodash';
+import { Button, Popover } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from '../../../ForemanRhCloudHelpers';
+
+const RemediateButton = ({ isExperimentalMode, selectedIds, toggleModal }) => {
+  const [isVisible, setVisible] = React.useState(true);
+
+  const popoverContent = __(
+    `To use this feature, please enable <a href=${foremanUrl(
+      '/settings?search=name+%3D+lab_features'
+    )}>Show Experimental Labs</a> in settings.`
+  );
+
+  let button = (
+    <Button
+      variant="primary"
+      isDisabled={isEmpty(selectedIds)}
+      onClick={() => {
+        if (!isExperimentalMode) {
+          setVisible(value => !value);
+        } else {
+          toggleModal();
+        }
+      }}
+    >
+      {__('Remediate')}
+    </Button>
+  );
+
+  if (!isExperimentalMode) {
+    button = (
+      <Popover
+        isVisible={isVisible}
+        bodyContent={
+          <div dangerouslySetInnerHTML={{ __html: popoverContent }} />
+        }
+      >
+        {button}
+      </Popover>
+    );
+  }
+  return button;
+};
+
+RemediateButton.propTypes = {
+  selectedIds: PropTypes.object,
+  isExperimentalMode: PropTypes.bool,
+  toggleModal: PropTypes.func.isRequired,
+};
+
+RemediateButton.defaultProps = {
+  selectedIds: {},
+  isExperimentalMode: false,
+};
+
+export default RemediateButton;