[C-4899] Fix isrc and iswc validation (#9352)

AudiusProject · Aug 1, 2024 · 9500340 · 9500340
1 parent 7c780e8
commit 9500340
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx
@@ -37,7 +37,9 @@ const errorMessages = {
   previewStartZero:
     'Preview must start at 0 since the track is less than 30 seconds.',
   bpmTooLow: `BPM less than ${MIN_BPM}`,
-  bpmTooHigh: `BPM greater than ${MAX_BPM}`
+  bpmTooHigh: `BPM greater than ${MAX_BPM}`,
+  isrc: "Invalid ISRC. Must be in the format 'CC-XXX-YY-NNNNN'",
+  iswc: "Invalid ISWC. Must be in the format 'T-34524688-1'"
 }
 
 const useEditTrackSchema = () => {
@@ -66,7 +68,22 @@ const useEditTrackSchema = () => {
           stream_conditions: z.any(),
           duration: z.number().nullable(),
           preview_start_seconds: z.any(),
-          bpm: z.optional(z.string().nullable())
+          bpm: z.optional(z.string().nullable()),
+          isrc: z.optional(
+            z
+              .string()
+              .regex(
+                /^[A-Z]{2}-?[A-Z\d]{3}-?\d{2}-?\d{5}$/i,
+                errorMessages.isrc
+              )
+              .nullable()
+          ),
+          iswc: z.optional(
+            z
+              .string()
+              .regex(/^T-?\d{3}.?\d{3}.?\d{3}.?-?\d$/i, errorMessages.iswc)
+              .nullable()
+          )
         })
         .refine(
           (values) => {
@@ -88,7 +105,7 @@ const useEditTrackSchema = () => {
           (values) => {
             return typeof values.genre === 'string' && !!values.genre
           },
-          { message: errorMessages.description, path: ['genre'] }
+          { message: errorMessages.genre, path: ['genre'] }
         )
         .refine(
           (values) => {

diff --git a/packages/mobile/src/screens/edit-track-screen/screens/IsrcIswcScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/IsrcIswcScreen.tsx
@@ -1,10 +1,13 @@
+import { useFormikContext } from 'formik'
 import { View } from 'react-native'
 
 import { IconInfo } from '@audius/harmony-native'
 import { TextField } from 'app/components/fields'
 import { FormScreen } from 'app/screens/form-screen'
 import { makeStyles } from 'app/styles'
 
+import type { FormValues } from '../types'
+
 const messages = {
   title: 'ISRC/ISWC',
   isrc: 'ISRC',
@@ -20,18 +23,31 @@ const useStyles = makeStyles(({ spacing }) => ({
 
 export const IsrcIswcScreen = () => {
   const styles = useStyles()
+
+  const { errors } = useFormikContext<FormValues>()
+
+  const hasErrors = Boolean(errors.isrc || errors.iswc)
+
   return (
-    <FormScreen title={messages.title} icon={IconInfo} variant='white'>
+    <FormScreen
+      title={messages.title}
+      icon={IconInfo}
+      variant='white'
+      disableSubmit={hasErrors}
+      revertOnCancel
+    >
       <View style={styles.content}>
         <TextField
           name='isrc'
           label={messages.isrc}
           placeholder='CC-XXX-YY-NNNNN'
+          errorBeforeSubmit
         />
         <TextField
           name='iswc'
           label={messages.iswc}
           placeholder='T-34524688-1'
+          errorBeforeSubmit
         />
       </View>
     </FormScreen>