Add convert index to remote restore options

Author: Seung Yeon Joo

cypress/fixtures/plugins/index-management-dashboards-plugin/sample_convert_index_to_remote_policy.json

@@ -30,7 +30,9 @@
               "snapshot": "{{ctx.index}}",
               "include_aliases": true,
               "ignore_index_settings": "index.refresh_interval,index.number_of_replicas",
-              "number_of_replicas": 0
+              "number_of_replicas": 0,
+              "delete_original_index": false,
+              "rename_pattern": "$1_remote"
             }
           }
         ],
@@ -39,4 +41,3 @@
     ]
   }
 }
-

models/interfaces.ts

@@ -435,6 +435,8 @@ export interface ConvertIndexToRemoteAction extends Action {
     include_aliases?: boolean;
     ignore_index_settings?: string;
     number_of_replicas?: number;
+    delete_original_index?: boolean;
+    rename_pattern?: string;
   };
 }
 

public/pages/VisualCreatePolicy/components/UIActions/ConvertIndexToRemoteUIAction.test.tsx

@@ -6,7 +6,6 @@
 import React from "react";
 import "@testing-library/jest-dom";
 import { render, screen, cleanup, fireEvent } from "@testing-library/react";
-import userEventModule from "@testing-library/user-event";
 import { DEFAULT_CONVERT_INDEX_TO_REMOTE } from "../../utils/constants";
 import { ConvertIndexToRemoteAction, UIAction } from "../../../../../models/interfaces";
 import { actionRepoSingleton } from "../../utils/helpers";
@@ -26,10 +25,8 @@ const mockOnChangeAction = (uiAction: UIAction<ConvertIndexToRemoteAction> = TES
 afterEach(() => cleanup());
 
 describe("ConvertIndexToRemoteUIAction component", () => {
-  const userEvent = userEventModule.setup();
-
   it("renders with default values", () => {
-    const { container } = render(actionRepoSingleton.getUIAction("convert_index_to_remote").render(TEST_PROPS, mockOnChangeAction));
+    render(actionRepoSingleton.getUIAction("convert_index_to_remote").render(TEST_PROPS, mockOnChangeAction));
 
     // Check that repository field exists with default value
     const repositoryInput = screen.getByTestId("action-render-convert-index-to-remote-repository");
@@ -46,6 +43,16 @@ describe("ConvertIndexToRemoteUIAction component", () => {
     expect(includeAliasesSwitch).toBeInTheDocument();
     expect(includeAliasesSwitch).not.toBeChecked();
 
+    // Check that delete_original_index switch exists
+    const deleteOriginalIndexSwitch = screen.getByTestId("action-render-convert-index-to-remote-delete-original-index");
+    expect(deleteOriginalIndexSwitch).toBeInTheDocument();
+    expect(deleteOriginalIndexSwitch).not.toBeChecked();
+
+    // Check that rename_pattern field exists
+    const renamePatternInput = screen.getByTestId("action-render-convert-index-to-remote-rename-pattern");
+    expect(renamePatternInput).toBeInTheDocument();
+    expect(renamePatternInput).toHaveValue("$1_remote");
+
     // Check that ignore_index_settings field exists
     const ignoreIndexSettingsInput = screen.getByTestId("action-render-convert-index-to-remote-ignore-index-settings");
     expect(ignoreIndexSettingsInput).toBeInTheDocument();
@@ -54,29 +61,25 @@ describe("ConvertIndexToRemoteUIAction component", () => {
     // Check that number_of_replicas field exists
     const numberOfReplicasInput = screen.getByTestId("action-render-convert-index-to-remote-number-of-replicas");
     expect(numberOfReplicasInput).toBeInTheDocument();
-    expect(numberOfReplicasInput).toHaveValue(0);
-
-    expect(container).toMatchSnapshot();
+    expect(numberOfReplicasInput).toHaveValue(null);
   });
 
   it("updates repository value on change", async () => {
     renderComponent();
 
     const repositoryInput = screen.getByTestId("action-render-convert-index-to-remote-repository");
-    await userEvent.clear(repositoryInput);
-    await userEvent.type(repositoryInput, "my-remote-repo");
+    fireEvent.change(repositoryInput, { target: { value: "my-remote-repo" } });
 
-    expect(repositoryInput).toHaveValue("my-remote-repo");
+    expect(screen.getByTestId("action-render-convert-index-to-remote-repository")).toHaveValue("my-remote-repo");
   });
 
   it("updates snapshot value on change", async () => {
     renderComponent();
 
     const snapshotInput = screen.getByTestId("action-render-convert-index-to-remote-snapshot");
-    await userEvent.clear(snapshotInput);
-    await userEvent.type(snapshotInput, "{{ctx.index}}");
+    fireEvent.change(snapshotInput, { target: { value: "{{ctx.index}}" } });
 
-    expect(snapshotInput).toHaveValue("{{ctx.index}}");
+    expect(screen.getByTestId("action-render-convert-index-to-remote-snapshot")).toHaveValue("{{ctx.index}}");
   });
 
   it("toggles include_aliases switch", async () => {
@@ -85,32 +88,52 @@ describe("ConvertIndexToRemoteUIAction component", () => {
     const includeAliasesSwitch = screen.getByTestId("action-render-convert-index-to-remote-include-aliases");
     expect(includeAliasesSwitch).not.toBeChecked();
 
-    await userEvent.click(includeAliasesSwitch);
-    expect(includeAliasesSwitch).toBeChecked();
+    fireEvent.click(includeAliasesSwitch);
+    expect(screen.getByTestId("action-render-convert-index-to-remote-include-aliases")).toBeChecked();
+  });
+
+  it("toggles delete_original_index switch", async () => {
+    renderComponent();
+
+    const deleteOriginalIndexSwitch = screen.getByTestId("action-render-convert-index-to-remote-delete-original-index");
+    expect(deleteOriginalIndexSwitch).not.toBeChecked();
+
+    fireEvent.click(deleteOriginalIndexSwitch);
+    expect(screen.getByTestId("action-render-convert-index-to-remote-delete-original-index")).toBeChecked();
+  });
+
+  it("updates rename_pattern value on change", async () => {
+    renderComponent();
+
+    const renamePatternInput = screen.getByTestId("action-render-convert-index-to-remote-rename-pattern");
+    fireEvent.change(renamePatternInput, { target: { value: "remote_$1" } });
+
+    expect(screen.getByTestId("action-render-convert-index-to-remote-rename-pattern")).toHaveValue("remote_$1");
   });
 
   it("updates ignore_index_settings value on change", async () => {
     renderComponent();
 
     const ignoreIndexSettingsInput = screen.getByTestId("action-render-convert-index-to-remote-ignore-index-settings");
-    await userEvent.type(ignoreIndexSettingsInput, "index.refresh_interval,index.number_of_replicas");
+    fireEvent.change(ignoreIndexSettingsInput, { target: { value: "index.refresh_interval,index.number_of_replicas" } });
 
-    expect(ignoreIndexSettingsInput).toHaveValue("index.refresh_interval,index.number_of_replicas");
+    expect(screen.getByTestId("action-render-convert-index-to-remote-ignore-index-settings")).toHaveValue(
+      "index.refresh_interval,index.number_of_replicas"
+    );
   });
 
   it("updates number_of_replicas value on change", async () => {
     renderComponent();
 
     const numberOfReplicasInput = screen.getByTestId("action-render-convert-index-to-remote-number-of-replicas");
-    await userEvent.clear(numberOfReplicasInput);
-    await userEvent.type(numberOfReplicasInput, "2");
+    fireEvent.change(numberOfReplicasInput, { target: { value: "2" } });
 
-    expect(numberOfReplicasInput).toHaveValue(2);
+    expect(screen.getByTestId("action-render-convert-index-to-remote-number-of-replicas")).toHaveValue(2);
   });
 
   it("validates required fields", () => {
     const uiAction = actionRepoSingleton.getUIAction("convert_index_to_remote");
-    
+
     // Valid action
     expect(uiAction.isValid()).toBe(true);
 
@@ -139,6 +162,32 @@ describe("ConvertIndexToRemoteUIAction component", () => {
     };
     const invalidUIAction2 = actionRepoSingleton.getUIActionFromData(invalidAction2.action);
     expect(invalidUIAction2.isValid()).toBe(false);
+
+    // Invalid action - rename pattern missing $1
+    const invalidAction3 = {
+      ...TEST_PROPS,
+      action: {
+        convert_index_to_remote: {
+          ...DEFAULT_CONVERT_INDEX_TO_REMOTE.convert_index_to_remote,
+          rename_pattern: "remote_index",
+        },
+      },
+    };
+    const invalidUIAction3 = actionRepoSingleton.getUIActionFromData(invalidAction3.action);
+    expect(invalidUIAction3.isValid()).toBe(false);
+
+    // Invalid action - negative number_of_replicas
+    const invalidAction4 = {
+      ...TEST_PROPS,
+      action: {
+        convert_index_to_remote: {
+          ...DEFAULT_CONVERT_INDEX_TO_REMOTE.convert_index_to_remote,
+          number_of_replicas: -1,
+        },
+      },
+    };
+    const invalidUIAction4 = actionRepoSingleton.getUIActionFromData(invalidAction4.action);
+    expect(invalidUIAction4.isValid()).toBe(false);
   });
 
   it("renders with custom values", () => {
@@ -149,21 +198,21 @@ describe("ConvertIndexToRemoteUIAction component", () => {
         include_aliases: true,
         ignore_index_settings: "index.refresh_interval",
         number_of_replicas: 2,
+        delete_original_index: true,
+        rename_pattern: "remote_$1",
       },
     };
 
     const customProps = { ...TEST_PROPS, action: customAction };
-    const { container } = render(
-      actionRepoSingleton.getUIAction("convert_index_to_remote").render(customProps, mockOnChangeAction)
-    );
+    render(actionRepoSingleton.getUIAction("convert_index_to_remote").render(customProps, mockOnChangeAction));
 
     expect(screen.getByTestId("action-render-convert-index-to-remote-repository")).toHaveValue("s3-repo");
     expect(screen.getByTestId("action-render-convert-index-to-remote-snapshot")).toHaveValue("{{ctx.index}}-snapshot");
     expect(screen.getByTestId("action-render-convert-index-to-remote-include-aliases")).toBeChecked();
+    expect(screen.getByTestId("action-render-convert-index-to-remote-delete-original-index")).toBeChecked();
+    expect(screen.getByTestId("action-render-convert-index-to-remote-rename-pattern")).toHaveValue("remote_$1");
     expect(screen.getByTestId("action-render-convert-index-to-remote-ignore-index-settings")).toHaveValue("index.refresh_interval");
     expect(screen.getByTestId("action-render-convert-index-to-remote-number-of-replicas")).toHaveValue(2);
-
-    expect(container).toMatchSnapshot();
   });
 
   it("returns correct content", () => {
@@ -174,13 +223,26 @@ describe("ConvertIndexToRemoteUIAction component", () => {
   it("converts to action correctly", () => {
     const uiAction = actionRepoSingleton.getUIAction("convert_index_to_remote");
     const action = uiAction.toAction();
-    
+
     expect(action).toHaveProperty("convert_index_to_remote");
     expect(action.convert_index_to_remote).toHaveProperty("repository");
     expect(action.convert_index_to_remote).toHaveProperty("snapshot");
     expect(action.convert_index_to_remote).toHaveProperty("include_aliases");
     expect(action.convert_index_to_remote).toHaveProperty("ignore_index_settings");
-    expect(action.convert_index_to_remote).toHaveProperty("number_of_replicas");
+    expect(action.convert_index_to_remote).toHaveProperty("delete_original_index");
+    expect(action.convert_index_to_remote).toHaveProperty("rename_pattern");
+    expect(action.convert_index_to_remote).not.toHaveProperty("number_of_replicas");
   });
-});
 
+  it("keeps number_of_replicas when explicitly configured", () => {
+    const uiAction = actionRepoSingleton.getUIActionFromData({
+      convert_index_to_remote: {
+        ...DEFAULT_CONVERT_INDEX_TO_REMOTE.convert_index_to_remote,
+        number_of_replicas: 2,
+      },
+    });
+
+    const action = uiAction.toAction() as ConvertIndexToRemoteAction;
+    expect(action.convert_index_to_remote.number_of_replicas).toBe(2);
+  });
+});