fix create cluster from template

Author: hgreebe

frontend/src/old-pages/Clusters/Properties.tsx

@@ -9,7 +9,7 @@
 // OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 // limitations under the License.
 import {ClusterStatus, ClusterDescription} from '../../types/clusters'
-import React, {PropsWithChildren, ReactElement} from 'react'
+import React from 'react'
 import {Trans, useTranslation} from 'react-i18next'
 import {findFirst, clusterDefaultUser} from '../../util'
 import {useState, setState, ssmPolicy} from '../../store'
@@ -39,7 +39,6 @@ import InfoLink from '../../components/InfoLink'
 import {useClusterPoll} from '../../components/useClusterPoll'
 import {ValueWithLabel} from '../../components/ValueWithLabel'
 import {EnableCostMonitoringButton} from './Costs/EnableCostMonitoringButton'
-import {DescribeCluster, GetConfiguration} from "../../model";
 
 export default function ClusterProperties() {
   const {t} = useTranslation()
@@ -50,11 +49,6 @@ export default function ClusterProperties() {
   const defaultRegion = useState(['aws', 'region'])
   const region = useState(['app', 'selectedRegion']) || defaultRegion
 
-  DescribeCluster(clusterName).then(data => {
-    const version = data.version
-      setState(['app', 'wizard', 'version'], version)
-  })
-
   function isSsmPolicy(p: any) {
     return p.hasOwnProperty('Policy') && p.Policy === ssmPolicy(region)
   }

frontend/src/old-pages/Configure/Configure.tsx

@@ -116,8 +116,6 @@ function Configure() {
   const [refreshing, setRefreshing] = React.useState(false)
   let navigate = useNavigate()
 
-  setState(['app', 'wizard', 'version'], null)
-
   const clusterPath = ['clusters', 'index', clusterName]
   const fleetStatus: ComputeFleetStatus = useState([
     ...clusterPath,

frontend/src/old-pages/Configure/Version.tsx

@@ -34,9 +34,8 @@ function Version() {
         // Get the current version
         const currentVersion = getState(['app', 'wizard', 'version'])
 
-        // Clear version only if we're not editing and there's no version set,
-        // or if we're explicitly not in editing mode
-        if (!editing && (currentVersion === undefined || currentVersion === null)) {
+        // Clear version only if we're not editing
+        if (!editing) {
             setState(['app', 'wizard', 'version'], null)
         }
     }, [editing])

frontend/src/old-pages/Configure/util.tsx

@@ -122,10 +122,6 @@ function loadTemplateLazy(config: any, callback?: () => void) {
   setState(['app', 'wizard', 'loaded'], true)
   setState(['app', 'wizard', 'config'], config)
 
-  // if (version) {
-  //   setState(['app', 'wizard', 'version'], version)
-  // }
-
   if (keypairs.length > 0 && !keypairNames.has(getIn(config, keypairPath)))
     setState(['app', 'wizard', 'config', ...keypairPath], keypairs[0].KeyName)
   setState(['app', 'wizard', 'page'], 'version')
@@ -169,15 +165,14 @@ const wizardLoadingPath = ['app', 'wizard', 'source', 'loading']
 
 function loadTemplateFromCluster(clusterName: string) {
   setState(wizardLoadingPath, true)
-  const clusterPath = ['clusters', 'index', clusterName]
-  const version = getState([...clusterPath, 'version'])
 
-  console.log("GOT HERE")
-  GetConfiguration(clusterName, (configuration: any) => {
-    setState(['app', 'wizard', 'version'], version)
-    loadTemplate(load(configuration), () => setState(wizardLoadingPath, false))
+  DescribeCluster(clusterName).then(data => {
+    const version = data.version
+    GetConfiguration(clusterName, (configuration: any) => {
+      setState(['app', 'wizard', 'version'], version)
+      loadTemplate(load(configuration), () => setState(wizardLoadingPath, false))
+    })
   })
-
 }
 
 export {loadTemplate, subnetName, loadTemplateFromCluster}