@onehat/data 1.4.9 → 1.4.13

package/cypress/integration/Property/Currency.spec.js

@@ -60,6 +60,28 @@ describe('CurrencyProperty', function() {
 			expect(formatted).to.be.eq('$1,234.56');
 		});
 
+		it('omitZeros', function() {
+			this.property.setValue('1234.56');
+			expect(this.property.displayValue).to.be.eq('$1,234.56');
+
+			this.property.setValue('1234.50');
+			expect(this.property.displayValue).to.be.eq('$1,234.50');
+
+			this.property.setValue('1234.00');
+			expect(this.property.displayValue).to.be.eq('$1,234.00');
+
+			this.property.omitZeros = true;
+
+			this.property.setValue('1234.56');
+			expect(this.property.displayValue).to.be.eq('$1,234.56');
+
+			this.property.setValue('1234.50');
+			expect(this.property.displayValue).to.be.eq('$1,234.50');
+
+			this.property.setValue('1234.00');
+			expect(this.property.displayValue).to.be.eq('$1,234');
+		});
+
 		it('submitValue', function() {
 			this.property.setValue(123.156);
 			const formatted = this.property.submitValue;

package/cypress/integration/Repository/Ajax.spec.js

@@ -30,6 +30,43 @@ describe('OneBuildRepository', function() {
 	});
 
 	describe('Params', function() {
+
+		it('setParam', function() {
+			const r = this.repository;
+			r.setParam('test', 1);
+
+			expect(r._params.test).to.be.eq(1);
+		});
+
+		it('setParams', function() {
+			const r = this.repository;
+			r.setParams({
+				test1: 1,
+				test2: 2,
+			});
+
+			expect(r._params.test1).to.be.eq(1);
+			expect(r._params.test2).to.be.eq(2);
+		});
+
+		it('setBaseParam', function() {
+			const r = this.repository;
+			r.setBaseParam('test', 1);
+
+			expect(r._baseParams.test).to.be.eq(1);
+		});
+
+		it('setBaseParams', function() {
+			const r = this.repository;
+			r.setBaseParams({
+				test1: 1,
+				test2: 2,
+			});
+
+			expect(r._baseParams.test1).to.be.eq(1);
+			expect(r._baseParams.test2).to.be.eq(2);
+		});
+
 		it('setValuelessParam', function() {
 			const r = this.repository;
 			r.setParam('conditions[field]', 1);
@@ -38,6 +75,24 @@ describe('OneBuildRepository', function() {
 			expect(r._params.conditions.field).to.be.eq(1);
 			expect(r._params.conditions[0]).to.be.eq('field IS NOT NULL');
 		});
+
+		it('clearParams', function() {
+			const r = this.repository;
+			r.setParams({
+				test1: 1,
+				test2: 2,
+			});
+			r.setBaseParams({
+				test1: 1,
+				test2: 2,
+			});
+
+			r.clearParams(false, true);
+
+			expect(r._params).to.be.empty;
+			expect(r._baseParams).to.be.empty;
+		});
+
 	});
 
 	describe('custom', function() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.4.9",
+	"version": "1.4.13",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -38,26 +38,26 @@
 		"@onehat/events": "^1.6.5",
 		"accounting-js": "^1.1.1",
 		"axios": "^0.21.4",
-		"chrono-node": "^2.3.0",
+		"chrono-node": "^2.3.5",
 		"fast-xml-parser": "^3.19.0",
 		"he": "^1.2.0",
 		"js-base64": "^3.6.1",
 		"lodash": "^4.17.21",
 		"moment": "^2.29.1",
 		"numeral": "^2.0.6",
-		"qs": "^6.10.1",
+		"qs": "^6.10.3",
 		"relative-time-parser": "^1.0.13",
 		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.14.6",
-		"@babel/node": "^7.14.7",
-		"@babel/plugin-proposal-class-properties": "^7.14.5",
-		"@babel/plugin-transform-runtime": "^7.14.5",
-		"@babel/preset-env": "^7.14.7",
-		"@babel/register": "^7.14.5",
-		"@babel/runtime": "^7.14.6",
-		"@cypress/webpack-preprocessor": "^5.9.1",
+		"@babel/core": "^7.16.7",
+		"@babel/node": "^7.16.8",
+		"@babel/plugin-proposal-class-properties": "^7.16.7",
+		"@babel/plugin-transform-runtime": "^7.16.8",
+		"@babel/preset-env": "^7.16.8",
+		"@babel/register": "^7.16.9",
+		"@babel/runtime": "^7.16.7",
+		"@cypress/webpack-preprocessor": "^5.11.0",
 		"babel-loader": "^8.2.2",
 		"cypress": "5.2.0",
 		"ink-docstrap": "^1.3.2",

package/src/Property/Currency.js

@@ -26,6 +26,7 @@ export default class CurrencyProperty extends Property {
 			},
 			submitAsString: true, // NOTE, we want to use the accounting.toFixed() method by default
 			defaultValue: 0.00,
+			omitZeros: false, // Should we omit any .00 at the end?
 		};
 
 		_.merge(this, defaults, config);
@@ -45,7 +46,12 @@ export default class CurrencyProperty extends Property {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
-		return accounting.formatMoney(this.parsedValue, this.displayOptions);
+
+		let ret = accounting.formatMoney(this.parsedValue, this.displayOptions)
+		if (this.omitZeros && ret.match(/\.00$/)) {
+			ret = ret.replace(/\.00$/, '');
+		}
+		return ret;
 	}
 
 	getSubmitValue = () => {

package/src/Repository/Ajax.js

@@ -87,9 +87,9 @@ class AjaxRepository extends Repository {
 			headers: {},
 
 			/**
-			 * @member {object} baseParams - Params that will be applied to every request
+			 * @member {object} _baseParams - Params that will be applied to every request
 			 */
-			baseParams: {},
+			_baseParams: {},
 			
 		};
 		_.merge(this, defaults, config);
@@ -202,8 +202,7 @@ class AjaxRepository extends Repository {
 	setParam = (name, value, isBaseParam = false) => {
 		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
-			paramsToChange = isBaseParam ? this.baseParams : this._params;
-		
+			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
 		if (matches) { // name has array notation like 'conditions[username]'
 			const first = matches[1],
@@ -234,7 +233,7 @@ class AjaxRepository extends Repository {
 	setValuelessParam = (name, isBaseParam = false) => {
 		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
-			paramsToChange = isBaseParam ? this.baseParams : this._params;
+			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
 		if (matches) { // name has array notation like 'conditions[username]'
 			const first = matches[1],
@@ -262,24 +261,35 @@ class AjaxRepository extends Repository {
 		});
 	}
 
+	/**
+	 * Sets base query param
+	 * @param {string} name - Param name to set.
+	 * @param {any} value - Param value to set.
+	 */
+	setBaseParam = (name, value) => {
+		this.setParam(name, value, true);
+	}
+
 	/**
 	 * Sets base query params. These params are sent on every request.
 	 * @param {object} params - Base params to set. Key is parameter name, value is parameter value
 	 */
 	setBaseParams = (params) => {
 		_.each(params, (value, name) => {
-			this.setParam(name, value, true);
+			this.setBaseParam(name, value);
 		});
 	}
 
 	/**
-	 * Manually clears all existing (non-base) params
-	 * including sorting, filtering, and pagination.
+	 * Manually clears all (non-base) params including filtering.
 	 * *Not intended for normal usage,* but rather for testing.
 	 * @param {boolean} reload - Whether to reload repository. Defaults to false.
 	 */
-	clearParams = (reload = false) => {
+	clearParams = (reload = false, clearBase = false) => {
 		this._params = {};
+		if (clearBase) {
+			this._baseParams = {};
+		}
 		if (reload && this.isLoaded) {
 			return this.reload();
 		}
@@ -292,8 +302,8 @@ class AjaxRepository extends Repository {
 	 */
 	_onChangeSorters = () => {
 		const sorter = this.sorters[0];
-		this.setParam(this.paramSort, sorter.name, true); // true to set baseParam
-		this.setParam(this.paramDirection, sorter.direction, true);
+		this.setBaseParam(this.paramSort, sorter.name);
+		this.setBaseParam(this.paramDirection, sorter.direction);
 		
 		if (this.isLoaded) {
 			return this.reload();
@@ -319,8 +329,8 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangePagination = () => {
-		this.setParam(this.paramPageNum, this.page, true); // true to set baseParam
-		this.setParam(this.paramPageSize, this.pageSize, true);
+		this.setBaseParam(this.paramPageNum, this.page);
+		this.setBaseParam(this.paramPageSize, this.pageSize);
 
 		if (this.isLoaded) {
 			return this.reload();
@@ -360,7 +370,7 @@ class AjaxRepository extends Repository {
 		}
 
 		const repository = this;
-		const data = _.assign({}, this.baseParams, this._params);
+		const data = _.assign({}, this._baseParams, this._params);
 		
 		return this._send(this.methods.get, this.api.get, data)
 					.then(result => {
@@ -462,7 +472,7 @@ class AjaxRepository extends Repository {
 		const params = {
 			id: entity.id,
 		};
-		return _.assign({}, this.baseParams, params);
+		return _.assign({}, this._baseParams, params);
 	}
 
 	/**

package/src/Repository/OneBuild.js

@@ -173,7 +173,7 @@ class OneBuildRepository extends AjaxRepository {
 		});
 
 		if (!_.isEmpty(sorterStrings)) {
-			this.setParam('order', sorterStrings.join(','));
+			this.setBaseParam('order', sorterStrings.join(','));
 		}
 		
 		if (this.isLoaded) {