pict-section-recordset 1.0.8 → 1.0.10

package/package.json

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

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

@@ -2,20 +2,8 @@
 const libRecordSetProviderBase = require('./RecordSet-RecordProvider-Base.js');
 
 /**
- * @typedef {(error?: Error, result?: any) => void} RestClientCallback
- *
  * @typedef {import('./RecordSet-RecordProvider-Base.js').RecordSetFilter} RecordSetFilter
  * @typedef {import('./RecordSet-RecordProvider-Base.js').RecordSetResult} RecordSetResult
- *
- * @typedef {{
- *  getJSON(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void,
- *  putJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  postJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  patchJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  headJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  delJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  getRawText(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void,
- * }} RestClient
  */
 
 /**
@@ -45,12 +33,6 @@ class RecordSetProvider extends libRecordSetProviderBase
 		this._Schema = { };
 	}
 
-	/** @type {RestClient} */
-	get restClient()
-	{
-		return this.fable.RestClient;
-	}
-
 	/**
 	 * @typedef {(error?: Error, result?: T) => void} RecordSetCallback
 	 * @template T = Record<string, any>
@@ -78,13 +60,13 @@ class RecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity}/${pIDOrGuid}`, (error, response, result) =>
+			this.entityProvider.getEntity(this.options.Entity, pIDOrGuid, (pError, pResult) =>
 			{
-				if (error)
+				if (pError)
 				{
-					return reject(error);
+					return reject(pError);
 				}
-				resolve(result);
+				resolve(pResult);
 			});
 		});
 	}
@@ -106,13 +88,17 @@ class RecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity}s/FilteredTo/FBV~GUID${this.options.Entity}~EQ~${encodeURIComponent(pGuid)}`, (error, response, result) =>
+			this.entityProvider.getEntitySet(this.options.Entity, `FBV~GUID${this.options.Entity}~EQ~${encodeURIComponent(pGuid)}`, (pError, pResult) =>
 			{
-				if (error)
+				if (pError)
 				{
-					return reject(error);
+					return reject(pError);
+				}
+				if (pResult.length > 1)
+				{
+					this.pict.log.error(`Multiple ${this.options.Entity} records found for GUID ${pGuid}`, { Records: pResult });
 				}
-				resolve(result[0]);
+				resolve(pResult[0]);
 			});
 		});
 	}
@@ -129,22 +115,21 @@ class RecordSetProvider extends libRecordSetProviderBase
 		{
 			throw new Error('Entity is not defined in the provider options.');
 		}
+		const tmpEntity = pOptions.Entity || this.options.Entity;
 		if (this.pict.LogNoisiness > 1)
 		{
-			this.pict.log.info(`Reading ${this.options.Entity} records`, { Options: pOptions });
+			this.pict.log.info(`Reading ${tmpEntity} records`, { Options: pOptions });
 		}
-		const filterString = pOptions.FilterString ? `/FilteredTo/${pOptions.FilterString}` : '';
-		const pagination = `/${pOptions.Offset || 0}/${pOptions.PageSize || 250}`;
-		//TODO: lite support / other variants?
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity || pOptions.Entity}s${filterString}${pagination}`, (error, response, result) =>
+			// using a space here, otherwise you get a `//` in the URL which breaks some stuff
+			this.entityProvider.getEntitySetPage(tmpEntity, pOptions.FilterString ? pOptions.FilterString : ' ', pOptions.Offset || 0, pOptions.PageSize || 250, (pError, pResult) =>
 			{
-				if (error)
+				if (pError)
 				{
-					return reject(error);
+					return reject(pError);
 				}
-				resolve({ Records: result, Facets: { } });
+				resolve({ Records: pResult, Facets: { } });
 			});
 		});
 	}
@@ -173,21 +158,21 @@ class RecordSetProvider extends libRecordSetProviderBase
 		{
 			throw new Error('Entity is not defined in the provider options.');
 		}
+		const tmpEntity = pOptions.Entity || this.options.Entity;
 		if (this.pict.LogNoisiness > 1)
 		{
-			this.pict.log.info(`Counting ${this.options.Entity} records`, { Options: pOptions });
+			this.pict.log.info(`Counting ${tmpEntity} records`, { Options: pOptions });
 		}
-		const filterString = pOptions.FilterString ? `/FilteredTo/${pOptions.FilterString}` : '';
 		//TODO: lite support / other variants?
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity || pOptions.Entity}s/Count${filterString}`, (error, response, result) =>
+			this.entityProvider.getEntitySetRecordCount(tmpEntity, pOptions.FilterString, (pError, pCount) =>
 			{
-				if (error)
+				if (pError)
 				{
-					return reject(error);
+					return reject(pError);
 				}
-				resolve(result);
+				resolve({ Count: pCount });
 			});
 		});
 	}
@@ -201,11 +186,11 @@ class RecordSetProvider extends libRecordSetProviderBase
 	{
 		return new Promise((resolve, reject) =>
 		{
-		if (this.pict.LogNoisiness > 1)
-		{
-			this.pict.log.info(`Creating record ${this.options.Entity}`, { Record: pRecord });
-		}
-			this.restClient.postJSON({
+			if (this.pict.LogNoisiness > 1)
+			{
+				this.pict.log.info(`Creating record ${this.options.Entity}`, { Record: pRecord });
+			}
+			this.entityProvider.restClient.postJSON({
 				url: `${this.options.URLPrefix}${this.options.Entity}`,
 				body: pRecord,
 			}, (error, response, result) =>
@@ -232,7 +217,7 @@ class RecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.putJSON({
+			this.entityProvider.restClient.putJSON({
 				url: `${this.options.URLPrefix}${this.options.Entity}`,
 				body: pRecord,
 			}, (error, response, result) =>
@@ -259,7 +244,7 @@ class RecordSetProvider extends libRecordSetProviderBase
 		}
 		return new Promise((resolve, reject) =>
 		{
-			this.restClient.delJSON({
+			this.entityProvider.restClient.delJSON({
 				url: `${this.options.URLPrefix}${this.options.Entity}/${pRecord[`ID${this.options.Entity}`]}`,
 				body: pRecord,
 			}, (error, response, result) =>
@@ -316,6 +301,16 @@ class RecordSetProvider extends libRecordSetProviderBase
 		return pRecord;
 	}
 
+	onBeforeInitialize()
+	{
+		/** @type {import('pict/types/source/Pict-Meadow-EntityProvider.js')} */
+		this.entityProvider = this.pict.instantiateServiceProviderWithoutRegistration('EntityProvider');
+		if (this.options.URLPrefix)
+		{
+			this.entityProvider.options.urlPrefix = this.options.URLPrefix;
+		}
+	}
+
 	/**
 	 * @param {(error?: Error) => void} fCallback - The callback function.
 	 */
@@ -329,7 +324,7 @@ class RecordSetProvider extends libRecordSetProviderBase
 			{
 				return fCallback();
 			}
-			this.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity}/Schema`, (error, response, result) =>
+			this.entityProvider.restClient.getJSON(`${this.options.URLPrefix}${this.options.Entity}/Schema`, (error, response, result) =>
 			{
 				if (error)
 				{

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

@@ -263,8 +263,24 @@ class viewRecordSetList extends libPictRecordSetRecordView
 
 		//FIXME: short-term workaround to not blow up the tempplate rendering with way too many links
 		const linkRangeStart = Math.max(0, tmpRecordListData.PageLinkBookmarks.Current - 10);
-		const linkRangeEnd = Math.min(tmpRecordListData.PageLinks.length - 1, tmpRecordListData.PageLinkBookmarks.Current + 10);
+		const linkRangeEnd = Math.min(tmpRecordListData.PageLinks.length, tmpRecordListData.PageLinkBookmarks.Current + 10);
 		tmpRecordListData.PageLinksLimited = tmpRecordListData.PageLinks.slice(linkRangeStart, linkRangeEnd);
+		if (linkRangeStart > 0)
+		{
+			tmpRecordListData.PageLinksLimited.unshift(
+				{
+					Page: 1,
+					URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/${0}/${tmpRecordListData.PageSize}`
+				});
+		}
+		if (linkRangeEnd < tmpRecordListData.PageLinks.length)
+		{
+			tmpRecordListData.PageLinksLimited.push(
+				{
+					Page: tmpRecordListData.PageCount,
+					URL:`#/PSRS/${tmpRecordListData.RecordSet}/List/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
+				});
+		}
 
 		tmpRecordListData.PageLinkBookmarks.Previous = tmpRecordListData.PageLinkBookmarks.Current - 1;
 		tmpRecordListData.PageLinkBookmarks.Next = tmpRecordListData.PageLinkBookmarks.Current + 1;

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

@@ -1,19 +1,7 @@
 export = RecordSetProvider;
 /**
- * @typedef {(error?: Error, result?: any) => void} RestClientCallback
- *
  * @typedef {import('./RecordSet-RecordProvider-Base.js').RecordSetFilter} RecordSetFilter
  * @typedef {import('./RecordSet-RecordProvider-Base.js').RecordSetResult} RecordSetResult
- *
- * @typedef {{
- *  getJSON(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void,
- *  putJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  postJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  patchJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  headJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  delJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void,
- *  getRawText(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void,
- * }} RestClient
  */
 /**
  * Class representing a data change detection provider for Pict dynamic forms.
@@ -24,8 +12,6 @@ declare class RecordSetProvider extends libRecordSetProviderBase {
     pict: any & import("pict");
     /** @type {Record<string, any>} */
     _Schema: Record<string, any>;
-    /** @type {RestClient} */
-    get restClient(): RestClient;
     /**
      * @typedef {(error?: Error, result?: T) => void} RecordSetCallback
      * @template T = Record<string, any>
@@ -78,6 +64,9 @@ declare class RecordSetProvider extends libRecordSetProviderBase {
      * @param {Record<string, any>} pRecord - The record to clone.
      */
     cloneRecord(pRecord: Record<string, any>): Promise<any>;
+    onBeforeInitialize(): void;
+    /** @type {import('pict/types/source/Pict-Meadow-EntityProvider.js')} */
+    entityProvider: import("pict/types/source/Pict-Meadow-EntityProvider.js");
     /**
      * @param {(error?: Error) => void} fCallback - The callback function.
      */
@@ -85,19 +74,9 @@ declare class RecordSetProvider extends libRecordSetProviderBase {
     getRecordSchema(): Promise<Record<string, any>>;
 }
 declare namespace RecordSetProvider {
-    export { RestClientCallback, RecordSetFilter, RecordSetResult, RestClient };
+    export { RecordSetFilter, RecordSetResult };
 }
 import libRecordSetProviderBase = require("./RecordSet-RecordProvider-Base.js");
-type RestClientCallback = (error?: Error, result?: any) => void;
 type RecordSetFilter = import("./RecordSet-RecordProvider-Base.js").RecordSetFilter;
 type RecordSetResult = import("./RecordSet-RecordProvider-Base.js").RecordSetResult;
-type RestClient = {
-    getJSON(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void;
-    putJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void;
-    postJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void;
-    patchJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void;
-    headJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void;
-    delJSON(pOptions: Record<string, any>, fCallback: RestClientCallback): void;
-    getRawText(pOptionsOrURL: string | Record<string, any>, fCallback: RestClientCallback): void;
-};
 //# sourceMappingURL=RecordSet-RecordProvider-MeadowEndpoints.d.ts.map

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;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AACH;IAgBE,+CAA+C;IAC/C,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,CAClC;IAET,kCAAkC;IAClC,SADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CACZ;IAGnB,yBAAyB;IACzB,kBADW,UAAU,CAIpB;IAED;;;OAGG;IAEH;;;;OAIG;IACH,qBAFW,MAAM,GAAC,MAAM,gBA4BvB;IAED;;;;OAIG;IACH,uBAFW,MAAM,GAAC,MAAM,gBAuBvB;IA+CD;;;;OAIG;IACH,4BAFW,eAAe,gBAyBzB;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;;OAEG;IACH,6BAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QA2BjC;IAED,gDAcC;CACD;;;;;0BAvWY,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI;uBAErC,OAAO,oCAAoC,EAAE,eAAe;uBAC5D,OAAO,oCAAoC,EAAE,eAAe;kBAE5D;IACT,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1F,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC7E,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC7E,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC5E,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC7F"}
+{"version":3,"file":"RecordSet-RecordProvider-MeadowEndpoints.d.ts","sourceRoot":"","sources":["../../source/providers/RecordSet-RecordProvider-MeadowEndpoints.js"],"names":[],"mappings":";AAGA;;;GAGG;AAEH;;;GAGG;AACH;IAgBE,+CAA+C;IAC/C,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,CAClC;IAET,kCAAkC;IAClC,SADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CACZ;IAGnB;;;OAGG;IAEH;;;;OAIG;IACH,qBAFW,MAAM,GAAC,MAAM,gBA4BvB;IAED;;;;OAIG;IACH,uBAFW,MAAM,GAAC,MAAM,gBA2BvB;IA8CD;;;;OAIG;IACH,4BAFW,eAAe,gBAyBzB;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,2BAQC;IANA,wEAAwE;IACxE,gBADW,OAAO,iDAAiD,CAAC,CAC2B;IAOhG;;OAEG;IACH,6BAFW,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QA2BjC;IAED,gDAcC;CACD;;;;;uBAlWY,OAAO,oCAAoC,EAAE,eAAe;uBAC5D,OAAO,oCAAoC,EAAE,eAAe"}

package/types/views/list/RecordSet-List.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordSet-List.d.ts","sourceRoot":"","sources":["../../../source/views/list/RecordSet-List.js"],"names":[],"mappings":";AAyEA;IAOE;;;;;;;;MAQC;IAGF,uCAuBC;IAED,+DAuBC;IAWD,8CAGC;IAED,sDAkCC;IA9BA,iCAUC;IAsBF,iIAmIC;CAwBD"}
+{"version":3,"file":"RecordSet-List.d.ts","sourceRoot":"","sources":["../../../source/views/list/RecordSet-List.js"],"names":[],"mappings":";AAyEA;IAOE;;;;;;;;MAQC;IAGF,uCAuBC;IAED,+DAuBC;IAWD,8CAGC;IAED,sDAkCC;IA9BA,iCAUC;IAsBF,iIAmJC;CAwBD"}