cronapp-common-js 2.8.4 → 2.8.8

package/js/datasource/datasource.js

@@ -2,6 +2,7 @@
 var ISO_PATTERN  = new RegExp("(\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d\\.\\d+([+-][0-2]\\d:[0-5]\\d|Z))|(\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d([+-][0-2]\\d:[0-5]\\d|Z))|(\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d([+-][0-2]\\d:[0-5]\\d|Z))");
 var TIME_PATTERN  = new RegExp("PT(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)(?:\\.(\\d+)?)?S)?");
 var DEP_PATTERN  = new RegExp("\\{\\{(.*?)\\|raw\\}\\}");
+var HTTP_STATUS = new RegExp("HTTP\\/1\\.1 (\\d+) (.*)");
 
 
 (function ($) {
@@ -78,6 +79,7 @@ var initDatasource = function(scope, element, attrs, DatasetManager, $timeout, $
     onAfterUpdate: attrs.onAfterUpdate,
     onBeforeDelete: attrs.onBeforeDelete,
     onAfterDelete: attrs.onAfterDelete,
+    onChangeStatus: attrs.onChangeStatus,
     onGet: attrs.onGet,
     onPost: attrs.onPost,
     onPut: attrs.onPut,
@@ -341,6 +343,23 @@ angular.module('datasourcejs', [])
   // Global dataset List
   this.datasets = {};
 
+  const $httpLegacy = (config) => {
+    let http = $http(config);
+    return {
+      success: function (thenCallback) {
+        http.then(response => {
+          thenCallback(response.data, response.status, response.headers, response.config);
+        });
+        return this;
+      },
+      error: function (catchCallback) {
+        http.catch(response => {
+          catchCallback(response.data, response.status, response.headers, response.config);
+        });
+        return this;
+      }
+    }
+  };
   /**
    * Class representing a single dataset
    */
@@ -451,8 +470,8 @@ angular.module('datasourcejs', [])
         update: function(url, object) {
           return this.call(url, "PUT", object, false);
         },
-        remove: function(url) {
-          return this.call(url, "DELETE", null, true);
+        remove: function(url, object) {
+          return this.call(url, "DELETE", object, true);
         },
         call: function(url, verb, obj, applyScope) {
           var object = {};
@@ -499,6 +518,7 @@ angular.module('datasourcejs', [])
           delete cloneObject.$$hashKey;
           delete cloneObject.__fromMemory;
           delete cloneObject.__odatafiles;
+          delete cloneObject.__$masterExpression;
 
           for (var key in cloneObject) {
             if (key.indexOf('__odataFile_') > -1) {
@@ -507,28 +527,30 @@ angular.module('datasourcejs', [])
             }
           }
 
-          // Get an ajax promise
-          this.$promise = _self.getService(verb)({
-            method: verb,
-            url: _self.removeSlash(((window.hostApp || "") + url)),
-            data: (object) ? JSON.stringify(cloneObject) : null,
-            headers: _self.headers,
-            rawData: (object) ? cloneObject : null
-          }).success(function(data, status, headers, config) {
+          for (var key in cloneObject) {
+            if (cloneObject.hasOwnProperty(key)) {
+              let value = cloneObject[key];
+              if (_self.isAutoGeneratedValue(value)) {
+                delete cloneObject[key];
+              }
+            }
+          }
+
+          var success = function(data, status, headers, config, batchPostponed) {
             _self.busy = false;
             if (_callback) {
               if (_self.isOData()) {
                 if (data.d != null && data.d.result != null) {
                   _self.normalizeData(data.d.result);
-                  _callback(data.d.result, true);
+                  _callback(data.d.result, true, batchPostponed);
                 } else if (data.d != null) {
                   _self.normalizeObject(data.d);
-                  _callback(data.d, true);
+                  _callback(data.d, true, batchPostponed);
                 } else {
-                  _callback(data, true);
+                  _callback(data, true, batchPostponed);
                 }
               } else {
-                _callback(isCronapiQuery?data.value:data, true);
+                _callback(isCronapiQuery?data.value:data, true, batchPostponed);
               }
             }
             if (isCronapiQuery || _self.isOData()) {
@@ -540,26 +562,49 @@ angular.module('datasourcejs', [])
               }
               _self.$scope.cronapi.evalInContext(JSON.stringify(commands));
             }
-          }).error(function(data, status, headers, config) {
-            _self.busy = false;
-            var msg;
-            if (_self.isOData()) {
-              msg = data.error.message.value;
-            } else {
-              msg = isCronapiQuery&&data.value?data.value:data
-            }
-            _self.handleError(msg);
-            if (_callbackError) {
-              _callbackError(msg);
-            }
-          });
+          };
+
+          var ds = _self.getParentDatasource();
+          let batchObj = ds.getBatchDataItem(object);
+          if (batchObj && batchObj.result) {
+            let idx = ds.batchServiceData.indexOf(batchObj);
+            ds.batchServiceData.splice(idx, 1);
+            $timeout(() => {
+              success(batchObj.result);
+            },0);
 
-          this.$promise.then = function(callback) {
+            this.$promise = {};
+          } else {
+            // Get an ajax promise
+            this.$promise = _self.getService(verb, object)({
+              method: verb,
+              url: _self.removeSlash(((window.hostApp || "") + url)),
+              data: verb!='DELETE'?((object) ? JSON.stringify(cloneObject) : null):null,
+              headers: _self.headers,
+              rawData: (object) ? cloneObject : null,
+              originalObject: (object) ? object : null,
+              urlPart: url
+            }).success(success).error(function (data, status, headers, config) {
+              _self.busy = false;
+              var msg;
+              if (_self.isOData()) {
+                msg = data.error.message.value;
+              } else {
+                msg = isCronapiQuery && data.value ? data.value : data
+              }
+              _self.handleError(msg);
+              if (_callbackError) {
+                _callbackError(msg);
+              }
+            });
+          }
+
+          this.$promise.then = function (callback) {
             _callback = callback;
             return this;
           }
 
-          this.$promise.error = function(callback) {
+          this.$promise.error = function (callback) {
             _callbackError = callback;
             return this;
           }
@@ -567,6 +612,12 @@ angular.module('datasourcejs', [])
         }
       }
 
+      this.isAutoGeneratedValue = function(value) {
+        return typeof value === 'string'
+            && value.length > 10
+            && (value.startsWith("$autogenerated$") || value.substring(1).startsWith("$autogenerated$"));
+      }
+
       this.getIndexedDB = function(properties) {
         if (!window.indexedDB) {
           window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
@@ -666,6 +717,212 @@ angular.module('datasourcejs', [])
 
       }
 
+      this.batchServiceData = [];
+
+      this.getBatchService = function(verb) {
+        return function(properties) {
+          var promise = {
+            verb: verb,
+            properties: properties,
+            successCallback: null,
+            errorCallback: null,
+            success: function (successCallback) {
+              this.successCallback = successCallback;
+              return this;
+            },
+
+            error: function (errorCallback) {
+              this.errorCallback = errorCallback;
+              return this;
+            }
+          };
+
+          $timeout(function() {
+            var ds = this.getParentDatasource();
+            let obj = properties.originalObject || properties.rawData || properties.data || this.active
+
+            let entity = this.entity;
+
+            if (verb == 'PUT') {
+              entity = this.getEditionURL(obj);
+            }
+
+            if (verb == 'DELETE') {
+              entity = this.getDeletionURL(obj);
+            }
+
+            if (entity.indexOf("/") > 0) {
+              entity = entity.substring(entity.lastIndexOf("/")+1, entity.length);
+            }
+
+            ds.batchServiceData.push({
+              entity: entity,
+              data: obj,
+              promise: promise
+            });
+
+            if (promise.successCallback) {
+              promise.successCallback.call(this, obj, null, null, null, true);
+            }
+          }.bind(this));
+
+          return promise;
+        }.bind(this);
+      }
+
+      this.batchEnabled = function(obj) {
+        if (obj && this.hasPendingChanges()) {
+          return this.getBatchDataItem(obj) != null ? false : true;
+        }
+
+        return false;
+      }
+
+      this.getBatchDataItem = function(obj) {
+        if (obj) {
+          var ds = this.getParentDatasource();
+          for (let i = 0; i < ds.batchServiceData.length; i++) {
+            let data = ds.batchServiceData[i].data;
+            if (data.__$id == obj.__$id) {
+              return ds.batchServiceData[i];
+            }
+          }
+        }
+
+        return null;
+      }
+
+      this.performBatchPost = function(originCallback) {
+        return new Promise((resolve, reject) => {
+          let boundary = "batch_" + this.uuidv4();
+          let odataPost = "";
+
+          odataPost += "--" + boundary + "\n";
+          let changeSet = "changeset_" + this.uuidv4();
+          odataPost += "Content-Type: multipart/mixed; boundary=" + changeSet + "\n";
+
+          for (let i = 0; i < this.batchServiceData.length; i++) {
+            let batchData = this.batchServiceData[i];
+
+            odataPost += "--" + changeSet + "\n";
+
+            odataPost += "Content-Type: application/http\n";
+            odataPost += "Content-Transfer-Encoding:binary\n";
+
+            odataPost += batchData.promise.properties.method + " " + batchData.entity + " HTTP/1.1\n";
+            odataPost += "Content-Type: application/json\n";
+            odataPost += "Accept: application/json\n";
+            odataPost += "X-Master-Id: "+batchData.promise.properties.originalObject.__$id+"\n";
+            if (batchData.promise.properties.originalObject.__$masterExpression) {
+              odataPost += "X-Detail-Fill: " + batchData.promise.properties.originalObject.__$masterExpression + "\n";
+            }
+
+            let headers = batchData.promise.properties.headers;
+            for (var key in headers) {
+              if (headers.hasOwnProperty(key)) {
+                odataPost += key + ": " + headers[key] + "\n";
+              }
+            }
+
+            if (batchData.promise.properties.method != 'DELETE') {
+              odataPost += batchData.promise.properties.data + "\n";
+            }
+
+          }
+
+          odataPost += "--" + changeSet + "--\n";
+          odataPost += "--" + boundary + "--\n";
+          console.log(odataPost);
+
+          let url = this.entity;
+          if (url.indexOf("/") > 0) {
+            url = url.substring(0, url.lastIndexOf("/"));
+          }
+
+          let headers = {};
+
+          this.copy(this.headers, headers);
+          headers["Content-Type"] = "multipart/mixed; boundary=" + boundary;
+
+          let error = (data, status, headers, config) => {
+            let callback;
+            if (this.batchServiceData.length > 0) {
+              callback = this.batchServiceData[0].promise.errorCallback;
+            }
+
+            if (callback) {
+              callback(data, status, headers, config, false);
+            } else {
+              this.handleError(data)
+            }
+
+            this.batchServiceData = [];
+          };
+
+          $httpLegacy({
+            method: "POST",
+            url: _self.removeSlash(((window.hostApp || "") + url + "/$batch")),
+            data: odataPost,
+            headers: headers,
+          }).success(function (data, status, headers, config, batchPostponed) {
+            let result = this.parseBatchResult(data);
+            for (let i = 0; i < result.length; i++) {
+              if (result[i].status >= 400) {
+                error(result[i].data, result[i].status);
+                return;
+              }
+            }
+            for (let i = 0; i < this.batchServiceData.length; i++) {
+              this.batchServiceData[i].result = result[i].data == null ? this.batchServiceData[i].data : result[i].data;
+            }
+
+            if (originCallback) {
+              originCallback();
+            } else {
+              let callback;
+              if (this.batchServiceData.length > 0) {
+                callback = this.batchServiceData[0].promise.successCallback;
+              }
+
+              if (callback) {
+                this.batchServiceData.splice(0, 1);
+                callback(result[0].data, result[0].status, headers, config, false);
+              }
+            }
+
+          }.bind(this)).error(error);
+        });
+      }
+
+      this.parseBatchResult = function(data) {
+        let results = [];
+        let lines = data.split("\n");
+        let status;
+        for (let j=0;j<lines.length;j++) {
+          let line = lines[j];
+          if (line.startsWith("{")) {
+            results.push({
+              status: status,
+              data: JSON.parse(line)
+            });
+          }
+
+          if (line.startsWith("HTTP/1.1")) {
+            var g = HTTP_STATUS.exec(line);
+            status = g[1];
+          }
+
+          if (line.startsWith("HTTP/1.1") && line.indexOf("No Content") > 0) {
+            results.push({
+              status: status,
+              data: null
+            });
+          }
+        }
+
+        return results;
+      }
+
       this.uuidv4 = function() {
         return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
           var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
@@ -673,7 +930,7 @@ angular.module('datasourcejs', [])
         });
       }
 
-      this.getService = function(verb) {
+      this.getService = function(verb, object) {
         _self = this;
         var event = eval("this.on"+verb);
 
@@ -790,7 +1047,10 @@ angular.module('datasourcejs', [])
 
         }
 
-        return $http;
+        if (this.batchEnabled(object) && verb != 'GET') {
+          return this.getBatchService(verb);
+        }
+        return $httpLegacy;
       }
 
       /**
@@ -1096,6 +1356,14 @@ angular.module('datasourcejs', [])
       }
     }
 
+    this.getParentDatasource = function() {
+      if (this.dependentLazyPost) {
+        return eval(this.dependentLazyPost).getParentDatasource();
+      }
+
+      return this
+    }
+
     this.updateObjectAtIndex = function(obj, data, idx) {
       data = data || this.data;
 
@@ -1105,6 +1373,7 @@ angular.module('datasourcejs', [])
       delete data[idx].__original;
       delete data[idx].__originalIdx;
       delete data[idx].__odatafiles;
+      delete data[idx].__$masterExpression;
     }
 
     this.cleanDependentBuffer = function() {
@@ -1169,23 +1438,25 @@ angular.module('datasourcejs', [])
       }
 
       this.cleanDependentBuffer();
+      this.batchServiceData = [];
       if (callback) {
         callback();
       }
     }
 
-    this.flushDependencies = function(callback) {
+    this.flushDependencies = function(callback, batchPostponed) {
+      var reset = [];
       if (this.dependentData) {
 
         var ins = function() {
 
           reduce(this.dependentData, function (item, resolve) {
-            item.storeDependentBuffer(function () {
+            reset.push(item.storeDependentBuffer(function () {
               resolve();
-            });
+            }, undefined, batchPostponed))
           }.bind(this), function () {
             if (callback) {
-              callback();
+              callback(reset);
             }
           }.bind(this))
 
@@ -1194,7 +1465,7 @@ angular.module('datasourcejs', [])
         reduce(reverseArr(this.dependentData), function (item, resolve) {
           item.storeDependentBuffer(function () {
             resolve();
-          }, true);
+          }, true, batchPostponed);
         }.bind(this), function () {
           ins();
         }.bind(this))
@@ -1202,37 +1473,56 @@ angular.module('datasourcejs', [])
 
       } else {
         if (callback) {
-          callback();
+          callback(reset);
         }
       }
     }
 
-    this.postBatchData = function(callback) {
+    this.postBatchData = function(callbackClient, dontPostpone) {
+      let batchPostponed = dontPostpone?false:true;
+      if (!dontPostpone) {
+        this.batchServiceData = [];
+      }
+      let callback = ()=> {
+        if (batchPostponed) {
+          batchPostponed = false;
+          this.performBatchPost(function() {
+            this.postBatchData(callbackClient, true);
+          }.bind(this));
+        } else {
+          if (callbackClient) {
+            callbackClient();
+          }
+        }
+      };
       this.postingBatch = true;
       var cleanFuncs = [];
       var func = function() {
-        cleanFuncs.push(this.storeDependentBuffer(function () {
-          reduce(this.dependentData, function (item, resolve) {
-            cleanFuncs.push(item.storeDependentBuffer(function () {
-              resolve();
-            }));
-          }.bind(this), function () {
-            this.postingBatch = false;
-            for (var x=0;x<cleanFuncs.length;x++) {
-              cleanFuncs[x]();
-            }
-            if (callback) {
-              callback();
-            }
-          }.bind(this))
-        }.bind(this)));
+        this.storeDependentBuffer(function () {
+          cleanFuncs.push(this.storeDependentBuffer(function () {
+            reduce(this.dependentData, function (item, resolve) {
+              cleanFuncs.push(item.storeDependentBuffer(function () {
+                resolve();
+              }, false, batchPostponed));
+            }.bind(this), function () {
+              this.postingBatch = false;
+              for (var x=0;x<cleanFuncs.length;x++) {
+                cleanFuncs[x]();
+              }
+              if (callback) {
+                callback();
+              }
+            }.bind(this))
+
+          }.bind(this), false, batchPostponed));
+        }.bind(this), true, batchPostponed);
       }.bind(this);
 
-      //Primeiro executa as remoções
+      //Primeiro executa as remoções dos filhos
       reduce(reverseArr(this.dependentData), function (item, resolve) {
         item.storeDependentBuffer(function () {
           resolve();
-        }, true);
+        }, true, batchPostponed);
       }.bind(this), function() {
         func();
       }.bind(this));
@@ -1257,7 +1547,7 @@ angular.module('datasourcejs', [])
       }
     }
 
-    this.storeDependentBuffer = function(callback, onlyRemove) {
+    this.storeDependentBuffer = function(callback, onlyRemove, batchMode) {
       var _self = this;
       var dependentDS = eval(_self.dependentLazyPost);
 
@@ -1311,18 +1601,28 @@ angular.module('datasourcejs', [])
           }
 
           if (_self.parameters) {
-            var params = _self.getParametersMap(item.__parentId?item.__parentId:null);
+            var params = _self.getParametersMap(item.__parentId ? item.__parentId : null);
             for (var key in params) {
               if (params.hasOwnProperty(key)) {
                 updateObjectValue(item, key, params[key]);
               }
             }
+
+            let masterExpression = _self.getParametersBatchExpression(item.__parentId ? item.__parentId : null);
+            item.__$masterExpression = masterExpression;
           }
 
           if (item.__status == "inserted") {
             (function (oldObj) {
-              var odataFiles = _self.processODataFiles(oldObj);
-              _self.insert(oldObj, function (newObj) {
+              var odataFiles;
+              if (!batchMode) {
+                odataFiles = _self.processODataFiles(oldObj);
+              }
+              _self.insert(oldObj, function (newObj, hotData, batchPostponed) {
+                if (batchPostponed) {
+                  resolve();
+                  return;
+                }
                 var sender = oldObj.__sender;
                 var idx = _self.getIndexOfListTempBuffer(oldObj, array);
                 var isFromMemory = false;
@@ -1343,7 +1643,7 @@ angular.module('datasourcejs', [])
 
                 if (odataFiles && odataFiles.length > 0) {
                   _self.sendODataFiles(odataFiles, newObj, function (result) {
-                    this.copy(result.data, currentObj);
+                    _self.copy(result.data, currentObj);
                   }.bind(this), function() {
                     resolve();
                   });
@@ -1358,8 +1658,15 @@ angular.module('datasourcejs', [])
 
           else if (item.__status == "updated") {
             (function (oldObj) {
-              var odataFiles = _self.processODataFiles(oldObj);
-              _self.update(oldObj, function (newObj) {
+              var odataFiles;
+              if (!batchMode) {
+                odataFiles = _self.processODataFiles(oldObj);
+              }
+              _self.update(oldObj, function (newObj, hotData, batchPostponed) {
+                if (batchPostponed) {
+                  resolve();
+                  return;
+                }
                 var sender = oldObj.__sender;
                 var idx = _self.getIndexOfListTempBuffer(oldObj, array);
                 var isFromMemory = false;
@@ -1379,7 +1686,7 @@ angular.module('datasourcejs', [])
                 }
                 if (odataFiles && odataFiles.length > 0) {
                   _self.sendODataFiles(odataFiles, newObj, function (result) {
-                    this.copy(result.data, currentObj);
+                    _self.copy(result.data, currentObj);
                   }.bind(this), function() {
                     resolve();
                   });
@@ -1392,9 +1699,13 @@ angular.module('datasourcejs', [])
             })(item);
           }
 
-          else if (item.__status == "deleted") {
+          else if (item.__status == "deleted" && onlyRemove) {
             (function (oldObj) {
-              _self.remove(oldObj, function () {
+              _self.remove(oldObj, function (newObj, hotData, batchPostponed) {
+                if (batchPostponed) {
+                  resolve();
+                  return;
+                }
                 if (_self.events.delete) {
                   var param = {};
                   _self.copy(oldObj, param);
@@ -1425,8 +1736,10 @@ angular.module('datasourcejs', [])
           this.inserting = false;
           this.hasMemoryData = false;
           this.memoryData = null;
-          this.notifyPendingChanges(this.hasMemoryData);
-          if (this.events.afterchanges) {
+          if (!batchMode) {
+            this.notifyPendingChanges(this.hasMemoryData);
+          }
+          if (this.events.afterchanges && !batchMode) {
             this.callDataSourceEvents('afterchanges', this.data);
           }
         }
@@ -1436,7 +1749,9 @@ angular.module('datasourcejs', [])
         if (callback) {
           callback();
         }
-        this.postDeleteData = null;
+        if (!batchMode) {
+          this.postDeleteData = null;
+        }
       }.bind(this));
 
       return resetFunc;
@@ -1561,7 +1876,7 @@ angular.module('datasourcejs', [])
 
     this.updateActive = function(from) {
       for (var key in from) {
-        if (from.hasOwnProperty(key)) {
+        if (from.hasOwnProperty(key) && key != "__status") {
           this.active[key] = from[key];
         }
       }
@@ -1684,7 +1999,7 @@ angular.module('datasourcejs', [])
     /**
      * Insert or update based on the the datasource state
      */
-    this.post = function(onSuccess, onError, silent) {
+    this.post = function(onSuccess, onError, silent, keepBuffer) {
 
       if (!silent && this.missingRequiredField())
         return;
@@ -1692,13 +2007,28 @@ angular.module('datasourcejs', [])
       if (!silent && this.hasInvalidField())
         return;
 
+      if (!keepBuffer) {
+        this.batchServiceData = [];
+      }
+
       this.lastAction = "post"; //TRM
 
       this.busy = true;
 
       if (this.inserting) {
         // Make a new request to persist the new item
-        this.insert(this.active, function(obj, hotData) {
+        this.insert(this.active, function(obj, hotData, batchPostponed) {
+          if (batchPostponed) {
+            if (this.dependentData && !this.dependentLazyPost && !this.batchPost) {
+              this.flushDependencies(() => {
+                this.performBatchPost(() => {
+                  this.post(onSuccess, onError, silent, true);
+                });
+              }, true);
+
+              return;
+            }
+          }
           // In case of success add the new inserted value at
           // the end of the array
 
@@ -1710,7 +2040,7 @@ angular.module('datasourcejs', [])
             obj.__$id = this.active.__$id;
           }
 
-          var func = function() {
+          var func = function(resetFunctions) {
             // The new object is now the active
             this.active = obj;
 
@@ -1729,13 +2059,19 @@ angular.module('datasourcejs', [])
             if (this.events.memorycreate && !hotData) {
               this.callDataSourceEvents('memorycreate', this.active);
             }
+
+            if (resetFunctions) {
+              for (let i =0;i<resetFunctions.length;i++) {
+                resetFunctions[i]();
+              }
+            }
           }.bind(this);
 
           var proceed = function () {
             this.data.push(obj);
 
             if (this.dependentData && !this.dependentLazyPost && !this.batchPost) {
-              this.flushDependencies(func);
+              this.flushDependencies(func, false);
             } else {
               func();
             }
@@ -1760,8 +2096,18 @@ angular.module('datasourcejs', [])
 
       } else if (this.editing) {
         // Make a new request to update the modified item
-        this.update(this.active, function(obj, hotData) {
+        this.update(this.active, function(obj, hotData, batchPostponed) {
+          if (batchPostponed) {
+            if (this.dependentData && !this.dependentLazyPost && !this.batchPost) {
+              this.flushDependencies(() => {
+                this.performBatchPost(() => {
+                  this.post(onSuccess, onError, silent, true);
+                });
+              }, batchPostponed);
 
+              return;
+            }
+          }
           var odataFiles;
 
           if (hotData) {
@@ -1825,7 +2171,7 @@ angular.module('datasourcejs', [])
             }
           }.bind(this));
 
-          var back = function() {
+          var back = function(resetFunctions) {
 
             if (foundRow) {
               this.handleAfterCallBack(this.onAfterUpdate);
@@ -1836,11 +2182,17 @@ angular.module('datasourcejs', [])
             if (onSuccess) {
               onSuccess(this.active);
             }
+
+            if (resetFunctions) {
+              for (let i =0;i<resetFunctions.length;i++) {
+                resetFunctions[i]();
+              }
+            }
           }.bind(this);
 
-          var func = function() {
+          var func = function(resetFunctions) {
             if (!hotData) {
-              back();
+              back(resetFunctions);
             } else {
               if (odataFiles && odataFiles.length > 0) {
                 this.sendODataFiles(odataFiles, foundRow, function (result) {
@@ -1849,10 +2201,10 @@ angular.module('datasourcejs', [])
                   if (this.events.update && hotData) {
                     this.callDataSourceEvents('update', foundRow);
                   }
-                  back();
+                  back(resetFunctions);
                 }.bind(this));
               } else {
-                back();
+                back(resetFunctions);
               }
             }
           }.bind(this);
@@ -2219,7 +2571,7 @@ angular.module('datasourcejs', [])
         let childrensDs = this.dependentData && this.dependentData.filter( ds => ds.inserting || ds.editing );
         !childrensDs || childrensDs.forEach( ds => ds.cancel() );
 
-        this.changeTitle();
+        this.noticeStatusChange();
       }.bind(this))
     };
 
@@ -2243,6 +2595,7 @@ angular.module('datasourcejs', [])
           this.cleanDependentBuffer();
         });
       }
+      this.batchServiceData = [];
     };
 
     this.removeODataFields = function(obj) {
@@ -2282,7 +2635,7 @@ angular.module('datasourcejs', [])
           // Get an ajax promise
           var url = this.entity;
           url += (this.entity.endsWith('/')) ? '__new__' : '/__new__';
-          this.$promise = $http({
+          this.$promise = $httpLegacy({
             method: "GET",
             url: this.removeSlash((window.hostApp || "") + url),
             headers: this.headers
@@ -2356,6 +2709,11 @@ angular.module('datasourcejs', [])
 
     };
 
+    this.noticeStatusChange = function() {
+      this.changeTitle();
+      this.handleBeforeCallBack(this.onChangeStatus);
+    };
+
     this.changeTitle = function() {
       if (!$('#starter').length || $('#starter').attr('primary-datasource') !== this.name) {
         return;
@@ -2383,6 +2741,17 @@ angular.module('datasourcejs', [])
           this.active.__$id = uuid();
         }
 
+        if (this.children && this.children.length) {
+          let keys = this.getKeyValues(this.active);
+          for (let key in keys) {
+            if (keys.hasOwnProperty(key)) {
+              if ((keys[key] == null || keys[key] == undefined) && key == '_objectKey') {
+                this.active[key] = "$autogenerated$" + this.uuidv4();
+              }
+            }
+          }
+        }
+
         this.inserting = true;
 
         if (this.onStartInserting) {
@@ -2397,7 +2766,7 @@ angular.module('datasourcejs', [])
         }
 
         this.resetFieldsStatus();
-        this.changeTitle();
+        this.noticeStatusChange();
 
       }.bind(this));
     };
@@ -2425,7 +2794,7 @@ angular.module('datasourcejs', [])
         this.callDataSourceEvents('updating', this.active);
       }
       this.resetFieldsStatus();
-      this.changeTitle();
+      this.noticeStatusChange();
     };
 
     this.removeSilent = function(object, onSuccess, onError) {
@@ -2447,7 +2816,10 @@ angular.module('datasourcejs', [])
 
         var keyObj = this.getKeyValues(object, forceDelete);
 
-        callback = callback || function(empty, hotData) {
+        callback = callback || function(empty, hotData, batchPostponed) {
+          if (batchPostponed) {
+            return;
+          }
           // For each row data
           for (var i = 0; i < this.data.length; i++) {
             // current object match with the same
@@ -2535,7 +2907,7 @@ angular.module('datasourcejs', [])
           if ((this.dependentLazyPost || this.batchPost) && !forceDelete) {
             callback();
           } else {
-            service.remove(this.getDeletionURL(object, forceDelete)).$promise.error(onError).then(callback);
+            service.remove(this.getDeletionURL(object, forceDelete), object).$promise.error(onError).then(callback);
           }
         }
       }.bind(this);
@@ -2687,6 +3059,9 @@ angular.module('datasourcejs', [])
       } else {
         this.offset = parseInt(this.offset) + 1;
       }
+      if (this._savedProps && this._savedProps.params) {
+        delete this._savedProps.params.$skip;
+      }
       this.fetch(this._savedProps, {
         success: function(data) {
           if (!data || data.length < parseInt(this.rowsPerPage)) {
@@ -2718,7 +3093,9 @@ angular.module('datasourcejs', [])
     this.prevPage = function() {
       if (!this.append && !this.preppend) {
         this.offset = parseInt(this.offset) - this.data.length;
-
+        if (this._savedProps && this._savedProps.params) {
+          delete this._savedProps.params.$skip;
+        }
         if (this.offset < 0) {
           this.offset = 0;
         } else if (this.offset >= 0) {
@@ -3134,6 +3511,56 @@ angular.module('datasourcejs', [])
       });
     }
 
+    this.getParametersBatchExpression = function(parentId) {
+      var expression = "";
+
+      var parameters;
+
+      var obj;
+
+      parameters = this.parametersExpression;
+      let ds = eval(this.dependentLazyPost);
+
+      if (ds) {
+        var arr = ds.getAllData();
+        if (ds.active && ds.active.__$id == parentId) {
+          obj = ds.active;
+        } else {
+          for (var i = 0; i < arr.length; i++) {
+            if (arr[i].__$id == parentId) {
+              obj = arr[i];
+              break;
+            }
+          }
+        }
+      }
+
+      if (parameters && parameters.length > 0) {
+        var parts = parameters.split(";")
+        for (var i=0;i<parts.length;i++) {
+          var part = parts[i];
+          var binary = part.split("=");
+          if (binary.length == 2) {
+            var value = binary[1];
+            if (binary[1].match(DEP_PATTERN)) {
+              var g = DEP_PATTERN.exec(value);
+              if (g[1].indexOf(".active.") != -1) {
+                var field = g[1].replace(this.dependentLazyPost + ".active.", "");
+                if (obj) {
+                  if (expression != '') {
+                    expression += ",";
+                  }
+                  expression = binary[0] + ":" + "$"+parentId+"."+field;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      return expression;
+    }
+
     this.removeSlash = function(u) {
       if (u.indexOf("http://") == 0) {
         return "http://" + u.substring(7).split("//").join("/");
@@ -3834,7 +4261,7 @@ angular.module('datasourcejs', [])
             var filterClause;
 
             var g = DEP_PATTERN.exec(binaryExpression[1]);
-            if (this.isEmpty(binary[1]) && this.dependentLazyPost && g[1] && g[1].startsWith(this.dependentLazyPost+".")) {
+            if ((this.isEmpty(binary[1]) || this.isAutoGeneratedValue(binary[1])) && this.dependentLazyPost && g[1] && g[1].startsWith(this.dependentLazyPost+".")) {
               if (this.parametersNullStrategy == "clean" || this.parametersNullStrategy == "default") {
                 cleanData = true;
                 var dds = eval(this.dependentLazyPost);
@@ -4406,6 +4833,7 @@ angular.module('datasourcejs', [])
         dts.onAfterUpdate = props.onAfterUpdate;
         dts.onBeforeDelete = props.onBeforeDelete;
         dts.onAfterDelete = props.onAfterDelete;
+        dts.onChangeStatus = props.onChangeStatus;
         dts.onGET = props.onGet,
         dts.onPOST = props.onPost,
         dts.onPUT = props.onPut,
@@ -4551,6 +4979,8 @@ function(DatasetManager, $timeout, $parse, Notification, $translate, $location,
   };
 }])
 
+let datasourceRepeat = 1;
+
 app.directive('crnRepeat', function(DatasetManager, $compile, $parse, $injector, $rootScope) {
   return {
     restrict: 'A',
@@ -4558,21 +4988,22 @@ app.directive('crnRepeat', function(DatasetManager, $compile, $parse, $injector,
     terminal: true,
     link: function(scope, element, attrs, controllers, transclude) {
 
+      datasourceRepeat++;
       if (attrs.crnRepeat) {
         scope.data = DatasetManager.datasets;
         if (scope.data[attrs.crnRepeat]) {
-          scope.datasourceRepeat = scope.data[attrs.crnRepeat];
+          scope['datasourceRepeat' + datasourceRepeat] = scope.data[attrs.crnRepeat];
         } else {
-          scope.datasourceRepeat = {};
-          scope.datasourceRepeat.data = $parse(attrs.crnRepeat)(scope);
+          scope['datasourceRepeat' + datasourceRepeat] = {};
+          scope['datasourceRepeat' + datasourceRepeat].data = $parse(attrs.crnRepeat)(scope);
         }
-        element.attr('ng-repeat', 'rowData in datasourceRepeat.data');
+        element.attr('ng-repeat', 'rowData in datasourceRepeat' + datasourceRepeat + '.data');
 
       }
 
       var tagName = element[0].tagName;
       $compile(element, null, 9999998)(scope);
-      scope.$watchCollection('datasourceRepeat.data', function (newVal, oldVal) {
+      scope.$watchCollection('datasourceRepeat' + datasourceRepeat + '.data', function (newVal, oldVal) {
         if (tagName.toLowerCase() == "ion-slide") {
           var $ionicSlideBoxDelegate = $injector.get('$ionicSlideBoxDelegate');
           $ionicSlideBoxDelegate.update();