[8.12] [ML] Data Frame Analytics: ensure job can be deleted from analytics map (#174212) (#174483)

# Backport This will backport the following commits from `main` to `8.12`: - [[ML] Data Frame Analytics: ensure job can be deleted from analytics map (#174212)](https://github.com/elastic/kibana/pull/174212)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Melissa Alvarez <melissa.alvarez@elastic.co>
2025-04-23 17:28:26 -04:00 · 2024-01-08 14:59:20 -05:00 · 2024-01-08 14:59:20 -05:00 · 72c06f5caa
commit 72c06f5caa
parent 9019ff6e15
5 changed files with 11 additions and 19 deletions
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
@ -132,13 +132,12 @@ export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => {
      if ((userCanDeleteIndex && deleteTargetIndex) || (userCanDeleteIndex && deleteDataView)) {
        deleteAnalyticsAndDestIndex(
          item.config,
-          item.stats,
          deleteTargetIndex,
          dataViewExists && deleteDataView,
          toastNotificationService
        );
      } else {
-        deleteAnalytics(item.config, item.stats, toastNotificationService);
+        deleteAnalytics(item.config, toastNotificationService);
      }
    }
  };
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
@ -11,20 +11,13 @@ import { extractErrorMessage } from '@kbn/ml-error-utils';
 import { ml } from '../../../../../services/ml_api_service';
 import { ToastNotificationService } from '../../../../../services/toast_notification_service';
 import { refreshAnalyticsList$, REFRESH_ANALYTICS_LIST_STATE } from '../../../../common';
-import {
-  isDataFrameAnalyticsFailed,
-  DataFrameAnalyticsListRow,
-} from '../../components/analytics_list/common';
+import { DataFrameAnalyticsListRow } from '../../components/analytics_list/common';

 export const deleteAnalytics = async (
  analyticsConfig: DataFrameAnalyticsListRow['config'],
-  analyticsStats: DataFrameAnalyticsListRow['stats'],
  toastNotificationService: ToastNotificationService
 ) => {
  try {
-    if (isDataFrameAnalyticsFailed(analyticsStats.state)) {
-      await ml.dataFrameAnalytics.stopDataFrameAnalytics(analyticsConfig.id, true);
-    }
    await ml.dataFrameAnalytics.deleteDataFrameAnalytics(analyticsConfig.id);
    toastNotificationService.displaySuccessToast(
      i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage', {
@ -46,16 +39,12 @@ export const deleteAnalytics = async (

 export const deleteAnalyticsAndDestIndex = async (
  analyticsConfig: DataFrameAnalyticsListRow['config'],
-  analyticsStats: DataFrameAnalyticsListRow['stats'],
  deleteDestIndex: boolean,
  deleteDestDataView: boolean,
  toastNotificationService: ToastNotificationService
 ) => {
  const destinationIndex = analyticsConfig.dest.index;
  try {
-    if (isDataFrameAnalyticsFailed(analyticsStats.state)) {
-      await ml.dataFrameAnalytics.stopDataFrameAnalytics(analyticsConfig.id, true);
-    }
    const status = await ml.dataFrameAnalytics.deleteDataFrameAnalyticsAndDestIndex(
      analyticsConfig.id,
      deleteDestIndex,
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
@ -145,9 +145,10 @@ export const dataFrameAnalyticsApiProvider = (httpService: HttpService) => ({
      version: '1',
    });
  },
-  deleteDataFrameAnalytics(analyticsId: string) {
+  deleteDataFrameAnalytics(analyticsId: string, force: boolean = true) {
    return httpService.http<any>({
      path: `${ML_INTERNAL_BASE_PATH}/data_frame/analytics/${analyticsId}`,
+      query: { force },
      method: 'DELETE',
      version: '1',
    });
@ -155,11 +156,12 @@ export const dataFrameAnalyticsApiProvider = (httpService: HttpService) => ({
  deleteDataFrameAnalyticsAndDestIndex(
    analyticsId: string,
    deleteDestIndex: boolean,
-    deleteDestDataView: boolean
+    deleteDestDataView: boolean,
+    force: boolean = true
  ) {
    return httpService.http<DeleteDataFrameAnalyticsWithIndexResponse>({
      path: `${ML_INTERNAL_BASE_PATH}/data_frame/analytics/${analyticsId}`,
-      query: { deleteDestIndex, deleteDestDataView },
+      query: { deleteDestIndex, deleteDestDataView, force },
      method: 'DELETE',
      version: '1',
    });
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@ -479,7 +479,7 @@ export function dataFrameAnalyticsRoutes(
        async ({ mlClient, client, request, response, getDataViewsService }) => {
          try {
            const { analyticsId } = request.params;
-            const { deleteDestIndex, deleteDestDataView } = request.query;
+            const { deleteDestIndex, deleteDestDataView, force } = request.query;
            let destinationIndex: string | undefined;
            const analyticsJobDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
            const destIndexDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
@ -499,7 +499,7 @@ export function dataFrameAnalyticsRoutes(
                destinationIndex = body.data_frame_analytics[0].dest.index;
              }
            } catch (e) {
-              // exist early if the job doesn't exist
+              // exit early if the job doesn't exist
              return response.customError(wrapError(e));
            }

@ -537,6 +537,7 @@ export function dataFrameAnalyticsRoutes(
            try {
              await mlClient.deleteDataFrameAnalytics({
                id: analyticsId,
+                force,
              });
              analyticsJobDeleted.success = true;
            } catch ({ body }) {
--- a/x-pack/plugins/ml/server/routes/schemas/data_frame_analytics_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/data_frame_analytics_schema.ts
@ -86,6 +86,7 @@ export const deleteDataFrameAnalyticsJobSchema = schema.object({
   */
  deleteDestIndex: schema.maybe(schema.boolean()),
  deleteDestDataView: schema.maybe(schema.boolean()),
+  force: schema.maybe(schema.boolean()),
 });

 export const dataFrameAnalyticsJobUpdateSchema = schema.object({