[ILM] Fix misleading copy and fix serialization

x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts

@@ -94,3 +94,28 @@ export const POLICY_WITH_NODE_ROLE_ALLOCATION: PolicyFromES = {
   },
   name: POLICY_NAME,
 };
+
+export const POLICY_WITH_MIGRATE_OFF: PolicyFromES = {
+  version: 1,
+  modified_date: Date.now().toString(),
+  policy: {
+    name: 'my_policy',
+    phases: {
+      hot: {
+        min_age: '0ms',
+        actions: {
+          rollover: {
+            max_age: '30d',
+            max_size: '50gb',
+          },
+        },
+      },
+      warm: {
+        actions: {
+          migrate: { enabled: false },
+        },
+      },
+    },
+  },
+  name: 'my_policy',
+};

x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts

@@ -14,6 +14,7 @@ import {
   DELETE_PHASE_POLICY,
   NEW_SNAPSHOT_POLICY_NAME,
   SNAPSHOT_POLICY_NAME,
+  POLICY_WITH_MIGRATE_OFF,
   POLICY_WITH_NODE_ATTR_AND_OFF_ALLOCATION,
   POLICY_WITH_NODE_ROLE_ALLOCATION,
 } from './constants';
@@ -142,6 +143,40 @@ describe('<EditPolicy />', () => {
   });
 
   describe('data allocation', () => {
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_MIGRATE_OFF]);
+      httpRequestsMockHelpers.setListNodes({
+        nodesByRoles: {},
+        nodesByAttributes: { test: ['123'] },
+        isUsingDeprecatedDataRoleConfig: false,
+      });
+      httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+
+      await act(async () => {
+        testBed = await setup();
+      });
+
+      const { component } = testBed;
+      component.update();
+    });
+
+    test('setting node_attr based allocation, but not selecting node attribute should leave allocation unchanged', async () => {
+      const { actions, find, component } = testBed;
+      act(() => {
+        find(`warm-dataTierAllocationControls.dataTierSelect`).simulate('click');
+      });
+      component.update();
+      await act(async () => {
+        find(`warm-dataTierAllocationControls.customDataAllocationOption`).simulate('click');
+      });
+      component.update();
+      await actions.savePolicy();
+      const latestRequest = server.requests[server.requests.length - 1];
+      const warmPhase = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm;
+
+      expect(warmPhase.actions.migrate).toEqual({ enabled: false });
+    });
+
     describe('node roles', () => {
       beforeEach(async () => {
         httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_NODE_ROLE_ALLOCATION]);

x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/data_tier_allocation/no_node_attributes_warning.tsx

@@ -19,7 +19,7 @@ const i18nTexts = {
       'xpack.indexLifecycleMgmt.editPolicy.warm.nodeAttributesMissingDescription',
       {
         defaultMessage:
-          'Define custom node attributes in elasticsearch.yml to use attribute-based allocation. Warm nodes will be used instead.',
+          'Define custom node attributes in elasticsearch.yml to use attribute-based allocation.',
       }
     ),
   },
@@ -28,7 +28,7 @@ const i18nTexts = {
       'xpack.indexLifecycleMgmt.editPolicy.cold.nodeAttributesMissingDescription',
       {
         defaultMessage:
-          'Define custom node attributes in elasticsearch.yml to use attribute-based allocation. Cold nodes will be used instead.',
+          'Define custom node attributes in elasticsearch.yml to use attribute-based allocation.',
       }
     ),
   },

x-pack/plugins/index_lifecycle_management/public/application/services/policies/shared/serialize_phase_with_allocation.ts

@@ -20,12 +20,15 @@ export const serializePhaseWithAllocation = (
 ): SerializedPhase['actions'] => {
   const esPhaseActions: SerializedPhase['actions'] = cloneDeep(originalPhaseActions);
 
-  if (phase.dataTierAllocationType === 'custom' && phase.selectedNodeAttrs) {
-    const [name, value] = phase.selectedNodeAttrs.split(':');
-    esPhaseActions.allocate = esPhaseActions.allocate || ({} as AllocateAction);
-    esPhaseActions.allocate.require = {
-      [name]: value,
-    };
+  if (phase.dataTierAllocationType === 'custom') {
+    if (phase.selectedNodeAttrs) {
+      const [name, value] = phase.selectedNodeAttrs.split(':');
+      esPhaseActions.allocate = esPhaseActions.allocate || ({} as AllocateAction);
+      esPhaseActions.allocate.require = {
+        [name]: value,
+      };
+    }
+    // else leave the policy configuration unchanged.
   } else if (phase.dataTierAllocationType === 'none') {
     esPhaseActions.migrate = { enabled: false };
     if (esPhaseActions.allocate) {