ValidationMessage: renamed invalid_value to replacement_value

Change-Id: I7d33c5b12a0f5d1f2102afb7453ab884f708f1c2

Author: schnetzzz

cmk/gui/form_specs/vue/visitors/_utils.py

@@ -57,7 +57,7 @@ def create_validation_error(
         error_message = error_message.localize(translate_to_current_language)
     return [
         shared_type_defs.ValidationMessage(
-            location=location or [], message=error_message, invalid_value=value
+            location=location or [], message=error_message, replacement_value=value
         )
     ]
 
@@ -68,7 +68,7 @@ def compute_validation_errors(
     raw_value: Any,
 ) -> list[shared_type_defs.ValidationMessage]:
     return [
-        shared_type_defs.ValidationMessage(location=[], message=x, invalid_value=parsed_value)
+        shared_type_defs.ValidationMessage(location=[], message=x, replacement_value=parsed_value)
         for x in optional_validation(validators, raw_value)
         if x is not None
     ]

cmk/gui/form_specs/vue/visitors/cascading_single_choice.py

@@ -108,7 +108,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[element.name] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
 

cmk/gui/form_specs/vue/visitors/catalog.py

@@ -183,7 +183,7 @@ def _validate(
                         shared_type_defs.ValidationMessage(
                             location=[topic_name, element_name] + validation.location,
                             message=validation.message,
-                            invalid_value=validation.invalid_value,
+                            replacement_value=validation.replacement_value,
                         )
                     )
         return element_validations

cmk/gui/form_specs/vue/visitors/dictionary.py

@@ -158,7 +158,7 @@ def _validate(
                         shared_type_defs.ValidationMessage(
                             location=[key_name],
                             message=_("Required field missing"),
-                            invalid_value=element_visitor.to_vue(DEFAULT_VALUE)[1],
+                            replacement_value=element_visitor.to_vue(DEFAULT_VALUE)[1],
                         )
                     )
                 continue
@@ -168,7 +168,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[key_name] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
 

cmk/gui/form_specs/vue/visitors/legacy_valuespec.py

@@ -132,7 +132,7 @@ def _validate(
             except MKUserError as e:
                 return [
                     shared_type_defs.ValidationMessage(
-                        location=[e.varname or ""], message=str(e), invalid_value=None
+                        location=[e.varname or ""], message=str(e), replacement_value=None
                     )
                 ]
             finally:

cmk/gui/form_specs/vue/visitors/list.py

@@ -89,7 +89,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[str(idx)] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
         return element_validations

cmk/gui/form_specs/vue/visitors/list_of_strings.py

@@ -72,7 +72,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[str(idx)] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
         return element_validations

cmk/gui/form_specs/vue/visitors/list_unique_selection.py

@@ -137,7 +137,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[str(idx)] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
         return element_validations

cmk/gui/form_specs/vue/visitors/optional_choice.py

@@ -81,7 +81,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=["parameter_form"],
                         message=validation_error.message,
-                        invalid_value=validation_error.invalid_value,
+                        replacement_value=validation_error.replacement_value,
                     )
                 )
 

cmk/gui/form_specs/vue/visitors/password.py

@@ -131,7 +131,7 @@ def _validate(
     ) -> list[VueComponents.ValidationMessage]:
         if parsed_value[1] == "explicit_password":
             return [
-                VueComponents.ValidationMessage(location=[], message=x, invalid_value="")
+                VueComponents.ValidationMessage(location=[], message=x, replacement_value="")
                 for x in optional_validation(compute_validators(self.form_spec), parsed_value[2][1])
                 if x is not None
             ]

cmk/gui/form_specs/vue/visitors/simple_password.py

@@ -68,7 +68,7 @@ def _validate(
         self, raw_value: object, parsed_value: _ParsedValueModel
     ) -> list[shared_type_defs.ValidationMessage]:
         return [
-            shared_type_defs.ValidationMessage(location=[], message=x, invalid_value="")
+            shared_type_defs.ValidationMessage(location=[], message=x, replacement_value="")
             for x in optional_validation(self._validators(), parsed_value)
             if x is not None
         ]

cmk/gui/form_specs/vue/visitors/tuple.py

@@ -87,7 +87,7 @@ def _validate(
                     shared_type_defs.ValidationMessage(
                         location=[str(idx)] + validation.location,
                         message=validation.message,
-                        invalid_value=validation.invalid_value,
+                        replacement_value=validation.replacement_value,
                     )
                 )
         return validation_errors

cmk/gui/openapi/endpoints/configuration_entity/response_schemas.py

@@ -18,7 +18,7 @@ class ValidationMessage(BaseSchema):
         example="",
         description="Error message",
     )
-    invalid_value = fields.String(
+    replacement_value = fields.String(
         example="",
         description="Invalid value",
     )

cmk/gui/quick_setup/handlers/utils.py

@@ -202,7 +202,7 @@ def get_stage_components_from_widget(widget: Widget, prefill_data: ParsedFormDat
 @dataclass
 class QuickSetupValidationError:
     message: str
-    invalid_value: Any
+    replacement_value: Any
     location: Sequence[str] = field(default_factory=list)
 
 

cmk/shared_typing/vue_formspec_components.py

@@ -281,7 +281,7 @@ class TimeSpecificI18n:
 class ValidationMessage:
     location: list[str]
     message: str
-    invalid_value: Any
+    replacement_value: Any
 
 
 @dataclass(kw_only=True)

packages/cmk-frontend-vue/src/components/_demo/DemoFormAll.vue

@@ -630,7 +630,7 @@ const validation = computed(() => {
       return {
         location: [name],
         message: 'some validation problem',
-        invalid_value: defaultValue
+        replacement_value: defaultValue
       }
     })
   } else {

packages/cmk-frontend-vue/src/components/_demo/DemoFormSingleChoiceEditableEditAsync.vue

@@ -135,7 +135,7 @@ provide(dispatcherKey, FormEditDispatcher)
         <option :value="[]">No error</option>
         <option
           :value="[
-            { location: ['element_name'], message: 'error message!', invalid_value: 'dafuck' }
+            { location: ['element_name'], message: 'error message!', replacement_value: 'dafuck' }
           ]"
         >
           One error

packages/cmk-frontend-vue/src/components/_demo/DemoFormTuple.vue

@@ -124,7 +124,7 @@ const components: Array<[unknown, string]> = [
   <FormReadonly
     :spec="getTupleSpec('horizontal', true, 'string')"
     :data="['one', 'two']"
-    :backend-validation="[{ location: ['1'], message: 'error', invalid_value: 'smth' }]"
+    :backend-validation="[{ location: ['1'], message: 'error', replacement_value: 'smth' }]"
   />
 </template>
 

packages/cmk-frontend-vue/src/form/components/FormReadonly.vue

@@ -140,7 +140,7 @@ function renderOptionalChoice(
       embeddedMessages.push({
         location: msg.location.slice(1),
         message: msg.message,
-        invalid_value: msg.invalid_value
+        replacement_value: msg.replacement_value
       })
     } else {
       localMessages.push(msg)
@@ -371,7 +371,7 @@ function computeUsedValue(
   backendValidation: ValidationMessages = []
 ): [string, boolean, string] {
   if (backendValidation.length > 0) {
-    return [backendValidation[0]!.invalid_value as string, true, backendValidation[0]!.message]
+    return [backendValidation[0]!.replacement_value as string, true, backendValidation[0]!.message]
   }
   return [value as string, false, '']
 }

packages/cmk-frontend-vue/src/form/components/forms/FormCascadingSingleChoice.vue

@@ -45,7 +45,7 @@ watch(
         elementValidation.value.push({
           location: msg.location.slice(1),
           message: msg.message,
-          invalid_value: msg.invalid_value
+          replacement_value: msg.replacement_value
         })
       }
     })

packages/cmk-frontend-vue/src/form/components/forms/FormConditionChoices/FormConditionChoices.vue

@@ -30,7 +30,7 @@ immediateWatch(
   (newValidation: ValidationMessages) => {
     validation.value = newValidation.map((m) => m.message)
     newValidation.forEach((message) => {
-      data.value = message.invalid_value as typing.ConditionChoicesValue[]
+      data.value = message.replacement_value as typing.ConditionChoicesValue[]
     })
   }
 )

packages/cmk-frontend-vue/src/form/components/forms/FormOptionalChoice.vue

@@ -37,7 +37,7 @@ immediateWatch(
         embeddedValidation.value.push({
           location: msg.location.slice(1),
           message: msg.message,
-          invalid_value: msg.invalid_value
+          replacement_value: msg.replacement_value
         })
       }
     })

packages/cmk-frontend-vue/src/form/components/utils/validation.ts

@@ -25,7 +25,7 @@ export function useValidation<Type>(
   immediateWatch(getBackendValidation, (newValidation: ValidationMessages) => {
     validation.value = newValidation.map((m) => m.message)
     newValidation.forEach((message) => {
-      data.value = message.invalid_value as Type
+      data.value = message.replacement_value as Type
     })
   })
 
@@ -128,7 +128,7 @@ export function groupNestedValidations(
     elementMessages.push({
       location: msg.location.slice(1),
       message: msg.message,
-      invalid_value: msg.invalid_value
+      replacement_value: msg.replacement_value
     })
     elementValidations[msgElementIdent] = elementMessages
   })
@@ -156,7 +156,7 @@ export function groupIndexedValidations(
     elementMessages.push({
       location: msg.location.slice(1),
       message: msg.message,
-      invalid_value: msg.invalid_value
+      replacement_value: msg.replacement_value
     })
     elementValidations[index] = elementMessages
   })

packages/cmk-frontend-vue/tests/form/components/forms/FormCascadingSingleChoice.test.ts

@@ -170,7 +170,7 @@ test('FormCascadingSingleChoice renders backend validation messages', async () =
         {
           location: [],
           message: 'Backend error message',
-          invalid_value: ''
+          replacement_value: ''
         }
       ]
     }

packages/cmk-frontend-vue/tests/form/components/forms/FormCatalog.test.ts

@@ -253,12 +253,12 @@ test('FormCatalog backend validation', async () => {
       {
         location: ['topic_name', 'ut_topic_element_1', 'ut_topic_1_dict_1'],
         message: 'ut_error_1',
-        invalid_value: ''
+        replacement_value: ''
       },
       {
         location: ['topic_name', 'ut_topic_element_2', 'ut_topic_2_dict_1'],
         message: 'ut_error_2',
-        invalid_value: ''
+        replacement_value: ''
       }
     ]
   }

packages/cmk-frontend-vue/tests/form/components/forms/FormConditionChoices.test.ts

@@ -53,7 +53,7 @@ test('FormConditionChoices shows backendValidation', async () => {
         {
           location: [],
           message: 'some message',
-          invalid_value: [
+          replacement_value: [
             {
               group_name: 'group1',
               value: { oper_eq: 'condition1' }

packages/cmk-frontend-vue/tests/form/components/forms/FormDictionary.test.ts

@@ -128,7 +128,7 @@ test('FormDictionary render backend validation message of children', async () =>
       spec,
       data: { bar: 'some_value' },
       backendValidation: [
-        { location: ['bar'], message: 'Backend error message', invalid_value: 'other_value' }
+        { location: ['bar'], message: 'Backend error message', replacement_value: 'other_value' }
       ]
     }
   })
@@ -143,7 +143,9 @@ test('FormDictionary renders its own backend validation message', async () => {
     props: {
       spec,
       data: { bar: 'some_value' },
-      backendValidation: [{ location: [], message: 'Backend error message', invalid_value: null }]
+      backendValidation: [
+        { location: [], message: 'Backend error message', replacement_value: null }
+      ]
     }
   })
 
@@ -262,7 +264,7 @@ test.skip('FormDictionary enable element, render backend validation message', as
       spec,
       data: {},
       backendValidation: [
-        { location: ['bar'], message: 'Backend error message', invalid_value: '' }
+        { location: ['bar'], message: 'Backend error message', replacement_value: '' }
       ]
     }
   })

packages/cmk-frontend-vue/tests/form/components/forms/FormFloat.test.ts

@@ -87,7 +87,9 @@ test('FormFloat renders backend validation messages', async () => {
     props: {
       spec,
       data: 42.0,
-      backendValidation: [{ location: [], message: 'Backend error message', invalid_value: 12.5 }]
+      backendValidation: [
+        { location: [], message: 'Backend error message', replacement_value: 12.5 }
+      ]
     }
   })
 

packages/cmk-frontend-vue/tests/form/components/forms/FormInteger.test.ts

@@ -90,7 +90,7 @@ test('FormInteger renders backend validation messages', async () => {
         {
           location: [],
           message: 'Backend error message',
-          invalid_value: 12
+          replacement_value: 12
         }
       ]
     }

packages/cmk-frontend-vue/tests/form/components/forms/FormList.test.ts

@@ -81,7 +81,7 @@ test('FormList renders backend validation messages', async () => {
     props: {
       spec,
       data: [],
-      backendValidation: [{ location: [], message: 'Backend error message', invalid_value: '' }]
+      backendValidation: [{ location: [], message: 'Backend error message', replacement_value: '' }]
     }
   })
 
@@ -103,7 +103,7 @@ test.skip('FormList updated backend child validation shows validation error', as
     spec,
     data: ['some value'],
     backendValidation: [
-      { location: ['0'], message: 'Backend error message', invalid_value: 'other value' }
+      { location: ['0'], message: 'Backend error message', replacement_value: 'other value' }
     ]
   })
 
@@ -118,7 +118,7 @@ test('FormList local child validation overwrites backend validation', async () =
       spec,
       data: ['some value'],
       backendValidation: [
-        { location: ['0'], message: 'Backend error message', invalid_value: 'other value' }
+        { location: ['0'], message: 'Backend error message', replacement_value: 'other value' }
       ]
     }
   })

packages/cmk-frontend-vue/tests/form/components/forms/FormListOfStrings.test.ts

@@ -43,7 +43,7 @@ test('FormListOfStrings renders backend validation messages', async () => {
     props: {
       spec,
       data: [],
-      backendValidation: [{ location: [], message: 'Backend error message', invalid_value: '' }]
+      backendValidation: [{ location: [], message: 'Backend error message', replacement_value: '' }]
     }
   })
 
@@ -65,7 +65,7 @@ test('FormListOfStrings updated backend child validation shows validation error'
     spec,
     data: ['some value'],
     backendValidation: [
-      { location: ['0'], message: 'Backend error message', invalid_value: 'other value' }
+      { location: ['0'], message: 'Backend error message', replacement_value: 'other value' }
     ]
   })
 
@@ -80,7 +80,7 @@ test('FormListOfStrings local child validation overwrites backend validation', a
       spec,
       data: ['some value'],
       backendValidation: [
-        { location: ['0'], message: 'Backend error message', invalid_value: 'other value' }
+        { location: ['0'], message: 'Backend error message', replacement_value: 'other value' }
       ]
     }
   })