Merge pull request #3270 from FlowFuse/fix-3266-blueprint-validation

Blueprint Admin: Fix form validation
FlowFuse · Dec 22, 2023 · 14fbc5f · 14fbc5f
2 parents 0335c90 + 40d02b0
commit 14fbc5f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/frontend/src/pages/admin/FlowBlueprints/dialogs/FlowBlueprintFormDialog.vue b/frontend/src/pages/admin/FlowBlueprints/dialogs/FlowBlueprintFormDialog.vue
@@ -119,7 +119,7 @@ export default {
     },
     computed: {
         formValid () {
-            return this.input.name && this.input.flows && this.input.modules && !this.errors.name && !this.errors.flows && !this.errors.modules
+            return this.input.name && this.input.flows && this.input.modules
         },
         dialogTitle () {
             return this.flowBlueprint?.id ? 'Edit Flow Blueprint' : 'Create Flow Blueprint'
@@ -131,6 +131,9 @@ export default {
                 return
             }
 
+            this.error = null
+            this.errors = {}
+
             const flowBlueprintProps = { ...this.input }
             if (flowBlueprintProps.order === '') {
                 delete flowBlueprintProps.order
@@ -170,11 +173,11 @@ export default {
                 if (error.response?.data?.error) {
                     const errorResponse = error.response.data
                     this.error = errorResponse.error
-                    if (errorResponse.message.includes('flows')) {
-                        this.errors.flows = errorResponse.message
+                    if (this.error.includes('flows')) {
+                        this.errors.flows = this.error
                     }
-                    if (errorResponse.message.includes('modules')) {
-                        this.errors.modules = errorResponse.message
+                    if (this.error.includes('modules')) {
+                        this.errors.modules = this.error
                     }
                 } else {
                     this.error = 'Unknown error, please try again'