pict-section-recordset 1.0.40 → 1.0.41

package/package.json

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

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

@@ -481,130 +481,12 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 			}
 			this.initializeEntitySchema(() =>
 			{
-				const tmpSchema = this._Schema;
-				if (!tmpSchema || !tmpSchema.properties)
+				if (pError)
 				{
 					return fCallback(pError);
 				}
-				const tmpProperties = tmpSchema?.properties;
-				// loop through the schema and add the columns to the tableCells
-				let tmpOrdinal = 0;
-				for (const tmpSchemaField in tmpProperties)
-				{
-					if (this.ignoreFilterFields.includes(tmpSchemaField))
-					{
-						continue;
-					}
-					++tmpOrdinal;
-					const tmpColumn = tmpProperties[tmpSchemaField];
-					let tmpFieldFilterSchema = this._FilterSchema[tmpSchemaField];
-					if (!tmpFieldFilterSchema)
-					{
-						this._FilterSchema[tmpSchemaField] = tmpFieldFilterSchema = { };
-					}
-					if (!tmpFieldFilterSchema.FilterKey)
-					{
-						tmpFieldFilterSchema.FilterKey = tmpSchemaField;
-					}
-					if (!tmpFieldFilterSchema.RecordSet)
-					{
-						tmpFieldFilterSchema.RecordSet = this.options.RecordSet;
-					}
-					if (!tmpFieldFilterSchema.DisplayName)
-					{
-						tmpFieldFilterSchema.DisplayName = this._getHumanReadableFieldName(tmpSchemaField);
-					}
-					if (!tmpFieldFilterSchema.Description)
-					{
-						tmpFieldFilterSchema.Description = `Filter by ${tmpFieldFilterSchema.DisplayName}`;
-					}
-					if (!tmpFieldFilterSchema.HelpText)
-					{
-						tmpFieldFilterSchema.HelpText = `Filter by ${tmpFieldFilterSchema.DisplayName} for the ${this._getHumanReadbleEntityName(this.options.Entity)} entity.`;
-					}
-					if (tmpFieldFilterSchema.Ordinal == null)
-					{
-						tmpFieldFilterSchema.Ordinal = tmpOrdinal;
-					}
-					if (!Array.isArray(tmpFieldFilterSchema.AvailableClauses))
-					{
-						tmpFieldFilterSchema.AvailableClauses = [];
-					}
-					const tmpFieldFilterClauses = this.getFieldFilterClauses(tmpSchemaField, tmpColumn);
-					if (Array.isArray(tmpFieldFilterClauses) && tmpFieldFilterClauses.length > 0)
-					{
-						for (const tmpFilterClause of tmpFieldFilterClauses)
-						{
-							//TODO: allow customization of filter order
-							tmpFilterClause.Ordinal = tmpFieldFilterSchema.AvailableClauses.length + 1;
-							tmpFieldFilterSchema.AvailableClauses.push(tmpFilterClause);
-						}
-					}
-				}
-				if (typeof this.pict.providers.FilterManager.filters === 'object')
-				{
-					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}`)
-						{
-							//FIXME: I don't think using filter key is right here
-							let tmpFieldFilterSchema = this._FilterSchema[tmpFilterKey];
-							if (!tmpFieldFilterSchema)
-							{
-								this._FilterSchema[tmpFilterKey] = tmpFieldFilterSchema = { };
-							}
-							if (!tmpFieldFilterSchema.FilterKey)
-							{
-								tmpFieldFilterSchema.FilterKey = tmpFilterKey;
-							}
-							if (!tmpFieldFilterSchema.RecordSet)
-							{
-								tmpFieldFilterSchema.RecordSet = this.options.RecordSet;
-							}
-							const tmpFieldHumanName = this._getHumanReadableFieldName(tmpFilterKey);
-							if (tmpFilterClause.DisplayName)
-							{
-								tmpFieldFilterSchema.DisplayName = tmpFilterClause.DisplayName;
-							}
-							if (!tmpFieldFilterSchema.DisplayName)
-							{
-								tmpFieldFilterSchema.DisplayName = tmpFieldHumanName;
-							}
-							if (!tmpFieldFilterSchema.Description)
-							{
-								tmpFieldFilterSchema.Description = tmpFilterClause.Description || `Filter by ${tmpFieldFilterSchema.DisplayName}`;
-							}
-							if (!tmpFieldFilterSchema.HelpText)
-							{
-								tmpFieldFilterSchema.HelpText = tmpFilterClause.HelpText || `Filter by ${tmpFieldFilterSchema.DisplayName} for the ${this._getHumanReadbleEntityName(this.options.Entity)} entity.`;
-							}
-							if (tmpFieldFilterSchema.Ordinal == null)
-							{
-								tmpFieldFilterSchema.Ordinal = tmpOrdinal;
-							}
-							if (!Array.isArray(tmpFieldFilterSchema.AvailableClauses))
-							{
-								tmpFieldFilterSchema.AvailableClauses = [];
-							}
-							tmpFieldFilterSchema.AvailableClauses.push(tmpFilterClause);
-							if (!tmpFilterClause.FilterKey)
-							{
-								tmpFilterClause.FilterKey = tmpFilterKey;
-							}
-							if (!tmpFilterClause.ClauseKey)
-							{
-								tmpFilterClause.ClauseKey = tmpFilterKey;
-							}
-							if (!tmpFilterClause.DisplayName)
-							{
-								tmpFilterClause.DisplayName = tmpFieldHumanName;
-							}
-							tmpFilterClause.Ordinal = tmpFieldFilterSchema.AvailableClauses.length + 1;
-						}
-					}
-				}
-				return fCallback(pError);
+				this.initializeFilterSchema();
+				return fCallback();
 			});
 		});
 	}
@@ -687,6 +569,133 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 		});
 	}
 
+	initializeFilterSchema()
+	{
+		const tmpSchema = this._Schema;
+		if (!tmpSchema || !tmpSchema.properties)
+		{
+			return;
+		}
+		const tmpProperties = tmpSchema?.properties;
+		// loop through the schema and add the columns to the tableCells
+		let tmpOrdinal = 0;
+		for (const tmpSchemaField in tmpProperties)
+		{
+			if (this.ignoreFilterFields.includes(tmpSchemaField))
+			{
+				continue;
+			}
+			++tmpOrdinal;
+			const tmpColumn = tmpProperties[tmpSchemaField];
+			let tmpFieldFilterSchema = this._FilterSchema[tmpSchemaField];
+			if (!tmpFieldFilterSchema)
+			{
+				this._FilterSchema[tmpSchemaField] = tmpFieldFilterSchema = { };
+			}
+			if (!tmpFieldFilterSchema.FilterKey)
+			{
+				tmpFieldFilterSchema.FilterKey = tmpSchemaField;
+			}
+			if (!tmpFieldFilterSchema.RecordSet)
+			{
+				tmpFieldFilterSchema.RecordSet = this.options.RecordSet;
+			}
+			if (!tmpFieldFilterSchema.DisplayName)
+			{
+				tmpFieldFilterSchema.DisplayName = this._getHumanReadableFieldName(tmpSchemaField);
+			}
+			if (!tmpFieldFilterSchema.Description)
+			{
+				tmpFieldFilterSchema.Description = `Filter by ${tmpFieldFilterSchema.DisplayName}`;
+			}
+			if (!tmpFieldFilterSchema.HelpText)
+			{
+				tmpFieldFilterSchema.HelpText = `Filter by ${tmpFieldFilterSchema.DisplayName} for the ${this._getHumanReadbleEntityName(this.options.Entity)} entity.`;
+			}
+			if (tmpFieldFilterSchema.Ordinal == null)
+			{
+				tmpFieldFilterSchema.Ordinal = tmpOrdinal;
+			}
+			if (!Array.isArray(tmpFieldFilterSchema.AvailableClauses))
+			{
+				tmpFieldFilterSchema.AvailableClauses = [];
+			}
+			const tmpFieldFilterClauses = this.getFieldFilterClauses(tmpSchemaField, tmpColumn);
+			if (Array.isArray(tmpFieldFilterClauses) && tmpFieldFilterClauses.length > 0)
+			{
+				for (const tmpFilterClause of tmpFieldFilterClauses)
+				{
+					//TODO: allow customization of filter order
+					tmpFilterClause.Ordinal = tmpFieldFilterSchema.AvailableClauses.length + 1;
+					tmpFieldFilterSchema.AvailableClauses.push(tmpFilterClause);
+				}
+			}
+		}
+		if (typeof this.pict.providers.FilterManager.filters === 'object')
+		{
+			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}`)
+				{
+					//FIXME: I don't think using filter key is right here
+					let tmpFieldFilterSchema = this._FilterSchema[tmpFilterKey];
+					if (!tmpFieldFilterSchema)
+					{
+						this._FilterSchema[tmpFilterKey] = tmpFieldFilterSchema = { };
+					}
+					if (!tmpFieldFilterSchema.FilterKey)
+					{
+						tmpFieldFilterSchema.FilterKey = tmpFilterKey;
+					}
+					if (!tmpFieldFilterSchema.RecordSet)
+					{
+						tmpFieldFilterSchema.RecordSet = this.options.RecordSet;
+					}
+					const tmpFieldHumanName = this._getHumanReadableFieldName(tmpFilterKey);
+					if (tmpFilterClause.DisplayName)
+					{
+						tmpFieldFilterSchema.DisplayName = tmpFilterClause.DisplayName;
+					}
+					if (!tmpFieldFilterSchema.DisplayName)
+					{
+						tmpFieldFilterSchema.DisplayName = tmpFieldHumanName;
+					}
+					if (!tmpFieldFilterSchema.Description)
+					{
+						tmpFieldFilterSchema.Description = tmpFilterClause.Description || `Filter by ${tmpFieldFilterSchema.DisplayName}`;
+					}
+					if (!tmpFieldFilterSchema.HelpText)
+					{
+						tmpFieldFilterSchema.HelpText = tmpFilterClause.HelpText || `Filter by ${tmpFieldFilterSchema.DisplayName} for the ${this._getHumanReadbleEntityName(this.options.Entity)} entity.`;
+					}
+					if (tmpFieldFilterSchema.Ordinal == null)
+					{
+						tmpFieldFilterSchema.Ordinal = tmpOrdinal;
+					}
+					if (!Array.isArray(tmpFieldFilterSchema.AvailableClauses))
+					{
+						tmpFieldFilterSchema.AvailableClauses = [];
+					}
+					tmpFieldFilterSchema.AvailableClauses.push(tmpFilterClause);
+					if (!tmpFilterClause.FilterKey)
+					{
+						tmpFilterClause.FilterKey = tmpFilterKey;
+					}
+					if (!tmpFilterClause.ClauseKey)
+					{
+						tmpFilterClause.ClauseKey = tmpFilterKey;
+					}
+					if (!tmpFilterClause.DisplayName)
+					{
+						tmpFilterClause.DisplayName = tmpFieldHumanName;
+					}
+					tmpFilterClause.Ordinal = tmpFieldFilterSchema.AvailableClauses.length + 1;
+				}
+			}
+		}
+	}
+
 	/**
 	 * @return {Promise<Record<string, any>>} The schema of the record.
 	 */
@@ -700,6 +709,7 @@ class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
 				{
 					return reject(pError);
 				}
+				this.initializeFilterSchema();
 				resolve();
 			}));
 		}

package/types/providers/RecordSet-RecordProvider-MeadowEndpoints.d.ts

@@ -146,6 +146,7 @@ declare class MeadowEndpointsRecordSetProvider extends libRecordSetProviderBase
      * @param {(error?: Error) => void} fCallback - The callback function.
      */
     initializeEntitySchema(fCallback: (error?: Error) => void): void;
+    initializeFilterSchema(): void;
 }
 declare namespace MeadowEndpointsRecordSetProvider {
     export { RecordSetFilter, RecordSetResult };

package/types/providers/RecordSet-RecordProvider-MeadowEndpoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSet-RecordProvider-MeadowEndpoints.d.ts","sourceRoot":"","sources":["../../source/providers/RecordSet-RecordProvider-MeadowEndpoints.js"],"names":[],"mappings":";AAGA;;;GAGG;AAEH;;;GAGG;AACH;IAcE;;;;;;;;;aASS;IACT,MAVW,OAAO,MAAM,CAAC,GAAG;QACpB,GAAG,EAAE,GAAG,CAAC;QACT,QAAQ,EACf;YACI,oBAAoB,EAAE,YAAY,CAAC;;;;;;aAAsC,CAAC,CAAC;YAC/E,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACnB,CAAC;QACE,6CAA6C,EAAE,CAAC,IAAI,QAAQ,KAAK,GAAG,CAAC;QACrE,oBAAoB,EAAE,YAAY,CAAC;;;;;;SAAsC,CAAC,CAAA;KAC7E,CACI;IACT;aAVa,GAAG;kBAEf;YACI,oBAAoB,EAAE,YAAY,CAAC;;;;;;aAAsC,CAAC,CAAC;YAC/E,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACnB;uDACkD,CAAC,IAAI,QAAQ,KAAK,GAAG;8BAC9C,YAAY,CAAC;;;;;;SAAsC,CAAC;MAG5D;IAMtB,kCAAkC;IAClC,SADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAClB;IACZ,kDAAkD;IAClD,cADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACvB;IACvB,kDAAkD;IAClD,iBADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACpB;IAG3B,0EAA0E;IAC1E,sBADa,OAAO,iDAAiD,CAAC,CAerE;IAVC,wEAAwE;IAExE,iBAFW,OAAO,iDAAiD,CAAC,CAE4B;IAUlG;;OAEG;IACH,0BAFY,KAAK,CAAC,MAAM,CAAC,CASxB;IAED;;;;OAIG;IACH,qBAFW,MAAM,GAAC,MAAM,gBA4BvB;IAED;;;;OAIG;IACH,uBAFW,MAAM,GAAC,MAAM,gBA2BvB;IAED,iGAiBC;IA+CD;;;;OAIG;IACH,4BAFW,eAAe,gBA0BzB;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,GAAC,MAAM,gBAKvB;IAaD;;;;OAIG;IACH,qBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAK7B;IAcD;;;OAGG;IACH,oCAHW,MAAM,WACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAiC7B;IAED;;OAEG;IACH,6BAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QA+MjC;IAED;;;OAGG;IACH,oCAHW,MAAM,GACL,MAAM,CAKjB;IAED;;;OAGG;IACH,yCAHW,MAAM,GACL,MAAM,CAiCjB;IAED;;OAEG;IACH,kCAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QA6BjC;CAyDD;;;;;uBApuBY,OAAO,oCAAoC,EAAE,eAAe;uBAC5D,OAAO,oCAAoC,EAAE,eAAe"}
+{"version":3,"file":"RecordSet-RecordProvider-MeadowEndpoints.d.ts","sourceRoot":"","sources":["../../source/providers/RecordSet-RecordProvider-MeadowEndpoints.js"],"names":[],"mappings":";AAGA;;;GAGG;AAEH;;;GAGG;AACH;IAcE;;;;;;;;;aASS;IACT,MAVW,OAAO,MAAM,CAAC,GAAG;QACpB,GAAG,EAAE,GAAG,CAAC;QACT,QAAQ,EACf;YACI,oBAAoB,EAAE,YAAY,CAAC;;;;;;aAAsC,CAAC,CAAC;YAC/E,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACnB,CAAC;QACE,6CAA6C,EAAE,CAAC,IAAI,QAAQ,KAAK,GAAG,CAAC;QACrE,oBAAoB,EAAE,YAAY,CAAC;;;;;;SAAsC,CAAC,CAAA;KAC7E,CACI;IACT;aAVa,GAAG;kBAEf;YACI,oBAAoB,EAAE,YAAY,CAAC;;;;;;aAAsC,CAAC,CAAC;YAC/E,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACnB;uDACkD,CAAC,IAAI,QAAQ,KAAK,GAAG;8BAC9C,YAAY,CAAC;;;;;;SAAsC,CAAC;MAG5D;IAMtB,kCAAkC;IAClC,SADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAClB;IACZ,kDAAkD;IAClD,cADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACvB;IACvB,kDAAkD;IAClD,iBADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACpB;IAG3B,0EAA0E;IAC1E,sBADa,OAAO,iDAAiD,CAAC,CAerE;IAVC,wEAAwE;IAExE,iBAFW,OAAO,iDAAiD,CAAC,CAE4B;IAUlG;;OAEG;IACH,0BAFY,KAAK,CAAC,MAAM,CAAC,CASxB;IAED;;;;OAIG;IACH,qBAFW,MAAM,GAAC,MAAM,gBA4BvB;IAED;;;;OAIG;IACH,uBAFW,MAAM,GAAC,MAAM,gBA2BvB;IAED,iGAiBC;IA+CD;;;;OAIG;IACH,4BAFW,eAAe,gBA0BzB;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAsB7B;IAED;;;;OAIG;IACH,sBAFW,MAAM,GAAC,MAAM,gBAKvB;IAaD;;;;OAIG;IACH,qBAFW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAK7B;IAcD;;;OAGG;IACH,oCAHW,MAAM,WACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAiC7B;IAED;;OAEG;IACH,6BAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QAyFjC;IAED;;;OAGG;IACH,oCAHW,MAAM,GACL,MAAM,CAKjB;IAED;;;OAGG;IACH,yCAHW,MAAM,GACL,MAAM,CAiCjB;IAED;;OAEG;IACH,kCAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QA6BjC;IAED,+BA6HC;CA0DD;;;;;uBA9uBY,OAAO,oCAAoC,EAAE,eAAe;uBAC5D,OAAO,oCAAoC,EAAE,eAAe"}