From 798e923afee24d7a85eefeac4abe80c3801b5fd9 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 4 Apr 2020 19:47:59 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                |  2 ++
 ayanova/src/views/ay-about.vue          |  2 +-
 ayanova/src/views/ay-data-list-view.vue |  8 +++++---
 ayanova/src/views/widget.vue            | 22 +++++++++++-----------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index ad9d8fa4..f190d91e 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -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
 		- 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:	
 	- 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
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index ec695afc..e4afae79 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -110,7 +110,7 @@
           </div>
 
           <v-divider class="mt-6"></v-divider>
-          <v-subheader data-cy="aboutlicensedoptions">{{
+          <v-subheader :data-cy="!!$ay.dev ? 'aboutlicensedoptions' : false">{{
             $ay.t("LicensedOptions")
           }}</v-subheader>
 
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 6dd03976..fc514aa5 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -47,7 +47,7 @@
                     :error-messages="form().serverErrors(this, 'name')"
                     ref="name"
                     @input="fieldValueChanged('name')"
-                    data-cy="name"
+                    :data-cy="!!$ay.dev ? 'name' : false"
                   ></v-text-field>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
@@ -63,7 +63,7 @@
             </v-col>
             <template v-for="(item, index) in obj.editView">
               <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>
                     {{ item.title }}
                   </v-card-title>
@@ -86,7 +86,9 @@
                     <!-- RE-ORDER CONTROL -->
                     <div class="d-flex justify-space-between">
                       <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
                         ></v-btn
                       >
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 1bf795ea..7014379e 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -7,7 +7,7 @@
             <v-col cols="12" mt-1 mb-2>
               <v-alert
                 ref="errorbox"
-                data-cy="errorbox"
+                :data-cy="!!$ay.dev ? 'errorbox' : false"
                 v-show="formState.errorBoxMessage"
                 color="error"
                 icon="fa-exclamation-circle "
@@ -31,7 +31,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                data-cy="name"
+                :data-cy="!!$ay.dev ? 'name' : false"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
@@ -46,7 +46,7 @@
                 v-model="obj.serial"
                 :readonly="true"
                 :label="$ay.t('WidgetSerial')"
-                data-cy="serial"
+                :data-cy="!!$ay.dev ? 'serial' : false"
               ></v-text-field>
             </v-col>
             <v-col
@@ -64,7 +64,7 @@
                 :counter="10"
                 :label="$ay.t('WidgetCount')"
                 ref="count"
-                data-cy="count"
+                :data-cy="!!$ay.dev ? 'count' : false"
                 :rules="[form().integerValid(this, 'count')]"
                 :error-messages="form().serverErrors(this, 'count')"
                 @input="fieldValueChanged('count')"
@@ -84,7 +84,7 @@
                 :readonly="formState.readOnly"
                 :label="$ay.t('WidgetDollarAmount')"
                 ref="dollarAmount"
-                data-cy="dollarAmount"
+                :data-cy="!!$ay.dev ? 'dollarAmount' : false"
                 :rules="[
                   form().decimalValid(this, 'dollarAmount'),
                   form().required(this, 'dollarAmount')
@@ -130,7 +130,7 @@
                 :readonly="formState.readOnly"
                 :label="$ay.t('Active')"
                 ref="active"
-                data-cy="active"
+                :data-cy="!!$ay.dev ? 'active' : false"
                 :error-messages="form().serverErrors(this, 'active')"
                 @change="fieldValueChanged('active')"
               ></v-checkbox>
@@ -150,7 +150,7 @@
                 :readonly="formState.readOnly"
                 :label="$ay.t('User')"
                 ref="userid"
-                data-cy="userid"
+                :data-cy="!!$ay.dev ? 'userid' : false"
                 :error-messages="form().serverErrors(this, 'userid')"
                 @input="fieldValueChanged('userid')"
               ></gz-pick-list>
@@ -171,7 +171,7 @@
                 :readonly="formState.readOnly"
                 :label="$ay.t('UserType')"
                 ref="usertype"
-                data-cy="usertype"
+                :data-cy="!!$ay.dev ? 'usertype' : false"
                 :rules="[form().integerValid(this, 'usertype')]"
                 :error-messages="form().serverErrors(this, 'usertype')"
                 @input="fieldValueChanged('usertype')"
@@ -185,7 +185,7 @@
                 :label="$ay.t('WidgetNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
                 ref="notes"
-                data-cy="notes"
+                :data-cy="!!$ay.dev ? 'notes' : false"
                 @input="fieldValueChanged('notes')"
                 auto-grow
                 clearable
@@ -197,7 +197,7 @@
                 v-model="obj.tags"
                 :readonly="formState.readOnly"
                 ref="tags"
-                data-cy="tags"
+                :data-cy="!!$ay.dev ? 'tags' : false"
                 :error-messages="form().serverErrors(this, 'tags')"
                 @input="fieldValueChanged('tags')"
               ></gz-tag-picker>
@@ -210,7 +210,7 @@
                 :readOnly="formState.readOnly"
                 :parentVM="this"
                 ref="customFields"
-                data-cy="customFields"
+                :data-cy="!!$ay.dev ? 'customFields' : false"
                 :error-messages="form().serverErrors(this, 'customFields')"
                 @input="fieldValueChanged('customFields')"
               ></gz-custom-fields>