Skip to content

Commit 6d0c77c

Browse files
jspaaksjspaaks
committed
updated src/ to deal with removing some files specfic to old error infrastructure
1 parent 9af99b7 commit 6d0c77c

14 files changed

Lines changed: 88 additions & 154 deletions

‎src/components/AuthorCardEditing.vue‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
standout
2121
title="The person's given names."
2222
v-bind:model-value="givenNames"
23-
v-bind:error="givenNamesError.hasError"
24-
v-bind:error-message="givenNamesError.messages.join(', ')"
23+
v-bind:error="false"
24+
v-bind:error-message="''"
2525
v-on:update:modelValue="$emit('update', 'givenNames', $event)"
2626
ref="givenNamesRef"
2727
/>
@@ -41,8 +41,8 @@
4141
standout
4242
title="The person's name particle, e.g., a nobiliary particle or a [preposition] meaning 'of' or 'from' (for example 'von' in 'Alexander von Humboldt')."
4343
v-bind:model-value="nameParticle"
44-
v-bind:error="nameParticleError.hasError"
45-
v-bind:error-message="nameParticleError.messages.join(', ')"
44+
v-bind:error="false"
45+
v-bind:error-message="''"
4646
v-on:update:modelValue="$emit('update', 'nameParticle', $event)"
4747
>
4848
<SchemaGuideLink
@@ -59,8 +59,8 @@
5959
standout
6060
title="The person's family names."
6161
v-bind:model-value="familyNames"
62-
v-bind:error="familyNamesError.hasError"
63-
v-bind:error-message="familyNamesError.messages.join(', ')"
62+
v-bind:error="false"
63+
v-bind:error-message="''"
6464
v-on:update:modelValue="$emit('update', 'familyNames', $event)"
6565
>
6666
<SchemaGuideLink
@@ -77,8 +77,8 @@
7777
standout
7878
title="The person's name suffix, e.g. 'Jr.' for Sammy Davis Jr. or 'III' for Frank Edwin Wright III."
7979
v-bind:model-value="nameSuffix"
80-
v-bind:error="nameSuffixError.hasError"
81-
v-bind:error-message="nameSuffixError.messages.join(', ')"
80+
v-bind:error="false"
81+
v-bind:error-message="''"
8282
v-on:update:modelValue="$emit('update', 'nameSuffix', $event)"
8383
>
8484
<SchemaGuideLink
@@ -104,8 +104,8 @@
104104
title="The person's email address."
105105
type="email"
106106
v-bind:model-value="email"
107-
v-bind:error="emailError.hasError"
108-
v-bind:error-message="emailError.messages.join(', ')"
107+
v-bind:error="false"
108+
v-bind:error-message="''"
109109
v-on:update:modelValue="$emit('update', 'email', $event)"
110110
/>
111111
</div>
@@ -129,8 +129,8 @@
129129
standout
130130
title="The person's affiliation."
131131
v-bind:model-value="affiliation"
132-
v-bind:error="affiliationError.hasError"
133-
v-bind:error-message="affiliationError.messages.join(', ')"
132+
v-bind:error="false"
133+
v-bind:error-message="''"
134134
v-on:update:modelValue="$emit('update', 'affiliation', $event)"
135135
/>
136136
<q-input
@@ -143,19 +143,19 @@
143143
standout
144144
title="The person's ORCID identifier."
145145
v-bind:model-value="orcid"
146-
v-bind:error="orcidError.hasError"
147-
v-bind:error-message="orcidError.messages.join(', ')"
146+
v-bind:error="false"
147+
v-bind:error-message="''"
148148
v-on:update:modelValue="$emit('update', 'orcid', $event)"
149149
/>
150150
</div>
151151

152152
<q-banner
153-
v-if="authorErrors.messages.length > 0"
153+
v-if="false"
154154
class="bg-warning text-negative"
155155
>
156156
<div
157157
v-bind:key="authindex"
158-
v-for="(screenMessage, authindex) in authorErrors.messages"
158+
v-for="(screenMessage, authindex) in []"
159159
>
160160
{{ screenMessage }}
161161
</div>
@@ -197,9 +197,7 @@
197197

198198
<script lang="ts">
199199
/* eslint-disable @typescript-eslint/restrict-template-expressions */
200-
import { computed, defineComponent, onMounted, ref } from 'vue'
201-
import { getMyErrors } from 'src/store/validator'
202-
import { authorErrors } from 'src/author-errors'
200+
import { defineComponent, onMounted, ref } from 'vue'
203201
import SchemaGuideLink from './SchemaGuideLink.vue'
204202
205203
export default defineComponent({
@@ -248,15 +246,7 @@ export default defineComponent({
248246
givenNamesRef.value?.focus()
249247
})
250248
return {
251-
givenNamesRef,
252-
givenNamesError: computed(() => getMyErrors(`/authors/${props.index}/given-names`)),
253-
nameParticleError: computed(() => getMyErrors(`/authors/${props.index}/name-particle`)),
254-
familyNamesError: computed(() => getMyErrors(`/authors/${props.index}/family-names`)),
255-
nameSuffixError: computed(() => getMyErrors(`/authors/${props.index}/name-suffix`)),
256-
emailError: computed(() => getMyErrors(`/authors/${props.index}/email`)),
257-
affiliationError: computed(() => getMyErrors(`/authors/${props.index}/affiliation`)),
258-
orcidError: computed(() => getMyErrors(`/authors/${props.index}/orcid`)),
259-
authorErrors: computed(() => authorErrors(props.index))
249+
givenNamesRef
260250
}
261251
},
262252
emits: ['closePressed', 'removePressed', 'update', 'moveUp', 'moveDown'],

‎src/components/AuthorCardViewing.vue‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
</template>
4444

4545
<script lang="ts">
46-
import { computed, defineComponent, PropType } from 'vue'
46+
import { defineComponent, PropType } from 'vue'
4747
import { AuthorType } from 'src/types'
48-
import { authorErrors } from 'src/author-errors'
4948
5049
export default defineComponent({
5150
name: 'AuthorCardViewing',
@@ -63,11 +62,6 @@ export default defineComponent({
6362
default: 0
6463
}
6564
},
66-
setup (props) {
67-
return {
68-
authorErrors: computed(() => authorErrors(props.index))
69-
}
70-
},
7165
emits: ['editPressed', 'moveDown', 'moveUp']
7266
})
7367
</script>

‎src/components/IdentifierCardEditing.vue‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<q-option-group
1010
inline
1111
type="radio"
12-
v-bind:error="typeError.hasError"
13-
v-bind:error-message="typeError.messages.join(', ')"
12+
v-bind:error="false"
13+
v-bind:error-message="''"
1414
v-bind:model-value="type"
1515
v-bind:options="typeOptions"
1616
v-on:update:modelValue="$emit('updateType', 'type', $event)"
@@ -29,8 +29,8 @@
2929
outlined
3030
standout
3131
dense
32-
v-bind:error="valueError.hasError"
33-
v-bind:error-message="valueError.messages.join(', ')"
32+
v-bind:error="false"
33+
v-bind:error-message="''"
3434
v-bind:model-value="value"
3535
v-on:update:modelValue="$emit('updateValue', 'value', $event)"
3636
ref="valueRef"
@@ -49,8 +49,8 @@
4949
outlined
5050
standout
5151
dense
52-
v-bind:error="descriptionError.hasError"
53-
v-bind:error-message="descriptionError.messages.join(', ')"
52+
v-bind:error="false"
53+
v-bind:error-message="''"
5454
v-bind:model-value="description"
5555
v-on:update:modelValue="$emit('updateDescription', 'description', $event)"
5656
/>
@@ -93,8 +93,6 @@
9393
<script lang="ts">
9494
import { IdentifierTypeType } from '../types'
9595
import { computed, defineComponent, onMounted, PropType, ref } from 'vue'
96-
import { getMyErrors } from 'src/store/validator'
97-
import { identifierErrors } from 'src/identifier-errors'
9896
import SchemaGuideLink from 'src/components/SchemaGuideLink.vue'
9997
10098
export default defineComponent({
@@ -147,13 +145,7 @@ export default defineComponent({
147145
{ label: 'Other', value: 'other' }
148146
],
149147
label: computed(() => linkInfo[props.type].label),
150-
anchor: computed(() => linkInfo[props.type].anchor),
151-
typeError: computed(() => getMyErrors(`/identifiers/${props.index}/type`)),
152-
valueError: computed(() => getMyErrors(`/identifiers/${props.index}/value`)),
153-
descriptionError: computed(() =>
154-
getMyErrors(`/identifiers/${props.index}/description`)
155-
),
156-
identifierErrors: computed(() => identifierErrors(props.index))
148+
anchor: computed(() => linkInfo[props.type].anchor)
157149
}
158150
},
159151
emits: [

‎src/components/IdentifierCardViewing.vue‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<q-card
33
bordered
4-
v-bind:class="['bg-formcard', identifierErrors.hasError ? 'red-border' : '']"
4+
v-bind:class="['bg-formcard', false ? 'red-border' : '']"
55
flat
66
style="display: flex; flex-direction: row"
77
>
@@ -42,9 +42,8 @@
4242
</template>
4343

4444
<script lang="ts">
45-
import { computed, defineComponent, PropType } from 'vue'
45+
import { defineComponent, PropType } from 'vue'
4646
import { IdentifierType } from 'src/types'
47-
import { identifierErrors } from 'src/identifier-errors'
4847
4948
export default defineComponent({
5049
name: 'IdentifierCardViewing',
@@ -62,11 +61,6 @@ export default defineComponent({
6261
default: 0
6362
}
6463
},
65-
setup (props) {
66-
return {
67-
identifierErrors: computed(() => identifierErrors(props.index))
68-
}
69-
},
7064
emits: ['editPressed', 'moveDown', 'moveUp']
7165
})
7266
</script>

‎src/components/Keyword.vue‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
outlined
88
placeholder="Type a keyword"
99
v-bind:model-value="keyword"
10-
v-bind:error="keywordError.hasError"
11-
v-bind:error-message="keywordError.messages.join(', ')"
10+
v-bind:error="false"
11+
v-bind:error-message="''"
1212
v-on:update:modelValue="$emit('update', $event)"
1313
ref="keywordRef"
1414
/>
@@ -42,8 +42,7 @@
4242
</template>
4343

4444
<script lang="ts">
45-
import { computed, defineComponent, onMounted, ref } from 'vue'
46-
import { getMyErrors } from 'src/store/validator'
45+
import { defineComponent, onMounted, ref } from 'vue'
4746
4847
export default defineComponent({
4948
name: 'KeywordCard',
@@ -61,14 +60,13 @@ export default defineComponent({
6160
default: 0
6261
}
6362
},
64-
setup (props) {
63+
setup () {
6564
const keywordRef = ref<HTMLElement | null>(null)
6665
onMounted(() => {
6766
keywordRef.value?.focus()
6867
})
6968
return {
70-
keywordRef,
71-
keywordError: computed(() => getMyErrors(`/keywords/${props.index}`))
69+
keywordRef
7270
}
7371
},
7472
emits: ['moveDown', 'moveUp', 'removePressed', 'update']

‎src/components/Preview.vue‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,28 @@
3030
</q-btn>
3131
</div>
3232
<textarea
33-
v-bind:class="['cffstr', isValidCFF ? '' : 'error']"
33+
v-bind:class="['cffstr', true ? '' : 'error']"
3434
readonly="true"
3535
v-bind:value="cffstr"
3636
wrap="hard"
3737
/>
3838
<div class="validation-msg">
39-
<p v-bind:class="isValidCFF ? '' : 'invalid'">
40-
Your CITATION.cff is {{ isValidCFF ? "valid" : "not valid" }}
39+
<p v-bind:class="true ? '' : 'invalid'">
40+
Your CITATION.cff is {{ true ? "valid" : "not valid" }}
4141
</p>
4242
</div>
4343
</template>
4444

4545
<script lang="ts">
46-
import { defineComponent, ref, computed } from 'vue'
46+
import { defineComponent, ref } from 'vue'
4747
import { useCffstr } from 'src/store/cffstr'
48-
import { useErrors } from 'src/store/errors'
4948
5049
export default defineComponent({
5150
name: 'Preview',
5251
components: {
5352
},
5453
setup () {
5554
const { cffstr } = useCffstr()
56-
const { errors } = useErrors()
5755
const showTooltip = ref(false)
5856
5957
const copyToClipboard = async () => {
@@ -63,12 +61,9 @@ export default defineComponent({
6361
showTooltip.value = false
6462
}
6563
66-
const isValidCFF = computed(() => errors.value.length === 0)
67-
6864
return {
6965
cffstr,
7066
copyToClipboard,
71-
isValidCFF,
7267
showTooltip
7368
}
7469
}

‎src/components/ScreenAbstract.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import Stepper from 'components/Stepper.vue'
4242
import StepperActions from 'components/StepperActions.vue'
4343
import { defineComponent } from 'vue'
4444
import { useCff } from '../store/cff'
45+
4546
export default defineComponent({
4647
name: 'ScreenAbstract',
4748
components: {

‎src/components/ScreenAuthors.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
</q-btn>
5757

5858
<q-banner
59-
v-if="authorsErrors.messages.length > 0"
59+
v-if="false"
6060
class="bg-warning text-negative"
6161
>
6262
<div
6363
v-bind:key="index"
64-
v-for="(screenMessage, index) in authorsErrors.messages"
64+
v-for="(screenMessage, index) in []"
6565
>
6666
{{ screenMessage }}
6767
</div>
@@ -75,7 +75,7 @@
7575
</template>
7676

7777
<script lang="ts">
78-
import { computed, defineComponent, nextTick, ref } from 'vue'
78+
import { defineComponent, nextTick, ref } from 'vue'
7979
import SchemaGuideLink from 'components/SchemaGuideLink.vue'
8080
import Stepper from 'components/Stepper.vue'
8181
import StepperActions from 'components/StepperActions.vue'
@@ -85,7 +85,6 @@ import { AuthorType } from 'src/types'
8585
import { moveDown, moveUp } from '../updown'
8686
import { useCff } from 'src/store/cff'
8787
import { scrollToBottom } from '../scroll-to-bottom'
88-
import { authorsErrors } from 'src/authors-errors'
8988
9089
export default defineComponent({
9190
name: 'ScreenAuthors',
@@ -158,8 +157,7 @@ export default defineComponent({
158157
moveAuthorDown,
159158
moveAuthorUp,
160159
removeAuthor,
161-
setAuthorField,
162-
authorsErrors: computed(() => authorsErrors(authors.value))
160+
setAuthorField
163161
}
164162
}
165163
})

0 commit comments

Comments
 (0)