@onehat/data 1.8.0 → 1.8.3

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

@@ -21,4 +21,26 @@ describe('PercentProperty', function() {
 		expect(this.property.displayValue).to.be.eq('12.325%');
 	});
 
+	it('omitZeros', function() {
+		this.property.setValue('1234.56');
+		expect(this.property.displayValue).to.be.eq('1234.560%');
+
+		this.property.setValue('1234.50');
+		expect(this.property.displayValue).to.be.eq('1234.500%');
+
+		this.property.setValue('1234.00');
+		expect(this.property.displayValue).to.be.eq('1234.000%');
+
+		this.property.omitZeros = true;
+
+		this.property.setValue('1234.56');
+		expect(this.property.displayValue).to.be.eq('1234.56%');
+
+		this.property.setValue('1234.50');
+		expect(this.property.displayValue).to.be.eq('1234.5%');
+
+		this.property.setValue('1234.00');
+		expect(this.property.displayValue).to.be.eq('1234%');
+	});
+
 });

package/package.json

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

package/src/Entity.js

@@ -331,6 +331,7 @@ class Entity extends EventEmitter {
 		if (this.isDeleted) {
 			this.undelete();
 		}
+		this.markStaged(false);
 		this.setLastModified();
 
 		this.emit('reset', this._proxy);

package/src/Property/PercentInt.js

@@ -8,12 +8,22 @@ import Formatters from '../Util/Formatters';
  * @extends PercentProperty
  */
 export default class PercentIntProperty extends FloatProperty {
+
+	constructor(config = {}) {
+		super(...arguments);
+
+		const defaults = {
+			omitZeros: false, // Should we omit any .00 at the end?
+		};
+
+		_.merge(this, defaults, config);
+	}
 	
 	getDisplayValue = () => {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
-		return Formatters.FormatPercentInt(this.parsedValue);
+		return Formatters.FormatPercentInt(this.parsedValue, this.omitZeros);
 	}
 
 };

package/src/Repository/Ajax.js

@@ -102,6 +102,11 @@ class AjaxRepository extends Repository {
 		 */
 		this.allowsMultiSort = false;
 
+		/**
+		 * @member {object} lastSendOptions - Last options sent to server
+		 */
+		this.lastSendOptions = null;
+
 		/**
 		 * @member {Object} _params - Object of query params to submit to server
 		 * @private
@@ -786,6 +791,8 @@ class AjaxRepository extends Repository {
 			console.log(url, options);
 		}
 		
+		this.lastSendOptions = options;
+		
 		return this.axios(options)
 					.catch(error => {
 						if (this.debugMode) {

package/src/Repository/OneBuild.js

@@ -113,6 +113,8 @@ class OneBuildRepository extends AjaxRepository {
 			console.log(url, options);
 		}
 		
+		this.lastSendOptions = options;
+		
 		return this.axios(options)
 					.catch(error => {
 						// BEGIN MOD

package/src/Util/Formatters.js

@@ -168,10 +168,13 @@ class Formatters {
 		return value.toFixed(precision) + '%';
 	}
 
-	static FormatPercentInt = (str) => {
+	static FormatPercentInt = (str, omitZeros = false) => {
 		if (_.isNil(str)) {
 			return str;
 		}
+		if (omitZeros) {
+			str = parseFloat(str).toString();
+		}
 		return '' + str + '%';
 	}