Vue apps: fix el-button not rendering

- use the el-button notation throughout the datasets app - remove invalid type="button" attribute - add strings to drupal fixture so it doesn't throw in dev env - build all apps
moreonion · Feb 5, 2024 · 0bd265d · 0bd265d
1 parent dd76c32
commit 0bd265d
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 81 deletions.
diff --git a/campaignion_email_to_target/datasets_app/src/App.vue b/campaignion_email_to_target/datasets_app/src/App.vue
@@ -3,7 +3,7 @@
     <div v-if="livingInWizard" v-loading="showSpinner && !showSelectDialog && !showEditDialog" class="dsa-wizard-step">
       <div class="ae-legend">{{ text('Your targets') }}</div>
       <div class="dsa-intro-text" v-html="introText"></div>
-      <ElButton type="button" @click="openDialog" :disabled="apiError || showSpinner" class="dsa-select-or-edit-dataset">{{ buttonText }}</ElButton>
+      <el-button @click="openDialog" :disabled="apiError || showSpinner" class="dsa-select-or-edit-dataset">{{ buttonText }}</el-button>
     </div>
     <div v-if="apiError" class="dsa-has-error">{{ text('api error') }}</div>
 

diff --git a/campaignion_email_to_target/datasets_app/src/components/EditDatasetDialog.vue b/campaignion_email_to_target/datasets_app/src/components/EditDatasetDialog.vue
@@ -79,7 +79,7 @@
             <span class="VueTables__heading"></span>
           </template>
         </v-client-table>
-        <el-button type="button" @click="addContact" class="dsa-add-contact">{{ text('add row') }}</el-button>
+        <el-button @click="addContact" class="dsa-add-contact">{{ text('add row') }}</el-button>
       </div>
     </div>
 

diff --git a/campaignion_email_to_target/datasets_app/src/components/EditValuePopup.vue b/campaignion_email_to_target/datasets_app/src/components/EditValuePopup.vue
@@ -10,8 +10,8 @@
       {{ label }}
     </div>
     <input type="text" v-model="value" @keydown.enter.stop="save" @keydown.esc.stop="cancel" ref="input" class="dsa-edit-value-input field-input"/>
-    <el-button type="button" @click="save" class="dsa-edit-value-save">{{ text('save') }}</el-button>
-    <el-button type="button" @click="cancel" class="dsa-edit-value-cancel">{{ text('cancel') }}</el-button>
+    <el-button @click="save" class="dsa-edit-value-save">{{ text('save') }}</el-button>
+    <el-button @click="cancel" class="dsa-edit-value-cancel">{{ text('cancel') }}</el-button>
   </div>
 </template>
 

diff --git a/campaignion_email_to_target/datasets_app/src/components/SelectDatasetDialog.vue b/campaignion_email_to_target/datasets_app/src/components/SelectDatasetDialog.vue
@@ -9,7 +9,7 @@
 
     <template slot="title">
       <span class="el-dialog__title">{{ text('Choose your dataset') }}</span>
-      <el-button type="button" @click="editNewDataset" class="dsa-add-new-dataset">{{ text('Add new dataset') }}</el-button>
+      <el-button @click="editNewDataset" class="dsa-add-new-dataset">{{ text('Add new dataset') }}</el-button>
     </template>
 
     <p class="dsa-hint">{{ text('hint') }}</p>

diff --git a/campaignion_email_to_target/js/datasets_app/datasets_app.vue.min.js b/campaignion_email_to_target/js/datasets_app/datasets_app.vue.min.js
diff --git a/campaignion_email_to_target/js/messages_app/e2t_messages_app.vue.min.js b/campaignion_email_to_target/js/messages_app/e2t_messages_app.vue.min.js
diff --git a/campaignion_wizard/js/redirects_app/redirects_app.vue.min.js b/campaignion_wizard/js/redirects_app/redirects_app.vue.min.js
diff --git a/campaignion_wizard/redirects_app/drupal-fixture.js b/campaignion_wizard/redirects_app/drupal-fixture.js
@@ -2,11 +2,15 @@
 // Functions taken from drupal.js.
 
 import exampleData from './test/fixtures/example-data'
+import elementUiStrings from 'element-ui/lib/locale/lang/en'
 
 const Drupal = {
   settings: {
     campaignion_wizard: {
       'personalized-redirects-widget--5': exampleData
+    },
+    campaignion_vue: {
+      element_ui_strings: elementUiStrings
     }
   },