diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java index 8a25136c..fcfd2fa1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java @@ -244,8 +244,6 @@ public class SearchPossibleValueSourceAction } } - queryFilter.setOrderBys(possibleValueSource.getOrderByFields()); - // todo - skip & limit as params queryFilter.setLimit(250); @@ -257,6 +255,9 @@ public class SearchPossibleValueSourceAction input.getDefaultQueryFilter().addSubFilter(queryFilter); queryFilter = input.getDefaultQueryFilter(); } + + queryFilter.setOrderBys(possibleValueSource.getOrderByFields()); + queryInput.setFilter(queryFilter); QueryOutput queryOutput = new QueryAction().execute(queryInput); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/audits/AuditsMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/audits/AuditsMetaDataProvider.java index 56b4b963..e5aef66a 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/audits/AuditsMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/audits/AuditsMetaDataProvider.java @@ -116,16 +116,19 @@ public class AuditsMetaDataProvider instance.addPossibleValueSource(new QPossibleValueSource() .withName(TABLE_NAME_AUDIT_TABLE) .withTableName(TABLE_NAME_AUDIT_TABLE) + .withOrderByField("name") ); instance.addPossibleValueSource(new QPossibleValueSource() .withName(TABLE_NAME_AUDIT_USER) .withTableName(TABLE_NAME_AUDIT_USER) + .withOrderByField("name") ); instance.addPossibleValueSource(new QPossibleValueSource() .withName(TABLE_NAME_AUDIT) .withTableName(TABLE_NAME_AUDIT) + .withOrderByField("id", false) ); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java index f22f5795..62e460bf 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java @@ -187,7 +187,8 @@ public class QueryStatMetaDataProvider return (new QPossibleValueSource() .withType(QPossibleValueSourceType.TABLE) .withName(QueryStat.TABLE_NAME) - .withTableName(QueryStat.TABLE_NAME)); + .withTableName(QueryStat.TABLE_NAME)) + .withOrderByField("id", false); } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFiltersMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFiltersMetaDataProvider.java index cb03e071..0347db77 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFiltersMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFiltersMetaDataProvider.java @@ -88,7 +88,8 @@ public class SavedFiltersMetaDataProvider .withName(SavedFilter.TABLE_NAME) .withType(QPossibleValueSourceType.TABLE) .withTableName(SavedFilter.TABLE_NAME) - .withValueFormatAndFields(PVSValueFormatAndFields.LABEL_ONLY); + .withValueFormatAndFields(PVSValueFormatAndFields.LABEL_ONLY) + .withOrderByField("label"); } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java index c31b6ab3..bd7f3231 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java @@ -303,19 +303,24 @@ public class ScriptsMetaDataProvider { instance.addPossibleValueSource(new QPossibleValueSource() .withName(Script.TABLE_NAME) - .withTableName(Script.TABLE_NAME)); + .withTableName(Script.TABLE_NAME) + .withOrderByField("name")); instance.addPossibleValueSource(new QPossibleValueSource() .withName(ScriptRevision.TABLE_NAME) - .withTableName(ScriptRevision.TABLE_NAME)); + .withTableName(ScriptRevision.TABLE_NAME) + .withOrderByField("scriptId") + .withOrderByField("sequenceNo", false)); instance.addPossibleValueSource(new QPossibleValueSource() .withName(ScriptType.TABLE_NAME) - .withTableName(ScriptType.TABLE_NAME)); + .withTableName(ScriptType.TABLE_NAME) + .withOrderByField("name")); instance.addPossibleValueSource(new QPossibleValueSource() .withName(ScriptLog.TABLE_NAME) - .withTableName(ScriptLog.TABLE_NAME)); + .withTableName(ScriptLog.TABLE_NAME) + .withOrderByField("id", false)); instance.addPossibleValueSource(new QPossibleValueSource() .withName(ScriptTypeFileMode.NAME) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTablesMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTablesMetaDataProvider.java index 100d705b..034efcd5 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTablesMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTablesMetaDataProvider.java @@ -127,7 +127,8 @@ public class QQQTablesMetaDataProvider return (new QPossibleValueSource() .withType(QPossibleValueSourceType.TABLE) .withName(QQQTable.TABLE_NAME) - .withTableName(QQQTable.TABLE_NAME)); + .withTableName(QQQTable.TABLE_NAME)) + .withOrderByField("label"); } }