pict-section-recordset 1.0.4 → 1.0.6

package/source/views/edit/RecordSet-Edit.js

@@ -1,60 +1,60 @@
 const libPictRecordSetRecordView = require('../RecordSet-RecordBaseView.js');
 
-const _DEFAULT_CONFIGURATION__Edit = (
-  {
-    ViewIdentifier: 'PRSP-Edit',
-
-    DefaultRenderable: 'PRSP_Renderable_Edit',
-    DefaultDestinationAddress: '#PRSP_Edit_Container',
-    DefaultTemplateRecordAddress: false,
-
-    // If this is set to true, when the App initializes this will.
-    // While the App initializes, initialize will be called.
-    AutoInitialize: false,
-    AutoInitializeOrdinal: 0,
-
-    // If this is set to true, when the App autorenders (on load) this will.
-    // After the App initializes, render will be called.
-    AutoRender: false,
-    AutoRenderOrdinal: 0,
-
-    AutoSolveWithApp: false,
-    AutoSolveOrdinal: 0,
-
-    CSS: false,
-    CSSPriority: 500,
-
-    Templates:
-      [
-        {
-          Hash: 'PRSP-Edit-Template',
-          Template: /*html*/`
+const _DEFAULT_CONFIGURATION__Edit =
+{
+	ViewIdentifier: 'PRSP-Edit',
+
+	DefaultRenderable: 'PRSP_Renderable_Edit',
+	DefaultDestinationAddress: '#PRSP_Edit_Container',
+	DefaultTemplateRecordAddress: false,
+
+	// If this is set to true, when the App initializes this will.
+	// While the App initializes, initialize will be called.
+	AutoInitialize: false,
+	AutoInitializeOrdinal: 0,
+
+	// If this is set to true, when the App autorenders (on load) this will.
+	// After the App initializes, render will be called.
+	AutoRender: false,
+	AutoRenderOrdinal: 0,
+
+	AutoSolveWithApp: false,
+	AutoSolveOrdinal: 0,
+
+	CSS: false,
+	CSSPriority: 500,
+
+	Templates:
+	[
+		{
+			Hash: 'PRSP-Edit-Template',
+			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-Edit-Template] -->
-	<!-- DefaultPackage end view template:  [PRSP-Edit-Template] -->
-	`
-        }
-      ],
-
-    Renderables:
-      [
-        {
-          RenderableHash: 'PRSP_Renderable_Edit',
-          TemplateHash: 'PRSP-Edit-Template',
-          DestinationAddress: '#PRSP_Edit_Container',
-          RenderMethod: 'replace'
-        }
-      ],
-
-    Manifests: {}
-  });
+	<!-- DefaultPackage end view template:	[PRSP-Edit-Template] -->
+`
+		}
+	],
+
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_Edit',
+			TemplateHash: 'PRSP-Edit-Template',
+			DestinationAddress: '#PRSP_Edit_Container',
+			RenderMethod: 'replace'
+		}
+	],
+
+	Manifests: {},
+};
 
 class viewRecordSetEdit extends libPictRecordSetRecordView
 {
-  constructor(pFable, pOptions, pServiceHash)
-  {
-    let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION__Edit, pOptions);
-    super(pFable, tmpOptions, pServiceHash);
-  }
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION__Edit, pOptions);
+		super(pFable, tmpOptions, pServiceHash);
+	}
 }
 
 module.exports = viewRecordSetEdit;

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

@@ -1,60 +1,60 @@
 const libPictView = require('pict-view');
 
-const _DEFAULT_CONFIGURATION_List_HeaderList = (
-  {
-    ViewIdentifier: 'PRSP-List-HeaderList',
-
-    DefaultRenderable: 'PRSP_Renderable_HeaderList',
-    DefaultDestinationAddress: '#PRSP_HeaderList_Container',
-    DefaultTemplateRecordAddress: false,
-
-    // If this is set to true, when the App initializes this will.
-    // While the App initializes, initialize will be called.
-    AutoInitialize: false,
-    AutoInitializeOrdinal: 0,
-
-    // If this is set to true, when the App autorenders (on load) this will.
-    // After the App initializes, render will be called.
-    AutoRender: false,
-    AutoRenderOrdinal: 0,
-
-    AutoSolveWithApp: false,
-    AutoSolveOrdinal: 0,
-
-    CSS: false,
-    CSSPriority: 500,
-
-    Templates:
-      [
-        {
-          Hash: 'PRSP-List-HeaderList-Template',
-          Template: /*html*/`
+const _DEFAULT_CONFIGURATION_List_HeaderList =
+{
+	ViewIdentifier: 'PRSP-List-HeaderList',
+
+	DefaultRenderable: 'PRSP_Renderable_HeaderList',
+	DefaultDestinationAddress: '#PRSP_HeaderList_Container',
+	DefaultTemplateRecordAddress: false,
+
+	// If this is set to true, when the App initializes this will.
+	// While the App initializes, initialize will be called.
+	AutoInitialize: false,
+	AutoInitializeOrdinal: 0,
+
+	// If this is set to true, when the App autorenders (on load) this will.
+	// After the App initializes, render will be called.
+	AutoRender: false,
+	AutoRenderOrdinal: 0,
+
+	AutoSolveWithApp: false,
+	AutoSolveOrdinal: 0,
+
+	CSS: false,
+	CSSPriority: 500,
+
+	Templates:
+	[
+		{
+			Hash: 'PRSP-List-HeaderList-Template',
+			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-List-HeaderList-Template] -->
-	<!-- DefaultPackage end view template:  [PRSP-List-HeaderList-Template] -->
-	`
-        }
-      ],
-
-    Renderables:
-      [
-        {
-          RenderableHash: 'PRSP_Renderable_HeaderList',
-          TemplateHash: 'PRSP-List-HeaderList-Template',
-          DestinationAddress: '#PRSP_HeaderList_Container',
-          RenderMethod: 'replace'
-        }
-      ],
-
-    Manifests: {}
-  });
+	<!-- DefaultPackage end view template:	[PRSP-List-HeaderList-Template] -->
+`
+		},
+	],
+
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_HeaderList',
+			TemplateHash: 'PRSP-List-HeaderList-Template',
+			DestinationAddress: '#PRSP_HeaderList_Container',
+			RenderMethod: 'replace'
+		},
+	],
+
+	Manifests: {},
+};
 
 class viewRecordSetListHeaderList extends libPictView
 {
-  constructor(pFable, pOptions, pServiceHash)
-  {
-    let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_HeaderList, pOptions);
-    super(pFable, tmpOptions, pServiceHash);
-  }
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_HeaderList, pOptions);
+		super(pFable, tmpOptions, pServiceHash);
+	}
 }
 
 module.exports = viewRecordSetListHeaderList;

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

@@ -58,9 +58,9 @@ const _DEFAULT_CONFIGURATION_List_PaginationTop = (
 					Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-List-Pagination-Template-Buttons] -->
 	<ul style="list-style-type: none; padding: 0; display: flex; justify-content: center;">
-		{~T:PRSP-List-Pagination-Template-Button-Previous~}
+		{~TIfAbs:PRSP-List-Pagination-Template-Button-Previous:Record:Record.PageLinkBookmarks.ShowPreviousLink^TRUE^true~}
 		{~TS:PRSP-List-Pagination-Template-Button-Page~}
-		{~T:PRSP-List-Pagination-Template-Button-Next~}
+		{~TIfAbs:PRSP-List-Pagination-Template-Button-Next:Record:Record.PageLinkBookmarks.ShowNextLink^TRUE^true~}
 	</ul>
 	<!-- DefaultPackage end view template:  [PRSP-List-Pagination-Template-Buttons] -->
 	`

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

@@ -1,76 +1,76 @@
 const libPictView = require('pict-view');
 
-const _DEFAULT_CONFIGURATION_List_RecordList = (
-  {
-    ViewIdentifier: 'PRSP-List-RecordList',
+const _DEFAULT_CONFIGURATION_List_RecordList =
+{
+	ViewIdentifier: 'PRSP-List-RecordList',
 
-    DefaultRenderable: 'PRSP_Renderable_RecordList',
-    DefaultDestinationAddress: '#PRSP_RecordList_Container',
-    DefaultTemplateRecordAddress: false,
+	DefaultRenderable: 'PRSP_Renderable_RecordList',
+	DefaultDestinationAddress: '#PRSP_RecordList_Container',
+	DefaultTemplateRecordAddress: false,
 
-    // If this is set to true, when the App initializes this will.
-    // While the App initializes, initialize will be called.
-    AutoInitialize: false,
-    AutoInitializeOrdinal: 0,
+	// If this is set to true, when the App initializes this will.
+	// While the App initializes, initialize will be called.
+	AutoInitialize: false,
+	AutoInitializeOrdinal: 0,
 
-    // If this is set to true, when the App autorenders (on load) this will.
-    // After the App initializes, render will be called.
-    AutoRender: false,
-    AutoRenderOrdinal: 0,
+	// If this is set to true, when the App autorenders (on load) this will.
+	// After the App initializes, render will be called.
+	AutoRender: false,
+	AutoRenderOrdinal: 0,
 
-    AutoSolveWithApp: false,
-    AutoSolveOrdinal: 0,
+	AutoSolveWithApp: false,
+	AutoSolveOrdinal: 0,
 
-    CSS: false,
-    CSSPriority: 500,
+	CSS: false,
+	CSSPriority: 500,
 
-    Templates:
-      [
-        {
-          Hash: 'PRSP-List-RecordList-Template',
-          Template: /*html*/`
+	Templates:
+	[
+		{
+			Hash: 'PRSP-List-RecordList-Template',
+			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-List-RecordList-Template] -->
-  <section id="PRSP_List_Container">
+	<section id="PRSP_List_Container">
 		{~T:PRSP-List-RecordList-Template-Table~}
 	</section>
-	<!-- DefaultPackage end view template:  [PRSP-List-RecordList-Template] -->
-	`
-        },
-        {
-          Hash: 'PRSP-List-RecordList-Template-Table',
-          Template: /*html*/`
-  <!-- DefaultPackage pict view template: [PRSP-List-RecordList-Template-Table] -->
-  <table id="PRSP_List_Table" tablespacing="0" cellpadding="0" cellspacing="0" style="width: 100%; border-collapse: collapse; margin-bottom: 20px;">
-    <thead>{~T:PRSP-List-RecordListHeader-Template~}</thead>
-    <tbody id="PRSP_RecordList_Container_Entries">
-      {~T:PRSP-List-RecordListEntry-Template~}
-    </tbody>
-  </table>
-  <!-- DefaultPackage end view template:  [PRSP-List-RecordList-Template-Table] -->
-  `
-        }
-      ],
+	<!-- DefaultPackage end view template:	[PRSP-List-RecordList-Template] -->
+`
+		},
+		{
+			Hash: 'PRSP-List-RecordList-Template-Table',
+			Template: /*html*/`
+	<!-- DefaultPackage pict view template: [PRSP-List-RecordList-Template-Table] -->
+	<table id="PRSP_List_Table" tablespacing="0" cellpadding="0" cellspacing="0" style="width: 100%; border-collapse: collapse; margin-bottom: 20px;">
+		<thead>{~T:PRSP-List-RecordListHeader-Template~}</thead>
+		<tbody id="PRSP_RecordList_Container_Entries">
+			{~T:PRSP-List-RecordListEntry-Template~}
+		</tbody>
+	</table>
+	<!-- DefaultPackage end view template:	[PRSP-List-RecordList-Template-Table] -->
+`
+		}
+	],
 
-    Renderables:
-      [
-        {
-          RenderableHash: 'PRSP_Renderable_RecordList',
-          TemplateHash: 'PRSP-List-RecordList-Template',
-          DestinationAddress: '#PRSP_RecordList_Container',
-          RenderMethod: 'replace'
-        }
-      ],
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_RecordList',
+			TemplateHash: 'PRSP-List-RecordList-Template',
+			DestinationAddress: '#PRSP_RecordList_Container',
+			RenderMethod: 'replace'
+		}
+	],
 
-    Manifests: {}
-  });
+	Manifests: {}
+};
 
 class viewRecordSetListRecordList extends libPictView
 {
-  constructor(pFable, pOptions, pServiceHash)
-  {
-    let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_RecordList, pOptions);
-    super(pFable, tmpOptions, pServiceHash);
-  }
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_RecordList, pOptions);
+		super(pFable, tmpOptions, pServiceHash);
+	}
 }
 
 module.exports = viewRecordSetListRecordList;

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

@@ -1,64 +1,64 @@
 const libPictView = require('pict-view');
 
-const _DEFAULT_CONFIGURATION_List_Title = (
-  {
-    ViewIdentifier: 'PRSP-List-Title',
+const _DEFAULT_CONFIGURATION_List_Title =
+{
+	ViewIdentifier: 'PRSP-List-Title',
 
-    DefaultRenderable: 'PRSP_Renderable_Title',
-    DefaultDestinationAddress: '#PRSP_Title_Container',
-    DefaultTemplateRecordAddress: false,
+	DefaultRenderable: 'PRSP_Renderable_Title',
+	DefaultDestinationAddress: '#PRSP_Title_Container',
+	DefaultTemplateRecordAddress: false,
 
-    // If this is set to true, when the App initializes this will.
-    // While the App initializes, initialize will be called.
-    AutoInitialize: false,
-    AutoInitializeOrdinal: 0,
+	// If this is set to true, when the App initializes this will.
+	// While the App initializes, initialize will be called.
+	AutoInitialize: false,
+	AutoInitializeOrdinal: 0,
 
-    // If this is set to true, when the App autorenders (on load) this will.
-    // After the App initializes, render will be called.
-    AutoRender: false,
-    AutoRenderOrdinal: 0,
+	// If this is set to true, when the App autorenders (on load) this will.
+	// After the App initializes, render will be called.
+	AutoRender: false,
+	AutoRenderOrdinal: 0,
 
-    AutoSolveWithApp: false,
-    AutoSolveOrdinal: 0,
+	AutoSolveWithApp: false,
+	AutoSolveOrdinal: 0,
 
-    CSS: false,
-    CSSPriority: 500,
+	CSS: false,
+	CSSPriority: 500,
 
-    Templates:
-      [
-        {
-          Hash: 'PRSP-List-Title-Template',
-          Template: /*html*/`
+	Templates:
+	[
+		{
+			Hash: 'PRSP-List-Title-Template',
+			Template: /*html*/`
 	<!-- DefaultPackage pict view template: [PRSP-List-Title-Template] -->
-  <header id="PRSP_Title_Container">
-    <h1 id="PRSP_Title">{~D:Record.Title~}</h1>
-    <h2 id="PRSP_Subtitle">{~D:Record.Subtitle~}</h2>
-  </header>
-	<!-- DefaultPackage end view template:  [PRSP-List-Title-Template] -->
-	`
-        }
-      ],
+	<header id="PRSP_Title_Container">
+		<h1 id="PRSP_Title">{~D:Record.Title~}</h1>
+		<h2 id="PRSP_Subtitle">{~D:Record.Subtitle~}</h2>
+	</header>
+	<!-- DefaultPackage end view template:	[PRSP-List-Title-Template] -->
+`
+		},
+	],
 
-    Renderables:
-      [
-        {
-          RenderableHash: 'PRSP_Renderable_Title',
-          TemplateHash: 'PRSP-List-Title-Template',
-          DestinationAddress: '#PRSP_Title_Container',
-          RenderMethod: 'replace'
-        }
-      ],
+	Renderables:
+	[
+		{
+			RenderableHash: 'PRSP_Renderable_Title',
+			TemplateHash: 'PRSP-List-Title-Template',
+			DestinationAddress: '#PRSP_Title_Container',
+			RenderMethod: 'replace'
+		},
+	],
 
-    Manifests: {}
-  });
+	Manifests: {},
+};
 
 class viewRecordSetListTitle extends libPictView
 {
-  constructor(pFable, pOptions, pServiceHash)
-  {
-    let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_Title, pOptions);
-    super(pFable, tmpOptions, pServiceHash);
-  }
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, _DEFAULT_CONFIGURATION_List_Title, pOptions);
+		super(pFable, tmpOptions, pServiceHash);
+	}
 }
 
 module.exports = viewRecordSetListTitle;

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

@@ -2,6 +2,7 @@ const libPictRecordSetRecordView = require('../RecordSet-RecordBaseView.js');
 
 const viewHeaderList = require('./RecordSet-List-HeaderList.js');
 const viewTitle = require('./RecordSet-List-Title.js');
+const viewFilters = require('../RecordSet-Filter.js');
 const viewPaginationTop = require('./RecordSet-List-PaginationTop.js');
 const viewRecordList = require('./RecordSet-List-RecordList.js');
 const viewRecordListHeader = require('./RecordSet-List-RecordListHeader.js');
@@ -41,6 +42,7 @@ const _DEFAULT_CONFIGURATION__List = (
 	<section id="PRSP_List_Container">
 		{~V:PRSP-List-Title~}
 		{~V:PRSP-List-HeaderList~}
+		{~V:PRSP-Filters~}
 		{~V:PRSP-List-PaginationTop~}
 		{~V:PRSP-List-RecordList~}
 		{~V:PRSP-List-PaginationBottom~}
@@ -87,6 +89,31 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		};
 	}
 
+	handleSearch(pSearchString)
+	{
+		const pictRouter = this.pict.providers.PictRouter;
+		const recordSet = pictRouter.router.current[0]?.data?.RecordSet;
+		const offset = '0'; // since we are searching, we reset to page 1
+		const pageSize = pictRouter.router.current[0]?.data?.PageSize || '100';
+		if (!recordSet)
+		{
+			this.pict.log.error('PictRecordSetRouter.handleSearch: No record set found in the current route: ', { routes: pictRouter.router.current });
+			return;
+		}
+		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[recordSet];
+		if (pSearchString)
+		{
+			//FIXME: figure this out based on the record set; or defer to another provider?
+			const searchFields = tmpProviderConfiguration?.SearchFields ?? [ 'Name' ];
+			const filterExpr = searchFields.map((filterField) => `FBVOR~${filterField}~LK~${encodeURIComponent(`%${pSearchString}%`)}`).join('~');
+			pictRouter.navigate(`/PSRS/${recordSet}/List/FilteredTo/${filterExpr}/${offset}/${pageSize}`);
+		}
+		else
+		{
+			pictRouter.navigate(`/PSRS/${recordSet}/List`);
+		}
+	}
+
 	handleRecordSetListRoute(pRoutePayload)
 	{
 		if (typeof(pRoutePayload) != 'object')
@@ -104,7 +131,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		const tmpProviderConfiguration = this.pict.PictSectionRecordSet.recordSetProviderConfigurations[pRoutePayload.data.RecordSet];
 		const tmpProviderHash = `RSP-Provider-${pRoutePayload.data.RecordSet}`;
 
-		const tmpFilterString = pRoutePayload.data.FilterString ? pRoutePayload.data.FilterString : '';
+		const tmpFilterString = pRoutePayload.data.FilterString || '';
 
 		const tmpOffset = pRoutePayload.data.Offset ? pRoutePayload.data.Offset : 0;
 		const tmpPageSize = pRoutePayload.data.PageSize ? pRoutePayload.data.PageSize : 100;
@@ -180,7 +207,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
 
 			"RenderDestination": this.options.DefaultDestinationAddress,
 
-			"FilterString": pFilterString || false,
+			"FilterString": pFilterString ? encodeURIComponent(pFilterString) : undefined,
 
 			"Records": { "Records": [] },
 			"TotalRecordCount": { "Count": -1 },
@@ -241,9 +268,12 @@ class viewRecordSetList extends libPictRecordSetRecordView
 
 		tmpRecordListData.PageLinkBookmarks.Previous = tmpRecordListData.PageLinkBookmarks.Current - 1;
 		tmpRecordListData.PageLinkBookmarks.Next = tmpRecordListData.PageLinkBookmarks.Current + 1;
+		tmpRecordListData.PageLinkBookmarks.ShowPreviousLink = true;
+		tmpRecordListData.PageLinkBookmarks.ShowNextLink = true;
 		if (tmpRecordListData.PageLinkBookmarks.Previous < 0)
 		{
-			tmpRecordListData.PageLinkBookmarks.Previous = false;
+			tmpRecordListData.PageLinkBookmarks.PreviousLink = false;
+			tmpRecordListData.PageLinkBookmarks.ShowPreviousLink = false;
 		}
 		else
 		{
@@ -251,7 +281,8 @@ class viewRecordSetList extends libPictRecordSetRecordView
 		}
 		if (tmpRecordListData.PageLinkBookmarks.Next >= tmpRecordListData.PageLinks.length)
 		{
-			tmpRecordListData.PageLinkBookmarks.Next = false;
+			tmpRecordListData.PageLinkBookmarks.NextLink = false;
+			tmpRecordListData.PageLinkBookmarks.ShowNextLink = false;
 		}
 		else
 		{
@@ -295,6 +326,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
 	{
 		this.childViews.headerList = this.pict.addView('PRSP-List-HeaderList', viewHeaderList.default_configuration, viewHeaderList);
 		this.childViews.title = this.pict.addView('PRSP-List-Title', viewTitle.default_configuration, viewTitle);
+		this.childViews.filters = this.pict.addView('PRSP-Filters', viewFilters.default_configuration, viewFilters);
 		this.childViews.paginationTop = this.pict.addView('PRSP-List-PaginationTop', viewPaginationTop.default_configuration, viewPaginationTop);
 		this.childViews.recordList = this.pict.addView('PRSP-List-RecordList', viewRecordList.default_configuration, viewRecordList);
 		this.childViews.recordListHeader = this.pict.addView('PRSP-List-RecordListHeader', viewRecordListHeader.default_configuration, viewRecordListHeader);