Add preconfirm optin option to bulk list management UI. Closes #935.

This commit is contained in:
Kailash Nadh 2022-11-01 21:39:02 +05:30
parent ef1f84ee7c
commit d8e3e25f06
3 changed files with 25 additions and 3 deletions

View file

@ -74,7 +74,7 @@ describe('Subscribers', () => {
it('Does bulk subscriber list add and remove', () => { it('Does bulk subscriber list add and remove', () => {
const cases = [ const cases = [
// radio: action to perform, rows: table rows to select and perform on: [expected statuses of those rows after thea action] // radio: action to perform, rows: table rows to select and perform on: [expected statuses of those rows after thea action]
{ radio: 'check-list-add', lists: [0, 1], rows: { 0: ['unconfirmed', 'unconfirmed'] } }, { radio: 'check-list-add', lists: [0, 1], rows: { 0: ['confirmed', 'confirmed'] } },
{ radio: 'check-list-unsubscribe', lists: [0, 1], rows: { 0: ['unsubscribed', 'unsubscribed'], 1: ['unsubscribed'] } }, { radio: 'check-list-unsubscribe', lists: [0, 1], rows: { 0: ['unsubscribed', 'unsubscribed'], 1: ['unsubscribed'] } },
{ radio: 'check-list-remove', lists: [0, 1], rows: { 1: [] } }, { radio: 'check-list-remove', lists: [0, 1], rows: { 1: [] } },
{ radio: 'check-list-add', lists: [0, 1], rows: { 0: ['unsubscribed', 'unsubscribed'], 1: ['unconfirmed', 'unconfirmed'] } }, { radio: 'check-list-add', lists: [0, 1], rows: { 0: ['unsubscribed', 'unsubscribed'], 1: ['unconfirmed', 'unconfirmed'] } },
@ -101,6 +101,11 @@ describe('Subscribers', () => {
// Select the radio option in the modal. // Select the radio option in the modal.
cy.get(`[data-cy=${c.radio}] .check`).click(); cy.get(`[data-cy=${c.radio}] .check`).click();
// For the first test, check the optin preconfirm box.
if (n === 0) {
cy.get('[data-cy=preconfirm]').click();
}
// Save. // Save.
cy.get('.modal button.is-primary').click(); cy.get('.modal button.is-primary').click();

View file

@ -32,6 +32,14 @@
:selected="form.lists" :selected="form.lists"
:all="lists.results" :all="lists.results"
></list-selector> ></list-selector>
<b-field :message="$t('subscribers.preconfirmHelp')">
<b-checkbox v-model="form.preconfirm" data-cy="preconfirm"
:native-value="true" :disabled="!hasOptinList">
{{ $t('subscribers.preconfirm') }}
</b-checkbox>
</b-field>
</section> </section>
<footer class="modal-card-foot has-text-right"> <footer class="modal-card-foot has-text-right">
@ -63,19 +71,24 @@ export default Vue.extend({
form: { form: {
action: 'add', action: 'add',
lists: [], lists: [],
preconfirm: false,
}, },
}; };
}, },
methods: { methods: {
onSubmit() { onSubmit() {
this.$emit('finished', this.form.action, this.form.lists); this.$emit('finished', this.form.action, this.form.preconfirm, this.form.lists);
this.$parent.close(); this.$parent.close();
}, },
}, },
computed: { computed: {
...mapState(['lists', 'loading']), ...mapState(['lists', 'loading']),
hasOptinList() {
return this.form.lists.some((l) => l.optin === 'double');
},
}, },
}); });
</script> </script>

View file

@ -450,7 +450,7 @@ export default Vue.extend({
this.$utils.confirm(this.$t('subscribers.confirmDelete', { num: this.numSelectedSubscribers }), fn); this.$utils.confirm(this.$t('subscribers.confirmDelete', { num: this.numSelectedSubscribers }), fn);
}, },
bulkChangeLists(action, lists) { bulkChangeLists(action, preconfirm, lists) {
const data = { const data = {
action, action,
query: this.fullQueryExp, query: this.fullQueryExp,
@ -458,6 +458,10 @@ export default Vue.extend({
target_list_ids: lists.map((l) => l.id), target_list_ids: lists.map((l) => l.id),
}; };
if (preconfirm) {
data.status = 'confirmed';
}
let fn = null; let fn = null;
if (!this.bulk.all && this.bulk.checked.length > 0) { if (!this.bulk.all && this.bulk.checked.length > 0) {
// If 'all' is not selected, perform by IDs. // If 'all' is not selected, perform by IDs.