fix: 🐛 android form validation didn't check the variant name

When creating a new android variant, only serverKey and serverID where
validated. Added some utility function to make dealing with the
validator simpler.

src/application/VariantForms/AndroidVariantForm.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { TextInput, Button, Form, FormGroup } from '@patternfly/react-core';
+import { Button, Form } from '@patternfly/react-core';
 import { AndroidVariant, Variant } from '@aerogear/unifiedpush-admin-client';
 import { FormField } from '../ApplicationDetail/panels/FormField';
 import {
@@ -10,6 +10,7 @@ import {
   validatorBuilder,
 } from 'json-data-validator';
 import { MultiEvaluationResult } from 'json-data-validator/build/src/Rule';
+import { formIsValid, validatorToPF4Status } from '../../utils/ValidatorUtils';
 
 interface State {
   serverKey: string;
@@ -90,44 +91,38 @@ export class AndroidVariantForm extends Component<Props, State> {
       <Form className="AndroidVariantForm" isHorizontal>
         <FormField
           fieldId={'server-key'}
-          component="textinput"
           label={'Push Network'}
-          helperText={'Server Key1'}
+          helperText={'Server Key'}
           onChange={value => updateField('serverKey', value)}
           helperTextInvalid={
             this.state.formValidation?.getEvaluationResult('serverKey')?.message
           }
-          validated={
-            this.state.formValidation
-              ? this.state.formValidation.isValid('serverKey')
-                ? 'success'
-                : 'error'
-              : 'default'
-          }
+          validated={validatorToPF4Status(
+            this.state.formValidation,
+            'serverKey'
+          )}
         />
 
         <FormField
           fieldId={'server-key'}
-          component="textinput"
-          helperText={'Sender ID1'}
+          helperText={'Sender ID'}
           onChange={value => updateField('senderID', value)}
           helperTextInvalid={
             this.state.formValidation?.getEvaluationResult('senderID')?.message
           }
-          validated={
-            this.state.formValidation
-              ? this.state.formValidation.isValid('senderID')
-                ? 'success'
-                : 'error'
-              : 'default'
-          }
+          validated={validatorToPF4Status(
+            this.state.formValidation,
+            'senderID'
+          )}
         />
         <div className="variantFormButtons">
           <Button
             className="dialogBtn"
             onClick={save}
             isDisabled={
-              !this.state.formValidation || !this.state.formValidation.valid
+              !this.props.variantName ||
+              this.props.variantName.length === 0 ||
+              !formIsValid(this.state.formValidation)
             }
           >
             Create

src/utils/ValidatorUtils.tsx

@@ -0,0 +1,14 @@
+import { MultiEvaluationResult } from 'json-data-validator/build/src/Rule';
+
+export const validatorToPF4Status: (
+  status: MultiEvaluationResult | undefined,
+  field: string
+) => 'success' | 'error' | 'default' = (
+  status: MultiEvaluationResult | undefined,
+  field: string
+) => (status ? (status.isValid(field) ? 'success' : 'error') : 'default');
+
+export const formIsValid: (
+  status: MultiEvaluationResult | undefined
+) => boolean = (status: MultiEvaluationResult | undefined) =>
+  !!(status?.valid && status.valid);