fixup: use action value for isChanged check, disable selectors when not in edit mode

Author: Anemy

packages/compass-schema-validation/src/components/validation-editor.tsx

@@ -234,12 +234,12 @@ export const ValidationEditor: React.FunctionComponent<
     >
       <div className={validationOptionsStyles}>
         <ActionSelector
-          isEditable={isEditable}
+          isEditable={isEditable && isEditingEnabled}
           validationActionChanged={validationActionChanged}
           validationAction={validationAction}
         />
         <LevelSelector
-          isEditable={isEditable}
+          isEditable={isEditable && isEditingEnabled}
           validationLevelChanged={validationLevelChanged}
           validationLevel={validationLevel}
         />

packages/compass-schema-validation/src/modules/validation.spec.ts

@@ -44,6 +44,7 @@ describe('validation module', function () {
         const validation = reducer(undefined, validationActionChanged('warn'));
 
         expect(validation.validationAction).to.equal('warn');
+        expect(validation.isChanged).to.equal(true);
       });
     });
 
@@ -55,6 +56,7 @@ describe('validation module', function () {
         );
 
         expect(validation.validationLevel).to.equal('moderate');
+        expect(validation.isChanged).to.equal(true);
       });
     });
 

packages/compass-schema-validation/src/modules/validation.ts

@@ -214,10 +214,13 @@ export default function reducer(
   ) {
     return {
       ...state,
+      prevValidation: {
+        ...DEFAULT_VALIDATION,
+      },
+      ...DEFAULT_VALIDATION,
       isChanged: false,
       error: null,
       syntaxError: null,
-      ...DEFAULT_VALIDATION,
       validator: action.validationTemplate,
     };
   }
@@ -283,7 +286,11 @@ export default function reducer(
       ...state,
       validationAction: action.validationAction,
       isChanged: !isEqual(
-        pick(state, ['validator', 'validationAction', 'validationLevel']),
+        {
+          validator: state.validator,
+          validationAction: action.validationAction,
+          validationLevel: state.validationLevel,
+        },
         state.prevValidation
       ),
     };
@@ -306,7 +313,11 @@ export default function reducer(
       ...state,
       validationLevel: action.validationLevel,
       isChanged: !isEqual(
-        pick(state, ['validator', 'validationAction', 'validationLevel']),
+        {
+          validator: state.validator,
+          validationAction: state.validationAction,
+          validationLevel: action.validationLevel,
+        },
         state.prevValidation
       ),
     };