@onehat/data 1.19.22 → 1.19.25

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

@@ -1114,6 +1114,38 @@ describe('Repository Base', function() {
 			const str = this.repository.toString();
 			expect(str).to.be.eq('NullRepository {bar} - foo');
 		});
+
+		it('_insertBefore', function() {
+			
+			const
+				repository = this.repository,
+				one = { id: 'one' },
+				two =  { id: 'two' },
+				three =  { id: 'three' };
+			
+			// insert into empty array
+			repository.entities = [];
+			repository._insertBefore(one);
+			expect(repository.entities.length).to.be.eq(1);
+			expect(repository.entities[0]).to.be.eq(one);
+
+			// insert into array with one
+			repository.entities = [two];
+			repository._insertBefore(one, two);
+			expect(repository.entities.length).to.be.eq(2);
+			expect(repository.entities[0]).to.be.eq(one);
+			expect(repository.entities[1]).to.be.eq(two);
+
+			// insert into middle of array
+			repository.entities = [one, three];
+			repository._insertBefore(two, three);
+			expect(repository.entities.length).to.be.eq(3);
+			expect(repository.entities[0]).to.be.eq(one);
+			expect(repository.entities[1]).to.be.eq(two);
+			expect(repository.entities[2]).to.be.eq(three);
+
+			repository.entities = []; // because the entities aren't real entities and we don't want a destory error
+		});
 	});
 
 	describe('tree', function() {

package/package.json

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

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -277,20 +277,24 @@ class LocalFromRemoteRepository extends EventEmitter {
 		// NORMAL PROCESS, basically call super()
 		// This adds to the local repository, so we can sync later,
 		// if needed.
-		const normalAdd = this._getActiveRepository().add(data);
+		const normalAdd = await this._getActiveRepository().add(data);
 		if (this.mode !== MODE_COMMAND_QUEUE || !this.isOnline) {
 			return normalAdd;
 		}
 		
 		// MODE_COMMAND_QUEUE -- try to sync now!
-		const entity = await normalAdd;
-		return await this.sync(entity);
+		return await this.sync(normalAdd);
 	}
 
 	/**
 	 * Syncs local and remote repositories, based on operation mode.
 	 */
 	sync = async (entity, callback = null) => {
+
+		if (this.debugMode) {
+			console.log('sync');
+		}
+
 		try {
 			if (!this.isOnline) {
 				this._doAutoSync(true);

package/src/Repository/Memory.js

@@ -590,6 +590,11 @@ class MemoryRepository extends Repository {
 		}
 	}
 
+
+	_insertBefore = (newEntity, entity = null) => {
+		throw Error('Not yet implemented');
+	}
+
 	/**
 	 * Gets the total number of Entities in the storage medium,
 	 * before any sorting or filtering is applied.

package/src/Repository/OneBuild.js

@@ -307,6 +307,45 @@ class OneBuildRepository extends AjaxRepository {
 			});
 	}
 
+	remoteDuplicate = async (entity) => {
+		
+		this.markLoading();
+
+		const
+			Model = this.getSchema().name,
+			id = entity.id,
+			result = await this._send('POST', Model + '/duplicate', { id });
+		
+		if (!result) {
+			this.markLoading(false);
+			this.throwError('error duplicating on server');
+			return;
+		}
+
+		const {
+			root,
+			success,
+			total,
+			message
+		} = this._processServerResponse(result);
+
+		if (!success) {
+			this.markLoading(false);
+			throw Error(message);
+		}
+
+		// Click duplicateId. The new row appears directly above the one that was duplicated
+		// The new duplicate is selected
+		// The display field should read "{old name} (duplicate)"
+
+		
+		const duplicateEntity = await this.createStandaloneEntity(root, true, true);
+		this._insertBefore(duplicateEntity, entity);
+
+		this.markLoading(false);
+		return duplicateEntity;
+	}
+
 	getSingleEntityFromServer = async (id) => {
 		if (this.isDestroyed) {
 			this.throwError('this.getSingleEntityFromServer is no longer valid. Repository has been destroyed.');
@@ -317,6 +356,12 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
+		if (!id) {
+			return null;
+		}
+
+		this.markLoading();
+
 		const idPropertyName = this.getSchema().model.idProperty;
 		const params = {};
 		params['conditions[' + idPropertyName + ']'] = id;
@@ -324,7 +369,7 @@ class OneBuildRepository extends AjaxRepository {
 		const data = _.merge(params, this._baseParams);
 
 		if (this.debugMode) {
-			console.log('getSingleEntityFromServer', options);
+			console.log('getSingleEntityFromServer', data);
 		}
 
 		return this._send(this.methods.get, this.api.get, data)
@@ -347,7 +392,7 @@ class OneBuildRepository extends AjaxRepository {
 						} = this._processServerResponse(result);
 
 						if (!root[0]) {
-							throw Error('Record does not exist!')
+							return null;
 						}
 
 						return this.createStandaloneEntity(root[0]);

package/src/Repository/Repository.js

@@ -1160,6 +1160,34 @@ export default class Repository extends EventEmitter {
 		this.entities = [];
 	}
 
+	/**
+	 * Inserts the newEntity directly before entity on the current page.
+	 */
+	_insertBefore = (newEntity, entity = null) => {
+
+		const
+			currentEntities = this.getEntities(),
+			foundIx = _.findIndex(currentEntities, ent => ent === entity),
+			existingEntityIx = foundIx === -1 ? 0 : foundIx;
+
+		let firstHalf = [],
+			secondHalf = [];
+
+		if (!currentEntities.length || existingEntityIx === 0) {
+			firstHalf.push(newEntity);
+			secondHalf = currentEntities;
+		} else {
+			firstHalf = _.slice(currentEntities, 0, existingEntityIx);
+			firstHalf.push(newEntity);
+			secondHalf = _.slice(currentEntities, existingEntityIx);
+		}
+
+		this.entities = [
+			...firstHalf,
+			...secondHalf,
+		];
+	}
+
 	/**
 	 * Deletes all locally cached entities in repository,
 	 * usually, the current "page".
@@ -1169,6 +1197,13 @@ export default class Repository extends EventEmitter {
 		this._destroyEntities();
 	}
 
+
+	//  _    __      __               
+	// | |  / /___ _/ /_  _____  _____
+	// | | / / __ `/ / / / / _ \/ ___/
+	// | |/ / /_/ / / /_/ /  __(__  ) 
+	// |___/\__,_/_/\__,_/\___/____/  
+
 	/**
 	 * Gets an array of "submit" values objects for the entities
 	 * @return {array} map -