Merge pull request #352 from citation-file-format/347-version-specific-validation

implement validation for date-released field

Author: fdiblen

src/components/ScreenVersionSpecific.vue

@@ -19,8 +19,6 @@
                 outlined
                 standout
                 v-bind:model-value="commit"
-                v-bind:error="FIXME.hasError"
-                v-bind:error-message="FIXME.messages.join(', ')"
                 v-on:update:modelValue="setCommit"
             />
 
@@ -33,8 +31,6 @@
                 outlined
                 standout
                 v-bind:model-value="version"
-                v-bind:error="FIXME.hasError"
-                v-bind:error-message="FIXME.messages.join(', ')"
                 v-on:update:modelValue="setVersion"
             />
 
@@ -49,8 +45,8 @@
                 style="width: 33.33%"
                 today-btn="true"
                 v-bind:model-value="dateReleased"
-                v-bind:error="FIXME.hasError"
-                v-bind:error-message="FIXME.messages.join(', ')"
+                v-bind:error="dateError.hasError"
+                v-bind:error-message="dateError.messages.join(', ')"
                 v-on:update:modelValue="setDateReleased"
             >
                 <template #append>
@@ -92,8 +88,9 @@
 <script lang="ts">
 import Stepper from 'components/Stepper.vue'
 import StepperActions from 'components/StepperActions.vue'
-import { defineComponent } from 'vue'
+import { computed, defineComponent } from 'vue'
 import { useCff } from '../store/cff'
+import { getMyErrors } from 'src/store/validator'
 
 export default defineComponent({
     name: 'ScreenVersionSpecific',
@@ -118,7 +115,7 @@ export default defineComponent({
             setCommit,
             setDateReleased,
             setVersion,
-            FIXME: { hasError: false, messages: [] }
+            dateError: computed(() => getMyErrors('/date-released'))
         }
     }
 })

src/components/Stepper.vue

@@ -28,10 +28,10 @@
             icon=""
             name="authors"
             title="Authors"
-            v-bind:order="1"
             v-bind:active-icon="isValidScreenAuthors.hasError ? 'warning' : 'edit'"
             v-bind:color="isValidScreenAuthors.hasError ? 'negative' : 'primary'"
             v-bind:error="isValidScreenAuthors.hasError"
+            v-bind:order="1"
             v-on:click="setStepName('authors')"
         />
 
@@ -97,15 +97,18 @@
         />
 
         <q-step
-            color="primary"
+            error-color="negative"
+            error-icon="warning"
             icon=""
             name="version-specific"
             title="Version specific"
+            v-bind:active-icon="isValidScreenVersionSpecific.hasError ? 'warning' : 'edit'"
+            v-bind:color="isValidScreenVersionSpecific.hasError ? 'negative' : 'primary'"
+            v-bind:error="isValidScreenVersionSpecific.hasError"
             v-bind:order="8"
             v-if="showAdvanced"
             v-on:click="setStepName('version-specific')"
         />
-
         <q-step
             active-icon="navigate_next"
             color="primary"
@@ -132,8 +135,9 @@ export default {
         const { showAdvanced, stepName, setStepName } = useApp()
         const { authors } = useCff()
         return {
-            isValidScreenStart: computed(() => getMyErrors('', ['message', 'title'])),
             isValidScreenAuthors: computed(() => authorsErrors(authors.value)),
+            isValidScreenStart: computed(() => getMyErrors('', ['message', 'title'])),
+            isValidScreenVersionSpecific: computed(() => getMyErrors('/date-released')),
             setStepName,
             showAdvanced,
             stepName

src/store/validator.ts

@@ -22,7 +22,6 @@ export function getMyErrors (myPath: string, fieldNames?: string[]):messageError
     }
 
     const checkForObjectProblems = (item: ErrorObject) => {
-        // const keywords = ['required', 'additionalProperties']
         if (fieldNames !== undefined && item.keyword === 'required') {
             return fieldNames.includes(item.params.missingProperty as string)
         }