@onehat/data 1.13.3 → 1.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.13.3",
+	"version": "1.13.5",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Integration/ReactNative/Repository/AsyncStorage.js

@@ -68,26 +68,35 @@ class AsyncStorageRepository extends OfflineRepository {
 				console.log(this.name, 'AsyncStorage.multiGet results', keys, results);
 			}
 
-			let values = [];
+			const values = [];
 			if (!_.isNil(results)) {
-				_.each(results, ([key, value]) => {
-					let parsed;
-					try {
-						parsed = JSON.parse(value);
-					} catch (e) {
-						parsed = value; // Invalid JSON, just return raw result
+				const chunks = _.chunk(results, 400); // create chunks of 400, which we'll iterate through, so we don't get "Excessive number of pending callbacks" error
+				let i, n, thisChunk, promises, promise, parsed;
+				for (i = 0; i < chunks.length; i++) { // iterate the chunks
+					thisChunk = chunks[i];
+					for (n = 0; n < thisChunk.length; n++) { // iterate the storage items
+						let [ key, value ] = thisChunk[n];
+
+						try {
+							parsed = JSON.parse(value);
+						} catch (e) {
+							parsed = value; // Invalid JSON, just return raw result
+						}
+						if (parsed === null) {
+							// Values should be stored as JSON, so it should be either {} or []. If it's null, that means the AsyncStorage can't find the record
+							// Delete the index to this record
+							const re = new RegExp('^' + this.name + '\-' + '(.*)'),
+								matches = key.match(re);
+							const id = parseInt(matches, 10);
+							promise = this._deleteFromIndex(id);
+							promises.push(promise);
+						} else {
+							values.push(parsed);
+						}
 					}
-					if (parsed === null) {
-						// Values should be stored as JSON, so it should be either {} or []. If it's null, that means the AsyncStorage can't find the record
-						// Delete the index to this record
-						const re = new RegExp('^' + this.name + '\-' + '(.*)'),
-							matches = key.match(re);
-						const id = parseInt(matches, 10);
-						this._deleteFromIndex(id);
-					} else {
-						values.push(parsed);
-					}
-				})
+
+					await Promise.all(promises);
+				}
 			}
 
 			// if (this.debugMode && _.size(keys) < 20) {

package/src/Repository/OneBuild.js

@@ -232,8 +232,49 @@ class OneBuildRepository extends AjaxRepository {
 		};
 	}
 
+	
 	/**
-	 * Login to OnBuild API
+	 * Integrates with RestTrait::reorder in OneBuild API
+	 * @param {entity} dragRecord - which entity was being dragged
+	 * @param {entity} dropRecord - which entity it was dropped on to
+	 * @param {string} dropPosition - position in which it was dropped; could be 'before' or 'after'
+	 * @return {Promise}
+	 */
+	reorder = (dragRecord, dropRecord, dropPosition) => {
+		const data = {
+			url: 'reorder',
+			data: qs.stringify({
+				ids: dragRecord.id,
+				dropPosition,
+				dropRecord_id: dropRecord.id,
+			}),
+			method: 'POST',
+			baseURL: this.api.baseURL,
+		};
+
+		if (this.debugMode) {
+			console.log('reorder', data);
+		}
+
+		return this.axios(data)
+			.then((result) => {
+				if (this.debugMode) {
+					console.log('reorder response', result);
+				}
+
+				const response = result.data;
+				if (!response.success) {
+					throw new Error(response.data);
+				}
+
+				// Reload the repository, so updated sort_order values can be retrieved
+				this.reload();
+
+			});
+	}
+
+	/**
+	 * Login to OneBuild API
 	 * @param {object} creds - object with two properties:
 	 * - username,
 	 * - password,
@@ -269,7 +310,7 @@ class OneBuildRepository extends AjaxRepository {
 	}
 
 	/**
-	 * Logout from OnBuild API
+	 * Logout from OneBuild API
 	 * @return {Promise}
 	 */
 	logout = () => {