umap-project 1.14.0a4__py3-none-any.whl → 2.0.0a0__py3-none-any.whl

umap/static/umap/js/modules/request.js

@@ -0,0 +1,155 @@
+// Uses `L._`` from Leaflet.i18n which we cannot import as a module yet
+import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
+
+export class RequestError extends Error {}
+
+export class HTTPError extends RequestError {
+  constructor(message) {
+    super(message)
+    this.name = this.constructor.name
+  }
+}
+
+export class NOKError extends RequestError {
+  constructor(response) {
+    super(response.status)
+    this.response = response
+    this.status = response.status
+    this.name = this.constructor.name
+  }
+}
+
+class BaseRequest {
+  async _fetch(method, uri, headers, data) {
+    let response
+
+    try {
+      response = await fetch(uri, {
+        method: method,
+        mode: 'cors',
+        headers: headers,
+        body: data,
+      })
+    } catch (error) {
+      console.error(error)
+      throw new HTTPError(error.message)
+    }
+    if (!response.ok) {
+      throw new NOKError(response)
+    }
+
+    return response
+  }
+}
+
+// Basic class to issue request
+// It returns a response, or null in case of error
+// In case of error, an alert is sent, but non 20X status are not handled
+// The consumer must check the response status by hand
+export class Request extends BaseRequest {
+  constructor(ui) {
+    super()
+    this.ui = ui
+  }
+
+  async _fetch(method, uri, headers, data) {
+    const id = Math.random()
+    this.ui.fire('dataloading', { id: id })
+    try {
+      const response = await BaseRequest.prototype._fetch.call(
+        this,
+        method,
+        uri,
+        headers,
+        data
+      )
+      return response
+    } catch (error) {
+      if (error instanceof NOKError) return this._onNOK(error)
+      return this._onError(error)
+    } finally {
+      this.ui.fire('dataload', { id: id })
+    }
+  }
+
+  async get(uri, headers) {
+    return await this._fetch('GET', uri, headers)
+  }
+
+  async post(uri, headers, data) {
+    return await this._fetch('POST', uri, headers, data)
+  }
+
+  _onError(error) {
+    this.ui.alert({ content: L._('Problem in the response'), level: 'error' })
+  }
+
+  _onNOK(error) {
+    this._onError(error)
+    return error.response
+  }
+}
+
+// Adds uMap specifics to requests handling
+// like logging, CSRF, etc.
+// It expects only json responses.
+// Returns an array of three elements: [data, response, error]
+// The consumer must check the error to proceed or not with using the data or response
+export class ServerRequest extends Request {
+  async _fetch(method, uri, headers, data) {
+    // Add a flag so backend can know we are in ajax and adapt the response
+    // See is_ajax in utils.py
+    headers = headers || {}
+    headers['X-Requested-With'] = 'XMLHttpRequest'
+    return await Request.prototype._fetch.call(this, method, uri, headers, data)
+  }
+
+  async post(uri, headers, data) {
+    const token = document.cookie.replace(
+      /(?:(?:^|.*;\s*)csrftoken\s*\=\s*([^;]*).*$)|^.*$/,
+      '$1'
+    )
+    if (token) {
+      headers = headers || {}
+      headers['X-CSRFToken'] = token
+    }
+    const response = await Request.prototype.post.call(this, uri, headers, data)
+    return await this._as_json(response)
+  }
+
+  async get(uri, headers) {
+    const response = await Request.prototype.get.call(this, uri, headers)
+    return await this._as_json(response)
+  }
+
+  async _as_json(response) {
+    if (Array.isArray(response)) return response
+    try {
+      const data = await response.json()
+      if (data.info) {
+        this.ui.alert({ content: data.info, level: 'info' })
+        this.ui.closePanel()
+      } else if (data.error) {
+        this.ui.alert({ content: data.error, level: 'error' })
+        return this._onError(new Error(data.error))
+      }
+      return [data, response, null]
+    } catch (error) {
+      return this._onError(error)
+    }
+  }
+
+  _onError(error) {
+    return [{}, null, error]
+  }
+
+  _onNOK(error) {
+    if (error.status === 403) {
+      this.ui.alert({
+        content: message || L._('Action not allowed :('),
+        level: 'error',
+      })
+    }
+    return [{}, error.response, error]
+  }
+}

umap/static/umap/js/umap.autocomplete.js

@@ -1,4 +1,4 @@
-L.U.AutoComplete = L.Class.extend({
+U.AutoComplete = L.Class.extend({
   options: {
     placeholder: 'Start typing...',
     emptyMessage: 'No result',
@@ -12,8 +12,8 @@ L.U.AutoComplete = L.Class.extend({
 
   initialize: function (el, options) {
     this.el = el
-    const ui = new L.U.UI(document.querySelector('header'))
-    this.xhr = new L.U.Xhr(ui)
+    const ui = new U.UI(document.querySelector('header'))
+    this.server = new U.ServerRequest(ui)
     L.setOptions(this, options)
     let CURRENT = null
     try {
@@ -69,19 +69,19 @@ L.U.AutoComplete = L.Class.extend({
 
   onKeyDown: function (e) {
     switch (e.keyCode) {
-      case L.U.Keys.TAB:
+      case U.Keys.TAB:
         if (this.CURRENT !== null) this.setChoice()
         L.DomEvent.stop(e)
         break
-      case L.U.Keys.ENTER:
+      case U.Keys.ENTER:
         L.DomEvent.stop(e)
         this.setChoice()
         break
-      case L.U.Keys.ESC:
+      case U.Keys.ESC:
         L.DomEvent.stop(e)
         this.hide()
         break
-      case L.U.Keys.DOWN:
+      case U.Keys.DOWN:
         if (this.RESULTS.length > 0) {
           if (this.CURRENT !== null && this.CURRENT < this.RESULTS.length - 1) {
             // what if one result?
@@ -93,7 +93,7 @@ L.U.AutoComplete = L.Class.extend({
           }
         }
         break
-      case L.U.Keys.UP:
+      case U.Keys.UP:
         if (this.CURRENT !== null) {
           L.DomEvent.stop(e)
         }
@@ -112,16 +112,16 @@ L.U.AutoComplete = L.Class.extend({
 
   onKeyUp: function (e) {
     const special = [
-      L.U.Keys.TAB,
-      L.U.Keys.ENTER,
-      L.U.Keys.LEFT,
-      L.U.Keys.RIGHT,
-      L.U.Keys.DOWN,
-      L.U.Keys.UP,
-      L.U.Keys.APPLE,
-      L.U.Keys.SHIFT,
-      L.U.Keys.ALT,
-      L.U.Keys.CTRL,
+      U.Keys.TAB,
+      U.Keys.ENTER,
+      U.Keys.LEFT,
+      U.Keys.RIGHT,
+      U.Keys.DOWN,
+      U.Keys.UP,
+      U.Keys.APPLE,
+      U.Keys.SHIFT,
+      U.Keys.ALT,
+      U.Keys.CTRL,
     ]
     if (special.indexOf(e.keyCode) === -1) {
       this.search()
@@ -158,21 +158,19 @@ L.U.AutoComplete = L.Class.extend({
     }
   },
 
-  search: function () {
-    const val = this.input.value
+  search: async function () {
+    let val = this.input.value
     if (val.length < this.options.minChar) {
       this.clear()
       return
     }
     if (`${val}` === `${this.CACHE}`) return
     else this.CACHE = val
-    this._do_search(
-      val,
-      function (data) {
-        this.handleResults(data.data)
-      },
-      this
+    val = val.toLowerCase()
+    const [{ data }, response] = await this.server.get(
+      `/agnocomplete/AutocompleteUser/?q=${encodeURIComponent(val)}`
     )
+    this.handleResults(data)
   },
 
   createResult: function (item) {
@@ -257,9 +255,9 @@ L.U.AutoComplete = L.Class.extend({
   },
 })
 
-L.U.AutoComplete.Ajax = L.U.AutoComplete.extend({
+U.AutoComplete.Ajax = U.AutoComplete.extend({
   initialize: function (el, options) {
-    L.U.AutoComplete.prototype.initialize.call(this, el, options)
+    U.AutoComplete.prototype.initialize.call(this, el, options)
     if (!this.el) return this
     this.createInput()
     this.createContainer()
@@ -272,17 +270,9 @@ L.U.AutoComplete.Ajax = L.U.AutoComplete.extend({
       label: option.innerHTML,
     }
   },
-
-  _do_search: function (val, callback, context) {
-    val = val.toLowerCase()
-    this.xhr.get(`/agnocomplete/AutocompleteUser/?q=${encodeURIComponent(val)}`, {
-      callback: callback,
-      context: context || this,
-    })
-  },
 })
 
-L.U.AutoComplete.Ajax.SelectMultiple = L.U.AutoComplete.Ajax.extend({
+U.AutoComplete.Ajax.SelectMultiple = U.AutoComplete.Ajax.extend({
   initSelectedContainer: function () {
     return L.DomUtil.after(
       this.input,
@@ -308,7 +298,7 @@ L.U.AutoComplete.Ajax.SelectMultiple = L.U.AutoComplete.Ajax.extend({
   },
 })
 
-L.U.AutoComplete.Ajax.Select = L.U.AutoComplete.Ajax.extend({
+U.AutoComplete.Ajax.Select = U.AutoComplete.Ajax.extend({
   initSelectedContainer: function () {
     return L.DomUtil.after(
       this.input,