pict-section-recordset 1.0.23 → 1.0.26

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

@@ -14,7 +14,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 {
 	/**
 	 * Creates an instance of RecordSetProvider.
-	 * @param {import('fable')} pFable - The Fable object.
+	 * @param {import('pict')} pFable - The Fable object.
 	 * @param {Record<string, any>} [pOptions] - Custom options for the provider.
 	 * @param {string} [pServiceHash] - The service hash.
 	 */
@@ -24,8 +24,6 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 
 		/** @type {Record<string, any>} */
 		this.options;
-		/** @type {import('fable')} */
-		this.fable;
 		/** @type {import('pict') & {
 		 *      log: any,
 		 *      services:
@@ -37,6 +35,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		 *      PictSectionRecordSet: InstanceType<import('../Pict-Section-RecordSet.js')>
 		 *  }} */
 		this.pict;
+		this.fable = this.pict;
 		/** @type {string} */
 		this.Hash;
 		/** @type {string} */
@@ -44,6 +43,10 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		//TODO: make this typedef better
 		/** @type {Record<string, any>} */
 		this._Schema = { };
+		/** @type {Record<string, Record<string, any>>} */
+		this._Experiences = { };
+		/** @type {Record<string, Record<string, any>>} */
+		this._FiltersByField = { };
 	}
 
 	/** @return {import('pict/types/source/Pict-Meadow-EntityProvider.js')} */
@@ -59,11 +62,6 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		return this._EntityProvider;
 	}
 
-	/**
-	 * @typedef {(error?: Error, result?: T) => void} RecordSetCallback
-	 * @template T = Record<string, any>
-	 */
-
 	/**
 	 * Get a record by its ID or GUID.
 	 *
@@ -129,6 +127,25 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		});
 	}
 
+	_prepareFilterState(pEntity, pOptions, pFilterExperienceResultAddress = 'Records')
+	{
+		const tmpClauses = [].concat(this.pict.Bundle._ActiveFilterState?.[pOptions.Entity || this.options.Entity]?.FilterClauses || []);
+		const tmpExperience = Object.assign({}, this.pict.Bundle._ActiveFilterState?.[pOptions.Entity || this.options.Entity]?.Experience || {});
+		if (!tmpExperience.ResultDestinationAddress)
+		{
+			tmpExperience.ResultDestinationAddress = `Bundle._ActiveFilterState[\`${this.options.RecordSet}\`].${pFilterExperienceResultAddress}`;
+		}
+		if (!tmpExperience.Entity)
+		{
+			tmpExperience.Entity = pEntity;
+		}
+		if (pOptions.FilterString && typeof pOptions.FilterString === 'string' && pOptions.FilterString.trim().length > 0)
+		{
+			tmpClauses.push({ Type: 'RawFilter', Value: pOptions.FilterString });
+		}
+		return [ tmpClauses, tmpExperience ];
+	}
+
 	/**
 	 * Read records from the provider.
 	 *
@@ -148,15 +165,16 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			// using a space here, otherwise you get a `//` in the URL which breaks some stuff
-			this.entityProvider.getEntitySetPage(tmpEntity, pOptions.FilterString ? pOptions.FilterString : ' ', pOptions.Offset || 0, pOptions.PageSize || 250, (pError, pResult) =>
+			const [ tmpClauses, tmpExperience ] = this._prepareFilterState(tmpEntity, pOptions);
+			this.pict.providers.FilterManager.loadRecordPageByFilter(tmpClauses, tmpExperience, pOptions.Offset || 0, pOptions.PageSize || 250, (pError) =>
 			{
 				if (pError)
 				{
 					return reject(pError);
 				}
-				resolve({ Records: pResult, Facets: { } });
+				resolve({ Records: this.pict.resolveStateFromAddress(tmpExperience.ResultDestinationAddress), Facets: { } });
 			});
+			// using a space here, otherwise you get a `//` in the URL which breaks some stuff
 		});
 	}
 
@@ -192,13 +210,14 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		//TODO: lite support / other variants?
 		return new Promise((resolve, reject) =>
 		{
-			this.entityProvider.getEntitySetRecordCount(tmpEntity, pOptions.FilterString, (pError, pCount) =>
+			const [ tmpClauses, tmpExperience ] = this._prepareFilterState(tmpEntity, pOptions, 'Count');
+			this.pict.providers.FilterManager.countRecordsByFilter(tmpClauses, tmpExperience, (pError) =>
 			{
 				if (pError)
 				{
 					return reject(pError);
 				}
-				resolve({ Count: pCount });
+				resolve({ Count: this.pict.resolveStateFromAddress(tmpExperience.ResultDestinationAddress) });
 			});
 		});
 	}
@@ -331,6 +350,89 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	 * @param {(error?: Error) => void} fCallback - The callback function.
 	 */
 	onInitializeAsync(fCallback)
+	{
+		super.onInitializeAsync((pError) =>
+		{
+			if (this.options.FilterExperiences && typeof this.options.FilterExperiences === 'object' && !Array.isArray(this.options.FilterExperiences))
+			{
+				this.pict.Bundle._ActiveFilterState = this.pict.Bundle._ActiveFilterState || {};
+				this.pict.Bundle._ActiveFilterState[this.options.RecordSet] = this.pict.Bundle._ActiveFilterState[this.options.RecordSet] || {};
+				const tmpEntityFilterState = this.pict.Bundle._ActiveFilterState[this.options.RecordSet];
+				tmpEntityFilterState.Experience = tmpEntityFilterState.Experience || {};
+				for (const tmpKey of Object.keys(this.options.FilterExperiences))
+				{
+					const tmpExperience = this.options.FilterExperiences[tmpKey];
+					if (!tmpExperience.FilterCriteriaHash && !Array.isArray(tmpExperience.FilterClauses))
+					{
+						this.log.warn(`Filter experience ${tmpKey} has invalid Criteria`, { Experience: tmpExperience });
+						continue;
+					}
+					if (tmpExperience.FilterCriteriaHash)
+					{
+						// load from hash
+						const tmpClauses = this.pict.providers.FilterManager.getFilterCriteria(tmpExperience.FilterCriteriaHash);
+						if (!tmpClauses)
+						{
+							this.pict.log.warn(`Filter experience ${tmpKey} filter criteria hash ${tmpExperience.FilterCriteriaHash} not found`, { Experience: tmpExperience });
+							continue;
+						}
+						//TODO: handle Ordinal / generate if missing
+						this._Experiences[tmpKey] = JSON.parse(JSON.stringify(tmpExperience));
+						this._Experiences[tmpKey].FilterClauses = JSON.parse(JSON.stringify(tmpClauses));
+						for (const tmpClause of this._Experiences[tmpKey].FilterClauses)
+						{
+							tmpClause.FilterCriteriaHash = tmpExperience.FilterCriteriaHash;
+							if (!tmpClause.FilterByColumn && !tmpClause.CoreConnectionColumn && !tmpClause.JoinInternalConnectionColumn)
+							{
+								this.log.warn(`Filter experience ${tmpKey} clause does not have filter by column configured`, { Clause: tmpClause });
+								continue;
+							}
+							if (tmpClause.FilterDefinitionHash)
+							{
+								const tmpFilter = this.pict.providers.FilterManager.getFilter(tmpClause.FilterDefinitionHash);
+								if (!tmpFilter)
+								{
+									this.pict.log.warn(`Filter experience ${tmpKey} filter criteria hash ${tmpClause.FilterDefinitionHash} not found`, { Experience: tmpExperience });
+									continue;
+								}
+								Object.assign(tmpClause, tmpFilter); //TODO: is there a risk of leakage here?
+								if (tmpClause.FilterByColumn && typeof tmpClause.Type === 'string')
+								{
+									if (tmpClause.Type.startsWith('InternalJoin'))
+									{
+										tmpClause.JoinInternalConnectionColumn = tmpClause.FilterByColumn;
+									}
+									else if (tmpClause.Type.startsWith('ExternalJoin'))
+									{
+										tmpClause.CoreConnectionColumn = tmpClause.FilterByColumn;
+									}
+								}
+							}
+						}
+						if (tmpExperience.Default && !tmpEntityFilterState.FilterClauses)
+						{
+							tmpEntityFilterState.FilterClauses = JSON.parse(JSON.stringify(this._Experiences[tmpKey].FilterClauses));
+						}
+						continue;
+					}
+					this._Experiences[tmpKey] = JSON.parse(JSON.stringify(tmpExperience));
+					if (tmpExperience.Default && !tmpEntityFilterState.FilterClauses)
+					{
+						tmpEntityFilterState.FilterClauses = JSON.parse(JSON.stringify(tmpExperience.FilterClauses));
+					}
+				}
+			}
+			this.initializeEntitySchema(() =>
+			{
+				return fCallback(pError);
+			});
+		});
+	}
+
+	/**
+	 * @param {(error?: Error) => void} fCallback - The callback function.
+	 */
+	initializeEntitySchema(fCallback)
 	{
 		this.fable.log.info('Initializing RecordSetProvider-MeadowEndpoints');
 		const checkSession = this.pict.services.PictSectionRecordSet ? this.pict.services.PictSectionRecordSet.checkSession.bind(this.pict.services.PictSectionRecordSet) : async () => true;
@@ -361,7 +463,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	{
 		if (!this._Schema)
 		{
-			await new Promise((resolve, reject) => this.onInitializeAsync((pError) =>
+			await new Promise((resolve, reject) => this.initializeEntitySchema((pError) =>
 			{
 				if (pError)
 				{
@@ -390,8 +492,8 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 			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);
+		this.pict.Bundle[this.Hash] = { CoreEntityRecordSubset: pRecords };
+		const config = [{ Type: 'SetStateAddress', StateAddress: `Bundle[${this.Hash}]` }].concat(this.options.RecordDecorationConfiguration);
 
 		try
 		{

package/source/services/RecordsSet-MetaController.js

@@ -1,18 +1,18 @@
 const libFableServiceProviderBase = require('fable-serviceproviderbase');
 
-const viewDefinitionRecordSetErrorNotFound = require('../views/error/RecordSet-Error-NotFound.json');
-const viewRecordSetList = require('../views/list/RecordSet-List.js');
-const viewRecordSetEdit = require('../views/edit/RecordSet-Edit.js');
-const viewRecordSetRead = require('../views/read/RecordSet-Read.js');
-const viewRecordSetDashboard = require('../views/dashboard/RecordSet-Dashboard.js');
+const ViewDefinitionRecordSetErrorNotFound = require('../views/error/RecordSet-Error-NotFound.json');
+const ViewRecordSetList = require('../views/list/RecordSet-List.js');
+const ViewRecordSetEdit = require('../views/edit/RecordSet-Edit.js');
+const ViewRecordSetRead = require('../views/read/RecordSet-Read.js');
+const ViewRecordSetDashboard = require('../views/dashboard/RecordSet-Dashboard.js');
 
 //_Pict.addProvider('BooksProvider', { Entity: 'Book', URLPrefix: 'http://www.datadebase.com:8086/1.0/' }, require('../source/providers/RecordSet-RecordProvider-MeadowEndpoints.js'));
-const providerBase = require('../providers/RecordSet-RecordProvider-Base.js');
-const providerMeadowEndpoints = require('../providers/RecordSet-RecordProvider-MeadowEndpoints.js');
+const ProviderBase = require('../providers/RecordSet-RecordProvider-Base.js');
+const ProviderMeadowEndpoints = require('../providers/RecordSet-RecordProvider-MeadowEndpoints.js');
 
-const providerLinkManager = require('../providers/RecordSet-Link-Manager.js');
+const ProviderLinkManager = require('../providers/RecordSet-Link-Manager.js');
 
-const providerRouter = require('../providers/RecordSet-Router.js');
+const ProviderRouter = require('../providers/RecordSet-Router.js');
 
 /** @type {Record<string, any>} */
 const _DEFAULT_CONFIGURATION =
@@ -20,6 +20,8 @@ const _DEFAULT_CONFIGURATION =
 		DefaultMeadowURLPrefix: '/1.0/'
 	};
 
+const libFormsTemplateProvider = require('pict-section-form').PictFormTemplateProvider;
+
 class RecordSetMetacontroller extends libFableServiceProviderBase
 {
 	constructor(pFable, pOptions, pServiceHash)
@@ -61,6 +63,9 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		this.manifests = { Default: this.pict.manifest };
 
 		this.has_initialized = false;
+
+		//FIXME: this duplicates a behavior in pict-section-form - figure out how we want this coupled dependency to work.
+		this.fable.addProviderSingleton('PictFormSectionDefaultTemplateProvider', libFormsTemplateProvider.default_configuration, libFormsTemplateProvider);
 	}
 
 	/*
@@ -163,7 +168,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 				{
 					providerConfiguration.URLPrefix = '/1.0/';
 				}
-				tmpProvider = this.recordSetProviders[pRecordSetConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, providerMeadowEndpoints);
+				tmpProvider = this.recordSetProviders[pRecordSetConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, ProviderMeadowEndpoints);
 				break;
 			default:
 			case 'Custom':
@@ -177,12 +182,12 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 					}
 					else
 					{
-						tmpProvider = this.recordSetProviders[providerConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, providerBase);
+						tmpProvider = this.recordSetProviders[providerConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, ProviderBase);
 					}
 				}
 				else
 				{
-					tmpProvider = this.recordSetProviders[providerConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, providerBase);
+					tmpProvider = this.recordSetProviders[providerConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, ProviderBase);
 				}
 				break;
 		}
@@ -302,15 +307,16 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 			return this;
 		}
 
-		this.fable.addProvider('RecordSetLinkManager', {}, providerLinkManager);
+		this.fable.addProvider('RecordSetLinkManager', {}, ProviderLinkManager);
 
 		// Add the subviews internally and externally
 		this.pict.addTemplate(require('../templates/Pict-Template-FilterView.js'));
-		this.childViews.errorNotFound = this.fable.addView('RSP-RecordSet-Error-NotFound', viewDefinitionRecordSetErrorNotFound);
-		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);
-		this.childViews.dashboard = this.fable.addView('RSP-RecordSet-Dashboard', this.options, viewRecordSetDashboard);
+		this.pict.addTemplate(require('../templates/Pict-Template-FilterInstanceViews.js'));
+		this.childViews.errorNotFound = this.fable.addView('RSP-RecordSet-Error-NotFound', ViewDefinitionRecordSetErrorNotFound);
+		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);
+		this.childViews.dashboard = this.fable.addView('RSP-RecordSet-Dashboard', this.options, ViewRecordSetDashboard);
 
 		// Initialize the subviews
 		this.childViews.list.initialize();
@@ -320,6 +326,22 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		// Now initialize the router
 
+		if (this.fable.settings.hasOwnProperty('Filters') && typeof this.fable.settings.Filters === 'object')
+		{
+			for (const tmpFilterKey of Object.keys(this.fable.settings.Filters))
+			{
+				this.pict.providers.FilterManager.addFilter(tmpFilterKey, this.fable.settings.Filters[tmpFilterKey]);
+			}
+		}
+
+		if (this.fable.settings.hasOwnProperty('FilterCriteria') && typeof this.fable.settings.FilterCriteria === 'object')
+		{
+			for (const tmpFilterCriterionKey of Object.keys(this.fable.settings.FilterCriteria))
+			{
+				this.pict.providers.FilterManager.addFilterCriteria(tmpFilterCriterionKey, this.fable.settings.FilterCriteria[tmpFilterCriterionKey]);
+			}
+		}
+
 		if (this.fable.settings.hasOwnProperty('DefaultRecordSetConfigurations'))
 		{
 			this.loadRecordSetConfigurationArray(this.fable.settings.DefaultRecordSetConfigurations);
@@ -346,7 +368,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		// Load pict-router if it isn't loaded
 		if (!('RecordSetRouter' in this.fable.providers))
 		{
-			this.fable.addProvider('RecordSetRouter', {}, providerRouter);
+			this.fable.addProvider('RecordSetRouter', {}, ProviderRouter);
 			this.fable.providers.RecordSetRouter.initialize();
 		}
 

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

@@ -0,0 +1,222 @@
+const libPictTemplate = require('pict-template');
+const libFilterViews = require('../views/filters/index.js');
+
+/**
+ * Specialized instruction for rendering the filter view and plumbing in required context.
+ *
+ * Based on the Pict base {~V:...~} template instruction.
+ */
+class PictTemplateFilterInstanceViewInstruction 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('{~FIV:', '~}');
+		this.addPattern('{~FilterInstanceViews:', '~}');
+
+
+		if (!('__TemplateOutputCache' in this.pict))
+		{
+			this.pict.__TemplateOutputCache = {};
+		}
+	}
+
+	_getViewForFilterClauses(pClauses)
+	{
+		const tmpViewHash =`PSRS-FilterType-${pClauses.Type}`; 
+		/** @type {import('../views/filters/RecordSet-Filter-Base.js')} */
+		let tmpView = this.pict.views[tmpViewHash];
+		if (!tmpView)
+		{
+			const tmpViewPrototype = libFilterViews[pClauses.Type] || libFilterViews.Base;
+			if (!tmpViewPrototype)
+			{
+				this.pict.log.error(`Pict: Filter Instance Views Template Render: No view prototype found for filter type [${pClauses.Type}]`);
+				return null;
+			}
+			//FIXME: is this safe? will this view get rendered at other times?
+			tmpView = this.pict.addView(tmpViewHash, { }, tmpViewPrototype);
+		}
+		return tmpView;
+	}
+
+	/**
+	 * 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
+	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 *
+	 * @return {string} The rendered template
+	 */
+	render(pTemplateHash, pRecord, pContextArray, pScope)
+	{
+		const tmpRecordSet = pRecord.RecordSet || '';
+		if (!tmpRecordSet)
+		{
+			this.pict.log.error(`Pict: Filter Instance Views Template Render: No record set specified in record`);
+			return '';
+		}
+		const tmpRecordSetConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations?.[tmpRecordSet];
+		if (!tmpRecordSetConfiguration)
+		{
+			this.pict.log.error(`Pict: Filter Instance Views Template Render: No record set configuration found for [${tmpRecordSet}]`);
+			return '';
+		}
+		let tmpViewContext = pRecord.ViewContext;
+		if (tmpViewContext)
+		{
+			tmpViewContext = tmpViewContext.trim();
+		}
+		else
+		{
+			tmpViewContext = 'Default';
+		}
+		pRecord = pRecord || {};
+		if (!pRecord.RecordSet)
+		{
+			pRecord.RecordSet = tmpRecordSet;
+		}
+		if (!pRecord.RecordSetConfiguration)
+		{
+			pRecord.RecordSetConfiguration = tmpRecordSetConfiguration;
+		}
+		if (!pRecord.ViewContext)
+		{
+			pRecord.ViewContext = pRecord.DashboardHash ? `${tmpViewContext}-${pRecord.DashboardHash}` : tmpViewContext;
+		}
+
+		let tmpRenderGUID = this.pict.getUUID();
+		let tmpResult = '';
+
+		const tmpClauses = this.pict.Bundle._ActiveFilterState?.[pRecord.RecordSet]?.FilterClauses || [];
+		//FIXME: lookup by hash instead?
+		for (let i = 0; i < tmpClauses.length; i++)
+		//for (const tmpClauses of this.pict.Bundle._ActiveFilterState?.[pRecord.RecordSet]?.FilterClauses || [])
+		{
+			const tmpClause = tmpClauses[i];
+			/** @type {import('../views/filters/RecordSet-Filter-Base.js')} */
+			const tmpView = this._getViewForFilterClauses(tmpClause);
+			if (!tmpView)
+			{
+				continue;
+			}
+
+			const tmpRecord = Object.assign({}, pRecord, tmpClause);
+			//tmpRecord.ClauseAddress = `Bundle._ActiveFilterState['${pRecord.RecordSet}'].FilterClauses[${i}]`;
+			tmpRecord.ClauseAddress = `_ActiveFilterState[\`${pRecord.RecordSet}\`].FilterClauses[${i}]`;
+			tmpView.prepareRecord(tmpRecord);
+			tmpView.renderWithScope(tmpClause, '__Virtual', `__TemplateOutputCache.${tmpRenderGUID}`, tmpRecord);
+
+			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
+	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
+	 * @return {void}
+	 */
+	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray, pScope)
+	{
+		const tmpRecordSet = pRecord.RecordSet || '';
+		if (!tmpRecordSet)
+		{
+			this.pict.log.error(`Pict: Filter Instance Views Template Render: No record set specified in record`);
+			return fCallback(null, '');
+		}
+		const tmpRecordSetConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations?.[tmpRecordSet];
+		if (!tmpRecordSetConfiguration)
+		{
+			this.pict.log.error(`Pict: Filter Instance Views Template Render: No record set configuration found for [${tmpRecordSet}]`);
+			return fCallback(null, '');
+		}
+		let tmpViewContext = pRecord.ViewContext;
+		if (tmpViewContext)
+		{
+			tmpViewContext = tmpViewContext.trim();
+		}
+		else
+		{
+			tmpViewContext = 'Default';
+		}
+
+		pRecord = pRecord || {};
+		if (!pRecord.RecordSet)
+		{
+			pRecord.RecordSet = tmpRecordSet;
+		}
+		if (!pRecord.RecordSetConfiguration)
+		{
+			pRecord.RecordSetConfiguration = tmpRecordSetConfiguration;
+		}
+		if (!pRecord.ViewContext)
+		{
+			pRecord.ViewContext = pRecord.DashboardHash ? `${tmpViewContext}-${pRecord.DashboardHash}` : tmpViewContext;
+		}
+		const tmpAnticipate = this.pict.newAnticipate();
+		let tmpResult = '';
+
+		const tmpClauses = this.pict.Bundle._ActiveFilterState?.[pRecord.RecordSet]?.FilterClauses || [];
+		//FIXME: lookup by hash instead?
+		for (let i = 0; i < tmpClauses.length; i++)
+		{
+			const tmpClause = tmpClauses[i];
+			/** @type {import('../views/filters/RecordSet-Filter-Base.js')} */
+			const tmpView = this._getViewForFilterClauses(tmpClause);
+			if (!tmpView)
+			{
+				continue;
+			}
+
+			const tmpRenderGUID = this.pict.getUUID();
+			tmpAnticipate.anticipate((fNext) =>
+			{
+				const tmpRecord = Object.assign({}, pRecord, tmpClause);
+				tmpRecord.ClauseAddress = `_ActiveFilterState[${pRecord.RecordSet}].FilterClauses[${i}]`;
+				tmpView.prepareRecord(tmpRecord);
+
+				return tmpView.renderWithScopeAsync(tmpClause, '__Virtual', `__TemplateOutputCache.${tmpRenderGUID}`, tmpRecord,
+					(pError, pResult) =>
+					{
+						if (pError)
+						{
+							this.log.warn(`Pict: Filter Instance Views Template Render: Error rendering view [${tmpView.Hash}]`, pError);
+							//TODO: should we fail the whole render?
+							return fNext();
+							//return fNext(pError);
+						}
+
+						tmpResult += this.pict.__TemplateOutputCache[tmpRenderGUID];
+						// TODO: Uncomment this when we like how it's working
+						//delete this.pict.__TemplateOutputCache[tmpRenderGUID];
+
+						return fNext(null);
+					});
+			});
+		}
+		return tmpAnticipate.wait((pError) =>
+		{
+			return fCallback(pError, tmpResult);
+		});
+	}
+}
+
+module.exports = PictTemplateFilterInstanceViewInstruction;

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

@@ -35,10 +35,11 @@ class PictTemplateFilterViewInstruction extends libPictTemplate
 	 * @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
+	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
 	 *
 	 * @return {string} The rendered template
 	 */
-	render(pTemplateHash, pRecord, pContextArray)
+	render(pTemplateHash, pRecord, pContextArray, pScope)
 	{
 		let [ tmpViewHash, tmpViewContext ] = pTemplateHash.split(':');
 		tmpViewHash = tmpViewHash.trim();
@@ -101,9 +102,10 @@ class PictTemplateFilterViewInstruction extends libPictTemplate
 	 * @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
+	 * @param {any} [pScope] - A sticky scope that can be used to carry state and simplify template
 	 * @return {void}
 	 */
-	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray)
+	renderAsync(pTemplateHash, pRecord, fCallback, pContextArray, pScope)
 	{
 		let [ tmpViewHash, tmpViewContext ] = pTemplateHash.split(':');
 		tmpViewHash = tmpViewHash.trim();