fix edge cases

elastic · Jan 6, 2021 · bfcdfb4 · bfcdfb4
1 parent 206016a
commit bfcdfb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/..._management/public/application/sections/edit_policy/form/configuration_issues_context.tsx b/..._management/public/application/sections/edit_policy/form/configuration_issues_context.tsx
@@ -40,7 +40,9 @@ export const ConfigurationIssuesProvider: FunctionComponent = ({ children }) =>
     ],
   });
   const isUsingDefaultRollover = get(formData, isUsingDefaultRolloverPath);
-  const isUsingCustomRollover = get(formData, isUsingCustomRolloverPath);
+  // Provide default value, as path may become undefined if removed from the DOM
+  const isUsingCustomRollover = get(formData, isUsingCustomRolloverPath, true);
+
   return (
     <ConfigurationIssuesContext.Provider
       value={{

diff --git a/...ifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts b/...ifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
@@ -52,10 +52,15 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
       /**
        * HOT PHASE ROLLOVER
        */
-      if (hotPhaseActions.rollover && isUsingRollover) {
+      if (isUsingRollover) {
         if (_meta.hot.isUsingDefaultRollover) {
           hotPhaseActions.rollover = cloneDeep(defaultRolloverAction);
         } else {
+          // Rollover may not exist if editing an existing policy with initially no rollover configured
+          if (!hotPhaseActions.rollover) {
+            hotPhaseActions.rollover = {};
+          }
+
           // We are using user-defined, custom rollover settings.
           if (updatedPolicy.phases.hot!.actions.rollover?.max_age) {
             hotPhaseActions.rollover.max_age = `${hotPhaseActions.rollover.max_age}${_meta.hot.customRollover.maxAgeUnit}`;