diff --git a/server/AyaNova/Controllers/ExportController.cs b/server/AyaNova/Controllers/ExportController.cs index 1d38d68e..702abafd 100644 --- a/server/AyaNova/Controllers/ExportController.cs +++ b/server/AyaNova/Controllers/ExportController.cs @@ -50,7 +50,7 @@ namespace AyaNova.Api.Controllers /// /// downloadable export file name [HttpPost("render/{format}")] - public async Task RenderExport([FromRoute] string format, [FromBody] DataListSelection dataListSelection) + public async Task RenderExport([FromRoute] string format, [FromBody] DataListSelectionOptions dataListSelection) { if (!serverState.IsOpen) diff --git a/server/AyaNova/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs index 026337f3..98319891 100644 --- a/server/AyaNova/Controllers/JobOperationsController.cs +++ b/server/AyaNova/Controllers/JobOperationsController.cs @@ -196,7 +196,7 @@ namespace AyaNova.Api.Controllers /// /// Job Id [HttpPost("batch-delete")] - public async Task BatchDeleteObjects([FromBody] DataListSelection dataListSelection) + public async Task BatchDeleteObjects([FromBody] DataListSelectionOptions dataListSelection) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs index 898bbdc6..fd821826 100644 --- a/server/AyaNova/Controllers/ReportController.cs +++ b/server/AyaNova/Controllers/ReportController.cs @@ -188,7 +188,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("data")] - public async Task GetReportData([FromBody] DataListSelection reportDataParam, ApiVersion apiVersion) + public async Task GetReportData([FromBody] DataListSelectionOptions reportDataParam, ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TagController.cs b/server/AyaNova/Controllers/TagController.cs index 8581adb6..deb2278f 100644 --- a/server/AyaNova/Controllers/TagController.cs +++ b/server/AyaNova/Controllers/TagController.cs @@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers /// /// Job Id [HttpPost("batch-add/{tag}")] - public async Task BatchAdd([FromRoute] string tag, [FromBody] DataListSelection dataListSelection) + public async Task BatchAdd([FromRoute] string tag, [FromBody] DataListSelectionOptions dataListSelection) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -173,7 +173,7 @@ namespace AyaNova.Api.Controllers /// /// Job Id [HttpPost("batch-remove/{tag}")] - public async Task BatchRemove([FromRoute] string tag, [FromBody] DataListSelection dataListSelection) + public async Task BatchRemove([FromRoute] string tag, [FromBody] DataListSelectionOptions dataListSelection) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -266,7 +266,7 @@ namespace AyaNova.Api.Controllers /// /// Job Id [HttpPost("batch-replace/{fromTag}")] - public async Task BatchReplace([FromRoute] string fromTag, [FromQuery] string toTag, [FromBody] DataListSelection dataListSelection) + public async Task BatchReplace([FromRoute] string fromTag, [FromQuery] string toTag, [FromBody] DataListSelectionOptions dataListSelection) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index c2f0c61f..07eeb0e3 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -331,7 +331,7 @@ namespace AyaNova.Biz //REPORT DATA //Data fetched to return to report designer for Client report design usage - public async Task GetReportData(DataListSelection dataListSelection) + public async Task GetReportData(DataListSelectionOptions dataListSelection) { var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData"); AuthorizationRoles effectiveRoles = CurrentUserRoles; diff --git a/server/AyaNova/models/dto/DataListSelection.cs b/server/AyaNova/models/dto/DataListSelectionOptions.cs similarity index 93% rename from server/AyaNova/models/dto/DataListSelection.cs rename to server/AyaNova/models/dto/DataListSelectionOptions.cs index a3c7eedf..649dba56 100644 --- a/server/AyaNova/models/dto/DataListSelection.cs +++ b/server/AyaNova/models/dto/DataListSelectionOptions.cs @@ -5,7 +5,7 @@ namespace AyaNova.Models //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 //be used to rehydrate a list of id's - public class DataListSelection : DataListBase + public class DataListSelectionOptions : DataListBase { public AyaType ObjectType { get; set; } public long[] SelectedRowIds { get; set; } diff --git a/server/AyaNova/models/dto/RenderReportParameter.cs b/server/AyaNova/models/dto/RenderReportParameter.cs index 2b907660..d4d60b4d 100644 --- a/server/AyaNova/models/dto/RenderReportParameter.cs +++ b/server/AyaNova/models/dto/RenderReportParameter.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; namespace AyaNova.Models { - public class RenderReportParameter : DataListSelection + public class RenderReportParameter : DataListSelectionOptions { public long ReportId { get; set; } public JToken ClientMeta { get; set; }//meta JSON data passed from client, not part of biz object data