removing first step

elastic · Oct 19, 2021 · f161ef4 · f161ef4
1 parent 0336d02
commit f161ef4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 43 deletions.
diff --git a/...pplication/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx b/...pplication/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx
@@ -204,7 +204,7 @@ export const JsonEditorFlyout: FC<Props> = ({ isDisabled, jobEditorMode, datafee
                 >
                   <FormattedMessage
                     id="xpack.ml.newJob.wizard.jsonFlyout.indicesChange.calloutText"
-                    defaultMessage="It is not possible to alter the indices being used by the datafeed here. If you wish to select a different index pattern or saved search, please jump to step 1 of the wizard and select change index pattern."
+                    defaultMessage="You cannot alter the indices being used by the datafeed here. To select a different index pattern or saved search, go to step 1 of the wizard and select the Change index pattern option."
                   />
                 </EuiCallOut>
               </>

diff --git a/...ion/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx b/...ion/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
@@ -42,6 +42,11 @@ import {
 
 const fixedPageSize: number = 8;
 
+enum STEP {
+  PICK_DATA_VIEW,
+  VALIDATE,
+}
+
 interface Props {
   onClose: () => void;
 }
@@ -61,7 +66,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
   const jobCreator = jc as AdvancedJobCreator;
 
   const [validating, setValidating] = useState(false);
-  const [step, setStep] = useState(0);
+  const [step, setStep] = useState(STEP.PICK_DATA_VIEW);
 
   const [currentDataViewTitle, setCurrentDataViewTitle] = useState<string>('');
   const [newDataViewTitle, setNewDataViewTitle] = useState<string>('');
@@ -75,7 +80,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
 
   useEffect(
     function stepChange() {
-      if (step === 1) {
+      if (step === STEP.PICK_DATA_VIEW) {
         setValidationResponse(null);
       }
     },
@@ -84,7 +89,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
 
   function onDataViewSelected(dataViewId: string) {
     if (validating === false) {
-      setStep(2);
+      setStep(STEP.VALIDATE);
       validate(dataViewId);
     }
   }
@@ -131,42 +136,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
         </EuiModalHeader>
 
         <EuiModalBody>
-          {step === 0 && (
-            <>
-              <EuiCallOut color="warning">
-                <FormattedMessage
-                  id="xpack.ml.newJob.wizard.datafeedStep.dataView.step0.description"
-                  defaultMessage="Changing the current index pattern may cause problems with the corresponding job configuration as the newly selected index pattern may not contain the same fields."
-                />
-              </EuiCallOut>
-
-              <EuiSpacer size="s" />
-              <EuiFlexGroup justifyContent="spaceBetween">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty onClick={onClose} isDisabled={validating} flush="left">
-                    <FormattedMessage
-                      id="xpack.ml.newJob.wizard.datafeedStep.dataView.step0.cancelButton"
-                      defaultMessage="Cancel"
-                    />
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButton
-                    isDisabled={validating}
-                    onClick={setStep.bind(null, 1)}
-                    fill
-                    data-test-subj="mlJobMgmtImportImportButton"
-                  >
-                    <FormattedMessage
-                      id="xpack.ml.newJob.wizard.datafeedStep.dataView.step0.nextButton"
-                      defaultMessage="Next"
-                    />
-                  </EuiButton>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </>
-          )}
-          {step === 1 && (
+          {step === STEP.PICK_DATA_VIEW && (
             <>
               <FormattedMessage
                 id="xpack.ml.newJob.wizard.datafeedStep.dataView.step1.title"
@@ -203,7 +173,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
               />
             </>
           )}
-          {step === 2 && (
+          {step === STEP.VALIDATE && (
             <>
               <FormattedMessage
                 id="xpack.ml.newJob.wizard.datafeedStep.dataView.step2.title"
@@ -233,7 +203,7 @@ export const ChangeDataViewModal: FC<Props> = ({ onClose }) => {
               <EuiFlexGroup justifyContent="spaceBetween">
                 <EuiFlexItem grow={false}>
                   <EuiButtonEmpty
-                    onClick={setStep.bind(null, 1)}
+                    onClick={setStep.bind(null, STEP.PICK_DATA_VIEW)}
                     isDisabled={validating}
                     flush="left"
                   >
@@ -281,7 +251,7 @@ const ValidationMessage: FC<{
       >
         <FormattedMessage
           id="xpack.ml.newJob.wizard.datafeedStep.dataView.validation.noDetectors.message"
-          defaultMessage="NNo detectors have been configured; this index pattern can be applied to the job."
+          defaultMessage="No detectors have been configured; this index pattern can be applied to the job."
         />
       </EuiCallOut>
     );