From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Jul 2020 12:26:25 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee

---
 .../shared/wikis/components/delete_wiki_modal.vue     | 15 ++++++++++++---
 app/assets/javascripts/pages/shared/wikis/wikis.js    | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'app/assets/javascripts/pages/shared/wikis')

diff --git a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
index 580cca49b5e..a7b7d597fb7 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
@@ -55,13 +55,22 @@ export default {
 
 <template>
   <div class="d-inline-block">
-    <button v-gl-modal="modalId" type="button" class="btn btn-danger">{{ __('Delete') }}</button>
+    <button
+      v-gl-modal="modalId"
+      type="button"
+      class="btn btn-danger"
+      data-qa-selector="delete_button"
+    >
+      {{ __('Delete') }}
+    </button>
     <gl-modal
       :title="title"
-      :ok-title="s__('WikiPageConfirmDelete|Delete page')"
+      :action-primary="{
+        text: s__('WikiPageConfirmDelete|Delete page'),
+        attributes: { variant: 'danger', 'data-qa-selector': 'confirm_deletion_button' },
+      }"
       :modal-id="modalId"
       title-tag="h4"
-      ok-variant="danger"
       @ok="onSubmit"
     >
       {{ message }}
diff --git a/app/assets/javascripts/pages/shared/wikis/wikis.js b/app/assets/javascripts/pages/shared/wikis/wikis.js
index ed67219383b..41d43812b5d 100644
--- a/app/assets/javascripts/pages/shared/wikis/wikis.js
+++ b/app/assets/javascripts/pages/shared/wikis/wikis.js
@@ -1,5 +1,6 @@
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import { s__, sprintf } from '~/locale';
+import Tracking from '~/tracking';
 
 const MARKDOWN_LINK_TEXT = {
   markdown: '[Link Title](page-slug)',
@@ -8,6 +9,9 @@ const MARKDOWN_LINK_TEXT = {
   org: '[[page-slug]]',
 };
 
+const TRACKING_EVENT_NAME = 'view_wiki_page';
+const TRACKING_CONTEXT_SCHEMA = 'iglu:com.gitlab/wiki_page_context/jsonschema/1-0-0';
+
 export default class Wikis {
   constructor() {
     this.sidebarEl = document.querySelector('.js-wiki-sidebar');
@@ -57,6 +61,8 @@ export default class Wikis {
         window.onbeforeunload = null;
       });
     }
+
+    Wikis.trackPageView();
   }
 
   handleWikiTitleChange(e) {
@@ -97,4 +103,17 @@ export default class Wikis {
       classList.remove('right-sidebar-expanded');
     }
   }
+
+  static trackPageView() {
+    const wikiPageContent = document.querySelector('.js-wiki-page-content[data-tracking-context]');
+    if (!wikiPageContent) return;
+
+    Tracking.event(document.body.dataset.page, TRACKING_EVENT_NAME, {
+      label: TRACKING_EVENT_NAME,
+      context: {
+        schema: TRACKING_CONTEXT_SCHEMA,
+        data: JSON.parse(wikiPageContent.dataset.trackingContext),
+      },
+    });
+  }
 }
-- 
cgit v1.2.3