foreman_rh_cloud 3.0.15 → 3.0.16

data/config/routes.rb

@@ -11,7 +11,6 @@ Rails.application.routes.draw do
     post 'installed_packages_inclusion', to: 'uploads#installed_packages_inclusion'
     post 'ips_obfuscation', to: 'uploads#ips_obfuscation'
 
-    get 'cloud_connector', to: 'uploads#cloud_connector_status'
     post 'cloud_connector', to: 'uploads#enable_cloud_connector'
 
     resources :tasks, only: [:create]

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.15'.freeze
+  VERSION = '3.0.16'.freeze
 end

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

@@ -42,6 +42,11 @@ export const cloudToken = 'some-cloud-token';
 
 export const excludePackages = false;
 
+export const CloudConnectorStatus = {
+  id: 7,
+  task: { id: 11 },
+};
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -57,6 +62,7 @@ export const pollingResponse = {
   ipsObfuscationEnabled,
   cloudToken,
   excludePackages,
+  CloudConnectorStatus,
 };
 
 export const fetchAccountsStatusResponse = {

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

@@ -29,6 +29,7 @@ export default (state = initialState, action) => {
       ipsObfuscationEnabled,
       cloudToken,
       excludePackages,
+      CloudConnectorStatus,
     } = {},
   } = action;
 
@@ -42,6 +43,7 @@ export default (state = initialState, action) => {
         ipsObfuscationEnabled,
         cloudToken,
         excludePackages,
+        CloudConnectorStatus,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:

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

@@ -5,6 +5,12 @@ Array [
   Array [
     Object {
       "payload": Object {
+        "CloudConnectorStatus": Object {
+          "id": 7,
+          "task": Object {
+            "id": 11,
+          },
+        },
         "accounts": Object {
           "Account1": Object {
             "generate_report_status": "running",

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

@@ -20,6 +20,12 @@ Object {
 
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
+  "CloudConnectorStatus": Object {
+    "id": 7,
+    "task": Object {
+      "id": 11,
+    },
+  },
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorActions.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { get, post } from 'foremanReact/redux/API';
+import { post } from 'foremanReact/redux/API';
 import { CONFIGURE_CLOUD_CONNECTOR } from './CloudConnectorConstants';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
 import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
@@ -19,9 +19,3 @@ export const configureCloudConnector = () =>
     ),
     errorToast: error => `${__('Cloud connector setup has failed: ')} ${error}`,
   });
-
-export const getCloudConnector = () =>
-  get({
-    key: CONFIGURE_CLOUD_CONNECTOR,
-    url: inventoryUrl('cloud_connector'),
-  });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorButton.js

@@ -1,35 +1,43 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Spinner, Button, Popover } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { CONNECTOR_STATUS } from './CloudConnectorConstants';
 
 export const CloudConnectorButton = ({ status, onClick, jobLink }) => {
+  const [isPopoverVisible, setIsPopoverVisible] = useState(false);
   if (status === CONNECTOR_STATUS.PENDING) {
     return (
       <Popover
+        isVisible={isPopoverVisible}
+        shouldClose={() => setIsPopoverVisible(false)}
         bodyContent={
           <div>
-            {__('Cloud connector job is still running, you can view it here:')}
+            {__('Cloud connector setup has started: ')}
             <a href={jobLink} target="_blank" rel="noopener noreferrer">
-              {__('Open job')}
+              {__('view the job in progress')}
             </a>
           </div>
         }
         aria-label="Popover with Link to cloud connector job"
         closeBtnAriaLabel="Close cloud connector Popover"
       >
-        <Button variant="secondary">
-          <Spinner size="sm" /> {__('Cloud Connector in progress')}
-        </Button>
+        <div
+          className="cloud-connector-pending-button"
+          onMouseEnter={() => setIsPopoverVisible(true)}
+        >
+          <Button variant="secondary" isDisabled>
+            <Spinner size="sm" /> {__('Cloud Connector is in progress')}
+          </Button>
+        </div>
       </Popover>
     );
   }
 
   if (status === CONNECTOR_STATUS.RESOLVED) {
     return (
-      <Button variant="secondary" isDisabled>
-        {__('Cloud Connector is configured')}
+      <Button variant="secondary" onClick={onClick}>
+        {__('Reconfigure Cloud Connector')}
       </Button>
     );
   }

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorSelectors.js

@@ -1,14 +1,19 @@
-import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
+import { selectAccountsList } from '../../../AccountList/AccountListSelectors';
+import { CONNECTOR_STATUS } from './CloudConnectorConstants';
 
-import {
-  CONFIGURE_CLOUD_CONNECTOR,
-  CONNECTOR_STATUS,
-} from './CloudConnectorConstants';
+export const SelectCloudConnectorStatus = state =>
+  selectAccountsList(state).CloudConnectorStatus || {};
 
-export const selectStatus = state =>
-  selectAPIResponse(state, CONFIGURE_CLOUD_CONNECTOR)?.result === 'success'
-    ? CONNECTOR_STATUS.RESOLVED
-    : CONNECTOR_STATUS.NOT_RESOLVED;
+export const selectStatus = state => {
+  const { task } = SelectCloudConnectorStatus(state);
+  if (!task) return CONNECTOR_STATUS.NOT_RESOLVED;
+  if (task.result === 'pending') return CONNECTOR_STATUS.PENDING;
+  if (task.result === 'success') return CONNECTOR_STATUS.RESOLVED;
+  return CONNECTOR_STATUS.NOT_RESOLVED;
+};
 
-export const selectJobLink = state =>
-  selectAPIResponse(state, CONFIGURE_CLOUD_CONNECTOR).job_link || '';
+export const selectJobLink = state => {
+  const { id } = SelectCloudConnectorStatus(state);
+  return id ? foremanUrl(`/job_invocations/${id}`) : '';
+};

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

@@ -14,35 +14,43 @@ exports[`CloudConnectorButton render pending connector 1`] = `
   aria-label="Popover with Link to cloud connector job"
   bodyContent={
     <div>
-      Cloud connector job is still running, you can view it here:
+      Cloud connector setup has started: 
       <a
         href="/job-link"
         rel="noopener noreferrer"
         target="_blank"
       >
-        Open job
+        view the job in progress
       </a>
     </div>
   }
   closeBtnAriaLabel="Close cloud connector Popover"
+  isVisible={false}
+  shouldClose={[Function]}
 >
-  <Button
-    variant="secondary"
+  <div
+    className="cloud-connector-pending-button"
+    onMouseEnter={[Function]}
   >
-    <Spinner
-      size="sm"
-    />
-     
-    Cloud Connector in progress
-  </Button>
+    <Button
+      isDisabled={true}
+      variant="secondary"
+    >
+      <Spinner
+        size="sm"
+      />
+       
+      Cloud Connector is in progress
+    </Button>
+  </div>
 </Popover>
 `;
 
 exports[`CloudConnectorButton render resolved cloud connector 1`] = `
 <Button
-  isDisabled={true}
+  onClick={[MockFunction]}
   variant="secondary"
 >
-  Cloud Connector is configured
+  Reconfigure Cloud Connector
 </Button>
 `;

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

@@ -1,10 +1,7 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { CloudConnectorButton } from './CloudConnectorButton';
-import {
-  configureCloudConnector,
-  getCloudConnector,
-} from './CloudConnectorActions';
+import { configureCloudConnector } from './CloudConnectorActions';
 import { selectStatus, selectJobLink } from './CloudConnectorSelectors';
 
 const ConnectedCloudConnectorButton = () => {
@@ -12,9 +9,6 @@ const ConnectedCloudConnectorButton = () => {
   const jobLink = useSelector(selectJobLink);
   const dispatch = useDispatch();
 
-  useEffect(() => {
-    dispatch(getCloudConnector());
-  }, [dispatch]);
   return (
     <CloudConnectorButton
       status={status}

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/toolbarButtons.scss

@@ -8,4 +8,8 @@
   .sync_button .spinner {
     margin: 3px 5px 0 -3px;
   }
+
+  .cloud-connector-pending-button {
+    display: inline-block;
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello