High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Split 'overwrite' on import UI into 2 separate options (userinfo and subscription status). Closes #2496
Kailash Nadha65608c113fe
diff --git a/frontend/src/views/Import.vue b/frontend/src/views/Import.vueindex b9ed1263..d21f9ea1 100644--- a/frontend/src/views/Import.vue+++ b/frontend/src/views/Import.vue@@ -42,17 +42,29 @@</div><div class="column">- <b-field v-if="form.mode === 'subscribe'" :label="$t('import.overwrite')"- :message="$t('import.overwriteHelp')">+ <b-field :label="$t('import.csvDelim')" :message="$t('import.csvDelimHelp')" class="delimiter">+ <b-input v-model="form.delim" name="delim" placeholder="," maxlength="1" required />+ </b-field>+ </div>+ </div>++ <div class="columns">+ <div class="column is-4">+ <b-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteUserInfo')"+ :message="$t('import.overwriteUserInfoHelp')"><div>- <b-switch v-model="form.overwrite" name="overwrite" data-cy="overwrite" />+ <b-switch v-model="form.overwriteUserInfo" name="overwriteUserInfo" data-cy="overwrite-user-info" /></div></b-field></div><div class="column">- <b-field :label="$t('import.csvDelim')" :message="$t('import.csvDelimHelp')" class="delimiter">- <b-input v-model="form.delim" name="delim" placeholder="," maxlength="1" required />+ <b-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteSubStatus')"+ :message="$t('import.overwriteSubStatusHelp')">+ <div>+ <b-switch v-model="form.overwriteSubStatus" name="overwriteSubStatus"+ data-cy="overwrite-sub-status" />+ </div></b-field></div></div>@@ -156,7 +168,8 @@ export default Vue.extend({subStatus: 'unconfirmed',delim: ',',lists: [],- overwrite: false,+ overwriteUserInfo: false,+ overwriteSubStatus: false,file: null,example: '',},@@ -286,7 +299,8 @@ export default Vue.extend({resetForm() {this.form.mode = 'subscribe';- this.form.overwrite = false;+ this.form.overwriteUserInfo = false;+ this.form.overwriteSubStatus = false;this.form.file = null;this.form.lists = [];this.form.subStatus = 'unconfirmed';@@ -294,7 +308,7 @@ export default Vue.extend({},onUpload() {- if (this.form.mode === 'subscribe' && this.form.overwrite) {+ if (this.form.mode === 'subscribe' && this.form.overwriteSubStatus) {this.$utils.confirm(this.$t('import.subscribeWarning'), this.onSubmit, this.resetForm);return;}@@ -312,7 +326,8 @@ export default Vue.extend({subscription_status: this.form.subStatus,delim: this.form.delim,lists: this.form.lists.map((l) => l.id),- overwrite: this.form.overwrite,+ overwrite_userinfo: this.form.overwriteUserInfo,+ overwrite_subscription_status: this.form.overwriteSubStatus,}));params.set('file', this.form.file);diff --git a/i18n/en.json b/i18n/en.jsonindex c6ed4aef..23f1d285 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -273,8 +273,10 @@"import.invalidSubStatus": "Invalid subscription status","import.listSubHelp": "Lists to subscribe to.","import.mode": "Mode",- "import.overwrite": "Overwrite?",- "import.overwriteHelp": "Overwrite name, attribs, subscription status of existing subscribers?",+ "import.overwriteUserInfo": "Overwrite user info",+ "import.overwriteUserInfoHelp": "Overwrite name and attributes of existing subscribers",+ "import.overwriteSubStatus": "Overwrite subscription status",+ "import.overwriteSubStatusHelp": "Overwrite status of existing list subscriptions","import.recordsCount": "{num} / {total} records","import.stopImport": "Stop import","import.subscribe": "Subscribe",diff --git a/internal/subimporter/importer.go b/internal/subimporter/importer.goindex 24ca48a3..f318bc39 100644--- a/internal/subimporter/importer.go+++ b/internal/subimporter/importer.go@@ -88,12 +88,14 @@ type Session struct {// SessionOpt represents the options for an importer session.type SessionOpt struct {- Filename string `json:"filename"`- Mode string `json:"mode"`- SubStatus string `json:"subscription_status"`- Overwrite bool `json:"overwrite"`- Delim string `json:"delim"`- ListIDs []int `json:"lists"`+ Filename string `json:"filename"`+ Mode string `json:"mode"`+ SubStatus string `json:"subscription_status"`+ Overwrite bool `json:"overwrite"`+ OverwriteUserInfo bool `json:"overwrite_userinfo"`+ OverwriteSubStatus bool `json:"overwrite_subscription_status"`+ Delim string `json:"delim"`+ ListIDs []int `json:"lists"`}// Status represents statistics from an ongoing import session.@@ -167,6 +169,13 @@ func (im *Importer) NewSession(opt SessionOpt) (*Session, error) {return nil, errors.New("an import is already running")}+ // For API backwards compatibility, if the old 'overwrite'+ // field is set, set both overwrite fields to true.+ if opt.Overwrite {+ opt.OverwriteUserInfo = true+ opt.OverwriteSubStatus = true+ }+im.Lock()im.status = Status{Status: StatusImporting,Name: opt.Filename,@@ -297,7 +306,7 @@ func (s *Session) Start() {}if s.opt.Mode == ModeSubscribe {- _, err = stmt.Exec(uu, sub.Email, sub.Name, sub.Attribs, pq.Array(listIDs), s.opt.SubStatus, s.opt.Overwrite)+ _, err = stmt.Exec(uu, sub.Email, sub.Name, sub.Attribs, pq.Array(listIDs), s.opt.SubStatus, s.opt.OverwriteUserInfo, s.opt.OverwriteSubStatus)} else if s.opt.Mode == ModeBlocklist {_, err = stmt.Exec(uu, sub.Email, sub.Name, sub.Attribs)}diff --git a/queries/subscribers.sql b/queries/subscribers.sqlindex 6524e529..a5aec3c1 100644--- a/queries/subscribers.sql+++ b/queries/subscribers.sql@@ -113,7 +113,7 @@ SELECT id from sub;-- name: upsert-subscriber-- Upserts a subscriber where existing subscribers get their names and attributes overwritten.--- If $7 = true, update values, otherwise, skip.+-- If $7 = true, update name/attribs. If $8 = true, update subscription status.WITH sub AS (INSERT INTO subscribers as s (uuid, email, name, attribs, status)VALUES($1, $2, $3, $4, 'enabled')@@ -130,7 +130,7 @@ subs AS (FROM sub, UNNEST($5::INT[]) AS listIDON CONFLICT (subscriber_id, list_id) DO UPDATESET updated_at = NOW(),- status = CASE WHEN $7 THEN EXCLUDED.status ELSE subscriber_lists.status END+ status = CASE WHEN $8 THEN EXCLUDED.status ELSE subscriber_lists.status END)SELECT uuid, id from sub;