pict-section-recordset 1.8.1 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pict-section-recordset",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "Pict dynamic record set management views",
   "main": "source/Pict-Section-RecordSet.js",
   "files": [
@@ -37,9 +37,9 @@
     "browser-env": "^3.3.0",
     "eslint": "^9.28.0",
     "jquery": "^3.7.1",
-    "pict": "^1.0.373",
+    "pict": "^1.0.372",
     "pict-application": "^1.0.34",
-    "pict-docuserve": "^1.4.19",
+    "pict-docuserve": "^1.4.4",
     "pict-service-commandlineutility": "^1.0.19",
     "quackage": "^1.3.0",
     "typescript": "^5.9.3"
@@ -48,7 +48,7 @@
     "fable-serviceproviderbase": "^3.0.19",
     "pict-provider": "^1.0.13",
     "pict-router": "^1.0.10",
-    "pict-section-form": "^1.1.9",
+    "pict-section-form": "^1.0.196",
     "pict-template": "^1.0.15",
     "pict-view": "^1.0.68",
     "sinon": "^21.0.1"

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

@@ -477,6 +477,43 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		return pRecord;
 	}
 
+	/**
+	 * The "list entry" display template for an entity — how one of its records should read as a single line
+	 * in a picker option / selected chip. Returns a pict template string (rendered against the raw record by
+	 * the picker's TextTemplate), or null to fall back to a single display field.
+	 *
+	 * This is deliberately a small, overridable seam: today it hard-knows `User` (whose name lives across
+	 * NameFull / NameFirst+NameLast and needs an Email/LoginID disambiguator), but the intent is that this
+	 * eventually reads a per-entity template off the Stricture schema instead of branching here.
+	 *
+	 * @param {string} pEntityName - The entity (e.g. 'User').
+	 * @return {string|null}
+	 */
+	getEntityListEntryTemplate(pEntityName)
+	{
+		// Register the User branching fall-backs once. addTemplate is idempotent (keyed by hash), so the
+		// guard is just to avoid the churn of re-registering on every descriptor build.
+		if (!this._entityListEntryTemplatesRegistered)
+		{
+			this._entityListEntryTemplatesRegistered = true;
+			// Name fallback: when NameFull is empty, compose it from the parts.
+			this.pict.TemplateProvider.addTemplate('RSP-EntityListEntry-User-NameParts', '{~D:Record.NameFirst~} {~D:Record.NameLast~}');
+			// Disambiguator fallback: when Email is empty, use the LoginID.
+			this.pict.TemplateProvider.addTemplate('RSP-EntityListEntry-User-Login', '{~D:Record.LoginID~}');
+		}
+
+		switch (pEntityName)
+		{
+			case 'User':
+				// "<name> (<email>)" — name is NameFull, else NameFirst+NameLast; the parenthetical is Email,
+				// else LoginID. Stable across the three name-field variations and unique enough to tell apart
+				// many same-named users.
+				return '{~DWTF:Record.NameFull:RSP-EntityListEntry-User-NameParts~} ({~DWTF:Record.Email:RSP-EntityListEntry-User-Login~})';
+			default:
+				return null;
+		}
+	}
+
 	/**
 	 * @param {string} pSchemaField - The schema field name.
 	 * @param {Record<string, any>} pColumn - The full column definition from the schema.
@@ -498,29 +535,23 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 			const tmpFieldHumanName = this.getHumanReadableFieldName(pSchemaField);
 			const isUserAuditField = ['CreatingIDUser', 'DeletingIDUser', 'UpdatingIDUser'].includes(pSchemaField);
 			const customFilterClauses = this.options.Filters?.[pSchemaField];
-			// The entity's own identity column (AutoIdentity / AutoGUID) — i.e. the primary key.
-			const isOwnIdentityField = pMeadowSchemaField && (pMeadowSchemaField.Type === 'AutoIdentity' || pMeadowSchemaField.Type === 'AutoGUID');
-			const isForeignKeyLike = pSchemaField.startsWith('ID') || pSchemaField.startsWith('ParentID') || isUserAuditField || customFilterClauses;
-			if (isForeignKeyLike)
+			if (pSchemaField.startsWith('ID') || pSchemaField.startsWith('ParentID') || isUserAuditField || customFilterClauses)
 			{
 				for (const customField of Array.isArray(customFilterClauses) ? customFilterClauses : [customFilterClauses])
 				{
-					// The table the picker pulls from: an explicit RemoteTable, else this
-					// recordset's declared Entity when the column is our own primary key (the PK
-					// references our own records), else the name peeled from the column for a
-					// plain foreign key. Peeling alone is the defect — a lake PK like
-					// `IDC182_HMA_MixDesign` peels to a table name that is not the entity name.
-					const remoteTableName = customField?.RemoteTable || (isOwnIdentityField ? this.options.Entity : pSchemaField.split('ID')[1]);
+					const remoteTableName = customField?.RemoteTable || pSchemaField.split('ID')[1];
 					const fieldName = this.getHumanReadableFieldName(pSchemaField);
 					tmpFieldFilterClauses.push(Object.assign(
 					{
 						"Label": `${ fieldName }`,
 						"Type": "InternalJoinSelectedValueList",
-						"ExternalFilterByColumns": remoteTableName === 'User' ? [ 'NameFirst', 'NameLast' ] : [ 'Name' ],
+						"ExternalFilterByColumns": remoteTableName === 'User' ? [ 'NameFirst', 'NameLast', 'Email', 'LoginID' ] : [ 'Name' ],
 						"ExternalRecordDisplayTemplate": remoteTableName === 'User' ? '{~D:Record.Data.NameFirst~} {~D:Record.Data.NameLast~}' : '{~D:Record.Name~}',
+						// The picker's option/selected display: a per-entity "list entry" template (the seam that
+						// will eventually live on the Stricture schema). Disambiguates beyond a single column.
+						"EntityListEntryTemplate": this.getEntityListEntryTemplate(remoteTableName),
 						"CoreConnectionColumn": pSchemaField,
 						"RemoteTable": `${ remoteTableName }`,
-						"URLPrefix": this.options.URLPrefix,
 						"JoinExternalConnectionColumn": `ID${ remoteTableName }`,
 						"JoinInternalConnectionColumn": pSchemaField,
 						'DisplayName': `Selected Records`,
@@ -530,10 +561,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 					}, customField));
 				}
 			}
-			// The primary key is also a plain integer key, so it ALSO falls through to the
-			// Exact / In Range clauses below. A real foreign key gets only the picker; ordinary
-			// columns are matched by type.
-			if (!isForeignKeyLike || isOwnIdentityField)
+			else
 			{
 				switch (tmpFieldType)
 				{

package/source/views/RecordSet-Filters.js

@@ -683,6 +683,9 @@ class ViewRecordSetSUBSETFilters extends libPictView
 			ValueField: tmpDescriptor.JoinExternalConnectionColumn || `ID${tmpDescriptor.RemoteTable}`,
 			SearchFields: tmpSearchFields,
 			TextField: tmpSearchFields[0],
+			// Composed, disambiguated option/chip label (e.g. "Brian Smith (brian@…)") — falls back to
+			// TextField when the entity has no list-entry template.
+			TextTemplate: tmpDescriptor.EntityListEntryTemplate || undefined,
 			Placeholder: `Select ${pMount.Label}…`,
 			OnChange: (pValue) => this.applyQuickFilterEntity(pRecordSet, pViewContext, pMount.Field, pMount.ClauseKey, pValue),
 		});

package/source/views/filters/RecordSet-Filter-EntityReference-Base.js

@@ -156,6 +156,9 @@ class ViewRecordSetSUBSETFilterEntityReferenceBase extends ViewRecordSetSUBSETFi
 			pRecord.ClauseDescriptor.PictForm.Multiple = this.isMultiSelect();
 			pRecord.ClauseDescriptor.PictForm.SearchFields = pRecord.ClauseDescriptor.PictForm.SearchFields
 				|| pRecord.ExternalFilterByColumns || (pRecord.ExternalFilterByColumn ? [ pRecord.ExternalFilterByColumn ] : [ 'Name' ]);
+			// Composed, disambiguated option/chip label (the entity's "list entry" template); falls back to a
+			// single display field when unset.
+			pRecord.ClauseDescriptor.PictForm.TextTemplate = pRecord.ClauseDescriptor.PictForm.TextTemplate || pRecord.EntityListEntryTemplate;
 			pRecord.ClauseDescriptor.PictForm.ValueArrayAddress = pRecord.ClauseValuesAddress;
 			pRecord.ClauseDescriptor.PictForm.GetContextScopeFilter = () => this.getContextScopeFilter(this.getInformaryScopedValue(pRecord.ClauseAddress) || pRecord);
 			// JoinEntity compound display (host opt-in on the clause): show each searched row joined to a
@@ -230,7 +233,6 @@ class ViewRecordSetSUBSETFilterEntityReferenceBase extends ViewRecordSetSUBSETFi
 					Destination: pOffset > 0 ? `${this.getInformaryAddressPrefix()}${pClauseInformaryAddress}.SearchResultsAppend` : `${this.getInformaryAddressPrefix()}${pClauseInformaryAddress}.SearchResults`,
 					RecordStartCursor: pOffset,
 					PageSize: this.options.PageSize,
-					URLPrefix: tmpClause.URLPrefix,
 				}
 			],
 			() =>