pict-section-recordset 1.0.24 → 1.0.26

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

@@ -1,7 +1,13 @@
+const { ajax } = require('jquery');
 const libPictRecordSet = require('../../source/Pict-Section-RecordSet.js');
 //const libPictSectionForm = require('pict-section-recordset');
+const libPictRecordSetLocalDateRangeFilterView = require('../../source/views/filters/RecordSet-Filter-DateRange.js');
 
-module.exports = libPictRecordSet.PictRecordSetApplication;
+class SimpleApplication extends libPictRecordSet.PictRecordSetApplication
+{
+}
+
+module.exports = SimpleApplication;
 
 module.exports.default_configuration.pict_configuration = (
 	{
@@ -175,133 +181,187 @@ module.exports.default_configuration.pict_configuration = (
 				},
 			}
 		},
-		"DefaultRecordSetConfigurations":
+		"Filters":
+		{
+			"ExternalJoinBookByAuthor":
+			{
+				"Type": "ExternalJoinStringMatch",
+				"ExternalFilterByColumns": [ "Name" ],
+
+				"CoreConnectionColumn": "IDBook",
+
+				"JoinTable": "BookAuthorJoin",
+				"JoinTableExternalConnectionColumn": "IDAuthor",
+				"JoinTableCoreConnectionColumn": "IDBook",
+
+				"ExternalFilterByTable": "Author",
+				"ExternalFilterByTableConnectionColumn": "IDAuthor"
+			}
+		},
+		"FilterCriteria":
+		{
+			"FilterRecordsetByBookAndCreateDate":
 			[
 				{
-					"RecordSet": "Book",
+					"FilterDefinitionHash": "ExternalJoinBookByAuthor",
+					"FilterByColumn": "IDBook"
+				},
+				{
+					"Type": "DateRange",
+					"FilterByColumn": "CreateDate"
+				}
+			],
+			"FilterRecordsetByTitle":
+			[
+				{
+					"Type": "StringMatch",
+					"FilterByColumn": "Title"
+				},
+			]
+		},
+
+		"DefaultRecordSetConfigurations":
+		[
+			{
+				"RecordSet": "Book",
 
-					"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.
+				"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.
 
-					"RecordSetListColumns": [
-						{
-							"Key": "Title",
-							"DisplayName": "Title"
-						},
-						{
-							"Key": "Genre",
-							"DisplayName": "Genre"
-						},
-						{
-							"Key": "ISBN",
-							"DisplayName": "Int'l SBN"
-						}
-					],
+				"RecordSetListColumns": [
+					{
+						"Key": "Title",
+						"DisplayName": "Title"
+					},
+					{
+						"Key": "Genre",
+						"DisplayName": "Genre"
+					},
+					{
+						"Key": "ISBN",
+						"DisplayName": "Int'l SBN"
+					}
+				],
+
+				"FilterExperiences":
+				{
+					"FilterByAuthorAndCreateDate":
+					{
+						"Ordinal": 1,
+						"FilterCriteriaHash": "FilterRecordsetByBookAndCreateDate",
+						"Default": true
+					},
+					"FilterByTitle":
+					{
+						"Ordinal": 2,
+						"FilterCriteriaHash": "FilterRecordsetByTitle"
+					}
+				},
 
-					"RecordSetListManifestOnly": false,
+				"RecordSetListManifestOnly": false,
 
-					"RecordSetListManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
-					"RecordSetDashboardManifests": [ "Bestsellers" ],
+				"RecordSetListManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
+				"RecordSetDashboardManifests": [ "Bestsellers" ],
 
-					"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>",
+				"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" ],
+				"SearchFields": [ "Title" ],
 
-					"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
 
-					"RecordSetURLPrefix": "/1.0/"
-				},
-				{
-					"RecordSet": "BookstoreInventory",
-					"Title": "Bookstore Inventory",
+				"RecordSetURLPrefix": "/1.0/"
+			},
+			{
+				"RecordSet": "BookstoreInventory",
+				"Title": "Bookstore Inventory",
 
-					"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.
+				"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.
 
-					"RecordSetListManifestOnly": true,
+				"RecordSetListManifestOnly": true,
 
-					"RecordSetDashboardManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
+				"RecordSetDashboardManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
 
-					"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"
-						},
-						{
-							"Entity": "BookAuthorJoin",
-							"Filter": "FBL~IDAuthor~INN~{~PJU:,^IDAuthor^Record.State.Authors~}",
-							"Destination": "State.BookAuthorJoinsRev"
-						},
-						{
-							"Entity": "Book",
-							"Filter": "FBL~IDBook~INN~{~PJU:,^IDBook^Record.State.BookAuthorJoinsRev~}",
-							"Destination": "State.BooksForAuthors"
-						},
-						{
-							"Type": "MapJoin",
-							"DestinationRecordSetAddress": "State.Authors",
-							"DestinationJoinValue": "IDAuthor",
-							"JoinJoinValueLHS": "IDAuthor",
-							"Joins": "State.BookAuthorJoinsRev",
-							"JoinJoinValueRHS": "IDBook",
-							"JoinRecordSetAddress": "State.BooksForAuthors",
-							"JoinValue": "IDBook",
-							"RecordDestinationAddress": "Books"
-						}
-					],
-					"AvailableVerbs": [ "Dashboard" ],
+				"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"
+					},
+					{
+						"Entity": "BookAuthorJoin",
+						"Filter": "FBL~IDAuthor~INN~{~PJU:,^IDAuthor^Record.State.Authors~}",
+						"Destination": "State.BookAuthorJoinsRev"
+					},
+					{
+						"Entity": "Book",
+						"Filter": "FBL~IDBook~INN~{~PJU:,^IDBook^Record.State.BookAuthorJoinsRev~}",
+						"Destination": "State.BooksForAuthors"
+					},
+					{
+						"Type": "MapJoin",
+						"DestinationRecordSetAddress": "State.Authors",
+						"DestinationJoinValue": "IDAuthor",
+						"JoinJoinValueLHS": "IDAuthor",
+						"Joins": "State.BookAuthorJoinsRev",
+						"JoinJoinValueRHS": "IDBook",
+						"JoinRecordSetAddress": "State.BooksForAuthors",
+						"JoinValue": "IDBook",
+						"RecordDestinationAddress": "Books"
+					}
+				],
+				"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>",
+				"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" ],
+				"SearchFields": [ "Title" ],
 
-					"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
-					//TODO: something like this to reduce boilerplate
-					"RecordSetFilterURLTemplate-Dashboard-Specific": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/$$DASHBOARD_HASH$$/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-Dashboard-Bestsellers": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/Bestsellers/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-Dashboard-Underdogs": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/Underdogs/FilteredTo/{~D:Record.FilterString~}",
-					"RecordSetFilterURLTemplate-Dashboard-NewReleases": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/NewReleases/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
+				//TODO: something like this to reduce boilerplate
+				"RecordSetFilterURLTemplate-Dashboard-Specific": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/$$DASHBOARD_HASH$$/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Dashboard-Bestsellers": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/Bestsellers/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Dashboard-Underdogs": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/Underdogs/FilteredTo/{~D:Record.FilterString~}",
+				"RecordSetFilterURLTemplate-Dashboard-NewReleases": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/NewReleases/FilteredTo/{~D:Record.FilterString~}",
 
-					"RecordSetURLPrefix": "/1.0/"
-				},
-				{
-					"RecordSet": "Author",
+				"RecordSetURLPrefix": "/1.0/"
+			},
+			{
+				"RecordSet": "Author",
 
-					"RecordSetType": "MeadowEndpoint",
-					"RecordSetMeadowEntity": "Author",
+				"RecordSetType": "MeadowEndpoint",
+				"RecordSetMeadowEntity": "Author",
 
-					"RecordSetURLPrefix": "/1.0/"
-				},
-				{
-					"RecordSet": "RandomizedValues",
+				"RecordSetURLPrefix": "/1.0/"
+			},
+			{
+				"RecordSet": "RandomizedValues",
 
-					"RecordSetType": "Custom" // This means the `PS-RSP-RandomizedValues` provider will be checked for to get records.
-				}
-			]
-		});
+				"RecordSetType": "Custom" // This means the `PS-RSP-RandomizedValues` provider will be checked for to get records.
+			}
+		]
+	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pict-section-recordset",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "Pict dynamic record set management views",
   "main": "source/Pict-Section-RecordSet.js",
   "directories": {
@@ -20,7 +20,7 @@
     "coverage": "npx nyc --reporter=lcov --reporter=text-lcov npx mocha -- -u tdd -R spec",
     "build": "npx quack build",
     "test": "npx mocha -u tdd -R spec",
-    "lint": "eslint source/**",
+    "lint": "eslint source",
     "types": "tsc -p tsconfig.build.json"
   },
   "types": "types/Pict-Section-RecordSet.d.ts",
@@ -33,19 +33,19 @@
     "browser-env": "^3.3.0",
     "eslint": "^9.28.0",
     "jquery": "^3.7.1",
-    "pict": "^1.0.272",
+    "pict": "^1.0.284",
     "pict-application": "^1.0.27",
     "pict-service-commandlineutility": "^1.0.15",
-    "quackage": "^1.0.41",
+    "quackage": "^1.0.42",
     "typescript": "^5.8.3"
   },
   "dependencies": {
     "fable-serviceproviderbase": "^3.0.15",
     "pict-provider": "^1.0.6",
     "pict-router": "^1.0.4",
-    "pict-section-form": "^1.0.98",
-    "pict-template": "^1.0.11",
-    "pict-view": "^1.0.61"
+    "pict-section-form": "^1.0.106",
+    "pict-template": "^1.0.12",
+    "pict-view": "^1.0.62"
   },
   "mocha": {
     "diff": true,

package/source/application/Pict-Application-RecordSet.js

@@ -1,7 +1,9 @@
 const libPictApplication = require('pict-application');
+const libPictSectionForm = require('pict-section-form');
 
 const libPictSectionRecordSet = require('../Pict-Section-RecordSet.js');
 const libDynamicSolver = require('../providers/RecordSet-DynamicRecordsetSolver.js');
+const libPictDynamicFormDependencyManager = require('pict-section-form').PictDynamicFormDependencyManager;
 
 /**
  * Represents a PictSectionRecordSetApplication.
@@ -21,7 +23,13 @@ class PictSectionRecordSetApplication extends libPictApplication
 		this.pict;
 		// Add the pict recordset meta controller service
 		this.pict.addServiceType('PictSectionRecordSet', libPictSectionRecordSet);
+		//FIXME: this is probably wrong, but needed for now?
+		this.pict.addServiceType('PictSectionForm', libPictSectionForm);
+
 		this.fable.addProviderSingleton('DynamicRecordsetSolver', libDynamicSolver.default_configuration, libDynamicSolver);
+
+		// add the dependencies for dynamic controls
+		this.fable.addAndInstantiateSingletonService('PictDynamicFormDependencyManager', libPictDynamicFormDependencyManager.default_configuration, libPictDynamicFormDependencyManager);
 	}
 
 	onInitialize()

package/source/providers/RecordSet-Link-Manager.js

@@ -9,7 +9,7 @@ const _DEFAULT_PROVIDER_CONFIGURATION =
 	AutoInitializeOrdinal: 0
 }
 
-class PictRecordSetRouter extends libPictProvider
+class PictRecordSetLinkManager extends libPictProvider
 {
 	constructor(pFable, pOptions, pServiceHash)
 	{
@@ -49,5 +49,5 @@ class PictRecordSetRouter extends libPictProvider
 	}
 }
 
-module.exports = PictRecordSetRouter;
+module.exports = PictRecordSetLinkManager;
 module.exports.default_configuration = _DEFAULT_PROVIDER_CONFIGURATION;

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

@@ -52,7 +52,7 @@ class RecordSetProviderBase extends libPictProvider
 {
 	/**
 	 * 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.
 	 */
@@ -64,7 +64,7 @@ class RecordSetProviderBase extends libPictProvider
 
 		/** @type {Record<string, any>} */
 		this.options;
-		/** @type {import('fable')} */
+		/** @type {import('pict')} */
 		this.fable;
 		/** @type {import('pict')} */
 		this.pict;
@@ -92,6 +92,13 @@ class RecordSetProviderBase extends libPictProvider
 		return { };
 	}
 
+	/*
+	get availableFilters()
+	{
+		return { IDBook: [ 'NumericMatch', 'NumericRange', 'ExternalJoinBookByAuthor' ], Title: [ 'StringMatch', 'StringRange' ] };
+	}
+	*/
+
 	/**
 	 * Read records from the provider.
 	 *

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)
 				{