[ML] Data Frame Analytics trained models: adds functional tests for '…

…Deploy Model' action (elastic#163886) ## Summary Adds functional tests for deploy model action for DFA trained models with default config and with custom config. Part of elastic#160712 Flaky test run: https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2961 (updated) ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine · Aug 24, 2023 · b2308a9 · b2308a9
1 parent 2d9b46d
commit b2308a9
Show file tree

Hide file tree

Showing 16 changed files with 576 additions and 16 deletions.
diff --git a/...k/plugins/ml/public/application/components/ml_inference/add_inference_pipeline_flyout.tsx b/...k/plugins/ml/public/application/components/ml_inference/add_inference_pipeline_flyout.tsx
@@ -103,7 +103,7 @@ export const AddInferencePipelineFlyout: FC<AddInferencePipelineFlyoutProps> = (
   );
 
   return (
-    <EuiFlyout onClose={onClose} className="mlTrainedModelsInferencePipelineFlyout" size="l">
+    <EuiFlyout onClose={onClose} size="l" data-test-subj="mlTrainedModelsInferencePipelineFlyout">
       <EuiFlyoutHeader>
         <EuiTitle size="m">
           <h3>

diff --git a/...l/public/application/components/ml_inference/components/add_inference_pipeline_footer.tsx b/...l/public/application/components/ml_inference/components/add_inference_pipeline_footer.tsx
@@ -47,7 +47,10 @@ export const AddInferencePipelineFooter: FC<Props> = ({
   return (
     <EuiFlexGroup>
       <EuiFlexItem grow={false}>
-        <EuiButtonEmpty onClick={onClose}>
+        <EuiButtonEmpty
+          onClick={onClose}
+          data-test-subj="mlTrainedModelsInferencePipelineCloseButton"
+        >
           {pipelineCreated ? CLOSE_BUTTON_LABEL : CANCEL_BUTTON_LABEL}
         </EuiButtonEmpty>
       </EuiFlexItem>
@@ -66,6 +69,7 @@ export const AddInferencePipelineFooter: FC<Props> = ({
       <EuiFlexItem grow={false}>
         {nextStep !== undefined ? (
           <EuiButton
+            data-test-subj="mlTrainedModelsInferencePipelineContinueButton"
             iconType="arrowRight"
             iconSide="right"
             onClick={() => setStep(nextStep as AddInferencePipelineSteps)}
@@ -76,6 +80,7 @@ export const AddInferencePipelineFooter: FC<Props> = ({
           </EuiButton>
         ) : (
           <EuiButton
+            data-test-subj="mlTrainedModelsInferencePipelineCreateButton"
             color="success"
             disabled={!isContinueButtonEnabled || creatingPipeline || pipelineCreated}
             fill

diff --git a/...ml/public/application/components/ml_inference/components/additional_advanced_settings.tsx b/...ml/public/application/components/ml_inference/components/additional_advanced_settings.tsx
@@ -59,10 +59,14 @@ export const AdditionalAdvancedSettings: FC<Props> = memo(
 
     return (
       <EuiAccordion
+        data-test-subj="mlTrainedModelsInferenceAdvancedSettingsAccordion"
         id={accordionId}
         buttonContent={
           <EuiFlexGroup gutterSize="xs">
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem
+              grow={false}
+              data-test-subj="mlTrainedModelsInferenceAdvancedSettingsAccordionButton"
+            >
               <FormattedMessage
                 id="xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.advanced.additionalSettingsLabel"
                 defaultMessage="Additional settings"
@@ -110,6 +114,7 @@ export const AdditionalAdvancedSettings: FC<Props> = memo(
                 }
               >
                 <EuiTextArea
+                  data-test-subj="mlTrainedModelsInferenceAdvancedSettingsConditionTextArea"
                   aria-label={i18n.translate(
                     'xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.advanced.conditionAriaLabel',
                     { defaultMessage: 'Optional condition for running the processor' }
@@ -141,6 +146,7 @@ export const AdditionalAdvancedSettings: FC<Props> = memo(
                     }
                   >
                     <EuiFieldText
+                      data-test-subj="mlTrainedModelsInferenceAdvancedSettingsTagInput"
                       value={additionalSettings?.tag ?? ''}
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                         handleAdditionalSettingsChange({ tag: e.target.value })

diff --git a/...ins/ml/public/application/components/ml_inference/components/on_failure_configuration.tsx b/...ins/ml/public/application/components/ml_inference/components/on_failure_configuration.tsx
@@ -89,7 +89,7 @@ export const OnFailureConfiguration: FC<Props> = memo(
     };
 
     return (
-      <EuiFlexGroup direction="column">
+      <EuiFlexGroup direction="column" data-test-subj="mlTrainedModelsInferenceOnFailureStep">
         <EuiFlexItem>
           <EuiFlexGroup>
             <EuiFlexItem grow={3}>
@@ -146,6 +146,7 @@ export const OnFailureConfiguration: FC<Props> = memo(
                     <EuiFlexItem grow={false}>
                       <EuiFormRow fullWidth>
                         <EuiSwitch
+                          data-test-subj={'mlTrainedModelsInferenceIgnoreFailureSwitch'}
                           label={
                             <FormattedMessage
                               id="xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.advanced.ignoreFailureLabel"
@@ -161,6 +162,7 @@ export const OnFailureConfiguration: FC<Props> = memo(
                       {ignoreFailure === false ? (
                         <EuiFormRow>
                           <EuiSwitch
+                            data-test-subj={'mlTrainedModelsInferenceTakeActionOnFailureSwitch'}
                             label={
                               <EuiFlexItem>
                                 <FormattedMessage
@@ -236,6 +238,7 @@ export const OnFailureConfiguration: FC<Props> = memo(
                       <>
                         {!editOnFailure ? (
                           <EuiCodeBlock
+                            data-test-subj="mlTrainedModelsInferenceOnFailureCodeBlock"
                             isCopyable={true}
                             overflowHeight={350}
                             css={{ height: '350px' }}
@@ -245,6 +248,7 @@ export const OnFailureConfiguration: FC<Props> = memo(
                         ) : null}
                         {editOnFailure ? (
                           <CodeEditor
+                            data-test-subj="mlTrainedModelsInferenceOnFailureEditor"
                             height={300}
                             languageId="json"
                             options={{

diff --git a/x-pack/plugins/ml/public/application/components/ml_inference/components/pipeline_details.tsx b/x-pack/plugins/ml/public/application/components/ml_inference/components/pipeline_details.tsx
@@ -137,6 +137,7 @@ export const PipelineDetails: FC<Props> = memo(
                 isInvalid={pipelineNameError !== undefined}
               >
                 <EuiFieldText
+                  data-test-subj="mlTrainedModelsInferencePipelineNameInput"
                   fullWidth
                   placeholder={i18n.translate(
                     'xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.configure.namePlaceholder',
@@ -173,6 +174,7 @@ export const PipelineDetails: FC<Props> = memo(
                 <EuiTextArea
                   compressed
                   fullWidth
+                  data-test-subj="mlTrainedModelsInferencePipelineDescriptionInput"
                   placeholder={i18n.translate(
                     'xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.configure.descriptionPlaceholder',
                     {
@@ -208,6 +210,7 @@ export const PipelineDetails: FC<Props> = memo(
               >
                 <EuiFieldText
                   fullWidth
+                  data-test-subj="mlTrainedModelsInferencePipelineTargetFieldInput"
                   value={targetField}
                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                     handleConfigChange(e.target.value, 'targetField')

diff --git a/...gins/ml/public/application/components/ml_inference/components/processor_configuration.tsx b/...gins/ml/public/application/components/ml_inference/components/processor_configuration.tsx
@@ -156,7 +156,10 @@ export const ProcessorConfiguration: FC<Props> = memo(
     };
 
     return (
-      <EuiFlexGroup direction="column">
+      <EuiFlexGroup
+        direction="column"
+        data-test-subj="mlTrainedModelsInferencePipelineProcessorConfigStep"
+      >
         {/* INFERENCE CONFIG */}
         <EuiFlexItem>
           <EuiFlexGroup>
@@ -193,6 +196,7 @@ export const ProcessorConfiguration: FC<Props> = memo(
                   <EuiFlexGroup gutterSize="xs" alignItems="center">
                     <EuiFlexItem grow={false}>
                       <EuiButtonEmpty
+                        data-test-subj="mlTrainedModelsInferencePipelineInferenceConfigEditButton"
                         iconType="pencil"
                         size="xs"
                         onClick={() => {
@@ -228,6 +232,7 @@ export const ProcessorConfiguration: FC<Props> = memo(
                 }
                 error={inferenceConfigError ?? inferenceConfigError}
                 isInvalid={inferenceConfigError !== undefined || inferenceConfigError !== undefined}
+                data-test-subj="mlTrainedModelsInferencePipelineInferenceConfigEditor"
               >
                 {editInferenceConfig ? (
                   <CodeEditor
@@ -242,7 +247,10 @@ export const ProcessorConfiguration: FC<Props> = memo(
                     onChange={handleInferenceConfigChange}
                   />
                 ) : (
-                  <EuiCodeBlock isCopyable={true}>
+                  <EuiCodeBlock
+                    isCopyable={true}
+                    data-test-subj="mlTrainedModelsInferencePipelineInferenceConfigBlock"
+                  >
                     {JSON.stringify(inferenceConfig, null, 2)}
                   </EuiCodeBlock>
                 )}
@@ -311,6 +319,7 @@ export const ProcessorConfiguration: FC<Props> = memo(
                   <EuiFlexGroup gutterSize="xs" justifyContent="flexStart">
                     <EuiFlexItem grow={false}>
                       <EuiButtonEmpty
+                        data-test-subj="mlTrainedModelsInferencePipelineFieldMapEditButton"
                         iconType="pencil"
                         size="xs"
                         onClick={() => {
@@ -349,10 +358,15 @@ export const ProcessorConfiguration: FC<Props> = memo(
                 }
                 error={fieldMapError}
                 isInvalid={fieldMapError !== undefined}
+                data-test-subj="mlTrainedModelsInferencePipelineFieldMapEdit"
               >
                 <>
                   {!editFieldMapping ? (
-                    <EuiCodeBlock isCopyable={true} overflowHeight={350}>
+                    <EuiCodeBlock
+                      isCopyable={true}
+                      overflowHeight={350}
+                      data-test-subj="mlTrainedModelsInferencePipelineFieldMapBlock"
+                    >
                       {JSON.stringify(fieldMap ?? {}, null, 2)}
                     </EuiCodeBlock>
                   ) : null}

diff --git a/...s/ml/public/application/components/ml_inference/components/review_and_create_pipeline.tsx b/...s/ml/public/application/components/ml_inference/components/review_and_create_pipeline.tsx
@@ -58,7 +58,12 @@ export const ReviewAndCreatePipeline: FC<Props> = ({
 
   const configCodeBlock = useMemo(
     () => (
-      <EuiCodeBlock language="json" isCopyable overflowHeight="400px">
+      <EuiCodeBlock
+        language="json"
+        isCopyable
+        overflowHeight="400px"
+        data-test-subj="mlTrainedModelsInferenceReviewAndCreateStepConfigBlock"
+      >
         {JSON.stringify(inferencePipeline ?? {}, null, 2)}
       </EuiCodeBlock>
     ),
@@ -67,7 +72,11 @@ export const ReviewAndCreatePipeline: FC<Props> = ({
 
   return (
     <>
-      <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiFlexGroup
+        direction="column"
+        gutterSize="s"
+        data-test-subj="mlTrainedModelsInferenceReviewAndCreateStep"
+      >
         <EuiFlexItem grow={3}>
           {pipelineCreated === false ? (
             <EuiTitle size="s">
@@ -86,6 +95,7 @@ export const ReviewAndCreatePipeline: FC<Props> = ({
             <EuiSpacer size="s" />
             {pipelineCreated === true && pipelineError === undefined ? (
               <EuiCallOut
+                data-test-subj="mlTrainedModelsInferenceReviewAndCreateStepSuccessCallout"
                 title={i18n.translate(
                   'xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.steps.create.successMessage',
                   {

diff --git a/.../plugins/ml/public/application/components/ml_inference/components/save_changes_button.tsx b/.../plugins/ml/public/application/components/ml_inference/components/save_changes_button.tsx
@@ -15,7 +15,12 @@ interface SaveChangesButtonProps {
 }
 
 export const SaveChangesButton: FC<SaveChangesButtonProps> = ({ onClick, disabled }) => (
-  <EuiButtonEmpty size="xs" onClick={onClick} disabled={disabled}>
+  <EuiButtonEmpty
+    size="xs"
+    onClick={onClick}
+    disabled={disabled}
+    data-test-subj="mlTrainedModelsInferencePipelineFlyoutSaveChangesButton"
+  >
     {i18n.translate(
       'xpack.ml.trainedModels.content.indices.pipelines.addInferencePipelineModal.saveChangesButton',
       { defaultMessage: 'Save changes' }

diff --git a/x-pack/plugins/ml/public/application/components/ml_inference/components/test_pipeline.tsx b/x-pack/plugins/ml/public/application/components/ml_inference/components/test_pipeline.tsx
@@ -129,7 +129,11 @@ export const TestPipeline: FC<Props> = memo(({ state, sourceIndex }) => {
 
   return (
     <>
-      <EuiFlexGroup direction="column" gutterSize="xs">
+      <EuiFlexGroup
+        direction="column"
+        gutterSize="xs"
+        data-test-subj="mlTrainedModelsInferenceTestStep"
+      >
         <EuiFlexItem>
           <EuiTitle size="s">
             <h4>
@@ -245,6 +249,7 @@ export const TestPipeline: FC<Props> = memo(({ state, sourceIndex }) => {
                 <>
                   <EuiResizablePanel grow hasBorder initialSize={50} paddingSize="xs">
                     <CodeEditor
+                      data-test-subj="mlTrainedModelsInferenceTestDocsEditor"
                       languageId="json"
                       options={{
                         automaticLayout: true,
@@ -259,7 +264,11 @@ export const TestPipeline: FC<Props> = memo(({ state, sourceIndex }) => {
                   <EuiResizableButton />
 
                   <EuiResizablePanel grow={false} hasBorder initialSize={50} paddingSize="xs">
-                    <EuiCodeBlock language="json" isCopyable className="reviewCodeBlock">
+                    <EuiCodeBlock
+                      language="json"
+                      isCopyable
+                      data-test-subj="mlTrainedModelsInferenceTestResult"
+                    >
                       {simulatePipelineError
                         ? JSON.stringify(simulatePipelineError, null, 2)
                         : simulatePipelineResult

diff --git a/x-pack/plugins/ml/public/application/components/ml_inference/validation.ts b/x-pack/plugins/ml/public/application/components/ml_inference/validation.ts
@@ -87,7 +87,7 @@ export const validateInferenceConfig = (
   }
 
   // If populated, inference config must have the correct model type
-  if (inferenceConfig && inferenceConfigKeys.length > 0) {
+  if (modelType && inferenceConfig && inferenceConfigKeys.length > 0) {
     if (modelType === inferenceConfigKeys[0]) {
       return error;
     } else {

diff --git a/x-pack/plugins/ml/public/application/model_management/model_actions.tsx b/x-pack/plugins/ml/public/application/model_management/model_actions.tsx
@@ -456,7 +456,11 @@ export function useModelActions({
           onModelDeployRequest(model);
         },
         available: (item) => {
-          const isDfaTrainedModel = item.metadata?.analytics_config !== undefined;
+          const isDfaTrainedModel =
+            item.metadata?.analytics_config !== undefined ||
+            item.inference_config?.regression !== undefined ||
+            item.inference_config?.classification !== undefined;
+
           return (
             isDfaTrainedModel &&
             !isBuiltInModel(item) &&