[Backport 3.1] fix: fetch full forecaster list, and fix delete bug

.github/workflows/verify-binary-installation.yml

@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
 
 on: [push, pull_request]
 env:
-  OPENSEARCH_VERSION: '3.1.0'
+  OPENSEARCH_VERSION: '3.2.0'
   CI: 1
   # avoid warnings like "tput: No value for $TERM and no -T specified"
   TERM: xterm

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "anomalyDetectionDashboards",
-  "version": "3.1.0.0",
-  "opensearchDashboardsVersion": "3.1.0",
+  "version": "3.2.0.0",
+  "opensearchDashboardsVersion": "3.2.0",
   "configPath": [
     "anomaly_detection_dashboards"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "anomaly-detection-dashboards",
-  "version": "3.1.0.0",
+  "version": "3.2.0.0",
   "description": "OpenSearch Anomaly Detection Dashboards Plugin",
   "main": "index.js",
   "config": {

public/pages/ConfigureForecastModel/components/SuggestParametersDialog/SuggestParametersDialog.tsx

@@ -176,11 +176,11 @@ export const SuggestParametersDialog: React.FC<SuggestParametersDialogProps> = (
             {suggestMode === 'provided' && (
               <EuiFormRow
                 label="Forecasting interval"
-                helpText="A valid interval is from 1 to 60 minutes."
+                helpText="A valid interval is from 1 minute to 30 days."
               >
                 <EuiFieldNumber
                   min={1}
-                  max={60}
+                  max={43200} // 30 days
                   value={providedInterval}
                   onChange={(e) => setProvidedInterval(Number(e.target.value))}
                   append="minutes"
@@ -195,11 +195,13 @@ export const SuggestParametersDialog: React.FC<SuggestParametersDialogProps> = (
               buttonContent="Advanced"
               paddingSize="m"
             >
-              <EuiFormRow label="Shingle size">
+              <EuiFormRow 
+                label="Shingle size"
+                helpText="A valid shingle size is from 4 to 128.">
                 <EuiFieldNumber
                   value={shingleSize}
                   onChange={(e) => setShingleSize(Number(e.target.value))}
-                  min={1}
+                  min={4}
                   max={128}
                 />
               </EuiFormRow>

public/pages/ForecastersList/containers/ConfirmActionModals/ForecasterActionsCell.tsx

@@ -108,7 +108,6 @@ export function ForecasterActionsCell(props: ForecasterActionsCellProps) {
             isListLoading: false,
             isRequestingToClose: false,
             affectedForecasters: [forecaster],
-            // affectedMonitors: getMonitorsForAction([forecaster], allMonitors),
         });
         closePopover();
     };
@@ -120,7 +119,6 @@ export function ForecasterActionsCell(props: ForecasterActionsCellProps) {
             isListLoading: false,
             isRequestingToClose: false,
             affectedForecasters: [forecaster],
-            // affectedMonitors: getMonitorsForAction([forecaster], allMonitors),
             actionText: isCancel ? 'cancel' : undefined,
         });
         closePopover();
@@ -254,8 +252,6 @@ export function ForecasterActionsCell(props: ForecasterActionsCellProps) {
         };
     };
 
-    // console.log("modalType", modalType);
-    console.log("confirmModalState", confirmModalState);
     // Update the modal rendering section
     let modal;
 
@@ -285,11 +281,12 @@ export function ForecasterActionsCell(props: ForecasterActionsCellProps) {
                 );
                 break;
             case FORECASTER_ACTION.DELETE:
+                const forecastToDelete = confirmModalState.affectedForecasters[0];
                 modal = (
                     <ConfirmDeleteForecastersModal
-                        forecasterId={forecasterId}
-                        forecasterName={forecasterName}
-                        forecasterState={forecasterState}
+                        forecasterId={forecastToDelete.id}
+                        forecasterName={forecastToDelete.name}
+                        forecasterState={forecastToDelete.curState}
                         onStopForecasters={(forecasterId: string, forecasterName: string) => handleStopForecasterJob(forecasterId, forecasterName)}
                         onDeleteForecasters={(forecasterId: string, forecasterName: string) => handleDeleteForecasterJob(forecasterId, forecasterName)}
                         onHide={handleHideModal}
@@ -318,7 +315,6 @@ export function ForecasterActionsCell(props: ForecasterActionsCellProps) {
         modal = null;
     }
 
-    console.log("modal", modal);
 
     return (
         <>

public/pages/ForecastersList/containers/List/List.tsx

@@ -226,8 +226,6 @@ export const ForecastersList = (props: ListProps) => {
 
   const intializeForecasters = async () => {
     // wait until selected data source is ready before doing dispatch calls if mds is enabled
-    console.log("intializeForecasters state.selectedDataSourceId", state.selectedDataSourceId);
-    //if (!dataSourceEnabled || (state.selectedDataSourceId && state.selectedDataSourceId !== "")) {
       dispatch(
         getForecasterList(
           getAllForecastersQueryParamsWithDataSourceId(
@@ -306,7 +304,6 @@ export const ForecastersList = (props: ListProps) => {
       state.selectedForecasterStates
     );
 
-    console.log('curSelectedForecasters', curSelectedForecasters);
     setForecastersToDisplay(curSelectedForecasters);
 
     setIsLoadingFinalForecasters(false);
@@ -457,26 +454,20 @@ export const ForecastersList = (props: ListProps) => {
 
   // Refresh data if user is selecting an index filter
   const handleIndexChange = (options: EuiComboBoxOptionProps[]): void => {
-    console.log('handleIndexChange called with options:', options);
-
     let indices: string[];
     indices =
       options.length == 0
         ? ALL_INDICES
         : options.map((option) => {
-            console.log('Processing index option:', option);
             return option.label;
           }).slice(0, MAX_SELECTED_INDICES);
 
-    console.log('Setting indices to:', indices);
 
     setState((prevState) => {
-      console.log('Previous state for index change:', prevState);
       const newState = {
         ...prevState,
         selectedIndices: indices,
       };
-      console.log('New state for index change:', newState);
       return newState;
     });
   };

server/routes/forecast.ts

@@ -21,7 +21,7 @@ import { Router } from '../router';
 import {
   SORT_DIRECTION,
   CUSTOM_FORECAST_RESULT_INDEX_PREFIX,
-  CUSTOM_FORECAST_RESULT_INDEX_WILDCARD,
+  MAX_FORECASTER,
   FORECASTER_DOC_FIELDS,
 } from '../utils/constants';
 import {
@@ -735,7 +735,9 @@ export default class ForecastService {
         this.client
       );
       const response = await callWithRequest('forecast.searchForecaster', {
-        body: {},
+        body: {
+          size: MAX_FORECASTER,
+        },
       });
       const totalForecasters = get(response, 'hits.total.value', 0);
 

test/setup.jest.ts

@@ -26,7 +26,24 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
 }));
 
 // address issue: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin/issues/832
-jest.mock('@osd/monaco', () => ({}));
+// jest.mock('@osd/monaco', () => ({}));
+// Provide a minimal monaco mock for tests
+jest.mock('@osd/monaco', () => ({
+  monaco: {
+    languages: {
+      CompletionItemKind: {
+        Function: 1,        // matches Monaco API:contentReference[oaicite:4]{index=4}
+        Operator: 11,
+        Module: 8,
+        Keyword: 17,
+        Variable: 4,
+        Field: 3,
+        Class: 5,
+        Value: 13,
+      },
+    },
+  },
+}));
 
 //for mocking window.scroll(0,0)
 const noop = () => {};