From 3445e567ef4015722fae39ad3372bd2450550478 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Mon, 16 Nov 2020 23:04:35 +0100 Subject: [PATCH 01/17] style: basic row for email notification in account page Initial style for the row in a new Email Settings category, using harcoded data --- assets/stylesheets/common/account_forms.scss | 6 +++ .../dashboard/views/account/account-form.tpl | 47 ++++++++++++++++++- lib/assets/javascripts/locale/en.json | 9 ++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/assets/stylesheets/common/account_forms.scss b/assets/stylesheets/common/account_forms.scss index 96b423fad671..9f191b4bbbe2 100644 --- a/assets/stylesheets/common/account_forms.scss +++ b/assets/stylesheets/common/account_forms.scss @@ -215,6 +215,12 @@ $sLabel-width: 140px; align-items: flex-start; } +.FormAccount-rowData--listItemWithAction { + justify-content: space-between; + background: $cStructure-grayBkg; + padding: 8px 14px; +} + .FormAccount-planTag { padding: 5px 10px; border-radius: 4px; diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index a35e29e8dccf..2b774b96dc6d 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -1,4 +1,6 @@
+ +
@@ -12,6 +14,7 @@
+ <% if (!hidePasswordFields) { %>
@@ -41,6 +44,7 @@ <%= accountFormExtension %> +
-
+

<%= _t('account.views.form.mfa_description') %>

@@ -111,6 +115,46 @@ <% } %> <% } %> + +
+

<%= _t('account.views.form.email_section.title') %>

+
+ + + +
+

<%= _t('account.views.form.email_section.description') %>

+
+ + +
+ +
+ + +
+
+ + checked="checked"<% } %>> + +
+ +
+

+ <%= mfaEnabled ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %> +

+
+ +
+
+ +
+ + + <% if (services.length > 0) { %>

<%= _t('account.views.form.connect_external_datasources') %>

@@ -121,6 +165,7 @@
<% } %> +
<% if (cantBeDeletedReason) { %>

diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index 310886d0039a..cb976636990e 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -85,6 +85,15 @@ "email_google": "Your account is linked to your Google account.", "errors": { "change_email": "You can change the email if you set a password." + }, + "email_section": { + "title": "Email settings", + "description": "Choose what type of emails you'd like to receive.", + "notifications": { + "enabled": "On", + "disabled": "Off", + "do_subscriptions":"Emails from Data Observatory" + } } } } From 45db4340399eb37f8fcbf8c37a2aa185257928bf Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Mon, 16 Nov 2020 23:39:29 +0100 Subject: [PATCH 02/17] style: rows collection to manage email settings in account WIP, without having any real interaction with data or api --- .../views/account/account-form-view.js | 41 ++++++++++++++++++- .../dashboard/views/account/account-form.tpl | 23 ++++++----- lib/assets/javascripts/locale/en.json | 3 +- 3 files changed, 54 insertions(+), 13 deletions(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index a4987625ae80..03c5fd4cbf95 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -38,8 +38,9 @@ module.exports = CoreView.extend({ }, _initModels: function () { - this._errors = this.options.errors || {}; + this._errors = this.options.errors || {}; this.add_related_model(this._renderModel); + this._getNotifications(); }, _initBinds: function () { @@ -75,6 +76,7 @@ module.exports = CoreView.extend({ services: this._getField('services') || [], mfaEnabled: this._getField('mfa_configured'), licenseExpiration: this._formatLicenseExpiration(), + notifications: this._notifications || {}, view: this }; @@ -193,6 +195,43 @@ module.exports = CoreView.extend({ }; }, + _getNotifications: function () { + this._notifications = { + "do_subscriptions": false, + "real_do_subscriptions": true + }; + + // note: the api requires an object with key + + // real API request + // this._client.emailNotifications().get((errors, response, data) => { + // if (errors) { + // this.options.onError(data, response, errors); + // } else { + // this.options.onSuccess(data); // ? + // this._notifications = data; + // } + + // this.render(); + // }); + + + }, + + _updateNotifications: function (notifications) { + this._setLoading('Saving email notifications config'); + + const notificationsParams = { notifications: notifications }; + this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { + if (errors) { + this.options.onError(data, errors); + this.render(); + } else { + this._getNotifications(); + } + }); + }, + _getDestinationValues: function () { return { username: this._username(), diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index 2b774b96dc6d..595bb7a66ba4 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -125,34 +125,35 @@

<%= _t('account.views.form.email_section.description') %>

- - +
- -
+ + + <% Object.keys(notifications).forEach(function (notificationKey) { %> +
- - checked="checked"<% } %>> - + + checked="checked"<% } %>> +

- <%= mfaEnabled ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %> + <%= notifications[notificationKey] ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %>

-
+ <% }); %>
- + <% if (services.length > 0) { %> diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index cb976636990e..74cb1992ad2f 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -92,7 +92,8 @@ "notifications": { "enabled": "On", "disabled": "Off", - "do_subscriptions":"Emails from Data Observatory" + "do_subscriptions":"Emails from Data Observatory NEW", + "real_do_subscriptions":"REAL Emails from Data Observatory NEW" } } } From 5a7f4b17f427a20f685a63fdfc1f9f98fba8ddf1 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 00:03:18 +0100 Subject: [PATCH 03/17] chore: manage label behaviour for email settings togglers --- .../views/account/account-form-view.js | 27 ++++++++++++++++++- .../dashboard/views/account/account-form.tpl | 7 +++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index 03c5fd4cbf95..ee82a2488a5b 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -27,7 +27,8 @@ module.exports = CoreView.extend({ events: { 'click .js-save': '_onClickSave', 'submit form': '_onClickSave', - 'change .js-toggle-mfa': '_onToggleMfa' + 'change .js-toggle-mfa': '_onToggleMfa', + 'change .js-toggle-notification' : '_onToggleNotification' }, initialize: function (options) { @@ -163,6 +164,18 @@ module.exports = CoreView.extend({ this._mfaLabel().html(newLabel); }, + _onToggleNotification: function (event) { + this.killEvent(event); + + const id = event.target.id; + const newLabel = (this._notificationStatus(id) ? + _t('account.views.form.email_section.notifications.enabled') : + _t('account.views.form.email_section.notifications.disabled') + ); + + this._notificationLabel(id).html(newLabel); + }, + _updateUser: function (user, password) { this._setLoading('Saving changes'); @@ -264,6 +277,18 @@ module.exports = CoreView.extend({ return this.$('.js-mfa-label'); }, + _notificationStatus: function (id) { + const selector = `.js-toggle-notification-${id}`; + if (this.$(selector).length === 0) { + return false; + } + return this.$(selector)[0].checked; + }, + + _notificationLabel: function (id) { + return this.$(`.js-notification-label-${id}`); + }, + _formatLicenseExpiration: function () { if (!this._getField('license_expiration')) { return null; } diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index 595bb7a66ba4..125a7c862acd 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -139,12 +139,12 @@
- checked="checked"<% } %>> + checked="checked"<% } %>>
-

+

<%= notifications[notificationKey] ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %>

@@ -152,8 +152,7 @@
<% }); %> -
- +
<% if (services.length > 0) { %> From 34a8e19dd741093ad6e3f4dad14827cc2996f9f6 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 00:49:41 +0100 Subject: [PATCH 04/17] feat: connect save email settings to general save changes in account Connect current button to launch both updateUser + updateNotifications settings. No hitting the real API yet. --- .../views/account/account-form-view.js | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index ee82a2488a5b..8f3f1265032f 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -136,22 +136,30 @@ module.exports = CoreView.extend({ _onClickSave: function (event) { this.killEvent(event); + // updated user info const origin = this._getUserFields(); const destination = this._getDestinationValues(); const destinationKeys = _.keys(destination); const differenceKeys = _.filter(destinationKeys, key => origin[key] !== destination[key] ); - const user = _.pick(destination, differenceKeys); + // updated notifications info + const notifications = this._getNotificationValuesFromUI(); + if (!this._userModel.get('needs_password_confirmation')) { - return this._updateUser(user); + this._updateUser(user); + this._updateNotifications(notifications); + return; } PasswordValidatedForm.showPasswordModal({ modalService: this._modals, - onPasswordTyped: (password) => this._updateUser(user, password), + onPasswordTyped: (password) => { + this._updateUser(user, password); + this._updateNotifications(notifications); + }, updatePassword: destination.new_password !== '' && destination.confirm_password !== '' }); }, @@ -235,14 +243,16 @@ module.exports = CoreView.extend({ this._setLoading('Saving email notifications config'); const notificationsParams = { notifications: notifications }; - this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { - if (errors) { - this.options.onError(data, errors); - this.render(); - } else { - this._getNotifications(); - } - }); + console.log(notificationsParams); + // real API request + // this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { + // if (errors) { + // this.options.onError(data, errors); + // this.render(); + // } else { + // this._getNotifications(); + // } + // }); }, _getDestinationValues: function () { @@ -254,6 +264,13 @@ module.exports = CoreView.extend({ }; }, + _getNotificationValuesFromUI: function () { + return _.reduce(this._notifications, function (params, value, key) { + params[key] = this._notificationStatus(key); + return params; + }, {}, this); + }, + _username: function () { return this.$('#user_username').val(); }, From 3457ec99cd1f2e429df1b5caa7cd75dd3661bc99 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 19:48:15 +0100 Subject: [PATCH 05/17] chore: small style & formatting changes --- .../dashboard/views/account/account-form-view.js | 14 +++++++------- lib/assets/javascripts/locale/en.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index 8f3f1265032f..decbcf00ea4d 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -28,7 +28,7 @@ module.exports = CoreView.extend({ 'click .js-save': '_onClickSave', 'submit form': '_onClickSave', 'change .js-toggle-mfa': '_onToggleMfa', - 'change .js-toggle-notification' : '_onToggleNotification' + 'change .js-toggle-notification': '_onToggleNotification' }, initialize: function (options) { @@ -39,7 +39,7 @@ module.exports = CoreView.extend({ }, _initModels: function () { - this._errors = this.options.errors || {}; + this._errors = this.options.errors || {}; this.add_related_model(this._renderModel); this._getNotifications(); }, @@ -176,8 +176,8 @@ module.exports = CoreView.extend({ this.killEvent(event); const id = event.target.id; - const newLabel = (this._notificationStatus(id) ? - _t('account.views.form.email_section.notifications.enabled') : + const newLabel = (this._notificationStatus(id) ? + _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') ); @@ -215,11 +215,11 @@ module.exports = CoreView.extend({ username: this._getField('username') }; }, - +∫ _getNotifications: function () { this._notifications = { "do_subscriptions": false, - "real_do_subscriptions": true + "fake_subscriptions": true }; // note: the api requires an object with key @@ -266,7 +266,7 @@ module.exports = CoreView.extend({ _getNotificationValuesFromUI: function () { return _.reduce(this._notifications, function (params, value, key) { - params[key] = this._notificationStatus(key); + params[key] = this._notificationStatus(key); return params; }, {}, this); }, diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index 74cb1992ad2f..8df1540846b7 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -92,8 +92,8 @@ "notifications": { "enabled": "On", "disabled": "Off", - "do_subscriptions":"Emails from Data Observatory NEW", - "real_do_subscriptions":"REAL Emails from Data Observatory NEW" + "do_subscriptions":"Emails from Data Observatory", + "fake_subscriptions":"Emails from Data Observatory (II)" } } } From a2b723a3c9e8c003c2201bdf7eaada3d164dc1f3 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 19:49:29 +0100 Subject: [PATCH 06/17] feat: add emailNotifications api client To manage getting & putting configuration related to new email notification --- .../carto-node/lib/clients/authenticated.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js index fcc5eb660b12..fc99ace9cf0b 100644 --- a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js +++ b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js @@ -267,6 +267,28 @@ class AuthenticatedClient extends PublicClient { } }; } + + /** + * API to enable/disable email notifications, such as DO notifications + */ + emailNotifications () { + const notificationsURLParts = ['api/v3/email_notifications']; + + return { + get: (callback) => { + return this.get(notificationsURLParts, callback); + }, + + set: (notifications, callback) => { + const opts = { + data: JSON.stringify({ notifications }), + dataType: 'json' + }; + + return this.put(notificationsURLParts, opts, callback); + } + } + } } module.exports = AuthenticatedClient; From 8263883f48641431b7c11e769aaba897d18c92ba Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 23:05:44 +0100 Subject: [PATCH 07/17] fix: typo in account file --- .../javascripts/dashboard/views/account/account-form-view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index decbcf00ea4d..f248433106b2 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -215,7 +215,7 @@ module.exports = CoreView.extend({ username: this._getField('username') }; }, -∫ + _getNotifications: function () { this._notifications = { "do_subscriptions": false, From b33852f5cc94dd310e6d67a6545a12c3b77db339 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 23:32:44 +0100 Subject: [PATCH 08/17] feat: connect account view to api --- .../views/account/account-form-view.js | 49 +++++--------- .../dashboard/views/account/account-form.tpl | 66 +++++++++---------- 2 files changed, 51 insertions(+), 64 deletions(-) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index f248433106b2..d5f174330edc 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -216,43 +216,30 @@ module.exports = CoreView.extend({ }; }, - _getNotifications: function () { - this._notifications = { - "do_subscriptions": false, - "fake_subscriptions": true - }; - - // note: the api requires an object with key - - // real API request - // this._client.emailNotifications().get((errors, response, data) => { - // if (errors) { - // this.options.onError(data, response, errors); - // } else { - // this.options.onSuccess(data); // ? - // this._notifications = data; - // } - - // this.render(); - // }); - + _getNotifications: function () { + this._client.emailNotifications().get((errors, response, data) => { + if (errors) { + this.options.onError(data, response, errors); + } else { + this._notifications = data.notifications; + } + this.render(); + }); }, _updateNotifications: function (notifications) { - this._setLoading('Saving email notifications config'); + this._setLoading('Saving email notifications'); const notificationsParams = { notifications: notifications }; - console.log(notificationsParams); - // real API request - // this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { - // if (errors) { - // this.options.onError(data, errors); - // this.render(); - // } else { - // this._getNotifications(); - // } - // }); + this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { + if (errors) { + this.options.onError(data, errors); + this.render(); + } else { + this._getNotifications(); + } + }); }, _getDestinationValues: function () { diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index 125a7c862acd..77de2cbf35c1 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -116,43 +116,43 @@ <% } %> -
-

<%= _t('account.views.form.email_section.title') %>

-
- - + <% if (Object.keys(notifications).length > 0) { %> +
+

<%= _t('account.views.form.email_section.title') %>

+
-
-

<%= _t('account.views.form.email_section.description') %>

-
- -
+ - - <% Object.keys(notifications).forEach(function (notificationKey) { %> -
- - -
-
- - checked="checked"<% } %>> - -
- -
-

- <%= notifications[notificationKey] ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %> -

+
+

<%= _t('account.views.form.email_section.description') %>

+
+ +
+ + <% Object.keys(notifications).forEach(function (notificationKey) { %> +
+ + +
+
+ + checked="checked"<% } %>> + +
+ +
+

+ <%= notifications[notificationKey] ? _t('account.views.form.email_section.notifications.enabled') : _t('account.views.form.email_section.notifications.disabled') %> +

+
-
- <% }); %> - -
+ <% }); %> +
+ <% } %> <% if (services.length > 0) { %> From 36678bd8d6ea828fce6a62aa7c4389518f790dd6 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Tue, 17 Nov 2020 23:56:38 +0100 Subject: [PATCH 09/17] chore: small style adjustments --- assets/stylesheets/common/account_forms.scss | 6 +++++- .../dashboard/views/account/account-form-view.js | 3 +-- .../javascripts/dashboard/views/account/account-form.tpl | 2 +- lib/assets/javascripts/locale/en.json | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/stylesheets/common/account_forms.scss b/assets/stylesheets/common/account_forms.scss index 9f191b4bbbe2..5195dfe32d87 100644 --- a/assets/stylesheets/common/account_forms.scss +++ b/assets/stylesheets/common/account_forms.scss @@ -79,6 +79,10 @@ $sLabel-width: 140px; margin-bottom: 16px; } +.FormAccount-row--mediumMarginBottom { + margin-bottom: 24px; +} + .FormAccount-row--wideMarginBottom { margin-bottom: 100px; } @@ -218,7 +222,7 @@ $sLabel-width: 140px; .FormAccount-rowData--listItemWithAction { justify-content: space-between; background: $cStructure-grayBkg; - padding: 8px 14px; + padding: 11px 11px 10px 12px; } .FormAccount-planTag { diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index d5f174330edc..6911ae73531e 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -231,8 +231,7 @@ module.exports = CoreView.extend({ _updateNotifications: function (notifications) { this._setLoading('Saving email notifications'); - const notificationsParams = { notifications: notifications }; - this._client.emailNotifications().set(notificationsParams, (errors, response, data) => { + this._client.emailNotifications().set(notifications, (errors, response, data) => { if (errors) { this.options.onError(data, errors); this.render(); diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index 77de2cbf35c1..c1107a18f5a3 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -123,7 +123,7 @@ -
+

<%= _t('account.views.form.email_section.description') %>

diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index 8df1540846b7..cb976636990e 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -92,8 +92,7 @@ "notifications": { "enabled": "On", "disabled": "Off", - "do_subscriptions":"Emails from Data Observatory", - "fake_subscriptions":"Emails from Data Observatory (II)" + "do_subscriptions":"Emails from Data Observatory" } } } From fc3341bed2859f9ab93fe996185e4296d824336d Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Wed, 18 Nov 2020 00:08:21 +0100 Subject: [PATCH 10/17] fix: linter warnings --- .../javascripts/carto-node/lib/clients/authenticated.js | 5 ++--- .../dashboard/views/account/account-form-view.js | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js index fc99ace9cf0b..7b973be0b708 100644 --- a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js +++ b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js @@ -273,7 +273,6 @@ class AuthenticatedClient extends PublicClient { */ emailNotifications () { const notificationsURLParts = ['api/v3/email_notifications']; - return { get: (callback) => { return this.get(notificationsURLParts, callback); @@ -284,11 +283,11 @@ class AuthenticatedClient extends PublicClient { data: JSON.stringify({ notifications }), dataType: 'json' }; - return this.put(notificationsURLParts, opts, callback); } - } + }; } + } module.exports = AuthenticatedClient; diff --git a/lib/assets/javascripts/dashboard/views/account/account-form-view.js b/lib/assets/javascripts/dashboard/views/account/account-form-view.js index 6911ae73531e..e95cefc240ae 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form-view.js +++ b/lib/assets/javascripts/dashboard/views/account/account-form-view.js @@ -176,9 +176,9 @@ module.exports = CoreView.extend({ this.killEvent(event); const id = event.target.id; - const newLabel = (this._notificationStatus(id) ? - _t('account.views.form.email_section.notifications.enabled') : - _t('account.views.form.email_section.notifications.disabled') + const newLabel = (this._notificationStatus(id) + ? _t('account.views.form.email_section.notifications.enabled') + : _t('account.views.form.email_section.notifications.disabled') ); this._notificationLabel(id).html(newLabel); @@ -216,7 +216,7 @@ module.exports = CoreView.extend({ }; }, - _getNotifications: function () { + _getNotifications: function () { this._client.emailNotifications().get((errors, response, data) => { if (errors) { this.options.onError(data, response, errors); From dc99fb6021e2ffd8e44f350f28c5ec2078e933b3 Mon Sep 17 00:00:00 2001 From: Jorge Tarrero Date: Wed, 18 Nov 2020 11:56:08 +0100 Subject: [PATCH 11/17] Always fill endpoint response with available notifications --- .../carto/api/email_notifications_controller.rb | 2 ++ .../api/email_notifications_controller_spec.rb | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/carto/api/email_notifications_controller.rb b/app/controllers/carto/api/email_notifications_controller.rb index 8b84c6a53f92..efdf8ab8aaae 100644 --- a/app/controllers/carto/api/email_notifications_controller.rb +++ b/app/controllers/carto/api/email_notifications_controller.rb @@ -27,6 +27,8 @@ def load_notifications def decorate_notifications payload = {} + Carto::UserEmailNotification::VALID_NOTIFICATIONS.map { |n| payload[n] = true } + @notifications.each do |notification| payload[notification.notification] = notification.enabled end diff --git a/spec/requests/carto/api/email_notifications_controller_spec.rb b/spec/requests/carto/api/email_notifications_controller_spec.rb index 6b15bfe5b777..10468eaeb3a7 100644 --- a/spec/requests/carto/api/email_notifications_controller_spec.rb +++ b/spec/requests/carto/api/email_notifications_controller_spec.rb @@ -6,9 +6,6 @@ before(:all) do @carto_user = FactoryGirl.create(:carto_user) - @carto_user.email_notifications = { - do_subscriptions: true - } end let(:auth_params) do @@ -16,13 +13,23 @@ end describe '#show' do - it 'list the current notifications' do + it 'always list available notifications with default value if missing in database' do get_json(api_v3_email_notifications_show_url(auth_params)) do |response| response.status.should eq 200 response.body.should eq({ notifications: { do_subscriptions: true } }) end end + it 'list the current notifications' do + @carto_user.email_notifications = { + do_subscriptions: false + } + get_json(api_v3_email_notifications_show_url(auth_params)) do |response| + response.status.should eq 200 + response.body.should eq({ notifications: { do_subscriptions: false } }) + end + end + it 'return error if unauthenticated' do get_json(api_v3_email_notifications_show_url({})) do |response| response.status.should eq 401 From d38e271c32a40159664f23ac710b34a0c149c6a6 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Thu, 19 Nov 2020 11:48:13 +0100 Subject: [PATCH 12/17] chore: comment --- lib/assets/javascripts/dashboard/views/account/account-form.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/assets/javascripts/dashboard/views/account/account-form.tpl b/lib/assets/javascripts/dashboard/views/account/account-form.tpl index c1107a18f5a3..2f57cf302954 100644 --- a/lib/assets/javascripts/dashboard/views/account/account-form.tpl +++ b/lib/assets/javascripts/dashboard/views/account/account-form.tpl @@ -68,6 +68,7 @@
+ <% if (isCartoDBHosted) { %> <% if ((isOrgAdmin || isOrgOwner) && licenseExpiration) { %>
From 4f82f4291bce3c4d5d588aa09f0e9ce880f9775b Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Thu, 19 Nov 2020 12:35:04 +0100 Subject: [PATCH 13/17] chore: add feature to news --- NEWS.md | 1 + lib/assets/javascripts/carto-node/lib/clients/authenticated.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 41b6ffb668b9..d5d2e1127254 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ Development ### Features * Email notifications toggle API endpoint [#15930](https://github.com/CartoDB/cartodb/pull/15930) +* New Email settings section in Account page to manage notifications [#15933](https://github.com/CartoDB/cartodb/pull/15933) ### Bug fixes / enhancements * Fix BigQuery connector not importing 0-bytes-processed datasets [#15916](https://github.com/CartoDB/cartodb/pull/15916) diff --git a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js index 7b973be0b708..db14976da13a 100644 --- a/lib/assets/javascripts/carto-node/lib/clients/authenticated.js +++ b/lib/assets/javascripts/carto-node/lib/clients/authenticated.js @@ -287,7 +287,6 @@ class AuthenticatedClient extends PublicClient { } }; } - } module.exports = AuthenticatedClient; From a3380189da861d4f5c1e3d6bab9626a1e4bba789 Mon Sep 17 00:00:00 2001 From: Jorge Tarrero Date: Thu, 19 Nov 2020 13:09:18 +0100 Subject: [PATCH 14/17] Fix linter --- spec/requests/carto/api/email_notifications_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/carto/api/email_notifications_controller_spec.rb b/spec/requests/carto/api/email_notifications_controller_spec.rb index 10468eaeb3a7..e8e08c0cd914 100644 --- a/spec/requests/carto/api/email_notifications_controller_spec.rb +++ b/spec/requests/carto/api/email_notifications_controller_spec.rb @@ -22,7 +22,7 @@ it 'list the current notifications' do @carto_user.email_notifications = { - do_subscriptions: false + do_subscriptions: false } get_json(api_v3_email_notifications_show_url(auth_params)) do |response| response.status.should eq 200 From 87fc8f52c5820d72cf148c41d3f56493eb913e8e Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Thu, 19 Nov 2020 13:26:02 +0100 Subject: [PATCH 15/17] chore: add temporary bump for staging deployment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad950a0477ae..7a41d6508192 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.207", + "version": "1.0.0-assets.207-01", "description": "CARTO UI frontend", "repository": { "type": "git", From 45cb6669fd8518a9c3184a1dbd1570c06a5eb435 Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Thu, 19 Nov 2020 16:06:32 +0100 Subject: [PATCH 16/17] chore: reset temp bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a41d6508192..ad950a0477ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.207-01", + "version": "1.0.0-assets.207", "description": "CARTO UI frontend", "repository": { "type": "git", From 8244d4f729574fe9c678cac46f0bce55d17d8bda Mon Sep 17 00:00:00 2001 From: VictorVelarde Date: Thu, 19 Nov 2020 16:09:29 +0100 Subject: [PATCH 17/17] Bump assets version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8af7bd18de8b..8d33564b8083 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.207", + "version": "1.0.0-assets.208", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ad950a0477ae..8a117a57bb59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.207", + "version": "1.0.0-assets.208", "description": "CARTO UI frontend", "repository": { "type": "git",