From d0d6b7ff1a34455f97998f66e1574ed6a7a1c421 Mon Sep 17 00:00:00 2001
From: Daan Vanden Bosch <daan.v.d.bosch@gmail.com>
Date: Tue, 14 Jul 2020 22:08:36 +0200
Subject: [PATCH] Fixed bug in QuestEditorUiPersister config sanitization code.
 When removing old components results in empty containers, these containers
 are now also removed.

---
 .../persistence/QuestEditorUiPersister.ts     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/quest_editor/persistence/QuestEditorUiPersister.ts b/src/quest_editor/persistence/QuestEditorUiPersister.ts
index 33c2d5a0..72658651 100644
--- a/src/quest_editor/persistence/QuestEditorUiPersister.ts
+++ b/src/quest_editor/persistence/QuestEditorUiPersister.ts
@@ -65,33 +65,22 @@ export class QuestEditorUiPersister extends Persister {
             return undefined;
         }
 
-        switch (config.type) {
-            case "component":
-                {
-                    // Remove corrupted components.
-                    if (!("componentName" in config)) {
-                        return undefined;
-                    }
+        if (config.type === "component") {
+            // Remove corrupted components.
+            if (!("componentName" in config)) {
+                return undefined;
+            }
 
-                    const component = components.get(config.componentName);
+            const component = components.get(config.componentName);
 
-                    // Remove deprecated components.
-                    if (!component) {
-                        return undefined;
-                    }
+            // Remove deprecated components.
+            if (!component) {
+                return undefined;
+            }
 
-                    found.add(config.componentName);
-                    config.id = component.id;
-                    config.title = component.title;
-                }
-                break;
-
-            case "stack":
-                // Remove empty stacks.
-                if (config.content == undefined || config.content.length === 0) {
-                    return undefined;
-                }
-                break;
+            found.add(config.componentName);
+            config.id = component.id;
+            config.title = component.title;
         }
 
         // Sanitize child items.
@@ -101,6 +90,17 @@ export class QuestEditorUiPersister extends Persister {
                 .filter(item => item) as ItemConfigType[];
         }
 
+        // Remove empty containers.
+        switch (config.type) {
+            case "row":
+            case "column":
+            case "stack":
+                if (config.content == undefined || config.content.length === 0) {
+                    return undefined;
+                }
+                break;
+        }
+
         // Remove corrupted activeItemIndex properties.
         const cfg = config as any;