fix: fix pictogram categories always hidden (#2630)

If user is authenticated.

We do not display alert messages on the home page.

umap/static/umap/js/modules/data/features.js

@@ -146,14 +146,13 @@ class Feature {
   }
 
   onCommit() {
+    this.pullGeometry(false)
     // When the layer is a remote layer, we don't want to sync the creation of the
     // points via the websocket, as the other peers will get them themselves.
-    const oldGeoJSON = this._just_married ? null : Utils.CopyJSON(this.toGeoJSON())
-    this.pullGeometry(false)
     if (this.datalayer?.isRemoteLayer()) return
-    if (this._just_married) {
+    if (this._needs_upsert) {
       this.sync.upsert(this.toGeoJSON(), null)
-      this._just_married = false
+      this._needs_upsert = false
     } else {
       this.sync.update('geometry', this.geometry, this._geometry_bk)
     }

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

@@ -808,9 +808,10 @@ Fields.IconUrl = class extends Fields.BlurInput {
   }
 
   addCategory(items, name) {
+    const hidden = name ? '' : ' hidden'
     const [parent, { grid }] = Utils.loadTemplateWithRefs(`
       <div class="umap-pictogram-category">
-        <h6 hidden=${!name}>${name}</h6>
+        <h6${hidden}>${name}</h6>
         <div class="umap-pictogram-grid" data-ref=grid></div>
       </div>
     `)

umap/static/umap/js/modules/importers/cadastrefr.js

@@ -8,18 +8,20 @@ import { AutocompleteCommunes } from './communesfr.js'
 const TEMPLATE = `
   <h3>Cadastre</h3>
   <p>Importer les données cadastrales d’une commune française.</p>
-  <select name="theme">
+  <div class="formbox">
-    <option value="batiments">Bâtiments</option>
+    <select name="theme">
-    <option value="communes">Communes</option>
+      <option value="batiments">Bâtiments</option>
-    <option value="feuilles">Feuilles</option>
+      <option value="communes">Communes</option>
-    <option value="lieux_dits">Lieux dits</option>
+      <option value="feuilles">Feuilles</option>
-    <option value="parcelles" selected>Parcelles</option>
+      <option value="lieux_dits">Lieux dits</option>
-    <option value="prefixes_sections">Préfixes sections</option>
+      <option value="parcelles" selected>Parcelles</option>
-    <option value="sections">Sections</option>
+      <option value="prefixes_sections">Préfixes sections</option>
-    <option value="subdivisions_fiscales">Subdivisions fiscales</option>
+      <option value="sections">Sections</option>
-  </select>
+      <option value="subdivisions_fiscales">Subdivisions fiscales</option>
-  <label id="boundary">
+    </select>
-  </label>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 export class Importer {

umap/static/umap/js/modules/importers/geodatamine.js

@@ -16,15 +16,17 @@ const BOUNDARY_TYPES = {
 const TEMPLATE = `
   <h3>GeoDataMine</h3>
   <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
-  <select name="theme">
+  <div class="formbox">
-    <option value="">${translate('Choose a theme')}</option>
+    <select name="theme">
-  </select>
+      <option value="">${translate('Choose a theme')}</option>
-  <label>
+    </select>
-    <input type="checkbox" name="aspoint" />
+    <label>
-    ${translate('Symplify all geometries to points')}
+      <input type="checkbox" name="aspoint" />
-  </label>
+      ${translate('Simplify all geometries to points')}
-  <label id="boundary">
+    </label>
-  </label>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {

umap/static/umap/js/umap.controls.js

@@ -629,7 +629,7 @@ U.Editable = L.Editable.extend({
     const line = new U.LineString(this._umap, datalayer, {
       geometry: { type: 'LineString', coordinates: [] },
     })
-    line._just_married = true
+    line._needs_upsert = true
     return line.ui
   },
 
@@ -638,7 +638,7 @@ U.Editable = L.Editable.extend({
     const poly = new U.Polygon(this._umap, datalayer, {
       geometry: { type: 'Polygon', coordinates: [] },
     })
-    poly._just_married = true
+    poly._needs_upsert = true
     return poly.ui
   },
 
@@ -647,7 +647,7 @@ U.Editable = L.Editable.extend({
     const point = new U.Point(this._umap, datalayer, {
       geometry: { type: 'Point', coordinates: [latlng.lng, latlng.lat] },
     })
-    point._just_married = true
+    point._needs_upsert = true
     return point.ui
   },
 

umap/static/umap/map.css

@@ -325,6 +325,7 @@ ul.photon-autocomplete {
 }
 .umap-edit-enabled .photon-autocomplete li.on .search-result-tools {
     display: flex;
+    position: relative;
 }
 
 

umap/tests/integration/test_picto.py

@@ -32,9 +32,15 @@ FIXTURES = Path(__file__).parent.parent / "fixtures"
 @pytest.fixture
 def pictos():
     path = FIXTURES / "star.svg"
-    Pictogram(name="star", pictogram=ContentFile(path.read_text(), path.name)).save()
+    Pictogram(
+        name="star", pictogram=ContentFile(path.read_text(), path.name), category="cat1"
+    ).save()
     path = FIXTURES / "circle.svg"
-    Pictogram(name="circle", pictogram=ContentFile(path.read_text(), path.name)).save()
+    Pictogram(
+        name="circle",
+        pictogram=ContentFile(path.read_text(), path.name),
+        category="cat2",
+    ).save()
 
 
 def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
@@ -57,6 +63,8 @@ def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
     define.click()
     # No picto defined yet, so recent should not be visible
     expect(page.get_by_text("Recent")).to_be_hidden()
+    expect(page.get_by_text("cat1")).to_be_visible()
+    expect(page.get_by_text("cat2")).to_be_visible()
     symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(symbols).to_have_count(2)
     search = page.locator(".umap-pictogram-body input")

umap/views.py

@@ -1047,12 +1047,15 @@ class MapDelete(DeleteView):
         if not self.object.can_delete(self.request):
             return HttpResponseForbidden(_("Only its owner can delete the map."))
         self.object.move_to_trash()
-        home_url = reverse("home")
+        if self.request.user.is_authenticated:
+            redirect_url = reverse("user_dashboard")
+        else:
+            redirect_url = reverse("home")
         messages.info(self.request, _("Map successfully deleted."))
         if is_ajax(self.request):
-            return simple_json_response(redirect=home_url)
+            return simple_json_response(redirect=redirect_url)
         else:
-            return HttpResponseRedirect(form.data.get("next") or home_url)
+            return HttpResponseRedirect(form.data.get("next") or redirect_url)
 
 
 class MapClone(PermissionsMixin, View):