provide default SubBranding values on empty fields, on upsert; cleanup: sub branding validation schema

Author: Soxasora

components/territory-branding.js

@@ -33,10 +33,10 @@ export default function TerritoryBrandingForm ({ sub }) {
         variables: {
           subName: sub.name,
           branding: {
-            title: values.title,
-            description: values.description,
-            primaryColor: values.primaryColor,
-            secondaryColor: values.secondaryColor,
+            title: values.title || sub.name,
+            description: values.description || sub.desc,
+            primaryColor: values.primaryColor || '#FADA5E',
+            secondaryColor: values.secondaryColor || '#F6911D',
             logoId: values.logoId,
             faviconId: values.faviconId
           }

lib/validate.js

@@ -368,19 +368,20 @@ export function customDomainSchema (args) {
 // Sub Branding validation schema
 // sanitize the input for correct colors and text
 export function subBrandingSchema (args) {
+  const hexRegex = /^#([0-9a-fA-F]{6})$/
   return object({
-    title: string().max(100, 'must be at most 100 characters').matches(/^[a-zA-Z0-9\s]+$/, {
+    title: string().max(50, 'must be at most 50 characters').matches(/^[a-zA-Z0-9\s]+$/, {
       message: 'title must only contain letters, numbers, and spaces'
     }).nullable().trim(),
-    description: string().max(250, 'must be at most 250 characters').matches(/^[a-zA-Z0-9\s]+$/, {
+    description: string().max(100, 'must be at most 100 characters').matches(/^[a-zA-Z0-9\s]+$/, {
       message: 'description must only contain letters, numbers, and spaces'
     }).nullable().trim(),
     logoId: intValidator.nullable().positive('must be positive').integer('must be an integer'),
     faviconId: intValidator.nullable().positive('must be positive').integer('must be an integer'),
-    primaryColor: string().matches(/^#([0-9a-fA-F]{6})$/, {
+    primaryColor: string().matches(hexRegex, {
       message: 'primary color must be a valid hex color'
     }).nullable(),
-    secondaryColor: string().matches(/^#([0-9a-fA-F]{6})$/, {
+    secondaryColor: string().matches(hexRegex, {
       message: 'secondary color must be a valid hex color'
     }).nullable()
   })