From b9d90cdddbb9a580d6b6fe16610866611b6e9d69 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Thu, 4 May 2023 15:03:50 -0500 Subject: [PATCH 1/2] fixed failing test because of class cast exception --- .../qqq/backend/module/api/mocks/MockApiUtilsHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/mocks/MockApiUtilsHelper.java b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/mocks/MockApiUtilsHelper.java index 65b973df..314eed51 100644 --- a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/mocks/MockApiUtilsHelper.java +++ b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/mocks/MockApiUtilsHelper.java @@ -33,7 +33,7 @@ import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeConsumer; import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeSupplier; import com.kingsrook.qqq.backend.module.api.actions.QHttpResponse; import org.apache.commons.io.IOUtils; -import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpRequestBase; import static org.junit.jupiter.api.Assertions.fail; @@ -221,6 +221,6 @@ public class MockApiUtilsHelper @SuppressWarnings("unchecked") public static String readRequestBody(HttpRequestBase request) throws IOException { - return (StringUtils.join("\n", IOUtils.readLines(((HttpPost) request).getEntity().getContent()))); + return (StringUtils.join("\n", IOUtils.readLines(((HttpEntityEnclosingRequestBase) request).getEntity().getContent()))); } } From 1e1a33c250b7355e58c92d0f98ad568f18dfa2b0 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Mon, 8 May 2023 11:25:08 -0500 Subject: [PATCH 2/2] fixed billing dashboard links and made them permissed --- .../actions/dashboard/AbstractHTMLWidgetRenderer.java | 10 +++++----- .../dashboard/widgets/NoCodeWidgetVelocityUtils.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractHTMLWidgetRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractHTMLWidgetRenderer.java index c3feaae2..4e2c0c14 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractHTMLWidgetRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractHTMLWidgetRenderer.java @@ -216,7 +216,7 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer /******************************************************************************* ** *******************************************************************************/ - public static String linkTableFilter(RenderWidgetInput input, String tableName, QQueryFilter filter) throws QException + public static String linkTableFilter(String tableName, QQueryFilter filter) throws QException { String tablePath = QContext.getQInstance().getTablePath(tableName); if(tablePath == null) @@ -232,9 +232,9 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer /******************************************************************************* ** *******************************************************************************/ - public static String aHrefTableFilterNoOfRecords(RenderWidgetInput input, String tableName, QQueryFilter filter, Integer noOfRecords, String singularLabel, String pluralLabel) throws QException + public static String aHrefTableFilterNoOfRecords(String tableName, QQueryFilter filter, Integer noOfRecords, String singularLabel, String pluralLabel) throws QException { - return (aHrefTableFilterNoOfRecords(input, tableName, filter, noOfRecords, singularLabel, pluralLabel, false)); + return (aHrefTableFilterNoOfRecords(tableName, filter, noOfRecords, singularLabel, pluralLabel, false)); } @@ -242,7 +242,7 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer /******************************************************************************* ** *******************************************************************************/ - public static String aHrefTableFilterNoOfRecords(RenderWidgetInput input, String tableName, QQueryFilter filter, Integer noOfRecords, String singularLabel, String pluralLabel, boolean onlyLinkCount) throws QException + public static String aHrefTableFilterNoOfRecords(String tableName, QQueryFilter filter, Integer noOfRecords, String singularLabel, String pluralLabel, boolean onlyLinkCount) throws QException { String plural = StringUtils.plural(noOfRecords, singularLabel, pluralLabel); String countString = QValueFormatter.formatValue(DisplayFormat.COMMAS, noOfRecords); @@ -253,7 +253,7 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer return (countString + displayText); } - String href = linkTableFilter(input, tableName, filter); + String href = linkTableFilter(tableName, filter); if(onlyLinkCount) { return ("" + countString + "" + displayText); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/NoCodeWidgetVelocityUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/NoCodeWidgetVelocityUtils.java index 45d91257..e81999e8 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/NoCodeWidgetVelocityUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/NoCodeWidgetVelocityUtils.java @@ -288,7 +288,7 @@ public class NoCodeWidgetVelocityUtils WidgetCount widgetCount = (WidgetCount) context.get(countVariableName + ".source"); Integer count = ValueUtils.getValueAsInteger(context.get(countVariableName)); QQueryFilter filter = widgetCount.getEffectiveFilter(input); - return (AbstractHTMLWidgetRenderer.aHrefTableFilterNoOfRecords(null, widgetCount.getTableName(), filter, count, singular, plural)); + return (AbstractHTMLWidgetRenderer.aHrefTableFilterNoOfRecords(widgetCount.getTableName(), filter, count, singular, plural)); } catch(Exception e) {