pict-section-recordset 1.0.53 → 1.0.55

package/source/views/create/RecordSet-Create.js

@@ -0,0 +1,344 @@
+const libPictRecordSetRecordView = require('../RecordSet-RecordBaseView.js');
+
+/** @type {Record<string, any>} */
+const _DEFAULT_CONFIGURATION__Create =
+{
+	ViewIdentifier: 'PRSP-Create',
+
+	DefaultRenderable: 'PRSP_Renderable_Create',
+	DefaultDestinationAddress: '#PRSP_Container',
+	DefaultTemplateRecordAddress: false,
+
+	// If this is set to true, when the App initializes this will.
+	// While the App initializes, initialize will be called.
+	AutoInitialize: false,
+	AutoInitializeOrdinal: 0,
+
+	// If this is set to true, when the App autorenders (on load) this will.
+	// After the App initializes, render will be called.
+	AutoRender: false,
+	AutoRenderOrdinal: 0,
+
+	AutoSolveWithApp: false,
+	AutoSolveOrdinal: 0,
+
+	CSS: false,
+	CSSPriority: 500,
+
+	Templates:
+	[
+		{
+			Hash: 'PRSP-Create-Basic-Template',
+			Template: /*html*/`
+				<!-- DefaultPackage pict view template: [PRSP-Create-Basic-Template] -->
+				<h1>{~D:Record.RecordSet~} Create</h1>
+				<div>
+					{~T:PRSP-Create-RecordCreate-Template~}
+				</div>
+				{~T:PRSP-Create-RecordButtonBar-Template~}
+				<!-- DefaultPackage end view template:  [PRSP-Create-Basic-Template] -->
+				`
+		},
+		{
+			Hash: 'PRSP-Create-RecordButtonBar-Template',
+			Template: /*html*/`
+				<style>
+					.record-button-bar-hidden
+					{
+						display: none;
+					}
+					.record-button-bar
+					{
+						display: flex;
+						margin-top: 15px;
+					}
+					.record-button-bar > button
+					{
+						margin-right: 10px;
+					}
+				</style>
+				<div class="record-button-bar">
+					<button id="PRSP-Create-ClearButton" type="button" onclick="_Pict.views['RSP-RecordSet-Create'].clear()">Clear</button>
+					<button id="PRSP-Create-SaveButton" type="button" onclick="_Pict.views['RSP-RecordSet-Create'].save()">Save</button>
+				</div>
+			`
+		},
+		{
+			Hash: 'PRSP-Create-Link-Name-Template',
+			Template: `Create`
+		},
+		{
+			Hash: 'PRSP-Create-Link-URL-Template',
+			Template: `#/PSRS/{~D:Record.Payload.Payload.RecordSet~}/Create`
+		},
+	],
+
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_Create_Basic',
+			TemplateHash: 'PRSP-Create-Basic-Template',
+			DestinationAddress: '#PRSP_Container',
+			RenderMethod: 'replace'
+		}
+	],
+
+	Manifests: {},
+};
+
+class viewRecordSetCreate extends libPictRecordSetRecordView
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION__Create, pOptions);
+
+		super(pFable, tmpOptions, pServiceHash);
+		this.RecordSet = null;
+		this.providerHash = null;
+		this.manifest = null;
+		this.defaultManifest = null;
+	}
+
+	handleRecordSetCreateRoute(pRoutePayload)
+	{
+		if (typeof(pRoutePayload) != 'object')
+		{
+			throw new Error(`Pict RecordSet Create view route handler called with invalid route payload.`);
+		}
+
+		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[pRoutePayload.data.RecordSet];
+		const tmpProviderHash = `RSP-Provider-${pRoutePayload.data.RecordSet}`;
+
+		tmpProviderConfiguration.RoutePayload = pRoutePayload;
+		tmpProviderConfiguration.RecordSet = pRoutePayload.data.RecordSet;
+
+		return this.renderCreate(tmpProviderConfiguration, tmpProviderHash);
+	}
+
+	async clear()
+	{
+		await this.onBeforeClear();
+		this.renderCreate(this.pict.PictSectionRecordSet.recordSetProviderConfigurations[this.RecordSet], this.providerHash);
+	}
+
+	async save()
+	{
+		await this.onBeforeSave();
+		const resultingRecord = await this.pict.providers[this.providerHash].createRecord(this.pict.AppData[`${ this.RecordSet }Details`]);
+
+		this.fable.providers.RecordSetRouter.pictRouter.navigate(`/PSRS/${ this.RecordSet }/View/${ resultingRecord[this.pict.providers[this.providerHash].getGUIDField()] }`);
+	}
+
+	async onBeforeClear()
+	{
+		// Hook that gets called before clear.
+	}
+
+	async onBeforeSave()
+	{
+		// Hook that gets called before save.
+	}
+
+	async onBeforeRenderCreate(pRecordConfiguration, pProviderHash)
+	{
+		// Hook that gets called before "renderCreate".
+	}
+
+	async renderCreate(pRecordConfiguration, pProviderHash)
+	{
+		await this.onBeforeRenderCreate(pRecordConfiguration, pProviderHash);
+		if (!(pProviderHash in this.pict.providers))
+		{
+			this.pict.log.error(`RecordSetCreate: No provider found for ${pProviderHash} in ${pRecordConfiguration.RecordSet}.  Create Render failed.`);
+			return false;
+		}
+
+		let tmpRecordCreateData =
+		{
+			"RecordSet": pRecordConfiguration.RecordSet,
+
+			"RecordConfiguration": pRecordConfiguration,
+
+			"RenderDestination": this.options.DefaultDestinationAddress,
+		};
+
+		if (pRecordConfiguration.RecordSet !== this.RecordSet)
+		{
+			this.RecordSet = pRecordConfiguration.RecordSet;
+		}
+
+		this.pict.AppData[`${ this.RecordSet }Details`] = {};
+
+		this.providerHash = pProviderHash;
+		tmpRecordCreateData.RecordSchema = await this.pict.providers[pProviderHash].getRecordSchema();
+
+		if (pRecordConfiguration.RecordSetCreateManifestOnly)
+		{
+			this.pict.TemplateProvider.addTemplate(`PRSP-Create-RecordCreate-Template`, /*html*/`
+				<!-- Manifest dynamic pict template: [PRSP-Create-RecordCreate-Template] -->
+				<div>${ this._generateManifestTemplate(pRecordConfiguration, 'RecordCreate') }</div>
+				<!-- Manifest dynamic pict end template: [PRSP-Create-RecordCreate-Template] -->
+			`);
+		}
+		else
+		{
+			// Construct a default manifest based on the RecordSchema:
+			this.defaultManifest = 
+			{
+				"Form": "DefaultManifest",
+				"Scope": "Default",
+				"Descriptors": {},
+				"Sections": 
+				[
+					{
+						"Name": "",
+						"Hash": "DefaultSection",
+						"Solvers": [],
+						"ShowTitle": false,
+						"Groups": [
+							{
+								"Name": "",
+								"Hash": "DefaultGroup",
+								"Rows": [],
+								"RecordSetSolvers": [],
+								"ShowTitle": false
+							}
+						]
+					}
+				]
+			}
+			let rowCounter = 1;
+			for (const p of Object.keys(tmpRecordCreateData.RecordSchema.properties))
+			{
+				const exclusionSet = [this.pict.providers[this.providerHash].getIDField(), this.pict.providers[this.providerHash].getGUIDField(), 'CreatingIDUser', 'UpdatingIDUser', 'DeletingIDUser', 'Deleted', 'CreateDate', 'UpdateDate', 'DeleteDate', 'Deleted'];
+				if (exclusionSet.includes(p))
+				{
+					continue;
+				}
+				const tmpDescriptor =
+				{
+					"Name": `${ this.pict.providers[pProviderHash].getHumanReadableFieldName?.() || p }`,
+					"Hash": `${ tmpRecordCreateData.RecordSet }-${ p }`,
+					"DataType": "String",
+					"PictForm": 
+					{
+						"Row": `${ rowCounter }`,
+						"Section": "DefaultSection",
+						"Group": "DefaultGroup"
+					}
+				};
+				rowCounter += 1;
+				switch (tmpRecordCreateData.RecordSchema.properties[p].type)
+				{
+					case 'string':
+					case 'autoguid':
+						tmpDescriptor.DataType = 'String';
+						break;
+					case 'datetime':
+					case 'date':
+					case 'createdate':
+					case 'updatedate':
+						tmpDescriptor.DataType = 'String';
+						tmpDescriptor.PictForm.InputType = 'DateTime'
+						break;
+					case 'boolean':
+					case 'deleted':
+						tmpDescriptor.DataType = 'Boolean';
+					case 'integer':
+					case 'decimal':
+					case 'autoidentity':
+					case 'createiduser':
+					case 'updateiduser':
+					case 'deleteiduser':
+						tmpDescriptor.DataType = 'Number';
+						break;
+					default:
+						tmpDescriptor.DataType = 'String';
+				}
+
+				this.defaultManifest.Descriptors[`${ tmpRecordCreateData.RecordSet }Details.${ p }`] = tmpDescriptor;
+			}
+			this.pict.TemplateProvider.addTemplate(`PRSP-Create-RecordCreate-Template`, /*html*/`
+				<!-- Manifest dynamic pict template: [PRSP-Create-RecordCreate-Template] -->
+				<div>${ this._generateManifestTemplate(pRecordConfiguration, 'RecordCreate', true) }</div>
+				<!-- Manifest dynamic pict end template: [PRSP-Create-RecordCreate-Template] -->
+			`);
+		}
+
+		this.renderAsync(`PRSP_Renderable_Create_Basic`, tmpRecordCreateData.RenderDestination, tmpRecordCreateData,
+			async function (pError)
+			{
+				if (pError)
+				{
+					this.pict.log.error(`RecordSetCreate: Error rendering create ${pError}`, tmpRecordCreateData);
+					return false;
+				}
+
+				if (this.pict.LogNoisiness > 0)
+				{
+					this.pict.log.info(`RecordSetCreate: Rendered create ${tmpRecordCreateData.RecordSet}`, tmpRecordCreateData);
+				}
+				else
+				{
+					this.pict.log.info(`RecordSetCreate: Rendered create ${tmpRecordCreateData.RecordSet}`);
+				}
+				for (const s of this.manifest?.Sections || [])
+				{
+					this.pict.views[`PictSectionForm-${ s.Hash }`].render();
+					this.pict.views[`PictSectionForm-${ s.Hash }`].marshalToView();
+				}
+				return true;
+			}.bind(this));
+	}
+
+	_generateManifestTemplate(config, section, useDefaultManifest)
+	{
+		const tmpManifestHash = config.RecordSetCreateDefaultManifest || config.RecordSetCreateManifests?.[0];
+		const tmpManifest = JSON.parse(JSON.stringify(useDefaultManifest ? this.defaultManifest : this.pict.PictSectionRecordSet.getManifest(tmpManifestHash)));
+		if (!tmpManifest)
+		{
+			this.pict.log.error(`RecordSetCreate: No manifest found for ${ config.RecordSet }. Create Render failed.`);
+			return '';
+		}
+		if (!tmpManifest.Descriptors)
+		{
+			this.pict.log.error(`RecordSetCreate: No manifest descriptors found for manifest ${ tmpManifestHash }. Create Render failed.`);
+			return '';
+		}
+
+		this.manifest = tmpManifest;
+		let sectionsTemplate = '';
+		for (const s of tmpManifest?.Sections || [])
+		{
+			delete this.pict.views[`PictSectionForm-${ s.Hash }`]
+		}
+		this.pict.views.PictFormMetacontroller.bootstrapPictFormViewsFromManifest(tmpManifest);
+
+		for (const pickList of tmpManifest?.PickLists || [])
+		{
+			this.pict.providers.DynamicMetaLists.rebuildListByHash(pickList.Hash);
+		}
+
+		for (const s of tmpManifest?.Sections || [])
+		{
+			const viewSectionID = `PSRS-Create-${ section }-Section-${ s.Hash }`;
+			sectionsTemplate += /*html*/`<div id="${ viewSectionID }"></div>`;
+			this.pict.views[`PictSectionForm-${ s.Hash }`].viewMarshalDestination = 'AppData';
+			this.pict.views[`PictSectionForm-${ s.Hash }`].options.DefaultDestinationAddress = `#${ viewSectionID }`;
+			this.pict.views[`PictSectionForm-${ s.Hash }`].rebuildCustomTemplate();
+		}
+		return sectionsTemplate
+	}
+
+
+	addRoutes(pPictRouter)
+	{
+		pPictRouter.addRoute('/PSRS/:RecordSet/Create', this.handleRecordSetCreateRoute.bind(this));
+		return true;
+	}
+}
+
+module.exports = viewRecordSetCreate;
+
+module.exports.default_configuration = _DEFAULT_CONFIGURATION__Create;
+

package/source/views/dashboard/RecordSet-Dashboard.js

@@ -279,7 +279,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		tmpRecordDashboardData.RecordSchema = await this.pict.providers[pProviderHash].getRecordSchema();
 
 		// TODO: This should be coming from the schema but that can come after we discuss how we deal with default routing
-		tmpRecordDashboardData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
+		tmpRecordDashboardData.GUIDAddress = this.pict.providers[pProviderHash].getGUIDField();
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
 		const tmpOffset = Number(tmpRecordDashboardData.Offset);
@@ -423,6 +423,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 				}
 				else
 				{
+					// @ts-ignore
 					tmpRecordDashboardData.TableCells = tmpManifest.TableCells;
 				}
 			}
@@ -570,7 +571,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		tmpRecordDashboardData.RecordSchema = tmpRecordSchema;
 
 		// TODO: This should be coming from the schema but that can come after we discuss how we deal with default routing
-		tmpRecordDashboardData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
+		tmpRecordDashboardData.GUIDAddress = this.pict.providers[pProviderHash].getGUIDField();
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
 		const tmpOffset = Number(tmpRecordDashboardData.Offset);

package/source/views/filters/RecordSet-Filter-Base-Range.js

@@ -1,4 +1,3 @@
-
 const ViewRecordSetSUBSETFilterBase = require('./RecordSet-Filter-Base');
 
 class ViewRecordSetSUBSETFilterBaseRange extends ViewRecordSetSUBSETFilterBase
@@ -24,7 +23,8 @@ class ViewRecordSetSUBSETFilterBaseRange extends ViewRecordSetSUBSETFilterBase
 			Address: pRecord.StartClauseAddress,
 			//TODO: figure out a nice pattern for extracting a name for the field from the filter - and allow the filter author to provide the label here
 			Name: pRecord.MinimumLabel || `Minimum ${pRecord.ExternalFilterByColumn || pRecord.ExternalFilterByColumns?.[0] || pRecord.FilterByColumn || pRecord.FilterByColumns?.[0] || 'Value'}`,
-			DataType: 'String',
+			DataType: pRecord.DataType || 'String',
+			PictForm: pRecord.PictForm || {},
 		};
 
 		pRecord.EndClauseDescriptor =
@@ -32,7 +32,8 @@ class ViewRecordSetSUBSETFilterBaseRange extends ViewRecordSetSUBSETFilterBase
 			Hash: this.fable.DataFormat.sanitizeObjectKey(`${pRecord.Hash}_End`),
 			Address: pRecord.EndClauseAddress,
 			Name: pRecord.MaximumLabel || `Maximum ${pRecord.ExternalFilterByColumn || pRecord.ExternalFilterByColumns?.[0] || pRecord.FilterByColumn || pRecord.FilterByColumns?.[0] || 'Value'}`,
-			DataType: 'String',
+			DataType: pRecord.DataType || 'String',
+			PictForm: pRecord.PictForm || {},
 		};
 	}
 }

package/source/views/filters/RecordSet-Filter-Base.js

@@ -89,7 +89,8 @@ class ViewRecordSetSUBSETFilterBase extends libPictView
 			Hash: this.fable.DataFormat.sanitizeObjectKey(pRecord.Hash),
 			//TODO: figure out a nice pattern for extracting a name for the field from the filter - and allow the filter author to provide the label here
 			Name: pRecord.Label || pRecord.ExternalFilterByColumn || pRecord.ExternalFilterByColumns?.[0] || pRecord.FilterByColumn || pRecord.FilterByColumns?.[0] || 'Value',
-			DataType: 'String',
+			DataType: pRecord.DataType || 'String',
+			PictForm: pRecord.PictForm || {},
 		};
 	}
 

package/source/views/filters/RecordSet-Filter-DateMatch.js

@@ -35,7 +35,8 @@ class ViewRecordSetSUBSETFilterDateMatch extends ViewRecordSetSUBSETFilterBase
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'DateTime';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-DateRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterDateRange extends ViewRecordSetSUBSETFilterBaseRa
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'DateTime';
-		pRecord.EndClauseDescriptor.DataType = 'DateTime';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	/**

package/source/views/filters/RecordSet-Filter-ExternalJoinDateMatch.js

@@ -35,7 +35,8 @@ class ViewRecordSetSUBSETFilterExternalJoinDateMatch extends ViewRecordSetSUBSET
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'DateTime';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-ExternalJoinDateRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterExternalJoinDateRange extends ViewRecordSetSUBSET
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'DateTime';
-		pRecord.EndClauseDescriptor.DataType = 'DateTime';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-ExternalJoinNumericMatch.js

@@ -32,7 +32,8 @@ class ViewRecordSetSUBSETFilterExternalJoinNumericMatch extends ViewRecordSetSUB
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-ExternalJoinNumericRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterExternalJoinNumericRange extends ViewRecordSetSUB
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'Number';
-		pRecord.EndClauseDescriptor.DataType = 'Number';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-ExternalJoinSelectedValue.js

@@ -99,7 +99,8 @@ class ViewRecordSetSUBSETFilterExternalJoinSelectedValue extends ViewRecordSetSU
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 		if (!pRecord.ExternalFilterTableLookupColumn)
 		{
 			pRecord.ExternalFilterTableLookupColumn = `ID${pRecord.ExternalFilterByTable}`;

package/source/views/filters/RecordSet-Filter-ExternalJoinSelectedValueList.js

@@ -99,7 +99,8 @@ class ViewRecordSetSUBSETFilterExternalJoinSelectedValueList extends ViewRecordS
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 		if (!pRecord.ExternalFilterTableLookupColumn)
 		{
 			pRecord.ExternalFilterTableLookupColumn = `ID${pRecord.ExternalFilterByTable}`;

package/source/views/filters/RecordSet-Filter-InternalJoinDateMatch.js

@@ -33,7 +33,8 @@ class ViewRecordSetSUBSETFilterInternalJoinDateMatch extends ViewRecordSetSUBSET
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'DateTime';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-InternalJoinDateRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterInternalJoinDateRange extends ViewRecordSetSUBSET
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'DateTime';
-		pRecord.EndClauseDescriptor.DataType = 'DateTime';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'DateTime';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-InternalJoinNumericMatch.js

@@ -33,7 +33,8 @@ class ViewRecordSetSUBSETFilterInternalJoinNumericMatch extends ViewRecordSetSUB
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-InternalJoinNumericRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterInternalJoinNumericRange extends ViewRecordSetSUB
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'Number';
-		pRecord.EndClauseDescriptor.DataType = 'Number';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-InternalJoinSelectedValue.js

@@ -99,7 +99,8 @@ class ViewRecordSetSUBSETFilterInternalJoinSelectedValue extends ViewRecordSetSU
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 		if (!pRecord.ExternalFilterTableLookupColumn)
 		{
 			pRecord.ExternalFilterTableLookupColumn = `ID${pRecord.RemoteTable}`;

package/source/views/filters/RecordSet-Filter-InternalJoinSelectedValueList.js

@@ -99,7 +99,8 @@ class ViewRecordSetSUBSETFilterInternalJoinSelectedValueList extends ViewRecordS
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 		if (!pRecord.ExternalFilterTableLookupColumn)
 		{
 			pRecord.ExternalFilterTableLookupColumn = `ID${pRecord.RemoteTable}`;

package/source/views/filters/RecordSet-Filter-NumericMatch.js

@@ -33,7 +33,8 @@ class ViewRecordSetSUBSETFilterNumericMatch extends ViewRecordSetSUBSETFilterBas
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.ClauseDescriptor.DataType = 'Number';
+		pRecord.ClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.ClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/filters/RecordSet-Filter-NumericRange.js

@@ -34,8 +34,10 @@ class ViewRecordSetSUBSETFilterNumericRange extends ViewRecordSetSUBSETFilterBas
 	{
 		super.prepareRecord(pRecord);
 
-		pRecord.StartClauseDescriptor.DataType = 'Number';
-		pRecord.EndClauseDescriptor.DataType = 'Number';
+		pRecord.StartClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.StartClauseDescriptor.PictForm = pRecord.PictForm || {};
+		pRecord.EndClauseDescriptor.DataType = pRecord.DataType || 'Number';
+		pRecord.EndClauseDescriptor.PictForm = pRecord.PictForm || {};
 	}
 
 	getFilterFormTemplate()

package/source/views/list/RecordSet-List.js

@@ -253,7 +253,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		tmpRecordListData.RecordSchema = tmpRecordSchema;
 
 		// TODO: This should be coming from the schema but that can come after we discuss how we deal with default routing
-		tmpRecordListData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
+		tmpRecordListData.GUIDAddress = this.pict.providers[pProviderHash].getGUIDField();
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
 		tmpRecordListData.PageEnd = Number(tmpRecordListData.Offset) + tmpRecordListData.Records.Records.length;
@@ -504,7 +504,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		tmpRecordListData.RecordSchema = await this.pict.providers[pProviderHash].getRecordSchema();
 
 		// TODO: This should be coming from the schema but that can come after we discuss how we deal with default routing
-		tmpRecordListData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
+		tmpRecordListData.GUIDAddress = this.pict.providers[pProviderHash].getGUIDField();
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
 		const tmpOffset = Number(tmpRecordListData.Offset);