From 8c3ed817b29f90e9e55d29291631b1c81e1739b4 Mon Sep 17 00:00:00 2001
From: Tyler Ohlsen <ohltyler@amazon.com>
Date: Wed, 11 Oct 2023 16:37:39 -0700
Subject: [PATCH] Prevent empty task IDs passed to server side (#616)

* Prevent empty task IDs passed to server side

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

* add release notes

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

---------

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
---
 .../containers/AnomalyHistory.tsx             | 45 ++++++++++---------
 ...ction-dashboards.release-notes-2.11.0.0.md |  4 ++
 2 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.11.0.0.md

diff --git a/public/pages/DetectorResults/containers/AnomalyHistory.tsx b/public/pages/DetectorResults/containers/AnomalyHistory.tsx
index 8fec0696..e9a355df 100644
--- a/public/pages/DetectorResults/containers/AnomalyHistory.tsx
+++ b/public/pages/DetectorResults/containers/AnomalyHistory.tsx
@@ -173,6 +173,12 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
   const backgroundColor = darkModeEnabled() ? '#29017' : '#F7F7F7';
   const resultIndex = get(props, 'detector.resultIndex', '');
 
+  // Utility fn to only fetch data when either it is non-historical, or historical and
+  // there is a populated task ID which will be used to fetch the historical results
+  const isValidToFetch = () => {
+    return !props.isHistorical || (props.isHistorical && taskId.current);
+  };
+
   // Tracking which parent category fields the user has selected to filter by.
   const [selectedCategoryFields, setSelectedCategoryFields] = useState(
     getCategoryFieldOptions(detectorCategoryField)
@@ -325,7 +331,8 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
   useEffect(() => {
     if (
       !isEmpty(bucketizedAnomalyResults) &&
-      !isDateRangeOversize(zoomRange, detectorInterval, MAX_ANOMALIES)
+      !isDateRangeOversize(zoomRange, detectorInterval, MAX_ANOMALIES) &&
+      isValidToFetch()
     ) {
       setBucketizedAnomalyResults(undefined);
       if (isHCDetector && selectedHeatmapCell) {
@@ -350,14 +357,16 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
   }, [zoomRange]);
 
   useEffect(() => {
-    fetchRawAnomalyResults(isHCDetector);
-    if (
-      !isHCDetector &&
-      isDateRangeOversize(dateRange, detectorInterval, MAX_ANOMALIES)
-    ) {
-      getBucketizedAnomalyResults();
-    } else {
-      setBucketizedAnomalyResults(undefined);
+    if (isValidToFetch()) {
+      fetchRawAnomalyResults(isHCDetector);
+      if (
+        !isHCDetector &&
+        isDateRangeOversize(dateRange, detectorInterval, MAX_ANOMALIES)
+      ) {
+        getBucketizedAnomalyResults();
+      } else {
+        setBucketizedAnomalyResults(undefined);
+      }
     }
   }, [dateRange, props.detector]);
 
@@ -399,13 +408,7 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
       );
       const detectorResultResponse = props.isHistorical
         ? await dispatch(
-            getDetectorResults(
-              taskId.current || '',
-              params,
-              true,
-              resultIndex,
-              true
-            )
+            getDetectorResults(taskId.current, params, true, resultIndex, true)
           ).catch((error: any) => {
             setIsLoading(false);
             setIsLoadingAnomalyResults(false);
@@ -457,17 +460,19 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
   useEffect(() => {
     // For any change, we will want to clear any selected heatmap cell to clear any populated charts / graphs
     setSelectedHeatmapCell(undefined);
-    fetchHCAnomalySummaries();
+    if (isValidToFetch()) {
+      fetchHCAnomalySummaries();
+    }
   }, [selectedCategoryFields]);
 
   useEffect(() => {
-    if (isHCDetector) {
+    if (isHCDetector && isValidToFetch()) {
       fetchHCAnomalySummaries();
     }
   }, [dateRange, heatmapDisplayOption]);
 
   useEffect(() => {
-    if (selectedHeatmapCell) {
+    if (selectedHeatmapCell && isValidToFetch()) {
       if (
         isMultiCategory &&
         get(selectedCategoryFields, 'length', 0) <
@@ -491,7 +496,7 @@ export const AnomalyHistory = (props: AnomalyHistoryProps) => {
 
   // Getting the latest sets of time series based on the selected parent + child entities
   useEffect(() => {
-    if (selectedHeatmapCell) {
+    if (selectedHeatmapCell && isValidToFetch()) {
       // Get a list of entity lists, where each list represents a unique entity combination of
       // all parent + child entities (a single model). And, for each one of these lists, fetch the time series data.
       const entityCombosToFetch = getAllEntityCombos(
diff --git a/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.11.0.0.md b/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.11.0.0.md
new file mode 100644
index 00000000..5189a282
--- /dev/null
+++ b/release-notes/opensearch-anomaly-detection-dashboards.release-notes-2.11.0.0.md
@@ -0,0 +1,4 @@
+Compatible with OpenSearch Dashboards 2.11.0.
+
+### Bug Fixes
+* Prevent empty task IDs passed to server side ([#616](https://github.com/opensearch-project/anomaly-detection-dashboards-plugin/pull/616))