Browse Source

Merge pull request #578 from smiclea/fix-minion-mapping

Fix OSMorphing minions shown for wrong platform
Nashwan Azhari 5 years ago
parent
commit
f9bc764058

+ 2 - 3
src/components/organisms/EditReplica/EditReplica.tsx

@@ -558,9 +558,8 @@ class EditReplica extends React.Component<Props, State> {
     if (endpoint) {
     if (endpoint) {
       dictionaryKey = `${endpoint.type}-${type}`
       dictionaryKey = `${endpoint.type}-${type}`
     }
     }
-    const minionPools = type === 'source'
-      ? minionPoolStore.minionPools.filter(m => m.endpoint_id === this.props.sourceEndpoint.id)
-      : minionPoolStore.minionPools.filter(m => m.endpoint_id === this.props.destinationEndpoint.id)
+    const minionPools = minionPoolStore.minionPools
+      .filter(m => m.pool_platform === type && m.endpoint_id === endpoint.id)
     return (
     return (
       <WizardOptions
       <WizardOptions
         minionPools={minionPools}
         minionPools={minionPools}

+ 1 - 1
src/components/pages/ReplicaDetailsPage/ReplicaDetailsPage.tsx

@@ -636,7 +636,7 @@ class ReplicaDetailsPage extends React.Component<Props, State> {
           >
           >
             <ReplicaMigrationOptions
             <ReplicaMigrationOptions
               transferItem={this.replica}
               transferItem={this.replica}
-              minionPools={minionPoolStore.minionPools}
+              minionPools={minionPoolStore.minionPools.filter(m => m.endpoint_id === this.replica?.destination_endpoint_id && m.pool_platform === 'destination')}
               loadingInstances={instanceStore.loadingInstancesDetails}
               loadingInstances={instanceStore.loadingInstancesDetails}
               instances={instanceStore.instancesDetails}
               instances={instanceStore.instancesDetails}
               onCancelClick={() => { this.handleCloseMigrationModal() }}
               onCancelClick={() => { this.handleCloseMigrationModal() }}