Skip to content

Commit

Permalink
Vue apps: fix el-button not rendering
Browse files Browse the repository at this point in the history
- use the el-button notation throughout the datasets app
- remove invalid type="button" attribute
- add strings to drupal fixtures so they don't throw in dev env
- build all apps
  • Loading branch information
mayakokits committed Feb 5, 2024
1 parent dd76c32 commit b316683
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 82 deletions.
5 changes: 5 additions & 0 deletions campaignion_email_to_target/datasets_app/drupal-fixture.js
@@ -1,6 +1,8 @@
// This module is used to provide the Drupal global in development and test mode.
// Functions taken from drupal.js.

import elementUiStrings from 'element-ui/lib/locale/lang/en'

const Drupal = {
settings: {
campaignion_email_to_target: {
Expand Down Expand Up @@ -55,6 +57,9 @@ const Drupal = {
},
datasetQuery: '',
organization: ''
},
campaignion_vue: {
element_ui_strings: elementUiStrings
}
},

Expand Down
2 changes: 1 addition & 1 deletion campaignion_email_to_target/datasets_app/src/App.vue
Expand Up @@ -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>

Expand Down
Expand Up @@ -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>

Expand Down
Expand Up @@ -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>

Expand Down
Expand Up @@ -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>
Expand Down
32 changes: 16 additions & 16 deletions campaignion_email_to_target/js/datasets_app/datasets_app.vue.min.js

Large diffs are not rendered by default.

This file was deleted.

6 changes: 5 additions & 1 deletion campaignion_email_to_target/messages_app/drupal-fixture.js
Expand Up @@ -3,12 +3,16 @@

import exampleData from '/test/unit/fixtures/example-data'
import initialData from '/test/unit/fixtures/initial-data'
import elementUiStrings from 'element-ui/lib/locale/lang/en'

const Drupal = {
settings: {
campaignion_email_to_target: (process.env.NODE_ENV === 'development')
? exampleData
: initialData
: initialData,
campaignion_vue: {
element_ui_strings: elementUiStrings
}
},

locale: {},
Expand Down
28 changes: 14 additions & 14 deletions campaignion_wizard/js/redirects_app/redirects_app.vue.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions campaignion_wizard/redirects_app/drupal-fixture.js
Expand Up @@ -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
}
},

Expand Down

0 comments on commit b316683

Please sign in to comment.