Merge branch 'main' of https://github.com/opensearch-project/index-ma…

…nagement-dashboards-plugin into neo_prod_new
opensearch-project · Apr 11, 2024 · 9c4ee45 · 9c4ee45
2 parents cbf4a2a + 134f23f
commit 9c4ee45
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/public/containers/ClearCacheModal/ClearCacheModal.tsx b/public/containers/ClearCacheModal/ClearCacheModal.tsx
@@ -113,7 +113,7 @@ export default function ClearCacheModal(props: ClearCacheModalProps) {
         const result = await services.commonService.apiCaller({
           endpoint: "indices.clearCache",
           data: {
-            index: unBlockedItems.join(","),
+            index: unBlockedItems.join(",") || "_all",
           },
         });
         if (result && result.ok) {

diff --git a/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx b/public/pages/ChangePolicy/containers/ChangePolicy/ChangePolicy.tsx
@@ -16,7 +16,6 @@ import { PolicyOption } from "../../models/interfaces";
 import { CoreServicesContext } from "../../../../components/core_services";
 import { DataSourceMenuContext, DataSourceProperties } from "../../../../services/DataSourceMenuContext";
 import { getDataSourcePropsFromContext, useUpdateUrlWithDataSourceProperties } from "../../../../components/MDSEnabledComponent";
-import { dataSource } from "src/plugins/data_source/server/saved_objects";
 
 interface ChangePolicyProps extends RouteComponentProps, DataSourceProperties {
   managedIndexService: ManagedIndexService;
@@ -41,7 +40,7 @@ export enum Radio {
 
 export class ChangePolicy extends Component<ChangePolicyProps, ChangePolicyState> {
   static contextType = CoreServicesContext;
-  state: ChangePolicyState = {
+  static emptyState = {
     selectedPolicies: [],
     selectedManagedIndices: [],
     selectedStateFilters: [],
@@ -51,6 +50,7 @@ export class ChangePolicy extends Component<ChangePolicyProps, ChangePolicyState
     selectedPoliciesError: "",
     hasSubmitted: false,
   };
+  state: ChangePolicyState = ChangePolicy.emptyState;
 
   async componentDidMount(): Promise<void> {
     this.context.chrome.setBreadcrumbs([BREADCRUMBS.INDEX_MANAGEMENT, BREADCRUMBS.MANAGED_INDICES, BREADCRUMBS.CHANGE_POLICY]);
@@ -60,14 +60,7 @@ export class ChangePolicy extends Component<ChangePolicyProps, ChangePolicyState
     if (prevProps.dataSourceId !== this.props.dataSourceId) {
       // reset the state, if dataSourceId changes, i.e., clear state
       this.setState({
-        selectedPolicies: [],
-        selectedManagedIndices: [],
-        selectedStateFilters: [],
-        stateRadioIdSelected: Radio.Current,
-        stateSelected: "",
-        managedIndicesError: "",
-        selectedPoliciesError: "",
-        hasSubmitted: false,
+        ...ChangePolicy.emptyState,
       });
     }
   }

diff --git a/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx b/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx
@@ -185,7 +185,7 @@ describe("<IndicesActions /> spec", () => {
       expect(browserServicesMock.commonService.apiCaller).toHaveBeenCalledWith({
         endpoint: "indices.clearCache",
         data: {
-          index: "",
+          index: "_all",
         },
       });
       expect(coreServicesMock.notifications.toasts.addSuccess).toHaveBeenCalledTimes(1);
@@ -238,7 +238,7 @@ describe("<IndicesActions /> spec", () => {
       expect(browserServicesMock.commonService.apiCaller).toHaveBeenCalledWith({
         endpoint: "indices.clearCache",
         data: {
-          index: "",
+          index: "_all",
         },
       });
       expect(coreServicesMock.notifications.toasts.addError).toHaveBeenCalledTimes(1);

diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
@@ -247,7 +247,10 @@ export class ManagedIndices extends MDSEnabledComponent<ManagedIndicesProps, Man
     try {
       const { managedIndexService, history } = this.props;
       const queryObject = ManagedIndices.getQueryObjectFromState(this.state);
-      const queryParamsString = queryString.stringify(queryObject);
+      const queryParamsString = queryString.stringify({
+        ...queryObject,
+        ...(this.state.multiDataSourceEnabled ? { dataSourceLabel: this.state.dataSourceLabel } : {}),
+      });
       history.replace({ ...this.props.location, search: queryParamsString });
 
       const getManagedIndicesResponse = await managedIndexService.getManagedIndices({

diff --git a/public/pages/Policies/containers/Policies/Policies.tsx b/public/pages/Policies/containers/Policies/Policies.tsx
@@ -141,7 +141,7 @@ export class Policies extends MDSEnabledComponent<PoliciesProps, PoliciesState>
     try {
       const { policyService, history } = this.props;
       const queryObject = Policies.getQueryObjectFromState(this.state);
-      const queryParamsString = queryString.stringify(queryObject);
+      const queryParamsString = queryString.stringify({ ...queryObject, dataSourceLabel: this.state.dataSourceLabel });
       history.replace({ ...this.props.location, search: queryParamsString });
       const getPoliciesResponse = await policyService.getPolicies(queryObject);
       if (getPoliciesResponse.ok) {