Merge fa82f8ef0a into 4dd50690b1

Broken since c27e675152

charts/umap/templates/configmap-templates.yaml

@@ -0,0 +1,12 @@
+{{ if .Values.umap.templates}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "umap.fullname" . }}-templates
+  labels:
+    {{- include "umap.labels" . | nindent 4 }}
+data:
+{{- range $k, $v := .Values.umap.templates }}
+    {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{end}}

charts/umap/templates/deployment.yaml

@@ -13,6 +13,7 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secret-config.yaml") . | sha256sum }}
+        checksum/templates: {{ include (print $.Template.BasePath "/configmap-templates.yaml") . | sha256sum }}
         checksum/env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
@@ -77,6 +78,14 @@ spec:
             - name: data
               mountPath: /srv/umap/uploads/
           {{- end }}
+          {{- if .Values.umap.templates}}
+          {{- range $k, $v := .Values.umap.templates }}
+            - name: templates
+              mountPath: /venv/lib/python3.11/site-packages/umap/templates/umap/{{- $k }}
+              subPath: {{ $k }}
+          {{- end }}
+          {{- end }}
+
       volumes:
         - name: config
           secret:
@@ -88,6 +97,12 @@ spec:
           persistentVolumeClaim:
             claimName: {{ include "umap.pvcName" . }}
       {{- end }}
+      {{- if .Values.umap.templates}}
+        - name: templates
+          configMap:
+            name: {{ include "umap.fullname" . }}-templates        
+      {{- end }}
+
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/umap/values.yaml

@@ -77,6 +77,17 @@ umap:
     SECRET_KEY: CHANGE_ME
     STATIC_ROOT: /srv/umap/static
     MEDIA_ROOT: /srv/umap/uploads
+  
+  templates: {}
+    # Overwrite templates like footer.html or header.html
+    #  footer.html: |
+    #    <a href="/imprint">Imprint</a>
+    #  header.html: |
+    #    custom Header    
+    #
+    # It is not recommended to overwrite other templates!
+    # list of templates: https://github.com/umap-project/umap/tree/master/umap/templates/umap
+    
   # You can also provide umap.conf content here:
   config: |
     from umap.settings.base import *

docs-users/requirements.txt

@@ -1,5 +1,5 @@
 # Force rtfd to use a recent version of mkdocs
 mkdocs==1.6.1
 pymdown-extensions==10.14.3
-mkdocs-material==9.5.50
+mkdocs-material==9.6.3
 mkdocs-static-i18n==1.3.0

docs/requirements.txt

@@ -1,5 +1,5 @@
 # Force rtfd to use a recent version of mkdocs
 mkdocs==1.6.1
 pymdown-extensions==10.14.3
-mkdocs-material==9.5.50
+mkdocs-material==9.6.3
 mkdocs-static-i18n==1.3.0

pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.1.5",
+  "Django==5.1.6",
   "django-agnocomplete==2.2.0",
   "django-environ==0.12.0",
   "django-probes==1.7.0",
@@ -44,10 +44,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.14.0",
-  "ruff==0.9.3",
+  "ruff==0.9.6",
   "djlint==1.36.4",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.5.50",
+  "mkdocs-material==9.6.3",
   "mkdocs-static-i18n==1.3.0",
   "vermin==1.6.0",
   "pymdown-extensions==10.14.3",
@@ -58,11 +58,11 @@ test = [
   "factory-boy==3.3.3",
   "playwright>=1.39",
   "pytest==8.3.4",
-  "pytest-django==4.9.0",
+  "pytest-django==4.10.0",
   "pytest-playwright==0.7.0",
   "pytest-rerunfailures==15.0",
   "pytest-xdist>=3.5.0,<4",
-  "moto[s3]==5.0.27"
+  "moto[s3]==5.0.28"
 ]
 docker = [
   "uwsgi==2.0.28",

umap/static/umap/js/modules/form/builder.js

@@ -63,7 +63,7 @@ export class Form extends Utils.WithEvents {
       try {
         value = value[sub]
       } catch {
-        console.log(field)
+        console.debug(field)
       }
     }
     return value
@@ -142,49 +142,50 @@ export class MutatingForm extends Form {
       slugKey: 'PropertyInput',
       labelKey: 'PropertyInput',
     }
-    for (const [key, schema] of Object.entries(SCHEMA)) {
+    for (const [key, defaults] of Object.entries(SCHEMA)) {
-      if (schema.type === Boolean) {
+      const properties = Object.assign({}, defaults)
-        if (schema.nullable) schema.handler = 'NullableChoices'
+      if (properties.type === Boolean) {
-        else schema.handler = 'Switch'
+        if (properties.nullable) properties.handler = 'NullableChoices'
-      } else if (schema.type === 'Text') {
+        else properties.handler = 'Switch'
-        schema.handler = 'Textarea'
+      } else if (properties.type === 'Text') {
-      } else if (schema.type === Number) {
+        properties.handler = 'Textarea'
-        if (schema.step) schema.handler = 'Range'
+      } else if (properties.type === Number) {
-        else schema.handler = 'IntInput'
+        if (properties.step) properties.handler = 'Range'
-      } else if (schema.choices) {
+        else properties.handler = 'IntInput'
-        const text_length = schema.choices.reduce(
+      } else if (properties.choices) {
+        const text_length = properties.choices.reduce(
           (acc, [_, label]) => acc + label.length,
           0
         )
         // Try to be smart and use MultiChoice only
         // for choices where labels are shorts…
         if (text_length < 40) {
-          schema.handler = 'MultiChoice'
+          properties.handler = 'MultiChoice'
         } else {
-          schema.handler = 'Select'
+          properties.handler = 'Select'
-          schema.selectOptions = schema.choices
+          properties.selectOptions = properties.choices
         }
       } else {
         switch (key) {
           case 'color':
           case 'fillColor':
-            schema.handler = 'ColorPicker'
+            properties.handler = 'ColorPicker'
             break
           case 'iconUrl':
-            schema.handler = 'IconUrl'
+            properties.handler = 'IconUrl'
             break
           case 'licence':
-            schema.handler = 'LicenceChooser'
+            properties.handler = 'LicenceChooser'
             break
         }
       }
 
       if (customHandlers[key]) {
-        schema.handler = customHandlers[key]
+        properties.handler = customHandlers[key]
       }
       // Input uses this key for its type attribute
-      delete schema.type
+      delete properties.type
-      this.defaultProperties[key] = schema
+      this.defaultProperties[key] = properties
     }
   }
 
@@ -202,7 +203,7 @@ export class MutatingForm extends Form {
   getTemplate(helper) {
     let template
     if (helper.properties.inheritable) {
-      const extraClassName = helper.get(true) === undefined ? ' undefined' : ''
+      const extraClassName = this.getter(helper.field) === undefined ? ' undefined' : ''
       template = `
         <div class="umap-field-${helper.name} formbox inheritable${extraClassName}">
           <div class="header" data-ref=header>

umap/static/umap/js/modules/form/fields.js

@@ -80,11 +80,13 @@ class BaseElement {
     this.input.value = ''
   }
 
-  get(own) {
+  get() {
-    if (!this.properties.inheritable || own) return this.builder.getter(this.field)
+    if (!this.properties.inheritable) return this.builder.getter(this.field)
     const path = this.field.split('.')
     const key = path[path.length - 1]
-    return this.obj.getOption(key) || SCHEMA[key]?.default
+    const value = this.obj.getOption(key)
+    if (value === undefined) return SCHEMA[key]?.default
+    return value
   }
 
   toHTML() {
@@ -1164,7 +1166,7 @@ Fields.MultiChoice = class extends BaseElement {
 
 Fields.TernaryChoices = class extends Fields.MultiChoice {
   getDefault() {
-    return 'null'
+    return null
   }
 
   toJS() {
@@ -1195,7 +1197,7 @@ Fields.NullableChoices = class extends Fields.TernaryChoices {
       this.properties.choices || [
         [true, translate('always')],
         [false, translate('never')],
-        ['null', translate('hidden')],
+        [null, translate('hidden')],
       ]
     )
   }

umap/static/umap/js/modules/schema.js

@@ -450,7 +450,7 @@ export const SCHEMA = {
     choices: [
       [true, translate('always')],
       [false, translate('never')],
-      ['null', translate('on hover')],
+      [null, translate('on hover')],
     ],
   },
   slideshow: {

umap/tests/integration/test_edit_map.py

@@ -210,3 +210,19 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     assert "Z First" == first_listed_feature.text_content()
     assert "Y Second" == second_listed_feature.text_content()
     assert "X Third" == third_listed_feature.text_content()
+
+
+def test_hover_tooltip_setting_should_be_persistent(live_server, map, page):
+    map.settings["properties"]["showLabel"] = None
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    page.get_by_role("button", name="Map advanced properties").click()
+    page.get_by_text("Default interaction options").click()
+    expect(page.get_by_text("on hover")).to_be_visible()
+    expect(page.locator(".umap-field-showLabel")).to_match_aria_snapshot("""
+        - text: Display label
+        - button "clear"
+        - text: always never on hover
+    """)
+    expect(page.locator(".umap-field-showLabel input[value=null]")).to_be_checked()

umap/tests/integration/test_view_marker.py

@@ -181,3 +181,13 @@ def test_only_visible_markers_are_added_to_dom(live_server, map, page):
     )
     expect(markers).to_have_count(1)
     expect(tooltips).to_have_count(1)
+
+
+def test_should_display_tooltip_on_hover(live_server, map, page, bootstrap):
+    map.settings["properties"]["showLabel"] = None
+    map.settings["properties"]["labelKey"] = "Foo {name}"
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_text("Foo test marker")).to_be_hidden()
+    page.locator(".leaflet-marker-icon").hover()
+    expect(page.get_by_text("Foo test marker")).to_be_visible()