@wavemaker/app-ng-runtime 11.8.0-next.24904 → 11.8.0-next.27301

app-ng-runtime/mobile/offline/bundles/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@awesome-cordova-plugins/file/ngx'), require('@wm/core'), require('@wm/mobile/core'), require('@wm/security'), require('@awesome-cordova-plugins/app-version/ngx'), require('@awesome-cordova-plugins/sqlite/ngx'), require('@wm/variables'), require('rxjs'), require('@wavemaker/variables')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@angular/core', '@angular/common', '@awesome-cordova-plugins/file/ngx', '@wm/core', '@wm/mobile/core', '@wm/security', '@awesome-cordova-plugins/app-version/ngx', '@awesome-cordova-plugins/sqlite/ngx', '@wm/variables', 'rxjs', '@wavemaker/variables'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.wm = global.wm || {}, global.wm.mobile = global.wm.mobile || {}, global.wm.mobile.offline = {}), global.ng.core, global.ng.common, global.awesomeCordova.plugins, global.wm.core, global.wm.mobile.core, global.wm.security, global.awesomeCordova.plugins, global.awesomeCordova.plugins, global.wm.variables, global.rxjs, global.wm_common_variables));
-})(this, (function (exports, i0, common, i3$1, i1$1, i3, i5, i1, i6, variables, rxjs, variables$1) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@awesome-cordova-plugins/file/ngx'), require('@wm/core'), require('@wm/mobile/core'), require('@wm/security'), require('@awesome-cordova-plugins/app-version/ngx'), require('@awesome-cordova-plugins/sqlite/ngx'), require('@wm/variables'), require('lodash-es'), require('rxjs'), require('@wavemaker/variables')) :
+    typeof define === 'function' && define.amd ? define(['exports', '@angular/core', '@angular/common', '@awesome-cordova-plugins/file/ngx', '@wm/core', '@wm/mobile/core', '@wm/security', '@awesome-cordova-plugins/app-version/ngx', '@awesome-cordova-plugins/sqlite/ngx', '@wm/variables', 'lodash-es', 'rxjs', '@wavemaker/variables'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.wm = global.wm || {}, global.wm.mobile = global.wm.mobile || {}, global.wm.mobile.offline = {}), global.ng.core, global.ng.common, global.awesomeCordova.plugins, global.wm.core, global.wm.mobile.core, global.wm.security, global.awesomeCordova.plugins, global.awesomeCordova.plugins, global.wm.variables, global._, global.rxjs, global.wm_common_variables));
+})(this, (function (exports, i0, common, i3$1, i1$1, i3, i5, i1, i6, variables, lodashEs, rxjs, variables$1) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -124,7 +124,7 @@
 
     const insertRecordSqlTemplate = (schema) => {
         const columnNames = [], placeHolder = [];
-        _.forEach(schema.columns, col => {
+        lodashEs.forEach(schema.columns, col => {
             columnNames.push(escapeName(col.name));
             placeHolder.push('?');
         });
@@ -132,14 +132,14 @@
     };
     const replaceRecordSqlTemplate = (schema) => {
         const columnNames = [], placeHolder = [];
-        _.forEach(schema.columns, col => {
+        lodashEs.forEach(schema.columns, col => {
             columnNames.push(escapeName(col.name));
             placeHolder.push('?');
         });
         return `REPLACE INTO ${escapeName(schema.name)} (${columnNames.join(',')}) VALUES (${placeHolder.join(',')})`;
     };
     const deleteRecordTemplate = (schema) => {
-        const primaryKeyField = _.find(schema.columns, 'primaryKey');
+        const primaryKeyField = lodashEs.find(schema.columns, 'primaryKey');
         if (primaryKeyField) {
             return `DELETE FROM ${escapeName(schema.name)} WHERE ${escapeName(primaryKeyField.name)} = ?`;
         }
@@ -153,7 +153,7 @@
             if (col.foreignRelations) {
                 col.foreignRelations.forEach(foreignRelation => {
                     childTableName = foreignRelation.sourceFieldName;
-                    _.forEach(foreignRelation.dataMapper, (childCol, childFiledName) => {
+                    lodashEs.forEach(foreignRelation.dataMapper, (childCol, childFiledName) => {
                         columns.push(childTableName + '.' + escapeName(childCol.name) + ' as \'' + childFiledName + '\'');
                     });
                     joins.push(` LEFT JOIN ${escapeName(foreignRelation.targetTable)} ${childTableName}
@@ -180,7 +180,7 @@
     const generateWherClause = (store, filterCriteria) => {
         let conditions;
         const fieldToColumnMapping = store.fieldToColumnMapping, tableName = store.entitySchema.name;
-        if (!_.isEmpty(filterCriteria) && _.isString(filterCriteria)) {
+        if (!lodashEs.isEmpty(filterCriteria) && lodashEs.isString(filterCriteria)) {
             return ' WHERE ' + filterCriteria;
         }
         if (filterCriteria) {
@@ -212,8 +212,8 @@
     };
     const generateOrderByClause = (store, sort) => {
         if (sort) {
-            return ' ORDER BY ' + _.map(sort.split(','), field => {
-                const splits = _.trim(field).split(' ');
+            return ' ORDER BY ' + lodashEs.map(sort.split(','), field => {
+                const splits = lodashEs.trim(field).split(' ');
                 splits[0] = escapeName(store.entitySchema.name) + '.' + escapeName(store.fieldToColumnMapping[splits[0]]);
                 return splits.join(' ');
             }).join(',');
@@ -230,7 +230,7 @@
             if (col.foreignRelations) {
                 col.foreignRelations.forEach(foreignRelation => {
                     let childEntity = null;
-                    _.forEach(foreignRelation.dataMapper, function (childCol, childFieldName) {
+                    lodashEs.forEach(foreignRelation.dataMapper, function (childCol, childFieldName) {
                         const fieldValue = dataObj[childFieldName];
                         if (i1$1.isDefined(fieldValue) && fieldValue !== null && fieldValue !== '') {
                             childEntity = childEntity || {};
@@ -241,7 +241,7 @@
                     dataObj[foreignRelation.sourceFieldName] = childEntity;
                 });
             }
-            else if (col.sqlType === 'boolean' && !_.isNil(val)) {
+            else if (col.sqlType === 'boolean' && !lodashEs.isNil(val)) {
                 dataObj[col.fieldName] = (val === 1);
             }
         });
@@ -258,7 +258,7 @@
                 return false;
             });
         }
-        if (_.isNil(value)) {
+        if (lodashEs.isNil(value)) {
             return col.defaultValue;
         }
         else if (col.sqlType === 'boolean') {
@@ -281,14 +281,14 @@
             this.localDbManagementService = localDbManagementService;
             this.sqliteObject = sqliteObject;
             this.fieldToColumnMapping = {};
-            this.primaryKeyField = _.find(this.entitySchema.columns, 'primaryKey');
+            this.primaryKeyField = lodashEs.find(this.entitySchema.columns, 'primaryKey');
             this.primaryKeyName = this.primaryKeyField ? this.primaryKeyField.fieldName : undefined;
             this.entitySchema.columns.forEach(c => {
                 this.fieldToColumnMapping[c.fieldName] = c.name;
                 if (c.foreignRelations) {
                     c.foreignRelations.forEach(foreignRelation => {
                         this.fieldToColumnMapping[foreignRelation.targetPath] = c.name;
-                        _.forEach(foreignRelation.dataMapper, (childCol, childFieldName) => {
+                        lodashEs.forEach(foreignRelation.dataMapper, (childCol, childFieldName) => {
                             this.fieldToColumnMapping[childFieldName] = foreignRelation.sourceFieldName + '.' + childCol.name;
                         });
                     });
@@ -304,7 +304,7 @@
             if (this.primaryKeyName) {
                 const idValue = entity[this.primaryKeyName];
                 if (this.primaryKeyField.sqlType === 'number'
-                    && (!i1$1.isDefined(idValue) || (_.isString(idValue) && _.isEmpty(_.trim(idValue))))) {
+                    && (!i1$1.isDefined(idValue) || (lodashEs.isString(idValue) && lodashEs.isEmpty(lodashEs.trim(idValue))))) {
                     if (this.primaryKeyField.generatorType === 'identity') {
                         // updating the id with the latest id obtained from nextId.
                         entity[this.primaryKeyName] = this.localDbManagementService.nextIdCount();
@@ -433,8 +433,8 @@
          */
         saveAll(entities) {
             // filtering the null entities
-            entities = _.filter(entities, null);
-            const queries = _.map(entities, entity => {
+            entities = lodashEs.filter(entities, null);
+            const queries = lodashEs.map(entities, entity => {
                 const rowData = mapObjToRow(this, entity);
                 const params = this.entitySchema.columns.map(f => rowData[f.name]);
                 return [this.replaceRecordSqlTemplate, params];
@@ -473,13 +473,13 @@
          * Converts form data object to map for storing request in local database..
          */
         serializeFormDataToMap(formData) {
-            const blobColumns = _.filter(this.entitySchema.columns, {
+            const blobColumns = lodashEs.filter(this.entitySchema.columns, {
                 'sqlType': 'blob'
             }), promises = [];
             let map = {};
             if (formData && typeof formData.append === 'function' && formData.rowData) {
-                _.forEach(formData.rowData, (fieldData, fieldName) => {
-                    if (fieldData && _.find(blobColumns, { 'fieldName': fieldName })) {
+                lodashEs.forEach(formData.rowData, (fieldData, fieldName) => {
+                    if (fieldData && lodashEs.find(blobColumns, { 'fieldName': fieldName })) {
                         promises.push(this.saveBlobToFile(fieldData).then(localFile => {
                             map[fieldName] = localFile;
                         }));
@@ -499,7 +499,7 @@
          */
         deserializeMapToFormData(map) {
             const formData = new FormData(), blobColumns = this.entitySchema.columns.filter(c => c.sqlType === 'blob'), promises = [];
-            _.forEach(blobColumns, column => {
+            lodashEs.forEach(blobColumns, column => {
                 const value = map[column.fieldName];
                 if (value && value.wmLocalPath) {
                     promises.push(i1$1.convertToBlob(value.wmLocalPath)
@@ -513,7 +513,8 @@
             return Promise.all(promises).then(() => formData);
         }
         createTableSql(schema) {
-            const fieldStr = _.reduce(schema.columns, (result, f) => {
+            // @ts-ignore
+            const fieldStr = lodashEs.reduce(schema.columns, (result, f) => {
                 let str = escapeName(f.name);
                 if (f.primaryKey) {
                     if (f.sqlType === 'number' && f.generatorType === 'databaseIdentity') {
@@ -655,7 +656,8 @@
             return new Promise((resolve, reject) => {
                 // Before closing databases, give some time for the pending transactions (if any).
                 setTimeout(() => {
-                    const closePromises = _.map(_.values(this.databases), db => db.sqliteObject.close());
+                    // @ts-ignore
+                    const closePromises = lodashEs.map(lodashEs.values(this.databases), db => db.sqliteObject.close());
                     Promise.all(closePromises).then(resolve, reject);
                 }, 1000);
             });
@@ -679,14 +681,14 @@
                 return Promise.reject(`Query by name ' ${queryName} ' Not Found`);
             }
             queryData = this.databases[dbName].queries[queryName];
-            paramPromises = _.chain(queryData.params)
+            paramPromises = lodashEs.chain(queryData.params)
                 .filter(p => p.variableType !== 'PROMPT')
                 .forEach(p => {
                 const paramValue = this.systemProperties[p.variableType].value(p.name, params);
                 return i1$1.toPromise(paramValue).then(v => params[p.name] = v);
             }).value();
             return Promise.all(paramPromises).then(() => {
-                params = _.map(queryData.params, p => {
+                params = lodashEs.map(queryData.params, p => {
                     // Sqlite will accept DateTime value as below format.
                     if (typeof params[p.name] !== 'string'
                         && (p.type === i1$1.DataType.DATETIME || p.type === i1$1.DataType.LOCALDATETIME)) {
@@ -701,18 +703,18 @@
                 return this.executeSQLQuery(dbName, queryData.query, params)
                     .then(result => {
                     let firstRow, needTransform;
-                    if (!_.isEmpty(result.rows)) {
+                    if (!lodashEs.isEmpty(result.rows)) {
                         firstRow = result.rows[0];
-                        needTransform = _.find(queryData.response.properties, p => !firstRow.hasOwnProperty(p.fieldName));
-                        if (!_.isUndefined(needTransform)) {
-                            result.rows = _.map(result.rows, row => {
+                        needTransform = lodashEs.find(queryData.response.properties, p => !firstRow.hasOwnProperty(p.fieldName));
+                        if (!lodashEs.isUndefined(needTransform)) {
+                            result.rows = lodashEs.map(result.rows, row => {
                                 const transformedRow = {}, rowWithUpperKeys = {};
                                 // This is to make search for data as case-insensitive
-                                _.forEach(row, (v, k) => rowWithUpperKeys[k.toUpperCase()] = v);
-                                _.forEach(queryData.response.properties, p => {
+                                lodashEs.forEach(row, (v, k) => rowWithUpperKeys[k.toUpperCase()] = v);
+                                lodashEs.forEach(queryData.response.properties, p => {
                                     // format the value depending on the typeRef specified in properties.
                                     const propType = i1$1.extractType(p.fieldType.typeRef);
-                                    i1$1.DEFAULT_FORMATS[_.toUpper(propType)];
+                                    i1$1.DEFAULT_FORMATS[lodashEs.toUpper(propType)];
                                     const fieldVal = row[p.name];
                                     if (fieldVal && typeof fieldVal !== 'string'
                                         && (propType === i1$1.DataType.DATETIME || propType === i1$1.DataType.LOCALDATETIME || propType === i1$1.DataType.DATE)) {
@@ -746,7 +748,7 @@
          */
         exportDB() {
             return new Promise((resolve, reject) => {
-                const folderToExport = 'offline_temp_' + _.now(), folderToExportFullPath = cordova.file.cacheDirectory + folderToExport + '/', zipFileName = '_offline_data.zip', metaInfo = {
+                const folderToExport = 'offline_temp_' + lodashEs.now(), folderToExportFullPath = cordova.file.cacheDirectory + folderToExport + '/', zipFileName = '_offline_data.zip', metaInfo = {
                     app: null,
                     OS: '',
                     createdOn: 0
@@ -776,7 +778,7 @@
                         else if (i1$1.isAndroid()) {
                             metaInfo.OS = 'ANDROID';
                         }
-                        metaInfo.createdOn = _.now();
+                        metaInfo.createdOn = lodashEs.now();
                         return metaInfo;
                     }).then(() => i1$1.executePromiseChain(this.getCallbacksFor('preExport'), [folderToExportFullPath, metaInfo]))
                         .then(() => {
@@ -829,7 +831,7 @@
          */
         importDB(zipPath, revertIfFails) {
             return new Promise((resolve, reject) => {
-                const importFolder = 'offline_temp_' + _.now(), importFolderFullPath = cordova.file.cacheDirectory + importFolder + '/';
+                const importFolder = 'offline_temp_' + lodashEs.now(), importFolderFullPath = cordova.file.cacheDirectory + importFolder + '/';
                 let zipMeta;
                 // Create a temporary folder to unzip the contents of the zip.
                 this.file.createDir(cordova.file.cacheDirectory, importFolder, false)
@@ -949,7 +951,7 @@
                     .then(metadata => this.loadNamedQueries(metadata))
                     .then(metadata => this.loadOfflineConfig(metadata))
                     .then(metadata => {
-                    return Promise.all(_.map(metadata, dbMetadata => {
+                    return Promise.all(lodashEs.map(metadata, dbMetadata => {
                         return this.openDatabase(dbMetadata)
                             .then(database => {
                             this.databases[dbMetadata.schema.name] = database;
@@ -968,9 +970,9 @@
                             .then(() => this.disableForeignKeys())
                             .then(() => this.deviceService.getAppBuildTime())
                             .then(dbSeedCreationTime => {
-                            return i1$1.executePromiseChain(_.map(this.callbacks, 'onDbCreate'), [{
+                            return i1$1.executePromiseChain(lodashEs.map(this.callbacks, 'onDbCreate'), [{
                                     'databases': this.databases,
-                                    'dbCreatedOn': _.now(),
+                                    'dbCreatedOn': lodashEs.now(),
                                     'dbSeedCreatedOn': dbSeedCreationTime
                                 }]);
                         }).then(() => this.databases);
@@ -1030,13 +1032,13 @@
                 let defaultValue = col.columnValue ? col.columnValue.defaultValue : '';
                 const type = col.sqlType;
                 if (type === 'number' && !col.primaryKey) {
-                    defaultValue = _.isEmpty(defaultValue) ? null : _.parseInt(defaultValue);
+                    defaultValue = lodashEs.isEmpty(defaultValue) ? null : lodashEs.parseInt(defaultValue);
                 }
                 else if (type === 'boolean') {
-                    defaultValue = _.isEmpty(defaultValue) ? null : (defaultValue === 'true' ? 1 : 0);
+                    defaultValue = lodashEs.isEmpty(defaultValue) ? null : (defaultValue === 'true' ? 1 : 0);
                 }
                 else {
-                    defaultValue = _.isEmpty(defaultValue) ? null : defaultValue;
+                    defaultValue = lodashEs.isEmpty(defaultValue) ? null : defaultValue;
                 }
                 reqEntity.columns.push({
                     name: col['name'],
@@ -1047,10 +1049,10 @@
                     defaultValue: defaultValue
                 });
             });
-            _.forEach(entity.relations, r => {
+            lodashEs.forEach(entity.relations, r => {
                 let targetEntitySchema, targetEntity, col, sourceColumn, mapping;
                 if (r.cardinality === 'ManyToOne' || r.cardinality === 'OneToOne') {
-                    targetEntity = _.find(schema.tables, t => t.name === r.targetTable);
+                    targetEntity = lodashEs.find(schema.tables, t => t.name === r.targetTable);
                     mapping = r.mappings[0];
                     if (targetEntity) {
                         targetEntity = targetEntity.entityName;
@@ -1067,7 +1069,8 @@
                             targetFieldName: targetEntitySchema.columns.find(column => column.name === mapping.targetColumn).fieldName
                         };
                         foreignRelation.targetPath = foreignRelation.sourceFieldName + '.' + foreignRelation.targetFieldName;
-                        foreignRelation.dataMapper = _.chain(targetEntitySchema.columns)
+                        // @ts-ignore
+                        foreignRelation.dataMapper = lodashEs.chain(targetEntitySchema.columns)
                             .keyBy(childCol => foreignRelation.sourceFieldName + '.' + childCol.fieldName)
                             .mapValues(childCol => new ColumnInfo(childCol.name, childCol.fieldName)).value();
                         col.foreignRelations = col.foreignRelations || [];
@@ -1080,25 +1083,25 @@
         // Loads necessary details of queries
         compactQueries(queriesByDB) {
             const queries = new Map();
-            _.forEach(queriesByDB.queries, queryData => {
+            lodashEs.forEach(queriesByDB.queries, queryData => {
                 let query, params;
                 if (queryData.nativeSql && queryData.type === 'SELECT') {
-                    query = _.isEmpty(queryData.offlineQueryString) ? queryData.queryString : queryData.offlineQueryString;
-                    params = _.map(this.extractQueryParams(query), p => {
-                        const paramObj = _.find(queryData.parameters, { 'name': p });
+                    query = lodashEs.isEmpty(queryData.offlineQueryString) ? queryData.queryString : queryData.offlineQueryString;
+                    params = lodashEs.map(this.extractQueryParams(query), p => {
+                        const paramObj = lodashEs.find(queryData.parameters, { 'name': p });
                         return {
                             name: paramObj.name,
                             type: paramObj.type,
                             variableType: paramObj.variableType
                         };
                     });
-                    params.forEach(p => query = _.replace(query, ':' + p.name, '?'));
+                    params.forEach(p => query = lodashEs.replace(query, ':' + p.name, '?'));
                     queries[queryData.name] = {
                         name: queryData.name,
                         query: query,
                         params: params,
                         response: {
-                            properties: _.map(queryData.response.properties, p => {
+                            properties: lodashEs.map(queryData.response.properties, p => {
                                 p.nameInUpperCase = p.name.toUpperCase();
                                 return p;
                             })
@@ -1124,7 +1127,7 @@
             return dbInfo;
         }
         convertBoolToInt(bool) {
-            return _.toString(bool) === 'true' ? 1 : 0;
+            return lodashEs.toString(bool) === 'true' ? 1 : 0;
         }
         convertIntToBool(int) {
             return int ? true : false;
@@ -1134,7 +1137,8 @@
          * @returns {*}
          */
         disableForeignKeys() {
-            return Promise.all(_.map(this.databases, db => this.executeSQLQuery(db.schema.name, 'PRAGMA foreign_keys = OFF')));
+            // @ts-ignore
+            return Promise.all(lodashEs.map(this.databases, db => this.executeSQLQuery(db.schema.name, 'PRAGMA foreign_keys = OFF')));
         }
         /**
          * Executes SQL query;
@@ -1217,7 +1221,7 @@
         getMetaInfo(fileNameRegex) {
             const folder = cordova.file.applicationDirectory + META_LOCATION + '/';
             return this.deviceFileService.listFiles(folder, fileNameRegex)
-                .then(files => Promise.all(_.map(files, f => {
+                .then(files => Promise.all(lodashEs.map(files, f => {
                 return new Promise((resolve, reject) => {
                     // Cordova File reader has buffer issues with large files.
                     // so, using ajax to retrieve local json
@@ -1245,7 +1249,7 @@
             return this.getMetaInfo(/.+_dataModel\.json$/)
                 .then((schemas) => {
                 const metadata = new Map();
-                schemas = i1$1.isArray(schemas) ? schemas : [schemas];
+                schemas = lodashEs.isArray(schemas) ? schemas : [schemas];
                 schemas.push(OFFLINE_WAVEMAKER_DATABASE_SCHEMA);
                 schemas.map(s => this.compactSchema(s))
                     .forEach(s => {
@@ -1263,7 +1267,7 @@
         loadNamedQueries(metadata) {
             return this.getMetaInfo(/.+_query\.json$/)
                 .then((queriesByDBs) => {
-                queriesByDBs = _.isArray(queriesByDBs) ? queriesByDBs : [queriesByDBs];
+                queriesByDBs = lodashEs.isArray(queriesByDBs) ? queriesByDBs : [queriesByDBs];
                 queriesByDBs.map(e => metadata[e.name].queries = this.compactQueries(e));
                 return metadata;
             });
@@ -1277,10 +1281,12 @@
         loadOfflineConfig(metadata) {
             return this.getMetaInfo(/.+_offline\.json$/)
                 .then(configs => {
-                _.forEach(configs, config => {
-                    _.forEach(config.entities, entityConfig => {
-                        const entitySchema = _.find(metadata[config.name].schema.entities, schema => schema.name === entityConfig.name);
-                        _.assignIn(entitySchema, entityConfig);
+                lodashEs.forEach(configs, config => {
+                    // @ts-ignore
+                    lodashEs.forEach(config.entities, entityConfig => {
+                        // @ts-ignore
+                        const entitySchema = lodashEs.find(metadata[config.name].schema.entities, schema => schema.name === entityConfig.name);
+                        lodashEs.assignIn(entitySchema, entityConfig);
                     });
                 });
                 return metadata;
@@ -1289,14 +1295,14 @@
         logSql(sqliteObject) {
             const logger = console, originalExecuteSql = sqliteObject.executeSql;
             sqliteObject.executeSql = (sql, params, logOutput) => {
-                const startTime = _.now();
+                const startTime = lodashEs.now();
                 return originalExecuteSql.call(sqliteObject, sql, params).then(result => {
                     if (logOutput || this._logSql) {
                         const objArr = [], rowCount = result.rows.length;
                         for (let i = 0; i < rowCount; i++) {
                             objArr.push(result.rows.item(i));
                         }
-                        logger.debug('SQL "%s"  with params %O took [%d ms]. And the result is %O', sql, params, _.now() - startTime, objArr);
+                        logger.debug('SQL "%s"  with params %O took [%d ms]. And the result is %O', sql, params, lodashEs.now() - startTime, objArr);
                     }
                     return result;
                 }, error => {
@@ -1324,10 +1330,12 @@
          * @returns {*}
          */
         normalizeData() {
-            return Promise.all(_.map(this.databases, database => {
-                return Promise.all(_.map(database.schema.entities, entitySchema => {
-                    return Promise.all(_.map(entitySchema.columns, column => {
+            return Promise.all(lodashEs.map(this.databases, database => {
+                // @ts-ignore
+                return Promise.all(lodashEs.map(database.schema.entities, entitySchema => {
+                    return Promise.all(lodashEs.map(entitySchema.columns, column => {
                         if (column.sqlType === 'boolean') {
+                            // @ts-ignore
                             return this.normalizeBooleanData(database.schema.name, entitySchema.name, column.name);
                         }
                     }));
@@ -1341,12 +1349,13 @@
             }).then(sqliteObject => {
                 database.sqliteObject = sqliteObject;
                 this.logSql(sqliteObject);
-                const storePromises = _.map(database.schema.entities, entitySchema => {
+                const storePromises = lodashEs.map(database.schema.entities, entitySchema => {
+                    // @ts-ignore
                     const store = new LocalDBStore(this.deviceFileService, entitySchema, this.file, this, sqliteObject);
                     return store.create();
                 });
                 return Promise.all(storePromises).then(stores => {
-                    _.forEach(stores, store => {
+                    lodashEs.forEach(stores, store => {
                         database.stores[store.entitySchema.entityName] = store;
                     });
                     return database;
@@ -1493,10 +1502,10 @@
         getLastPushInfo() {
             return this.localKeyValueService.get(LAST_PUSH_INFO_KEY)
                 .then(info => {
-                if (i1$1.isString(info.startTime)) {
+                if (lodashEs.isString(info.startTime)) {
                     info.startTime = new Date(info.startTime);
                 }
-                if (i1$1.isString(info.endTime)) {
+                if (lodashEs.isString(info.endTime)) {
                     info.endTime = new Date(info.endTime);
                 }
                 return info;
@@ -1525,7 +1534,7 @@
          * @returns {boolean} returns true, if a flush process is in progress. Otherwise, returns false.
          */
         isFlushInProgress() {
-            return !(_.isUndefined(this.deferredFlush) || _.isNull(this.deferredFlush));
+            return !(lodashEs.isUndefined(this.deferredFlush) || lodashEs.isNull(this.deferredFlush));
         }
         /**
          * Stops the ongoing flush process.
@@ -1617,11 +1626,11 @@
                 .then(() => i1$1.executePromiseChain(this.getWorkers('transformParamsFromMap'), [change]))
                 .then(() => this.pushService.push(change))
                 .then(function () {
-                return i1$1.executePromiseChain(_.reverse(self.getWorkers('postCallSuccess')), [change, arguments])
+                return i1$1.executePromiseChain(lodashEs.reverse(self.getWorkers('postCallSuccess')), [change, arguments])
                     .then(() => change);
             }).catch(function () {
                 if (self.networkService.isConnected()) {
-                    return i1$1.executePromiseChain(_.reverse(self.getWorkers('postCallError')), [change, arguments])
+                    return i1$1.executePromiseChain(lodashEs.reverse(self.getWorkers('postCallError')), [change, arguments])
                         .catch(i1$1.noop).then(() => Promise.reject(change));
                 }
                 return Promise.reject(change);
@@ -1643,7 +1652,7 @@
             });
         }
         getWorkers(type) {
-            return _.map(this.workers, w => w[type] && w[type].bind(w));
+            return lodashEs.map(this.workers, w => w[type] && w[type].bind(w));
         }
         static { this.ɵfac = function ChangeLogService_Factory(t) { return new (t || ChangeLogService)(i0__namespace.ɵɵinject(LocalDBManagementService), i0__namespace.ɵɵinject(LocalKeyValueService), i0__namespace.ɵɵinject(PushService), i0__namespace.ɵɵinject(i3__namespace.NetworkService)); }; }
         static { this.ɵprov = /*@__PURE__*/ i0__namespace.ɵɵdefineInjectable({ token: ChangeLogService, factory: ChangeLogService.ɵfac, providedIn: 'root' }); }
@@ -1728,7 +1737,7 @@
         insertTableData(params, successCallback, failureCallback, options = {}) {
             this.getStore(params).then(store => {
                 const isPKAutoIncremented = (store.primaryKeyField && store.primaryKeyField.generatorType === 'identity');
-                if (_.get(options, 'resetPrimaryKey') !== false && isPKAutoIncremented && params.data[store.primaryKeyName]) {
+                if (lodashEs.get(options, 'resetPrimaryKey') !== false && isPKAutoIncremented && params.data[store.primaryKeyName]) {
                     delete params.data[store.primaryKeyName];
                 }
                 return store.add(params.data).then(() => {
@@ -1869,7 +1878,7 @@
             return fieldName;
         }
         convertFieldNameToColumnName(store, filterGroup, options) {
-            _.forEach(filterGroup.rules, rule => {
+            lodashEs.forEach(filterGroup.rules, rule => {
                 if (rule.rules) {
                     this.convertFieldNameToColumnName(store, rule);
                 }
@@ -1879,7 +1888,7 @@
             });
             // handling the scenario where variable options can have filterField. For example: search filter query
             if (options && options.filterFields) {
-                options.filterFields = _.mapKeys(options.filterFields, (v, k) => {
+                options.filterFields = lodashEs.mapKeys(options.filterFields, (v, k) => {
                     return this.getColumnName(store, k);
                 });
             }
@@ -1905,7 +1914,7 @@
          */
         preCall(change) {
             if (change.service === 'DatabaseService') {
-                change.params.data = _.mapValues(change.params.data, v => {
+                change.params.data = lodashEs.mapValues(change.params.data, v => {
                     const remoteUrl = this.fileStore[v];
                     if (remoteUrl) {
                         this.logger.debug('swapped file path from %s -> %s', v, remoteUrl);
@@ -1976,23 +1985,27 @@
          */
         updateDBChange(change, oldUploadDir, uploadDir) {
             const modifiedProperties = {}, entityName = change.params.entityName, dataModelName = change.params.dataModelName;
-            change.params.data = _.mapValues(change.params.data, function (v, k) {
+            change.params.data = lodashEs.mapValues(change.params.data, function (v, k) {
                 let mv = v, isModified = false;
-                if (_.isString(v)) {
-                    mv = _.replace(v, oldUploadDir, uploadDir);
-                    isModified = !_.isEqual(mv, v);
-                }
-                else if (_.isObject(v) && v.wmLocalPath) {
-                    // insertMultiPartData and updateMultiPartData
-                    mv = _.replace(v.wmLocalPath, oldUploadDir, uploadDir);
-                    isModified = !_.isEqual(mv, v.wmLocalPath);
+                if (lodashEs.isString(v)) {
+                    mv = lodashEs.replace(v, oldUploadDir, uploadDir);
+                    isModified = !lodashEs.isEqual(mv, v);
+                }
+                else { // @ts-ignore
+                    if (lodashEs.isObject(v) && v.wmLocalPath) {
+                        // insertMultiPartData and updateMultiPartData
+                        // @ts-ignore
+                        mv = lodashEs.replace(v.wmLocalPath, oldUploadDir, uploadDir);
+                        // @ts-ignore
+                        isModified = !lodashEs.isEqual(mv, v.wmLocalPath);
+                    }
                 }
                 if (isModified) {
                     modifiedProperties[k] = mv;
                 }
                 return mv;
             });
-            if (!_.isEmpty(modifiedProperties)) {
+            if (!lodashEs.isEmpty(modifiedProperties)) {
                 this.localDBManagementService.getStore(dataModelName, entityName)
                     .then(store => {
                     // If there is a primary for the entity, then update actual row with the modifications
@@ -2000,7 +2013,7 @@
                         const primaryKeyName = store.primaryKeyName;
                         const primaryKey = change.params.data[primaryKeyName];
                         return store.get(primaryKey)
-                            .then(obj => store.save(_.assignIn(obj, modifiedProperties)));
+                            .then(obj => store.save(lodashEs.assignIn(obj, modifiedProperties)));
                     }
                 }).then(() => {
                     change.params = JSON.stringify(change.params);
@@ -2019,7 +2032,7 @@
             change.params = JSON.parse(change.params);
             if (change.service === 'OfflineFileUploadService'
                 && change.operation === 'uploadToServer') {
-                change.params.file = _.replace(change.params.file, metaInfo.uploadDir, this.uploadDir);
+                change.params.file = lodashEs.replace(change.params.file, metaInfo.uploadDir, this.uploadDir);
                 change.params = JSON.stringify(change.params);
                 return this.changeLogService.getStore().then(store => store.save(change));
             }
@@ -2083,7 +2096,7 @@
                 const dataModelName = change.params.dataModelName;
                 return this.localDBManagementService.getStore(dataModelName, entityName).then(store => {
                     const id = change['dataLocalId'] || change.params.data[store.primaryKeyName];
-                    if (!(_.isUndefined(id) || _.isNull(id))) {
+                    if (!(lodashEs.isUndefined(id) || lodashEs.isNull(id))) {
                         this.removeError(dataModelName, entityName, id);
                     }
                 });
@@ -2096,7 +2109,7 @@
                 const dataModelName = change.params.dataModelName;
                 return this.localDBManagementService.getStore(dataModelName, entityName).then(store => {
                     const id = change['dataLocalId'] || (change.params.data && change.params.data[store.primaryKeyName]) || change.params[store.primaryKeyName] || change.params.id;
-                    if (!(_.isUndefined(id) || _.isNull(id))) {
+                    if (!(lodashEs.isUndefined(id) || lodashEs.isNull(id))) {
                         this.recordError(dataModelName, entityName, id);
                     }
                 });
@@ -2322,8 +2335,10 @@
                     case 'insertMultiPartTableData':
                     case 'updateMultiPartTableData':
                         // clean up files
-                        _.forEach(change.params.data, v => {
-                            if (_.isObject(v) && v.wmLocalPath) {
+                        lodashEs.forEach(change.params.data, v => {
+                            // @ts-ignore
+                            if (lodashEs.isObject(v) && v.wmLocalPath) {
+                                // @ts-ignore
                                 this.deviceFileService.removeFile(v.wmLocalPath);
                             }
                         });
@@ -2359,8 +2374,9 @@
                                  * As save method called with FormData object, empty row is inserted.
                                  * Since FormData is converted to map, update the record details now.
                                  */
-                                store.save(_.mapValues(map, function (v) {
-                                    return (_.isObject(v) && v.wmLocalPath) || v;
+                                store.save(lodashEs.mapValues(map, function (v) {
+                                    // @ts-ignore
+                                    return (lodashEs.isObject(v) && v.wmLocalPath) || v;
                                 }));
                                 return map;
                             });
@@ -2418,15 +2434,15 @@
                 const onlineHandler = this.httpService.sendCallAsObservable;
                 if (onlineHandler) {
                     this.httpService.sendCallAsObservable = (reqParams, params) => {
-                        if (!params && _.get(reqParams, 'url')) {
+                        if (!params && lodashEs.get(reqParams, 'url')) {
                             params = { url: reqParams.url };
                         }
                         // reqParams will contain the full path of insert/update call which will be processed again in parseConfig method
                         // and will be appended again with '/services/./.' which will result in deployedUrl + '/service/./.' + '/service/./.' which is wrong.
                         // Hence passing url in params
-                        const clonedParamsUrl = _.clone(params.url);
-                        params = _.extend(params, reqParams);
-                        const operation = _.find(apiConfiguration, { name: _.get(params, 'operation') });
+                        const clonedParamsUrl = lodashEs.clone(params.url);
+                        params = lodashEs.extend(params, reqParams);
+                        const operation = lodashEs.find(apiConfiguration, { name: lodashEs.get(params, 'operation') });
                         if (this.networkService.isConnected() || params.onlyOnline || !operation || !params.dataModelName) {
                             return rxjs.from(this.remoteDBcall(operation, onlineHandler, params));
                         }
@@ -2475,7 +2491,7 @@
         }
         // set hasBlob flag on params when blob field is present
         hasBlob(store) {
-            const blobColumns = _.filter(store.entitySchema.columns, {
+            const blobColumns = lodashEs.filter(store.entitySchema.columns, {
                 'sqlType': 'blob'
             });
             return !!blobColumns.length;
@@ -2518,8 +2534,8 @@
                                     store.saveAll(response.body.content);
                                 }
                                 else if (operation.type === 'INSERT') {
-                                    params = _.clone(params);
-                                    params.data = _.clone(response.body);
+                                    params = lodashEs.clone(params);
+                                    params.data = lodashEs.clone(response.body);
                                     this.offlineDBService[operation.name](params, i1$1.noop, i1$1.noop, {
                                         resetPrimaryKey: false
                                     });
@@ -2542,10 +2558,10 @@
         prepareToCascade(params) {
             return this.getStore(params).then(store => {
                 const childObjectPromises = [];
-                _.forEach(params.data, (v, k) => {
+                lodashEs.forEach(params.data, (v, k) => {
                     let column, foreignRelation, childParams;
                     // NOTE: Save only one-to-one relations for cascade
-                    if (_.isObject(v) && !_.isArray(v)) {
+                    if (lodashEs.isObject(v) && !lodashEs.isArray(v)) {
                         column = store.entitySchema.columns.find(c => {
                             if (c.primaryKey && c.foreignRelations) {
                                 foreignRelation = c.foreignRelations.find(f => f.sourceFieldName === k);
@@ -2554,7 +2570,7 @@
                         });
                     }
                     if (column) {
-                        childParams = _.cloneDeep(params);
+                        childParams = lodashEs.cloneDeep(params);
                         childParams.entityName = foreignRelation.targetEntity;
                         childParams.data = v;
                         const childPromise = this.getStore(childParams).then(childStore => {
@@ -2672,7 +2688,7 @@
             isOfflineBehaviourAdded$1 = true;
             const orig = this.httpService.sendCallAsObservable;
             this.httpService.sendCallAsObservable = (reqParams, params) => {
-                if (!params && _.get(reqParams, 'url')) {
+                if (!params && lodashEs.get(reqParams, 'url')) {
                     params = { url: reqParams.url };
                 }
                 if (!this.networkService.isConnected() && params.url.indexOf('/queryExecutor/') > 0) {
@@ -2684,7 +2700,7 @@
             };
         }
         executeLocally(params) {
-            const url = params.url, hasUrlParams = url.indexOf('?') > 0, dbName = this.substring(url, 'services/', '/queryExecutor'), queryName = this.substring(url, 'queries/', hasUrlParams ? '?' : undefined), urlParams = hasUrlParams ? this.getHttpParamMap(this.substring(url, '?', undefined)) : {}, dataParams = this.getHttpParamMap(params.dataParams), queryParams = _.extend(urlParams, dataParams);
+            const url = params.url, hasUrlParams = url.indexOf('?') > 0, dbName = this.substring(url, 'services/', '/queryExecutor'), queryName = this.substring(url, 'queries/', hasUrlParams ? '?' : undefined), urlParams = hasUrlParams ? this.getHttpParamMap(this.substring(url, '?', undefined)) : {}, dataParams = this.getHttpParamMap(params.dataParams), queryParams = lodashEs.extend(urlParams, dataParams);
             return this.localDBManagementService.executeNamedQuery(dbName, queryName, queryParams)
                 .then(result => {
                 const rows = result.rows;
@@ -2723,7 +2739,7 @@
                 str = decodeURIComponent(str);
                 str.split('&').forEach(c => {
                     const csplits = c.split('=');
-                    if (_.isEmpty(_.trim(csplits[1])) || !NUMBER_REGEX.test(csplits[1])) {
+                    if (lodashEs.isEmpty(lodashEs.trim(csplits[1])) || !NUMBER_REGEX.test(csplits[1])) {
                         result[csplits[0]] = csplits[1];
                     }
                     else {
@@ -2744,7 +2760,7 @@
             this.deviceService = deviceService;
             this.networkService = networkService;
             this.securityService = securityService;
-            this.saveSecurityConfigLocally = _.debounce((config) => {
+            this.saveSecurityConfigLocally = lodashEs.debounce((config) => {
                 this._saveSecurityConfigLocally(config);
             }, 1000);
         }
@@ -2981,7 +2997,7 @@
         const promises = {};
         return {
             start: promise => {
-                promise.$$pullProcessId = 'PULL_' + _.now();
+                promise.$$pullProcessId = 'PULL_' + lodashEs.now();
             },
             add: (pullPromise, promise) => {
                 const pullProcessId = pullPromise.$$pullProcessId;
@@ -2992,15 +3008,15 @@
             },
             remove: (pullPromise, promise) => {
                 const pullProcessId = pullPromise.$$pullProcessId;
-                _.remove(promises[pullProcessId], promise);
-                if (_.isEmpty(promises[pullProcessId])) {
+                lodashEs.remove(promises[pullProcessId], promise);
+                if (lodashEs.isEmpty(promises[pullProcessId])) {
                     delete promises[pullProcessId];
                 }
             },
             abort: (pullPromise) => {
                 const pullProcessId = pullPromise.$$pullProcessId;
                 if (promises[pullProcessId]) {
-                    _.forEach(promises[pullProcessId], function (p) {
+                    lodashEs.forEach(promises[pullProcessId], function (p) {
                         if (p && p.abort) {
                             p.abort();
                         }
@@ -3047,22 +3063,22 @@
          * @returns {any}
          */
         addDeltaCriteria(db, entityName, query) {
-            const entitySchema = db.schema.entities[entityName], deltaFieldName = entitySchema.pullConfig.deltaFieldName, deltaField = _.find(entitySchema.columns, { 'fieldName': deltaFieldName }) || {};
+            const entitySchema = db.schema.entities[entityName], deltaFieldName = entitySchema.pullConfig.deltaFieldName, deltaField = lodashEs.find(entitySchema.columns, { 'fieldName': deltaFieldName }) || {};
             let isBundledEntity;
-            if (!_.isEmpty(deltaFieldName)) {
+            if (!lodashEs.isEmpty(deltaFieldName)) {
                 return this.localDBManagementService.isBundled(db.schema.name, entityName)
                     .then(flag => isBundledEntity = flag)
                     .then(() => this.getLastPullInfo())
                     .then(lastPullInfo => {
                     let lastPullTime = (lastPullInfo && lastPullInfo.startTime && lastPullInfo.startTime.getTime());
-                    const lastPullDBInfo = _.find(lastPullInfo && lastPullInfo.databases, { 'name': db.schema.name }), lastPullEntityInfo = _.find(lastPullDBInfo && lastPullDBInfo.entities, { 'entityName': entityName }) || {};
+                    const lastPullDBInfo = lodashEs.find(lastPullInfo && lastPullInfo.databases, { 'name': db.schema.name }), lastPullEntityInfo = lodashEs.find(lastPullDBInfo && lastPullDBInfo.entities, { 'entityName': entityName }) || {};
                     if (!lastPullTime && isBundledEntity) {
                         // For bundled entity when there is no last pull, fetch records that got modified after db creation.
                         lastPullTime = (lastPullInfo && lastPullInfo.endTime && lastPullInfo.endTime.getTime());
                         lastPullEntityInfo.query = query;
                     }
                     if (lastPullEntityInfo.query === query && lastPullTime > 0) {
-                        if (_.isEmpty(query)) {
+                        if (lodashEs.isEmpty(query)) {
                             query = '';
                         }
                         else {
@@ -3111,17 +3127,17 @@
                     }
                     return query;
                 }).then(query => {
-                    filter = _.isEmpty(query) ? '' : 'q=' + query;
+                    filter = lodashEs.isEmpty(query) ? '' : 'q=' + query;
                     return this.getTotalRecordsToPull(db, entitySchema, filter, pullPromise);
                 }).then(maxNoOfRecords => {
                     const pageSize = entitySchema.pullConfig.size || 100, maxNoOfPages = Math.ceil(maxNoOfRecords / pageSize);
                     result.totalRecordsToPull = maxNoOfRecords;
                     let sort = entitySchema.pullConfig.orderBy;
-                    sort = (_.isEmpty(sort) ? '' : sort + ',') + store.primaryKeyName;
+                    sort = (lodashEs.isEmpty(sort) ? '' : sort + ',') + store.primaryKeyName;
                     progressObserver.next(result);
                     const _progressObserver = { next: data => {
                             inProgress++;
-                            data = _.slice(data, 0, result.totalRecordsToPull - result.pulledRecordCount);
+                            data = lodashEs.slice(data, 0, result.totalRecordsToPull - result.pulledRecordCount);
                             store.saveAll(data).then(() => {
                                 result.pulledRecordCount += data ? data.length : 0;
                                 progressObserver.next(result);
@@ -3147,7 +3163,7 @@
         }
         // If expression starts with 'bind:', then expression is evaluated and result is returned.
         evalIfBind(expression) {
-            if (_.startsWith(expression, 'bind:')) {
+            if (lodashEs.startsWith(expression, 'bind:')) {
                 expression = expression.replace(/\[\$\i\]/g, '[0]');
                 return i1$1.$parseExpr(expression.replace('bind:', ''))(this.app);
             }
@@ -3190,8 +3206,8 @@
             };
             return this.retryIfNetworkFails(() => {
                 return this.executeDatabaseCountQuery(params).then(function (response) {
-                    const totalRecordCount = response, maxRecordsToPull = _.parseInt(entitySchema.pullConfig.maxNumberOfRecords);
-                    if (_.isNaN(maxRecordsToPull) || maxRecordsToPull <= 0 || totalRecordCount < maxRecordsToPull) {
+                    const totalRecordCount = response, maxRecordsToPull = parseInt(entitySchema.pullConfig.maxNumberOfRecords);
+                    if (lodashEs.isNaN(maxRecordsToPull) || maxRecordsToPull <= 0 || totalRecordCount < maxRecordsToPull) {
                         return totalRecordCount;
                     }
                     return maxRecordsToPull;
@@ -3204,23 +3220,23 @@
             return this.localDBManagementService.isBundled(db.schema.name, entityName)
                 .then(isBundledEntity => {
                 let hasNullAttributeValue = false;
-                if (isBundledEntity || _.isEmpty(entitySchema.pullConfig.query)) {
-                    query = _.cloneDeep(entitySchema.pullConfig.filter);
-                    query = _.map(query, v => {
+                if (isBundledEntity || lodashEs.isEmpty(entitySchema.pullConfig.query)) {
+                    query = lodashEs.cloneDeep(entitySchema.pullConfig.filter);
+                    query = lodashEs.map(query, v => {
                         v.attributeValue = this.evalIfBind(v.attributeValue);
-                        hasNullAttributeValue = hasNullAttributeValue || _.isNil(v.attributeValue);
+                        hasNullAttributeValue = hasNullAttributeValue || lodashEs.isNil(v.attributeValue);
                         return v;
                     });
                     if (hasNullAttributeValue) {
                         return Promise.reject('Null criteria values are present');
                     }
-                    query = _.sortBy(query, 'attributeName');
+                    query = lodashEs.sortBy(query, 'attributeName');
                     query = variables$1.LiveVariableUtils.getSearchQuery(query, ' AND ', true);
                 }
                 else {
                     query = this.evalIfBind(entitySchema.pullConfig.query);
                 }
-                if (_.isNil(query)) {
+                if (lodashEs.isNil(query)) {
                     return Promise.resolve(null);
                 }
                 return Promise.resolve(encodeURIComponent(query));
@@ -3244,7 +3260,8 @@
                 totalTaskCount: 0
             };
             const storePromises = [];
-            _.forEach(db.schema.entities, entity => {
+            lodashEs.forEach(db.schema.entities, entity => {
+                // @ts-ignore
                 storePromises.push(this.localDBManagementService.getStore(datamodelName, entity.entityName));
             });
             return new Promise((resolve, reject) => {
@@ -3258,21 +3275,21 @@
                             entities.push(store.entitySchema);
                         }
                     });
-                    const pullPromises = _.chain(entities)
+                    const pullPromises = lodashEs.chain(entities)
                         .map(entity => {
                         const _progressObserver = {
                             next: info => {
-                                const i = _.findIndex(result.entities, { 'entityName': info.entityName });
+                                const i = lodashEs.findIndex(result.entities, { 'entityName': info.entityName });
                                 if (i >= 0) {
                                     result.entities[i] = info;
                                 }
                                 else {
                                     result.entities.push(info);
                                 }
-                                result.pulledRecordCount = _.reduce(result.entities, function (sum, entityPullInfo) {
+                                result.pulledRecordCount = lodashEs.reduce(result.entities, function (sum, entityPullInfo) {
                                     return sum + entityPullInfo.pulledRecordCount;
                                 }, 0);
-                                result.totalRecordsToPull = _.reduce(result.entities, function (sum, entityPullInfo) {
+                                result.totalRecordsToPull = lodashEs.reduce(result.entities, function (sum, entityPullInfo) {
                                     return sum + entityPullInfo.totalRecordsToPull;
                                 }, 0);
                                 progressObserver.next(result);
@@ -3364,7 +3381,7 @@
         getDb(dbName) {
             return this.localDBManagementService.loadDatabases()
                 .then(databases => {
-                const db = _.find(databases, { 'name': dbName });
+                const db = lodashEs.find(databases, { 'name': dbName });
                 return db || Promise.reject('Local database (' + dbName + ') not found');
             });
         }
@@ -3374,10 +3391,10 @@
          */
         getLastPullInfo() {
             return this.localKeyValueService.get(LAST_PULL_INFO_KEY).then(info => {
-                if (_.isString(info.startTime)) {
+                if (lodashEs.isString(info.startTime)) {
                     info.startTime = new Date(info.startTime);
                 }
-                if (_.isString(info.endTime)) {
+                if (lodashEs.isString(info.endTime)) {
                     info.endTime = new Date(info.endTime);
                 }
                 return info;
@@ -3404,28 +3421,28 @@
             };
             this.localDBManagementService.loadDatabases()
                 .then(databases => {
-                const dataPullPromises = _.chain(databases).filter(function (db) {
+                const dataPullPromises = lodashEs.chain(databases).filter(function (db) {
                     return !db.schema.isInternal;
                 }).map(db => {
                     pullProcessManager.start(deferred.promise);
                     const _progressObserver = { next: data => {
-                            const i = _.findIndex(pullInfo.databases, { 'name': data.name });
+                            const i = lodashEs.findIndex(pullInfo.databases, { 'name': data.name });
                             if (i >= 0) {
                                 pullInfo.databases[i] = data;
                             }
                             else {
                                 pullInfo.databases.push(data);
                             }
-                            pullInfo.totalTaskCount = _.reduce(pullInfo.databases, function (sum, dbPullInfo) {
+                            pullInfo.totalTaskCount = lodashEs.reduce(pullInfo.databases, function (sum, dbPullInfo) {
                                 return sum + dbPullInfo.totalTaskCount;
                             }, 0);
-                            pullInfo.completedTaskCount = _.reduce(pullInfo.databases, function (sum, dbPullInfo) {
+                            pullInfo.completedTaskCount = lodashEs.reduce(pullInfo.databases, function (sum, dbPullInfo) {
                                 return sum + dbPullInfo.completedTaskCount;
                             }, 0);
-                            pullInfo.totalPulledRecordCount = _.reduce(pullInfo.databases, function (sum, dbPullInfo) {
+                            pullInfo.totalPulledRecordCount = lodashEs.reduce(pullInfo.databases, function (sum, dbPullInfo) {
                                 return sum + dbPullInfo.pulledRecordCount;
                             }, 0);
-                            pullInfo.totalRecordsToPull = _.reduce(pullInfo.databases, function (sum, dbPullInfo) {
+                            pullInfo.totalRecordsToPull = lodashEs.reduce(pullInfo.databases, function (sum, dbPullInfo) {
                                 return sum + dbPullInfo.totalRecordsToPull;
                             }, 0);
                             progressObserver.next(pullInfo);