From c5abaac60d3f0fa77eccd7903b0fa8ad50076804 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 24 Jan 2022 00:53:29 +0100
Subject: [PATCH] Fix overrideAll-functionality

---
 .../Conversion/LegacyJsonConvert.ts           | 36 +++++++++++++++++--
 assets/themes/speelplekken/speelplekken.json  |  5 ++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
index df9408a8ea..4be0c136a2 100644
--- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
+++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
@@ -1041,15 +1041,47 @@ class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
 
 }
 
+export class ApplyOverrideAll extends DesugaringStep<LayoutConfigJson> {
+    
+    constructor() {
+        super("Applies 'overrideAll' onto every 'layer'. The 'overrideAll'-field is removed afterwards",["overrideAll","layers"]);
+    }
+
+    convert(state: DesugaringContext, json: LayoutConfigJson, context: string): { result: LayoutConfigJson; errors: string[]; warnings: string[] } {
+        
+        const overrideAll = json.overrideAll;
+        if(overrideAll === undefined){
+            return {result :json, warnings: [], errors: []}
+        }
+        
+        json = {...json}
+        
+        delete json.overrideAll
+        const newLayers = []
+        for (let layer of json.layers) {
+            layer = {...<LayerConfigJson>layer}
+            Utils.Merge(overrideAll,  layer)
+            newLayers.push(layer)
+        }
+        json.layers = newLayers
+        
+        
+        return {result :json, warnings: [], errors: []};
+    }
+    
+}
+
 export class PrepareTheme extends Fuse<LayoutConfigJson> {
     constructor() {
         super(
             "Fully prepares and expands a theme",
             new OnEveryConcat("layers", new SubstituteLayer()),
             new SetDefault("socialImage", "assets/SocialImage.png", true),
-            new AddDefaultLayers(),
-            new AddDependencyLayersToTheme(),
             new OnEvery("layers", new PrepareLayer()),
+            new ApplyOverrideAll(),
+            new AddDefaultLayers(),
+            
+            new AddDependencyLayersToTheme(),
             new OnEvery("layers", new AddMiniMap())
         );
     }
diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json
index adf40461a3..226c789153 100644
--- a/assets/themes/speelplekken/speelplekken.json
+++ b/assets/themes/speelplekken/speelplekken.json
@@ -277,11 +277,10 @@
         "render": "<iframe style='width: 100%; height: 300px' src=\"https://www.youtube-nocookie.com/embed/{_video:id}\" title=\"YouTube video player\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>"
       }
     ],
-    "+iconOverlays": [
+    "+iconBadges": [
       {
         "if": "_video:id~*",
-        "then": "./assets/themes/speelplekken/youtube.svg",
-        "badge": true
+        "then": "./assets/themes/speelplekken/youtube.svg"
       }
     ],
     "isShown": {