added test for removing shrink field in serialization and re-ordered fields in hot phase advanced

jloleysens · jloleysens · commit 3b09eb150ffc · 2020-12-09T16:08:52.000+01:00
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -192,7 +192,7 @@ export const setup = async (arg?: { appServicesContext: Partial<AppServicesConte
     await createFormSetValueAction(`${phase}-selectedPrimaryShardCount`)(value);
   };
 
-  const shrinkExists = () => exists('shrinkSwitch');
+  const shrinkExists = (phase: Phases) => () => exists(`${phase}-shrinkSwitch`);
 
   const setFreeze = createFormToggleAction('freezeSwitch');
   const freezeExists = () => exists('freezeSwitch');
@@ -238,6 +238,7 @@ export const setup = async (arg?: { appServicesContext: Partial<AppServicesConte
         ...createForceMergeActions('hot'),
         setIndexPriority: setIndexPriority('hot'),
         setShrink: setShrink('hot'),
+        shrinkExists: shrinkExists('hot'),
         ...createSearchableSnapshotActions('hot'),
       },
       warm: {
@@ -249,7 +250,7 @@ export const setup = async (arg?: { appServicesContext: Partial<AppServicesConte
         setSelectedNodeAttribute: setSelectedNodeAttribute('warm'),
         setReplicas: setReplicas('warm'),
         setShrink: setShrink('warm'),
-        shrinkExists,
+        shrinkExists: shrinkExists('warm'),
         ...createForceMergeActions('warm'),
         setIndexPriority: setIndexPriority('warm'),
       },
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
@@ -236,8 +236,8 @@ export const HotPhase: FunctionComponent = () => {
         {isRolloverEnabled && (
           <>
             {<ForcemergeField phase="hot" />}
-            {license.canUseSearchableSnapshot() && <SearchableSnapshotField phase="hot" />}
             <ShrinkField phase="hot" />
+            {license.canUseSearchableSnapshot() && <SearchableSnapshotField phase="hot" />}
           </>
         )}
         <SetPriorityInputField phase={hotProperty} />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
@@ -290,4 +290,14 @@ describe('deserializer and serializer', () => {
       enabled: false,
     });
   });
+
+  it('removes shrink from hot and warm when unset', () => {
+    delete formInternal.phases.hot!.actions!.shrink;
+    delete formInternal.phases.warm!.actions!.shrink;
+
+    const result = serializer(formInternal);
+
+    expect(result.phases.hot!.actions.shrink).toBeUndefined();
+    expect(result.phases.warm!.actions.shrink).toBeUndefined();
+  });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
@@ -69,6 +69,10 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
         delete hotPhaseActions.set_priority;
       }
 
+      if (!updatedPolicy.phases.hot?.actions?.shrink) {
+        delete hotPhaseActions.shrink;
+      }
+
       if (!updatedPolicy.phases.hot!.actions?.searchable_snapshot) {
         delete hotPhaseActions.searchable_snapshot;
       }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (`
`69`	`69`	`delete hotPhaseActions.set_priority;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ if (!updatedPolicy.phases.hot?.actions?.shrink) {`
	`73`	`+ delete hotPhaseActions.shrink;`
	`74`	`+ }`
	`75`	`+`
`72`	`76`	`if (!updatedPolicy.phases.hot!.actions?.searchable_snapshot) {`
`73`	`77`	`delete hotPhaseActions.searchable_snapshot;`
`74`	`78`	`}`