pict-section-recordset 1.0.57 → 1.0.59

package/source/views/RecordSet-Filters.js

@@ -38,6 +38,7 @@ const _DEFAULT_CONFIGURATION_SUBSET_Filter =
 		</div>
 		{~T:PRSP-SUBSET-Filters-Template-Button-Fieldset~}
 		{~T:PRSP-SUBSET-Filters-Template-AddFilter-Fieldset~}
+		{~T:PRSP-SUBSET-Filters-Template-ManageFilters-Fieldset~}
 	</form>
 	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filters-Template] -->
 `
@@ -58,10 +59,22 @@ const _DEFAULT_CONFIGURATION_SUBSET_Filter =
 			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="button" id="PRSP_Filter_Button_Clear" title="Clear all filters to a blank state" onclick="_Pict.views['PRSP-Filters'].handleClear(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}')">Clear</button>
+		<button type="button" id="PRSP_Filter_Button_Reset" title="Reset all filters to the last saved/defaulted state" 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] -->
+`
+		},
+		{
+			Hash: 'PRSP-SUBSET-Filters-Template-ManageFilters-Fieldset',
+			Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filters-Template-ManageFilters-Fieldset] -->
+	<fieldset>
+		<button type="button" id="PRSP_Filter_Button_Manage" title="Manage saved filter experiences" onclick="_Pict.views['PRSP-Filters'].handleManage(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}')">Manage Filter Experience</button>
+		<div id="FilterPersistenceView-Container"></div>
+	</fieldset>
+	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filters-Template-ManageFilters-Fieldset] -->
 `
 		},
 		{
@@ -69,7 +82,7 @@ const _DEFAULT_CONFIGURATION_SUBSET_Filter =
 			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-SUBSET-Filters-Template-AddFilter-Fieldset] -->
 	<fieldset>
-		<button type="button" id="PRSP_Filter_Button_Add" onclick="_Pict.views['PRSP-Filters'].selectFilterToAdd(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}')">+</button>
+		<button type="button" id="PRSP_Filter_Button_Add" title="Add a new filter clause" onclick="_Pict.views['PRSP-Filters'].selectFilterToAdd(event, '{~D:Record.RecordSet~}', '{~D:Record.ViewContext~}')">+</button>
 		<div id="PRSP-SUBSET-Filters-Template-AddFilter-Dropdown"></div>
 	</fieldset>
 	<!-- DefaultPackage end view template:	[PRSP-SUBSET-Filters-Template-AddFilter-Fieldset] -->
@@ -220,6 +233,43 @@ class ViewRecordSetSUBSETFilters extends libPictView
 		{
 			this.lookup[this.chars.charCodeAt(i)] = i;
 		}
+
+		this.addFilterCallback = null;
+		this.removeFilterCallback = null;
+	}
+
+	/**
+	 * Sets a callback function to be executed after a filter is added.
+	 * @param {function} pCallback - The callback function to be executed after a filter is added.
+	 */
+	setAddFilterCallback(pCallback)
+	{
+		this.addFilterCallback = pCallback;
+	}
+
+	/**
+	 * Sets a callback function to be executed after a filter is removed.
+	 * @param {function} pCallback - The callback function to be executed after a filter is removed.
+	 */
+	setRemoveFilterCallback(pCallback)
+	{
+		this.removeFilterCallback = pCallback;
+	}
+
+	/**
+	 * Removes the callback function for adding a filter.
+	 */
+	removeAddFilterCallback()
+	{
+		this.addFilterCallback = null;
+	}
+
+	/**
+	 * Removes the callback function for removing a filter.
+	 */
+	removeRemoveFilterCallback()
+	{
+		this.removeFilterCallback = null;
 	}
 
 	/**
@@ -246,7 +296,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 
 	/**
 	 * 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()
@@ -264,7 +313,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 
 	/**
 	 * 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()
@@ -344,33 +392,66 @@ class ViewRecordSetSUBSETFilters extends libPictView
 			}
 			//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);
+			// always store the last used filter experience search, even if they don't save it
+			this.pict.providers.FilterDataProvider.setLastUsedFilterExperience(null, pRecordSet, pViewContext);
 		});
+		// new search means this can't be out of date anymore
+		this.pict.providers.FilterDataProvider.filterExperienceModifiedFromURLHash = false;
 	}
 
 	/**
+	 * Clear all filter clauses for the given record set and view context.
 	 * @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)
+	handleClear(pEvent, pRecordSet, pViewContext)
 	{
-		pEvent.preventDefault();
+		if (pEvent) pEvent.preventDefault();
 		this.pict.ContentAssignment.assignContent('input[name="filter"]', '');
-		const tmpFilterExperienceClauses = this.pict.Bundle._ActiveFilterState[pRecordSet]?.FilterClauses;
-		if (Array.isArray(tmpFilterExperienceClauses))
+		this.pict.Bundle._ActiveFilterState[pRecordSet].FilterClauses = [];
+		this.pict.providers.FilterDataProvider.removeDefaultFilterExperience(pRecordSet, pViewContext);
+		this.performSearch(pRecordSet, pViewContext, '');
+	}
+
+	// NOTE: Reset means to default state, Clear means to no filters at all
+	/**
+	 * Reset the filters to default state or fallback to to clear everything if no default exist for the given record set and view context.
+	 * @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)
+	{
+		if (pEvent) pEvent.preventDefault();
+		this.pict.providers.FilterDataProvider.removeLastUsedFilterExperience(pRecordSet, pViewContext);
+		this.pict.log.info(`Clearing filters for record set: ${pRecordSet} in view context: ${pViewContext}`);
+		// Apply default filter experience if it exists, otherwise just clear
+		const tmpDefaultFilterExperience = this.pict.providers.FilterDataProvider.getDefaultFilterExperience(pRecordSet, pViewContext);
+		if (tmpDefaultFilterExperience)
+		{
+			this.pict.log.info(`Applying default filter experience for record set: ${pRecordSet} in view context: ${pViewContext}`);
+			this.pict.providers.FilterDataProvider.applyExpectedFilterExperience(pRecordSet, pViewContext, tmpDefaultFilterExperience.FilterExperienceHash, false);
+			this.pict.providers.FilterDataProvider.filterExperienceModifiedFromURLHash = false;
+		}
+		else 
 		{
-			for (const tmpClause of tmpFilterExperienceClauses)
-			{
-				delete tmpClause.Value;
-				delete tmpClause.Values;
-				delete tmpClause.SearchInputValue;
-				delete tmpClause.SelectedValues;
-				delete tmpClause.SearchResults;
-				delete tmpClause.SearchResultsOffset;
-				delete tmpClause.LoadMoreEnabled;
-			}
+			this.handleClear(pEvent, pRecordSet, pViewContext);
 		}
-		this.performSearch(pRecordSet, pViewContext);
+	}
+
+	/**
+	 * @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)
+	 * @returns {boolean} - Always returns false to prevent default action
+	*/
+	handleManage(pEvent, pRecordSet, pViewContext)
+	{
+		if (pEvent) pEvent.preventDefault();
+		this.pict.log.info(`Managing filters for record set: ${pRecordSet} in view context: ${pViewContext}`);
+		this.pict.views.FilterPersistenceView.openFilterPersistenceUI(pRecordSet, pViewContext);
+		return false;
 	}
 
 	/**
@@ -380,30 +461,50 @@ class ViewRecordSetSUBSETFilters extends libPictView
 	 */
 	selectFilterToAdd(pEvent, pRecordSet, pViewContext)
 	{
-		pEvent.preventDefault();
+		if (pEvent) pEvent.preventDefault();
 		//const tmpRecordsetProvider = this.pict.providers['RSP-Provider-' + pRecordSet];
 		//this.pict.log.info(`Selecting filter to add for record set: ${pRecordSet} in view context: ${pViewContext}`, tmpRecordsetProvider.getFilterSchema())
 		this.renderWithScope(this.pict.providers[`RSP-Provider-${pRecordSet}`], 'PRSP-SUBSET-Filters-Template-AddFilter-Dropdown', undefined, { RecordSet: pRecordSet, ViewContext: pViewContext });
 	}
 
+	/**
+	 * @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)
+	 * @param {string} pFilterKey - The key of the filter to add
+	 * @param {string} pClauseKey - The key of the clause to add
+	 */
 	addFilter(pEvent, pRecordSet, pViewContext, pFilterKey, pClauseKey)
 	{
-		pEvent?.preventDefault();
+		if (pEvent) pEvent.preventDefault();
 		this.pict.log.info(`Adding filter: ${pFilterKey} with clause: ${pClauseKey} to record set: ${pRecordSet} in view context: ${pViewContext}`);
 		this.pict.providers[`RSP-Provider-${pRecordSet}`].addFilterClause(pFilterKey, pClauseKey);
 		//FIXME: we need the record from the original render here but no longer have it...
 		this.render(undefined, undefined, { RecordSet: pRecordSet, ViewContext: pViewContext });
+		if (this.addFilterCallback) this.addFilterCallback();
 	}
 
+	/**
+	 * @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)
+	 * @param {string} pSpecificFilterKey - The key of the specific filter to remove
+	 */
 	removeFilter(pEvent, pRecordSet, pViewContext, pSpecificFilterKey)
 	{
-		pEvent?.preventDefault();
+		if (pEvent) pEvent.preventDefault();
 		this.pict.log.info(`Removing filter: ${pSpecificFilterKey} from record set: ${pRecordSet} in view context: ${pViewContext}`);
 		this.pict.providers[`RSP-Provider-${pRecordSet}`].removeFilterClause(pSpecificFilterKey);
 		//FIXME: we need the record from the original render here but no longer have it...
 		this.render(undefined, undefined, { RecordSet: pRecordSet, ViewContext: pViewContext });
+		if (this.removeFilterCallback) this.removeFilterCallback();
 	}
 
+	/**
+	 * Gets the filter schema for the given record set.
+	 * @param {string} pRecordSet - The record set to get the filter schema for
+	 * @return {Array<any>} - The filter schema for the given record set
+	 */
 	getFilterSchema(pRecordSet)
 	{
 		const tmpRecordsetProvider = this.pict.providers['RSP-Provider-' + pRecordSet];
@@ -412,7 +513,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 
 	/**
 	 * Lifecycle hook that triggers after the view is rendered.
-	 *
 	 * @param {import('pict-view').Renderable} pRenderable - The renderable that was rendered.
 	 */
 	onAfterRender(pRenderable)
@@ -426,7 +526,7 @@ class ViewRecordSetSUBSETFilters extends libPictView
 		const tmpSelect = document.getElementById('PRSP-SUBSET-Filters-Template-AddFilter-Dropdown-Select');
 		if (tmpSelect)
 		{
-			const tmpActiveOption = document.getElementById('PRSP-SUBSET-Filters-Template-AddFilter-Dropdown-Select')?.querySelector('option:checked')
+			const tmpActiveOption = document.getElementById('PRSP-SUBSET-Filters-Template-AddFilter-Dropdown-Select')?.querySelector('option:checked');
 			const tmpRecordSet = tmpActiveOption?.getAttribute('data-i-recordset');
 			const tmpFilterKey = tmpActiveOption?.getAttribute('data-i-filter-key');
 			const tmpViewContext = tmpSelect?.getAttribute('data-i-view-context');
@@ -447,9 +547,24 @@ class ViewRecordSetSUBSETFilters extends libPictView
 			}
 		}
 		this.onMarshalToView();
+
+		// NOTE: This is where we ensure the filter experience is applied after a render.
+		const tmpRouteUrl = this.pict.providers.PictRouter?.router?.current[0]?.url || this.pict.providers.PictRouter?.router?.current[0]?.hashString;
+		const tmpRecordSet = tmpRouteUrl?.split?.('PSRS/')?.[1]?.split?.('/')?.[0];
+		const tmpViewContext = tmpRouteUrl?.split?.('PSRS/')?.[1]?.split?.('/')?.[1];
+		if (tmpRecordSet && tmpViewContext)
+		{
+			this.pict.providers.FilterDataProvider.applyExpectedFilterExperience(tmpRecordSet, tmpViewContext);
+		}
+
 		return res;
 	}
 
+	/**
+	 * Encodes the filter experience to a string.
+	 * @param {Record<string, any>} pExperience - The filter experience to serialize.
+	 * @return {Promise<string>} - The serialized filter experience as a string.
+	 */
 	async serializeFilterExperience(pExperience)
 	{
 		if (!pExperience || typeof pExperience !== 'object')
@@ -468,8 +583,8 @@ class ViewRecordSetSUBSETFilters extends libPictView
 	}
 
 	/**
+	 * Decodes the filter experience from a string.
 	 * @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)
@@ -485,7 +600,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 	/**
 	 * @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')
@@ -506,6 +620,7 @@ class ViewRecordSetSUBSETFilters extends libPictView
 	{
 		const cs = new DecompressionStream(encoding);
 		const writer = cs.writable.getWriter();
+		// @ts-ignore
 		writer.write(byteArray);
 		writer.close();
 		return new Response(cs.readable).arrayBuffer().then((arrayBuffer) =>
@@ -516,7 +631,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 
 	/**
 	 * @param {ArrayBuffer} arraybuffer - The ArrayBuffer to encode to Base64.
-	 *
 	 * @return {string} - The Base64 encoded string.
 	 */
 	encode(arraybuffer)
@@ -548,7 +662,6 @@ class ViewRecordSetSUBSETFilters extends libPictView
 
 	/**
 	 * @param {string} base64 - The Base64 encoded string to decode to an ArrayBuffer.
-	 *
 	 * @return {ArrayBuffer} - The decoded ArrayBuffer.
 	 */
 	decode(base64)

package/test/PictSectionRecordSet-Basic_tests.js

@@ -1,14 +1,13 @@
 /*
 	Unit tests for PictSectionRecordSet Basic
-	
+
 */
 
-// This is temporary, but enables unit tests
 const libBrowserEnv = require('browser-env');
-libBrowserEnv();
 
 const libPictView = require('pict-view');
 
+const sinon = require('sinon');
 const Chai = require('chai');
 const Expect = Chai.expect;
 
@@ -54,7 +53,29 @@ suite
 	'PictSectionRecordSet Basic',
 	() =>
 	{
-		setup(() => { });
+		let originalLocalStorage;
+
+		setup(() =>
+		{
+			libBrowserEnv({
+				url: "http://localhost/",
+			});
+			originalLocalStorage = localStorage;
+			// @ts-ignore
+			localStorage = {
+				getItem: sinon.stub(),
+				setItem: sinon.stub(),
+				removeItem: sinon.stub(),
+			};
+		});
+
+		teardown(() =>
+		{
+			sinon.restore();
+			// @ts-ignore
+			delete localStorage;
+			localStorage = originalLocalStorage;
+		});
 
 		suite
 			(
@@ -67,10 +88,13 @@ suite
 							{
 								let _Pict = new libPict();
 								_Pict.LogNoisiness = 1;
-								let _PictEnvironment = new libPict.EnvironmentObject(_Pict);
+								//let _PictEnvironment = new libPict.EnvironmentObject(_Pict);
+								localStorage = originalLocalStorage;
 
+								// Define view configuration
 								let _Application = new DoNothingApplication(_Pict, {});
 
+
 								Expect(_Application).to.be.an('object', 'Application should be an object.');
 								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
 
@@ -78,20 +102,19 @@ suite
 
 								_Application.initialize();
 
+								let _PictSectionRecordSet = _Pict.addView(tmpViewHash, tmpViewConfiguration, libPictSectionRecordSet);
 
-								// let _PictSectionRecordSet = _Pict.addView(tmpViewHash, tmpViewConfiguration, libPictSectionRecordSet);
-
-								// Expect(_PictSectionRecordSet).to.be.an('object');
+								Expect(_PictSectionRecordSet).to.be.an('object');
 
-								// // Test package anthropology
-								// Expect(_PictSectionRecordSet._PackageFableServiceProvider).to.be.an('object', 'Fable should have a _PackageFableServiceProvider object.');
-								// Expect(_PictSectionRecordSet._PackageFableServiceProvider.name).equal('fable-serviceproviderbase', 'Fable _PackageFableServiceProvider.package.name should be set.');
-								// Expect(_PictSectionRecordSet._PackagePictView).to.be.an('object', 'Should have a _PackagePictView object.');
-								// Expect(_PictSectionRecordSet._PackagePictView.name).to.equal('pict-view', '_PackagePictView.package.name should be set.');
-								// Expect(_PictSectionRecordSet._Package).to.be.an('object', 'Should have a _Package object.');
-								// Expect(_PictSectionRecordSet._Package.name).to.equal('pict-section-recordset', '_Package.package.name should be set.');
+								// Test package anthropology
+								Expect(_PictSectionRecordSet._PackageFableServiceProvider).to.be.an('object', 'Fable should have a _PackageFableServiceProvider object.');
+								Expect(_PictSectionRecordSet._PackageFableServiceProvider.name).equal('fable-serviceproviderbase', 'Fable _PackageFableServiceProvider.package.name should be set.');
+								Expect(_PictSectionRecordSet._PackagePictView).to.be.an('object', 'Should have a _PackagePictView object.');
+								Expect(_PictSectionRecordSet._PackagePictView.name).to.equal('pict-view', '_PackagePictView.package.name should be set.');
+								Expect(_PictSectionRecordSet._Package).to.be.an('object', 'Should have a _Package object.');
+								Expect(_PictSectionRecordSet._Package.name).to.equal('pict-section-recordset', '_Package.package.name should be set.');
 
-								// return fDone();
+								return fDone();
 							}
 						);
 					});

package/test/PictSectionRecordSet-Filter-Data-Provider_tests.js

@@ -0,0 +1,263 @@
+/*
+	Unit tests for PictSectionRecordSet Basic
+
+*/
+
+const libBrowserEnv = require('browser-env');
+
+const libPictView = require('pict-view');
+
+const sinon = require('sinon');
+const Chai = require('chai');
+const Expect = Chai.expect;
+
+const libPict = require('pict');
+
+const libPictSectionRecordSet = require('../source/Pict-Section-RecordSet.js');
+const libPictSectionRecordSetFilterDataProvider = require('../source/providers/Filter-Data-Provider.js');
+
+class DoNothingApplication extends libPictSectionRecordSet.PictRecordSetApplication
+{
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		super(pFable, pOptions, pServiceHash);
+
+		this.pict.addView('DoNothingView', {}, DoNothingView);
+		this.pict.addProvider('FilterDataProvider', libPictSectionRecordSetFilterDataProvider);
+	}
+
+	/**
+	 * @param {function} fDone - Callback that finishes the test
+	 */
+	set testDone(fDone)
+	{
+		this._testDone = fDone;
+	}
+
+	onAfterInitialize()
+	{
+		this.solve();
+		this._testDone();
+		return super.onAfterInitialize();
+	}
+}
+
+class DoNothingView extends libPictView
+{
+	constructor(pPict, pOptions)
+	{
+		super(pPict, pOptions);
+	}
+}
+
+suite
+(
+	'PictSectionRecordSet Filter Data Provider Basic Tests',
+	() =>
+	{
+		let originalLocalStorage;
+		let _Pict = new libPict();
+		_Pict.LogNoisiness = 1;
+		//let _PictEnvironment = new libPict.EnvironmentObject(_Pict);
+		localStorage = originalLocalStorage;
+
+		setup(() =>
+		{
+			libBrowserEnv({
+				url: "http://localhost/",
+			});
+			originalLocalStorage = localStorage;
+			// @ts-ignore
+			localStorage = {
+				getItem: sinon.stub(),
+				setItem: sinon.stub(),
+				removeItem: sinon.stub(),
+			};
+		});
+
+		teardown(() =>
+		{
+			sinon.restore();
+			// @ts-ignore
+			delete localStorage;
+			localStorage = originalLocalStorage;
+		});
+
+		suite
+			(
+				'Filter Data Provider Basic Tests',
+				() =>
+				{
+					test(
+							'Basic Initialization',
+							(fDone) =>
+							{
+								// Define view configuration
+								let _Application = new DoNothingApplication(_Pict, {});
+								let _DataFilterProvider = _Application.pict.providers.FilterDataProvider;
+								
+								_DataFilterProvider.storageProvider = localStorage
+								let _StorageProvider = _DataFilterProvider.storageProvider;
+
+								Expect(_DataFilterProvider).to.be.an('object', 'Filter Data Provider should be an object.');
+								Expect(_StorageProvider).to.be.an.instanceof(originalLocalStorage.constructor, 'Storage Provider should be an instance of localStorage.');
+
+								Expect(_Application).to.be.an('object', 'Application should be an object.');
+								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
+
+								_Application.testDone = fDone;
+
+								_Application.initialize();
+								
+							}
+						);
+					});
+
+		suite
+			(
+				'Filter Data Provider Apply Expected Filter Experience Tests',
+				() =>
+				{
+					test(
+							'Apply Expected Filter Experience with no parameters',
+							(fDone) =>
+							{
+								// Define view configuration
+								let _Application = new DoNothingApplication(_Pict, {});
+								let _DataFilterProvider = _Application.pict.providers.FilterDataProvider;
+								
+								_DataFilterProvider.storageProvider = localStorage
+								let _StorageProvider = _DataFilterProvider.storageProvider;
+
+								Expect(_DataFilterProvider).to.be.an('object', 'Filter Data Provider should be an object.');
+								Expect(_StorageProvider).to.be.an.instanceof(originalLocalStorage.constructor, 'Storage Provider should be an instance of localStorage.');
+
+								Expect(_Application).to.be.an('object', 'Application should be an object.');
+								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
+
+								_Application.testDone = fDone;
+
+								_Application.initialize();
+
+								// Call applyExpectedFilterExperience with no parameters
+								let result = _DataFilterProvider.applyExpectedFilterExperience();
+
+								// TODO: Need better way to test this... Last used and default filter experiences are not accounted for in this test context.
+								// For now, just check that the method runs and returns true (should be false if nothing is set in storage).
+								Expect(result).to.be.true;
+
+							}
+						);
+
+					test(
+							'Apply Expected Filter Experience with parameters',
+							(fDone) =>
+							{
+								// Define view configuration
+								let _Application = new DoNothingApplication(_Pict, {});
+								let _DataFilterProvider = _Application.pict.providers.FilterDataProvider;
+								
+								_DataFilterProvider.storageProvider = localStorage
+								let _StorageProvider = _DataFilterProvider.storageProvider;
+
+								Expect(_DataFilterProvider).to.be.an('object', 'Filter Data Provider should be an object.');
+								Expect(_StorageProvider).to.be.an.instanceof(originalLocalStorage.constructor, 'Storage Provider should be an instance of localStorage.');
+
+								Expect(_Application).to.be.an('object', 'Application should be an object.');
+								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
+
+								_Application.testDone = fDone;
+
+								_Application.initialize();
+
+								// Call applyExpectedFilterExperience with parameters
+								let result = _DataFilterProvider.applyExpectedFilterExperience('TestRecordSet', 'TestViewContext');
+
+								Expect(result).to.be.true;
+
+							}
+						);
+
+					test(
+							'Modify localStorage to simulate last used filter experience and test Apply Expected Filter Experience',
+							(fDone) =>
+							{
+								// Define view configuration
+								let _Application = new DoNothingApplication(_Pict, {});
+								let _DataFilterProvider = _Application.pict.providers.FilterDataProvider;
+								
+								_DataFilterProvider.storageProvider = localStorage
+								let _StorageProvider = _DataFilterProvider.storageProvider;
+
+								Expect(_DataFilterProvider).to.be.an('object', 'Filter Data Provider should be an object.');
+								Expect(_StorageProvider).to.be.an.instanceof(originalLocalStorage.constructor, 'Storage Provider should be an instance of localStorage.');
+
+								Expect(_Application).to.be.an('object', 'Application should be an object.');
+								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
+
+								_Application.testDone = fDone;
+
+								_Application.initialize();
+
+								// Simulate last used filter experience in localStorage
+								const testRecordSet = 'TestRecordSet';
+								const testViewContext = 'TestViewContext';
+								const testFilterExperienceHash = 'LastUsedHash123';
+
+								const lastUsedKey = `Filter_MetaTest_${testRecordSet}_${testViewContext}_${test}`;
+								localStorage.getItem.withArgs(lastUsedKey).returns(JSON.stringify({
+									FilterExperienceHash: testFilterExperienceHash
+								}));
+
+								// Call applyExpectedFilterExperience with parameters
+								let result = _DataFilterProvider.applyExpectedFilterExperience(testRecordSet, testViewContext, testFilterExperienceHash);
+
+								Expect(result).to.be.true;
+								Expect(localStorage.setItem.calledWith(lastUsedKey, sinon.match.string)).to.be.true;
+
+							}
+						);
+
+					test(
+							'Modify localStorage to simuate creating settings for the default filter experience and test Apply Expected Filter Experience',
+							(fDone) =>
+							{
+								// Define view configuration
+								let _Application = new DoNothingApplication(_Pict, {});
+								let _DataFilterProvider = _Application.pict.providers.FilterDataProvider;
+								
+								_DataFilterProvider.storageProvider = localStorage
+								let _StorageProvider = _DataFilterProvider.storageProvider;
+
+								Expect(_DataFilterProvider).to.be.an('object', 'Filter Data Provider should be an object.');
+								Expect(_StorageProvider).to.be.an.instanceof(originalLocalStorage.constructor, 'Storage Provider should be an instance of localStorage.');
+
+								Expect(_Application).to.be.an('object', 'Application should be an object.');
+								Expect(_Application).to.be.an.instanceof(libPictSectionRecordSet.PictRecordSetApplication, 'Application should be an instance of PictRecordSetApplication.');
+
+								_Application.testDone = fDone;
+
+								_Application.initialize();
+
+								// Simulate default filter experience settings in localStorage
+								const testRecordSet = 'TestRecordSet';
+								const testViewContext = 'TestViewContext';
+								const testFilterExperienceHash = 'DefaultHash123';
+
+								const defaultKey = `Filter_MetaTest_${testRecordSet}_${testViewContext}_SETTINGS`;
+								localStorage.getItem.withArgs(defaultKey).returns(JSON.stringify({
+									LastUsedFilterExperienceHash: testFilterExperienceHash
+								}));
+								// Call applyExpectedFilterExperience with parameters
+								let result = _DataFilterProvider.applyExpectedFilterExperience(testRecordSet, testViewContext, testFilterExperienceHash);
+
+								Expect(result).to.be.true;
+								Expect(localStorage.setItem.calledWith(defaultKey, sinon.match.string)).to.be.true;
+								
+							}
+						);
+				}	
+					
+			);
+	}
+);