commit 40f74a6d1b8b41d4ab697a4b4d06a99493e756a8
author Laurence Maultsby <laurence.maultsby@riftio.com> Wed Sep 21 09:30:56 2016 -0400
committer Laurence Maultsby <laurence.maultsby@riftio.com> Wed Sep 21 09:30:56 2016 -0400
tree 6b36624d8d7bc0c1c5a3122f9d570f2ef31c8679
parent d2e20e6e0a436a3dde171aa92ce01ff2fe9a28bc

RIFT-14704: SSH Keys fix on Instantiate page

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx

diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 4db4a63..ec40ccf 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@ -420,8 +420,9 @@
 
             {
               sshKeysRef.map(function(ref, i) {
+                let keyref = JSON.stringify(ref)
                 return (
-                  <div key={i} className="inputControls inputControls-sshkeys">
+                  <div key={keyref.name + '-' + i} className="inputControls inputControls-sshkeys">
                     <label>
                       <div>
                       <SelectOption
@@ -434,13 +435,13 @@
                         })}
                         ref="keyPairSelection"
                         initial={false}
-                        defaultValue={sshKeysList[0].name}
-                        onChange={self.props.updateSshKeyRef(i)}>
+                        defaultValue={keyref.name || sshKeysList[0].name}
+                        onChange={props.sshFn.updateKeyRef(i)}>
                       </SelectOption>
                       </div>
                     </label>
                     <label>
-                      <span onClick={self.props.updateSshKeyRef(i, true)} className="removeInput">
+                      <span onClick={props.sshFn.updateKeyRef(i, true)} className="removeInput">
                         <img src={imgRemove} />
                         Remove
                       </span>
@@ -452,7 +453,7 @@
             <div className="inputControls inputControls-sshkeys ">
               <label style={{display: 'flex', 'flexDirection': 'row'}}>
               SSH KEY PAIR
-                <span onClick={self.props.updateSshKeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
+                <span onClick={props.sshFn.updateKeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
                   <img src={imgAdd} />
                   ADD
                 </span>

skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx

diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
index 5546b25..0e5fa1f 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
@@ -78,6 +78,9 @@
 
             ipProfileList={this.props.ipProfiles}
 
+            sshKeysList={this.props.sshKeysList}
+            sshKeysRef={this.props.sshKeysRef}
+
             dnsServers={this.props.dnsServers}
 
             usersList = {this.props.usersList}