fix(mwan): fixing validation on default rule (#431)

NethServer · Nov 12, 2024 · 767d4a1 · 767d4a1
1 parent 6974a19
commit 767d4a1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/composables/useRuleForm.ts b/src/composables/useRuleForm.ts
@@ -164,17 +164,23 @@ export function useRuleForm(policies: Ref<Policy[]>, rule?: Ref<Rule | undefined
 
   function isValid() {
     validationErrors.value.clear()
-    let validationCheck = validateRequired(name.value)
+    let validationCheck = validateRequired(policy.value)
     if (!validationCheck.valid) {
-      validationErrors.value.set('name', String(validationCheck.errMessage))
+      validationErrors.value.set('policy', String(validationCheck.errMessage))
     }
     validationCheck = validateRequired(policy.value)
     if (!validationCheck.valid) {
       validationErrors.value.set('policy', String(validationCheck.errMessage))
     }
-    const { valid, errMessage, i18Params } = validateUciName(name.value, 12)
-    if (!valid) {
-      validationErrors.value.set('name', t(errMessage as string, i18Params as any))
+    if (name.value != 'Default Rule') {
+      validationCheck = validateRequired(name.value)
+      if (!validationCheck.valid) {
+        validationErrors.value.set('name', String(validationCheck.errMessage))
+      }
+      const { valid, errMessage, i18Params } = validateUciName(name.value, 12)
+      if (!valid) {
+        validationErrors.value.set('name', t(errMessage as string, i18Params as any))
+      }
     }
     if (sourceAddress.value != '') {
       validationCheck = validateIp4OrCidr(sourceAddress.value)