pict-section-recordset 1.0.15 → 1.0.16

package/example_applications/simple_entity/Simple-RecordSet-Application.js

@@ -12,6 +12,71 @@ module.exports.default_configuration.pict_configuration = (
 				"AutoRenderMainViewportViewAfterInitialize": false
 			},
 
+		"DefaultDashboards":
+		[
+			{
+				"Scope": "Bookstore",
+				"CoreEntity": "Book",
+				"RecordDecorationConfiguration":
+				[
+					{
+						"Entity": "BookAuthorJoin",
+						"Filter": "FBL~IDBook~INN~{~PJU:,^IDBook^Record.State.CoreEntityRecordSubset~}",
+						"Destination": "State.BookAuthorJoins"
+					},
+					{
+						"Entity": "Author",
+						"Filter": "FBL~IDAuthor~INN~{~PJU:,^IDAuthor^Record.State.BookAuthorJoins~}",
+						"Destination": "State.Authors"
+					},
+					{
+						"Type": "MapJoin",
+						"DestinationRecordSetAddress": "State.CoreEntityRecordSubset",
+						"DestinationJoinValue": "IDBook",
+						"JoinJoinValueLHS": "IDBook",
+						"Joins": "State.BookAuthorJoins",
+						"JoinJoinValueRHS": "IDAuthor",
+						"JoinRecordSetAddress": "State.Authors",
+						"JoinValue": "IDAuthor",
+						"RecordDestinationAddress": "Authors"
+					}
+				],
+				"Descriptors":
+				{
+					"Title":
+					{
+						"Name": "Title",
+						"Hash": "Title",
+						"DataType": "String"
+					},
+					"Authors":
+					{
+						"Name": "Authors",
+						"Hash": "Authors",
+						"PictForm":
+						{
+							"InputType": "ReadOnly",
+						}
+					},
+					"AuthorCount":
+					{
+						"Name": "Number of Authors",
+						"Hash": "AuthorCount",
+						"DataType": "Number",
+						"PictForm":
+						{
+							"InputType": "ReadOnly"
+						}
+					}
+				}
+			},
+			{
+				"Scope": "AuthorSummary",
+				"Descriptors":
+				{
+				}
+			}
+		],
 		"DefaultRecordSetConfigurations":
 			[
 				{
@@ -38,8 +103,56 @@ module.exports.default_configuration.pict_configuration = (
 					"RecordSetListHasExtraColumns": true,
 					"RecordSetListExtraColumnsHeaderTemplate": "<th style=\"border-bottom: 1px solid #ccc; padding: 5px; background-color: #f2f2f2; color: #333;\">Cover</th>",
 					"RecordSetListExtraColumnRowTemplate": "<td><img src=\"{~D:Record.Data.ImageURL~}\"></td>",
+
+					"SearchFields": [ "Title" ],
+
+					"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
+					"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
+					"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/DashboardFilteredTo/{~D:Record.FilterString~}",
+
+					"RecordSetURLPrefix": "/1.0/"
+				},
+				{
+					"RecordSet": "BookstoreInventory",
+
+					"RecordSetType": "MeadowEndpoint", // Could be "Custom" which would require a provider to already be created for the record set.
+					"RecordSetMeadowEntity": "Book",   // This leverages the /Schema endpoint to get the record set columns.
+					"RecordDecorationConfiguration":
+					[
+						{
+							"Entity": "BookAuthorJoin",
+							"Filter": "FBL~IDBook~INN~{~PJU:,^IDBook^Record.State.CoreEntityRecordSubset~}",
+							"Destination": "State.BookAuthorJoins"
+						},
+						{
+							"Entity": "Author",
+							"Filter": "FBL~IDAuthor~INN~{~PJU:,^IDAuthor^Record.State.BookAuthorJoins~}",
+							"Destination": "State.Authors"
+						},
+						{
+							"Type": "MapJoin",
+							"DestinationRecordSetAddress": "State.CoreEntityRecordSubset",
+							"DestinationJoinValue": "IDBook",
+							"JoinJoinValueLHS": "IDBook",
+							"Joins": "State.BookAuthorJoins",
+							"JoinJoinValueRHS": "IDAuthor",
+							"JoinRecordSetAddress": "State.Authors",
+							"JoinValue": "IDAuthor",
+							"RecordDestinationAddress": "Authors"
+						}
+					],
+					"AvailableVerbs": [ "Dashboard" ],
+
+					"RecordSetListHasExtraColumns": true,
+					"RecordSetListExtraColumnsHeaderTemplate": "<th style=\"border-bottom: 1px solid #ccc; padding: 5px; background-color: #f2f2f2; color: #333;\">Cover</th>",
+					"RecordSetListExtraColumnRowTemplate": "<td><img src=\"{~D:Record.Data.ImageURL~}\"></td>",
+
 					"SearchFields": [ "Title" ],
 
+					"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
+					"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
+					"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/DashboardFilteredTo/{~D:Record.FilterString~}",
+
 					"RecordSetURLPrefix": "/1.0/"
 				},
 				{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pict-section-recordset",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Pict dynamic record set management views",
   "main": "source/Pict-Section-RecordSet.js",
   "directories": {
@@ -33,7 +33,7 @@
     "browser-env": "^3.3.0",
     "eslint": "^9.27.0",
     "jquery": "^3.7.1",
-    "pict": "^1.0.257",
+    "pict": "^1.0.262",
     "pict-application": "^1.0.25",
     "pict-service-commandlineutility": "^1.0.15",
     "quackage": "^1.0.41",
@@ -43,7 +43,7 @@
     "fable-serviceproviderbase": "^3.0.15",
     "pict-provider": "^1.0.3",
     "pict-router": "^1.0.3",
-    "pict-section-form": "^1.0.95",
+    "pict-section-form": "^1.0.97",
     "pict-template": "^1.0.10",
     "pict-view": "^1.0.60"
   },

package/source/providers/RecordSet-RecordProvider-Base.js

@@ -104,6 +104,20 @@ class RecordSetProviderBase extends libPictProvider
 		return { Records: [], Facets: { } };
 	}
 
+	/**
+	 * Read records from the provider.
+	 *
+	 * @param {RecordSetFilter} pOptions - Options for the read operation.
+	 *
+	 * @return {Promise<RecordSetResult>} - The result of the read operation.
+	 */
+	async getDecoratedRecords(pOptions)
+	{
+		const tmpRecords = await this.getRecords(pOptions);
+		await this.decorateCoreRecords(tmpRecords.Records);
+		return tmpRecords;
+	}
+
 	/**
 	 * Read records from the provider.
 	 *
@@ -133,6 +147,7 @@ class RecordSetProviderBase extends libPictProvider
 	 * Create a new record.
 	 *
 	 * @param {Record<string, any>} pRecord - The record to create.
+	 * @return {Promise<Record<string, any>>} - The created record.
 	 */
 	async createRecord(pRecord)
 	{
@@ -144,6 +159,7 @@ class RecordSetProviderBase extends libPictProvider
 	 * Update a record.
 	 *
 	 * @param {Record<string, any>} pRecord - The record to update.
+	 * @return {Promise<Record<string, any>>} - The updated record.
 	 */
 	async updateRecord(pRecord)
 	{
@@ -155,6 +171,7 @@ class RecordSetProviderBase extends libPictProvider
 	 * Delete a record.
 	 *
 	 * @param {Record<string, any>} pRecord - The record to delete.
+	 * @return {Promise<void>}
 	 */
 	async deleteRecord(pRecord)
 	{
@@ -188,6 +205,7 @@ class RecordSetProviderBase extends libPictProvider
 	 * Clone a record.
 	 *
 	 * @param {Record<string, any>} pRecord - The record to clone.
+	 * @return {Promise<Record<string, any>>} - The cloned record.
 	 */
 	async cloneRecord(pRecord)
 	{
@@ -211,6 +229,16 @@ class RecordSetProviderBase extends libPictProvider
 	{
 		return { };
 	}
+
+	/**
+	 * Abstract decoration method for core records. Subclasses should implement this method to decorate records with additional information.
+	 *
+	 * @param {Array<Record<string, any>>} pRecords - The records to decorate.
+	 * @return {Promise<void>}
+	 */
+	async decorateCoreRecords(pRecords)
+	{
+	}
 }
 
 module.exports = RecordSetProviderBase;

package/source/providers/RecordSet-RecordProvider-MeadowEndpoints.js

@@ -10,7 +10,7 @@ const libRecordSetProviderBase = require('./RecordSet-RecordProvider-Base.js');
  * Class representing a data change detection provider for Pict dynamic forms.
  * @extends libRecordSetProviderBase
  */
-class RecordSetProvider extends libRecordSetProviderBase
+class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 {
 	/**
 	 * Creates an instance of RecordSetProvider.
@@ -26,8 +26,21 @@ class RecordSetProvider extends libRecordSetProviderBase
 		this.options;
 		/** @type {import('fable')} */
 		this.fable;
-		/** @type {import('fable') & import('pict')} */
+		/** @type {import('pict') & {
+		 *      log: any,
+		 *      services:
+		 *      {
+		 *			PictSectionRecordSet: InstanceType<import('../Pict-Section-RecordSet.js')>,
+		 *			[key: string]: any,
+		 *		},
+		 *      instantiateServiceProviderWithoutRegistration: (hash: String) => any,
+		 *      PictSectionRecordSet: InstanceType<import('../Pict-Section-RecordSet.js')>
+		 *  }} */
 		this.pict;
+		/** @type {string} */
+		this.Hash;
+		/** @type {string} */
+		this.UUID;
 		//TODO: make this typedef better
 		/** @type {Record<string, any>} */
 		this._Schema = { };
@@ -359,6 +372,43 @@ class RecordSetProvider extends libRecordSetProviderBase
 		}
 		return this._Schema;
 	}
+
+	/**
+	 * Abstract decoration method for core records. Subclasses should implement this method to decorate records with additional information.
+	 *
+	 * @param {Array<Record<string, any>>} pRecords - The records to decorate.
+	 * @return {Promise<void>}
+	 */
+	async decorateCoreRecords(pRecords)
+	{
+		if (!this.options.RecordDecorationConfiguration)
+		{
+			return;
+		}
+		if (!Array.isArray(this.options.RecordDecorationConfiguration))
+		{
+			this.pict.log.error('RecordDecorationConfiguration is not an array', { RecordDecorationConfiguration: this.options.RecordDecorationConfiguration });
+			return;
+		}
+		this.pict.AppData[this.Hash] = { CoreEntityRecordSubset: pRecords };
+		const config = [{ Type: 'SetStateAddress', StateAddress: `AppData[${this.Hash}]` }].concat(this.options.RecordDecorationConfiguration);
+
+		try
+		{
+			await new Promise((resolve, reject) => this.pict.EntityProvider.gatherDataFromServer(config, (err) =>
+			{
+				if (err)
+				{
+					return reject(err);
+				}
+				resolve();
+			}));
+		}
+		catch (error)
+		{
+			this.pict.log.error(`MeadowEndpointsRecordSetProvider: Error gathering data from server for record decoration: ${error.message}`, { Stack: error.stack });
+		}
+	}
 }
 
-module.exports = RecordSetProvider;
+module.exports = MeadowEndpointsRecordSetProvider;

package/source/services/RecordsSet-MetaController.js

@@ -28,6 +28,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		/** @type {import('pict') & { addAndInstantiateSingletonService: (hash: string, options: any, prototype: any) => any }} */
 		this.fable;
+		this.pict = this.fable;
 		/** @type {any} */
 		this.log;
 		/** @type {any} */
@@ -45,7 +46,8 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		this.recordSetProviders = {};
 		this.recordSetProviderConfigurations = {};
 
-		this.recordSetListConfigurations = {};
+		this.dashboardConfigurations = {};
+
 		this.sessionProviders = [];
 
 		this.has_initialized = false;
@@ -77,6 +79,15 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 				}
 			]
 	 */
+
+	/**
+	 * @return {Record<string, any>} - The registered configuration for the RecordSet
+	 */
+	getRecordSetConfiguration(pRecordSet)
+	{
+		return this.recordSetProviderConfigurations[pRecordSet];
+	}
+
 	loadRecordSetConfiguration(pRecordSetConfiguration)
 	{
 		if (typeof pRecordSetConfiguration !== 'object')
@@ -190,6 +201,72 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		}
 	}
 
+	/**
+	 * @param {Array<Record<string, any>>} pDashboardConfigurationArray - An array of dashboard configurations.
+	 */
+	loadDashboardConfigurationArray(pDashboardConfigurationArray)
+	{
+		if (!Array.isArray(pDashboardConfigurationArray))
+		{
+			this.fable.log.error(`RecordSetMetacontroller: ${this.UUID} loadDashboardConfigurationArray called with invalid configuration.`);
+			return false;
+		}
+		if (pDashboardConfigurationArray.length === 0)
+		{
+			this.fable.log.warn(`RecordSetMetacontroller: ${this.UUID} loadDashboardConfigurationArray called with empty configuration.`);
+			return false;
+		}
+		for (const tmpDashboardConfiguration of pDashboardConfigurationArray)
+		{
+			if (tmpDashboardConfiguration.RecordDecorationConfiguration)
+			{
+				//TODO: register the record decoration configuration
+			}
+		}
+	}
+
+	/**
+	 * TODO: This method is still incomplete.
+	 *
+	 * @param {Record<string, any>} pDashboardConfiguration - The dashboard configuration to add.
+	 */
+	addDashboardConfiguration(pDashboardConfiguration)
+	{
+		let tmpProvider = false;
+
+		if (this.recordSetProviders[pDashboardConfiguration.RecordSet])
+		{
+			this.pict.log.error(`RecordSetMetacontroller: ${this.UUID} addDashboardConfiguration called with invalid configuration. RecordSet ${pDashboardConfiguration.RecordSet} already exists.`);
+			return null;
+		}
+		const providerConfiguration = Object.assign({}, {Hash: `RSP-Provider-${pDashboardConfiguration.RecordSet}`}, pDashboardConfiguration);
+		this.dashboardConfigurations[providerConfiguration.RecordSet] = providerConfiguration;
+
+		// Create a Meadow Endpoints provider
+		// Allow the Record Set to optionally point to a different entity
+		if ('RecordSetCoreMeadowEntity' in pDashboardConfiguration)
+		{
+			providerConfiguration.Entity = pDashboardConfiguration.RecordSetCoreMeadowEntity;
+		}
+		else
+		{
+			this.pict.log.error(`RecordSetMetacontroller: ${this.UUID} addDashboardConfiguration called with invalid configuration. Missing RecordSetCoreMeadowEntity.`);
+			return null;
+		}
+		// Default the URLPrefix to the base URLPrefix
+		if ('RecordSetURLPrefix' in pDashboardConfiguration)
+		{
+			providerConfiguration.URLPrefix = pDashboardConfiguration.RecordSetURLPrefix;
+		}
+		else
+		{
+			providerConfiguration.URLPrefix = '/1.0/';
+		}
+		tmpProvider = this.recordSetProviders[pDashboardConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, providerMeadowEndpoints);
+
+		return tmpProvider;
+	}
+
 	loadRecordSetDynamcally(pRecordSet, pEntity, pDefaultFilter)
 	{
 		if (typeof(pRecordSet) === 'object')
@@ -284,6 +361,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		this.fable.addProvider('RecordSetLinkManager', {}, providerLinkManager);
 
 		// Add the subviews internally and externally
+		this.pict.addTemplate(require('../templates/Pict-Template-FilterView.js'));
 		this.childViews.list = this.fable.addView('RSP-RecordSet-List', this.options, viewRecordSetList);
 		this.childViews.edit = this.fable.addView('RSP-RecordSet-Edit', this.options, viewRecordSetEdit);
 		this.childViews.read = this.fable.addView('RSP-RecordSet-Read', this.options, viewRecordSetRead);
@@ -302,6 +380,11 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 			this.loadRecordSetConfigurationArray(this.fable.settings.DefaultRecordSetConfigurations);
 		}
 
+		if (this.fable.settings.hasOwnProperty('DefaultDashboards'))
+		{
+			this.loadDashboardConfigurationArray(this.fable.settings.DefaultDashboards);
+		}
+
 		this.has_initialized = true;
 
 		// Load pict-router if it isn't loaded

package/source/templates/Pict-Template-FilterView.js

@@ -0,0 +1,172 @@
+const libPictTemplate = require('pict-template');
+
+/**
+ * Specialized instruction for rendering the filter view and plumbing in required context.
+ *
+ * Based on the Pict base {~V:...~} template instruction.
+ */
+class PictTemplateFilterViewInstruction extends libPictTemplate
+{
+	/**
+	 * @param {Object} pFable - The Fable Framework instance
+	 * @param {Object} pOptions - The options for the service
+	 * @param {String} pServiceHash - The hash of the service
+	 */
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+
+		/** @type {any} */
+		this.log;
+
+		this.addPattern('{~FV:', '~}');
+		this.addPattern('{~FilterView:', '~}');
+
+
+		if (!('__TemplateOutputCache' in this.pict))
+		{
+			this.pict.__TemplateOutputCache = {};
+		}
+	}
+
+	/**
+	 * Render a template expression, returning a string with the resulting content.
+	 *
+	 * @param {string} pTemplateHash - The hash contents of the template (what's between the template start and stop tags)
+	 * @param {any} pRecord - The json object to be used as the Record for the template render
+	 * @param {Array<any>} pContextArray - An array of context objects accessible from the template; safe to leave empty
+	 *
+	 * @return {string} The rendered template
+	 */
+	render(pTemplateHash, pRecord, pContextArray)
+	{
+		let [ tmpViewHash, tmpViewContext ] = pTemplateHash.split(':');
+		tmpViewHash = tmpViewHash.trim();
+		const tmpRecordSet = pRecord.RecordSet || '';
+		if (!tmpRecordSet)
+		{
+			this.pict.log.error(`Pict: Filter View Template Render: No record set specified in template hash [${pTemplateHash}] for view [${tmpViewHash}]`);
+			return '';
+		}
+		const tmpRecordSetConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations?.[tmpRecordSet];
+		if (!tmpRecordSetConfiguration)
+		{
+			this.pict.log.error(`Pict: Filter View Template Render: No record set configuration found for [${tmpRecordSet}] in template hash [${pTemplateHash}] for view [${tmpViewHash}]`);
+			return '';
+		}
+		if (tmpViewContext)
+		{
+			tmpViewContext = tmpViewContext.trim();
+		}
+		else
+		{
+			tmpViewContext = 'Default';
+		}
+		if (!(tmpViewHash in this.pict.views))
+		{
+			this.log.warn(`Pict: Filter View Template Render: View not found for [${tmpViewHash}]`);
+			return '';
+		}
+
+		pRecord = pRecord || {};
+		if (!pRecord.RecordSet)
+		{
+			pRecord.RecordSet = tmpRecordSet;
+		}
+		if (!pRecord.RecordSetConfiguration)
+		{
+			pRecord.RecordSetConfiguration = tmpRecordSetConfiguration;
+		}
+		if (!pRecord.ViewContext)
+		{
+			pRecord.ViewContext = tmpViewContext;
+		}
+
+		let tmpRenderGUID = this.pict.getUUID();
+
+		/** @type {import('pict-view')} */
+		const tmpView = this.pict.views[tmpViewHash];
+
+		tmpView.render('__Virtual', `__TemplateOutputCache.${tmpRenderGUID}`, pRecord);
+
+		let tmpResult = this.pict.__TemplateOutputCache[tmpRenderGUID];
+		// TODO: Uncomment this when we like how it's working
+		//delete this.pict.__TemplateOutputCache[tmpRenderGUID];
+
+		return tmpResult;
+	}
+
+	/**
+	 * @param {string} pTemplateHash - The hash contents of the template (what's between the template start and stop tags)
+	 * @param {any} pRecord - The json object to be used as the Record for the template
+	 * @param {(pError?: Error, pResult?: string) => void} fCallback - The callback function to call with the result
+	 * @param {Array<any>} pContextArray - An array of context objects accessible from the template; safe to leave empty
+	 * @return {void}
+	 */
+	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray)
+	{
+		let [ tmpViewHash, tmpViewContext ] = pTemplateHash.split(':');
+		tmpViewHash = tmpViewHash.trim();
+		const tmpRecordSet = pRecord.RecordSet || '';
+		if (!tmpRecordSet)
+		{
+			this.pict.log.error(`Pict: Filter View Template Render: No record set specified in template hash [${pTemplateHash}] for view [${tmpViewHash}]`);
+			return fCallback(null, '');
+		}
+		const tmpRecordSetConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations?.[tmpRecordSet];
+		if (!tmpRecordSetConfiguration)
+		{
+			this.pict.log.error(`Pict: Filter View Template Render: No record set configuration found for [${tmpRecordSet}] in template hash [${pTemplateHash}] for view [${tmpViewHash}]`);
+			return fCallback(null, '');
+		}
+		if (tmpViewContext)
+		{
+			tmpViewContext = tmpViewContext.trim();
+		}
+		else
+		{
+			tmpViewContext = 'Default';
+		}
+		if (!(tmpViewHash in this.pict.views))
+		{
+			this.log.warn(`Pict: Filter View Template Render: View not found for [${tmpViewHash}]`);
+			return fCallback(null, '');
+		}
+
+		pRecord = pRecord || {};
+		if (!pRecord.RecordSet)
+		{
+			pRecord.RecordSet = tmpRecordSet;
+		}
+		if (!pRecord.RecordSetConfiguration)
+		{
+			pRecord.RecordSetConfiguration = tmpRecordSetConfiguration;
+		}
+		if (!pRecord.ViewContext)
+		{
+			pRecord.ViewContext = tmpViewContext;
+		}
+		let tmpRenderGUID = this.pict.getUUID();
+
+		/** @type {import('pict-view')} */
+		const tmpView = this.pict.views[tmpViewHash];
+
+		return tmpView.renderAsync('__Virtual', `__TemplateOutputCache.${tmpRenderGUID}`, pRecord,
+			(pError, pResult) =>
+			{
+				if (pError)
+				{
+					this.log.warn(`Pict: Filter View Template Render: Error rendering view [${tmpViewHash}]`, pError);
+					return fCallback(pError, '');
+				}
+
+				let tmpResult = this.pict.__TemplateOutputCache[tmpRenderGUID];
+				// TODO: Uncomment this when we like how it's working
+				//delete this.pict.__TemplateOutputCache[tmpRenderGUID];
+
+				return fCallback(null, tmpResult);
+			});
+	}
+}
+
+module.exports = PictTemplateFilterViewInstruction;

package/source/views/RecordSet-Filter.js

@@ -32,7 +32,7 @@ const _DEFAULT_CONFIGURATION_SUBSET_Filter =
 			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filter-Template] -->
 	<section id="PRSP_Filter_Container">
-		<form id="PRSP_Filter_Form" onsubmit="_Pict.views['PRSP-Filters'].handleSearch(event)">
+		<form id="PRSP_Filter_Form" onsubmit="_Pict.views['PRSP-Filters'].handleSearch(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}'); return false;">
 			{~T:PRSP-SUBSET-Filter-Template-Input-Fieldset~}
 			{~T:PRSP-SUBSET-Filter-Template-Button-Fieldset~}
 		</form>
@@ -56,7 +56,7 @@ const _DEFAULT_CONFIGURATION_SUBSET_Filter =
 			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filter-Template-Button-Fieldset] -->
 	<fieldset>
-		<button type="button" id="PRSP_Filter_Button_Reset" onclick="_Pict.views['PRSP-Filters'].handleReset(event)">Reset</button>
+		<button type="button" id="PRSP_Filter_Button_Reset" onclick="_Pict.views['PRSP-Filters'].handleReset(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}')">Reset</button>
 		<button type="submit" id="PRSP_Filter_Button_Apply">Apply</button>
 	</fieldset>
 	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filter-Template-Button-Fieldset] -->
@@ -83,20 +83,57 @@ class viewRecordSetSUBSETFilter extends libPictView
 	{
 		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_SUBSET_Filter, pOptions);
 		super(pFable, tmpOptions, pServiceHash);
+		/** @type {import('fable') & import('pict') & { PictSectionRecordSet: import('../Pict-Section-RecordSet.js') }} */
+		this.pict;
 	}
 
-	handleSearch(event)
+	/**
+	 * @param {Event} pEvent - The DOM event that triggered the search
+	 * @param {string} pRecordSet - The record set being filtered
+	 * @param {string} pViewContext - The view context for the filter (ex. List, Dashboard)
+	 */
+	handleSearch(pEvent, pRecordSet, pViewContext)
 	{
-		event.preventDefault(); // don't submit the form
-		event.stopPropagation();
-		this.pict.views['RSP-RecordSet-List']?.handleSearch?.(this.pict.ContentAssignment.readContent('input[name="filter"]'));
+		pEvent.preventDefault(); // don't submit the form
+		pEvent.stopPropagation();
+		const tmpSearchString = this.pict.ContentAssignment.readContent(`input[name="filter"]`);
+		this.performSearch(pRecordSet, pViewContext, tmpSearchString ? String(tmpSearchString) : ' ');
 	}
 
-	handleReset(event)
+	/**
+	 * @param {string} pRecordSet - The record set being filtered
+	 * @param {string} pViewContext - The view context for the filter (ex. List, Dashboard)
+	 * @param {string} [pFilterString] - The filter string to apply, defaults to a single space if not provided
+	 */
+	performSearch(pRecordSet, pViewContext, pFilterString)
 	{
-		event.stopPropagation();
+		const tmpPictRouter = this.pict.providers.PictRouter;
+		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[pRecordSet];
+		let filterExpr = ' ';
+		if (pFilterString)
+		{
+			const searchFields = tmpProviderConfiguration?.SearchFields ?? [ 'Name' ];
+			filterExpr = searchFields.map((filterField) => `FBVOR~${filterField}~LK~${encodeURIComponent(`%${pFilterString}%`)}`).join('~');
+		}
+		let tmpURLTemplate = tmpProviderConfiguration[`RecordSetFilterURLTemplate-${pViewContext}`] || tmpProviderConfiguration[`RecordSetFilterURLTemplate-Default`];
+		const tmpURL = this.pict.parseTemplate(tmpURLTemplate,
+			{
+				RecordSet: pRecordSet,
+				FilterString: filterExpr,
+			});
+		tmpPictRouter.router.navigate(tmpURL);
+	}
+
+	/**
+	 * @param {Event} pEvent - The DOM event that triggered the search
+	 * @param {string} pRecordSet - The record set being filtered
+	 * @param {string} pViewContext - The view context for the filter (ex. List, Dashboard)
+	 */
+	handleReset(pEvent, pRecordSet, pViewContext)
+	{
+		pEvent.preventDefault();
 		this.pict.ContentAssignment.assignContent('input[name="filter"]', '');
-		this.pict.views['RSP-RecordSet-List']?.handleSearch?.('');
+		this.performSearch(pRecordSet, pViewContext);
 	}
 }