Merge pull request #16405 from CartoDB/feature/sc-220191/notification-about-data-migrations-to-carto3

[sc220191] Notification about data migrations to CARTO 3

NEWS.md

@@ -19,6 +19,7 @@ Development
 * Setting to enable/disable import notifications [16354](https://github.com/CartoDB/cartodb/pull/16354)
 * 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)
 
 ### Bug fixes / enhancements
 - Fix rubocop integration [#16382](https://github.com/CartoDB/cartodb/pull/16382)

lib/assets/javascripts/new-dashboard/App.vue

@@ -74,7 +74,9 @@ export default {
       return !!this.$store.getters['user/isNotificationVisible'];
     },
     isCarto3ReleaseNotificationVisible () {
-      return this.isEnterprise && this.displayCarto3ReleaseNotification;
+      // HACK: Disabling notification
+      return false;
+      // return this.isEnterprise && this.displayCarto3ReleaseNotification;
     },
     baseUrl () {
       return this.$store.state.user.base_url;

lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue

@@ -39,11 +39,19 @@
         <UserDropdown :userModel="user" :notificationsCount="notificationsCount" :open="isDropdownOpen" :baseUrl="baseUrl" v-click-outside="closeDropdown" @linkClick="closeDropdown" />
 
         <NotificationPopup
+          v-if="!popupWasShown('popups.newPlatform') && isEnterprise"
+          class="notification-popup"
+          :title="$t('NewPlatformMessage.title')"
+          :message="$t('NewPlatformMessage.message')"
+          :messageHasHTML="true"
+          @click.native.stop.prevent="toggleDropdown"/>
+
+        <!-- <NotificationPopup
           v-if="!popupWasShown('feedback.popupWasShown')"
           class="notification-popup"
           :title="$t('FeedbackMessage.title')"
           :message="$t('FeedbackMessage.message')"
-          @click.native.stop.prevent="toggleDropdown"/>
+          @click.native.stop.prevent="toggleDropdown"/> -->
 
         <!-- <NotificationPopup
           v-if="!popupWasShown('popups.DataObservatorySamples') && !isOnPremise"
@@ -111,8 +119,9 @@ export default {
     };
   },
   mounted () {
-    this.markPopupAsRead('feedback.popupWasShown');
+    this.markPopupAsRead('popups.newPlatform');
-    this.markPopupAsRead('popups.directDBConnection');
+    // this.markPopupAsRead('feedback.popupWasShown');
+    // this.markPopupAsRead('popups.directDBConnection');
   },
   computed: {
     hasDBFFActive () {
@@ -132,6 +141,9 @@ export default {
         !this.isFirstTimeInDashboard &&
         !this.hasDropdownOpenedForFirstTime &&
         !this.popupWasShown;
+    },
+    isEnterprise () {
+      return this.$props.user && this.$props.user.is_enterprise;
     }
   },
   methods: {

lib/assets/javascripts/new-dashboard/components/Popups/NotificationPopup.vue

@@ -7,11 +7,10 @@
         {{ title }}
       </p>
 
-      <p class="notification__paragraph text is-small" v-if="messageHasHTML" v-html="message"></p>
+      <template v-for="(paragraph, index) in message">
-
+        <p class="notification__paragraph text is-small" v-if="messageHasHTML" v-html="paragraph" :key="index"></p>
-      <p class="notification__paragraph text is-small" v-if="!messageHasHTML">
+        <p class="notification__paragraph text is-small" v-else :key="index">{{ paragraph }}</p>
-        {{ message }}
+      </template>
-      </p>
     </div>
   </a>
 </template>
@@ -21,7 +20,7 @@ export default {
   name: 'NotificationPopup',
   props: {
     title: String,
-    message: String,
+    message: Array,
     messageHasHTML: {
       type: Boolean,
       default: false

lib/assets/javascripts/new-dashboard/i18n/locales/en.json

@@ -557,6 +557,13 @@
     "maps": "0 maps | {maps} map | {maps} maps",
     "datasets": "0 datasets | {datasets} dataset | {datasets} datasets"
   },
+  "NewPlatformMessage": {
+    "title": "New version of the CARTO Platform",
+    "message": [
+      "To start using the latest version of our platform, please create your account <a href='https://carto.com/signup' target='_blank'>here</a>. We will then align it to your current subscription plan.",
+      "If you need help migrating your data to the new version of CARTO, reach out to our <a href='mailto:enterprise-support@carto.com'>Support team</a>."
+    ]
+  },
   "FeedbackMessage": {
     "title": "Let us know what you think.",
     "message": "Missing something? Should we be doing something differently?"

lib/assets/test/spec/new-dashboard/unit/specs/components/__snapshots__/NavigationBar.spec.js.snap

@@ -70,7 +70,7 @@ exports[`NavigationBar.vue should render regular navbar with user dropdown close
     <div class="navbar-user">
       <div class="navbar-avatar" style="background-image: url(//cartodb-libs.global.ssl.fastly.net/cartodbui/assets/unversioned/images/avatars/avatar_ghost_yellow.png);"></div>
       <userdropdown-stub baseurl="" usermodel="[object Object]"></userdropdown-stub>
-      <notificationpopup-stub title="FeedbackMessage.title" message="FeedbackMessage.message" class="notification-popup"></notificationpopup-stub>
+      <!---->
     </div> <span class="navbar-searchClose"><img svg-inline="" src="../../assets/icons/navbar/close.svg"></span>
   </div>
 </nav>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.286",
+  "version": "1.0.0-assets.287",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.286",
+  "version": "1.0.0-assets.287",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",