Added MDS for Transform Jobs

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge · Apr 1, 2024 · f171c65 · f171c65
1 parent 1d392b3
commit f171c65
Show file tree

Hide file tree

Showing 17 changed files with 739 additions and 569 deletions.
diff --git a/public/pages/CreateRollup/containers/CreateRollup/CreateRollup.tsx b/public/pages/CreateRollup/containers/CreateRollup/CreateRollup.tsx
@@ -36,7 +36,7 @@ interface CreateRollupProps extends RouteComponentProps, DataSourceMenuPropertie
   hasAggregation: boolean;
 }
 
-export class CreateRollup extends Component<CreateRollupProps> {
+export default class CreateRollup extends Component<CreateRollupProps> {
   render() {
     if (this.props.currentStep !== 1) {
       return null;
@@ -63,9 +63,3 @@ export class CreateRollup extends Component<CreateRollupProps> {
     );
   }
 }
-
-export default function (props: CreateRollupProps) {
-  const dataSourceMenuProperties = useContext(DataSourceMenuContext);
-  useUpdateUrlWithDataSourceProperties();
-  return <CreateRollup {...props} {...dataSourceMenuProperties} />;
-}
diff --git a/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx b/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx
@@ -5,7 +5,7 @@
 
 import React, { ChangeEvent, Component, useContext } from "react";
 import { EuiButton, EuiButtonEmpty, EuiComboBoxOptionOption, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
-import { RouteComponentProps } from "react-router-dom";
+import { RouteComponentProps, useHistory } from "react-router-dom";
 import moment from "moment";
 import { RollupService } from "../../../../services";
 import { BREADCRUMBS, ROUTES } from "../../../../utils/constants";
@@ -21,10 +21,15 @@ import CreateRollupStep3 from "../CreateRollupStep3";
 import CreateRollupStep4 from "../CreateRollupStep4";
 import { compareFieldItem, parseFieldOptions } from "../../utils/helpers";
 import { CoreServicesContext } from "../../../../components/core_services";
-import { DataSourceMenuContext, DataSourceMenuProperties } from "../../../../services/DataSourceMenuContext";
+import {
+  DataSourceMenuContext,
+  DataSourceMenuProperties,
+  DataSourceMenuReadOnlyContext,
+  DataSourceMenuReadOnlyProperties,
+} from "../../../../services/DataSourceMenuContext";
 import { useUpdateUrlWithDataSourceProperties } from "../../../../components/MDSEnabledComponent";
 
-interface CreateRollupFormProps extends RouteComponentProps, DataSourceMenuProperties {
+interface CreateRollupFormProps extends RouteComponentProps, DataSourceMenuProperties, DataSourceMenuReadOnlyProperties {
   rollupService: RollupService;
   indexService: IndexService;
 }
@@ -226,6 +231,14 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
   _next() {
     let currentStep = this.state.currentStep;
     let error = false;
+
+    const dataSourceReadOnly = this.props.dataSourceReadOnly;
+    const setDataSourceReadOnly = this.props.setDataSourceReadOnly;
+
+    if (!dataSourceReadOnly) {
+      setDataSourceReadOnly(true);
+    }
+
     //Verification here
     if (currentStep == 1) {
       const { rollupId, sourceIndex, targetIndex } = this.state;
@@ -289,6 +302,14 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
     let currentStep = this.state.currentStep;
     // If the current step is 2 or 3, then subtract one on "previous" button click
     currentStep = currentStep <= 1 ? 1 : currentStep - 1;
+    if (currentStep == 1) {
+      const dataSourceReadOnly = this.props.dataSourceReadOnly;
+      const setDataSourceReadOnly = this.props.setDataSourceReadOnly;
+
+      if (dataSourceReadOnly) {
+        setDataSourceReadOnly(false);
+      }
+    }
     this.setState({
       currentStep: currentStep,
     });
@@ -737,7 +758,8 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
 }
 
 export default function (props: Omit<CreateRollupFormProps, keyof DataSourceMenuProperties>) {
+  const dataSourceReadOnlyProperties = useContext(DataSourceMenuReadOnlyContext);
   const dataSourceMenuProperties = useContext(DataSourceMenuContext);
   useUpdateUrlWithDataSourceProperties();
-  return <CreateRollupForm {...props} {...dataSourceMenuProperties} />;
+  return <CreateRollupForm {...props} {...dataSourceMenuProperties} {...dataSourceReadOnlyProperties} />;
 }
diff --git a/public/pages/CreateTransform/components/DefineTransforms/DefineTransforms.tsx b/public/pages/CreateTransform/components/DefineTransforms/DefineTransforms.tsx
@@ -96,7 +96,7 @@ export default function DefineTransforms({
   const fetchData = useCallback(async () => {
     setLoading(true);
     try {
-      const response = await transformService.searchSampleData(sourceIndex, { from: 0, size: DefaultSampleDataSize }, sourceIndexFilter);
+      const response = await transformService.searchSampleData(sourceIndex, sourceIndexFilter, { from: 0, size: DefaultSampleDataSize });
 
       if (response.ok) {
         setData(response.response.data);
@@ -162,7 +162,7 @@ export default function DefineTransforms({
     }
     const val = data[rowIndex]._source[columnId];
     return val !== undefined ? JSON.stringify(val) : "-";
-  }
+  };
 
   //TODO: remove duplicate code here after extracting the first table as separate component
   if (isReadOnly)

diff --git a/public/pages/CreateTransform/containers/CreateTransformForm/CreateTransformForm.tsx b/public/pages/CreateTransform/containers/CreateTransformForm/CreateTransformForm.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { ChangeEvent, Component } from "react";
+import React, { ChangeEvent, Component, useContext } from "react";
 import { EuiButton, EuiButtonEmpty, EuiComboBoxOptionOption, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
 import { RouteComponentProps } from "react-router-dom";
 import moment from "moment";
@@ -27,8 +27,15 @@ import SpecifyScheduleStep from "../SpecifyScheduleStep";
 import ReviewAndCreateStep from "../ReviewAndCreateStep";
 import { compareFieldItem, createdTransformToastMessage, isGroupBy, parseFieldOptions } from "../../utils/helpers";
 import { CoreServicesContext } from "../../../../components/core_services";
-
-interface CreateTransformFormProps extends RouteComponentProps {
+import {
+  DataSourceMenuContext,
+  DataSourceMenuProperties,
+  DataSourceMenuReadOnlyContext,
+  DataSourceMenuReadOnlyProperties,
+} from "../../../../services/DataSourceMenuContext";
+import { useUpdateUrlWithDataSourceProperties } from "../../../../components/MDSEnabledComponent";
+
+interface CreateTransformFormProps extends RouteComponentProps, DataSourceMenuProperties, DataSourceMenuReadOnlyProperties {
   rollupService: RollupService;
   transformService: TransformService;
   indexService: IndexService;
@@ -78,7 +85,7 @@ interface CreateTransformFormState {
   isLoading: boolean;
 }
 
-export default class CreateTransformForm extends Component<CreateTransformFormProps, CreateTransformFormState> {
+export class CreateTransformForm extends Component<CreateTransformFormProps, CreateTransformFormState> {
   static contextType = CoreServicesContext;
   _isMount: boolean;
 
@@ -188,11 +195,10 @@ export default class CreateTransformForm extends Component<CreateTransformFormPr
     const { sourceIndex, sourceIndexFilter } = this.state;
     this.setState({ isLoading: true });
     try {
-      const response = await transformService.searchSampleData(
-        sourceIndex[0].label,
-        { from: 0, size: DefaultSampleDataSize },
-        sourceIndexFilter
-      );
+      const response = await transformService.searchSampleData(sourceIndex[0].label, sourceIndexFilter, {
+        from: 0,
+        size: DefaultSampleDataSize,
+      });
 
       if (!response.ok) {
         const errMsg = response.error ? response.error : "There was a problem searching data from source index.";
@@ -213,6 +219,13 @@ export default class CreateTransformForm extends Component<CreateTransformFormPr
     let currentStep = this.state.currentStep;
     let warned = this.state.beenWarned;
     let error = false;
+
+    const dataSourceReadOnly = this.props.dataSourceReadOnly;
+    const setDataSourceReadOnly = this.props.setDataSourceReadOnly;
+    if (!dataSourceReadOnly) {
+      setDataSourceReadOnly(true);
+    }
+
     // Verification here
     if (currentStep == 1) {
       const { transformId, sourceIndex, targetIndex, sourceIndexFilterError } = this.state;
@@ -265,6 +278,14 @@ export default class CreateTransformForm extends Component<CreateTransformFormPr
     let currentStep = this.state.currentStep;
     // If the current step is 2 or 3, then subtract one on "previous" button click
     currentStep = currentStep <= 1 ? 1 : currentStep - 1;
+    if (currentStep == 1) {
+      const dataSourceReadOnly = this.props.dataSourceReadOnly;
+      const setDataSourceReadOnly = this.props.setDataSourceReadOnly;
+
+      if (dataSourceReadOnly) {
+        setDataSourceReadOnly(false);
+      }
+    }
     this.setState({
       currentStep: currentStep,
     });
@@ -664,3 +685,10 @@ export default class CreateTransformForm extends Component<CreateTransformFormPr
     );
   }
 }
+
+export default function (props: Omit<CreateTransformFormProps, keyof DataSourceMenuProperties>) {
+  const dataSourceReadOnlyProperties = useContext(DataSourceMenuReadOnlyContext);
+  const dataSourceMenuProperties = useContext(DataSourceMenuContext);
+  useUpdateUrlWithDataSourceProperties();
+  return <CreateTransformForm {...props} {...dataSourceMenuProperties} {...dataSourceReadOnlyProperties} />;
+}
diff --git a/public/pages/EditRollup/containers/EditRollup.tsx b/public/pages/EditRollup/containers/EditRollup.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { ChangeEvent, Component } from "react";
+import React, { ChangeEvent, Component, useContext } from "react";
 import { RouteComponentProps } from "react-router-dom";
 import moment from "moment";
 import queryString from "query-string";
@@ -17,6 +17,7 @@ import { RollupService } from "../../../services";
 import { EMPTY_ROLLUP } from "../../CreateRollup/utils/constants";
 import { CoreServicesContext } from "../../../components/core_services";
 import { delayTimeUnitToMS, msToDelayTimeUnit } from "../../CreateRollup/utils/helpers";
+import { useUpdateUrlWithDataSourceProperties } from "../../../components/MDSEnabledComponent";
 
 interface EditRollupProps extends RouteComponentProps {
   rollupService: RollupService;
@@ -45,7 +46,7 @@ interface EditRollupState {
   rollupJSON: any;
 }
 
-export default class EditRollup extends Component<EditRollupProps, EditRollupState> {
+export class EditRollup extends Component<EditRollupProps, EditRollupState> {
   static contextType = CoreServicesContext;
   constructor(props: EditRollupProps) {
     super(props);
@@ -343,3 +344,8 @@ export default class EditRollup extends Component<EditRollupProps, EditRollupSta
     );
   }
 }
+
+export default function (props: EditRollupProps) {
+  useUpdateUrlWithDataSourceProperties();
+  return <EditRollup {...props} />;
+}