simplified use of custom matcher function for highlighting duplicate items in authors and in identifiers arrays

Author: jspaaks

src/components/AuthorCardViewing.vue

@@ -44,7 +44,7 @@
 
 <script lang="ts">
 import { PropType, computed, defineComponent, onUpdated } from 'vue'
-import { byError, duplicateAuthorMatcher, duplicateAuthorQueries, emailQueries, orcidQueries } from 'src/error-filtering'
+import { byError, duplicateAuthorQueries, duplicateMatcher, emailQueries, orcidQueries } from 'src/error-filtering'
 import { AuthorType } from 'src/types'
 import { useStepperErrors } from 'src/store/stepper-errors'
 import { useValidation } from 'src/store/validation'
@@ -83,7 +83,8 @@ export default defineComponent({
         })
         const duplicateErrors = computed(() => {
             return duplicateAuthorQueries
-                .filter(byError(errors.value, duplicateAuthorMatcher(props.index)))
+                .filter(byError(errors.value))
+                .filter(byError(errors.value, duplicateMatcher(props.index)))
                 .map(query => query.replace.message)
         })
         const authorErrors = computed(() => [...emailErrors.value, ...orcidErrors.value, ...duplicateErrors.value])

src/components/IdentifierCardViewing.vue

@@ -43,7 +43,7 @@
 
 <script lang="ts">
 import { PropType, computed, defineComponent } from 'vue'
-import { byError, duplicateIdentifierMatcher, duplicateIdentifierQueries, identifierValueQueries } from 'src/error-filtering'
+import { byError, duplicateIdentifierQueries, duplicateMatcher, identifierValueQueries } from 'src/error-filtering'
 import { IdentifierType } from 'src/types'
 import { useValidation } from 'src/store/validation'
 
@@ -72,7 +72,8 @@ export default defineComponent({
         })
         const duplicateErrors = computed(() => {
             return duplicateIdentifierQueries
-                .filter(byError(errors.value, duplicateIdentifierMatcher(props.index)))
+                .filter(byError(errors.value))
+                .filter(byError(errors.value, duplicateMatcher(props.index)))
                 .map(query => query.replace.message)
         })
         const identifierErrors = computed(() => [...identifierValueErrors.value, ...duplicateErrors.value])

src/components/Keyword.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script lang="ts">
-import { byError, duplicateKeywordMatcher, duplicateKeywordQueries, keywordQueries } from 'src/error-filtering'
+import { byError, duplicateKeywordQueries, duplicateMatcher, keywordQueries } from 'src/error-filtering'
 import { computed, defineComponent } from 'vue'
 import { useValidation } from 'src/store/validation'
 
@@ -73,7 +73,8 @@ export default defineComponent({
         })
         const duplicateErrors = computed(() => {
             return duplicateKeywordQueries
-                .filter(byError(errors.value, duplicateKeywordMatcher(props.index)))
+                .filter(byError(errors.value))
+                .filter(byError(errors.value, duplicateMatcher(props.index)))
                 .map(query => query.replace.message)
         })
         const validationErrors = computed(() => [...keywordErrors.value, ...duplicateErrors.value])

src/error-filtering.ts

@@ -30,37 +30,7 @@ const defaultMatcher: Comparator = (error, query) => {
     return true
 }
 
-export const duplicateAuthorMatcher = (index: number) => {
-    return (error: ErrorObject) => {
-        if (error.instancePath !== '/authors') {
-            return false
-        }
-        if (error.schemaPath !== '#/properties/authors/uniqueItems') {
-            return false
-        }
-        if (error.params.i !== index && error.params.j !== index) {
-            return false
-        }
-        return true
-    }
-}
-
-export const duplicateIdentifierMatcher = (index: number) => {
-    return (error: ErrorObject) => {
-        if (error.instancePath !== '/identifiers') {
-            return false
-        }
-        if (error.schemaPath !== '#/properties/identifiers/uniqueItems') {
-            return false
-        }
-        if (error.params.i !== index && error.params.j !== index) {
-            return false
-        }
-        return true
-    }
-}
-
-export const duplicateKeywordMatcher = (index: number) => {
+export const duplicateMatcher = (index: number) => {
     return (error: ErrorObject) => error.params.i === index || error.params.j === index
 }
 
@@ -100,14 +70,20 @@ export const dateReleasedQueries: ErrorQuery[] = [{
 }]
 
 export const duplicateAuthorQueries: ErrorQuery[] = [{
-    find: {},
+    find: {
+        instancePath: '/authors',
+        schemaPath: '#/properties/authors/uniqueItems'
+    },
     replace: {
         message: 'This author is a duplicate.'
     }
 }]
 
 export const duplicateIdentifierQueries: ErrorQuery[] = [{
-    find: {},
+    find: {
+        instancePath: '/identifiers',
+        schemaPath: '#/properties/identifiers/uniqueItems'
+    },
     replace: {
         message: 'This identifier is a duplicate.'
     }