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

Update possibleValuesStandalone to accept filter as formParam.

Browse Source
This commit is contained in:
darin.kelkhoff
2025-07-14 16:32:00 -05:00
parent 79bc7dfecd
commit 384195a2c3
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1856,7 +1856,23 @@ public class QJavalinImplementation
throw (new QNotFoundException("Could not find possible value source " + possibleValueSourceName + " in this instance.")); throw (new QNotFoundException("Could not find possible value source " + possibleValueSourceName + " in this instance."));
} }
finishPossibleValuesRequest(context, possibleValueSourceName, null, otherValues); //////////////////////////////////////////////////
// allow a filter to be passed in from frontend //
//////////////////////////////////////////////////
QQueryFilter defaultQueryFilter = null;
List<String> filterParam = context.formParamMap().get("filter");
if(CollectionUtils.nullSafeHasContents(filterParam))
{
String possibleValueSourceFilterJSON = filterParam.get(0);
defaultQueryFilter = JsonUtils.toObject(possibleValueSourceFilterJSON, QQueryFilter.class);
String useCaseParam = QJavalinUtils.getQueryParamOrFormParam(context, "useCase");
PossibleValueSearchFilterUseCase useCase = ObjectUtils.tryElse(() -> PossibleValueSearchFilterUseCase.valueOf(useCaseParam.toUpperCase()), PossibleValueSearchFilterUseCase.FORM);
defaultQueryFilter.interpretValues(otherValues, useCase);
}
finishPossibleValuesRequest(context, possibleValueSourceName, defaultQueryFilter, otherValues);
} }
catch(Exception e) catch(Exception e)
{ {
@ -1871,8 +1887,8 @@ public class QJavalinImplementation
*******************************************************************************/ *******************************************************************************/
static void finishPossibleValuesRequest(Context context, QFieldMetaData field) throws IOException, QException static void finishPossibleValuesRequest(Context context, QFieldMetaData field) throws IOException, QException
{ {
QQueryFilter defaultQueryFilter = null; QQueryFilter defaultQueryFilter = null;
Map<String, Serializable> otherValues = getOtherValueForPossibleValueRequest(context); Map<String, Serializable> otherValues = getOtherValueForPossibleValueRequest(context);
if(field.getPossibleValueSourceFilter() != null) if(field.getPossibleValueSourceFilter() != null)
{ {

29
qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java
View File

@ -39,6 +39,9 @@ import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
import com.kingsrook.qqq.backend.core.logging.QCollectingLogger; import com.kingsrook.qqq.backend.core.logging.QCollectingLogger;
import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.logging.QLogger;
import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportFormat; import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportFormat;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.dashboard.widgets.WidgetType; import com.kingsrook.qqq.backend.core.model.dashboard.widgets.WidgetType;
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
@ -1075,7 +1078,7 @@ class QJavalinImplementationTest extends QJavalinTestBase
** **
*******************************************************************************/ *******************************************************************************/
@Test @Test
void testPossibleValueWithoutTableOrProcess() void testStandalonePossibleValueSource()
{ {
HttpResponse<String> response = Unirest.get(BASE_URL + "/possibleValues/person").asString(); HttpResponse<String> response = Unirest.get(BASE_URL + "/possibleValues/person").asString();
assertEquals(200, response.getStatus()); assertEquals(200, response.getStatus());
@ -1089,6 +1092,28 @@ class QJavalinImplementationTest extends QJavalinTestBase
/*******************************************************************************
**
*******************************************************************************/
@Test
void testStandalonePossibleValueSourceWithFilter()
{
HttpResponse<String> response = Unirest.post(BASE_URL + "/possibleValues/person")
.field("values", JsonUtils.toJson(Map.of("firstInitial", "D")))
.field("filter", JsonUtils.toJson(new QQueryFilter(new QFilterCriteria("firstName", QCriteriaOperator.STARTS_WITH, "${input.firstInitial}"))))
.asString();
assertEquals(200, response.getStatus());
JSONObject jsonObject = JsonUtils.toJSONObject(response.getBody());
assertNotNull(jsonObject);
assertNotNull(jsonObject.getJSONArray("options"));
assertEquals(1, jsonObject.getJSONArray("options").length());
assertEquals(1, jsonObject.getJSONArray("options").getJSONObject(0).getInt("id"));
assertEquals("Darin Kelkhoff (1)", jsonObject.getJSONArray("options").getJSONObject(0).getString("label"));
}
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
@ -1481,6 +1506,8 @@ class QJavalinImplementationTest extends QJavalinTestBase
{ {
static int callCount = 0; static int callCount = 0;
@Override @Override
public void run(DownloadFileSupplementalActionInput input, DownloadFileSupplementalActionOutput output) throws QException public void run(DownloadFileSupplementalActionInput input, DownloadFileSupplementalActionOutput output) throws QException
{ {