+
diff --git a/app/assets/javascripts/issues/show/components/header_actions.vue b/app/assets/javascripts/issues/show/components/header_actions.vue
index 427aad8d96b..07c837a1fd2 100644
--- a/app/assets/javascripts/issues/show/components/header_actions.vue
+++ b/app/assets/javascripts/issues/show/components/header_actions.vue
@@ -103,6 +103,7 @@ export default {
};
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
issuableReference: {
query: issueReferenceQuery,
variables() {
diff --git a/app/assets/javascripts/jira_connect/branches/components/project_dropdown.vue b/app/assets/javascripts/jira_connect/branches/components/project_dropdown.vue
index e3fa0ce8073..616a9932d49 100644
--- a/app/assets/javascripts/jira_connect/branches/components/project_dropdown.vue
+++ b/app/assets/javascripts/jira_connect/branches/components/project_dropdown.vue
@@ -33,6 +33,7 @@ export default {
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
projects: {
query: getProjectsQuery,
variables() {
diff --git a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js
index a6081303bf8..b13b20e1116 100644
--- a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js
+++ b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js
@@ -1,4 +1,5 @@
import Vue from 'vue';
+import { InternalEvents } from '~/tracking';
export function confirmAction(
message,
@@ -13,6 +14,7 @@ export function confirmAction(
title,
hideCancel,
size,
+ trackingEvent,
} = {},
) {
return new Promise((resolve) => {
@@ -42,6 +44,13 @@ export function confirmAction(
on: {
confirmed() {
confirmed = true;
+ if (trackingEvent) {
+ InternalEvents.trackEvent(trackingEvent.name, {
+ label: trackingEvent.label,
+ property: trackingEvent.property,
+ value: trackingEvent.value,
+ });
+ }
},
closed() {
component.$destroy();
diff --git a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
index 0e959e899e9..36c0d735fce 100644
--- a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
+++ b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
@@ -1,13 +1,34 @@
import { confirmAction } from './confirm_action';
function confirmViaGlModal(message, element) {
- const { confirmBtnVariant, title, isHtmlMessage } = element.dataset;
+ const {
+ confirmBtnVariant,
+ title,
+ isHtmlMessage,
+ trackingEventName,
+ trackingEventLabel,
+ trackingEventProperty,
+ trackingEventValue,
+ } = element.dataset;
const screenReaderText =
element.querySelector('.gl-sr-only')?.textContent ||
element.querySelector('.sr-only')?.textContent ||
element.getAttribute('aria-label');
+ const getTrackingEventConfig = (trackingEventNameFromDataset) => {
+ if (!trackingEventNameFromDataset) return null;
+
+ return {
+ name: trackingEventNameFromDataset,
+ label: trackingEventLabel,
+ property: trackingEventProperty,
+ value: trackingEventValue,
+ };
+ };
+
+ const trackingEventConfig = getTrackingEventConfig(trackingEventName);
+
const config = {
...(screenReaderText && { primaryBtnText: screenReaderText }),
...(confirmBtnVariant && { primaryBtnVariant: confirmBtnVariant }),
@@ -15,6 +36,10 @@ function confirmViaGlModal(message, element) {
...(isHtmlMessage && { modalHtmlMessage: message }),
};
+ if (trackingEventConfig) {
+ config.trackingEvent = trackingEventConfig;
+ }
+
return confirmAction(message, config);
}
diff --git a/app/assets/javascripts/members/placeholders/components/placeholder_actions.vue b/app/assets/javascripts/members/placeholders/components/placeholder_actions.vue
index 0c0d8f56197..69174eec730 100644
--- a/app/assets/javascripts/members/placeholders/components/placeholder_actions.vue
+++ b/app/assets/javascripts/members/placeholders/components/placeholder_actions.vue
@@ -55,6 +55,7 @@ export default {
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
users: {
query: searchUsersQuery,
variables() {
diff --git a/app/assets/javascripts/members/placeholders/components/placeholders_table.vue b/app/assets/javascripts/members/placeholders/components/placeholders_table.vue
index f8736822bc7..ec2369a9ca4 100644
--- a/app/assets/javascripts/members/placeholders/components/placeholders_table.vue
+++ b/app/assets/javascripts/members/placeholders/components/placeholders_table.vue
@@ -63,6 +63,7 @@ export default {
};
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
sourceUsers: {
query: importSourceUsersQuery,
variables() {
diff --git a/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue b/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue
index ea9bb7ee887..8afb11d40dd 100644
--- a/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue
+++ b/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue
@@ -12,6 +12,7 @@ import userPermissionsQuery from './queries/user_permissions.query.graphql';
export default {
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
userPermissions: {
query: userPermissionsQuery,
variables() {
diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue
index c7cf2197aa9..2ceb37a76cb 100644
--- a/app/assets/javascripts/merge_requests/components/sticky_header.vue
+++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue
@@ -31,6 +31,7 @@ export default {
TYPE_MERGE_REQUEST,
apollo: {
$subscribe: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
title: {
query() {
return titleSubscription;
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index a5827cc815c..c2ccdaeadd0 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -174,6 +174,7 @@ export default {
},
canResolve() {
if (!this.discussionRoot) return false;
+ if (!this.note.resolvable) return false;
return this.note.current_user.can_resolve_discussion;
},
diff --git a/app/assets/javascripts/pages/import/fogbugz/new_user_map/components/user_select.vue b/app/assets/javascripts/pages/import/fogbugz/new_user_map/components/user_select.vue
index 912b84dbae6..33767956c60 100644
--- a/app/assets/javascripts/pages/import/fogbugz/new_user_map/components/user_select.vue
+++ b/app/assets/javascripts/pages/import/fogbugz/new_user_map/components/user_select.vue
@@ -20,6 +20,7 @@ export default {
},
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
usersQuery: {
query: searchUsersQuery,
variables() {
diff --git a/app/assets/javascripts/pages/projects/show/empty_project.js b/app/assets/javascripts/pages/projects/show/empty_project.js
new file mode 100644
index 00000000000..89bfaa43f59
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/show/empty_project.js
@@ -0,0 +1,14 @@
+import { GlTabsBehavior, HISTORY_TYPE_HASH } from '~/tabs';
+
+export default class EmptyProject {
+ constructor() {
+ this.configureGitTabsEl = document.querySelector('.js-configure-git-tabs');
+
+ this.emptyProjectTabsEl = document.querySelector('.js-empty-project-tabs');
+
+ // eslint-disable-next-line no-new
+ new GlTabsBehavior(this.configureGitTabsEl, { history: HISTORY_TYPE_HASH });
+ // eslint-disable-next-line no-new
+ new GlTabsBehavior(this.emptyProjectTabsEl, { history: HISTORY_TYPE_HASH });
+ }
+}
diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js
index a123a134ef3..11d3c4ad2cc 100644
--- a/app/assets/javascripts/pages/projects/show/index.js
+++ b/app/assets/javascripts/pages/projects/show/index.js
@@ -10,6 +10,7 @@ import initReadMore from '~/read_more';
import initAmbiguousRefModal from '~/ref/init_ambiguous_ref_modal';
import CodeDropdown from '~/vue_shared/components/code_dropdown/code_dropdown.vue';
import initSourceCodeDropdowns from '~/vue_shared/components/download_dropdown/init_download_dropdowns';
+import EmptyProject from '~/pages/projects/show/empty_project';
import { initHomePanel } from '../home_panel';
// Project show page loads different overview content based on user preferences
@@ -81,6 +82,15 @@ const initCodeDropdown = () => {
});
};
+const initEmptyProjectTabs = () => {
+ const emptyProjectEl = document.querySelector('#js-project-show-empty-page');
+
+ if (!emptyProjectEl) return;
+
+ new EmptyProject(); // eslint-disable-line no-new
+};
+
initCodeDropdown();
initSourceCodeDropdowns();
initFindFileShortcut();
+initEmptyProjectTabs();
diff --git a/app/assets/javascripts/pipeline_wizard/components/commit.vue b/app/assets/javascripts/pipeline_wizard/components/commit.vue
index 29481bf4444..3117d0afdd3 100644
--- a/app/assets/javascripts/pipeline_wizard/components/commit.vue
+++ b/app/assets/javascripts/pipeline_wizard/components/commit.vue
@@ -116,6 +116,7 @@ export default {
},
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
project: {
query: getFileMetaDataQuery,
variables() {
diff --git a/app/assets/javascripts/profile/components/snippets/snippets_tab.vue b/app/assets/javascripts/profile/components/snippets/snippets_tab.vue
index abc66e16b97..e830fa1aad6 100644
--- a/app/assets/javascripts/profile/components/snippets/snippets_tab.vue
+++ b/app/assets/javascripts/profile/components/snippets/snippets_tab.vue
@@ -37,6 +37,7 @@ export default {
};
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
userSnippets: {
query: getUserSnippets,
variables() {
diff --git a/app/assets/javascripts/profile/components/user_achievements.vue b/app/assets/javascripts/profile/components/user_achievements.vue
index 17314da26c6..12b14816dcf 100644
--- a/app/assets/javascripts/profile/components/user_achievements.vue
+++ b/app/assets/javascripts/profile/components/user_achievements.vue
@@ -14,6 +14,7 @@ export default {
mixins: [timeagoMixin],
inject: ['rootUrl', 'userId'],
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
userAchievements: {
query: getUserAchievements,
variables() {
diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue
index 52cf9b05c1b..1be46b15102 100644
--- a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue
+++ b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue
@@ -21,6 +21,7 @@ export default {
},
inject: ['fullPath', 'commitSha'],
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
project: {
query: commitReferencesQuery,
variables() {
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
index 0e0fc52ef6f..80ff0ccf813 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
@@ -10,6 +10,7 @@ import {
visitUrl,
setUrlParams,
} from '~/lib/utils/url_utility';
+import { InternalEvents } from '~/tracking';
import { helpPagePath } from '~/helpers/help_page_helper';
import branchRulesQuery from 'ee_else_ce/projects/settings/branch_rules/queries/branch_rules_details.query.graphql';
import { createAlert } from '~/alert';
@@ -19,6 +20,15 @@ import CrudComponent from '~/vue_shared/components/crud_component.vue';
import SettingsSection from '~/vue_shared/components/settings/settings_section.vue';
import editBranchRuleMutation from 'ee_else_ce/projects/settings/branch_rules/mutations/edit_branch_rule.mutation.graphql';
import { getAccessLevels, getAccessLevelInputFromEdges } from 'ee_else_ce/projects/settings/utils';
+import {
+ BRANCH_RULE_DETAILS_LABEL,
+ CHANGED_BRANCH_RULE_TARGET,
+ CHANGED_ALLOWED_TO_MERGE,
+ CHANGED_ALLOWED_TO_PUSH_AND_MERGE,
+ CHANGED_ALLOW_FORCE_PUSH,
+ UNPROTECTED_BRANCH,
+ CHANGED_REQUIRE_CODEOWNER_APPROVAL,
+} from 'ee_else_ce/projects/settings/branch_rules/tracking/constants';
import deleteBranchRuleMutation from '../../mutations/branch_rule_delete.mutation.graphql';
import BranchRuleModal from '../../../components/branch_rule_modal.vue';
import Protection from './protection.vue';
@@ -83,6 +93,7 @@ export default {
showCodeOwners: { default: false },
},
apollo: {
+ // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties
project: {
query: branchRulesQuery,
variables() {
@@ -225,6 +236,9 @@ export default {
.then(
// eslint-disable-next-line consistent-return
({ data: { branchRuleDelete } = {} } = {}) => {
+ InternalEvents.trackEvent(UNPROTECTED_BRANCH, {
+ label: BRANCH_RULE_DETAILS_LABEL,
+ });
const [error] = branchRuleDelete.errors;
if (error) {
return createAlert({
@@ -252,6 +266,12 @@ export default {
openAllowedToPushAndMergeDrawer() {
this.isAllowedToPushAndMergeDrawerOpen = true;
},
+ onEditRuleTarget(ruleTarget) {
+ this.editBranchRule({
+ name: ruleTarget,
+ trackEvent: CHANGED_BRANCH_RULE_TARGET,
+ });
+ },
onEnableForcePushToggle(isChecked) {
this.isAllowForcePushLoading = true;
const toastMessage = isChecked
@@ -261,6 +281,7 @@ export default {
this.editBranchRule({
branchProtection: { allowForcePush: isChecked },
toastMessage,
+ trackEvent: CHANGED_ALLOW_FORCE_PUSH,
});
},
onEnableCodeOwnersToggle(isChecked) {
@@ -272,6 +293,7 @@ export default {
this.editBranchRule({
branchProtection: { codeOwnerApprovalRequired: isChecked },
toastMessage,
+ trackEvent: CHANGED_REQUIRE_CODEOWNER_APPROVAL,
});
},
onEditAccessLevels(accessLevels) {
@@ -281,15 +303,22 @@ export default {
this.editBranchRule({
branchProtection: { mergeAccessLevels: accessLevels },
toastMessage: s__('BranchRules|Allowed to merge updated'),
+ trackEvent: CHANGED_ALLOWED_TO_MERGE,
});
} else if (this.isAllowedToPushAndMergeDrawerOpen) {
this.editBranchRule({
branchProtection: { pushAccessLevels: accessLevels },
toastMessage: s__('BranchRules|Allowed to push and merge updated'),
+ trackEvent: CHANGED_ALLOWED_TO_PUSH_AND_MERGE,
});
}
},
- editBranchRule({ name = this.branchRule.name, branchProtection = null, toastMessage = '' }) {
+ editBranchRule({
+ name = this.branchRule.name,
+ branchProtection = null,
+ toastMessage = '',
+ trackEvent = '',
+ }) {
this.$apollo
.mutate({
mutation: editBranchRuleMutation,
@@ -317,6 +346,12 @@ export default {
return;
}
+ if (trackEvent.length) {
+ InternalEvents.trackEvent(trackEvent, {
+ label: BRANCH_RULE_DETAILS_LABEL,
+ });
+ }
+
const isRedirectNeeded = !branchProtection;
if (isRedirectNeeded) {
visitUrl(setUrlParams({ branch: name }));
@@ -559,7 +594,7 @@ export default {
:ref="$options.editModalId"
:title="$options.i18n.updateTargetRule"
:action-primary-text="$options.i18n.update"
- @primary="editBranchRule({ name: $event })"
+ @primary="onEditRuleTarget"
/>