diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java index da5ebcd0..fc5ac1f3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java @@ -25,7 +25,6 @@ package com.kingsrook.qqq.backend.core.actions.dashboard.widgets; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -122,7 +121,6 @@ public abstract class AbstractWidgetRenderer ////////////////////////////////////////// Set exists = new HashSet<>(); output.getResults().removeIf(pvs -> !exists.add(pvs.getLabel())); - output.getResults().sort(Comparator.comparing(QPossibleValue::getLabel)); for(QPossibleValue possibleValue : output.getResults()) { dropdownOptionList.add(Map.of( diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ParentWidgetData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ParentWidgetData.java index f75f032e..6315bce1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ParentWidgetData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ParentWidgetData.java @@ -32,6 +32,7 @@ import java.util.List; public class ParentWidgetData extends QWidgetData { private List childWidgetNameList; + private boolean omitReloadWidgetCallback; @@ -87,4 +88,38 @@ public class ParentWidgetData extends QWidgetData return (this); } + + + /******************************************************************************* + ** Getter for omitReloadWidgetCallback + ** + *******************************************************************************/ + public boolean getOmitReloadWidgetCallback() + { + return omitReloadWidgetCallback; + } + + + + /******************************************************************************* + ** Setter for omitReloadWidgetCallback + ** + *******************************************************************************/ + public void setOmitReloadWidgetCallback(boolean omitReloadWidgetCallback) + { + this.omitReloadWidgetCallback = omitReloadWidgetCallback; + } + + + + /******************************************************************************* + ** Fluent setter for omitReloadWidgetCallback + ** + *******************************************************************************/ + public ParentWidgetData withOmitReloadWidgetCallback(boolean omitReloadWidgetCallback) + { + this.omitReloadWidgetCallback = omitReloadWidgetCallback; + return (this); + } + } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java index 3cc56ad4..ffc6002e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java @@ -41,6 +41,7 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface protected String icon; protected String label; protected String type; + protected String minHeight; protected boolean isCard; protected Integer gridColumns; protected QCodeReference codeReference; @@ -428,6 +429,40 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface + /******************************************************************************* + ** Getter for minHeight + ** + *******************************************************************************/ + public String getMinHeight() + { + return minHeight; + } + + + + /******************************************************************************* + ** Setter for minHeight + ** + *******************************************************************************/ + public void setMinHeight(String minHeight) + { + this.minHeight = minHeight; + } + + + + /******************************************************************************* + ** Fluent setter for minHeight + ** + *******************************************************************************/ + public QWidgetMetaData withMinHeight(String minHeight) + { + this.minHeight = minHeight; + return (this); + } + + + /******************************************************************************* ** Getter for permissionRules *******************************************************************************/ diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java index dfecc869..24119d7e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java @@ -131,6 +131,15 @@ public interface QWidgetMetaDataInterface extends MetaDataWithPermissionRules *******************************************************************************/ void setIsCard(boolean isCard); + /******************************************************************************* + ** Getter for minHeight + *******************************************************************************/ + String getMinHeight(); + + /******************************************************************************* + ** Setter for minHeight + *******************************************************************************/ + void setMinHeight(String minHeight); /******************************************************************************* ** Getter for storeDropdownSelections diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java index f31445e3..240403bd 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java @@ -45,6 +45,7 @@ public class QFrontendWidgetMetaData private final String icon; private final Integer gridColumns; private final boolean isCard; + private final String minHeight; private final boolean storeDropdownSelections; private final List dropdowns; @@ -67,6 +68,7 @@ public class QFrontendWidgetMetaData this.icon = widgetMetaData.getIcon(); this.gridColumns = widgetMetaData.getGridColumns(); this.isCard = widgetMetaData.getIsCard(); + this.minHeight = widgetMetaData.getMinHeight(); this.dropdowns = widgetMetaData.getDropdowns(); this.storeDropdownSelections = widgetMetaData.getStoreDropdownSelections(); @@ -130,6 +132,17 @@ public class QFrontendWidgetMetaData + /******************************************************************************* + ** Getter for minHeight + ** + *******************************************************************************/ + public String getMinHeight() + { + return minHeight; + } + + + /******************************************************************************* ** Getter for isCard **