pict-section-recordset 1.0.24 → 1.0.26

package/source/views/RecordSet-Filters.js

@@ -0,0 +1,449 @@
+const libPictView = require('pict-view');
+
+/** @type {Record<string, any>} */
+const _DEFAULT_CONFIGURATION_SUBSET_Filter =
+{
+	ViewIdentifier: 'PRSP-SUBSET-Filters',
+
+	DefaultRenderable: 'PRSP_Renderable_Filters',
+	DefaultDestinationAddress: '#PRSP_Filters_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-SUBSET-Filters-Template',
+			Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filters-Template] -->
+	<section id="PRSP_Filters_Container">
+		<form id="PRSP_Filter_Form" onsubmit="_Pict.views['PRSP-Filters'].handleSearch(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}'); return false;">
+			{~T:PRSP-SUBSET-Filters-Template-Input-Fieldset~}
+			<div id="PRSP_Filter_Instances">
+				{~FIV:Record~}
+			</div>
+			{~T:PRSP-SUBSET-Filters-Template-Button-Fieldset~}
+		</form>
+	</section>
+	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filters-Template] -->
+`
+		},
+		{
+			Hash: 'PRSP-SUBSET-Filters-Template-Input-Fieldset',
+			Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filters-Template-Input-Fieldset] -->
+	<fieldset>
+		<label for="filter">Filter:</label>
+		<input type="text" name="filter">
+	</fieldset>
+	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filters-Template-Input-Fieldset] -->
+`
+		},
+		{
+			Hash: 'PRSP-SUBSET-Filters-Template-Button-Fieldset',
+			Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filters-Template-Button-Fieldset] -->
+	<fieldset>
+		<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-Filters-Template-Button-Fieldset] -->
+`
+		},
+	],
+
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_Filters',
+			TemplateHash: 'PRSP-SUBSET-Filters-Template',
+			DestinationAddress: '#PRSP_Filters_Container',
+			RenderMethod: 'replace'
+		},
+	],
+
+	Manifests: {},
+};
+
+//FIXME: export this from PSF?
+const libPictViewDynamicForm = require('pict-section-form/source/views/Pict-View-DynamicForm.js');
+
+class ViewRecordSetSUBSETFilters extends libPictView
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		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;
+
+		const tmpDynamicInputViewSection = (
+		{
+			"Hash": "PSRSDynamicInputs",
+			"Name": "Custom Dynamic Inputs",
+			"ViewHash": "PSRSFilterProxyView",
+
+			"AutoMarshalDataOnSolve": true,
+			"IncludeInMetatemplateSectionGeneration": false,
+
+			"Manifests":
+			{
+				"Section":
+				{
+					"Scope": "PSRSDynamic",
+					"Sections":
+					[
+						{
+							"Hash": "PSRSDynamicInputs",
+							"Name": "Dynamic Inputs"
+						}
+					],
+					"Descriptors":
+					{
+						"PSRS.DynamicInputPlaceholder":
+						{
+							"Name": "DynamicInputPlaceholder",
+							"Hash": "DynamicInputPlaceholder",
+							"DataType": "String",
+							"Macro":
+							{
+								"HTMLSelector": ""
+							},
+							"PictForm":
+							{
+								"Section": "PSRSDynamicInputs"
+							}
+						}
+					}
+				}
+			}
+		});
+		if (!this.pict.views[tmpDynamicInputViewSection.ViewHash])
+		{
+			const tmpViewConfiguration = Object.assign({}, tmpDynamicInputViewSection);
+			this.pict.addView(tmpViewConfiguration.ViewHash, tmpViewConfiguration, libPictViewDynamicForm);
+			this.pict.views[tmpDynamicInputViewSection.ViewHash].viewMarshalDestination = 'Bundle';
+		}
+		this.chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+		// Use a lookup table to find the index.
+		this.lookup = typeof Uint8Array === 'undefined' ? [] : new Uint8Array(256);
+		for (let i = 0; i < this.chars.length; i++)
+		{
+			this.lookup[this.chars.charCodeAt(i)] = i;
+		}
+	}
+
+	//NOTE: two methods below copied from the pict-section-form metacontroller
+	//TODO: consider subclassing the dynamic view to somehow mark these as filter views so we can only operate on those views
+
+	/**
+	 * Marshals data from the view to the model, usually AppData (or configured data store).
+	 *
+	 * @returns {any} The result of the superclass's onMarshalFromView method.
+	 */
+	onMarshalFromView()
+	{
+		let tmpViewList = Object.keys(this.fable.views);
+		for (let i = 0; i < tmpViewList.length; i++)
+		{
+			if (this.fable.views[tmpViewList[i]].isPictSectionForm)
+			{
+				this.fable.views[tmpViewList[i]].marshalFromView();
+			}
+		}
+		return super.onMarshalFromView();
+	}
+
+	/**
+	 * Marshals the data to the view from the model, usually AppData (or configured data store).
+	 *
+	 * @returns {any} The result of the super.onMarshalToView() method.
+	 */
+	onMarshalToView()
+	{
+		let tmpViewList = Object.keys(this.fable.views);
+		for (let i = 0; i < tmpViewList.length; i++)
+		{
+			if (this.fable.views[tmpViewList[i]].isPictSectionForm)
+			{
+				this.fable.views[tmpViewList[i]].marshalToView();
+			}
+		}
+		return super.onMarshalToView();
+	}
+
+	/**
+	 * @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)
+	{
+		pEvent.preventDefault(); // don't submit the form
+		pEvent.stopPropagation();
+		//FIXME: store this filter string in the bundle so we can re-apply it on re-render
+		const tmpSearchString = this.pict.ContentAssignment.readContent(`input[name="filter"]`);
+		this.performSearch(pRecordSet, pViewContext, tmpSearchString ? String(tmpSearchString) : '');
+	}
+
+	/**
+	 * @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)
+	{
+		const tmpPictRouter = this.pict.providers.PictRouter;
+		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[pRecordSet];
+		let filterExpr = '';
+		if (pFilterString)
+		{
+			/** @type {Array<string>} */
+			const searchFields = tmpProviderConfiguration?.SearchFields ?? [ 'Name' ];
+			filterExpr = searchFields.map((filterField) => `FBVOR~${filterField}~LK~${encodeURIComponent(`%${pFilterString}%`)}`).join('~');
+		}
+		let tmpURLTemplate = tmpProviderConfiguration[`RecordSetFilterURLTemplate-${pViewContext}`] || tmpProviderConfiguration[`RecordSetFilterURLTemplate-Default`];
+		if (!tmpURLTemplate)
+		{
+			if (pViewContext === 'Dashboard' || pViewContext === 'List')
+			{
+				tmpURLTemplate = `/PSRS/${pRecordSet}/${pViewContext}/FilteredTo/{~D:Record.FilterString~}`;
+			}
+		}
+		let tmpURL;
+		if (tmpURLTemplate)
+		{
+			tmpURL = this.pict.parseTemplate(tmpURLTemplate,
+				{
+					RecordSet: pRecordSet,
+					FilterString: filterExpr,
+				});
+		}
+		else
+		{
+			tmpURL = `/PSRS/${pRecordSet}/List/FilteredTo/${filterExpr}`;
+		}
+		if (tmpURL.endsWith('FilteredTo/') || tmpURL.includes('FilteredTo//'))
+		{
+			tmpURL = tmpURL.replace(/\/FilteredTo\//, '');
+		}
+		this.serializeFilterExperience(this.pict.Bundle._ActiveFilterState[pRecordSet]?.FilterClauses).then((pFilterExperienceSerialized) =>
+		{
+			if (pFilterExperienceSerialized)
+			{
+				tmpURL += `/FilterExperience/${encodeURIComponent(pFilterExperienceSerialized)}`;
+			}
+			//FIXME: this doesn't force a re-render if other filters have changes, but aren't in the URL - so we either need to put them in the URL, or force a re-render based on the filter states
+			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"]', '');
+		const tmpFilterExperienceClauses = this.pict.Bundle._ActiveFilterState[pRecordSet]?.FilterClauses;
+		if (Array.isArray(tmpFilterExperienceClauses))
+		{
+			for (const tmpClause of tmpFilterExperienceClauses)
+			{
+				delete tmpClause.Value;
+				delete tmpClause.Values;
+			}
+		}
+		this.performSearch(pRecordSet, pViewContext);
+	}
+
+	/**
+	 * Lifecycle hook that triggers after the view is rendered.
+	 *
+	 * @param {import('pict-view').Renderable} pRenderable - The renderable that was rendered.
+	 * @param {string} pRenderDestinationAddress - The address where the renderable was rendered.
+	 * @param {any} pRecord - The record (data) that was used by the renderable.
+	 * @param {string} pContent - The content that was rendered.
+	 */
+	onAfterRender(pRenderable, pRenderDestinationAddress, pRecord, pContent)
+	{
+		//FIXME: since this is rendering to the DOM indirectly, can't marshal right after render; need to fix this better, if this even works
+		setTimeout(() =>
+		{
+			this.onMarshalToView();
+		}, 1);
+		return super.onAfterRender(pRenderable, pRenderDestinationAddress, pRecord, pContent);
+	}
+
+	/**
+	 * Lifecycle hook that triggers after the view is rendered (async flow).
+	 *
+	 * @param {import('pict-view').ErrorCallback} fCallback - The callback to call when the async operation is complete.
+	 */
+	onAfterRenderAsync(fCallback)
+	{
+		return super.onAfterRenderAsync((pError) =>
+		{
+			//FIXME: since this is rendering to the DOM indirectly, can't marshal right after render; need to fix this better, if this even works
+			setTimeout(() =>
+			{
+				this.onMarshalToView();
+			}, 1);
+			fCallback(pError);
+		});
+	}
+
+	async serializeFilterExperience(pExperience)
+	{
+		if (!pExperience || typeof pExperience !== 'object')
+		{
+			return '';
+		}
+		return this.encode(await this.compress(JSON.stringify(pExperience)));
+	}
+
+	/**
+	 * @param {string} pExperience - The serialized filter experience as a string.
+	 *
+	 * @return {Promise<Record<string, any>>} - The serialized filter experience as a string.
+	 */
+	async deserializeFilterExperience(pExperience)
+	{
+		if (!pExperience || typeof pExperience !== 'string')
+		{
+			//TODO: if the default filters expand, how we wanna handle that?
+			return null;
+		}
+		return JSON.parse(await this.decompress(new Uint8Array(this.decode(pExperience))));
+	}
+
+	/**
+	 * @param {string} string - The string to compress.
+	 * @param {CompressionFormat} [encoding='gzip'] - The encoding to use for compression, defaults to 'gzip'.
+	 *
+	 * @return {Promise<ArrayBuffer>} - The compressed byte array.
+	 */
+	async compress(string, encoding = 'gzip')
+	{
+		const byteArray = new TextEncoder().encode(string);
+		const cs = new CompressionStream(encoding);
+		const writer = cs.writable.getWriter();
+		writer.write(byteArray);
+		writer.close();
+		return new Response(cs.readable).arrayBuffer();
+	}
+
+	/**
+	 * @param {Uint8Array} byteArray - The byte array to decompress.
+	 * @param {CompressionFormat} [encoding='gzip'] - The encoding to use for compression, defaults to 'gzip'.
+	 */
+	async decompress(byteArray, encoding = 'gzip')
+	{
+		const cs = new DecompressionStream(encoding);
+		const writer = cs.writable.getWriter();
+		writer.write(byteArray);
+		writer.close();
+		return new Response(cs.readable).arrayBuffer().then((arrayBuffer) =>
+		{
+			return new TextDecoder().decode(arrayBuffer);
+		});
+	}
+
+	/**
+	 * @param {ArrayBuffer} arraybuffer - The ArrayBuffer to encode to Base64.
+	 *
+	 * @return {string} - The Base64 encoded string.
+	 */
+	encode(arraybuffer)
+	{
+		let bytes = new Uint8Array(arraybuffer),
+			i,
+			len = bytes.length,
+			base64 = '';
+
+		for (i = 0; i < len; i += 3)
+		{
+			base64 += this.chars[bytes[i] >> 2];
+			base64 += this.chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)];
+			base64 += this.chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)];
+			base64 += this.chars[bytes[i + 2] & 63];
+		}
+
+		if (len % 3 === 2)
+		{
+			base64 = base64.substring(0, base64.length - 1) + '=';
+		}
+		else if (len % 3 === 1)
+		{
+			base64 = base64.substring(0, base64.length - 2) + '==';
+		}
+
+		return base64;
+	};
+
+	/**
+	 * @param {string} base64 - The Base64 encoded string to decode to an ArrayBuffer.
+	 *
+	 * @return {ArrayBuffer} - The decoded ArrayBuffer.
+	 */
+	decode(base64)
+	{
+		let bufferLength = base64.length * 0.75,
+			len = base64.length,
+			i,
+			p = 0,
+			encoded1,
+			encoded2,
+			encoded3,
+			encoded4;
+
+		if (base64[base64.length - 1] === '=')
+		{
+			bufferLength--;
+			if (base64[base64.length - 2] === '=')
+			{
+				bufferLength--;
+			}
+		}
+
+		const arraybuffer = new ArrayBuffer(bufferLength),
+			bytes = new Uint8Array(arraybuffer);
+
+		for (i = 0; i < len; i += 4)
+		{
+			encoded1 = this.lookup[base64.charCodeAt(i)];
+			encoded2 = this.lookup[base64.charCodeAt(i + 1)];
+			encoded3 = this.lookup[base64.charCodeAt(i + 2)];
+			encoded4 = this.lookup[base64.charCodeAt(i + 3)];
+
+			bytes[p++] = (encoded1 << 2) | (encoded2 >> 4);
+			bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);
+			bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);
+		}
+
+		return arraybuffer;
+	};
+}
+
+module.exports = ViewRecordSetSUBSETFilters;
+
+module.exports.default_configuration = _DEFAULT_CONFIGURATION_SUBSET_Filter;
+

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

@@ -2,7 +2,7 @@ const libPictRecordSetRecordView = require('../RecordSet-RecordBaseView.js');
 
 const viewHeaderDashboard = require('./RecordSet-Dashboard-HeaderDashboard.js');
 const viewTitle = require('./RecordSet-Dashboard-Title.js');
-const viewFilters = require('../RecordSet-Filter.js');
+const viewFilters = require('../RecordSet-Filters.js');
 const viewPaginationTop = require('./RecordSet-Dashboard-PaginationTop.js');
 const viewRecordList = require('./RecordSet-Dashboard-RecordList.js');
 const viewRecordListHeader = require('./RecordSet-Dashboard-RecordListHeader.js');
@@ -119,15 +119,16 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		const tmpProviderHash = `RSP-Provider-${pRoutePayload.data.RecordSet}`;
 
 		const tmpFilterString = pRoutePayload.data.FilterString || '';
+		const tmpSerializedFilterExperience = pRoutePayload.data.FilterExperience || '';
 
 		const tmpOffset = pRoutePayload.data.Offset ? pRoutePayload.data.Offset : 0;
 		const tmpPageSize = pRoutePayload.data.PageSize ? pRoutePayload.data.PageSize : 100;
 
 		if (pRoutePayload.data.DashboardHash)
 		{
-			return this.renderSpecificDashboard(pRoutePayload.data.DashboardHash, tmpProviderConfiguration, tmpProviderHash, tmpFilterString, tmpOffset, tmpPageSize);
+			return this.renderSpecificDashboard(pRoutePayload.data.DashboardHash, tmpProviderConfiguration, tmpProviderHash, tmpFilterString, tmpSerializedFilterExperience, tmpOffset, tmpPageSize);
 		}
-		return this.renderDashboard(tmpProviderConfiguration, tmpProviderHash, tmpFilterString, tmpOffset, tmpPageSize);
+		return this.renderDashboard(tmpProviderConfiguration, tmpProviderHash, tmpFilterString, tmpSerializedFilterExperience, tmpOffset, tmpPageSize);
 	}
 
 	/**
@@ -135,14 +136,22 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 	 */
 	addRoutes(pPictRouter)
 	{
+		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/FilteredTo/:FilterString/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/FilteredTo/:FilterString/:Offset/:PageSize/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/FilteredTo/:FilterString/:Offset/:PageSize', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/FilteredTo/:FilterString', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/:Offset/:PageSize/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/:Offset/:PageSize', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard/:Offset', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/Dashboard', this.handleRecordSetDashboardRoute.bind(this));
 
+		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/FilteredTo/:FilterString/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/FilteredTo/:FilterString/:Offset/:PageSize/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/FilteredTo/:FilterString/:Offset/:PageSize', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/FilteredTo/:FilterString', this.handleRecordSetDashboardRoute.bind(this));
+		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/:Offset/:PageSize/FilterExperience/:FilterExperience', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/:Offset/:PageSize', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash/:Offset', this.handleRecordSetDashboardRoute.bind(this));
 		pPictRouter.router.on('/PSRS/:RecordSet/SpecificDashboard/:DashboardHash', this.handleRecordSetDashboardRoute.bind(this));
@@ -201,12 +210,13 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 	 * @param {Record<string, any>} pRecordSetConfiguration
 	 * @param {string} pProviderHash
 	 * @param {string} pFilterString
+	 * @param {string} pSerializedFilterExperience
 	 * @param {number} pOffset
 	 * @param {number} pPageSize
 	 *
 	 * @return {Promise<void>}
 	 */
-	async renderSpecificDashboard(pDashboardHash, pRecordSetConfiguration, pProviderHash, pFilterString, pOffset, pPageSize)
+	async renderSpecificDashboard(pDashboardHash, pRecordSetConfiguration, pProviderHash, pFilterString, pSerializedFilterExperience, pOffset, pPageSize)
 	{
 		if (!pRecordSetConfiguration)
 		{
@@ -231,6 +241,17 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			tmpTitle = this.pict.parseTemplate(tmpManifestDefinition.TitleTemplate, pRecordSetConfiguration);
 		}
 
+		const tmpEncodedFilterExperience = pSerializedFilterExperience && encodeURIComponent(pSerializedFilterExperience);
+		if (tmpEncodedFilterExperience)
+		{
+			// shove filter xp into the active filters for this recordset
+			const tmpExperienceFromURL = await this.pict.views['PRSP-Filters'].deserializeFilterExperience(pSerializedFilterExperience);
+			if (tmpExperienceFromURL)
+			{
+				this.pict.manifest.setValueByHash(this.pict.Bundle, `_ActiveFilterState[${pRecordSetConfiguration.RecordSet}].FilterClauses`, tmpExperienceFromURL);
+			}
+		}
+
 		let tmpRecordDashboardData =
 		{
 			"Title": tmpTitle,
@@ -262,7 +283,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		tmpRecordDashboardData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
-		const tmpOffset = typeof(tmpRecordDashboardData.Offset) === 'number' ? tmpRecordDashboardData.Offset : parseInt(tmpRecordDashboardData.Offset);
+		const tmpOffset = Number(tmpRecordDashboardData.Offset);
 		tmpRecordDashboardData.PageEnd = tmpOffset + tmpRecordDashboardData.Records.Records.length;
 
 		// Compute the number of pages total
@@ -296,6 +317,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/SpecificDashboard/${pDashboardHash}/${i * tmpRecordDashboardData.PageSize}/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinks[tmpRecordDashboardData.PageLinks.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 
 		//FIXME: short-term workaround to not blow up the tempplate rendering with way too many links
@@ -322,6 +347,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/SpecificDashboard/${pDashboardHash}/0/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinksLimited[tmpRecordDashboardData.PageLinksLimited.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 		if (linkRangeEnd < tmpRecordDashboardData.PageLinks.length)
 		{
@@ -343,6 +372,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/SpecificDashboard/${pDashboardHash}/${(tmpRecordDashboardData.PageCount - 1) * tmpRecordDashboardData.PageSize}/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinksLimited[tmpRecordDashboardData.PageLinksLimited.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 
 		tmpRecordDashboardData.PageLinkBookmarks.Previous = tmpRecordDashboardData.PageLinkBookmarks.Current - 1;
@@ -458,12 +491,13 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 	 * @param {Record<string, any>} pRecordSetConfiguration
 	 * @param {string} pProviderHash
 	 * @param {string} pFilterString
+	 * @param {string} pSerializedFilterExperience
 	 * @param {number} pOffset
 	 * @param {number} pPageSize
 	 *
 	 * @return {Promise<void>}
 	 */
-	async renderDashboard(pRecordSetConfiguration, pProviderHash, pFilterString, pOffset, pPageSize)
+	async renderDashboard(pRecordSetConfiguration, pProviderHash, pFilterString, pSerializedFilterExperience, pOffset, pPageSize)
 	{
 		if (!pRecordSetConfiguration)
 		{
@@ -486,7 +520,18 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			}
 			else
 			{
-				return this.renderSpecificDashboard(tmpManifestHash, pRecordSetConfiguration, pProviderHash, pFilterString, pOffset, pPageSize);
+				return this.renderSpecificDashboard(tmpManifestHash, pRecordSetConfiguration, pProviderHash, pFilterString, pSerializedFilterExperience, pOffset, pPageSize);
+			}
+		}
+
+		const tmpEncodedFilterExperience = pSerializedFilterExperience && encodeURIComponent(pSerializedFilterExperience);
+		if (tmpEncodedFilterExperience)
+		{
+			// shove filter xp into the active filters for this recordset
+			const tmpExperienceFromURL = await this.pict.views['PRSP-Filters'].deserializeFilterExperience(pSerializedFilterExperience);
+			if (tmpExperienceFromURL)
+			{
+				this.pict.manifest.setValueByHash(this.pict.Bundle, `_ActiveFilterState[${pRecordSetConfiguration.RecordSet}].FilterClauses`, tmpExperienceFromURL);
 			}
 		}
 
@@ -525,7 +570,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		tmpRecordDashboardData.GUIDAddress = `GUID${this.pict.providers[pProviderHash].options.Entity}`;
 
 		// Get the "page end record number" for the current page (e.g. for messaging like Record 700 to 800 of 75,000)
-		const tmpOffset = typeof(tmpRecordDashboardData.Offset) === 'number' ? tmpRecordDashboardData.Offset : parseInt(tmpRecordDashboardData.Offset);
+		const tmpOffset = Number(tmpRecordDashboardData.Offset);
 		tmpRecordDashboardData.PageEnd = tmpOffset + tmpRecordDashboardData.Records.Records.length;
 
 		// Compute the number of pages total
@@ -559,6 +604,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/Dashboard/${i * tmpRecordDashboardData.PageSize}/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinks[tmpRecordDashboardData.PageLinks.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 
 		//FIXME: short-term workaround to not blow up the tempplate rendering with way too many links
@@ -585,6 +634,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/Dashboard/${0}/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinksLimited[tmpRecordDashboardData.PageLinksLimited.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 		if (linkRangeEnd < tmpRecordDashboardData.PageLinks.length)
 		{
@@ -606,6 +659,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 						URL: `#/PSRS/${tmpRecordDashboardData.RecordSet}/Dashboard/${(tmpRecordDashboardData.PageCount - 1) * tmpRecordDashboardData.PageSize}/${tmpRecordDashboardData.PageSize}`
 					});
 			}
+			if (tmpEncodedFilterExperience)
+			{
+				tmpRecordDashboardData.PageLinksLimited[tmpRecordDashboardData.PageLinksLimited.length - 1].URL += `/FilterExperience/${tmpEncodedFilterExperience}`;
+			}
 		}
 
 		tmpRecordDashboardData.PageLinkBookmarks.Previous = tmpRecordDashboardData.PageLinkBookmarks.Current - 1;

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

@@ -0,0 +1,38 @@
+
+const ViewRecordSetSUBSETFilterBase = require('./RecordSet-Filter-Base');
+
+class ViewRecordSetSUBSETFilterBaseRange extends ViewRecordSetSUBSETFilterBase
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+	}
+
+	/**
+	 * @param {Record<string, any>} pRecord
+	 */
+	prepareRecord(pRecord)
+	{
+		super.prepareRecord(pRecord);
+
+		pRecord.StartClauseAddress = pRecord.ClauseValuesAddress + '.Start';
+		pRecord.EndClauseAddress = pRecord.ClauseValuesAddress + '.End';
+
+		pRecord.StartClauseDescriptor =
+		{
+			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',
+		};
+
+		pRecord.EndClauseDescriptor =
+		{
+			Address: pRecord.EndClauseAddress,
+			Name: pRecord.MaximumLabel || `Maximum ${pRecord.ExternalFilterByColumn || pRecord.ExternalFilterByColumns?.[0] || pRecord.FilterByColumn || pRecord.FilterByColumns?.[0] || 'Value'}`,
+			DataType: 'String',
+		};
+	}
+}
+
+module.exports = ViewRecordSetSUBSETFilterBaseRange;