Migrate all jQuery promises to native ES6 Promise (ref: $.Deferred(), $.when(), $.get() and $.post())

package.json

@@ -30,6 +30,7 @@
   "dependencies": {
     "regenerator-runtime": "^0.13.9",
     "shp-write": "^0.3.2",
+    "util-deprecate": "^1.0.2",
     "vue": "2.6.12",
     "vue-color": "^2.8.1",
     "vue-cookie": "^1.1.4",

src/app/core/editing/editor.js

@@ -114,36 +114,34 @@ proto._doGetFeaturesRequest = function(options={}) {
 
 // get features from server method
 proto._getFeatures = function(options={}) {
-  const d = $.Deferred();
-  const doRequest = this._doGetFeaturesRequest(options);
-  if (!doRequest) d.resolve();
-  else
-    this._layer.getFeatures(options)
-      .then(promise => {
-        promise.then(features => {
+  return new Promise((resolve, reject) => {
+    const doRequest = this._doGetFeaturesRequest(options);
+    if (!doRequest) resolve();
+    else
+      this._layer.getFeatures(options)
+        .then(features => {
           this._addFeaturesFromServer(features);
           this._allfeatures = !options.filter;
-          return d.resolve(features);
-        }).fail(err => d.reject(err))
-      })
-      .fail(err => d.reject(err));
-  return d.promise();
+          return resolve(features);
+        })
+        .catch(err => reject(err))
+  });
 };
 
 // method to revert (cancel) all changes in history and clean session
 proto.revert = function() {
-  const d = $.Deferred();
-  const features  = this._cloneFeatures(this._layer.readFeatures());
-  this._featuresstore.setFeatures(features);
-  d.resolve();
-  return d.promise();
+  return new Promise((resolve, reject) => {
+    const features  = this._cloneFeatures(this._layer.readFeatures());
+    this._featuresstore.setFeatures(features);
+    resolve();
+  })
 };
 
 proto.rollback = function(changes=[]) {
-  const d = $.Deferred();
-  this._applyChanges(changes, true);
-  d.resolve();
-  return d.promise()
+  return new Promise((resolve, reject) => {
+    this._applyChanges(changes, true);
+    resolve();
+  })
 };
 
 proto.applyChangesToNewRelationsAfterCommit = function(relationsResponse) {
@@ -208,51 +206,42 @@ proto.getLockIds = function(){
 
 // run after server apply changed to origin resource
 proto.commit = function(commitItems) {
-  const d = $.Deferred();
-  // in case of relations bind to new feature
-  const relations = commitItems.add.length ? Object.keys(commitItems.relations).map(relationId => {
-    const layerRelation = this._layer.getRelations().getRelationByFatherChildren(this._layer.getId(), relationId);
-    const updates = commitItems.relations[relationId].update.map(relation => relation.id);
-    const add = commitItems.relations[relationId].add.map(relation => relation.id);
-    return {
-      [relationId]:{
-        ids: [...add, ...updates],
-        fatherField: layerRelation.getFatherField(),
-        childField: layerRelation.getChildField()
+  return new Promise((resolve, reject) => {
+    // in case of relations bind to new feature
+    const relations = commitItems.add.length ? Object.keys(commitItems.relations).map(relationId => {
+      const layerRelation = this._layer.getRelations().getRelationByFatherChildren(this._layer.getId(), relationId);
+      const updates = commitItems.relations[relationId].update.map(relation => relation.id);
+      const add = commitItems.relations[relationId].add.map(relation => relation.id);
+      return {
+        [relationId]:{
+          ids: [...add, ...updates],
+          fatherField: layerRelation.getFatherField(),
+          childField: layerRelation.getChildField()
+        }
       }
-    }
-  }) : [];
-  this._layer.commit(commitItems)
-    .then(promise => {
-      promise
-        .then(response => {
-          this.applyCommitResponse(response, relations);
-          d.resolve(response);
-        })
-        .fail(err => d.reject(err))
-    })
-    .fail(err => d.reject(err));
-  return d.promise();
+    }) : [];
+    this._layer.commit(commitItems)
+      .then(response => {
+        this.applyCommitResponse(response, relations);
+        resolve(response);
+      })
+      .catch(err => reject(err))
+  })
 };
 
 //start editing function
 proto.start = function(options={}) {
-  const d = $.Deferred();
-  // load features of layer based on filter type
-  this.getFeatures(options)
-    .then(promise => {
-      promise
-        .then(features => {
-          // the features are already inside featuresstore
-          d.resolve(features);
-          //if all ok set to started
-          this._started = true;
-        })
-        .fail(err => d.reject(err))
-
-    })
-    .fail(err => d.reject(err));
-  return d.promise()
+  return new Promise((resolve, reject) => {
+    // load features of layer based on filter type
+    this.getFeatures(options)
+      .then(features => {
+        // the features are already inside featuresstore
+        resolve(features);
+        //if all ok set to started
+        this._started = true;
+      })
+      .catch(err => reject(err))
+  })
 };
 
 //action to layer
@@ -283,14 +272,14 @@ proto.readEditingFeatures = function(){
 
 // stop editor
 proto.stop = function() {
-  const d = $.Deferred();
-  this._layer.unlock()
-    .then(response => {
-      this.clear();
-      d.resolve(response);
-    })
-    .fail(err => d.reject(err));
-  return d.promise();
+  return new Promise((resolve, reject) => {
+    this._layer.unlock()
+      .then(response => {
+        this.clear();
+        resolve(response);
+      })
+      .catch(err => reject(err));
+  })
 };
 
 //run save layer

src/app/core/editing/history.js

@@ -42,33 +42,33 @@ const proto = History.prototype;
 
 proto.add = function(uniqueId, items) {
   //state object is an array of feature/features changed in a transaction
-  const d = $.Deferred();
-  // before insert an item into the history
-  // check if are at last state step (no redo was done)
-  // in this way avoid starge barch in the history
-  //If we are in the middle of undo, delete all changes in the histroy from the current "state"
-  // so i can create a new history
+  return new Promise((resolve, reject) => {
+      // before insert an item into the history
+      // check if are at last state step (no redo was done)
+      // in this way avoid starge barch in the history
+      //If we are in the middle of undo, delete all changes in the histroy from the current "state"
+      // so i can create a new history
 
-  if (this._current === null) {
-    this._states = [{
-      id: uniqueId,
-      items
-    }]
-  } else {
-    if (this._states.length && this._current < this.getLastState().id)
-      this._states = this._states.filter(state => state.id <= this._current);
-    this._states.push({
-      id: uniqueId,
-      items
-    });
-  }
+      if (this._current === null) {
+        this._states = [{
+          id: uniqueId,
+          items
+        }]
+      } else {
+        if (this._states.length && this._current < this.getLastState().id)
+          this._states = this._states.filter(state => state.id <= this._current);
+        this._states.push({
+          id: uniqueId,
+          items
+        });
+      }
 
-  this._current = uniqueId;
-  this._setState();
-  // return unique id key
-  // it can be used in save relation
-  d.resolve(uniqueId);
-  return d.promise();
+      this._current = uniqueId;
+      this._setState();
+      // return unique id key
+      // it can be used in save relation
+      resolve(uniqueId);
+  })
 };
 
 proto.getRelationStates = function(layerId, {clear=false}={}) {