From cee6d5eeb936d5dcc587c8a4fc53a6ce69408f73 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Date: Wed, 27 May 2026 22:18:28 +0800
Subject: [PATCH] Polish deployment creation wizard layout

---
 .../deployments/create-guide/layout.tsx       | 20 +++++++++----------
 .../deployments/create-guide/source-step.tsx  | 10 +++++-----
 .../use-create-deployment-guide.ts            | 10 ++++++++++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/features/deployments/create-guide/layout.tsx b/web/features/deployments/create-guide/layout.tsx
index 4d9d299a85..179432f472 100644
--- a/web/features/deployments/create-guide/layout.tsx
+++ b/web/features/deployments/create-guide/layout.tsx
@@ -148,8 +148,8 @@ export function GuideCard({ children, actions }: {
   actions: ReactNode
 }) {
   return (
-    <div className="flex w-full min-w-0 flex-col">
-      <div className="min-h-0">
+    <div className="flex min-h-0 w-full min-w-0 flex-1 flex-col">
+      <div className="min-h-0 flex-1">
         {children}
       </div>
       {actions}
@@ -168,11 +168,16 @@ export function GuideFrame({ activeStep, children }: {
       <div className="flex min-w-0 flex-1 shrink-0 justify-center overflow-y-auto">
         <section
           aria-label={t('createGuide.title')}
-          className="w-full max-w-[840px] px-5 sm:px-8 lg:px-10"
+          className="flex h-full w-full max-w-[840px] flex-col px-5 sm:px-8 lg:px-10"
         >
           <div className="h-5 sm:h-8 lg:h-12" />
-          <div className="pt-1 pb-4">
+          <div className="flex min-w-0 items-start justify-between gap-6 pt-1 pb-4">
             <h1 className="title-2xl-semi-bold text-text-primary">{t('createGuide.title')}</h1>
+            {activeStep !== 'done' && (
+              <div className="hidden w-[148px] shrink-0 min-[1120px]:block">
+                <GuideProgressSummary activeStep={activeStep} />
+              </div>
+            )}
           </div>
           <GuideStepIntro activeStep={activeStep} />
           {activeStep !== 'done' && (
@@ -183,11 +188,6 @@ export function GuideFrame({ activeStep, children }: {
           {children}
         </section>
       </div>
-      {activeStep !== 'done' && (
-        <aside className="pointer-events-none absolute top-24 left-[calc(50%+390px)] hidden w-[148px] min-[1120px]:block">
-          <GuideProgressSummary activeStep={activeStep} />
-        </aside>
-      )}
     </div>
   )
 }
@@ -216,7 +216,7 @@ export function GuideActions({
     return null
 
   return (
-    <div className="flex items-center justify-end gap-2 pt-4 pb-8">
+    <div className="sticky bottom-0 z-10 -mx-5 mt-auto flex items-center justify-end gap-2 border-t border-divider-subtle bg-background-default-subtle/95 px-5 py-4 backdrop-blur-sm sm:-mx-8 sm:px-8 lg:-mx-10 lg:px-10">
       {(step === 'release' || step === 'target') && (
         <Button type="button" variant="secondary" onClick={onBack} disabled={isDeploying}>
           {t('createGuide.actions.back')}
diff --git a/web/features/deployments/create-guide/source-step.tsx b/web/features/deployments/create-guide/source-step.tsx
index 04c96d3c58..1d9392831c 100644
--- a/web/features/deployments/create-guide/source-step.tsx
+++ b/web/features/deployments/create-guide/source-step.tsx
@@ -42,10 +42,10 @@ function SourceAppOption({ app, selected, onSelect }: {
   return (
     <label
       className={cn(
-        'group flex min-h-14 cursor-pointer items-center gap-3 border-b border-b-divider-subtle px-3 py-2 transition-colors first:rounded-t-lg last:rounded-b-lg last:border-b-0',
+        'group flex min-h-14 cursor-pointer items-center gap-3 border-b border-l-2 border-b-divider-subtle px-3 py-2 transition-colors first:rounded-t-lg last:rounded-b-lg last:border-b-0',
         selected
-          ? 'bg-state-accent-hover hover:bg-state-accent-hover'
-          : 'bg-background-default hover:bg-state-base-hover',
+          ? 'border-l-state-accent-solid bg-background-default hover:bg-state-base-hover'
+          : 'border-l-transparent bg-background-default hover:bg-state-base-hover',
       )}
     >
       <AppIcon
@@ -57,7 +57,7 @@ function SourceAppOption({ app, selected, onSelect }: {
         imageUrl={app.icon_url}
       />
       <span className="flex min-w-0 grow flex-col gap-0.5">
-        <span className={cn('truncate system-sm-medium', selected ? 'text-text-accent' : 'text-text-primary')}>{app.name}</span>
+        <span className="truncate system-sm-medium text-text-primary">{app.name}</span>
         <span className={cn('truncate system-xs-regular', selected ? 'text-text-secondary' : 'text-text-tertiary')}>{t(`appMode.${mode}`)}</span>
       </span>
       <input
@@ -70,7 +70,7 @@ function SourceAppOption({ app, selected, onSelect }: {
       <span
         className={cn(
           'flex size-5 shrink-0 items-center justify-center rounded-full',
-          selected ? 'bg-primary-600 text-text-primary-on-surface' : 'text-transparent',
+          selected ? 'bg-state-accent-active text-text-accent' : 'text-transparent',
         )}
         aria-hidden="true"
       >
diff --git a/web/features/deployments/create-guide/use-create-deployment-guide.ts b/web/features/deployments/create-guide/use-create-deployment-guide.ts
index 0c50a03f9c..4804b66de0 100644
--- a/web/features/deployments/create-guide/use-create-deployment-guide.ts
+++ b/web/features/deployments/create-guide/use-create-deployment-guide.ts
@@ -258,6 +258,15 @@ export function useCreateDeploymentGuide() {
     setStep('target')
   }
 
+  function applyReleaseDefaults() {
+    const nextInstanceName = sourceName.trim()
+
+    if (!instanceName.trim() && nextInstanceName)
+      setInstanceName(nextInstanceName)
+    if (!releaseName.trim())
+      setReleaseName(defaultedReleaseName)
+  }
+
   async function handleDeploy() {
     if (!selectedEnvironment?.id || isDeploying)
       return
@@ -321,6 +330,7 @@ export function useCreateDeploymentGuide() {
     if (step === 'source') {
       if (method === 'bindApp' && effectiveSelectedApp)
         setSelectedApp(effectiveSelectedApp)
+      applyReleaseDefaults()
       setStep('release')
       return
     }