Bug fix in Indexes page and worked on comments on previous commit

Signed-off-by: Kshitij Tandon <[email protected]>
opensearch-project · Aug 20, 2024 · fec4974 · fec4974
1 parent c4a5f3e
commit fec4974
Show file tree

Hide file tree

Showing 10 changed files with 297 additions and 170 deletions.
diff --git a/public/pages/ComposableTemplates/components/IndexControls/IndexControls.tsx b/public/pages/ComposableTemplates/components/IndexControls/IndexControls.tsx
@@ -48,7 +48,7 @@ export default function SearchControls(props: SearchControlsProps) {
           }}
           onChange={(val) => onChange("selectedTypes", val || [])}
           value={state.selectedTypes}
-          useNewUx={props.useNewUX}
+          useNewUX={props.useNewUX}
           options={[
             {
               label: IndicesUpdateMode.alias,

diff --git a/public/pages/Indices/components/IndexControls/IndexControls.tsx b/public/pages/Indices/components/IndexControls/IndexControls.tsx
@@ -19,6 +19,7 @@ import {
 import { DataStream, ManagedCatIndex } from "../../../../../server/models/interfaces";
 import IndicesActions from "../../containers/IndicesActions";
 import { getUISettings } from "../../../../services/Services";
+import { RouteComponentProps } from "react-router-dom";
 
 interface IndexControlsProps {
   search: string;
@@ -28,6 +29,7 @@ interface IndexControlsProps {
   getDataStreams: () => Promise<DataStream[]>;
   toggleShowDataStreams: () => void;
   selectedItems: ManagedCatIndex[];
+  history?: RouteComponentProps["history"];
 }
 
 interface IndexControlsState {
@@ -50,7 +52,7 @@ export default class IndexControls extends Component<IndexControlsProps, IndexCo
   };
 
   render() {
-    const { search, onSearchChange, showDataStreams, toggleShowDataStreams, onRefresh, selectedItems } = this.props;
+    const { search, onSearchChange, showDataStreams, toggleShowDataStreams, onRefresh, selectedItems, history } = this.props;
 
     const schema = {
       strict: true,
@@ -97,7 +99,7 @@ export default class IndexControls extends Component<IndexControlsProps, IndexCo
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <IndicesActions
-            {...this.props}
+            history={this.props.history}
             onDelete={onRefresh}
             onClose={onRefresh}
             onShrink={onRefresh}

diff --git a/public/pages/Indices/containers/Indices/Indices.tsx b/public/pages/Indices/containers/Indices/Indices.tsx
@@ -308,6 +308,7 @@ export class Indices extends MDSEnabledComponent<IndicesProps, IndicesState> {
               getDataStreams={this.getDataStreams}
               toggleShowDataStreams={this.toggleShowDataStreams}
               selectedItems={this.state.selectedItems}
+              history={this.props.history}
             />
 
             <EuiBasicTable

diff --git a/public/pages/Indices/containers/IndicesActions/index.tsx b/public/pages/Indices/containers/IndicesActions/index.tsx
@@ -30,6 +30,7 @@ export interface IndicesActionsProps extends Pick<RouteComponentProps, "history"
   onDelete: () => void;
   onClose: () => void;
   onShrink: () => void;
+  history: RouteComponentProps["history"];
 }
 
 export default function IndicesActions(props: IndicesActionsProps) {

diff --git a/public/pages/ManagedIndices/components/InfoModal/InfoModal.tsx b/public/pages/ManagedIndices/components/InfoModal/InfoModal.tsx
@@ -14,7 +14,6 @@ import {
   EuiOverlayMask,
   EuiCodeBlock,
 } from "@elastic/eui";
-import { size } from "lodash";
 
 interface InfoModalProps {
   info: object;

diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
@@ -435,7 +435,6 @@ export class ManagedIndices extends MDSEnabledComponent<ManagedIndicesProps, Man
       showEditModal,
       isPopoverOpen,
     } = this.state;
-    console.log(this.context);
     const filterIsApplied = !!search;
     const page = Math.floor(from / size);
 

diff --git a/public/pages/Reindex/container/Reindex/Reindex.test.tsx b/public/pages/Reindex/container/Reindex/Reindex.test.tsx
@@ -17,6 +17,23 @@ import { CoreServicesConsumer, CoreServicesContext } from "../../../../component
 import Reindex from "./Reindex";
 import { ModalProvider, ModalRoot } from "../../../../components/Modal";
 import { BrowserServices } from "../../../../models/interfaces";
+import { getApplication, getNavigationUI, getUISettings } from "../../../../services/Services";
+
+jest.mock("../../../../services/Services", () => ({
+  ...jest.requireActual("../../../../services/Services"),
+  getUISettings: jest.fn(),
+  getApplication: jest.fn(),
+  getNavigationUI: jest.fn(),
+}));
+
+beforeEach(() => {
+  (getUISettings as jest.Mock).mockReturnValue({
+    get: jest.fn().mockReturnValue(false), // or false, depending on your test case
+  });
+  (getApplication as jest.Mock).mockReturnValue({});
+
+  (getNavigationUI as jest.Mock).mockReturnValue({});
+});
 
 function renderWithRouter(initialEntries = [ROUTES.REINDEX] as string[]) {
   return {