pict-section-recordset 1.0.16 → 1.0.19

package/source/services/RecordsSet-MetaController.js

@@ -1,5 +1,6 @@
 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');
@@ -26,7 +27,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION, pOptions);
 		super(pFable, tmpOptions, pServiceHash);
 
-		/** @type {import('pict') & { addAndInstantiateSingletonService: (hash: string, options: any, prototype: any) => any }} */
+		/** @type {import('pict') & { addAndInstantiateSingletonService: (hash: string, options: any, prototype: any) => any, newManyfest: (rec: any) => any }} */
 		this.fable;
 		this.pict = this.fable;
 		/** @type {any} */
@@ -50,6 +51,9 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		this.sessionProviders = [];
 
+		this.manifestDefinitions = {};
+		this.manifests = { Default: this.pict.manifest };
+
 		this.has_initialized = false;
 	}
 
@@ -201,72 +205,6 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		}
 	}
 
-	/**
-	 * @param {Array<Record<string, any>>} pDashboardConfigurationArray - An array of dashboard configurations.
-	 */
-	loadDashboardConfigurationArray(pDashboardConfigurationArray)
-	{
-		if (!Array.isArray(pDashboardConfigurationArray))
-		{
-			this.fable.log.error(`RecordSetMetacontroller: ${this.UUID} loadDashboardConfigurationArray called with invalid configuration.`);
-			return false;
-		}
-		if (pDashboardConfigurationArray.length === 0)
-		{
-			this.fable.log.warn(`RecordSetMetacontroller: ${this.UUID} loadDashboardConfigurationArray called with empty configuration.`);
-			return false;
-		}
-		for (const tmpDashboardConfiguration of pDashboardConfigurationArray)
-		{
-			if (tmpDashboardConfiguration.RecordDecorationConfiguration)
-			{
-				//TODO: register the record decoration configuration
-			}
-		}
-	}
-
-	/**
-	 * TODO: This method is still incomplete.
-	 *
-	 * @param {Record<string, any>} pDashboardConfiguration - The dashboard configuration to add.
-	 */
-	addDashboardConfiguration(pDashboardConfiguration)
-	{
-		let tmpProvider = false;
-
-		if (this.recordSetProviders[pDashboardConfiguration.RecordSet])
-		{
-			this.pict.log.error(`RecordSetMetacontroller: ${this.UUID} addDashboardConfiguration called with invalid configuration. RecordSet ${pDashboardConfiguration.RecordSet} already exists.`);
-			return null;
-		}
-		const providerConfiguration = Object.assign({}, {Hash: `RSP-Provider-${pDashboardConfiguration.RecordSet}`}, pDashboardConfiguration);
-		this.dashboardConfigurations[providerConfiguration.RecordSet] = providerConfiguration;
-
-		// Create a Meadow Endpoints provider
-		// Allow the Record Set to optionally point to a different entity
-		if ('RecordSetCoreMeadowEntity' in pDashboardConfiguration)
-		{
-			providerConfiguration.Entity = pDashboardConfiguration.RecordSetCoreMeadowEntity;
-		}
-		else
-		{
-			this.pict.log.error(`RecordSetMetacontroller: ${this.UUID} addDashboardConfiguration called with invalid configuration. Missing RecordSetCoreMeadowEntity.`);
-			return null;
-		}
-		// Default the URLPrefix to the base URLPrefix
-		if ('RecordSetURLPrefix' in pDashboardConfiguration)
-		{
-			providerConfiguration.URLPrefix = pDashboardConfiguration.RecordSetURLPrefix;
-		}
-		else
-		{
-			providerConfiguration.URLPrefix = '/1.0/';
-		}
-		tmpProvider = this.recordSetProviders[pDashboardConfiguration.RecordSet] = this.fable.addProvider(providerConfiguration.Hash, providerConfiguration, providerMeadowEndpoints);
-
-		return tmpProvider;
-	}
-
 	loadRecordSetDynamcally(pRecordSet, pEntity, pDefaultFilter)
 	{
 		if (typeof(pRecordSet) === 'object')
@@ -362,6 +300,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		// 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);
@@ -380,9 +319,20 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 			this.loadRecordSetConfigurationArray(this.fable.settings.DefaultRecordSetConfigurations);
 		}
 
-		if (this.fable.settings.hasOwnProperty('DefaultDashboards'))
+		for (const [ tmpManifestKey, tmpManifest ] of Object.entries(this.fable.settings.Manifests || {}))
 		{
-			this.loadDashboardConfigurationArray(this.fable.settings.DefaultDashboards);
+			if (!tmpManifest || !tmpManifest.Scope || !tmpManifest.Descriptors)
+			{
+				this.pict.log.error(`RecordSetDashboard: Invalid manifest: ${tmpManifestKey}.`, tmpManifest);
+				continue;
+			}
+			if (tmpManifestKey !== tmpManifest.Scope)
+			{
+				this.pict.log.error(`RecordSetDashboard: Manifest key ${tmpManifestKey} does not match manifest scope ${tmpManifest.Scope}.  This is bad.  Fix it.`);
+			}
+			this.generateManifestTableCells(tmpManifest);
+			this.manifestDefinitions[tmpManifest.Scope] = tmpManifest;
+			this.manifests[tmpManifest.Scope] = this.pict.newManyfest(tmpManifest);
 		}
 
 		this.has_initialized = true;
@@ -396,6 +346,55 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		return true;
 	}
+
+	getManifest(pScope)
+	{
+		return this.manifests[pScope];
+	}
+
+	/**
+	 * @param {Record<string, any>} pManifest - The manifest to generate table cells for.
+	 */
+	generateManifestTableCells(pManifest)
+	{
+		if (!pManifest || !pManifest.Descriptors || !pManifest.Scope)
+		{
+			this.pict.log.error(`RecordSetDashboard: No manifest or descriptors found for ${pManifest}.  Cannot generate table cells.`);
+			if (pManifest)
+			{
+				pManifest.TableCells = [];
+			}
+			return;
+		}
+		const tmpTableCells = Object.entries(pManifest.Descriptors || {}).filter(([ key, descriptor ]) => descriptor.PictDashboard).map(([ key, descriptor ]) =>
+		{
+			const tmpPictDashboard = descriptor.PictDashboard;
+			if (tmpPictDashboard?.Equation && !tmpPictDashboard.ValueTemplate)
+			{
+				//FIXME: is this the right mapping?
+				if (tmpPictDashboard.EquationNamespaceScope === 'Full')
+				{
+					tmpPictDashboard.ValueTemplate = '{~SBR:Record.Data.PictDashboard.Equation::Pict.PictSectionRecordSet.getManifest(Record.Data.ManifestHash)~}';
+				}
+				else
+				{
+					tmpPictDashboard.ValueTemplate = '{~SBR:Record.Data.PictDashboard.Equation:Record.Payload:Pict.PictSectionRecordSet.getManifest(Record.Data.ManifestHash)~}';
+				}
+			}
+			if (!tmpPictDashboard.ValueTemplate)
+			{
+				tmpPictDashboard.ValueTemplate = '{~DVBK:Record.Payload:Record.Data.Key~}';
+			}
+			return {
+				Key: key,
+				DisplayName: descriptor.Name || key,
+				ManifestHash: pManifest.Scope,
+				PictDashboard: tmpPictDashboard,
+			};
+		});
+		pManifest.TableCells = tmpTableCells;
+	}
+
 }
 
 module.exports = RecordSetMetacontroller;

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

@@ -79,7 +79,7 @@ class PictTemplateFilterViewInstruction extends libPictTemplate
 		}
 		if (!pRecord.ViewContext)
 		{
-			pRecord.ViewContext = tmpViewContext;
+			pRecord.ViewContext = pRecord.DashboardHash ? `${tmpViewContext}-${pRecord.DashboardHash}` : tmpViewContext;
 		}
 
 		let tmpRenderGUID = this.pict.getUUID();
@@ -144,7 +144,7 @@ class PictTemplateFilterViewInstruction extends libPictTemplate
 		}
 		if (!pRecord.ViewContext)
 		{
-			pRecord.ViewContext = tmpViewContext;
+			pRecord.ViewContext = pRecord.DashboardHash ? `${tmpViewContext}-${pRecord.DashboardHash}` : tmpViewContext;
 		}
 		let tmpRenderGUID = this.pict.getUUID();
 

package/source/views/RecordSet-Filter.js

@@ -109,18 +109,27 @@ class viewRecordSetSUBSETFilter extends libPictView
 	{
 		const tmpPictRouter = this.pict.providers.PictRouter;
 		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[pRecordSet];
-		let filterExpr = ' ';
+		let filterExpr = '%20';
 		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`];
-		const tmpURL = this.pict.parseTemplate(tmpURLTemplate,
-			{
-				RecordSet: pRecordSet,
-				FilterString: filterExpr,
-			});
+		let tmpURL;
+		if (tmpURLTemplate)
+		{
+			tmpURL = this.pict.parseTemplate(tmpURLTemplate,
+				{
+					RecordSet: pRecordSet,
+					FilterString: filterExpr,
+				});
+		}
+		else
+		{
+			tmpURL = `/PSRS/${pRecordSet}/List/FilteredTo/${filterExpr}`;
+		}
 		tmpPictRouter.router.navigate(tmpURL);
 	}
 

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

@@ -60,7 +60,7 @@ const _DEFAULT_CONFIGURATION_List_RecordListEntry = (
 					Hash: 'PRSP-Dashboard-RecordListEntry-Template-Row-Cell',
 					Template: /*html*/`
 		<td style="border-bottom: 1px solid #ccc; padding: 5px;">
-			{~DVBK:Record.Payload:Record.Data.Key~}
+			{~TBDA:Record.Data.PictDashboard.ValueTemplate~}
 		</td>
 	`
 				},

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

@@ -37,6 +37,18 @@ const _DEFAULT_CONFIGURATION_List_RecordListHeader = (
 		{~T:PRSP-Dashboard-RecordListActions-Template-Header~}
 	</tr>
 	<!-- DefaultPackage end view template:  [PRSP-Dashboard-RecordListHeader-Template] -->
+	`
+				},
+				{
+					Hash: 'PRSP-Dashboard-RecordListHeader-Manifest-Template',
+					Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-Dashboard-RecordListHeader-Template] -->
+	<tr>
+		{~TS:PRSP-Dashboard-RecordListHeader-Template-Header:Record.ManifestOhz~}
+		{~T:PRSP-Dashboard-RecordListHeader-Template-Extra-Header~}
+		{~T:PRSP-Dashboard-RecordListActions-Template-Header~}
+	</tr>
+	<!-- DefaultPackage end view template:  [PRSP-Dashboard-RecordListHeader-Template] -->
 	`
 				},
 				{