pict-section-form 1.0.123 → 1.0.125

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.123",
+    "version": "1.0.125",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {

package/source/providers/Pict-Provider-DynamicSolver.js

@@ -47,7 +47,7 @@ class PictDynamicSolver extends libPictProvider
 
 		/** @type {import('pict')} */
 		this.pict;
-		/** @type {import('pict') & { instantiateServiceProviderIfNotExists: (hash: string) => any }} */
+		/** @type {import('pict') & { instantiateServiceProviderIfNotExists: (hash: string) => any, ExpressionParser: any }} */
 		this.fable;
 		/** @type {any} */
 		this.log;

package/source/providers/inputs/Pict-Provider-Input-AutofillTriggerGroup.js

@@ -176,9 +176,9 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {boolean} - Returns true.
 	 */
-	onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
+	onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
 	{
-		const tmpPayload = typeof pValue === 'string' ? pEvent : '';
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
 		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
 		if (!tmpEventGUID)
 		{
@@ -188,7 +188,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 		let tmpAutoFillTriggerGroups = pInput.PictForm.AutofillTriggerGroup;
 		if (!tmpAutoFillTriggerGroups || tmpType !== 'TriggerGroup' || (pInput.Hash || pInput.DataAddress) == tmpInputHash)
 		{
-			return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+			return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
 		}
 		if (!Array.isArray(tmpAutoFillTriggerGroups))
 		{
@@ -220,7 +220,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 			}
 		}
 
-		return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
+		return super.onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
 	}
 
 	/**
@@ -235,9 +235,9 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {boolean} - Returns true.
 	 */
-	onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
+	onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
 	{
-		const tmpPayload = typeof pValue === 'string' ? pEvent : '';
+		const tmpPayload = typeof pEvent === 'string' ? pEvent : '';
 		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
 		if (!tmpEventGUID)
 		{
@@ -247,7 +247,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 		if (!pInput.PictForm.AutofillTriggerGroup || tmpType !== 'TriggerGroup' || (pInput.Hash || pInput.DataAddress) == tmpInputHash)
 		{
 			// Do nothing for now -- this is the triggering element
-			return super.onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+			return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
 		}
 		let tmpAutoFillTriggerGroups = pInput.PictForm.AutofillTriggerGroup;
 		if (!Array.isArray(tmpAutoFillTriggerGroups))
@@ -282,7 +282,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 			}
 		}
 
-		return super.onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
+		return super.onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
 	}
 }
 

package/source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js

@@ -199,10 +199,11 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value of the input.
 	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} [pTransactionGUID] - (optional) The transaction GUID for the event dispatch.
 	 *
-	 * @return {Promise<any>} - Returns a promise that resolves when the data has been gathered.
+	 * @return {Promise<Error?>} - Returns a promise that resolves when the data has been gathered.
 	 */
-	async gatherDataFromServer(pView, pInput, pValue, pHTMLSelector)
+	async gatherDataFromServer(pView, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		// Gather data from the server
 		// These have to date not been asyncronous.  Now they will be...
@@ -212,6 +213,11 @@ class CustomInputHandler extends libPictSectionInputExtension
 			return null;
 		}
 
+		const tmpLoadGUID = `BundleLoad-${this.pict.getUUID()}`;
+		if (pTransactionGUID)
+		{
+			pView.registerEventTransactionAsyncOperation(pTransactionGUID, tmpLoadGUID);
+		}
 		let tmpInput = pInput;
 		let tmpValue = pValue;
 		let tmpAnticipate = this.fable.newAnticipate();
@@ -248,7 +254,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 				if (tmpInput.PictForm.EntityBundleTriggerGroup && this.pict.views.PictFormMetacontroller)
 				{
 					// Trigger the autofill global event
-					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`TriggerGroup:${tmpInput.PictForm.EntityBundleTriggerGroup}:BundleLoad:${pInput.Hash || pInput.DataAddress}:${this.pict.getUUID()}`);
+					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`TriggerGroup:${tmpInput.PictForm.EntityBundleTriggerGroup}:BundleLoad:${pInput.Hash || pInput.DataAddress}:${this.pict.getUUID()}`, pTransactionGUID);
 				}
 				if (tmpInput.PictForm.EntityBundleTriggerMetacontrollerSolve && this.pict.views.PictFormMetacontroller)
 				{
@@ -274,6 +280,11 @@ class CustomInputHandler extends libPictSectionInputExtension
 					{
 						this.log.error(`EntityBundleRequest error gathering entity set: ${pError}`, pError);
 					}
+					//TODO: close the async operation if we have a transaction GUID
+					if (pTransactionGUID)
+					{
+						pView.eventTransactionAsyncOperationComplete(pTransactionGUID, tmpLoadGUID);
+					}
 
 					return pResolve(pError);
 				});
@@ -298,7 +309,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 		if (pValue && pInput.PictForm && pInput.PictForm.EntityBundleTriggerOnInitialize)
 		{
 			// This is a request on initial load
-			this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
+			this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 		}
 		// This is in case we need to do a request on initial load!
 		return super.onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
@@ -333,7 +344,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 */
 	onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
-		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
+		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 		return super.onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
@@ -350,7 +361,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 */
 	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
-		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
+		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 		return super.onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 

package/source/views/Pict-View-DynamicForm.js

@@ -68,7 +68,8 @@ class PictViewDynamicForm extends libPictViewClass
 		}
 
 		// Use this to manage transactions
-		this.transactionTracking = this.pict.newTransactionTracker();
+		//FIXME: should we have these sioled??
+		//this.transactionTracking = this.pict.newTransactionTracker();
 
 		/** @type {Record<string, any>} */
 		this._PackagePictView = this._Package;
@@ -168,6 +169,8 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
 			let tmpHashAddress = this.sectionManifest.resolveHashAddress(pInputHash);
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -176,7 +179,6 @@ class PictViewDynamicForm extends libPictViewClass
 				let tmpValue = this.sectionManifest.getValueByHash(tmpMarshalDestinationObject, tmpHashAddress);
 
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -193,6 +195,10 @@ class PictViewDynamicForm extends libPictViewClass
 			{
 				this.log.error(`Dynamic form [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInputHash}) data from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 		else
 		{
@@ -227,6 +233,8 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
 			let tmpHashAddress = tmpInput.Address;
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -238,7 +246,6 @@ class PictViewDynamicForm extends libPictViewClass
 				// Each row has a distinct address!
 				let tmpVirtualInformaryHTMLSelector = tmpInput.Macro.HTMLSelectorTabular + `[data-i-index="${pRowIndex}"]`;
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -255,6 +262,10 @@ class PictViewDynamicForm extends libPictViewClass
 			{
 				this.log.error(`Dynamic form [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${tmpInput.Hash}) tabular data for group ${pGroupIndex} row ${pRowIndex} from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 		else
 		{
@@ -277,6 +288,8 @@ class PictViewDynamicForm extends libPictViewClass
 	 */
 	setDataByInput(pInput, pValue)
 	{
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
 			this.sectionManifest.setValueByHash(this.getMarshalDestinationObject(), pInput.Hash, pValue)
@@ -286,7 +299,6 @@ class PictViewDynamicForm extends libPictViewClass
 			// Each row has a distinct address!
 			let tmpVirtualInformaryHTMLSelector = pInput.Macro.HTMLSelector;
 			let tmpInputProviderList = this.getInputProviderList(pInput);
-			const tmpTransactionGUID = this.fable.getUUID();
 			for (let i = 0; i < tmpInputProviderList.length; i++)
 			{
 				if (this.pict.providers[tmpInputProviderList[i]])
@@ -298,12 +310,15 @@ class PictViewDynamicForm extends libPictViewClass
 					this.log.error(`Dynamic form setDataByInput [${this.Hash}]::[${this.UUID}] cannot find provider [${tmpInputProviderList[i]}] for input [${pInput.Hash}].`);
 				}
 			}
-			this.finalizeTransaction(tmpTransactionGUID);
 		}
 		catch (pError)
 		{
 			this.log.error(`Dynamic form setDataByInput [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInput.Hash}) from view in dataChanged event: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 
 		return false;
 	}
@@ -354,6 +369,8 @@ class PictViewDynamicForm extends libPictViewClass
 		)
 		{
 			// The informary stuff doesn't know the resolution of the hash to address, so do it here.
+			const tmpTransactionGUID = this.fable.getUUID();
+			this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 			try
 			{
 				let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
@@ -365,7 +382,6 @@ class PictViewDynamicForm extends libPictViewClass
 				// Each row has a distinct address!
 				let tmpVirtualInformaryHTMLSelector = tmpInput.Macro.HTMLSelectorTabular + `[data-i-index="${pRowIndex}"]`;
 				let tmpInputProviderList = this.getInputProviderList(tmpInput);
-				const tmpTransactionGUID = this.fable.getUUID();
 				for (let i = 0; i < tmpInputProviderList.length; i++)
 				{
 					if (this.pict.providers[tmpInputProviderList[i]])
@@ -377,12 +393,15 @@ class PictViewDynamicForm extends libPictViewClass
 						this.log.error(`Dynamic form setDataTabularByHash [${this.Hash}]::[${this.UUID}] cannot find provider [${tmpInputProviderList[i]}] for input [${tmpInput.Hash}] row ${pRowIndex}.`);
 					}
 				}
-				this.finalizeTransaction(tmpTransactionGUID);
 			}
 			catch (pError)
 			{
 				this.log.error(`Dynamic form setDataTabularByHash [${this.Hash}]::[${this.UUID}] gross error marshaling specific (${pInputHash}) tabular data for group ${pGroupIndex} row ${pRowIndex} from view in dataChanged event: ${pError}`);
 			}
+			finally
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
 		}
 
 		return false;
@@ -439,10 +458,10 @@ class PictViewDynamicForm extends libPictViewClass
 	onMarshalToView()
 	{
 		// TODO: Only marshal data that has changed since the last marshal.  Thought experiment: who decides what changes happened?
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = this.fable.getUUID();
-			this.transactionTracking.registerTransaction(tmpTransactionGUID);
 			let tmpMarshalDestinationObject = this.getMarshalDestinationObject();
 			// TODO: Add optional transaction awareness to informary
 			this.pict.providers.Informary.marshalDataToForm(tmpMarshalDestinationObject, this.formID, this.sectionManifest);
@@ -453,15 +472,19 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling data to view: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 		return super.onMarshalToView();
 	}
 
 	manualMarshalDataToViewByInput(pInput, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
-			this.transactionTracking.registerTransaction(tmpTransactionGUID);
 			this.pict.providers.Informary.manualMarshalDataToFormByInput(pInput);
 			this.runLayoutProviderFunctions('onDataMarshalToForm', tmpTransactionGUID);
 			this.runInputProviderFunctions('onDataMarshalToForm', pInput.Hash, null, tmpTransactionGUID);
@@ -470,14 +493,21 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling data to view: ${pError}`);
 		}
+		finally
+		{
+			if (tmpTransactionGUID !== pTransactionGUID)
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
+		}
 	}
 
 	manualMarshalTabularDataToViewByInput(pInput, pRowIndex, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = (typeof(pTransactionGUID) == 'string') ? pTransactionGUID : this.fable.getUUID();
-			this.transactionTracking.registerTransaction(tmpTransactionGUID);
 			this.pict.providers.Informary.manualMarshalTabularDataToFormByInput(pInput, pRowIndex);
 			this.runLayoutProviderFunctions('onDataMarshalToForm', tmpTransactionGUID);
 			this.runInputProviderFunctions('onDataMarshalToForm', pInput.Hash, pRowIndex, tmpTransactionGUID);
@@ -486,6 +516,13 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error marshaling tabular data to view: ${pError}`);
 		}
+		finally
+		{
+			if (tmpTransactionGUID !== pTransactionGUID)
+			{
+				this.finalizeTransaction(tmpTransactionGUID);
+			}
+		}
 	}
 
 	/**
@@ -513,10 +550,10 @@ class PictViewDynamicForm extends libPictViewClass
 	onAfterMarshalToForm()
 	{
 		// Check to see if there are any hooks set from the input templates
+		const tmpTransactionGUID = this.fable.getUUID();
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 		try
 		{
-			let tmpTransactionGUID = this.fable.getUUID();
-			this.transactionTracking.registerTransaction(tmpTransactionGUID);
 			this.runInputProviderFunctions('onAfterMarshalToForm', null, null, tmpTransactionGUID);
 
 		}
@@ -524,6 +561,10 @@ class PictViewDynamicForm extends libPictViewClass
 		{
 			this.log.error(`Gross error running after marshal to form: ${pError}`);
 		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -602,10 +643,21 @@ class PictViewDynamicForm extends libPictViewClass
 	onAfterRender(pRenderable)
 	{
 		let tmpTransactionGUID = this.fable.getUUID();
-		this.transactionTracking.registerTransaction(tmpTransactionGUID);
+		this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 
-		this.runLayoutProviderFunctions('onGroupLayoutInitialize', tmpTransactionGUID);
-		this.runInputProviderFunctions('onInputInitialize', null, null, tmpTransactionGUID);
+		try
+		{
+			this.runLayoutProviderFunctions('onGroupLayoutInitialize', tmpTransactionGUID);
+			this.runInputProviderFunctions('onInputInitialize', null, null, tmpTransactionGUID);
+		}
+		catch (pError)
+		{
+			this.log.error(`Gross error running after render: ${pError.message || pError}`);
+		}
+		finally
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 		return super.onAfterRender(pRenderable);
 	}
 
@@ -628,7 +680,7 @@ class PictViewDynamicForm extends libPictViewClass
 	runLayoutProviderFunctions(pFunctionName, pTransactionGUID)
 	{
 		const tmpTransactionGUID = (typeof(pTransactionGUID) === 'string') ? pTransactionGUID : this.fable.getUUID();
-		const tmpTransaction = this.transactionTracking.registerTransaction(tmpTransactionGUID);
+		const tmpTransaction = this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 
 		// Check to see if there are any hooks set from the input templates
 		let tmpLayoutProviders = this.pict.ContentAssignment.getElement(`${this.sectionDefinition.DefaultDestinationAddress} [data-i-pictdynamiclayout="true"]`);
@@ -660,12 +712,16 @@ class PictViewDynamicForm extends libPictViewClass
 			if (tmpLayoutProvider && (pFunctionName in tmpLayoutProvider))
 			{
 				let tmpFunction = tmpLayoutProvider[pFunctionName];
-				if (this.transactionTracking.checkEvent(tmpTransaction.TransactionKey, `G${tmpGroupIndex}-L${tmpLayout}`, pFunctionName))
+				if (this.pict.TransactionTracking.checkEvent(tmpTransaction.TransactionKey, `G${tmpGroupIndex}-L${tmpLayout}`, pFunctionName))
 				{
 					tmpFunction.call(tmpLayoutProvider, this, tmpGroup);
 				}
 			}
 		}
+		if (tmpTransactionGUID !== pTransactionGUID)
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -679,7 +735,7 @@ class PictViewDynamicForm extends libPictViewClass
 	runInputProviderFunctions(pFunctionName, pInputHash, pRowIndex, pTransactionGUID)
 	{
 		const tmpTransactionGUID = (typeof(pTransactionGUID) === 'string') ? pTransactionGUID : this.fable.getUUID();
-		const tmpTransaction = this.transactionTracking.registerTransaction(tmpTransactionGUID);
+		const tmpTransaction = this.pict.TransactionTracking.registerTransaction(tmpTransactionGUID);
 
 		// Check to see if there are any hooks set from the input templates
 		for (let i = 0; i < this.sectionDefinition.Groups.length; i++)
@@ -713,8 +769,8 @@ class PictViewDynamicForm extends libPictViewClass
 											this.log.trace(`Dynamic form [${this.Hash}]::[${this.UUID}] running provider [${tmpInputProviderList[l]}] function [${pFunctionName}] for input [${tmpInput.Hash}].`);
 										}
 										// TODO: Right now the Option input requires this bug to work
-										//if (this.transactionTracking.checkEvent(tmpTransaction.TransactionKey, `I${tmpInput.Hash}-P${tmpInputProviderList[l]}`, pFunctionName))
-										if ((tmpInput.PictForm.InputType == 'Option') || this.transactionTracking.checkEvent(tmpTransaction.TransactionKey, `I${tmpInput.Hash}-P${tmpInputProviderList[l]}`, pFunctionName))
+										//if (this.pict.TransactionTracking.checkEvent(tmpTransaction.TransactionKey, `I${tmpInput.Hash}-P${tmpInputProviderList[l]}`, pFunctionName))
+										if ((tmpInput.PictForm.InputType == 'Option') || this.pict.TransactionTracking.checkEvent(tmpTransaction.TransactionKey, `I${tmpInput.Hash}-P${tmpInputProviderList[l]}`, pFunctionName))
 										{
 											this.pict.providers[tmpInputProviderList[l]][pFunctionName](this, tmpGroup, j, tmpInput, tmpValue, tmpInput.Macro.HTMLSelector);
 										}
@@ -766,7 +822,7 @@ class PictViewDynamicForm extends libPictViewClass
 										let tmpValue = this.sectionManifest.getValueByHash(this.getMarshalDestinationObject(), tmpValueAddress);
 										try
 										{
-											if (this.transactionTracking.checkEvent(tmpTransaction.TransactionKey, `TI${tmpInput.Hash}-P${tmpInputProviderList[l]}-R${r}`, pFunctionName))
+											if (this.pict.TransactionTracking.checkEvent(tmpTransaction.TransactionKey, `TI${tmpInput.Hash}-P${tmpInputProviderList[l]}-R${r}`, pFunctionName))
 											{
 												this.pict.providers[tmpInputProviderList[l]][pFunctionName + 'Tabular'](this, tmpGroup, tmpInput, tmpValue, tmpInput.Macro.HTMLSelectorTabular, r);
 											}
@@ -787,7 +843,10 @@ class PictViewDynamicForm extends libPictViewClass
 				}
 			}
 		}
-		this.finalizeTransaction(tmpTransactionGUID);
+		if (pTransactionGUID !== tmpTransactionGUID)
+		{
+			this.finalizeTransaction(tmpTransactionGUID);
+		}
 	}
 
 	/**
@@ -1179,6 +1238,8 @@ class PictViewDynamicForm extends libPictViewClass
 				}
 			}
 		}
+		//TODO: figure out how to safely clean up old transactions
+		//delete this.pict.TransactionTracking.transactions[pTransactionGUID];
 		return true;
 	}
 

package/types/source/providers/Pict-Provider-DynamicSolver.d.ts

@@ -13,9 +13,10 @@ declare class PictDynamicSolver extends libPictProvider {
     constructor(pFable: object, pOptions: object, pServiceHash: object);
     /** @type {import('pict')} */
     pict: import("pict");
-    /** @type {import('pict') & { instantiateServiceProviderIfNotExists: (hash: string) => any }} */
+    /** @type {import('pict') & { instantiateServiceProviderIfNotExists: (hash: string) => any, ExpressionParser: any }} */
     fable: import("pict") & {
         instantiateServiceProviderIfNotExists: (hash: string) => any;
+        ExpressionParser: any;
     };
     /**
      * Checks the solver and returns the solver object if it passes the checks.

package/types/source/providers/Pict-Provider-DynamicSolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-DynamicSolver.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicSolver.js"],"names":[],"mappings":";AA8BA;;GAEG;AACH;IAEC;;;;;;OAMG;IACH,oBAJW,MAAM,YACN,MAAM,gBACN,MAAM,EAqChB;IA9BA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,gGAAgG;IAChG,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,qCAAqC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAA;KAAE,CAClF;IA6BX;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED;;;;;;;OAOG;IACH,wDAFW,MAAM,QAyDhB;IAED;;;;;OAKG;IACH,gEAFW,MAAM,QA+BhB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAiFxB;IADA;;;;;MAAuC;CAExC;;;;;AAhWD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}
+{"version":3,"file":"Pict-Provider-DynamicSolver.d.ts","sourceRoot":"","sources":["../../../source/providers/Pict-Provider-DynamicSolver.js"],"names":[],"mappings":";AA8BA;;GAEG;AACH;IAEC;;;;;;OAMG;IACH,oBAJW,MAAM,YACN,MAAM,gBACN,MAAM,EAqChB;IA9BA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,uHAAuH;IACvH,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,qCAAqC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;QAAC,gBAAgB,EAAE,GAAG,CAAA;KAAE,CACzG;IA6BX;;;;;;;;;OASG;IACH,qBALW,MAAM,GAAC,MAAM,cACb,OAAO,aACP,MAAM,GACJ,MAAM,GAAC,SAAS,CA8B5B;IAED;;;;;;;OAOG;IACH,wDAFW,MAAM,QAyDhB;IAED;;;;;OAKG;IACH,gEAFW,MAAM,QA+BhB;IAED;;;;;OAKG;IACH,sDAFW,MAAM,QAwBhB;IAED;;;;;;;;OAQG;IACH,gCAJW,MAAM,yBAWhB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,yBAFW,QAAM,MAAM,EAAE,QAiFxB;IADA;;;;;MAAuC;CAExC;;;;;AAhWD,kCAAkC;AAClC,6CADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS3B"}

package/types/source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.d.ts

@@ -52,10 +52,11 @@ declare class CustomInputHandler extends libPictSectionInputExtension {
      * @param {Object} pInput - The input object.
      * @param {any} pValue - The value of the input.
      * @param {string} pHTMLSelector - The HTML selector.
+     * @param {string} [pTransactionGUID] - (optional) The transaction GUID for the event dispatch.
      *
-     * @return {Promise<any>} - Returns a promise that resolves when the data has been gathered.
+     * @return {Promise<Error?>} - Returns a promise that resolves when the data has been gathered.
      */
-    gatherDataFromServer(pView: any, pInput: any, pValue: any, pHTMLSelector: string): Promise<any>;
+    gatherDataFromServer(pView: any, pInput: any, pValue: any, pHTMLSelector: string, pTransactionGUID?: string): Promise<Error | null>;
     /**
      * Initializes a tabular input element.
      *

package/types/source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-Input-EntityBundleRequest.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,4DAA4D;IAC5D,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,GAAG,CAAA;KAAE,CAC9C;IAKX,oGA0EC;IAED,+GAgEC;IAED;;;;;;;;;OASG;IACH,sDALW,GAAG,iBACH,MAAM,GAEL,OAAO,CAAC,GAAG,CAAC,CA8EvB;IA0BD;;;;;;;;;;;OAWG;IACH,uEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;;OAUG;IACH,qDANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;;;OAWG;IACH,6EALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,OAAO,CAKnB;IAED;;;;;;;;;;;OAWG;IACH,yEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;CACD"}
+{"version":3,"file":"Pict-Provider-Input-EntityBundleRequest.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,4DAA4D;IAC5D,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,GAAG,CAAA;KAAE,CAC9C;IAKX,oGA0EC;IAED,+GAgEC;IAED;;;;;;;;;;OAUG;IACH,sDANW,GAAG,iBACH,MAAM,qBACN,MAAM,GAEL,OAAO,CAAC,KAAK,OAAC,CAAC,CAwF1B;IA0BD;;;;;;;;;;;OAWG;IACH,uEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;IAED;;;;;;;;;OASG;IACH,8CALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;;OAUG;IACH,qDANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAMf;IAED;;;;;;;;;;;OAWG;IACH,6EALW,GAAG,iBACH,MAAM,oBACN,MAAM,GACJ,OAAO,CAKnB;IAED;;;;;;;;;;;OAWG;IACH,yEANW,GAAG,iBACH,MAAM,aACN,MAAM,oBACN,MAAM,GACJ,GAAG,CAKf;CACD"}

package/types/source/views/Pict-View-DynamicForm.d.ts

@@ -9,7 +9,6 @@ export = PictViewDynamicForm;
  */
 declare class PictViewDynamicForm extends libPictViewClass {
     constructor(pFable: any, pOptions: any, pServiceHash: any);
-    transactionTracking: import("pict/types/source/services/Fable-Service-TransactionTracking");
     /** @type {Record<string, any>} */
     _PackagePictView: Record<string, any>;
     sectionDefinition: any;

package/types/source/views/Pict-View-DynamicForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-DynamicForm.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-DynamicForm.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Pict-View-DynamicForm.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-DynamicForm.js"],"names":[],"mappings":"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"}

package/utility/csvparser/ParseCSV-Command-Inject.js

@@ -320,10 +320,12 @@ class ImportExtraDataCSVCommand extends libPictCommandLineUtility.ServiceCommand
 
 										if (tmpOptionsRow['Option Value'] || tmpOptionsRow['Option Text'])
 										{
+											// strip leading and trailing whitespace, and convert HTML entities for quotes and apostrophes
+											const tmpCleanText = (tmpOptionsRow['Option Text'] || tmpOptionsRow['Option Value']).trim().replace(/"/g, '"').replace(/'/g, "'");
 											tmpPickListConfig.DefaultListData.push(
 												{
 													id: tmpOptionsRow['Option Value'],
-													text: tmpOptionsRow['Option Text']
+													text: tmpCleanText,
 												});
 										}
 									}