diff --git a/app/views/install/installer.phtml b/app/views/install/installer.phtml index ec262a826c..1c3a6c97e0 100644 --- a/app/views/install/installer.phtml +++ b/app/views/install/installer.phtml @@ -1,6 +1,7 @@ data-locked-database="" + data-topology="" data-default-http-port="" data-default-https-port="" data-default-app-domain="" diff --git a/app/views/install/installer/js/modules/context.js b/app/views/install/installer/js/modules/context.js index db250dd03e..e870e78c69 100644 --- a/app/views/install/installer/js/modules/context.js +++ b/app/views/install/installer/js/modules/context.js @@ -2,6 +2,10 @@ const getBodyDataset = () => document.body?.dataset ?? {}; const isUpgradeMode = () => getBodyDataset().upgrade === 'true'; const getLockedDatabase = () => getBodyDataset().lockedDatabase || ''; + const getTopology = () => { + const topology = getBodyDataset().topology || 'combined'; + return topology === 'separate' ? 'separate' : 'combined'; + }; const getEnabledDatabases = () => { const raw = getBodyDataset().enabledDatabases; if (!raw) return ['postgresql', 'mariadb', 'mongodb']; @@ -108,6 +112,7 @@ getBodyDataset, isUpgradeMode, getLockedDatabase, + getTopology, getEnabledDatabases, STEP_IDS, STATUS, diff --git a/app/views/install/installer/js/modules/state.js b/app/views/install/installer/js/modules/state.js index df7fd98417..2dcbeeeb1e 100644 --- a/app/views/install/installer/js/modules/state.js +++ b/app/views/install/installer/js/modules/state.js @@ -50,6 +50,9 @@ if (data.lockedDatabase) { formState.database = data.lockedDatabase; } + if (data.topology === 'combined' || data.topology === 'separate') { + formState.topology = data.topology; + } if (!isUpgradeMode?.()) { setStateIfEmpty('database', data.defaultDatabase); } diff --git a/app/views/install/installer/js/steps.js b/app/views/install/installer/js/steps.js index ceeff83846..40767a6886 100644 --- a/app/views/install/installer/js/steps.js +++ b/app/views/install/installer/js/steps.js @@ -10,7 +10,8 @@ INSTALLATION_STEPS, clampStep, isUpgradeMode, - getEnabledDatabases + getEnabledDatabases, + getTopology } = Context; const { @@ -106,7 +107,7 @@ const hydrateStep1State = (root) => { State.setStateIfEmpty?.('appDomain', root.querySelector('#hostname')?.value); State.setStateIfEmpty?.('database', root.querySelector('input[name="database"]:checked')?.value); - State.setStateIfEmpty?.('topology', root.querySelector('input[name="topology"]:checked')?.value || 'combined'); + State.setStateIfEmpty?.('topology', getTopology?.() || root.querySelector('input[name="topology"]:checked')?.value || 'combined'); State.setStateIfEmpty?.('httpPort', root.querySelector('#http-port')?.value); State.setStateIfEmpty?.('httpsPort', root.querySelector('#https-port')?.value); State.setStateIfEmpty?.('emailCertificates', root.querySelector('#ssl-email')?.value); diff --git a/app/views/install/installer/templates/steps/step-1.phtml b/app/views/install/installer/templates/steps/step-1.phtml index 3b27e0ecdb..162cec1075 100644 --- a/app/views/install/installer/templates/steps/step-1.phtml +++ b/app/views/install/installer/templates/steps/step-1.phtml @@ -1,6 +1,8 @@
-