Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

4 files changed, 10 insertions, 83 deletions

diff --git a/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue b/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
deleted file mode 100644
index c0ad814172d..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script>
-import { GlEmptyState, GlSprintf, GlLink, GlButton } from '@gitlab/ui';
-
-export default {
-  components: {
-    GlEmptyState,
-    GlSprintf,
-    GlLink,
-    GlButton,
-  },
-  inject: {
-    isAdmin: {
-      default: false,
-    },
-    svgPath: {
-      default: '',
-    },
-    docsLink: {
-      default: '',
-    },
-    primaryButtonPath: {
-      default: '',
-    },
-  },
-};
-</script>
-<template>
-  <gl-empty-state class="js-empty-state" :title="__('Usage ping is off')" :svg-path="svgPath">
-    <template #description>
-      <gl-sprintf
-        v-if="!isAdmin"
-        :message="
-          __(
-            'To view instance-level analytics, ask an admin to turn on %{docLinkStart}usage ping%{docLinkEnd}.',
-          )
-        "
-      >
-        <template #docLink="{ content }">
-          <gl-link :href="docsLink" target="_blank">{{ content }}</gl-link>
-        </template>
-      </gl-sprintf>
-      <template v-else
-        ><p>
-          {{ __('Turn on usage ping to review instance-level analytics.') }}
-        </p>
-
-        <gl-button category="primary" variant="success" :href="primaryButtonPath">
-          {{ __('Turn on usage ping') }}</gl-button
-        >
-      </template>
-    </template>
-  </gl-empty-state>
-</template>
diff --git a/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js b/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js
deleted file mode 100644
index ae73033079d..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// EE-specific feature. Find the implementation in the `ee/`-folder
-export default () => {};
diff --git a/app/assets/javascripts/admin/dev_ops_report/devops_score_empty_state.js b/app/assets/javascripts/admin/dev_ops_report/devops_score_empty_state.js
deleted file mode 100644
index 0cb8d9be0e4..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/devops_score_empty_state.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import Vue from 'vue';
-import UserCallout from '~/user_callout';
-import UsagePingDisabled from './components/usage_ping_disabled.vue';
-
-export default () => {
-  // eslint-disable-next-line no-new
-  new UserCallout();
-
-  const emptyStateContainer = document.getElementById('js-devops-empty-state');
-
-  if (!emptyStateContainer) return false;
-
-  const { emptyStateSvgPath, enableUsagePingLink, docsLink, isAdmin } = emptyStateContainer.dataset;
-
-  return new Vue({
-    el: emptyStateContainer,
-    provide: {
-      isAdmin: Boolean(isAdmin),
-      svgPath: emptyStateSvgPath,
-      primaryButtonPath: enableUsagePingLink,
-      docsLink,
-    },
-    render(h) {
-      return h(UsagePingDisabled);
-    },
-  });
-};
diff --git a/app/assets/javascripts/admin/users/tabs.js b/app/assets/javascripts/admin/users/tabs.js
index 9ada77396c7..cbaab7df4e9 100644
--- a/app/assets/javascripts/admin/users/tabs.js
+++ b/app/assets/javascripts/admin/users/tabs.js
@@ -1,11 +1,20 @@
+import Api from '~/api';
 import { historyPushState } from '~/lib/utils/common_utils';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
 
 const COHORTS_PANE = 'cohorts';
+const COHORTS_PANE_TAB_CLICK_EVENT = 'i_analytics_cohorts';
 
 const tabClickHandler = (e) => {
   const { hash } = e.currentTarget;
-  const tab = hash === `#${COHORTS_PANE}` ? COHORTS_PANE : null;
+
+  let tab = null;
+
+  if (hash === `#${COHORTS_PANE}`) {
+    tab = COHORTS_PANE;
+    Api.trackRedisHllUserEvent(COHORTS_PANE_TAB_CLICK_EVENT);
+  }
+
   const newUrl = mergeUrlParams({ tab }, window.location.href);
   historyPushState(newUrl);
 };