pict-section-recordset 1.0.20 → 1.0.21

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

@@ -222,6 +222,8 @@ module.exports.default_configuration.pict_configuration = (
 					"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,
+
 					"RecordSetDashboardManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
 
 					"RecordDecorationConfiguration":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pict-section-recordset",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "Pict dynamic record set management views",
   "main": "source/Pict-Section-RecordSet.js",
   "directories": {

package/source/views/RecordSet-Filter.js

@@ -117,6 +117,13 @@ class viewRecordSetSUBSETFilter extends libPictView
 			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)
 		{

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

@@ -220,15 +220,15 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			return;
 		}
 
-		let tmpManifest;
+		let tmpManifestDefinition;
 		if (pDashboardHash)
 		{
-			tmpManifest = this.pict.PictSectionRecordSet.manifestDefinitions[pDashboardHash];
+			tmpManifestDefinition = this.pict.PictSectionRecordSet.manifestDefinitions[pDashboardHash];
 		}
 		let tmpTitle = pRecordSetConfiguration.Title || pRecordSetConfiguration.RecordSet;
-		if (tmpManifest && tmpManifest.TitleTemplate)
+		if (tmpManifestDefinition && tmpManifestDefinition.TitleTemplate)
 		{
-			tmpTitle = this.pict.parseTemplate(tmpManifest.TitleTemplate, pRecordSetConfiguration);
+			tmpTitle = this.pict.parseTemplate(tmpManifestDefinition.TitleTemplate, pRecordSetConfiguration);
 		}
 
 		let tmpRecordDashboardData =
@@ -369,11 +369,10 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 
 		if (pDashboardHash)
 		{
-			tmpRecordDashboardData.TableCells = tmpManifest?.TableCells;
+			tmpRecordDashboardData.TableCells = tmpManifestDefinition?.TableCells;
 		}
 		if (!tmpRecordDashboardData.TableCells)
 		{
-			tmpRecordDashboardData.TableCells = [];
 			// Put code here to preprocess columns into other data parts.
 			/*
 				"RecordSetListManifestOnly": false,
@@ -381,42 +380,58 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 				"RecordSetListManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
 				"RecordSetDashboardManifests": [ "Bestsellers" ],
 			 */
-			if (tmpRecordDashboardData.RecordSetConfiguration.hasOwnProperty('RecordSetListColumns'))
+			if (pRecordSetConfiguration.RecordSetListManifestOnly)
 			{
-				tmpRecordDashboardData.TableCells = tmpRecordDashboardData.RecordSetConfiguration.RecordSetListColumns.map((key) =>
-					{
-						if (typeof key === 'object')
+				const tmpManifestHash = pRecordSetConfiguration.RecordSetDashboardDefaultManifest || pRecordSetConfiguration.RecordSetDashboardManifests?.[0];
+				const tmpManifest = this.pict.PictSectionRecordSet.getManifest(tmpManifestHash);
+				if (!tmpManifest)
+				{
+					this.pict.log.error(`RecordSetDashboard: No manifest found for ${pRecordSetConfiguration.RecordSet}.  List Render failed.`);
+				}
+				else
+				{
+					tmpRecordDashboardData.TableCells = tmpManifest.TableCells;
+				}
+			}
+			if (!tmpRecordDashboardData.TableCells)
+			{
+				if (tmpRecordDashboardData.RecordSetConfiguration.hasOwnProperty('RecordSetListColumns'))
+				{
+					tmpRecordDashboardData.TableCells = tmpRecordDashboardData.RecordSetConfiguration.RecordSetListColumns.map((key) =>
 						{
-							if (!key.DisplayName)
-							{
-								key.DisplayName = key.Key; //FIXME: use schema?
-							}
-							if (!key.ManifestHash)
+							if (typeof key === 'object')
 							{
-								key.ManifestHash = 'Default';
+								if (!key.DisplayName)
+								{
+									key.DisplayName = key.Key; //FIXME: use schema?
+								}
+								if (!key.ManifestHash)
+								{
+									key.ManifestHash = 'Default';
+								}
+								return key;
 							}
-							return key;
-						}
-						return {
-							Key: key,
-							DisplayName: key, //FIXME: use schema?
-							ManifestHash: 'Default',
-							PictDashboard:
-							{
-								ValueTemplate: '{~DVBK:Record.Payload:Record.Data.Key~}',
-							},
-						};
-					});
-			}
-			else
-			{
-				this.dynamicallyGenerateColumns(tmpRecordDashboardData);
+							return {
+								Key: key,
+								DisplayName: key, //FIXME: use schema?
+								ManifestHash: 'Default',
+								PictDashboard:
+								{
+									ValueTemplate: '{~DVBK:Record.Payload:Record.Data.Key~}',
+								},
+							};
+						});
+				}
+				else
+				{
+					this.dynamicallyGenerateColumns(tmpRecordDashboardData);
+				}
 			}
 		}
 
 		tmpRecordDashboardData = this.onBeforeRenderList(tmpRecordDashboardData);
 
-		this.pict.providers.DynamicRecordsetSolver.solveDashboard(tmpManifest || { }, tmpRecordDashboardData.Records.Records);
+		this.pict.providers.DynamicRecordsetSolver.solveDashboard(tmpManifestDefinition, tmpRecordDashboardData.Records.Records);
 
 		this.renderAsync('PRSP_Renderable_List', tmpRecordDashboardData.RenderDestination, tmpRecordDashboardData,
 			function (pError)
@@ -460,6 +475,19 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			this.pict.log.error(`RecordSetDashboard: No provider found for ${pProviderHash} in ${pRecordSetConfiguration.RecordSet}.  List Render failed.`);
 			return;
 		}
+		if (pRecordSetConfiguration.RecordSetListManifestOnly)
+		{
+			const tmpManifestHash = pRecordSetConfiguration.RecordSetDashboardDefaultManifest || pRecordSetConfiguration.RecordSetDashboardManifests?.[0];
+			const tmpManifest = this.pict.PictSectionRecordSet.getManifest(tmpManifestHash);
+			if (!tmpManifest)
+			{
+				this.pict.log.error(`RecordSetDashboard: No manifest found for ${pRecordSetConfiguration.RecordSet}.  List Render failed.`);
+			}
+			else
+			{
+				return this.renderSpecificDashboard(tmpManifestHash, pRecordSetConfiguration, pProviderHash, pFilterString, pOffset, pPageSize);
+			}
+		}
 
 		let tmpRecordDashboardData =
 		{
@@ -482,7 +510,7 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		// TODO: There are still problems with the way these have nested data.  Discuss how we might move that around
 		// Fetch the records
 		const [ tmpRecords, tmpTotalRecordCount, tmpRecordSchema ] = await Promise.all([
-			this.pict.providers[pProviderHash].getRecords(tmpRecordDashboardData),
+			this.pict.providers[pProviderHash].getDecoratedRecords(tmpRecordDashboardData),
 			this.pict.providers[pProviderHash].getRecordSetCount(tmpRecordDashboardData),
 			this.pict.providers[pProviderHash].getRecordSchema(),
 		]);
@@ -601,7 +629,6 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			tmpRecordDashboardData.PageLinkBookmarks.NextLink = tmpRecordDashboardData.PageLinks[tmpRecordDashboardData.PageLinkBookmarks.Next];
 		}
 
-		tmpRecordDashboardData.TableCells = [];
 		// Put code here to preprocess columns into other data parts.
 		/*
 			"RecordSetListManifestOnly": false,
@@ -611,23 +638,32 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 		 */
 		if (tmpRecordDashboardData.RecordSetConfiguration.hasOwnProperty('RecordSetListColumns'))
 		{
-			tmpRecordDashboardData.TableCells = tmpRecordDashboardData.RecordSetConfiguration.RecordSetListColumns.map((key) =>
+			tmpRecordDashboardData.TableCells = tmpRecordDashboardData.RecordSetConfiguration.RecordSetListColumns.map((pKey) =>
 				{
-					if (typeof key === 'object')
+					if (typeof pKey === 'object')
 					{
-						if (!key.DisplayName)
+						const tmpTableCell = pKey;
+						if (!tmpTableCell.DisplayName)
+						{
+							tmpTableCell.DisplayName = tmpTableCell.Key; //FIXME: use schema?
+						}
+						if (!tmpTableCell.ManifestHash)
+						{
+							tmpTableCell.ManifestHash = 'Default';
+						}
+						if (!tmpTableCell.PictDashboard)
 						{
-							key.DisplayName = key.Key; //FIXME: use schema?
+							tmpTableCell.PictDashboard = {};
 						}
-						if (!key.ManifestHash)
+						if (!tmpTableCell.PictDashboard.ValueTemplate)
 						{
-							key.ManifestHash = 'Default';
+							tmpTableCell.PictDashboard.ValueTemplate = '{~DVBK:Record.Payload:Record.Data.Key~}';
 						}
-						return key;
+						return tmpTableCell;
 					}
 					return {
-						Key: key,
-						DisplayName: key, //FIXME: use schema?
+						Key: pKey,
+						DisplayName: pKey, //FIXME: use schema?
 						ManifestHash: 'Default',
 						PictDashboard:
 						{

package/types/views/RecordSet-Filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSet-Filter.d.ts","sourceRoot":"","sources":["../../source/views/RecordSet-Filter.js"],"names":[],"mappings":";AA+EA;IAEC,2DAMC;IAFA,kHAAkH;IAClH,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,GAAG;QAAE,oBAAoB,EAAE;;;;;;SAAsC,CAAA;KAAE,CACrG;IAGV;;;;OAIG;IACH,qBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAQhB;IAED;;;;OAIG;IACH,0BAJW,MAAM,gBACN,MAAM,kBACN,MAAM,QA4BhB;IAED;;;;OAIG;IACH,oBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAOhB;CACD;;;;;AAhJD,kCAAkC;AAClC,oDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2E5B"}
+{"version":3,"file":"RecordSet-Filter.d.ts","sourceRoot":"","sources":["../../source/views/RecordSet-Filter.js"],"names":[],"mappings":";AA+EA;IAEC,2DAMC;IAFA,kHAAkH;IAClH,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,GAAG;QAAE,oBAAoB,EAAE;;;;;;SAAsC,CAAA;KAAE,CACrG;IAGV;;;;OAIG;IACH,qBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAQhB;IAED;;;;OAIG;IACH,0BAJW,MAAM,gBACN,MAAM,kBACN,MAAM,QAmChB;IAED;;;;OAIG;IACH,oBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAOhB;CACD;;;;;AAvJD,kCAAkC;AAClC,oDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2E5B"}

package/types/views/dashboard/RecordSet-Dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSet-Dashboard.d.ts","sourceRoot":"","sources":["../../../source/views/dashboard/RecordSet-Dashboard.js"],"names":[],"mappings":";AA0EA;IAOE;;;;;;;;MAQC;IAGF,iEAsCC;IAED;;OAEG;IACH,qCAeC;IAED,8CAGC;IAED,sDAuCC;IAnCA,iCAUC;IA2BF;;;;;;;;;OASG;IACH,wCATW,MAAM,2BACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBACnB,MAAM,iBACN,MAAM,WACN,MAAM,aACN,MAAM,GAEL,OAAO,CAAC,IAAI,CAAC,CAwOxB;IAED;;;;;;;;OAQG;IACH,yCARW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBACnB,MAAM,iBACN,MAAM,WACN,MAAM,aACN,MAAM,GAEL,OAAO,CAAC,IAAI,CAAC,CA+NxB;CAwBD;;;;;AA3qBD,kCAAkC;AAClC,iDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA6D1B"}
+{"version":3,"file":"RecordSet-Dashboard.d.ts","sourceRoot":"","sources":["../../../source/views/dashboard/RecordSet-Dashboard.js"],"names":[],"mappings":";AA0EA;IAOE;;;;;;;;MAQC;IAGF,iEAsCC;IAED;;OAEG;IACH,qCAeC;IAED,8CAGC;IAED,sDAuCC;IAnCA,iCAUC;IA2BF;;;;;;;;;OASG;IACH,wCATW,MAAM,2BACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBACnB,MAAM,iBACN,MAAM,WACN,MAAM,aACN,MAAM,GAEL,OAAO,CAAC,IAAI,CAAC,CAuPxB;IAED;;;;;;;;OAQG;IACH,yCARW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBACnB,MAAM,iBACN,MAAM,WACN,MAAM,aACN,MAAM,GAEL,OAAO,CAAC,IAAI,CAAC,CAoPxB;CAwBD;;;;;AA/sBD,kCAAkC;AAClC,iDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA6D1B"}