Merge pull request #41 from platformatic/bugfix/multiple-templates

feat: using multiple templates
platformatic · Nov 30, 2023 · 1970015 · 1970015
2 parents 30ab8b8 + 1b071b1
commit 1970015
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/renderer/src/components/steps/PrepareFolder.jsx b/src/renderer/src/components/steps/PrepareFolder.jsx
@@ -108,7 +108,7 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => {
           onClick={() => onClickCopyLogs()}
           color={WHITE}
           backgroundColor={RICH_BLACK}
-          classes={`${commonStyles.buttonPadding} cy-action-next`}
+          classes={`${commonStyles.buttonPadding} cy-action-donwload-logs`}
         />
         {folderPreparedError
           ? <Button

diff --git a/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx b/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx
@@ -18,10 +18,10 @@ function ConfigureEnvVarsTemplateAndPlugins ({
   const [currentComponent, setCurrentComponent] = useState(<></>)
 
   useEffect(() => {
-    if (configuredServices !== null) {
+    if (configuredServices !== null && !serviceSelected) {
       setServiceSelected(configuredServices[0])
     }
-  }, [configuredServices])
+  }, [configuredServices, !serviceSelected])
 
   function handleChangeTemplateEnvVars (event) {
     return handleChangeTemplateForm(event, serviceSelected.template, serviceSelected.name)

diff --git a/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx b/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx
@@ -19,6 +19,7 @@ const ConfigureServices = React.forwardRef(({ onNext }, ref) => {
 
   useEffect(() => {
     if (services.length > 0) {
+      const tmpServices = []
       let tmpTemplateForms = {}
       let tmpTemplateValidations = {}
       let tmpTemplateValidForm = {}
@@ -60,8 +61,9 @@ const ConfigureServices = React.forwardRef(({ onNext }, ref) => {
         tmpObj.validForm = tmpTemplateValidForm
         tmpObj.updatedAt = new Date().toISOString()
         tmpObj.plugins = []
+        tmpServices.push(tmpObj)
       })
-      setConfiguredServices([...configuredServices, tmpObj])
+      setConfiguredServices(tmpServices)
     }
   }, [services])