bfg-common 1.4.252 → 1.4.254

package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue

@@ -2,12 +2,12 @@
   <div class="frequency">
     <common-pages-scheduled-tasks-modals-common-frequency-after-startup
       v-if="props.type === 'after-startup'"
-      v-model="model.frg_after_startup"
+      v-model="model"
     />
 
     <common-pages-scheduled-tasks-modals-common-frequency-interval
       v-if="showTimeInterval"
-      v-model="model.frg_interval"
+      v-model="model"
       :type="props.type"
     />
 

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/AfterStartup.vue

@@ -5,13 +5,13 @@
     </span>
 
     <label
-      for="failed-login-attempts"
+      for="minute-delay-field"
       class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
       :class="timeIntervalErrorText && 'invalid'"
     >
       <input
-        id="failed-login-attempts"
-        v-model="modelAfterStartupLocal"
+        id="minute-delay-field"
+        v-model="modelFrequencyLocal.frg_after_startup"
         data-id="edit-lockout-policy-time-interval-input"
         type="text"
         @input="onInitTimeIntervalValidation"
@@ -30,10 +30,13 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~//lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import { validateField } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
 
-const modelAfterStartupLocal = defineModel<string>({ required: true })
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -45,8 +48,18 @@ const onInitTimeIntervalValidation = (): void => {
 const timeIntervalErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value) return ''
 
-  return validateField(localization.value, modelAfterStartupLocal.value)
+  return validateField(
+    localization.value,
+    modelFrequencyLocal.value.frg_after_startup
+  )
 })
+watch(
+  timeIntervalErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = newValue !== ''
+  },
+  { immediate: true }
+)
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Interval.vue

@@ -11,7 +11,7 @@
     >
       <input
         id="frequency-time-interval"
-        v-model="modelIntervalLocal"
+        v-model="modelFrequencyLocal.frg_interval"
         data-id="frequency-time-interval-input"
         type="text"
         @input="onInitTimeIntervalValidation"
@@ -31,6 +31,7 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import {
   defineIntervalSuffixLabelFunc,
   validateField,
@@ -39,7 +40,9 @@ import {
 const props = defineProps<{
   type: string
 }>()
-const modelIntervalLocal = defineModel<string>({ required: true })
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -51,8 +54,18 @@ const onInitTimeIntervalValidation = (): void => {
 const timeIntervalErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value) return ''
 
-  return validateField(localization.value, modelIntervalLocal.value)
+  return validateField(
+    localization.value,
+    modelFrequencyLocal.value.frg_interval
+  )
 })
+watch(
+  timeIntervalErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
 
 const intervalSuffixLabel = computed(() => {
   const lang = useLocalStorage('lang')
@@ -60,7 +73,7 @@ const intervalSuffixLabel = computed(() => {
   return defineIntervalSuffixLabelFunc(
     localization.value,
     props.type,
-    modelIntervalLocal.value,
+    modelFrequencyLocal.value.frg_interval,
     lang
   )
 })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.252",
+  "version": "1.4.254",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",