diff --git a/NEWS.md b/NEWS.md index 046d243726..73f56c11f4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -20,6 +20,7 @@ Development * Setting to enable/disable random username generation on SAML authentication process [16372](https://github.com/CartoDB/cartodb/pull/16372) * Add type guessing capabilities to the ArcGIS connector [#16385](https://github.com/CartoDB/cartodb/pull/16385) * Add notification about data migrations to CARTO 3 [#16405](https://github.com/CartoDB/cartodb/pull/16405) +* Update banner to notify about data migrations to CARTO 3 [#16420](https://github.com/CartoDB/cartodb/pull/16420) ### Bug fixes / enhancements - Fix rubocop integration [#16382](https://github.com/CartoDB/cartodb/pull/16382) diff --git a/lib/assets/javascripts/new-dashboard/App.vue b/lib/assets/javascripts/new-dashboard/App.vue index 8753d62f21..a4d3bb9239 100644 --- a/lib/assets/javascripts/new-dashboard/App.vue +++ b/lib/assets/javascripts/new-dashboard/App.vue @@ -52,14 +52,14 @@ export default { MamufasImportView }, data: () => ({ - displayCarto3ReleaseNotification: notificationIsVisible(window.localStorage.getItem('carto3ReleaseVisible')) + displayCarto3ReleaseNotification: notificationIsVisible(window.localStorage.getItem('carto3ReleaseVisibleV2')) }), created () { sendMetric(MetricsTypes.VISITED_PRIVATE_PAGE, { page: 'dashboard' }); }, methods: { closeCarto3Release () { - window.localStorage.setItem('carto3ReleaseVisible', new Date().getTime()); + window.localStorage.setItem('carto3ReleaseVisibleV2', new Date().getTime()); this.displayCarto3ReleaseNotification = false; } }, @@ -74,9 +74,7 @@ export default { return !!this.$store.getters['user/isNotificationVisible']; }, isCarto3ReleaseNotificationVisible () { - // HACK: Disabling notification - return false; - // return this.isEnterprise && this.displayCarto3ReleaseNotification; + return this.isEnterprise && this.displayCarto3ReleaseNotification; }, baseUrl () { return this.$store.state.user.base_url; diff --git a/lib/assets/javascripts/new-dashboard/components/NotificationCarto3Release.vue b/lib/assets/javascripts/new-dashboard/components/NotificationCarto3Release.vue index 7e25c2479d..9ac2aabeac 100644 --- a/lib/assets/javascripts/new-dashboard/components/NotificationCarto3Release.vue +++ b/lib/assets/javascripts/new-dashboard/components/NotificationCarto3Release.vue @@ -10,20 +10,23 @@ class="text" v-html=" $t('Carto3Release.message', { - link: `${$t('Carto3Release.link')}`, + link: `${$t('Carto3Release.link')}`, + contact: `${$t('Carto3Release.contactUs')}` }) " > -