@onehat/data 1.4.5 → 1.4.9

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

@@ -372,6 +372,19 @@ describe('Repository Base', function() {
 			expect(didFireChangeFilters).to.be.true;
 		});
 
+		it('changing filters resets pagination', function() {
+			this.repository.isPaginated = true;
+			this.repository.setPageSize(1);
+			this.repository.setPage(3);
+
+			this.repository.setFilters({
+				b: '1',
+				c: '2',
+			});
+
+			expect(this.repository.page).to.be.eq(1);
+		});
+
 	});
 
 	describe('pagination', function() {
@@ -414,29 +427,73 @@ describe('Repository Base', function() {
 		});
 
 		it('_calculatePaginationVars', function() {
-			let results = this.Repository._calculatePaginationVars(15, 1, 10), // Capital "R"
-				expected = {
-					page: 1,
-					pageSize: 10,
-					total: 15,
-					totalPages: 2,
-					pageStart: 1,
-					pageEnd: 10,
-					pageTotal: 10,
-				};
-			expect(_.isEqual(results, expected)).to.be.true;
-
-			results = this.Repository._calculatePaginationVars(15, 2, 10); // Capital "R"
-			expected = {
-				page: 2,
-				pageSize: 10,
-				total: 15,
-				totalPages: 2,
-				pageStart: 11,
-				pageEnd: 15,
-				pageTotal: 5,
-			};
-			expect(_.isEqual(results, expected)).to.be.true;
+			let results;
+
+			results = this.Repository._calculatePaginationVars(0, 1, 10);
+			expect(results.page).to.be.eq(1);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(0);
+			expect(results.totalPages).to.be.eq(1);
+			expect(results.pageStart).to.be.eq(0);
+			expect(results.pageEnd).to.be.eq(0);
+			expect(results.pageTotal).to.be.eq(0);
+
+			results = this.Repository._calculatePaginationVars(15, 1, 10);
+			expect(results.page).to.be.eq(1);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(1);
+			expect(results.pageEnd).to.be.eq(10);
+			expect(results.pageTotal).to.be.eq(10);
+
+			results = this.Repository._calculatePaginationVars(15, 2, 10);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(11);
+			expect(results.pageEnd).to.be.eq(15);
+			expect(results.pageTotal).to.be.eq(5);
+
+			results = this.Repository._calculatePaginationVars(15, 2, 5);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(5);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(3);
+			expect(results.pageStart).to.be.eq(6);
+			expect(results.pageEnd).to.be.eq(10);
+			expect(results.pageTotal).to.be.eq(5);
+
+			results = this.Repository._calculatePaginationVars(7, 2, 5);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(5);
+			expect(results.total).to.be.eq(7);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(6);
+			expect(results.pageEnd).to.be.eq(7);
+			expect(results.pageTotal).to.be.eq(2);
+
+			results = this.Repository._calculatePaginationVars(15, 15, 1);
+			expect(results.page).to.be.eq(15);
+			expect(results.pageSize).to.be.eq(1);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(15);
+			expect(results.pageStart).to.be.eq(15);
+			expect(results.pageEnd).to.be.eq(15);
+			expect(results.pageTotal).to.be.eq(1);
+		});
+
+		it('reset pagination', function() {
+			expect(this.repository.page).to.be.eq(1);
+			
+			this.repository.isPaginated = true;
+			this.repository.setPageSize(1);
+			this.repository.setPage(3);
+			expect(this.repository.page).to.be.eq(3);
+
+			this.repository.resetPagination();
+			expect(this.repository.page).to.be.eq(1);
 		});
 
 	});

package/package.json

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

package/src/Integration/ReactNative/Repository/AsyncStorage.js

@@ -1,7 +1,12 @@
+/**
+ * This file is categorized as "Proprietary Framework Code"
+ * and is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
 /** @module Repository */
 
 import OfflineRepository from '@onehat/data/src/Repository/Offline.js';
-import AsyncStorage from '@react-native-community/async-storage';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 import _ from 'lodash';
 
 /**
@@ -37,10 +42,12 @@ class AsyncStorageRepository extends OfflineRepository {
 					value = result; // Invalid JSON, just return raw result
 				}
 			}
+			
 			return value;
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageGetValue error', msg);
 				debugger;
 			}
 		}
@@ -60,7 +67,7 @@ class AsyncStorageRepository extends OfflineRepository {
 			const results = await AsyncStorage.multiGet(this._namespace(keys));
 
 			if (this.debugMode) {
-				console.log(this.name, 'AsyncStorage.multiGet results', name, results);
+				console.log(this.name, 'AsyncStorage.multiGet results', results);
 			}
 
 			let values = [];
@@ -72,7 +79,17 @@ class AsyncStorageRepository extends OfflineRepository {
 					} catch (e) {
 						parsed = value; // Invalid JSON, just return raw result
 					}
-					values.push(parsed);
+					if (parsed === null) {
+						// Values should be stored as JSON, so it should be either {} or []. If it's null, that means the AsyncStorage can't find the record
+						// Delete the index to this record
+						const re = new RegExp('^' + this.name + '\-' + '(.*)'),
+							matches = key.match(re);
+debugger;
+						const id = parseInt(matches, 10);
+						this._deleteFromIndex(id);
+					} else {
+						values.push(parsed);
+					}
 				})
 			}
 
@@ -84,6 +101,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageGetMultiple error', msg);
 				debugger;
 			}
 		}
@@ -103,6 +121,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageSetValue error', msg);
 				debugger;
 			}
 		}
@@ -126,11 +145,16 @@ class AsyncStorageRepository extends OfflineRepository {
 				console.log(this.name, 'AsyncStorage.multiSet', keys);
 			}
 
+			if (_.isEmpty(converted)) {
+				return;
+			}
+
 			return await AsyncStorage.multiSet(converted);
 
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageSetMultiple error', msg);
 				debugger;
 			}
 		}
@@ -151,6 +175,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageDeleteValue error', msg);
 				debugger;
 			}
 		}
@@ -171,6 +196,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		} catch (error) {
 			if (this.debugMode) {
 				const msg = error && error.message;
+				console.log('_storageDeleteMultiple error', msg);
 				debugger;
 			}
 		}

package/src/Integration/ReactNative/Repository/SecureStore.js

@@ -1,94 +1,99 @@
-import OfflineRepository from '@onehat/data/src/Repository/Offline';
-import * as SecureStore from 'expo-secure-store'; // see: https://docs.expo.io/versions/latest/sdk/securestore/
-import _ from 'lodash';
-
 /**
- * Repository representing Expo's SecureStore
- * Uses expo-secure-store package
+ * This file is categorized as "Proprietary Framework Code"
+ * and is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
  */
-class SecureStoreRepository extends OfflineRepository {
-
-	constructor(config = {}) {
-		super(...arguments);
-		_.merge(this, config);
-	}
-
-	_storageGetValue = async (name) => {
-		try {
-			
-			if (this.debugMode) {
-				console.log(this.name, 'SecureStore.get', name);
-			}
-
-			const result = await SecureStore.getItemAsync(this._namespace(name));
-
-			if (this.debugMode) {
-				console.log(this.name, 'SecureStore.get results', name, result);
-			}
-
-			let value;
-			if (!_.isNil(result)) {
-				try {
-					value = JSON.parse(result);
-				} catch (e) {
-					value = result; // Invalid JSON, just return raw result
-				}
-			}
-			return value;
-		} catch (error) {
-			if (this.debugMode) {
-				const msg = error && error.message;
-				debugger;
-			}
-		}
-	}
-
-	_storageSetValue = async (name, value) => {
-		try {
-			if (!_.isString(value)) {
-				value = JSON.stringify(value);
-			}
-			if (this.debugMode) {
-				console.log(this.name, 'SecureStore.set', name, value);
-			}
-
-			const result = await SecureStore.setItemAsync(this._namespace(name), value);
-
-			// if (this.debugMode) {
-			// 	console.log(this.name, 'SecureStore.set results', name, result);
-			// }
-			return result;
-		} catch (error) {
-			if (this.debugMode) {
-				const msg = error && error.message;
-				debugger;
-			}
-		}
-	}
-
-	_storageDeleteValue = async (name) => {
-		try {
-			if (this.debugMode) {
-				console.log(this.name, 'SecureStore.delete', name);
-			}
-
-			const result = await SecureStore.deleteItemAsync(this._namespace(name));
-
-			// if (this.debugMode) {
-			// 	console.log(this.name, 'SecureStore.delete results', name, result);
-			// }
-			return result;
-		} catch (error) {
-			if (this.debugMode) {
-				const msg = error && error.message;
-				debugger;
-			}
-		}
-	}
-
-};
-
-SecureStoreRepository.className = 'SecureStore';
-SecureStoreRepository.type = 'secure';
-
-export default SecureStoreRepository;
+ import OfflineRepository from '@onehat/data/src/Repository/Offline.js';
+ import * as SecureStore from 'expo-secure-store'; // see: https://docs.expo.io/versions/latest/sdk/securestore/
+ import _ from 'lodash';
+ 
+ /**
+  * Repository representing Expo's SecureStore
+  * Uses expo-secure-store package
+  */
+ class SecureStoreRepository extends OfflineRepository {
+ 
+	 constructor(config = {}) {
+		 super(...arguments);
+		 _.merge(this, config);
+	 }
+ 
+	 _storageGetValue = async (name) => {
+		 try {
+			 
+			 if (this.debugMode) {
+				 console.log(this.name, 'SecureStore.get', name);
+			 }
+ 
+			 const result = await SecureStore.getItemAsync(this._namespace(name));
+ 
+			 if (this.debugMode) {
+				 console.log(this.name, 'SecureStore.get results', name, result);
+			 }
+ 
+			 let value;
+			 if (!_.isNil(result)) {
+				 try {
+					 value = JSON.parse(result);
+				 } catch (e) {
+					 value = result; // Invalid JSON, just return raw result
+				 }
+			 }
+			 return value;
+		 } catch (error) {
+			 if (this.debugMode) {
+				 const msg = error && error.message;
+				 debugger;
+			 }
+		 }
+	 }
+ 
+	 _storageSetValue = async (name, value) => {
+		 try {
+			 if (!_.isString(value)) {
+				 value = JSON.stringify(value);
+			 }
+			 if (this.debugMode) {
+				 console.log(this.name, 'SecureStore.set', name, value);
+			 }
+ 
+			 const result = await SecureStore.setItemAsync(this._namespace(name), value);
+ 
+			 // if (this.debugMode) {
+			 // 	console.log(this.name, 'SecureStore.set results', name, result);
+			 // }
+			 return result;
+		 } catch (error) {
+			 if (this.debugMode) {
+				 const msg = error && error.message;
+				 debugger;
+			 }
+		 }
+	 }
+ 
+	 _storageDeleteValue = async (name) => {
+		 try {
+			 if (this.debugMode) {
+				 console.log(this.name, 'SecureStore.delete', name);
+			 }
+ 
+			 const result = await SecureStore.deleteItemAsync(this._namespace(name));
+ 
+			 // if (this.debugMode) {
+			 // 	console.log(this.name, 'SecureStore.delete results', name, result);
+			 // }
+			 return result;
+		 } catch (error) {
+			 if (this.debugMode) {
+				 const msg = error && error.message;
+				 debugger;
+			 }
+		 }
+	 }
+ 
+ };
+ 
+ SecureStoreRepository.className = 'SecureStore';
+ SecureStoreRepository.type = 'secure';
+ 
+ export default SecureStoreRepository;

package/src/Repository/Ajax.js

@@ -292,8 +292,8 @@ class AjaxRepository extends Repository {
 	 */
 	_onChangeSorters = () => {
 		const sorter = this.sorters[0];
-		this.setParam(this.paramSort, sorter.name);
-		this.setParam(this.paramDirection, sorter.direction);
+		this.setParam(this.paramSort, sorter.name, true); // true to set baseParam
+		this.setParam(this.paramDirection, sorter.direction, true);
 		
 		if (this.isLoaded) {
 			return this.reload();
@@ -319,8 +319,8 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangePagination = () => {
-		this.setParam(this.paramPageNum, this.page);
-		this.setParam(this.paramPageSize, this.pageSize);
+		this.setParam(this.paramPageNum, this.page, true); // true to set baseParam
+		this.setParam(this.paramPageSize, this.pageSize, true);
 
 		if (this.isLoaded) {
 			return this.reload();

package/src/Repository/Offline.js

@@ -23,13 +23,8 @@ class OfflineRepository extends MemoryRepository {
 
 	async initialize() {
 		this.pauseEvents(); // Queue 'initialize' event from super
-		await super.initialize();
 
-		this._index = await this._getIndex();
-		if (!this._index) {
-			await this._setIndex([]);
-			this._index = [];
-		}
+		await super.initialize(); // Initializes index in _loadFromStorage()
 
 		this.resumeEvents(true); // Now fire it!
 	}
@@ -80,7 +75,14 @@ class OfflineRepository extends MemoryRepository {
 	 */
 	_loadFromStorage = async () => {
 		try {
-			const ids = await this._getIndex(),
+
+			this._index = await this._getIndex();
+			if (!this._index) {
+				await this._setIndex([]);
+				this._index = [];
+			}
+
+			const ids = this._index,
 				total = ids && ids.length ? ids.length : 0,
 				results = [];
 			

package/src/Repository/Repository.js

@@ -648,6 +648,7 @@ export default class Repository extends EventEmitter {
 		if (!_.isEqual(this.filters, filters)) {
 			isChanged = true;
 			this.filters = filters;
+			this.resetPagination();
 			this.emit('changeFilters');
 			if (this._onChangeFilters) {
 				return this._onChangeFilters();
@@ -666,6 +667,17 @@ export default class Repository extends EventEmitter {
 	// /_/    \__,_/\__, /_/_/ /_/\__,_/\__/\___/
 	//             /____/
 
+	/**
+	 * Resets the pagination to page one
+	 * @fires changePageSize
+	 */
+	resetPagination = (pageSize) => {
+		if (this.isDestroyed) {
+			throw Error('this.resetPagination is no longer valid. Repository has been destroyed.');
+		}
+		this.setPage(1);
+	}
+
 	/**
 	 * Sets the pageSize
 	 * @fires changePageSize
@@ -779,12 +791,38 @@ export default class Repository extends EventEmitter {
 	 * @static
 	 */
 	static _calculatePaginationVars = (total, page, pageSize) => {
+
+		// Special case: empty pages
+		if (total < 1) {
+			return {
+				page,
+				pageSize,
+				total,
+				totalPages: 1,
+				pageStart: 0,
+				pageEnd: 0,
+				pageTotal: 0,
+			};
+		}
+
 		const totalPages = Math.ceil(total / pageSize),
-			pageStart = !total ? 0 : ((page -1) * pageSize) + 1,
-			remainder = total > pageSize ? total % pageSize : 0,
-			pageTotal = (page === 1 && totalPages === 1) ? total : 
-						(page < totalPages ? pageSize : remainder),
-			pageEnd = !total ? 0 : pageStart -1 + pageTotal;
+			pageStart = ((page -1) * pageSize) + 1;
+		
+		let remainder,
+			pageEnd,
+			pageTotal;
+
+		if (page === 1 && totalPages === 1) {
+			pageTotal = total;
+		} else if (page < totalPages) {
+			pageTotal = pageSize;
+		} else {
+			// last page
+			remainder = total % pageSize;
+			pageTotal = remainder || pageSize;
+		}
+
+		pageEnd = pageStart + pageTotal -1;
 		
 		return {
 			page,
@@ -1302,6 +1340,9 @@ export default class Repository extends EventEmitter {
 		if (!_.isArray(entities)) {
 			entities = [entities];
 		}
+		if (!entities.length) {
+			return;
+		}
 		_.each(entities, (entity) => {
 			entity.markDeleted(); // Entity is still there, it's just marked for deletion
 		});