pict-section-recordset 1.0.53 → 1.0.55

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

@@ -157,6 +157,34 @@ class SimpleApplication extends libPictRecordSet.PictRecordSetApplication
 	onInitialize()
 	{
 		this.pict.addView('PRSP-FilterType-ExternalJoinSelectedValueList-MyCoolView', {}, CustomFilterView);
+		this.pict.addView('SpecialBookView', 
+        {
+            "ViewIdentifier": "SpecialBookView",
+
+            "DefaultRenderable": "SpecialBookView",
+            "DefaultDestinationAddress": "#Placeholder",
+            "IncludeInMetacontrollerOperations": true,
+
+            "AutoRender": false,
+
+            "Templates": [
+                {
+                    "Hash": "SpecialBookView-Content",
+                    "Template": /*html*/`
+						<div>
+							This is a special book view, here's some text: <br />
+							Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+						</div>
+					`
+                }
+            ],
+            "Renderables": [
+                {
+                    "RenderableHash": "SpecialBookView",
+                    "TemplateHash": "SpecialBookView-Content"
+                }
+            ]
+        });
 
 		return super.onInitialize();
 	}
@@ -175,6 +203,156 @@ module.exports.default_configuration.pict_configuration = (
 
 		"Manifests": // Manifest'Ohs: Breakfast of Champions
 		{
+			"Book-View":
+			{
+				"Form": "BookViewManifest",
+				"Scope": "Book-View",
+				"Descriptors": 
+				{
+					"BookDetails.Title": 
+					{
+						"Name": "Title",
+						"Hash": "ViewBookName",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "1",
+							"Section": "BookView",
+							"Group": "BookView"
+						}
+					},
+					"BookDetails.Genre": 
+					{
+						"Name": "Genre",
+						"Hash": "ViewBookGenre",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "1",
+							"Section": "BookView",
+							"Group": "BookView"
+						}
+					},
+					"BookDetails.ISBN": 
+					{
+						"Name": "ISBN",
+						"Hash": "ViewBookISBN",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "2",
+							"Section": "BookView",
+							"Group": "BookView"
+						}
+					}
+				},
+				"Sections": 
+				[
+					{
+						"Name": "Book View",
+						"Hash": "BookView",
+						"Solvers": [],
+						"ShowTitle": false,
+						"Groups": [
+							{
+								"Name": "Book View",
+								"Hash": "BookView",
+								"Rows": [],
+								"RecordSetSolvers": [],
+								"ShowTitle": false
+							}
+						]
+					}
+				]
+			},
+			"Author-View":
+			{
+				"Form": "AuthorViewManifest",
+				"Scope": "Author-View",
+				"Descriptors": 
+				{
+					"AuthorDetails.Name": 
+					{
+						"Name": "Author Name",
+						"Hash": "ViewAuthorName",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "1",
+							"Section": "AuthorView",
+							"Group": "AuthorView"
+						}
+					},
+				},
+				"Sections": 
+				[
+					{
+						"Name": "Author View",
+						"Hash": "AuthorView",
+						"Solvers": [],
+						"ShowTitle": false,
+						"Groups": [
+							{
+								"Name": "Author View",
+								"Hash": "AuthorView",
+								"Rows": [],
+								"RecordSetSolvers": [],
+								"ShowTitle": false
+							}
+						]
+					}
+				]
+			},
+			"AuthorMetadata":
+			{
+				"Form": "AuthorMetadataManifest",
+				"Scope": "AuthorMetadata",
+				"Descriptors": 
+				{
+					"AuthorDetails.GUIDAuthor": 
+					{
+						"Name": "Author GUID",
+						"Hash": "ViewGUIDAuthor",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "1",
+							"Section": "AuthorMetadata",
+							"Group": "AuthorMetadata"
+						}
+					},
+					"AuthorDetails.IDAuthor": 
+					{
+						"Name": "ID Author",
+						"Hash": "ViewIDAuthor",
+						"DataType": "String",
+						"PictForm": 
+						{
+							"Row": "1",
+							"Section": "AuthorMetadata",
+							"Group": "AuthorMetadata"
+						}
+					},
+				},
+				"Sections": 
+				[
+					{
+						"Name": "Author Metadata",
+						"Hash": "AuthorMetadata",
+						"Solvers": [],
+						"ShowTitle": false,
+						"Groups": [
+							{
+								"Name": "Author Metadata",
+								"Hash": "AuthorMetadata",
+								"Rows": [],
+								"RecordSetSolvers": [],
+								"ShowTitle": false
+							}
+						]
+					}
+				]
+			},
 			"Bestsellers":
 			{
 				"Scope": "Bestsellers",
@@ -481,6 +659,32 @@ module.exports.default_configuration.pict_configuration = (
 					}
 				},
 
+				"RecordSetReadManifestOnly": true,
+				"RecordSetReadDefaultManifestView": "Book-View",
+				"RecordSetReadManifestsView": [ "Book-View" ],
+
+				"ReadLayout": "Split",
+
+				"RecordSetReadTabs": 
+				[
+					{
+						Type: "AttachedRecord",
+						RecordSet: "Author",
+						Title: "Author",
+						JoiningRecordSet: "BookAuthorJoin"
+					},
+					{
+						Type: "Manifest",
+						Manifest: "AuthorMetadata",
+						Title: "Author Metadata"
+					},
+					{
+						Type: "View",
+						View: "SpecialBookView",
+						Title: "More Book Info"
+					}
+				],
+
 				"RecordSetListManifestOnly": false,
 
 				"RecordSetListManifests": [ "Bestsellers", "Underdogs", "NewReleases" ],
@@ -579,7 +783,23 @@ module.exports.default_configuration.pict_configuration = (
 				"RecordSetType": "MeadowEndpoint",
 				"RecordSetMeadowEntity": "Author",
 
-				"RecordSetURLPrefix": "/1.0/"
+				"RecordSetURLPrefix": "/1.0/",
+
+				"RecordSetReadManifestOnly": true,
+				"RecordSetReadManifestsView": [ "Author-View" ],
+
+				"ReadLayout": "Tab",
+				"RecordSetReadTabTitle": "Author",
+
+				"RecordSetReadTabs": 
+				[
+					{
+						Type: "Manifest",
+						Manifest: "AuthorMetadata",
+						Title: "Author Metadata"
+					}
+				],
+
 			},
 			{
 				"RecordSet": "RandomizedValues",

package/example_applications/simple_entity/html/index.html

@@ -17,6 +17,8 @@
 			<ul>
 				<li><a href="#/PSRS/Book/List">Book List</a></li>
 				<li><a href="#/PSRS/Author/List">Author List</a></li>
+				<li><a href="#/PSRS/Book/Create">Book Create</a></li>
+				<li><a href="#/PSRS/Author/Create">Author Create</a></li>
 			</ul>
 		</nav>
 		<div id="PRSP_Container"></div>

package/package.json

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

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

@@ -26,6 +26,8 @@ class PictSectionRecordSetApplication extends libPictApplication
 		//FIXME: this is probably wrong, but needed for now?
 		this.pict.addServiceType('PictSectionForm', libPictSectionForm);
 
+		this.pict.addView('PictFormMetacontroller', {}, libPictSectionForm.PictFormMetacontroller);
+
 		this.fable.addProviderSingleton('DynamicRecordsetSolver', libDynamicSolver.default_configuration, libDynamicSolver);
 
 		// add the dependencies for dynamic controls

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

@@ -25,7 +25,7 @@ class PictRecordSetLinkManager extends libPictProvider
 		// Format:
 		// {
 		//   Name: "View Record",
-		//   URL: "#/PSRS/{~D:Record.Payload.RecordSet~}/Read/{~DVBK:Record.Data:Record.Payload.GUIDAddress~}",
+		//   URL: "#/PSRS/{~D:Record.Payload.RecordSet~}/View/{~DVBK:Record.Data:Record.Payload.GUIDAddress~}",
 		//   Default: true
 		// }
 		this.linkTemplates = [];

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

@@ -102,6 +102,16 @@ class RecordSetProviderBase extends libPictProvider
 	}
 	*/
 
+	getGUIDField()
+	{ 
+		return `GUID${ this.options.Entity }`;
+	}
+
+	getIDField()
+	{ 
+		return `ID${ this.options.Entity }`;
+	}
+
 	/**
 	 * Read records from the provider.
 	 *

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

@@ -111,6 +111,36 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		});
 	}
 
+	getGUIDField()
+	{ 
+		if (this._Schema?.MeadowSchema?.Schema?.length)
+		{
+			for (let field of this._Schema.MeadowSchema.Schema)
+			{
+				if (field.Type == 'AutoGUID')
+				{
+					return field.Column;
+				}
+			}
+		}
+		return `GUID${ this.options.Entity }`;
+	}
+
+	getIDField()
+	{ 
+		if (this._Schema?.MeadowSchema?.Schema?.length)
+		{
+			for (let field of this._Schema.MeadowSchema.Schema)
+			{
+				if (field.Type == 'AutoIdentity')
+				{
+					return field.Column;
+				}
+			}
+		}
+		return `ID${ this.options.Entity }`;
+	}
+
 	/**
 	 * Get a record by its ID or GUID.
 	 *
@@ -128,7 +158,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			this.entityProvider.getEntitySet(this.options.Entity, `FBV~GUID${this.options.Entity}~EQ~${encodeURIComponent(pGuid)}`, (pError, pResult) =>
+			this.entityProvider.getEntitySet(this.options.Entity, `FBV~${ this.getGUIDField() }~EQ~${encodeURIComponent(pGuid)}`, (pError, pResult) =>
 			{
 				if (pError)
 				{
@@ -182,6 +212,37 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		return new Promise((resolve, reject) =>
 		{
 			const [ tmpClauses, tmpExperience ] = this._prepareFilterState(tmpEntity, pOptions);
+			if (this.options.FilterEndpointOverride)
+			{
+				// Call the filtering endpoint with the clauses and experience.
+				this.entityProvider.restClient.postJSON({
+					url: `${ this.options.URLPrefix }${ this.options.FilterEndpointOverride }/${ pOptions.Offset || 0 }/${ pOptions.PageSize || 250 }`,
+					body: { Clauses: tmpClauses, Experience: tmpExperience },
+				}, (pError, response, result) =>
+				{
+					if (pError)
+					{
+						return reject(pError);
+					}
+					const recordsReturn = result;
+					const IDFields = ['CreatingIDUser', 'UpdatingIDUser'];
+					if (recordsReturn.length)
+					{
+						for (const k of Object.keys(recordsReturn[0]))
+						{
+							if (k.startsWith('ID') && k !== `ID${ tmpEntity }`)
+							{
+								IDFields.push(k);
+							}
+						}
+					}
+					this.pict.EntityProvider.cacheConnectedEntityRecords(recordsReturn, IDFields, ['User', 'User'], false, () => 
+					{
+						resolve({ Records: recordsReturn, Facets: { } });
+					});
+				});
+				return;
+			}
 			this.pict.providers.FilterManager.loadRecordPageByFilterUsingProvider(this.entityProvider, tmpClauses, tmpExperience, pOptions.Offset || 0, pOptions.PageSize || 250, (pError) =>
 			{
 				if (pError)
@@ -242,6 +303,22 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		return new Promise((resolve, reject) =>
 		{
 			const [ tmpClauses, tmpExperience ] = this._prepareFilterState(tmpEntity, pOptions, 'Count');
+			if (this.options.FilterEndpointOverride)
+			{
+				// Call the filtering endpoint with the clauses and experience.
+				this.entityProvider.restClient.postJSON({
+					url: `${ this.options.URLPrefix }${ this.options.FilterEndpointOverride }/Count`,
+					body: { Clauses: tmpClauses, Experience: tmpExperience },
+				}, (error, response, result) =>
+				{
+					if (error)
+					{
+						return reject(error);
+					}
+					resolve(result);
+				});
+				return;
+			}
 			this.pict.providers.FilterManager.countRecordsByFilterUsingProivider(this.entityProvider, tmpClauses, tmpExperience, (pError) =>
 			{
 				if (pError)
@@ -289,7 +366,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	{
 		if (this.pict.LogNoisiness > 1)
 		{
-			this.pict.log.info(`Updating record ${this.options.Entity} ${pRecord[`ID${this.options.Entity}`]}`);
+			this.pict.log.info(`Updating record ${this.options.Entity} ${pRecord[this.getIDField()]}`);
 		}
 		return new Promise((resolve, reject) =>
 		{
@@ -316,12 +393,12 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	{
 		if (this.pict.LogNoisiness > 1)
 		{
-			this.pict.log.info(`Deleting record ${this.options.Entity} ${pRecord[`ID${this.options.Entity}`]}`);
+			this.pict.log.info(`Deleting record ${this.options.Entity} ${pRecord[this.getIDField()]}`);
 		}
 		return new Promise((resolve, reject) =>
 		{
 			this.entityProvider.restClient.delJSON({
-				url: `${this.options.URLPrefix}${this.options.Entity}/${pRecord[`ID${this.options.Entity}`]}`,
+				url: `${this.options.URLPrefix}${this.options.Entity}/${pRecord[this.getIDField()]}`,
 				body: pRecord,
 			}, (error, response, result) =>
 			{
@@ -372,8 +449,8 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	 */
 	cleanRecord(pRecord)
 	{
-		delete pRecord[`ID${this.options.Entity}`];
-		delete pRecord[`GUID${this.options.Entity}`];
+		delete pRecord[this.getIDField()];
+		delete pRecord[this.getGUIDField()];
 		return pRecord;
 	}
 
@@ -395,7 +472,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 				tmpFieldType = pMeadowSchemaField.Type.toLowerCase();
 			}
 			tmpFieldFilterClauses = [];
-			const tmpFieldHumanName = this._getHumanReadableFieldName(pSchemaField);
+			const tmpFieldHumanName = this.getHumanReadableFieldName(pSchemaField);
 			const isUserAuditField = ['CreatingIDUser', 'DeletingIDUser', 'UpdatingIDUser'].includes(pSchemaField);
 			const customFilterClauses = this.options.Filters?.[pSchemaField];
 			if (pSchemaField.startsWith('ID') || pSchemaField.startsWith('ParentID') || isUserAuditField || customFilterClauses)
@@ -403,7 +480,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 				for (const customField of Array.isArray(customFilterClauses) ? customFilterClauses : [customFilterClauses])
 				{
 					const remoteTableName = customField?.RemoteTable || pSchemaField.split('ID')[1];
-					const fieldName = this._getHumanReadableFieldName(pSchemaField);
+					const fieldName = this.getHumanReadableFieldName(pSchemaField);
 					tmpFieldFilterClauses.push(Object.assign(
 					{
 						"Label": `${ fieldName }`,
@@ -575,17 +652,17 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 	 * @param {string} pSchemaField - The schema field name.
 	 * @return {string} - The human-readable name for the schema field.
 	 */
-	_getHumanReadableFieldName(pSchemaField)
+	getHumanReadableFieldName(pSchemaField)
 	{
 		if (!this._Schema || !this._Schema.properties || !this._Schema.properties[pSchemaField])
 		{
 			return pSchemaField;
 		}
-		if (pSchemaField === `ID${this.options.Entity}`)
+		if (pSchemaField === this.getIDField())
 		{
 			return `${this._getHumanReadableEntityName(this.options.Entity)} Unique Database ID`;
 		}
-		if (pSchemaField === `GUID${this.options.Entity}`)
+		if (pSchemaField === this.getGUIDField())
 		{
 			return `${this._getHumanReadableEntityName(this.options.Entity)} Unique Identifier`;
 		}
@@ -682,7 +759,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 			}
 			if (!tmpFieldFilterSchema.DisplayName)
 			{
-				tmpFieldFilterSchema.DisplayName = this._getHumanReadableFieldName(tmpSchemaField);
+				tmpFieldFilterSchema.DisplayName = this.getHumanReadableFieldName(tmpSchemaField);
 			}
 			if (!tmpFieldFilterSchema.Description)
 			{
@@ -716,7 +793,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 			for (const tmpFilterKey of Object.keys(this.pict.providers.FilterManager.filters))
 			{
 				const tmpFilterClause = this.pict.providers.FilterManager.filters[tmpFilterKey];
-				if (tmpFilterClause.CoreConnectionColumn === `ID${this.options.Entity}`)
+				if (tmpFilterClause.CoreConnectionColumn === this.getIDField())
 				{
 					//FIXME: I don't think using filter key is right here
 					let tmpFieldFilterSchema = this._FilterSchema[tmpFilterKey];
@@ -732,7 +809,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 					{
 						tmpFieldFilterSchema.RecordSet = this.options.RecordSet;
 					}
-					const tmpFieldHumanName = this._getHumanReadableFieldName(tmpFilterKey);
+					const tmpFieldHumanName = this.getHumanReadableFieldName(tmpFilterKey);
 					if (tmpFilterClause.DisplayName)
 					{
 						tmpFieldFilterSchema.DisplayName = tmpFilterClause.DisplayName;

package/source/providers/RecordSet-Router.js

@@ -46,7 +46,7 @@ class PictRecordSetRouter extends libPictProvider
 		//this.pictRouter.addRoute('/PSRS/:RecordSet/List/:Begin/:Cap', "{~LV:Record~}");
 		this.pict.views['RSP-RecordSet-List'].addRoutes(pRouter);
 		this.pict.views['RSP-RecordSet-Read'].addRoutes(pRouter);
-		this.pict.views['RSP-RecordSet-Edit'].addRoutes(pRouter);
+		this.pict.views['RSP-RecordSet-Create'].addRoutes(pRouter);
 		this.pict.views['RSP-RecordSet-Dashboard'].addRoutes(pRouter);
 
 		this.pict.PictSectionRecordSet.addRoutes(pRouter);

package/source/services/RecordsSet-MetaController.js

@@ -2,8 +2,8 @@ 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');
+const ViewRecordSetCreate = require('../views/create/RecordSet-Create.js');
 const ViewRecordSetDashboard = require('../views/dashboard/RecordSet-Dashboard.js');
 
 //_Pict.addProvider('BooksProvider', { Entity: 'Book', URLPrefix: 'http://www.datadebase.com:8086/1.0/' }, require('../source/providers/RecordSet-RecordProvider-MeadowEndpoints.js'));
@@ -41,7 +41,7 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 
 		this.childViews = {
 			list: null,
-			edit: null,
+			create: null,
 			read: null,
 			dashboard: null
 		};
@@ -229,6 +229,14 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 				{
 					providerConfiguration.Entity = pRecordSetConfiguration.RecordSet;
 				}
+				if (`FilterEndpointOverride` in pRecordSetConfiguration)
+				{
+					providerConfiguration.FilterEndpointOverride = pRecordSetConfiguration.FilterEndpointOverride;
+				}
+				else
+				{
+					providerConfiguration.FilterEndpointOverride = null;
+				}
 				// Default the URLPrefix to the base URLPrefix
 				if (`RecordSetURLPrefix` in pRecordSetConfiguration)
 				{
@@ -432,14 +440,14 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		this.pict.addTemplate(require('../views/filters').Base);
 		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);
+		this.childViews.create = this.fable.addView('RSP-RecordSet-Create', this.options, ViewRecordSetCreate);
 		this.childViews.dashboard = this.fable.addView('RSP-RecordSet-Dashboard', this.options, ViewRecordSetDashboard);
 
 		// Initialize the subviews
 		this.childViews.list.initialize();
-		this.childViews.edit.initialize();
 		this.childViews.read.initialize();
+		this.childViews.create.initialize();
 		this.childViews.dashboard.initialize();
 
 		// Now initialize the router
@@ -484,9 +492,12 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 			{
 				this.pict.log.error(`RecordSetDashboard: Manifest key ${tmpManifestKey} does not match manifest scope ${tmpManifest.Scope}.  This is bad.  Fix it.`);
 			}
-			this.generateManifestTableCells(tmpManifest);
+			if (!tmpManifest.Form)
+			{
+				this.generateManifestTableCells(tmpManifest);
+			}
 			this.manifestDefinitions[tmpManifest.Scope] = tmpManifest;
-			this.manifests[tmpManifest.Scope] = this.pict.newManyfest(tmpManifest);
+			this.manifests[tmpManifest.Scope] = tmpManifest.Form ? tmpManifest : this.pict.newManyfest(tmpManifest);
 		}
 
 		this.has_initialized = true;

package/source/views/RecordSet-RecordBaseView.js

@@ -40,7 +40,7 @@ Record JSON:
 \`\`\`json
 {~DataJson:Record~}
 \`\`\`
---!
+-->
 <!-- DefaultPackage end view template:  [PRSP-Base-View-Template] -->
 		`
 			}