Skip to content

Commit 56fcf77

Browse files
Tim020claude
andcommitted
Simplify form validation mixin API
Remove validateNewState and validateEditState convenience wrappers. Components now call getValidationState directly with the form state key. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 2ac4af0 commit 56fcf77

File tree

8 files changed

+30
-52
lines changed

8 files changed

+30
-52
lines changed

client/src/mixins/formValidationMixin.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,6 @@ export default {
5050
return $dirty ? !$error : null;
5151
},
5252

53-
/**
54-
* Validate state for a field in newFormState.
55-
* Convenience method that wraps getValidationState.
56-
*
57-
* @param {string} fieldName - The field name to validate
58-
* @returns {boolean|null} - Bootstrap validation state
59-
*/
60-
validateNewState(fieldName) {
61-
return this.getValidationState('newFormState', fieldName);
62-
},
63-
64-
/**
65-
* Validate state for a field in editFormState.
66-
* Convenience method that wraps getValidationState.
67-
*
68-
* @param {string} fieldName - The field name to validate
69-
* @returns {boolean|null} - Bootstrap validation state
70-
*/
71-
validateEditState(fieldName) {
72-
return this.getValidationState('editFormState', fieldName);
73-
},
74-
7553
/**
7654
* Reset a form to its initial state and reset validation.
7755
*

client/src/views/show/config/ConfigCast.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
id="new-first-name-input"
7272
v-model="$v.newFormState.firstName.$model"
7373
name="new-first-name-input"
74-
:state="validateNewState('firstName')"
74+
:state="getValidationState('newFormState', 'firstName')"
7575
aria-describedby="new-first-name-feedback"
7676
/>
7777
<b-form-invalid-feedback id="new-first-name-feedback">
@@ -87,7 +87,7 @@
8787
id="new-last-name-input"
8888
v-model="$v.newFormState.lastName.$model"
8989
name="new-last-name-input"
90-
:state="validateNewState('lastName')"
90+
:state="getValidationState('newFormState', 'lastName')"
9191
aria-describedby="new-last-name-feedback"
9292
/>
9393
<b-form-invalid-feedback id="new-last-name-feedback">
@@ -115,7 +115,7 @@
115115
id="edit-first-name-input"
116116
v-model="$v.editFormState.firstName.$model"
117117
name="edit-first-name-input"
118-
:state="validateEditState('firstName')"
118+
:state="getValidationState('editFormState', 'firstName')"
119119
aria-describedby="edit-first-name-feedback"
120120
/>
121121
<b-form-invalid-feedback id="edit-first-name-feedback">
@@ -131,7 +131,7 @@
131131
id="edit-last-name-input"
132132
v-model="$v.editFormState.lastName.$model"
133133
name="edit-last-name-input"
134-
:state="validateEditState('lastName')"
134+
:state="getValidationState('editFormState', 'lastName')"
135135
aria-describedby="edit-last-name-feedback"
136136
/>
137137
<b-form-invalid-feedback id="edit-last-name-feedback">

client/src/views/show/config/ConfigCharacters.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
id="new-name-input"
7979
v-model="$v.newFormState.name.$model"
8080
name="new-name-input"
81-
:state="validateNewState('name')"
81+
:state="getValidationState('newFormState', 'name')"
8282
aria-describedby="new-name-feedback"
8383
/>
8484
<b-form-invalid-feedback id="new-name-feedback">
@@ -94,7 +94,7 @@
9494
id="new-description-input"
9595
v-model="$v.newFormState.description.$model"
9696
name="new-description-input"
97-
:state="validateNewState('description')"
97+
:state="getValidationState('newFormState', 'description')"
9898
/>
9999
</b-form-group>
100100
<b-form-group
@@ -106,7 +106,7 @@
106106
id="new-played-by-input"
107107
v-model="$v.newFormState.played_by.$model"
108108
:options="castOptions"
109-
:state="validateNewState('played_by')"
109+
:state="getValidationState('newFormState', 'played_by')"
110110
/>
111111
</b-form-group>
112112
</b-form>
@@ -126,7 +126,7 @@
126126
id="edit-name-input"
127127
v-model="$v.editFormState.name.$model"
128128
name="edit-name-input"
129-
:state="validateEditState('name')"
129+
:state="getValidationState('editFormState', 'name')"
130130
aria-describedby="edit-name-feedback"
131131
/>
132132
<b-form-invalid-feedback id="edit-name-feedback">
@@ -142,7 +142,7 @@
142142
id="edit-description-input"
143143
v-model="$v.editFormState.description.$model"
144144
name="edit-description-input"
145-
:state="validateEditState('description')"
145+
:state="getValidationState('editFormState', 'description')"
146146
/>
147147
</b-form-group>
148148
<b-form-group
@@ -154,7 +154,7 @@
154154
id="edit-played-by-input"
155155
v-model="$v.editFormState.played_by.$model"
156156
:options="castOptions"
157-
:state="validateEditState('played_by')"
157+
:state="getValidationState('editFormState', 'played_by')"
158158
/>
159159
</b-form-group>
160160
</b-form>

client/src/vue_components/show/config/acts_and_scenes/ConfigActs.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
id="new-name-input"
7373
v-model="$v.newFormState.name.$model"
7474
name="new-name-input"
75-
:state="validateNewState('name')"
75+
:state="getValidationState('newFormState', 'name')"
7676
aria-describedby="new-name-feedback"
7777
/>
7878
<b-form-invalid-feedback id="new-name-feedback">
@@ -119,7 +119,7 @@
119119
id="edit-name-input"
120120
v-model="$v.editFormState.name.$model"
121121
name="edit-name-input"
122-
:state="validateEditState('name')"
122+
:state="getValidationState('editFormState', 'name')"
123123
aria-describedby="edit-name-feedback"
124124
/>
125125
<b-form-invalid-feedback id="edit-name-feedback">
@@ -146,7 +146,7 @@
146146
id="edit-previous-act-input"
147147
v-model="$v.editFormState.previous_act_id.$model"
148148
:options="editFormActOptions"
149-
:state="validateEditState('previous_act_id')"
149+
:state="getValidationState('editFormState', 'previous_act_id')"
150150
aria-describedby="edit-previous-act-feedback"
151151
/>
152152
<b-form-invalid-feedback id="edit-previous-act-feedback">

client/src/vue_components/show/config/acts_and_scenes/ConfigScenes.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
id="new-name-input"
9797
v-model="$v.newFormState.name.$model"
9898
name="new-name-input"
99-
:state="validateNewState('name')"
99+
:state="getValidationState('newFormState', 'name')"
100100
aria-describedby="new-name-feedback"
101101
/>
102102
<b-form-invalid-feedback id="new-name-feedback">
@@ -108,7 +108,7 @@
108108
id="new-act-input"
109109
v-model="$v.newFormState.act_id.$model"
110110
:options="actOptions"
111-
:state="validateNewState('act_id')"
111+
:state="getValidationState('newFormState', 'act_id')"
112112
aria-describedby="new-act-feedback"
113113
/>
114114
<b-form-invalid-feedback id="new-act-feedback">
@@ -144,7 +144,7 @@
144144
id="edit-name-input"
145145
v-model="$v.editFormState.name.$model"
146146
name="edit-name-input"
147-
:state="validateEditState('name')"
147+
:state="getValidationState('editFormState', 'name')"
148148
aria-describedby="edit-name-feedback"
149149
/>
150150
<b-form-invalid-feedback id="edit-name-feedback">
@@ -156,7 +156,7 @@
156156
id="edit-act-input"
157157
v-model="$v.editFormState.act_id.$model"
158158
:options="actOptions"
159-
:state="validateEditState('act_id')"
159+
:state="getValidationState('editFormState', 'act_id')"
160160
aria-describedby="edit-act-feedback"
161161
@change="editActChanged"
162162
/>
@@ -173,7 +173,7 @@
173173
id="edit-previous-scene-input"
174174
v-model="$v.editFormState.previous_scene_id.$model"
175175
:options="editFormPrevScenes"
176-
:state="validateEditState('previous_scene_id')"
176+
:state="getValidationState('editFormState', 'previous_scene_id')"
177177
aria-describedby="edit-previous-scene-feedback"
178178
/>
179179
<b-form-invalid-feedback id="edit-previous-scene-feedback">

client/src/vue_components/show/config/characters/CharacterGroups.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
id="new-name-input"
6868
v-model="$v.newFormState.name.$model"
6969
name="new-name-input"
70-
:state="validateNewState('name')"
70+
:state="getValidationState('newFormState', 'name')"
7171
aria-describedby="new-name-feedback"
7272
/>
7373
<b-form-invalid-feedback id="new-name-feedback">
@@ -83,7 +83,7 @@
8383
id="new-description-input"
8484
v-model="$v.newFormState.description.$model"
8585
name="new-description-input"
86-
:state="validateNewState('description')"
86+
:state="getValidationState('newFormState', 'description')"
8787
/>
8888
</b-form-group>
8989
<b-form-group
@@ -99,7 +99,7 @@
9999
:options="CHARACTER_LIST"
100100
track-by="id"
101101
label="name"
102-
:state="validateNewState('characters')"
102+
:state="getValidationState('newFormState', 'characters')"
103103
@input="newSelectChanged"
104104
/>
105105
</b-form-group>
@@ -120,7 +120,7 @@
120120
id="edit-name-input"
121121
v-model="$v.editFormState.name.$model"
122122
name="edit-name-input"
123-
:state="validateEditState('name')"
123+
:state="getValidationState('editFormState', 'name')"
124124
aria-describedby="edit-name-feedback"
125125
/>
126126
<b-form-invalid-feedback id="edit-name-feedback">
@@ -136,7 +136,7 @@
136136
id="edit-description-input"
137137
v-model="$v.editFormState.description.$model"
138138
name="edit-description-input"
139-
:state="validateEditState('description')"
139+
:state="getValidationState('editFormState', 'description')"
140140
/>
141141
</b-form-group>
142142
<b-form-group
@@ -152,7 +152,7 @@
152152
:options="CHARACTER_LIST"
153153
track-by="id"
154154
label="name"
155-
:state="validateEditState('characters')"
155+
:state="getValidationState('editFormState', 'characters')"
156156
@input="editSelectChanged"
157157
/>
158158
</b-form-group>

client/src/vue_components/show/config/stage/CrewList.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
id="new-first-name-input"
4848
v-model="$v.newFormState.firstName.$model"
4949
name="new-first-name-input"
50-
:state="validateNewState('firstName')"
50+
:state="getValidationState('newFormState', 'firstName')"
5151
aria-describedby="new-first-name-feedback"
5252
/>
5353
<b-form-invalid-feedback id="new-first-name-feedback">
@@ -63,7 +63,7 @@
6363
id="new-last-name-input"
6464
v-model="$v.newFormState.lastName.$model"
6565
name="new-last-name-input"
66-
:state="validateNewState('lastName')"
66+
:state="getValidationState('newFormState', 'lastName')"
6767
aria-describedby="new-last-name-feedback"
6868
/>
6969
<b-form-invalid-feedback id="new-last-name-feedback">
@@ -90,7 +90,7 @@
9090
id="edit-first-name-input"
9191
v-model="$v.editFormState.firstName.$model"
9292
name="edit-first-name-input"
93-
:state="validateEditState('firstName')"
93+
:state="getValidationState('editFormState', 'firstName')"
9494
aria-describedby="edit-first-name-feedback"
9595
/>
9696
<b-form-invalid-feedback id="edit-first-name-feedback">
@@ -106,7 +106,7 @@
106106
id="edit-last-name-input"
107107
v-model="$v.editFormState.lastName.$model"
108108
name="edit-last-name-input"
109-
:state="validateEditState('lastName')"
109+
:state="getValidationState('editFormState', 'lastName')"
110110
aria-describedby="edit-last-name-feedback"
111111
/>
112112
<b-form-invalid-feedback id="edit-last-name-feedback">

client/src/vue_components/user/settings/CueColourPreferences.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
v-model="$v.newFormState.colour.$model"
6363
name="new-colour-input"
6464
type="color"
65-
:state="validateNewState('colour')"
65+
:state="getValidationState('newFormState', 'colour')"
6666
aria-describedby="new-colour-feedback"
6767
/>
6868
<b-form-invalid-feedback id="new-colour-feedback">
@@ -106,7 +106,7 @@
106106
v-model="$v.editFormState.colour.$model"
107107
name="edit-colour-input"
108108
type="color"
109-
:state="validateEditState('colour')"
109+
:state="getValidationState('editFormState', 'colour')"
110110
aria-describedby="edit-colour-feedback"
111111
/>
112112
<b-form-invalid-feedback id="edit-colour-feedback">

0 commit comments

Comments
 (0)