Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 21 insertions, 25 deletions

diff --git a/app/assets/javascripts/whats_new/index.js b/app/assets/javascripts/whats_new/index.js
index c9ee3404d2a..19cdb590ae2 100644
--- a/app/assets/javascripts/whats_new/index.js
+++ b/app/assets/javascripts/whats_new/index.js
@@ -1,32 +1,28 @@
 import Vue from 'vue';
 import App from './components/app.vue';
-import Trigger from './components/trigger.vue';
 import store from './store';
 
-export default () => {
-  // eslint-disable-next-line no-new
-  new Vue({
-    el: document.getElementById('whats-new-app'),
-    store,
-    components: {
-      App,
-    },
-
-    render(createElement) {
-      return createElement('app');
-    },
-  });
+let whatsNewApp;
 
-  // eslint-disable-next-line no-new
-  new Vue({
-    el: document.getElementById('whats-new-trigger'),
-    store,
-    components: {
-      Trigger,
-    },
+export default () => {
+  if (whatsNewApp) {
+    store.dispatch('openDrawer');
+  } else {
+    const whatsNewElm = document.getElementById('whats-new-app');
 
-    render(createElement) {
-      return createElement('trigger');
-    },
-  });
+    whatsNewApp = new Vue({
+      el: whatsNewElm,
+      store,
+      components: {
+        App,
+      },
+      render(createElement) {
+        return createElement('app', {
+          props: {
+            features: whatsNewElm.getAttribute('data-features'),
+          },
+        });
+      },
+    });
+  }
 };