@onehat/data 1.21.16 → 1.21.18

package/cypress/e2e/Repository/OneBuild.cy.js

@@ -2,6 +2,7 @@ import { OneHatData } from '../../../src/OneHatData.js';
 import UsersDefinition from '../../fixtures/Definitions/Users.js';
 import GroupsDefinition from '../../fixtures/Definitions/Groups.js';
 import UserData from '../../fixtures/Data/User.js';
+import _ from 'lodash';
 
 const baseURL = Cypress.env('baseURL'),
 	creds = {
@@ -63,6 +64,22 @@ describe('OneBuildRepository', function() {
 		expect(p.conditions.key2).to.be.eq('2');
 	});
 
+	it('merge from lodash', function() {
+		const
+			a = {
+				test: true,
+			},
+			b = {
+				foo: true,
+			};
+		let c;
+		const bar = _.merge({}, a, b, c);
+
+		expect(_.isEqual(a, { test: true })).to.be.true;
+		expect(_.isEqual(b, { foo: true })).to.be.true;
+		expect(_.isEqual(bar, { test: true, foo: true })).to.be.true;
+	});
+
 	it.skip('401', function() {
 		cy.wrap((async () => {
 

package/package.json

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

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -459,7 +459,7 @@ class LocalFromRemoteRepository extends EventEmitter {
 						}
 	
 						// local <-- remote
-						await localItem.loadOriginalData(remoteItem.getOriginalData());
+						localItem.response = remoteItem.response;
 						this.remote.clear();
 
 						// Handle the server's response

package/src/Repository/Memory.js

@@ -449,10 +449,11 @@ class MemoryRepository extends Repository {
 			return;
 		}
 		
-		delete this._keyedEntities[entity.id];
+		if (!entity.isDestroyed) {
+			delete this._keyedEntities[entity.id];
+			entity.destroy();
+		}
 		this.entities = _.filter(this.entities, (x) => x.id !== entity.id);
-
-		entity.destroy();
 		return entity;
 	}
 
@@ -600,8 +601,9 @@ class MemoryRepository extends Repository {
 
 		this._setPaginationVars();
 
-		const nextEntities = this._paginate(entities),
-			nextValues = _.map(nextEntities, (entity) => entity.getSubmitValues());
+		const
+			nextEntities = this._paginate(entities),
+			nextValues = _.map(nextEntities, (entity) => entity.isDestroyed ? null : entity.getSubmitValues());
 		if (!_.isEqual(this._previousValues, nextValues)) {
 			this.entities = nextEntities;
 			this._previousValues = nextValues;

package/src/Repository/Offline.js

@@ -214,6 +214,10 @@ class OfflineRepository extends MemoryRepository {
 		}
 
 		// Get a clone, in case we need to revert back to it later
+		if (entity.isDestroyed) {
+			return await this._storageDeleteValue(entity.id);
+		}
+
 		const clone = entity.clone();
 
 		// Attempt to edit
@@ -242,7 +246,7 @@ class OfflineRepository extends MemoryRepository {
 		}
 		
 		// Get a clone, in case we need to revert back to it later
-		const clone = entity.clone();
+		const clone = entity.isDestroyed ? null : entity.clone();
 
 		// Attempt to delete
 		super._doDelete(entity);
@@ -253,8 +257,12 @@ class OfflineRepository extends MemoryRepository {
 			storageResult = await this._storageDeleteValue(entity.id);
 			await this._deleteFromIndex(entity.id);
 		} catch (e) {
-			// Revert to clone
-			this._keyedEntities[clone.id] = clone;
+			// try to revert to clone
+			if (clone) {
+				this._keyedEntities[clone.id] = clone;
+			} else {
+				delete this._keyedEntities[entity.id];
+			}
 		}
 
 		return storageResult;

package/src/Repository/OneBuild.js

@@ -96,7 +96,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Fires off axios request to server
 	 * @private
 	 */
-	_send(method, url, data) {
+	_send(method, url, data, headers) {
 
 		if (!url) {
 			this.throwError('No url submitted');
@@ -108,17 +108,17 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
-		const headers = _.merge({
+		const mergedHeaders = _.merge({
 							// 'Content-Type': 'application/json', // Stops axios from using 'application/x-www-form-urlencoded'
 							Accept: 'application/json',
-						}, this.headers);
+						}, this.headers, headers);
 
 		const options = {
 				url,
 				method,
 				baseURL: this.api.baseURL,
 				transformResponse: null,
-				headers,
+				headers: mergedHeaders,
 				params: method === 'GET' ? data : null,
 				data: method !== 'GET' ? qs.stringify(data) : null,
 				timeout: this.timeout,

package/src/Repository/Repository.js

@@ -1523,7 +1523,7 @@ export default class Repository extends EventEmitter {
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(entities, entity => entity.isDirty && !entity.isSaving);
+		return _.filter(entities, entity => !entity.isSaving && (entity.isDestroyed || entity.isDirty));
 	}
 
 	/**
@@ -1539,7 +1539,7 @@ export default class Repository extends EventEmitter {
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(entities, entity => entity.isDeleted);
+		return _.filter(entities, entity => entity.isDestroyed || entity.isDeleted);
 	}
 
 	/**