@onehat/data 1.21.17 → 1.21.19

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.17",
+	"version": "1.21.19",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Entity/Entity.js

@@ -1619,7 +1619,7 @@ class Entity extends EventEmitter {
 		}
 
 		const children = await this.getChildren();
-		return  _.includes(children, treeNode);
+		return _.includes(children, treeNode);
 	}
 
 	/**

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,
@@ -805,13 +805,10 @@ class OneBuildRepository extends AjaxRepository {
 		// If children already exist, remove them from the repository
 		// This way, we can reload just a portion of the tree
 		if (!_.isEmpty(treeNode.children)) {
-			const children = treeNode.children;
-			treeNode.children = [];
-
-			const oThis = this;
-			_.each(children, (child) => {
-				oThis.removeEntity(child);
+			_.each(treeNode.children, (child) => {
+				treeNode.repository.removeTreeNode(child);
 			});
+			treeNode.children = [];
 		}
 		
 		this.markLoading();