feat(validation): add length validation for mwan name rule (#397)

NethServer · Oct 17, 2024 · 56bfaea · 56bfaea
1 parent 79b3e44
commit 56bfaea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/standalone/multi-wan/RuleCreator.vue b/src/components/standalone/multi-wan/RuleCreator.vue
@@ -152,7 +152,7 @@ function save() {
       <NeTextInput
         v-model.trim="name"
         :disabled="saving"
-        :invalid-message="t(validationErrors.getFirstI18nKeyFor('name'))"
+        :invalid-message="validationErrors.getFirstFor('name')"
         :label="t('standalone.multi_wan.rule_name')"
         :placeholder="t('standalone.multi_wan.rule_name')"
         name="rule_name"

diff --git a/src/composables/useRuleForm.ts b/src/composables/useRuleForm.ts
@@ -10,7 +10,8 @@ import {
   MessageBag,
   validateIp4OrCidr,
   validatePortRangeForMwan,
-  validateRequired
+  validateRequired,
+  validateUciName
 } from '@/lib/validation'
 import { type ObjectReference, useObjects } from '@/composables/useObjects'
 import { ubusCall } from '@/lib/standalone/ubus'
@@ -171,6 +172,10 @@ export function useRuleForm(policies: Ref<Policy[]>, rule?: Ref<Rule | undefined
     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 (sourceAddress.value != '') {
       validationCheck = validateIp4OrCidr(sourceAddress.value)
       if (!validationCheck.valid) {