@onehat/data 1.22.28 → 1.22.30

package/package.json

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

package/src/Property/Mixed.js

@@ -21,7 +21,7 @@ import _ from 'lodash';
  * Class represents a Property that can store values of multiple types.
  * The actual type is determined dynamically based on the value being set.
  * 
- * Usage: { name: 'date', title: 'Date', types: ['date', 'string'], },
+ * Usage: { name: 'date', title: 'Date', type: 'mixed', types: ['date', 'string'], },
  * This is primarily used to allow a field that's normally one PropertyType
  * to also accept string values (e.g. values like '2025-01-01' or 'N/A').
  * 
@@ -402,6 +402,56 @@ export default class MixedProperty extends EventEmitter {
 		this.internalProperties.forEach((property) => property.destroy());
 		this.internalProperties.clear();
 	}
+
+	/**
+	 * Returns the default configuration for this PropertyType.
+	 * For MixedProperty, this delegates to the first configured type's defaults.
+	 * @param {Object} defaults - The default configuration to merge with (should include 'types' array)
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const mixedPropertyDefaults = {
+			name: null,
+			allowNull: true,
+			depends: null,
+			mapping: null,
+			submitAsString: false,
+			isSortable: true,
+			isTempId: false,
+			isVirtual: false,
+			title: null,
+			tooltip: null,
+			fieldGroup: null,
+			isForeignModel: false,
+			filterType: null,
+			isFilteringDisabled: false,
+			viewerType: null,
+			editorType: null,
+			isEditingDisabled: false,
+			defaultValue: null,
+			formatter: null,
+		};
+		
+		// If types are configured, use the first type's default value
+		if (defaults.types && Array.isArray(defaults.types) && defaults.types.length > 0) {
+			const
+				firstTypeConfig = defaults.types[0],
+				firstTypeName = typeof firstTypeConfig === 'string' ? firstTypeConfig : firstTypeConfig.type;
+			if (firstTypeName) {
+				try {
+					const PropertyClass = MixedProperty.prototype._getPropertyClass(firstTypeName);
+					const typeDefaults = PropertyClass.getStaticDefaults ? PropertyClass.getStaticDefaults() : {};
+					if (typeDefaults.defaultValue !== undefined) {
+						mixedPropertyDefaults.defaultValue = typeDefaults.defaultValue;
+					}
+				} catch (e) {
+					// If we can't get the property class, just use null default
+				}
+			}
+		}
+		
+		return _.merge({}, mixedPropertyDefaults, defaults);
+	}
 }
 
 MixedProperty.className = 'Mixed';

package/src/Repository/Ajax.js

@@ -480,7 +480,7 @@ class AjaxRepository extends Repository {
 			const
 				currentEntityCount = this.entities.length,
 				newPageSize = this.pageSize;
-			if (this.page === 1 && currentEntityCount >= newPageSize && this.isPaginated) {
+			if (this.previousPage === 1 && this.page === 1 && currentEntityCount >= newPageSize && this.isPaginated) {
 				// Optimization: if we're on page 1 and already have enough entities
 				// for the new page size, just truncate the existing data instead of reloading
 				const entitiesToRemove = this.entities.splice(newPageSize);
@@ -491,7 +491,7 @@ class AjaxRepository extends Repository {
 					console.log(`Truncated entities from ${currentEntityCount} to ${newPageSize}`);
 				}
 			} else {
-				// We need more data or we're not on page 1, so reload
+				// We need more data or weren't already on page 1, so reload
 				return this.reload();
 			}
 		}

package/src/Repository/Repository.js

@@ -190,6 +190,11 @@ export default class Repository extends EventEmitter {
 		 */
 		this.page = 1;
 
+		/**
+		 * @member {number} previousPage - State: Previous page number in pagination
+		 */
+		this.previousPage = null;
+
 		/**
 		 * Getter for 
 		 * @member {number} pageTotal - State: Total number of entities on the current page
@@ -940,6 +945,8 @@ export default class Repository extends EventEmitter {
 			return false;
 		}
 
+		this.previousPage = this.page;
+
 		// Reset to page 1 (don't use setPage(), so we can skip _onChangePagination, which we'll do later)
 		this.page = 1;
 		this.emit('changePage');
@@ -975,6 +982,7 @@ export default class Repository extends EventEmitter {
 			return false;
 		}
 
+		this.previousPage = this.page;
 		this.page = page;
 		this.emit('changePage');
 		if (this._onChangePagination) {

package/src/Schema/Schema.js

@@ -286,7 +286,9 @@ export default class Schema extends EventEmitter {
 				if (!propertyType) {
 					propertyType = PropertyTypes['string'];
 				}
-				const staticDefaults = propertyType.getStaticDefaults();
+				// Pass the property definition to getStaticDefaults for types like 'mixed'
+				// that need access to the configuration (e.g., the types array)
+				const staticDefaults = propertyType.getStaticDefaults(property);
 				defaultValue = staticDefaults.defaultValue;
 			}
 			if (_.isFunction(defaultValue)) {