pict-section-recordset 1.0.18 → 1.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/example_applications/simple_entity/Simple-RecordSet-Application.js +4 -4
  2. package/package.json +1 -1
  3. package/source/views/RecordSet-Filter.js +13 -5
  4. package/source/views/list/RecordSet-List.js +5 -5
  5. package/types/views/RecordSet-Filter.d.ts.map +1 -1
package/example_applications/simple_entity/Simple-RecordSet-Application.js CHANGED
@@ -209,8 +209,8 @@ module.exports.default_configuration.pict_configuration = (
209
209
 
210
210
  "SearchFields": [ "Title" ],
211
211
 
212
- "RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
213
- "RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
212
+ "RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
213
+ "RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
214
214
  "RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
215
215
 
216
216
  "RecordSetURLPrefix": "/1.0/"
@@ -277,8 +277,8 @@ module.exports.default_configuration.pict_configuration = (
277
277
 
278
278
  "SearchFields": [ "Title" ],
279
279
 
280
- "RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
281
- "RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/ListFilteredTo/{~D:Record.FilterString~}",
280
+ "RecordSetFilterURLTemplate-Default": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
281
+ "RecordSetFilterURLTemplate-List": "/PSRS/{~D:Record.RecordSet~}/List/FilteredTo/{~D:Record.FilterString~}",
282
282
  "RecordSetFilterURLTemplate-Dashboard": "/PSRS/{~D:Record.RecordSet~}/Dashboard/FilteredTo/{~D:Record.FilterString~}",
283
283
  //TODO: something like this to reduce boilerplate
284
284
  "RecordSetFilterURLTemplate-Dashboard-Specific": "/PSRS/{~D:Record.RecordSet~}/SpecificDashboard/$$DASHBOARD_HASH$$/FilteredTo/{~D:Record.FilterString~}",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pict-section-recordset",
3
- "version": "1.0.18",
3
+ "version": "1.0.19",
4
4
  "description": "Pict dynamic record set management views",
5
5
  "main": "source/Pict-Section-RecordSet.js",
6
6
  "directories": {
package/source/views/RecordSet-Filter.js CHANGED
@@ -117,11 +117,19 @@ class viewRecordSetSUBSETFilter extends libPictView
117
117
  filterExpr = searchFields.map((filterField) => `FBVOR~${filterField}~LK~${encodeURIComponent(`%${pFilterString}%`)}`).join('~');
118
118
  }
119
119
  let tmpURLTemplate = tmpProviderConfiguration[`RecordSetFilterURLTemplate-${pViewContext}`] || tmpProviderConfiguration[`RecordSetFilterURLTemplate-Default`];
120
- const tmpURL = this.pict.parseTemplate(tmpURLTemplate,
121
- {
122
- RecordSet: pRecordSet,
123
- FilterString: filterExpr,
124
- });
120
+ let tmpURL;
121
+ if (tmpURLTemplate)
122
+ {
123
+ tmpURL = this.pict.parseTemplate(tmpURLTemplate,
124
+ {
125
+ RecordSet: pRecordSet,
126
+ FilterString: filterExpr,
127
+ });
128
+ }
129
+ else
130
+ {
131
+ tmpURL = `/PSRS/${pRecordSet}/List/FilteredTo/${filterExpr}`;
132
+ }
125
133
  tmpPictRouter.router.navigate(tmpURL);
126
134
  }
127
135
 
package/source/views/list/RecordSet-List.js CHANGED
@@ -117,8 +117,8 @@ class viewRecordSetList extends libPictRecordSetRecordView
117
117
 
118
118
  addRoutes(pPictRouter)
119
119
  {
120
- pPictRouter.router.on('/PSRS/:RecordSet/ListFilteredTo/:FilterString/:Offset/:PageSize', this.handleRecordSetListRoute.bind(this));
121
- pPictRouter.router.on('/PSRS/:RecordSet/ListFilteredTo/:FilterString', this.handleRecordSetListRoute.bind(this));
120
+ pPictRouter.router.on('/PSRS/:RecordSet/List/FilteredTo/:FilterString/:Offset/:PageSize', this.handleRecordSetListRoute.bind(this));
121
+ pPictRouter.router.on('/PSRS/:RecordSet/List/FilteredTo/:FilterString', this.handleRecordSetListRoute.bind(this));
122
122
  pPictRouter.router.on('/PSRS/:RecordSet/List/:Offset/:PageSize', this.handleRecordSetListRoute.bind(this));
123
123
  pPictRouter.router.on('/PSRS/:RecordSet/List/:Offset', this.handleRecordSetListRoute.bind(this));
124
124
  pPictRouter.router.on('/PSRS/:RecordSet/List', this.handleRecordSetListRoute.bind(this));
@@ -232,7 +232,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
232
232
  {
233
233
  Page: i + 1,
234
234
  RelativeOffset: i - tmpRecordListData.PageLinkBookmarks.Current,
235
- URL: `#/PSRS/${tmpRecordListData.RecordSet}/ListFilteredTo/${tmpRecordListData.FilterString}/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
235
+ URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${i * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
236
236
  });
237
237
  }
238
238
  else
@@ -258,7 +258,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
258
258
  {
259
259
  Page: 1,
260
260
  RelativeOffset: -tmpRecordListData.PageLinkBookmarks.Current,
261
- URL: `#/PSRS/${tmpRecordListData.RecordSet}/ListFilteredTo/${tmpRecordListData.FilterString}/${tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
261
+ URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
262
262
  });
263
263
  }
264
264
  else
@@ -279,7 +279,7 @@ class viewRecordSetList extends libPictRecordSetRecordView
279
279
  {
280
280
  Page: tmpRecordListData.PageCount,
281
281
  RelativeOffset: (tmpRecordListData.PageCount - 1) - tmpRecordListData.PageLinkBookmarks.Current,
282
- URL: `#/PSRS/${tmpRecordListData.RecordSet}/ListFilteredTo/${tmpRecordListData.FilterString}/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
282
+ URL: `#/PSRS/${tmpRecordListData.RecordSet}/List/FilteredTo/${tmpRecordListData.FilterString}/${(tmpRecordListData.PageCount - 1) * tmpRecordListData.PageSize}/${tmpRecordListData.PageSize}`
283
283
  });
284
284
  }
285
285
  else
package/types/views/RecordSet-Filter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RecordSet-Filter.d.ts","sourceRoot":"","sources":["../../source/views/RecordSet-Filter.js"],"names":[],"mappings":";AA+EA;IAEC,2DAMC;IAFA,kHAAkH;IAClH,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,GAAG;QAAE,oBAAoB,EAAE;;;;;;SAAsC,CAAA;KAAE,CACrG;IAGV;;;;OAIG;IACH,qBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAQhB;IAED;;;;OAIG;IACH,0BAJW,MAAM,gBACN,MAAM,kBACN,MAAM,QAoBhB;IAED;;;;OAIG;IACH,oBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAOhB;CACD;;;;;AAxID,kCAAkC;AAClC,oDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2E5B"}
1
+ {"version":3,"file":"RecordSet-Filter.d.ts","sourceRoot":"","sources":["../../source/views/RecordSet-Filter.js"],"names":[],"mappings":";AA+EA;IAEC,2DAMC;IAFA,kHAAkH;IAClH,MADW,GAAe,GAAG,OAAO,MAAM,CAAC,GAAG;QAAE,oBAAoB,EAAE;;;;;;SAAsC,CAAA;KAAE,CACrG;IAGV;;;;OAIG;IACH,qBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAQhB;IAED;;;;OAIG;IACH,0BAJW,MAAM,gBACN,MAAM,kBACN,MAAM,QA4BhB;IAED;;;;OAIG;IACH,oBAJW,KAAK,cACL,MAAM,gBACN,MAAM,QAOhB;CACD;;;;;AAhJD,kCAAkC;AAClC,oDADW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2E5B"}