Interface change for MDS and deprecating dataSourceLabel from the URL (…

…#1031) (#1036) Signed-off-by: Ramakrishna Chilaka <[email protected]> (cherry picked from commit ed98e4a)
opensearch-project · Apr 15, 2024 · be61e6a · be61e6a
1 parent 927c05d
commit be61e6a
Show file tree

Hide file tree

Showing 13 changed files with 498 additions and 521 deletions.
diff --git a/public/components/MDSEnabledComponent/MDSEnabledComponent.tsx b/public/components/MDSEnabledComponent/MDSEnabledComponent.tsx
@@ -11,7 +11,6 @@ export default class MDSEnabledComponent<
     super(props);
     this.state = {
       dataSourceId: props.dataSourceId,
-      dataSourceLabel: props.dataSourceLabel,
       multiDataSourceEnabled: props.multiDataSourceEnabled,
     } as State;
   }
@@ -21,13 +20,9 @@ export default class MDSEnabledComponent<
     prevState: State
   ) {
     // static members cannot reference class type parameters
-    if (
-      nextProps.multiDataSourceEnabled &&
-      (nextProps.dataSourceId !== prevState.dataSourceId || nextProps.dataSourceLabel !== prevState.dataSourceLabel)
-    ) {
+    if (nextProps.multiDataSourceEnabled && nextProps.dataSourceId !== prevState.dataSourceId) {
       return {
         dataSourceId: nextProps.dataSourceId,
-        dataSourceLabel: nextProps.dataSourceLabel,
       };
     }
     return null;
@@ -36,7 +31,7 @@ export default class MDSEnabledComponent<
 
 export function useUpdateUrlWithDataSourceProperties() {
   const dataSourceMenuProps = useContext(DataSourceMenuContext);
-  const { dataSourceId, dataSourceLabel, multiDataSourceEnabled } = dataSourceMenuProps;
+  const { dataSourceId, multiDataSourceEnabled } = dataSourceMenuProps;
   const history = useHistory();
   const currentSearch = history.location.search;
   const currentQuery = queryString.parse(currentSearch);
@@ -46,9 +41,8 @@ export function useUpdateUrlWithDataSourceProperties() {
         search: queryString.stringify({
           ...currentQuery,
           dataSourceId,
-          dataSourceLabel,
         }),
       });
     }
-  }, [dataSourceId, dataSourceLabel, multiDataSourceEnabled]);
+  }, [dataSourceId, multiDataSourceEnabled]);
 }
diff --git a/public/pages/Aliases/utils/constants.tsx b/public/pages/Aliases/utils/constants.tsx
@@ -15,5 +15,4 @@ export const DEFAULT_QUERY_PARAMS = {
   sortDirection: SortDirection.DESC,
   status: "",
   dataSourceId: "",
-  dataSourceLabel: "",
 };
diff --git a/public/pages/ComposableTemplates/utils/constants.tsx b/public/pages/ComposableTemplates/utils/constants.tsx
@@ -14,5 +14,4 @@ export const DEFAULT_QUERY_PARAMS = {
   sortField: "name" as keyof ICatComposableTemplate,
   sortDirection: SortDirection.DESC,
   dataSourceId: "",
-  dataSourceLabel: "",
 };
diff --git a/public/pages/DataStreams/utils/constants.tsx b/public/pages/DataStreams/utils/constants.tsx
@@ -14,7 +14,6 @@ export const DEFAULT_QUERY_PARAMS = {
   sortField: "name" as keyof DataStream,
   sortDirection: SortDirection.DESC,
   dataSourceId: "",
-  dataSourceLabel: "",
 };
 
 export const HEALTH_TO_COLOR: {

diff --git a/public/pages/Indices/containers/Indices/Indices.test.tsx b/public/pages/Indices/containers/Indices/Indices.test.tsx
@@ -23,7 +23,6 @@ function renderWithRouter(
   Component: React.ComponentType<any>,
   data: DataSourceMenuProperties = {
     dataSourceId: "",
-    dataSourceLabel: "",
     multiDataSourceEnabled: false,
   },
   renderFn = render
@@ -264,7 +263,6 @@ describe("re-render on data-source-id prop change", () => {
 
     const { getByText, queryByText, rerender } = renderWithRouter(Indices, {
       dataSourceId: "test_data_source_id",
-      dataSourceLabel: "test_data_source_label",
       multiDataSourceEnabled: true,
     });
 
@@ -276,7 +274,6 @@ describe("re-render on data-source-id prop change", () => {
       Indices,
       {
         dataSourceId: "test_data_source_id_2",
-        dataSourceLabel: "test_data_source_label_2",
         multiDataSourceEnabled: true,
       },
       rerender

diff --git a/public/pages/Indices/containers/Indices/Indices.tsx b/public/pages/Indices/containers/Indices/Indices.tsx
@@ -133,7 +133,6 @@ export class Indices extends MDSEnabledComponent<IndicesProps, IndicesState> {
       const queryObject = this.getQueryObjectFromState(this.state);
       const queryParamsString = queryString.stringify({
         ...queryObject,
-        ...(this.state.multiDataSourceEnabled ? { dataSourceLabel: this.state.dataSourceLabel } : {}),
       });
       history.replace({ ...this.props.location, search: queryParamsString });
 

diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
@@ -247,10 +247,7 @@ export class ManagedIndices extends MDSEnabledComponent<ManagedIndicesProps, Man
     try {
       const { managedIndexService, history } = this.props;
       const queryObject = ManagedIndices.getQueryObjectFromState(this.state);
-      const queryParamsString = queryString.stringify({
-        ...queryObject,
-        ...(this.state.multiDataSourceEnabled ? { dataSourceLabel: this.state.dataSourceLabel } : {}),
-      });
+      const queryParamsString = queryString.stringify(queryObject);
       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
@@ -142,7 +142,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, dataSourceLabel: this.state.dataSourceLabel });
+      const queryParamsString = queryString.stringify(queryObject);
       history.replace({ ...this.props.location, search: queryParamsString });
       const getPoliciesResponse = await policyService.getPolicies(queryObject);
       if (getPoliciesResponse.ok) {

diff --git a/public/pages/Rollups/containers/Rollups/Rollups.tsx b/public/pages/Rollups/containers/Rollups/Rollups.tsx
@@ -122,9 +122,9 @@ export class Rollups extends MDSEnabledComponent<RollupsProps, RollupsState> {
     try {
       const { rollupService, history } = this.props;
       const queryObject = Rollups.getQueryObjectFromState(this.state);
-      const queryParamsString = queryString.stringify({ ...queryObject, dataSourceLabel: this.state.dataSourceLabel });
+      const queryParamsString = queryString.stringify(queryObject);
       history.replace({ ...this.props.location, search: queryParamsString });
-      const rollupJobsResponse = await rollupService.getRollups(queryObject); // Add type assertion
+      const rollupJobsResponse = await rollupService.getRollups(queryObject);
       if (rollupJobsResponse.ok) {
         const { rollups, totalRollups, metadata } = rollupJobsResponse.response;
         this.setState({ rollups, totalRollups, rollupExplain: metadata });

diff --git a/public/pages/Templates/utils/constants.tsx b/public/pages/Templates/utils/constants.tsx
@@ -14,5 +14,4 @@ export const DEFAULT_QUERY_PARAMS = {
   sortField: "name" as keyof ITemplate,
   sortDirection: SortDirection.DESC,
   dataSourceId: "",
-  dataSourceLabel: "",
 };
diff --git a/public/pages/Transforms/containers/Transforms/Transforms.tsx b/public/pages/Transforms/containers/Transforms/Transforms.tsx
@@ -342,10 +342,7 @@ export class Transforms extends MDSEnabledComponent<TransformProps, TransformSta
     try {
       const { transformService, history } = this.props;
       const queryObject = Transforms.getQueryObjectFromState(this.state);
-      const queryParamsString = queryString.stringify({
-        ...Transforms.getQueryObjectFromState(this.state),
-        dataSourceLabel: this.state.dataSourceLabel,
-      });
+      const queryParamsString = queryString.stringify(Transforms.getQueryObjectFromState(this.state));
       history.replace({ ...this.props.location, search: queryParamsString });
       const response = await transformService.getTransforms(queryObject);
       if (response.ok) {

diff --git a/public/services/DataSourceMenuContext.ts b/public/services/DataSourceMenuContext.ts
@@ -3,7 +3,6 @@ import { createContext } from "react";
 
 export interface DataSourceMenuProperties {
   dataSourceId: string;
-  dataSourceLabel: string;
   multiDataSourceEnabled: boolean;
 }
 
@@ -14,7 +13,6 @@ export interface DataSourceMenuReadOnlyProperties {
 
 const DataSourceMenuContext = createContext<DataSourceMenuProperties>({
   dataSourceId: "",
-  dataSourceLabel: "",
   multiDataSourceEnabled: false,
 });