QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read filter & fields from formParam if not found as queryParam, in exports

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-05 16:48:35 -05:00
parent c91a678905
commit ba544adb76
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
View File

@ -1161,21 +1161,13 @@ public class QJavalinImplementation
try try
{ {
////////////////////////////////////////// String format = context.queryParam("format");
// read params from the request context //
//////////////////////////////////////////
String format = context.queryParam("format");
String filter = context.queryParam("filter");
Integer limit = QJavalinUtils.integerQueryParam(context, "limit");
ReportFormat reportFormat = getReportFormat(context, optionalFilename, format); ReportFormat reportFormat = getReportFormat(context, optionalFilename, format);
if(reportFormat == null) if(reportFormat == null)
{ {
return; return;
} }
String filename = optionalFilename.orElse(tableName + "." + reportFormat.toString().toLowerCase(Locale.ROOT));
///////////////////////////////////////////// /////////////////////////////////////////////
// set up the report action's input object // // set up the report action's input object //
///////////////////////////////////////////// /////////////////////////////////////////////
@ -1184,18 +1176,33 @@ public class QJavalinImplementation
exportInput.setTableName(tableName); exportInput.setTableName(tableName);
exportInput.setReportFormat(reportFormat); exportInput.setReportFormat(reportFormat);
String filename = optionalFilename.orElse(tableName + "." + reportFormat.toString().toLowerCase(Locale.ROOT));
exportInput.setFilename(filename); exportInput.setFilename(filename);
Integer limit = QJavalinUtils.integerQueryParam(context, "limit");
exportInput.setLimit(limit); exportInput.setLimit(limit);
PermissionsHelper.checkTablePermissionThrowing(exportInput, TablePermissionSubType.READ); PermissionsHelper.checkTablePermissionThrowing(exportInput, TablePermissionSubType.READ);
String fields = QJavalinUtils.stringQueryParam(context, "fields"); String fields = QJavalinUtils.stringQueryParam(context, "fields");
if(!StringUtils.hasContent(fields))
{
fields = context.formParam("fields");
}
if(StringUtils.hasContent(fields)) if(StringUtils.hasContent(fields))
{ {
exportInput.setFieldNames(List.of(fields.split(","))); exportInput.setFieldNames(List.of(fields.split(",")));
} }
if(filter != null) String filter = context.queryParam("filter");
if(!StringUtils.hasContent(filter))
{
filter = context.formParam("filter");
}
if(StringUtils.hasContent(filter))
{ {
exportInput.setQueryFilter(JsonUtils.toObject(filter, QQueryFilter.class)); exportInput.setQueryFilter(JsonUtils.toObject(filter, QQueryFilter.class));
} }
@ -1209,17 +1216,18 @@ public class QJavalinImplementation
return (exportAction); return (exportAction);
}; };
String finalFilter = filter;
UnsafeConsumer<ExportAction, Exception> execute = (ExportAction exportAction) -> UnsafeConsumer<ExportAction, Exception> execute = (ExportAction exportAction) ->
{ {
QJavalinAccessLogger.logStart("export", logPair("table", tableName)); QJavalinAccessLogger.logStart("export", logPair("table", tableName));
try try
{ {
ExportOutput exportOutput = exportAction.execute(exportInput); ExportOutput exportOutput = exportAction.execute(exportInput);
QJavalinAccessLogger.logEndSuccess(logPair("recordCount", exportOutput.getRecordCount()), logPairIfSlow("filter", filter, SLOW_LOG_THRESHOLD_MS)); QJavalinAccessLogger.logEndSuccess(logPair("recordCount", exportOutput.getRecordCount()), logPairIfSlow("filter", finalFilter, SLOW_LOG_THRESHOLD_MS));
} }
catch(Exception e) catch(Exception e)
{ {
QJavalinAccessLogger.logEndFail(e, logPair("filter", filter)); QJavalinAccessLogger.logEndFail(e, logPair("filter", finalFilter));
throw (e); throw (e);
} }
}; };