This commit is contained in:
2020-04-04 19:47:59 +00:00
parent 977b313fcf
commit 798e923afe
4 changed files with 19 additions and 15 deletions

View File

@@ -54,6 +54,8 @@ todo: change all testing data-cy attributes to conditional see ay-customize for
- Really need at this point a way to not have to add a fucking data property to *every* fucking form but rather a central location available to all vue from main or window - Really need at this point a way to not have to add a fucking data property to *every* fucking form but rather a central location available to all vue from main or window
- dig into that and see if it's possible again and how to do it because then all forms could be simplified a great deal. - dig into that and see if it's possible again and how to do it because then all forms could be simplified a great deal.
todo: is there a way to not have to specify "name" 5 times in a text field on widget form (for example), maybe can use this.ref??
todo: add tests for the following: todo: add tests for the following:
- customize form form - customize form form
- NOTE: All cypress tests run serially anyway, so it's perfectly ok to customize the widget form, go see if it worked, then come back and reverse it without affecting the other tests - NOTE: All cypress tests run serially anyway, so it's perfectly ok to customize the widget form, go see if it worked, then come back and reverse it without affecting the other tests

View File

@@ -110,7 +110,7 @@
</div> </div>
<v-divider class="mt-6"></v-divider> <v-divider class="mt-6"></v-divider>
<v-subheader data-cy="aboutlicensedoptions">{{ <v-subheader :data-cy="!!$ay.dev ? 'aboutlicensedoptions' : false">{{
$ay.t("LicensedOptions") $ay.t("LicensedOptions")
}}</v-subheader> }}</v-subheader>

View File

@@ -47,7 +47,7 @@
:error-messages="form().serverErrors(this, 'name')" :error-messages="form().serverErrors(this, 'name')"
ref="name" ref="name"
@input="fieldValueChanged('name')" @input="fieldValueChanged('name')"
data-cy="name" :data-cy="!!$ay.dev ? 'name' : false"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
@@ -63,7 +63,7 @@
</v-col> </v-col>
<template v-for="(item, index) in obj.editView"> <template v-for="(item, index) in obj.editView">
<v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2> <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
<v-card :data-cy="'columncard:' + item.key"> <v-card :data-cy="!!$ay.dev ? 'columncard:' + item.key : false">
<v-card-title> <v-card-title>
{{ item.title }} {{ item.title }}
</v-card-title> </v-card-title>
@@ -86,7 +86,9 @@
<!-- RE-ORDER CONTROL --> <!-- RE-ORDER CONTROL -->
<div class="d-flex justify-space-between"> <div class="d-flex justify-space-between">
<v-btn large icon @click="move('start', index)" <v-btn large icon @click="move('start', index)"
><v-icon large data-cy="movestart" ><v-icon
large
:data-cy="!!$ay.dev ? 'movestart' : false"
>fa-step-backward</v-icon >fa-step-backward</v-icon
></v-btn ></v-btn
> >

View File

@@ -7,7 +7,7 @@
<v-col cols="12" mt-1 mb-2> <v-col cols="12" mt-1 mb-2>
<v-alert <v-alert
ref="errorbox" ref="errorbox"
data-cy="errorbox" :data-cy="!!$ay.dev ? 'errorbox' : false"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
@@ -31,7 +31,7 @@
]" ]"
:error-messages="form().serverErrors(this, 'name')" :error-messages="form().serverErrors(this, 'name')"
ref="name" ref="name"
data-cy="name" :data-cy="!!$ay.dev ? 'name' : false"
@input="fieldValueChanged('name')" @input="fieldValueChanged('name')"
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -46,7 +46,7 @@
v-model="obj.serial" v-model="obj.serial"
:readonly="true" :readonly="true"
:label="$ay.t('WidgetSerial')" :label="$ay.t('WidgetSerial')"
data-cy="serial" :data-cy="!!$ay.dev ? 'serial' : false"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col <v-col
@@ -64,7 +64,7 @@
:counter="10" :counter="10"
:label="$ay.t('WidgetCount')" :label="$ay.t('WidgetCount')"
ref="count" ref="count"
data-cy="count" :data-cy="!!$ay.dev ? 'count' : false"
:rules="[form().integerValid(this, 'count')]" :rules="[form().integerValid(this, 'count')]"
:error-messages="form().serverErrors(this, 'count')" :error-messages="form().serverErrors(this, 'count')"
@input="fieldValueChanged('count')" @input="fieldValueChanged('count')"
@@ -84,7 +84,7 @@
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('WidgetDollarAmount')" :label="$ay.t('WidgetDollarAmount')"
ref="dollarAmount" ref="dollarAmount"
data-cy="dollarAmount" :data-cy="!!$ay.dev ? 'dollarAmount' : false"
:rules="[ :rules="[
form().decimalValid(this, 'dollarAmount'), form().decimalValid(this, 'dollarAmount'),
form().required(this, 'dollarAmount') form().required(this, 'dollarAmount')
@@ -130,7 +130,7 @@
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('Active')" :label="$ay.t('Active')"
ref="active" ref="active"
data-cy="active" :data-cy="!!$ay.dev ? 'active' : false"
:error-messages="form().serverErrors(this, 'active')" :error-messages="form().serverErrors(this, 'active')"
@change="fieldValueChanged('active')" @change="fieldValueChanged('active')"
></v-checkbox> ></v-checkbox>
@@ -150,7 +150,7 @@
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('User')" :label="$ay.t('User')"
ref="userid" ref="userid"
data-cy="userid" :data-cy="!!$ay.dev ? 'userid' : false"
:error-messages="form().serverErrors(this, 'userid')" :error-messages="form().serverErrors(this, 'userid')"
@input="fieldValueChanged('userid')" @input="fieldValueChanged('userid')"
></gz-pick-list> ></gz-pick-list>
@@ -171,7 +171,7 @@
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('UserType')" :label="$ay.t('UserType')"
ref="usertype" ref="usertype"
data-cy="usertype" :data-cy="!!$ay.dev ? 'usertype' : false"
:rules="[form().integerValid(this, 'usertype')]" :rules="[form().integerValid(this, 'usertype')]"
:error-messages="form().serverErrors(this, 'usertype')" :error-messages="form().serverErrors(this, 'usertype')"
@input="fieldValueChanged('usertype')" @input="fieldValueChanged('usertype')"
@@ -185,7 +185,7 @@
:label="$ay.t('WidgetNotes')" :label="$ay.t('WidgetNotes')"
:error-messages="form().serverErrors(this, 'notes')" :error-messages="form().serverErrors(this, 'notes')"
ref="notes" ref="notes"
data-cy="notes" :data-cy="!!$ay.dev ? 'notes' : false"
@input="fieldValueChanged('notes')" @input="fieldValueChanged('notes')"
auto-grow auto-grow
clearable clearable
@@ -197,7 +197,7 @@
v-model="obj.tags" v-model="obj.tags"
:readonly="formState.readOnly" :readonly="formState.readOnly"
ref="tags" ref="tags"
data-cy="tags" :data-cy="!!$ay.dev ? 'tags' : false"
:error-messages="form().serverErrors(this, 'tags')" :error-messages="form().serverErrors(this, 'tags')"
@input="fieldValueChanged('tags')" @input="fieldValueChanged('tags')"
></gz-tag-picker> ></gz-tag-picker>
@@ -210,7 +210,7 @@
:readOnly="formState.readOnly" :readOnly="formState.readOnly"
:parentVM="this" :parentVM="this"
ref="customFields" ref="customFields"
data-cy="customFields" :data-cy="!!$ay.dev ? 'customFields' : false"
:error-messages="form().serverErrors(this, 'customFields')" :error-messages="form().serverErrors(this, 'customFields')"
@input="fieldValueChanged('customFields')" @input="fieldValueChanged('customFields')"
></gz-custom-fields> ></gz-custom-fields>