From 09ea799ad4ce3e90060cbca1e984ec75fb84a739 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sun, 3 Dec 2023 03:33:02 +0100
Subject: [PATCH] Studio: some fixes, show user id when running localhost

---
 src/UI/Studio/EditItemButton.svelte | 51 +++++++++++++++++------------
 src/UI/Studio/EditLayerState.ts     | 16 ++++++++-
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/UI/Studio/EditItemButton.svelte b/src/UI/Studio/EditItemButton.svelte
index 3d593f0a1..f5f1c1001 100644
--- a/src/UI/Studio/EditItemButton.svelte
+++ b/src/UI/Studio/EditItemButton.svelte
@@ -1,29 +1,30 @@
 <script lang="ts">
-  import { UIEventSource } from "../../Logic/UIEventSource"
-  import { OsmConnection } from "../../Logic/Osm/OsmConnection"
-  import Marker from "../Map/Marker.svelte"
-  import NextButton from "../Base/NextButton.svelte"
-  import { AllKnownLayouts } from "../../Customizations/AllKnownLayouts"
-  import { AllSharedLayers } from "../../Customizations/AllSharedLayers"
-  import { createEventDispatcher } from "svelte"
+    import { UIEventSource } from "../../Logic/UIEventSource"
+    import { OsmConnection } from "../../Logic/Osm/OsmConnection"
+    import Marker from "../Map/Marker.svelte"
+    import NextButton from "../Base/NextButton.svelte"
+    import { AllKnownLayouts } from "../../Customizations/AllKnownLayouts"
+    import { AllSharedLayers } from "../../Customizations/AllSharedLayers"
+    import { createEventDispatcher } from "svelte"
 
-  export let info: { id: string; owner: number }
-  export let category: "layers" | "themes"
-  export let osmConnection: OsmConnection
+    export let info: { id: string; owner: number }
+    export let category: "layers" | "themes"
+    export let osmConnection: OsmConnection
 
-  let displayName = UIEventSource.FromPromise(
-    osmConnection.getInformationAboutUser(info.owner)
-  ).mapD((response) => response.display_name)
+    let displayName = UIEventSource.FromPromise(
+        osmConnection.getInformationAboutUser(info.owner),
+    ).mapD((response) => response.display_name)
 
-  let selfId = osmConnection.userDetails.mapD((ud) => ud.uid)
-  function fetchIconDescription(layerId): any {
-    if (category === "themes") {
-      return AllKnownLayouts.allKnownLayouts.get(layerId).icon
+    let selfId = osmConnection.userDetails.mapD((ud) => ud.uid)
+
+    function fetchIconDescription(layerId): any {
+        if (category === "themes") {
+            return AllKnownLayouts.allKnownLayouts.get(layerId).icon
+        }
+        return AllSharedLayers.getSharedLayersConfigs().get(layerId)?._layerIcon
     }
-    return AllSharedLayers.getSharedLayersConfigs().get(layerId)?._layerIcon
-  }
 
-  const dispatch = createEventDispatcher<{ layerSelected: string }>()
+    const dispatch = createEventDispatcher<{ layerSelected: string }>()
 </script>
 
 <NextButton clss="small" on:click={() => dispatch("layerSelected", info)}>
@@ -32,6 +33,14 @@
   </div>
   <b class="px-1">{info.id}</b>
   {#if info.owner && info.owner !== $selfId}
-    (made by {$displayName ?? info.owner})
+    {#if $displayName}
+      (made by {$displayName}
+      {#if window.location.host.startsWith("127.0.0.1")}
+        - {info.owner}
+      {/if}
+      )
+    {:else }
+      ({info.owner})
+    {/if}
   {/if}
 </NextButton>
diff --git a/src/UI/Studio/EditLayerState.ts b/src/UI/Studio/EditLayerState.ts
index 75e821a9d..7a7d7f7ba 100644
--- a/src/UI/Studio/EditLayerState.ts
+++ b/src/UI/Studio/EditLayerState.ts
@@ -299,6 +299,9 @@ export default class EditLayerState extends EditJsonState<LayerConfigJson> {
 
 
         function cleanArray(data: object, key: string): boolean{
+            if(!data){
+                return false
+            }
             if (data[key]) {
                 // A bit of cleanup
                 const lBefore = data[key].length
@@ -312,7 +315,18 @@ export default class EditLayerState extends EditJsonState<LayerConfigJson> {
         }
 
         this.configuration.addCallbackAndRunD((layer) => {
-            const changed = cleanArray(layer, "tagRenderings") || cleanArray(layer, "pointRenderings")
+            let changed = cleanArray(layer, "tagRenderings") || cleanArray(layer, "pointRenderings")
+            for (const tr of layer.tagRenderings ?? []) {
+                if(typeof tr === "string"){
+                    continue
+                }
+
+                const qtr = (<QuestionableTagRenderingConfigJson> tr)
+                if(qtr.freeform && Object.keys(qtr.freeform ).length === 0){
+                    delete qtr.freeform
+                    changed = true
+                }
+            }
             if(changed){
                 this.configuration.ping()
             }