validate image upload

clrfund · Jun 7, 2023 · 5481962 · 5481962
1 parent 1515683
commit 5481962
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/vue-app/src/locales/cn.json b/vue-app/src/locales/cn.json
@@ -1199,7 +1199,7 @@
         "donation": "捐款细节",
         "team": "团队",
         "links": "链接",
-        "images": "图片",
+        "image": "图片",
         "review": "审查",
         "submit": "提交"
       }

diff --git a/vue-app/src/locales/en.json b/vue-app/src/locales/en.json
@@ -1199,7 +1199,7 @@
         "donation": "Donation details",
         "team": "Team details",
         "links": "Links",
-        "images": "Images",
+        "image": "Images",
         "review": "Review",
         "submit": "Submit"
       }

diff --git a/vue-app/src/locales/es.json b/vue-app/src/locales/es.json
@@ -1199,7 +1199,7 @@
         "donation": "Detalles de la donación",
         "team": "Detalles del equipo",
         "links": "Enlaces",
-        "images": "Imágenes",
+        "image": "Imágenes",
         "review": "Revisa",
         "submit": "Enviar"
       }

diff --git a/vue-app/src/views/JoinView.vue b/vue-app/src/views/JoinView.vue
@@ -772,25 +772,32 @@ const rules = computed(() => {
     image: {
       bannerHash: {
         required,
-        validIpfsHash: isIPFS.cid,
+        validIpfsHash,
+        $autoDirty: true,
       },
       thumbnailHash: {
         required,
-        validIpfsHash: isIPFS.cid,
+        validIpfsHash,
+        $autoDirty: true,
       },
     },
   }
 })
 const v$ = useVuelidate(rules, form)
 
 const currentStep = ref<number>(0)
-const steps = ['project', 'donation', 'team', 'links', 'images', 'review', 'submit', 'confirm']
+const steps = ['project', 'donation', 'team', 'links', 'image', 'review', 'submit', 'confirm']
 const stepNames = steps.slice(0, steps.length - 1)
 const showSummaryPreview = ref(false)
 const isWaiting = ref(false)
 const txHash = ref('')
 const txError = ref('')
 
+function validIpfsHash(hash: string): boolean {
+  const isValid = Boolean(hash) && isIPFS.cid(hash)
+  return isValid
+}
+
 const isNavDisabled = computed<boolean>(
   () => !isStepValid(currentStep.value) && currentStep.value !== form.furthestStep,
 )
@@ -860,6 +867,7 @@ function saveFormData(updateFurthest?: boolean): void {
 // Callback from IpfsImageUpload component
 function handleUpload(key, value) {
   form.image[key] = value
+  v$.value.image[key].$touch()
   saveFormData(false)
 }
 
@@ -872,6 +880,7 @@ function isStepValid(step: number): boolean {
     return isLinkStepValid()
   }
   const stepName: string = steps[step]
+
   return !v$.value[stepName]?.$invalid
 }