QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-19 05:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for "otherValues" in possibleValuesStandalone

Browse Source
This commit is contained in:
darin.kelkhoff
2025-05-27 11:31:30 -05:00
parent a4b1a8858d
commit 8b6f4b635a
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1848,13 +1848,15 @@ public class QJavalinImplementation
{
String possibleValueSourceName = context.pathParam("possibleValueSourceName");
Map<String, Serializable> otherValues = getOtherValueForPossibleValueRequest(context);
QPossibleValueSource pvs = qInstance.getPossibleValueSource(possibleValueSourceName);
if(pvs == null)
{
throw (new QNotFoundException("Could not find possible value source " + possibleValueSourceName + " in this instance."));
}
finishPossibleValuesRequest(context, possibleValueSourceName, null);
finishPossibleValuesRequest(context, possibleValueSourceName, null, otherValues);
}
catch(Exception e)
{
@ -1870,28 +1872,39 @@ public class QJavalinImplementation
static void finishPossibleValuesRequest(Context context, QFieldMetaData field) throws IOException, QException
{
QQueryFilter defaultQueryFilter = null;
Map<String, Serializable> otherValues = getOtherValueForPossibleValueRequest(context);
if(field.getPossibleValueSourceFilter() != null)
{
Map<String, Serializable> values = new HashMap<>();
if(context.formParamMap().containsKey("values"))
{
List<String> valuesParamList = context.formParamMap().get("values");
if(CollectionUtils.nullSafeHasContents(valuesParamList))
{
String valuesParam = valuesParamList.get(0);
values = JsonUtils.toObject(valuesParam, new TypeReference<>() {});
}
}
defaultQueryFilter = field.getPossibleValueSourceFilter().clone();
String useCaseParam = QJavalinUtils.getQueryParamOrFormParam(context, "useCase");
PossibleValueSearchFilterUseCase useCase = ObjectUtils.tryElse(() -> PossibleValueSearchFilterUseCase.valueOf(useCaseParam.toUpperCase()), PossibleValueSearchFilterUseCase.FORM);
defaultQueryFilter.interpretValues(values, useCase);
defaultQueryFilter.interpretValues(otherValues, useCase);
}
finishPossibleValuesRequest(context, field.getPossibleValueSourceName(), defaultQueryFilter);
finishPossibleValuesRequest(context, field.getPossibleValueSourceName(), defaultQueryFilter, otherValues);
}
/***************************************************************************
**
***************************************************************************/
private static Map<String, Serializable> getOtherValueForPossibleValueRequest(Context context) throws IOException
{
Map<String, Serializable> otherValues = new HashMap<>();
if(context.formParamMap().containsKey("values"))
{
List<String> valuesParamList = context.formParamMap().get("values");
if(CollectionUtils.nullSafeHasContents(valuesParamList))
{
String valuesParam = valuesParamList.get(0);
otherValues = JsonUtils.toObject(valuesParam, new TypeReference<>() {});
}
}
return otherValues;
}
@ -1899,7 +1912,7 @@ public class QJavalinImplementation
/*******************************************************************************
**
*******************************************************************************/
static void finishPossibleValuesRequest(Context context, String possibleValueSourceName, QQueryFilter defaultFilter) throws QException
static void finishPossibleValuesRequest(Context context, String possibleValueSourceName, QQueryFilter defaultFilter, Map<String, Serializable> otherValues) throws QException
{
String searchTerm = context.queryParam("searchTerm");
String ids = context.queryParam("ids");
@ -1909,6 +1922,7 @@ public class QJavalinImplementation
input.setPossibleValueSourceName(possibleValueSourceName);
input.setSearchTerm(searchTerm);
input.setDefaultQueryFilter(defaultFilter);
input.setOtherValues(otherValues);
if(StringUtils.hasContent(ids))
{