Skip to content

Commit

Permalink
Merge pull request #16420 from CartoDB/bug/sc-229113/all-users-add-fi…
Browse files Browse the repository at this point in the history
…xed-banner-on-the-top-of

[sc220191] Add fixed banner about data migration to the new platform
  • Loading branch information
Shylpx committed Jun 14, 2022
2 parents a3bb145 + 0bba5f0 commit 64bc263
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 3 additions & 5 deletions lib/assets/javascripts/new-dashboard/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@
class="text"
v-html="
$t('Carto3Release.message', {
link: `<a href='https://carto.com/blog/announcing-carto-spatial-extension-bigquery/' target='_blank'>${$t('Carto3Release.link')}</a>`,
link: `<a href='https://carto.com/signup' target='_blank'>${$t('Carto3Release.link')}</a>`,
contact: `<a href='mailto:enterprise-support@carto.com' target='_blank'>${$t('Carto3Release.contactUs')}</a>`
})
"
>
</span>
</div>
</span>
<button

<!-- HACK: Non-closable banner -->
<!-- <button
class="notification__close-button"
@click="close"
aria-label="Close"
>
<img src="../assets/icons/common/close-black.svg" />
</button>
</button> -->
</div>
</template>

Expand Down
7 changes: 4 additions & 3 deletions lib/assets/javascripts/new-dashboard/i18n/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"Carto3Release": {
"title": "New release",
"message": "Announcing the launch of the cloud native Spatial Extension for BigQuery, {link}!",
"link": "find out more"
"title": "Try out the new CARTO platform!",
"message": "Create your account {link}. {contact} so we can match your current plan and help you migrate your data.",
"link": "here",
"contactUs": "Contact us"
},
"MapCard": {
"shared": {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "1.0.0-assets.288",
"version": "1.0.0-assets.289",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
Expand Down

0 comments on commit 64bc263

Please sign in to comment.