From f5eea1fe3f390ee36ae10505a449e5601c668d56 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Fri, 31 May 2024 19:07:42 +0200
Subject: [PATCH] wip(naming): replace "plugin" by "importer"

We are not ready yet to talk about plugins
---
 umap/settings/base.py                   |  2 +-
 umap/static/umap/js/modules/importer.js | 28 +++++++++++++------------
 umap/static/umap/js/umap.js             |  3 ---
 umap/views.py                           |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/umap/settings/base.py b/umap/settings/base.py
index 0fad343c..b63c72f4 100644
--- a/umap/settings/base.py
+++ b/umap/settings/base.py
@@ -259,7 +259,7 @@ UMAP_DEFAULT_SHARE_STATUS = None
 UMAP_DEFAULT_EDIT_STATUS = None
 UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False
 UMAP_HOME_FEED = "latest"
-UMAP_EXPERIMENTAL_PLUGINS = {
+UMAP_EXPERIMENTAL_IMPORTERS = {
     # "geodatamine": {},
     # "communesfr": {},
     # "presets": {
diff --git a/umap/static/umap/js/modules/importer.js b/umap/static/umap/js/modules/importer.js
index cee0cf9c..b0eac871 100644
--- a/umap/static/umap/js/modules/importer.js
+++ b/umap/static/umap/js/modules/importer.js
@@ -3,7 +3,7 @@ import { translate } from './i18n.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import Dialog from './ui/dialog.js'
 
-const AVAILABLE_PLUGINS = ['geodatamine', 'communesfr', 'presets']
+const AVAILABLE_IMPORTERS = ['geodatamine', 'communesfr', 'presets']
 
 const TEMPLATE = `
     <h3><i class="icon icon-16 icon-upload"></i><span>${translate('Import data')}</span></h3>
@@ -12,9 +12,9 @@ const TEMPLATE = `
       <input type="url" placeholder="${translate('Provide an URL here')}" />
       <textarea placeholder="${translate('Paste your data here')}"></textarea>
     </div>
-    <div class="plugins">
+    <div class="importers">
       <h4>${translate('Import from:')}</h4>
-      <div class="button-bar by4" id="plugins">
+      <div class="button-bar by4" id="importers">
       </div>
     </div>
     <label data-help="importFormats">
@@ -40,16 +40,18 @@ export default class Importer {
   constructor(map) {
     this.map = map
     this.TYPES = ['geojson', 'csv', 'gpx', 'kml', 'osm', 'georss', 'umap']
-    this.PLUGINS = []
-    this.loadPlugins()
+    this.IMPORTERS = []
+    this.loadImporterss()
     this.dialog = new Dialog(this.map._controlContainer)
   }
 
-  loadPlugins() {
-    for (const key of AVAILABLE_PLUGINS) {
-      if (key in this.map.options.plugins) {
+  loadImporterss() {
+    for (const key of AVAILABLE_IMPORTERS) {
+      if (key in this.map.options.importers) {
         import(`./importers/${key}.js`).then((mod) => {
-          this.PLUGINS.push(new mod.Importer(this.map, this.map.options.plugins[key]))
+          this.IMPORTERS.push(
+            new mod.Importer(this.map, this.map.options.importers[key])
+          )
         })
       }
     }
@@ -95,17 +97,17 @@ export default class Importer {
   build() {
     this.container = DomUtil.create('div', 'umap-upload')
     this.container.innerHTML = TEMPLATE
-    if (this.PLUGINS.length) {
-      for (const plugin of this.PLUGINS) {
+    if (this.IMPORTERS.length) {
+      for (const plugin of this.IMPORTERS) {
         L.DomUtil.createButton(
           'flat',
-          this.container.querySelector('#plugins'),
+          this.container.querySelector('#importers'),
           plugin.name,
           () => plugin.open(this)
         )
       }
     } else {
-      this.qs('.plugins').style.display = 'none'
+      this.qs('.importers').style.display = 'none'
     }
     for (const type of this.TYPES) {
       DomUtil.element({
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index 2601b1fb..1a90fc5d 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -20,9 +20,6 @@ L.Map.mergeOptions({
   enablePolygonDraw: true,
   enablePolylineDraw: true,
   limitBounds: {},
-  importPresets: [
-    // {url: 'http://localhost:8019/en/datalayer/1502/', label: 'Simplified World Countries', format: 'geojson'}
-  ],
   slideshow: {},
   clickable: true,
   permissions: {},
diff --git a/umap/views.py b/umap/views.py
index 8258ac1c..93bbcfcb 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -505,7 +505,7 @@ class MapDetailMixin:
             "featuresHaveOwner": settings.UMAP_DEFAULT_FEATURES_HAVE_OWNERS,
             "websocketEnabled": settings.WEBSOCKET_ENABLED,
             "websocketURI": settings.WEBSOCKET_FRONT_URI,
-            "plugins": settings.UMAP_EXPERIMENTAL_PLUGINS,
+            "importers": settings.UMAP_EXPERIMENTAL_IMPORTERS,
         }
         created = bool(getattr(self, "object", None))
         if (created and self.object.owner) or (not created and not user.is_anonymous):