From 05eb6e15a546ba96ec2215d1d80780b77f08c383 Mon Sep 17 00:00:00 2001
From: Wendelin <12148533+wendevlin@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:24:03 +0100
Subject: [PATCH] Save scene before switching to live edit (#23094)

Save scene changes before live edit, align delete icons for entities.
---
 src/panels/config/scene/ha-scene-editor.ts | 10 ++++++++--
 src/translations/en.json                   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 5dce2d4577..410aff18f9 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -559,6 +559,7 @@ export class HaSceneEditor extends SubscribeMixin(
                               }
                               return html`
                                 <ha-list-item
+                                  class="entity"
                                   hasMeta
                                   .graphic=${this._mode === "live"
                                     ? "icon"
@@ -776,13 +777,15 @@ export class HaSceneEditor extends SubscribeMixin(
         text: this.hass.localize(
           "ui.panel.config.scene.editor.enter_live_mode_unsaved"
         ),
-        confirmText: this.hass!.localize("ui.common.continue"),
-        destructive: true,
+        confirmText: this.hass!.localize(
+          "ui.panel.config.scene.editor.save_before_live"
+        ),
         dismissText: this.hass!.localize("ui.common.cancel"),
       });
       if (!result) {
         return;
       }
+      await this._saveScene();
     }
 
     this._entities.forEach((entity) => this._storeState(entity));
@@ -1326,6 +1329,9 @@ export class HaSceneEditor extends SubscribeMixin(
         li[role="separator"] {
           border-bottom-color: var(--divider-color);
         }
+        ha-list-item.entity {
+          padding-right: 28px;
+        }
       `,
     ];
   }
diff --git a/src/translations/en.json b/src/translations/en.json
index 20018575bd..193d38ce1a 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3881,7 +3881,8 @@
             "review_mode_detail": "You can adjust the scene's details and remove devices or entities. To fully edit, switch to Live Edit, which will apply the scene.",
             "live_edit": "Live Edit",
             "live_edit_detail": "In Live Edit, all changes to this scene are applied in real-time to your devices and entities.",
-            "enter_live_mode_unsaved": "You have unsaved changes to this scene. Continuing to live preview will apply the saved scene, which may overwrite your unsaved changes. Consider if you would like to save the scene first before activating it.",
+            "enter_live_mode_unsaved": "Before proceeding to Live Edit, please save your current changes.",
+            "save_before_live": "Save and Live Edit",
             "switch_to_review_mode": "Switch to review mode",
             "default_name": "New scene",
             "load_error_not_editable": "Only scenes in scenes.yaml are editable.",