This commit is contained in:
2021-01-27 18:54:39 +00:00
parent b90ab0b35c
commit 2751bd3d93
7 changed files with 9 additions and 9 deletions

View File

@@ -50,7 +50,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dataListSelection"></param> /// <param name="dataListSelection"></param>
/// <returns>downloadable export file name</returns> /// <returns>downloadable export file name</returns>
[HttpPost("render/{format}")] [HttpPost("render/{format}")]
public async Task<IActionResult> RenderExport([FromRoute] string format, [FromBody] DataListSelection dataListSelection) public async Task<IActionResult> RenderExport([FromRoute] string format, [FromBody] DataListSelectionOptions dataListSelection)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)

View File

@@ -196,7 +196,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dataListSelection"></param> /// <param name="dataListSelection"></param>
/// <returns>Job Id</returns> /// <returns>Job Id</returns>
[HttpPost("batch-delete")] [HttpPost("batch-delete")]
public async Task<IActionResult> BatchDeleteObjects([FromBody] DataListSelection dataListSelection) public async Task<IActionResult> BatchDeleteObjects([FromBody] DataListSelectionOptions dataListSelection)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));

View File

@@ -188,7 +188,7 @@ namespace AyaNova.Api.Controllers
/// <param name="apiVersion">From route path</param> /// <param name="apiVersion">From route path</param>
/// <returns></returns> /// <returns></returns>
[HttpPost("data")] [HttpPost("data")]
public async Task<IActionResult> GetReportData([FromBody] DataListSelection reportDataParam, ApiVersion apiVersion) public async Task<IActionResult> GetReportData([FromBody] DataListSelectionOptions reportDataParam, ApiVersion apiVersion)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));

View File

@@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dataListSelection"></param> /// <param name="dataListSelection"></param>
/// <returns>Job Id</returns> /// <returns>Job Id</returns>
[HttpPost("batch-add/{tag}")] [HttpPost("batch-add/{tag}")]
public async Task<IActionResult> BatchAdd([FromRoute] string tag, [FromBody] DataListSelection dataListSelection) public async Task<IActionResult> BatchAdd([FromRoute] string tag, [FromBody] DataListSelectionOptions dataListSelection)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
@@ -173,7 +173,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dataListSelection"></param> /// <param name="dataListSelection"></param>
/// <returns>Job Id</returns> /// <returns>Job Id</returns>
[HttpPost("batch-remove/{tag}")] [HttpPost("batch-remove/{tag}")]
public async Task<IActionResult> BatchRemove([FromRoute] string tag, [FromBody] DataListSelection dataListSelection) public async Task<IActionResult> BatchRemove([FromRoute] string tag, [FromBody] DataListSelectionOptions dataListSelection)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
@@ -266,7 +266,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dataListSelection"></param> /// <param name="dataListSelection"></param>
/// <returns>Job Id</returns> /// <returns>Job Id</returns>
[HttpPost("batch-replace/{fromTag}")] [HttpPost("batch-replace/{fromTag}")]
public async Task<IActionResult> BatchReplace([FromRoute] string fromTag, [FromQuery] string toTag, [FromBody] DataListSelection dataListSelection) public async Task<IActionResult> BatchReplace([FromRoute] string fromTag, [FromQuery] string toTag, [FromBody] DataListSelectionOptions dataListSelection)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));

View File

@@ -331,7 +331,7 @@ namespace AyaNova.Biz
//REPORT DATA //REPORT DATA
//Data fetched to return to report designer for Client report design usage //Data fetched to return to report designer for Client report design usage
public async Task<Newtonsoft.Json.Linq.JArray> GetReportData(DataListSelection dataListSelection) public async Task<Newtonsoft.Json.Linq.JArray> GetReportData(DataListSelectionOptions dataListSelection)
{ {
var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData"); var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData");
AuthorizationRoles effectiveRoles = CurrentUserRoles; AuthorizationRoles effectiveRoles = CurrentUserRoles;

View File

@@ -5,7 +5,7 @@ namespace AyaNova.Models
//Used to drive processes that rely on selections made at client from a datalist //Used to drive processes that rely on selections made at client from a datalist
//either a preselected list of id's or a datalist key and listview filter object that can //either a preselected list of id's or a datalist key and listview filter object that can
//be used to rehydrate a list of id's //be used to rehydrate a list of id's
public class DataListSelection : DataListBase public class DataListSelectionOptions : DataListBase
{ {
public AyaType ObjectType { get; set; } public AyaType ObjectType { get; set; }
public long[] SelectedRowIds { get; set; } public long[] SelectedRowIds { get; set; }

View File

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq;
namespace AyaNova.Models namespace AyaNova.Models
{ {
public class RenderReportParameter : DataListSelection public class RenderReportParameter : DataListSelectionOptions
{ {
public long ReportId { get; set; } public long ReportId { get; set; }
public JToken ClientMeta { get; set; }//meta JSON data passed from client, not part of biz object data public JToken ClientMeta { get; set; }//meta JSON data passed from client, not part of biz object data