@onehat/data 1.22.18 → 1.22.20

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

@@ -38,6 +38,21 @@ describe('OneBuildRepository', function() {
 			expect(r._params.test).to.be.eq(1);
 		});
 
+		it('getBaseParamConditions', function() {
+			const
+				r = this.repository,
+				newConditions = {
+					'conditions[Model.model]': 'test1',
+					'conditions[Model.modelid]': 'test2',
+				};
+
+			r.setBaseParams(newConditions);
+
+			const conditions = r.getBaseParamConditions();
+
+			expect(conditions).to.eql(newConditions);
+		});
+
 		it('hasParam', function() {
 			const r = this.repository;
 			r.setParam('test', 1);

package/package.json

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

package/src/Repository/Ajax.js

@@ -354,6 +354,19 @@ class AjaxRepository extends Repository {
 		return this._baseParams;
 	}
 
+	/**
+	 * Returns current value of any baseParam query conditions
+	 */
+	getBaseParamConditions() {
+		const
+			existingConditions = this._baseParams.conditions || {},
+			convertedConditions = {};
+		_.each(existingConditions, (value, key) => {
+			convertedConditions['conditions[' + key + ']'] = value;
+		});
+		return convertedConditions;
+	}
+
 	/**
 	 * Determines if query param exists
 	 * @param {string} name - Param name
@@ -522,7 +535,7 @@ class AjaxRepository extends Repository {
 
 		const repository = this;
 		
-    return this._send(this.methods.get, url, data, { isLoadRequest: true, requestKey, })
+		return this._send(this.methods.get, url, data, { isLoadRequest: true, requestKey, })
 					.then(result => {
 						if (this.debugMode) {
 							console.log('Response for ' + this.name, result);

package/src/Repository/Tree.js

@@ -113,6 +113,7 @@ class TreeRepository extends OneBuildRepository {
 				this.total = total;
 				this._setPaginationVars();
 
+				this.markLoaded();
 				this.areRootNodesLoaded = true;