From 31e6bf4d4988893114320f34c00736336d0ec343 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 6 Sep 2022 11:41:25 -0500 Subject: [PATCH] PRDONE-94: updates from code review feedback added .env test --- .../actions/dashboard/AbstractWidgetRenderer.java | 1 + .../dashboard/QuickSightChartRenderer.java | 2 ++ .../core/actions/dashboard/WidgetDataLoader.java | 1 + .../core/model/dashboard/widgets/BarChart.java | 1 + .../core/model/dashboard/widgets/QWidget.java | 1 + .../model/dashboard/widgets/QuickSightChart.java | 2 ++ .../model/metadata/dashboard/QWidgetMetaData.java | 1 + .../dashboard/QWidgetMetaDataInterface.java | 1 + .../dashboard/QuickSightChartMetaData.java | 1 + .../QMetaDataVariableInterpreterTest.java | 15 +++++++++++++++ 10 files changed, 26 insertions(+) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractWidgetRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractWidgetRenderer.java index 93370857..ba65c767 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractWidgetRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/AbstractWidgetRenderer.java @@ -29,6 +29,7 @@ import com.kingsrook.qqq.backend.core.model.session.QSession; /******************************************************************************* + ** Base class for rendering qqq dashboard widgets ** *******************************************************************************/ public abstract class AbstractWidgetRenderer diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRenderer.java index 5ce05407..6d8a50db 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/QuickSightChartRenderer.java @@ -39,10 +39,12 @@ import software.amazon.awssdk.services.quicksight.model.RegisteredUserEmbeddingE /******************************************************************************* + ** Widget implementation for amazon QuickSight charts ** *******************************************************************************/ public class QuickSightChartRenderer extends AbstractWidgetRenderer { + /******************************************************************************* ** *******************************************************************************/ diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/WidgetDataLoader.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/WidgetDataLoader.java index 83d2676c..293df38e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/WidgetDataLoader.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/WidgetDataLoader.java @@ -30,6 +30,7 @@ import com.kingsrook.qqq.backend.core.model.session.QSession; /******************************************************************************* + ** Class for loading widget implementation code and rendering of widgets ** *******************************************************************************/ public class WidgetDataLoader diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/BarChart.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/BarChart.java index 3fd0b73f..5c5ccf4b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/BarChart.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/BarChart.java @@ -26,6 +26,7 @@ import java.util.List; /******************************************************************************* + ** Model containing datastructure expected by frontend material dashboard bar chart widget ** *******************************************************************************/ public class BarChart implements QWidget diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QWidget.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QWidget.java index 81f1d400..d62c35df 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QWidget.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QWidget.java @@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.model.dashboard.widgets; /******************************************************************************* + ** Interface for frontend material dashboard widget's datastructures ** *******************************************************************************/ public interface QWidget diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QuickSightChart.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QuickSightChart.java index e5561cac..de738d6f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QuickSightChart.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QuickSightChart.java @@ -23,6 +23,8 @@ package com.kingsrook.qqq.backend.core.model.dashboard.widgets; /******************************************************************************* + ** Model containing datastructure expected by frontend material dashboard + ** AWS quick sight widget ** *******************************************************************************/ public class QuickSightChart implements QWidget 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 3bf01462..7234eb90 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 @@ -26,6 +26,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; /******************************************************************************* + ** Base metadata for frontend material dashboard widgets ** *******************************************************************************/ public class QWidgetMetaData implements QWidgetMetaDataInterface 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 162fc56a..584e61b7 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 @@ -26,6 +26,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; /******************************************************************************* + ** Interface for qqq widget meta data ** *******************************************************************************/ public interface QWidgetMetaDataInterface diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QuickSightChartMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QuickSightChartMetaData.java index c83ff288..6d1b82f6 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QuickSightChartMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QuickSightChartMetaData.java @@ -26,6 +26,7 @@ import java.util.Collection; /******************************************************************************* + ** AWS Quicksite specific meta data for frontend material dashboard widget ** *******************************************************************************/ public class QuickSightChartMetaData extends QWidgetMetaData implements QWidgetMetaDataInterface diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreterTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreterTest.java index d40a82d9..1e339199 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreterTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreterTest.java @@ -113,6 +113,21 @@ class QMetaDataVariableInterpreterTest + /******************************************************************************* + ** + *******************************************************************************/ + @Test + void testDotEnvFile() + { + QMetaDataVariableInterpreter secretReader = new QMetaDataVariableInterpreter(); + String key = "CUSTOM_PROPERTY"; + String value = "ABCD-9876"; + assertNull(secretReader.interpret("${env.NOT-" + key + "}")); + assertEquals(value, secretReader.interpret("${env." + key + "}")); + } + + + /******************************************************************************* ** *******************************************************************************/