Fixed test failures. Removed usage of ES10 code.

Signed-off-by: Ketan Verma <ketan9495@gmail.com>
opensearch-project · Jun 3, 2021 · 7890691 · 7890691
1 parent 5a93cbd
commit 7890691
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 17 deletions.
diff --git a/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx b/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx
@@ -71,7 +71,7 @@ export default class RollupIndices extends Component<RollupIndicesProps, RollupI
     const { indexService } = this.props;
     this.setState({ isLoading: true, indexOptions: [] });
     try {
-      const queryObject = { from: 0, size: 10, search: searchValue, sortDirection: "desc", sortField: "index" };
+      const queryObject = { from: 0, size: 10, search: searchValue, sortDirection: "desc", sortField: "index", showDataStreams: true };
       const getIndicesResponse = await indexService.getIndices(queryObject);
       if (getIndicesResponse.ok) {
         const options = searchValue.trim() ? [{ label: `${searchValue}*` }] : [];

diff --git a/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx b/public/pages/CreateTransform/components/TransformIndices/TransformIndices.tsx
@@ -81,7 +81,7 @@ export default class TransformIndices extends Component<TransformIndicesProps, T
     const { indexService } = this.props;
     this.setState({ isLoading: true, indexOptions: [] });
     try {
-      const queryObject = { from: 0, size: 10, search: searchValue, sortDirection: "desc", sortField: "index" };
+      const queryObject = { from: 0, size: 10, search: searchValue, sortDirection: "desc", sortField: "index", showDataStreams: true };
       const getIndicesResponse = await indexService.getIndices(queryObject);
       if (getIndicesResponse.ok) {
         const options = searchValue.trim() ? [{ label: `${searchValue}*` }] : [];

diff --git a/public/pages/Indices/components/IndexControls/IndexControls.test.tsx b/public/pages/Indices/components/IndexControls/IndexControls.test.tsx
@@ -41,6 +41,9 @@ describe("<IndexControls /> spec", () => {
         onSearchChange={() => {}}
         onPageClick={() => {}}
         onRefresh={async () => {}}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
       />
     );
 
@@ -57,6 +60,9 @@ describe("<IndexControls /> spec", () => {
         onSearchChange={onSearchChange}
         onPageClick={() => {}}
         onRefresh={async () => {}}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
       />
     );
 
@@ -68,7 +74,17 @@ describe("<IndexControls /> spec", () => {
   it("calls onRefresh on an interval", async () => {
     const onRefresh = jest.fn();
     const { getByTestId } = render(
-      <IndexControls activePage={0} pageCount={2} search={""} onSearchChange={() => {}} onPageClick={() => {}} onRefresh={onRefresh} />
+      <IndexControls
+        activePage={0}
+        pageCount={2}
+        search={""}
+        onSearchChange={() => {}}
+        onPageClick={() => {}}
+        onRefresh={onRefresh}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
+      />
     );
 
     fireEvent.click(getByTestId("superDatePickerToggleQuickMenuButton"));

diff --git a/public/pages/Indices/containers/Indices/Indices.tsx b/public/pages/Indices/containers/Indices/Indices.tsx
@@ -125,10 +125,9 @@ export default class Indices extends Component<IndicesProps, IndicesState> {
 
       const getIndicesResponse = await indexService.getIndices({
         ...queryObject,
-        // TODO: enable these once UT issues are figured out.
-        // terms: this.getTermClausesFromState(),
-        // indices: this.getFieldClausesFromState("indices"),
-        // dataStreams: this.getFieldClausesFromState("data_streams"),
+        terms: this.getTermClausesFromState(),
+        indices: this.getFieldClausesFromState("indices"),
+        dataStreams: this.getFieldClausesFromState("data_streams"),
       });
 
       if (getIndicesResponse.ok) {
@@ -159,7 +158,7 @@ export default class Indices extends Component<IndicesProps, IndicesState> {
 
   getFieldClausesFromState = (clause: string): string[] => {
     const { query } = this.state;
-    return (query.ast.getFieldClauses(clause) || []).map((field) => field.value).flat();
+    return _.flatten((query.ast.getFieldClauses(clause) || []).map((field) => field.value));
   };
 
   getTermClausesFromState = (): string[] => {

diff --git a/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.test.tsx b/public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.test.tsx
@@ -41,6 +41,9 @@ describe("<ManagedIndexControls /> spec", () => {
         onSearchChange={() => {}}
         onPageClick={() => {}}
         onRefresh={async () => {}}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
       />
     );
 
@@ -57,6 +60,9 @@ describe("<ManagedIndexControls /> spec", () => {
         onSearchChange={onSearchChange}
         onPageClick={() => {}}
         onRefresh={async () => {}}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
       />
     );
 
@@ -75,6 +81,9 @@ describe("<ManagedIndexControls /> spec", () => {
         onSearchChange={() => {}}
         onPageClick={() => {}}
         onRefresh={onRefresh}
+        showDataStreams={false}
+        getDataStreams={async () => {}}
+        toggleShowDataStreams={() => {}}
       />
     );
 

diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx b/public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
@@ -248,10 +248,9 @@ export default class ManagedIndices extends Component<ManagedIndicesProps, Manag
 
       const getManagedIndicesResponse = await managedIndexService.getManagedIndices({
         ...queryObject,
-        // TODO: enable these once UT failures are fixed
-        // terms: this.getTermClausesFromState(),
-        // indices: this.getFieldClausesFromState("indices"),
-        // dataStreams: this.getFieldClausesFromState("data_streams"),
+        terms: this.getTermClausesFromState(),
+        indices: this.getFieldClausesFromState("indices"),
+        dataStreams: this.getFieldClausesFromState("data_streams"),
       });
 
       if (getManagedIndicesResponse.ok) {
@@ -284,7 +283,7 @@ export default class ManagedIndices extends Component<ManagedIndicesProps, Manag
 
   getFieldClausesFromState = (clause: string): string[] => {
     const { query } = this.state;
-    return (query.ast.getFieldClauses(clause) || []).map((field) => field.value).flat();
+    return _.flatten((query.ast.getFieldClauses(clause) || []).map((field) => field.value));
   };
 
   getTermClausesFromState = (): string[] => {

diff --git a/server/routes/managedIndices.ts b/server/routes/managedIndices.ts
@@ -45,7 +45,7 @@ export default function (services: NodeServices, router: IRouter) {
           terms: schema.maybe(schema.any()),
           indices: schema.maybe(schema.any()),
           dataStreams: schema.maybe(schema.any()),
-          showDataStreams: schema.maybe(schema.boolean()), // TODO: remove maybe
+          showDataStreams: schema.boolean(),
         }),
       },
     },

diff --git a/server/utils/helpers.ts b/server/utils/helpers.ts
@@ -24,6 +24,7 @@
  * permissions and limitations under the License.
  */
 
+import _ from "lodash";
 import { ExplainAPIManagedIndexMetaData, QueryStringQuery } from "../models/interfaces";
 import { MatchAllQuery } from "../models/types";
 import { ManagedIndexMetaData } from "../../models/interfaces";
@@ -77,11 +78,11 @@ export function getMustQuery<T extends string>(field: T, search: string): MatchA
 
 export function getSearchString(terms?: string[], indices?: string[], dataStreams?: string[]): string {
   // Terms are searched with a wildcard around them.
-  const searchTerms = terms ? `*${[terms].flat().join("*,*")}*` : "";
+  const searchTerms = terms ? `*${_.castArray(terms).join("*,*")}*` : "";
 
   // Indices and data streams are searched with an exact match.
-  const searchIndices = indices ? [indices].flat().join(",") : "";
-  const searchDataStreams = dataStreams ? [dataStreams].flat().join(",") : "";
+  const searchIndices = indices ? _.castArray(indices).join(",") : "";
+  const searchDataStreams = dataStreams ? _.castArray(dataStreams).join(",") : "";
 
   // The overall search string is a combination of terms, indices, and data streams.
   // If the search string is blank, then '*' is used to match everything.