@onehat/data 1.18.4 → 1.18.7

package/package.json

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

package/src/Property/Json.js

@@ -115,3 +115,9 @@ export default class JsonProperty extends Property {
 
 JsonProperty.className = 'Json';
 JsonProperty.type = 'json';
+
+
+// For the sake of OneBuild, create an alias of Json, that's Tag
+class TagProperty extends JsonProperty {}
+TagProperty.className = 'Tag';
+TagProperty.type = 'tag';

package/src/Property/index.js

@@ -8,7 +8,7 @@ import DateTimeProperty from './DateTime.js';
 import FileProperty from './File.js';
 import FloatProperty from './Float.js';
 import IntegerProperty from './Integer.js';
-import JsonProperty from './Json.js';
+import JsonProperty, { TagProperty } from './Json.js';
 import PercentProperty from './Percent.js';
 import PercentIntProperty from './PercentInt.js';
 import StringProperty from './String.js';
@@ -28,6 +28,7 @@ const PropertyTypes = {
 	[PercentProperty.type]: PercentProperty,
 	[PercentIntProperty.type]: PercentIntProperty,
 	[StringProperty.type]: StringProperty,
+	[TagProperty.type]: TagProperty,
 	[TimeProperty.type]: TimeProperty,
 	[UuidProperty.type]: UuidProperty,
 };

package/src/Repository/Ajax.js

@@ -450,7 +450,7 @@ class AjaxRepository extends Repository {
 						}
 					})
 					.finally(() => {
-						this.isLoading = false;
+						this.markLoading(false);
 					});
 	}
 
@@ -511,7 +511,7 @@ class AjaxRepository extends Repository {
 						}
 					})
 					.finally(() => {
-						this.isLoading = false;
+						this.markLoading(false);
 					});
 		
 	}
@@ -894,12 +894,17 @@ class AjaxRepository extends Repository {
 			return;
 		}
 
+		const headers = _.merge({
+							'Content-Type': 'application/json',
+							'Accept': 'application/json',
+						}, this.headers);
+
 		const options = {
 				url,
 				method,
 				baseURL: this.api.baseURL,
 				transformResponse: null,
-				headers: this.headers,
+				headers,
 				params: method === 'GET' ? data : null,
 				data: method !== 'GET' ? qs.stringify(data) : null,
 				timeout: this.timeout,

package/src/Repository/OneBuild.js

@@ -1,5 +1,6 @@
 /** @module Repository */
 
+import Repository from './Repository.js';
 import AjaxRepository from './Ajax.js';
 import qs from 'qs';
 import _ from 'lodash';
@@ -45,7 +46,7 @@ class OneBuildRepository extends AjaxRepository {
 			},
 
 			methods: {
-				get: 'POST',
+				// get: 'POST',
 			},
 			
 			rootProperty: 'data',
@@ -104,12 +105,17 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
+		const headers = _.merge({
+							'Content-Type': 'application/json',
+							Accept: 'application/json',
+						}, this.headers);
+
 		const options = {
 				url,
 				method,
 				baseURL: this.api.baseURL,
 				transformResponse: null,
-				headers: this.headers,
+				headers,
 				params: method === 'GET' ? data : null,
 				data: method !== 'GET' ? qs.stringify(data) : null,
 				timeout: this.timeout,
@@ -220,7 +226,8 @@ class OneBuildRepository extends AjaxRepository {
 			};
 		}
 
-		const response = this.reader.read(result.data),
+		const
+			response = _.isPlainObject(result.data) ? result.data : this.reader.read(result.data),
 			root = response[this.rootProperty],
 			success = response[this.successProperty],
 			total = response[this.totalProperty],
@@ -347,11 +354,16 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('logout');
 		}
 
+		const headers = _.merge({
+							'Content-Type': 'application/json',
+							Accept: 'application/json',
+						}, this.headers);
+
 		return this.axios({
 				url: 'Users/apiLogout',
 				method: 'POST',
 				baseURL: this.api.baseURL,
-				headers: this.headers,
+				headers,
 				timeout: this.timeout,
 			})
 			.then((result) => {
@@ -424,13 +436,9 @@ class OneBuildRepository extends AjaxRepository {
 			this.throwError('Offline');
 			return;
 		}
+		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
+		this.markLoading();
 
-		// Clear all entities, if any exist
-		_.each(this.entities, (entity) => {
-			entity.destroy();
-		});
-		this.entities = [];
-		
 		
 		const data = {
 			url: this.name + '/getRootNodes',
@@ -450,19 +458,50 @@ class OneBuildRepository extends AjaxRepository {
 		return this.axios(data)
 			.then((result) => {
 				if (this.debugMode) {
-					console.log('getRootNodes response', result);
+					console.log('Response for getRootNodes', result);
 				}
 
-				const response = result.data;
-				if (!response.success) {
-					this.throwError(response.data);
+				if (this.isDestroyed) {
+					// If this repository gets destroyed before it has a chance
+					// to process the Ajax request, just ignore the response.
 					return;
 				}
 
-				// TODO: Load up the repository with these root nodes
+				const {
+					root,
+					success,
+					total,
+					message
+				} = this._processServerResponse(result);
 
+				this._destroyEntities();
 
+				// Set the current entities
+				this.entities = _.map(root, (data) => {
+					const entity = Repository._createEntity(this.schema, data, this, true);
+					this._relayEntityEvents(entity);
+					return entity;
+				});
+
+				this.assembleTreeNodes();
+				
+				// Set the total records that pass filter
+				this.total = total;
+				this._setPaginationVars();
+
+				this.areRootNodesLoaded = true;
+
+				this.markLoaded();
 
+				this.emit('changeData', this.entities);
+				this.emit('load', this);
+
+				return this.getBy((entity) => {
+					return entity.isRoot;
+				});
+			})
+			.finally(() => {
+				this.markLoading(false);
 			});
 	}
 

package/src/Repository/Repository.js

@@ -219,6 +219,11 @@ export default class Repository extends EventEmitter {
 		 */
 		this.lastLoaded = null;
 
+		/**
+		 * @member {boolean} areRootNodesLoaded - State: whether or not root nodes have been loaded at least once
+		 */
+		this.areRootNodesLoaded = false;
+
 		/**
 		 * @member {boolean} isSaving - State: whether or not entities are currently being saved
 		 */
@@ -355,15 +360,15 @@ export default class Repository extends EventEmitter {
 	/**
 	 * Marks this repository as loading
 	 */
-	markLoading = () => {
-		this.isLoading = true;
+	markLoading = (bool = true) => {
+		this.isLoading = bool;
 	}
 
 	/**
 	 * Marks this repository as loaded
 	 */
 	markLoaded = () => {
-		this.isLoading = false;
+		this.markLoading(false);
 		this.isLoaded = true;
 		this.lastLoaded = moment(new Date()).format('YYYY-MM-DD HH:mm:ss.SSSS');
 	}