diff --git a/server/AyaNova/Controllers/TagController.cs b/server/AyaNova/Controllers/TagController.cs index e9a9fa18..0ff84426 100644 --- a/server/AyaNova/Controllers/TagController.cs +++ b/server/AyaNova/Controllers/TagController.cs @@ -90,9 +90,6 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - if (selectedRequest.IsEmpty) - return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "DataListSelectedRequest is required")); - if (!selectedRequest.ObjectType.HasAttribute(typeof(CoreBizObjectAttribute))) return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, "Not a taggable object type")); @@ -186,9 +183,6 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - if (selectedRequest.IsEmpty) - return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "DataListSelectedRequest is required")); - if (!selectedRequest.ObjectType.HasAttribute(typeof(CoreBizObjectAttribute))) return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, "Not a taggable object type")); if (!Authorized.HasModifyRole(HttpContext.Items, selectedRequest.ObjectType)) @@ -283,8 +277,7 @@ namespace AyaNova.Api.Controllers return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - if (selectedRequest.IsEmpty) - return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "DataListSelectedRequest is required")); + if (!selectedRequest.ObjectType.HasAttribute(typeof(CoreBizObjectAttribute))) return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, "Not a taggable object type")); if (!Authorized.HasModifyRole(HttpContext.Items, selectedRequest.ObjectType)) @@ -295,8 +288,8 @@ namespace AyaNova.Api.Controllers toTag = TagBiz.NormalizeTag(toTag); if (string.IsNullOrWhiteSpace(toTag)) return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "toTag")); - - //Rehydrate id list if necessary + + //Rehydrate id list if necessary if (selectedRequest.SelectedRowIds.Length == 0) selectedRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList( selectedRequest, diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 5a41316c..39fc4d04 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -360,12 +360,12 @@ namespace AyaNova.Biz //RENDER // - public async Task RenderReport(DataListReportProcessingOptions reportParam, string apiUrl) + public async Task RenderReport(DataListReportRequest reportRequest, string apiUrl) { var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::RenderReport"); //get report, vet security, see what we need before init in case of issue - var report = await ct.Report.FirstOrDefaultAsync(z => z.Id == reportParam.ReportId); + var report = await ct.Report.FirstOrDefaultAsync(z => z.Id == reportRequest.ReportId); if (report == null) { AddError(ApiErrorCode.NOT_FOUND, "id"); @@ -382,7 +382,7 @@ namespace AyaNova.Biz } //Client meta data is required - if (reportParam.ClientMeta == null) + if (reportRequest.ClientMeta == null) { AddError(ApiErrorCode.VALIDATION_MISSING_PROPERTY, null, "ClientMeta parameter is missing and required to render report"); return null; @@ -403,7 +403,7 @@ namespace AyaNova.Biz // ListView = reportParam.ListView, // MetaView = reportParam.MetaView // }); - var ReportData = await GetReportData(reportParam); + var ReportData = await GetReportData(reportRequest); //initialization log.LogDebug("Initializing report system"); @@ -526,7 +526,7 @@ namespace AyaNova.Biz log.LogDebug($"Preparing page: adding Client meta data"); //Client meta data to JSON string - var clientMeta = reportParam.ClientMeta.ToString(); + var clientMeta = reportRequest.ClientMeta.ToString(); log.LogDebug($"Preparing page: adding Server meta data"); //Server meta data @@ -557,7 +557,7 @@ namespace AyaNova.Biz //Report meta data // var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,ListView:`{reportParam.ListView}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}"; //removed listview as it no longer exists and I don't think there's any useful purpose to it in the report javascript at this time - var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}"; + var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportRequest.DataListKey}`,SelectedRowIds: `{string.Join(",", reportRequest.SelectedRowIds)}`}}"; //duplicate meta data in report page wide variable for use by our internal functions