[ML] Transforms: Fix editing retention policy without default value.

x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx

@@ -55,7 +55,9 @@ export const EditTransformFlyoutForm: FC<EditTransformFlyoutFormProps> = ({
   );
 
   const retentionDateFieldOptions = useMemo(() => {
-    return Array.isArray(dateFieldNames) ? dateFieldNames.map((text: string) => ({ text })) : [];
+    return Array.isArray(dateFieldNames)
+      ? dateFieldNames.map((text: string) => ({ text, value: text }))
+      : [];
   }, [dateFieldNames]);
 
   return (
@@ -181,6 +183,11 @@ export const EditTransformFlyoutForm: FC<EditTransformFlyoutFormProps> = ({
                   onChange={(e) =>
                     dispatch({ field: 'retentionPolicyField', value: e.target.value })
                   }
+                  hasNoInitialSelection={
+                    !retentionDateFieldOptions
+                      .map((d) => d.text)
+                      .includes(formFields.retentionPolicyField.value)
+                  }
                 />
               </EuiFormRow>
             ) : (

x-pack/test/functional/apps/transform/editing.ts

@@ -5,33 +5,17 @@
  * 2.0.
  */
 
-import { TransformPivotConfig } from '../../../../plugins/transform/common/types/transform';
 import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig } from './index';
-
-function getTransformConfig(): TransformPivotConfig {
-  const date = Date.now();
-  return {
-    id: `ec_editing_${date}`,
-    source: { index: ['ft_ecommerce'] },
-    pivot: {
-      group_by: { category: { terms: { field: 'category.keyword' } } },
-      aggregations: { 'products.base_price.avg': { avg: { field: 'products.base_price' } } },
-    },
-    description:
-      'ecommerce batch transform with avg(products.base_price) grouped by terms(category)',
-    dest: { index: `user-ec_2_${date}` },
-  };
-}
+import { getLatestTransformConfig, getPivotTransformConfig } from './index';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const transform = getService('transform');
 
   describe('editing', function () {
-    const transformConfigWithPivot = getTransformConfig();
+    const transformConfigWithPivot = getPivotTransformConfig('editing');
     const transformConfigWithLatest = getLatestTransformConfig('editing');
 
     before(async () => {
@@ -67,8 +51,14 @@ export default function ({ getService }: FtrProviderContext) {
         transformDescription: 'updated description',
         transformDocsPerSecond: '1000',
         transformFrequency: '10m',
+        transformRetentionPolicyField: 'order_date',
+        transformRetentionPolicyMaxAge: '1d',
         expected: {
           messageText: 'updated transform.',
+          retentionPolicy: {
+            field: '',
+            maxAge: '',
+          },
           row: {
             status: TRANSFORM_STATE.STOPPED,
             type: 'pivot',
@@ -83,8 +73,14 @@ export default function ({ getService }: FtrProviderContext) {
         transformDescription: 'updated description',
         transformDocsPerSecond: '1000',
         transformFrequency: '10m',
+        transformRetentionPolicyField: 'order_date',
+        transformRetentionPolicyMaxAge: '1d',
         expected: {
           messageText: 'updated transform.',
+          retentionPolicy: {
+            field: '',
+            maxAge: '',
+          },
           row: {
             status: TRANSFORM_STATE.STOPPED,
             type: 'latest',
@@ -152,10 +148,38 @@ export default function ({ getService }: FtrProviderContext) {
             'Frequency',
             testData.transformFrequency
           );
+
+          await transform.testExecution.logTestStep('should update the transform retention policy');
+          await transform.editFlyout.openTransformEditAccordionRetentionPolicySettings();
+
+          await transform.editFlyout.assertTransformEditFlyoutRetentionPolicyFieldSelectEnabled(
+            true
+          );
+          await transform.editFlyout.assertTransformEditFlyoutRetentionPolicyFieldSelectValue(
+            testData.expected.retentionPolicy.field
+          );
+          await transform.editFlyout.setTransformEditFlyoutRetentionPolicyFieldSelectValue(
+            testData.transformRetentionPolicyField
+          );
+
+          await transform.editFlyout.assertTransformEditFlyoutInputEnabled(
+            'RetentionPolicyMaxAge',
+            true
+          );
+          await transform.editFlyout.assertTransformEditFlyoutInputValue(
+            'RetentionPolicyMaxAge',
+            testData.expected.retentionPolicy.maxAge
+          );
+          await transform.editFlyout.setTransformEditFlyoutInputValue(
+            'RetentionPolicyMaxAge',
+            testData.transformRetentionPolicyMaxAge
+          );
         });
 
         it('updates the transform and displays it correctly in the job list', async () => {
           await transform.testExecution.logTestStep('should update the transform');
+          await transform.editFlyout.assertUpdateTransformButtonExists();
+          await transform.editFlyout.assertUpdateTransformButtonEnabled(true);
           await transform.editFlyout.updateTransform();
 
           await transform.testExecution.logTestStep('should display the transforms table');

x-pack/test/functional/apps/transform/permissions/full_transform_access.ts

@@ -160,7 +160,7 @@ export default function ({ getService }: FtrProviderContext) {
           'should have the retention policy inputs enabled'
         );
         await transform.editFlyout.openTransformEditAccordionRetentionPolicySettings();
-        await transform.editFlyout.assertTransformEditFlyoutRetentionPolicySelectEnabled(true);
+        await transform.editFlyout.assertTransformEditFlyoutRetentionPolicyFieldSelectEnabled(true);
         await transform.editFlyout.assertTransformEditFlyoutInputEnabled(
           'RetentionPolicyMaxAge',
           true

x-pack/test/functional/services/transform/edit_flyout.ts

@@ -37,7 +37,7 @@ export function TransformEditFlyoutProvider({ getService }: FtrProviderContext)
       );
     },
 
-    async assertTransformEditFlyoutRetentionPolicySelectEnabled(expectedValue: boolean) {
+    async assertTransformEditFlyoutRetentionPolicyFieldSelectEnabled(expectedValue: boolean) {
       await testSubjects.existOrFail(`transformEditFlyoutRetentionPolicyFieldSelect`, {
         timeout: 1000,
       });
@@ -52,6 +52,28 @@ export function TransformEditFlyoutProvider({ getService }: FtrProviderContext)
       );
     },
 
+    async assertTransformEditFlyoutRetentionPolicyFieldSelectValue(expectedValue: string) {
+      await testSubjects.existOrFail(`transformEditFlyoutRetentionPolicyFieldSelect`, {
+        timeout: 1000,
+      });
+      const actualValue = await testSubjects.getAttribute(
+        'transformEditFlyoutRetentionPolicyFieldSelect',
+        'value'
+      );
+      expect(actualValue).to.eql(
+        expectedValue,
+        `Retention policy field option value should be '${expectedValue}' (got '${actualValue}')`
+      );
+    },
+
+    async setTransformEditFlyoutRetentionPolicyFieldSelectValue(fieldOptionValue: string) {
+      await testSubjects.selectValue(
+        'transformEditFlyoutRetentionPolicyFieldSelect',
+        fieldOptionValue
+      );
+      await this.assertTransformEditFlyoutRetentionPolicyFieldSelectValue(fieldOptionValue);
+    },
+
     async assertTransformEditFlyoutInputEnabled(input: string, expectedValue: boolean) {
       await testSubjects.existOrFail(`transformEditFlyout${input}Input`, { timeout: 1000 });
       const isEnabled = await testSubjects.isEnabled(`transformEditFlyout${input}Input`);