Filter provider options by what's available

ManageIQ · Feb 4, 2019 · b6b46a0 · b6b46a0
1 parent badc511
commit b6b46a0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/app/javascript/common/constants.js b/app/javascript/common/constants.js
@@ -23,8 +23,16 @@ export const OPENSTACK = 'openstack';
 export const RHV = 'rhevm';
 
 export const V2V_TARGET_PROVIDERS = [
-  { name: __('Red Hat Virtualization'), id: RHV },
-  { name: __('Red Hat OpenStack Platform'), id: OPENSTACK }
+  {
+    name: __('Red Hat Virtualization'),
+    id: RHV,
+    type: 'ManageIQ::Providers::Redhat::InfraManager'
+  },
+  {
+    name: __('Red Hat OpenStack Platform'),
+    id: OPENSTACK,
+    type: 'ManageIQ::Providers::Openstack::CloudManager'
+  }
 ];
 
 export const FETCH_TARGET_COMPUTE_URLS = {

diff --git a/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap b/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
@@ -13,6 +13,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": true,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -43,6 +44,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -77,6 +79,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -107,6 +110,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": true,
@@ -137,6 +141,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": true,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -167,6 +172,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -197,6 +203,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": true,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -227,6 +234,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -259,6 +267,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -289,6 +298,7 @@ Object {
   "errorSavingSettings": "error",
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -319,6 +329,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,
@@ -351,6 +362,7 @@ Object {
   "errorSavingSettings": null,
   "fetchingServersRejected": false,
   "fetchingSettingsRejected": false,
+  "hasSufficientProviders": false,
   "isFetchingConversionHosts": false,
   "isFetchingProviders": false,
   "isFetchingServers": false,

diff --git a/...ipt/react/screens/App/Settings/screens/ConversionHostsSettings/ConversionHostsSettings.js b/...ipt/react/screens/App/Settings/screens/ConversionHostsSettings/ConversionHostsSettings.js
@@ -28,7 +28,7 @@ class ConversionHostsSettings extends React.Component {
         {!hasSufficientProviders ? (
           <ShowWizardEmptyState
             description={
-              __('The source and target providers must be configured before attempting a migration') // prettier-ignore
+              __('There are no providers available from which to configure a conversion host. You must configure a target provider before configuring conversion hosts.') // prettier-ignore
             }
             buttonText={__('Configure Providers')}
             buttonHref="/ems_infra/show_list"

diff --git a/.../ConversionHostsSettings/components/ConversionHostWizard/ConversionHostWizardConstants.js b/.../ConversionHostsSettings/components/ConversionHostWizard/ConversionHostWizardConstants.js
@@ -1,13 +1,6 @@
-import { RHV, OPENSTACK } from '../../../../../../../../common/constants';
-
 export const stepIDs = {
   locationStep: 'conversionHostWizardLocationStep',
   hostsStep: 'conversionHostWizardHostsStep',
   authenticationStep: 'conversionHostWizardAuthenticationStep',
   resultsStep: 'conversionHostWizardResultsStep'
 };
-
-export const PROVIDER_TYPES = {
-  [RHV]: 'ManageIQ::Providers::Redhat::InfraManager',
-  [OPENSTACK]: 'ManageIQ::Providers::Openstack::CloudManager'
-};
diff --git a/...ConversionHostWizard/ConversionHostWizardLocationStep/ConversionHostWizardLocationStep.js b/...ConversionHostWizard/ConversionHostWizardLocationStep/ConversionHostWizardLocationStep.js
@@ -12,7 +12,7 @@ import {
   FETCH_TARGET_COMPUTE_URLS
 } from '../../../../../../../../../common/constants';
 
-import { stepIDs, PROVIDER_TYPES } from '../ConversionHostWizardConstants';
+import { stepIDs } from '../ConversionHostWizardConstants';
 
 class ConversionHostWizardLocationStep extends React.Component {
   componentDidUpdate(prevProps) {
@@ -36,9 +36,12 @@ class ConversionHostWizardLocationStep extends React.Component {
     const { providers, isFetchingTargetComputeResources, targetComputeResources } = this.props;
     const { selectedProviderType, selectedProviderId } = this.getDerivedProps();
 
-    const providersFilteredBySelectedType = providers.filter(
-      provider => provider.type === PROVIDER_TYPES[selectedProviderType]
+    const availableProviderOptions = V2V_TARGET_PROVIDERS.filter(option =>
+      providers.some(provider => provider.type === option.type)
     );
+    const selectedProviderOption = availableProviderOptions.find(option => option.id === selectedProviderType);
+    const providersFilteredBySelectedType =
+      selectedProviderOption && providers.filter(provider => provider.type === selectedProviderOption.type);
 
     const targetComputeFilteredBySelectedProvider = targetComputeResources.filter(
       computeResource => computeResource.ems_id === selectedProviderId
@@ -61,7 +64,7 @@ class ConversionHostWizardLocationStep extends React.Component {
           {...selectFieldBaseProps}
           name="providerType"
           label={__('Provider Type')}
-          options={V2V_TARGET_PROVIDERS}
+          options={availableProviderOptions}
         />
         {selectedProviderType && (
           <Spinner loading={isFetchingTargetComputeResources}>