pict-section-recordset 1.21.0 → 1.22.0

package/package.json

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

package/source/services/RecordsSet-MetaController.js

@@ -186,6 +186,43 @@ class RecordSetMetacontroller extends libFableServiceProviderBase
 		return this.recordSetProviderConfigurations[pRecordSet];
 	}
 
+	/**
+	 * Resolve a column name to the record-set it references, so a form can mount an entity Picker and the
+	 * read view can resolve the name. Two sources, in order:
+	 *
+	 *   1. The record-set config's explicit `ForeignKeyEntities` map ({ ColumnName: EntityName }). This is
+	 *      how non-conventional references are declared — prefixed/suffixed columns (ParentIDSample,
+	 *      ItemIDTestSpecificationSet, LinkedIDUser, IDMaterialParent, …) and any override. Mapping a
+	 *      column to a falsy value explicitly opts it OUT (keeps it a plain input).
+	 *   2. The plain `ID<Entity>` convention — a column named exactly `ID` + an entity that is a
+	 *      registered record-set (IDOrganization → Organization). No prefix heuristics; anything that
+	 *      isn't a clean `ID<Entity>` must be declared in the map above.
+	 *
+	 * Returns false for the row's own id, IDCustomer, non-references, and references this app doesn't
+	 * manage as a record-set (which then stay plain inputs).
+	 *
+	 * @param {string} pFieldName - the schema column name.
+	 * @param {Record<string, any>} [pRecordSetConfiguration] - the owning record-set's configuration.
+	 * @param {string} [pOwnIDField] - the row's own id field, excluded (e.g. 'IDTestSpecification').
+	 * @return {string|false} the referenced record-set name, or false.
+	 */
+	resolveForeignEntity(pFieldName, pRecordSetConfiguration, pOwnIDField)
+	{
+		if (!pFieldName || (typeof pFieldName !== 'string')) { return false; }
+		// 1. Explicit per-record-set mapping wins (declares exceptions; a falsy value opts a column out).
+		const tmpMap = pRecordSetConfiguration && pRecordSetConfiguration.ForeignKeyEntities;
+		if (tmpMap && Object.prototype.hasOwnProperty.call(tmpMap, pFieldName))
+		{
+			return tmpMap[pFieldName] || false;
+		}
+		// 2. Plain ID<Entity> convention, validated against the registered record-sets.
+		if ((pFieldName === pOwnIDField) || (pFieldName === 'IDCustomer')) { return false; }
+		if (!pFieldName.startsWith('ID')) { return false; }
+		const tmpRemote = pFieldName.slice(2);
+		if (!tmpRemote) { return false; }
+		return this.recordSetProviderConfigurations[tmpRemote] ? tmpRemote : false;
+	}
+
 	/**
 	 * @param {Record<string, any>} pRecordSetConfiguration - The RecordSet configuration to load.
 	 */

package/source/views/create/RecordSet-Create.js

@@ -210,14 +210,14 @@ class viewRecordSetCreate extends libPictRecordSetRecordView
 			let rowCounter = 1;
 			for (const p of Object.keys(tmpRecordCreateData.RecordSchema.properties))
 			{
-				const exclusionSet = [this.pict.providers[this.providerHash].getIDField(), this.pict.providers[this.providerHash].getGUIDField(), 'CreatingIDUser', 'UpdatingIDUser', 'DeletingIDUser', 'Deleted', 'CreateDate', 'UpdateDate', 'DeleteDate', 'Deleted'];
+				const exclusionSet = [this.pict.providers[this.providerHash].getIDField(), this.pict.providers[this.providerHash].getGUIDField(), 'CreatingIDUser', 'UpdatingIDUser', 'DeletingIDUser', 'Deleted', 'CreateDate', 'UpdateDate', 'DeleteDate', 'Deleted', 'IDCustomer', 'ExternalSyncDate', 'ExternalSyncGUID']; // IDCustomer: meadow-endpoints/retold tenancy discriminator — server-managed, never settable via the API
 				if (exclusionSet.includes(p))
 				{
 					continue;
 				}
 				const tmpDescriptor =
 				{
-					"Name": `${ this.pict.providers[pProviderHash].getHumanReadableFieldName?.() || p }`,
+					"Name": `${ this.pict.providers[pProviderHash].getHumanReadableFieldName?.(p) || p }`,
 					"Hash": `${ tmpRecordCreateData.RecordSet }-${ p }`,
 					"DataType": "String",
 					"PictForm": 
@@ -256,6 +256,17 @@ class viewRecordSetCreate extends libPictRecordSetRecordView
 						tmpDescriptor.DataType = 'String';
 				}
 
+				const tmpForeignEntity = this.pict.PictSectionRecordSet.resolveForeignEntity(p, pRecordConfiguration, this.pict.providers[this.providerHash].getIDField());
+				if (tmpForeignEntity && this.pict.providers['Pict-Section-Picker'])
+				{
+					// Foreign-key column → searchable entity Picker (edit) + resolved name (read).
+					tmpDescriptor.PictForm.InputType = 'Picker';
+					tmpDescriptor.PictForm.Entity = tmpForeignEntity;
+					const tmpForeignConfig = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[tmpForeignEntity];
+					if (tmpForeignConfig && tmpForeignConfig.SearchFields) { tmpDescriptor.PictForm.SearchFields = tmpForeignConfig.SearchFields; }
+				}
+				// Per-record-set label override (e.g. Contract/Project IDOrganization → "Prime Contractor").
+				if (pRecordConfiguration.FieldLabels && pRecordConfiguration.FieldLabels[p]) { tmpDescriptor.Name = pRecordConfiguration.FieldLabels[p]; }
 				this.defaultManifest.Descriptors[`${ tmpRecordCreateData.RecordSet }Details.${ p }`] = tmpDescriptor;
 			}
 			this.pict.TemplateProvider.addTemplate(`PRSP-Create-RecordCreate-Template`, /*html*/`

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

@@ -218,6 +218,8 @@ class viewRecordSetDashboard extends libPictRecordSetRecordView
 			'DeletingIDUser',
 			'UpdateDate',
 			'UpdatingIDUser',
+			'IDCustomer', // meadow-endpoints/retold tenancy discriminator — server-managed, hidden from every record view
+			'ExternalSyncDate', 'ExternalSyncGUID', // external-sync auditing stamps (Headlight integration sync)
 		];
 
 		const tmpSchema = pRecordListData.RecordSchema;

package/source/views/list/RecordSet-List-Title.js

@@ -34,8 +34,16 @@ const _DEFAULT_CONFIGURATION_List_Title =
 	<header id="PRSP_Title_Container">
 		<h1 id="PRSP_Title">{~D:Record.Title~}</h1>
 		<h2 id="PRSP_Subtitle">{~D:Record.Subtitle~}</h2>
+		{~TIfAbs:PRSP-List-Title-CreateButton-Template:Record:Record.RecordSetConfiguration.RecordSetListShowCreateButton^TRUE^~}
 	</header>
 	<!-- DefaultPackage end view template:	[PRSP-List-Title-Template] -->
+`
+		},
+		{
+			Hash: 'PRSP-List-Title-CreateButton-Template',
+			Template: /*html*/`
+	<!-- Optional list "New" action; opt in per record set via RecordSetConfiguration.RecordSetListShowCreateButton. -->
+	<button type="button" class="prsp-list-title-create" title="Create a new record" onclick="_Pict.views['RSP-RecordSet-List'].createNew('{~D:Record.RecordSet~}')">{~I:Plus~} New</button>
 `
 		},
 	],

package/source/views/list/RecordSet-List.js

@@ -189,6 +189,26 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		return true;
 	}
 
+	/**
+	 * Navigate to the Create form for a record set. Backs the optional list title-bar "New" button
+	 * (opt in per record set via RecordSetConfiguration.RecordSetListShowCreateButton). Routes through
+	 * the section router so it works in both hash and memory router modes; falls back to the active
+	 * route's record set when called without an argument.
+	 * @param {string} [pRecordSet] - The record set to create a new record in.
+	 * @return {boolean} True when navigation was issued.
+	 */
+	createNew(pRecordSet)
+	{
+		const tmpRecordSet = pRecordSet || this.fable?.providers?.RecordSetRouter?.pictRouter?.router?.current?.[0]?.data?.RecordSet;
+		if (!tmpRecordSet)
+		{
+			this.log.warn(`RecordSetList: createNew called but no record set could be resolved.`);
+			return false;
+		}
+		this.fable.providers.RecordSetRouter.pictRouter.navigate(`/PSRS/${ tmpRecordSet }/Create`);
+		return true;
+	}
+
 	onBeforeRenderList(pRecordListData)
 	{
 		return pRecordListData;
@@ -269,6 +289,8 @@ class viewRecordSetList extends libPictRecordSetRecordView
 			'DeletingIDUser',
 			'UpdateDate',
 			'UpdatingIDUser',
+			'IDCustomer', // meadow-endpoints/retold tenancy discriminator — server-managed, hidden from every record view
+			'ExternalSyncDate', 'ExternalSyncGUID', // external-sync auditing stamps (Headlight integration sync)
 		];
 	}
 

package/source/views/read/RecordSet-Read.js

@@ -5,7 +5,9 @@ const libViewAssociationEditor = require('../associate/RecordSet-AssociationEdit
 // surfaced through the record audit header (the first-class activity line + the Details
 // modal), not inline in the record body. The entity's own ID/GUID field names are added
 // at suppression time via the provider's getIDField()/getGUIDField().
-const _AUDIT_FIELD_NAMES = ['CreatingIDUser', 'UpdatingIDUser', 'DeletingIDUser', 'Deleted', 'CreateDate', 'UpdateDate', 'DeleteDate'];
+// Audit / sync-bookkeeping fields suppressed from the record body and surfaced in the Details modal.
+// ExternalSyncDate / ExternalSyncGUID are the external-sync auditing stamps (Headlight integration sync).
+const _AUDIT_FIELD_NAMES = ['CreatingIDUser', 'UpdatingIDUser', 'DeletingIDUser', 'Deleted', 'CreateDate', 'UpdateDate', 'DeleteDate', 'ExternalSyncDate', 'ExternalSyncGUID'];
 
 /** @type {Record<string, any>} */
 const _DEFAULT_CONFIGURATION__Read = (
@@ -43,9 +45,10 @@ const _DEFAULT_CONFIGURATION__Read = (
 			.prsp-audit-button:hover { border-color: var(--theme-color-brand-primary, #156dd1); color: var(--theme-color-brand-primary, #156dd1); }
 			.prsp-record-related:empty { display: none; }
 			.prsp-audit-anchor { position: relative; }
-			.prsp-audit-popover { position: absolute; top: calc(100% + 8px); right: 0; min-width: 320px; max-width: 90vw; background: var(--theme-color-background-panel, #fff); border: 1px solid var(--theme-color-border-default, #d7dce3); border-radius: 10px; box-shadow: 0 14px 36px rgba(15, 23, 42, 0.18); padding: 1rem 1.1rem; z-index: 40; display: none; }
+			.prsp-audit-popover { position: absolute; top: calc(100% + 8px); right: 0; min-width: 380px; width: max-content; max-width: 90vw; background: var(--theme-color-background-panel, #fff); border: 1px solid var(--theme-color-border-default, #d7dce3); border-radius: 10px; box-shadow: 0 14px 36px rgba(15, 23, 42, 0.18); padding: 1rem 1.1rem; z-index: 40; display: none; }
 			.prsp-audit-popover.is-open { display: block; }
-			.prsp-audit-dl { display: grid; grid-template-columns: auto 1fr; gap: 0.6rem 1rem; align-items: baseline; margin: 0; }
+			.prsp-audit-dl { display: grid; grid-template-columns: auto auto; gap: 0.6rem 1rem; align-items: baseline; margin: 0; }
+			.prsp-audit-dl dd { white-space: nowrap; }
 			.prsp-audit-dl dt { color: var(--theme-color-text-muted, #6b7686); font-size: 0.74rem; text-transform: uppercase; letter-spacing: 0.03em; white-space: nowrap; }
 			.prsp-audit-dl dd { margin: 0; color: var(--theme-color-text-primary, #1f2733); font-size: 0.9rem; }
 			.prsp-audit-dl dd small { color: var(--theme-color-text-muted, #6b7686); }
@@ -59,6 +62,18 @@ const _DEFAULT_CONFIGURATION__Read = (
 			.prsp-record-read input.input[readonly], .prsp-record-read input.input[disabled], .prsp-record-read textarea[readonly], .prsp-record-read textarea[disabled], .prsp-record-read select[disabled] { background: transparent !important; border-color: transparent !important; box-shadow: none !important; padding-left: 0 !important; padding-right: 0 !important; height: auto !important; min-height: 0 !important; opacity: 1 !important; cursor: default !important; color: var(--theme-color-text-primary, #1f2733) !important; -webkit-text-fill-color: var(--theme-color-text-primary, #1f2733) !important; font-weight: 600 !important; font-size: 1.1rem !important; }
 			.prsp-record-read .label { font-size: 0.68rem !important; font-weight: 600 !important; text-transform: uppercase !important; letter-spacing: 0.05em !important; color: var(--theme-color-text-muted, #6b7686) !important; margin-bottom: 0.05rem !important; }
 			.prsp-record-read .section-header { background: var(--theme-color-background-selected, #e3edfb) !important; color: var(--theme-color-brand-primary, #156dd1) !important; font-size: 0.74rem !important; font-weight: 700 !important; text-transform: uppercase !important; letter-spacing: 0.06em !important; padding: 0.4rem 0.8rem !important; border-radius: 6px !important; border-bottom: 0 !important; margin: 1.1rem 0 0.7rem !important; }
+				/* Record header — a readable title (the record's own name, via a heuristic) with the entity
+				   type as an eyebrow, instead of a raw "RecordSet GUIDField [guid]" string. */
+			.prsp-read-head { margin: 0 0 1.1rem; }
+			.prsp-read-eyebrow { font-size: 0.72rem; font-weight: 650; text-transform: uppercase; letter-spacing: 0.06em; color: var(--theme-color-text-muted, #6b7686); }
+			.prsp-read-title { font-size: 1.5rem; font-weight: 700; line-height: 1.2; margin: 0.1rem 0 0; color: var(--theme-color-text-primary, #1f2733); }
+				/* Read-view association tabs — pill nav, shared by the Tab and Split layouts (single source;
+				   layouts style only their own nav container). */
+			.psrs-tab { padding: 0.4rem 0.85rem; border: 1px solid var(--theme-color-border-default, #d7dce3); border-radius: 8px; cursor: pointer; font-size: 0.88rem; color: var(--theme-color-text-secondary, #45505f); background: var(--theme-color-background-panel, #fff); user-select: none; transition: all 0.15s ease; }
+			.psrs-tab:hover { background: var(--theme-color-background-tertiary, #eceef2); color: var(--theme-color-text-primary, #1f2733); }
+			.psrs-tab.is-active { border-color: var(--theme-color-brand-primary, #156dd1); background: var(--theme-color-background-selected, #e3edfb); color: var(--theme-color-brand-primary, #156dd1); font-weight: 600; }
+			.psrs-tab-body { display: none; }
+			.psrs-tab-body.is-active { display: block; }
 		`,
 		CSSPriority: 500,
 
@@ -119,11 +134,22 @@ const _DEFAULT_CONFIGURATION__Read = (
 					Hash: 'PRSP-Read-RecordTabNav-Template',
 					Template: /*html*/`<!-- Placeholder for tabs, something has gone wrong if this comment is rendered. -->`
 				},
+				{
+					// Readable record header, shared by all three layouts: the record's display name (heuristic)
+					// over a small entity-type eyebrow, falling back to the GUID field + value when the record
+					// has no obvious name. DisplayTitle / TitleEyebrow are computed in renderRead().
+					Hash: 'PRSP-Read-Header-Template',
+					Template: /*html*/`
+						<div class="prsp-read-head">
+							<div class="prsp-read-eyebrow">{~D:Record.TitleEyebrow~}</div>
+							<h1 class="prsp-read-title">{~D:Record.DisplayTitle~}</h1>
+						</div>`
+				},
 				{
 					Hash: 'PRSP-Read-Basic-Template',
 					Template: /*html*/`
 						<!-- DefaultPackage pict view template: [PRSP-Read-Basic-Template] -->
-						<h1>{~D:Record.RecordSet~} {~D:Record.GUIDAddress~} [{~D:Record.RecordConfiguration.GUIDRecord~}]</h1>
+						{~T:PRSP-Read-Header-Template~}
 						<!--
 						{~DJ:Record~}
 						-->
@@ -156,7 +182,7 @@ const _DEFAULT_CONFIGURATION__Read = (
 							.psrs-split-view.psrs-collapsed #psrs-resize { display: none; }
 							.psrs-split-view.psrs-collapsed .psrs-left-panel { min-width: 100% !important; width: 100%; }
 						</style>
-						<h1>{~D:Record.RecordSet~} {~D:Record.GUIDAddress~} [{~D:Record.RecordConfiguration.GUIDRecord~}]</h1>
+						{~T:PRSP-Read-Header-Template~}
 						<div class="psrs-split-tabnav">{~T:PRSP-Read-RecordTabNav-Template~}</div>
 						<div class="psrs-split-view psrs-collapsed">
 							<div class="psrs-left-panel" style="min-width: {~D:Record.SplitLeftWidth~};">
@@ -174,36 +200,14 @@ const _DEFAULT_CONFIGURATION__Read = (
 					Hash: 'PRSP-Read-Tab-Template',
 					Template: /*html*/`
 						<!-- DefaultPackage pict view template: [PRSP-Read-Tab-Template] -->
-						<h1>{~D:Record.RecordSet~} {~D:Record.GUIDAddress~} [{~D:Record.RecordConfiguration.GUIDRecord~}]</h1>
+						{~T:PRSP-Read-Header-Template~}
 						<!--
 						{~DJ:Record~}
 						-->
 						<style>
-							#PRSP-Read-Tab-Nav
-							{
-								display: flex;
-								border-bottom: 1px solid rgba(0,0,0,0.5);
-								margin-bottom: 20px;
-								width: 100%;
-							}
-							.psrs-tab.is-active
-							{
-								border: 1px solid rgba(0,0,0,0.5);
-							}
-							.psrs-tab
-							{
-								padding: 10px;
-								border-right: 1px solid rgba(0,0,0,0.5);
-								border-left: 1px solid rgba(0,0,0,0.5);
-							}
-							.psrs-tab-body
-							{
-								display: none;
-							}
-							.psrs-tab-body.is-active
-							{
-								display: inherit;
-							}
+							/* Tab layout owns only its nav container; the pill styling for .psrs-tab /
+							   .psrs-tab-body is shared from the view's persistent CSS block. */
+							#PRSP-Read-Tab-Nav { display: flex; flex-wrap: wrap; gap: 0.35rem; width: 100%; margin: 0 0 1.25rem; padding-bottom: 0.5rem; border-bottom: 1px solid var(--theme-color-border-light, #e8ebf0); }
 						</style>
 						<div class="psrs-tab-view">
 							<div id="PRSP-Read-Tabs-Container">
@@ -241,6 +245,7 @@ const _DEFAULT_CONFIGURATION__Read = (
 										{~TS:PRSP-Read-RecordAudit-Created-Template:AppData.PRSP_RecordAudit.CreatedSlot~}
 										{~TS:PRSP-Read-RecordAudit-Updated-Template:AppData.PRSP_RecordAudit.UpdatedSlot~}
 										{~TS:PRSP-Read-RecordAudit-Deleted-Template:AppData.PRSP_RecordAudit.DeletedSlot~}
+										{~TS:PRSP-Read-RecordAudit-ExternalSync-Template:AppData.PRSP_RecordAudit.ExternalSyncSlot~}
 									</dl>
 								</div>
 							</div>
@@ -267,6 +272,14 @@ const _DEFAULT_CONFIGURATION__Read = (
 					Hash: 'PRSP-Read-RecordAudit-Deleted-Template',
 					Template: /*html*/`<dt>Deleted</dt><dd class="is-deleted">{~DateFormat:Record.Date^MMM D, YYYY - h:mm A~} <small>by {~E:User^Record.UserID^PRSP-Read-RecordAudit-UserName-Template~}</small></dd>`
 				},
+				{
+					Hash: 'PRSP-Read-RecordAudit-ExternalSync-Template',
+					Template: /*html*/`<dt>External sync</dt><dd>{~TIfAbs:PRSP-Read-RecordAudit-ExternalSyncDate-Template:Record:Record.HasDate^TRUE^~}{~NE:Record.NeverSynced^Never synced~}</dd>`
+				},
+				{
+					Hash: 'PRSP-Read-RecordAudit-ExternalSyncDate-Template',
+					Template: /*html*/`{~DateFormat:Record.Date^MMM D, YYYY - h:mm A~}`
+				},
 				{
 					// Soft-deleted record banner (the ViewDeleted route, or a record deleted out from
 					// under a normal View). The one-or-zero-element DeletedBannerSlot drives it.
@@ -517,7 +530,9 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 			DeletedSlot: tmpDeleted ? [{ Date: pRecord.DeleteDate, UserID: pRecord.DeletingIDUser }] : [],
 			// The ViewDeleted route's banner: present whenever the record is soft-deleted (whether the
 			// user arrived via ViewDeleted or the record was deleted out from under a normal View).
-			DeletedBannerSlot: (!!pRecord.Deleted) ? [{ Date: pRecord.DeleteDate, UserID: pRecord.DeletingIDUser, HasDate: this._validAuditDate(pRecord.DeleteDate) }] : []
+			DeletedBannerSlot: (!!pRecord.Deleted) ? [{ Date: pRecord.DeleteDate, UserID: pRecord.DeletingIDUser, HasDate: this._validAuditDate(pRecord.DeleteDate) }] : [],
+			// External-sync auditing stamp — surfaced in the Details modal for entities that carry the field.
+			ExternalSyncSlot: ('ExternalSyncDate' in pRecord) ? [{ Date: pRecord.ExternalSyncDate, HasDate: this._validAuditDate(pRecord.ExternalSyncDate), NeverSynced: !this._validAuditDate(pRecord.ExternalSyncDate) }] : []
 		};
 	}
 
@@ -656,7 +671,7 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 			return;
 		}
 		const tmpProvider = this.pict.providers[this.providerHash];
-		const tmpSuppress = _AUDIT_FIELD_NAMES.slice();
+		const tmpSuppress = _AUDIT_FIELD_NAMES.concat('IDCustomer'); // IDCustomer: meadow-endpoints/retold tenancy discriminator — server-managed
 		if (tmpProvider)
 		{
 			tmpSuppress.push(tmpProvider.getIDField());
@@ -821,6 +836,14 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 			`);
 		}
 
+		// Readable record header: the record's own name (heuristic — Name / Title / DisplayName / …),
+		// with the entity type (camelCase split) as an eyebrow. Falls back to the GUID field + value
+		// when the record has no obvious display field. Computed before onBeforeRenderRead so apps can
+		// still override DisplayTitle / TitleEyebrow there.
+		const tmpReadableName = this._computeDisplayName(tmpRecordReadData.Record);
+		tmpRecordReadData.DisplayTitle = tmpReadableName || `${ tmpRecordReadData.GUIDAddress } [${ pRecordConfiguration.GUIDRecord }]`;
+		tmpRecordReadData.TitleEyebrow = String(pRecordConfiguration.RecordSet || '').replace(/([a-z0-9])([A-Z])/g, '$1 $2');
+
 		tmpRecordReadData = this.onBeforeRenderRead(tmpRecordReadData);
 
 		this.renderAsync(`PRSP_Renderable_Read_${ this.layoutType }`, tmpRecordReadData.RenderDestination, tmpRecordReadData,
@@ -954,14 +977,14 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 		const schema = await this.pict.providers[providerHash].getRecordSchema();
 		for (const p of Object.keys(schema.properties))
 		{
-			const exclusionSet = [this.pict.providers[this.providerHash].getIDField(), this.pict.providers[this.providerHash].getGUIDField()].concat(_AUDIT_FIELD_NAMES);
+			const exclusionSet = [this.pict.providers[this.providerHash].getIDField(), this.pict.providers[this.providerHash].getGUIDField()].concat(_AUDIT_FIELD_NAMES, 'IDCustomer');
 			if (exclusionSet.includes(p))
 			{
 				continue;
 			}
 			const tmpDescriptor =
 			{
-				"Name": `${ this.pict.providers[providerHash].getHumanReadableFieldName?.() || p }`,
+				"Name": `${ this.pict.providers[providerHash].getHumanReadableFieldName?.(p) || p }`,
 				"Hash": `${ this.pict.providers[this.providerHash].options.Entity  }-${ p }`,
 				"DataType": "String",
 				"PictForm": 
@@ -1000,6 +1023,28 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 					tmpDescriptor.DataType = 'String';
 			}
 
+			const tmpForeignEntity = this.pict.PictSectionRecordSet.resolveForeignEntity(p, this.pict.PictSectionRecordSet.recordSetProviderConfigurations[recordSet], this.pict.providers[this.providerHash].getIDField());
+			if (tmpForeignEntity && this.pict.providers['Pict-Section-Picker'])
+			{
+				// Foreign-key column → searchable entity Picker (edit) + resolved name (read, see the view-mode override).
+				tmpDescriptor.PictForm.InputType = 'Picker';
+				tmpDescriptor.PictForm.Entity = tmpForeignEntity;
+				const tmpForeignConfig = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[tmpForeignEntity];
+				if (tmpForeignConfig && tmpForeignConfig.SearchFields) { tmpDescriptor.PictForm.SearchFields = tmpForeignConfig.SearchFields; }
+			}
+			// Per-record-set label override (e.g. Contract/Project IDOrganization → "Prime Contractor").
+			const tmpReadRSConfig = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[recordSet];
+			if (tmpReadRSConfig && tmpReadRSConfig.FieldLabels && tmpReadRSConfig.FieldLabels[p]) { tmpDescriptor.Name = tmpReadRSConfig.FieldLabels[p]; }
+			// JSON/object columns → embedded ObjectEditor (read-only tree in View, editable in Edit). Driven by the
+			// schema column type, with a per-record-set ObjectEditorFields list to opt in string-typed JSON blobs.
+			// Gated on the pict-section-form ObjectEditor input being registered (graceful on older form versions).
+			const tmpObjectEditorFields = (tmpReadRSConfig && Array.isArray(tmpReadRSConfig.ObjectEditorFields)) ? tmpReadRSConfig.ObjectEditorFields : [];
+			if (tmpDescriptor.PictForm.InputType !== 'Picker' && this.pict.providers['Pict-Input-ObjectEditor'] &&
+				(schema.properties[p].type === 'object' || schema.properties[p].type === 'json' || tmpObjectEditorFields.includes(p)))
+			{
+				tmpDescriptor.DataType = 'Object';
+				tmpDescriptor.PictForm.InputType = 'ObjectEditor';
+			}
 			defaultManifest.Descriptors[`${ recordSet }Details.${ p }`] = tmpDescriptor;
 		}
 		return defaultManifest;
@@ -1030,6 +1075,11 @@ class viewRecordSetRead extends libPictRecordSetRecordView
 				{
 					tmpManifest.Descriptors[x].PictForm = {};
 				}
+				// Entity-reference (Picker) fields stay a Picker but render read-only (the resolved entity
+				// name as plain text, no dropdown); everything else becomes plain read-only text.
+				if (tmpManifest.Descriptors[x].PictForm.InputType === 'Picker') { tmpManifest.Descriptors[x].PictForm.ReadOnly = true; continue; }
+				// ObjectEditor stays an ObjectEditor but renders its read-only tree (not a plain text field).
+				if (tmpManifest.Descriptors[x].PictForm.InputType === 'ObjectEditor') { tmpManifest.Descriptors[x].PictForm.ReadOnly = true; continue; }
 				tmpManifest.Descriptors[x].PictForm.InputType = 'ReadOnly';
 			}
 		}