diff options
Diffstat (limited to 'app')
1807 files changed, 23822 insertions, 9719 deletions
diff --git a/app/assets/images/learn_gitlab/section_code.svg b/app/assets/images/learn_gitlab/section_code.svg new file mode 100644 index 00000000000..da170c93be6 --- /dev/null +++ b/app/assets/images/learn_gitlab/section_code.svg @@ -0,0 +1,4 @@ +<svg width="25" height="30" viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M15 8L15 9.5C15 10.3284 15.6716 11 16.5 11C17.3284 11 18 10.3284 18 9.5V7.74264C18 6.94699 17.6839 6.18393 17.1213 5.62132L12.8787 1.37868C12.3161 0.816071 11.553 0.5 10.7574 0.5H1.5C0.671573 0.5 0 1.17157 0 2V20C0 20.8284 0.671573 21.5 1.5 21.5H6C6.82843 21.5 7.5 20.8284 7.5 20C7.5 19.1716 6.82843 18.5 6 18.5H3V3.5H10.5V6.5C10.5 7.32843 11.1716 8 12 8H15Z" fill="#6E49CB"/> +<path d="M10.5 18.5C10.5 17.6716 11.1716 17 12 17H13.5V15.5C13.5 14.6716 14.1716 14 15 14C15.8284 14 16.5 14.6716 16.5 15.5V17H18C18.8284 17 19.5 17.6716 19.5 18.5C19.5 19.3284 18.8284 20 18 20H16.5V21.5C16.5 22.3284 15.8284 23 15 23C14.1716 23 13.5 22.3284 13.5 21.5V20H12C11.1716 20 10.5 19.3284 10.5 18.5Z" fill="#6E49CB"/> +</svg> diff --git a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue index d24285af5c3..02159d4d524 100644 --- a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue +++ b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue @@ -1,6 +1,6 @@ <script> import { GlAlert } from '@gitlab/ui'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { __, n__, sprintf } from '~/locale'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import DomElementListener from '~/vue_shared/components/dom_element_listener.vue'; diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js index 6fc37e9331f..d6fdcea468a 100644 --- a/app/assets/javascripts/activities.js +++ b/app/assets/javascripts/activities.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { setCookie } from '~/lib/utils/common_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import { localTimeAgo } from './lib/utils/datetime_utility'; import Pager from './pager'; diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue index a41ff42df20..c66b595ffdc 100644 --- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue +++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue @@ -2,7 +2,7 @@ import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf, GlBadge } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js index d4c9db2fa33..de9c7488ace 100644 --- a/app/assets/javascripts/add_context_commits_modal/store/actions.js +++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue new file mode 100644 index 00000000000..a4211002f71 --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue @@ -0,0 +1,41 @@ +<script> +import { getTimeago } from '~/lib/utils/datetime_utility'; +import { __, sprintf } from '~/locale'; +import ListItem from '~/vue_shared/components/registry/list_item.vue'; + +export default { + name: 'AbuseReportRow', + components: { + ListItem, + }, + props: { + report: { + type: Object, + required: true, + }, + }, + computed: { + updatedAt() { + const template = __('Updated %{timeAgo}'); + return sprintf(template, { timeAgo: getTimeago().format(this.report.updatedAt) }); + }, + title() { + const { reportedUser, reporter, category } = this.report; + const template = __('%{reported} reported for %{category} by %{reporter}'); + return sprintf(template, { reported: reportedUser.name, reporter: reporter.name, category }); + }, + }, +}; +</script> + +<template> + <list-item data-testid="abuse-report-row"> + <template #left-primary> + <div class="gl-font-weight-normal" data-testid="title">{{ title }}</div> + </template> + + <template #right-secondary> + <div data-testid="updated-at">{{ updatedAt }}</div> + </template> + </list-item> +</template> diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue new file mode 100644 index 00000000000..b60fe3ae9b8 --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue @@ -0,0 +1,109 @@ +<script> +import { setUrlParams, redirectTo, queryToObject, updateHistory } from '~/lib/utils/url_utility'; +import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants'; +import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; +import { + FILTERED_SEARCH_TOKENS, + DEFAULT_SORT, + SORT_OPTIONS, + isValidSortKey, +} from '~/admin/abuse_reports/constants'; +import { buildFilteredSearchCategoryToken } from '~/admin/abuse_reports/utils'; + +export default { + name: 'AbuseReportsFilteredSearchBar', + components: { FilteredSearchBar }, + sortOptions: SORT_OPTIONS, + inject: ['categories'], + data() { + return { + initialFilterValue: [], + initialSortBy: DEFAULT_SORT, + }; + }, + computed: { + tokens() { + return [...FILTERED_SEARCH_TOKENS, buildFilteredSearchCategoryToken(this.categories)]; + }, + }, + created() { + const query = queryToObject(window.location.search); + + // Backend shows open reports by default if status param is not specified. + // To match that behavior, update the current URL to include status=open + // query when no status query is specified on load. + if (!query.status) { + query.status = 'open'; + updateHistory({ url: setUrlParams(query), replace: true }); + } + + const sort = this.currentSortKey(); + if (sort) { + this.initialSortBy = query.sort; + } + + const tokens = this.tokens + .filter((token) => query[token.type]) + .map((token) => ({ + type: token.type, + value: { + data: query[token.type], + operator: '=', + }, + })); + + this.initialFilterValue = tokens; + }, + methods: { + currentSortKey() { + const { sort } = queryToObject(window.location.search); + + return isValidSortKey(sort) ? sort : undefined; + }, + handleFilter(tokens) { + let params = tokens.reduce((accumulator, token) => { + const { type, value } = token; + + // We don't support filtering reports by search term for now + if (!value || !type || type === FILTERED_SEARCH_TERM) { + return accumulator; + } + + return { + ...accumulator, + [type]: value.data, + }; + }, {}); + + const sort = this.currentSortKey(); + if (sort) { + params = { ...params, sort }; + } + + redirectTo(setUrlParams(params, window.location.href, true)); + }, + handleSort(sort) { + const { page, ...query } = queryToObject(window.location.search); + + redirectTo(setUrlParams({ ...query, sort }, window.location.href, true)); + }, + }, + filteredSearchNamespace: 'abuse_reports', + recentSearchesStorageKey: 'abuse_reports', +}; +</script> + +<template> + <filtered-search-bar + :namespace="$options.filteredSearchNamespace" + :tokens="tokens" + :recent-searches-storage-key="$options.recentSearchesStorageKey" + :search-input-placeholder="__('Filter reports')" + :initial-filter-value="initialFilterValue" + :initial-sort-by="initialSortBy" + :sort-options="$options.sortOptions" + data-testid="abuse-reports-filtered-search-bar" + @onFilter="handleFilter" + @onSort="handleSort" + /> +</template> diff --git a/app/assets/javascripts/admin/abuse_reports/components/app.vue b/app/assets/javascripts/admin/abuse_reports/components/app.vue new file mode 100644 index 00000000000..e1e75a4f8d0 --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/components/app.vue @@ -0,0 +1,63 @@ +<script> +import { GlEmptyState, GlPagination } from '@gitlab/ui'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; +import FilteredSearchBar from './abuse_reports_filtered_search_bar.vue'; +import AbuseReportRow from './abuse_report_row.vue'; + +export default { + name: 'AbuseReportsApp', + components: { + AbuseReportRow, + FilteredSearchBar, + GlEmptyState, + GlPagination, + }, + props: { + abuseReports: { + type: Array, + required: true, + }, + pagination: { + type: Object, + required: true, + }, + }, + computed: { + showPagination() { + return this.pagination.totalItems > this.pagination.perPage; + }, + }, + methods: { + paginationLinkGenerator(page) { + return mergeUrlParams({ page }, window.location.href); + }, + }, +}; +</script> +<template> + <div> + <filtered-search-bar /> + + <gl-empty-state v-if="abuseReports.length == 0" :title="s__('AbuseReports|No reports found')" /> + <abuse-report-row + v-for="(report, index) in abuseReports" + v-else + :key="index" + :report="report" + /> + + <gl-pagination + v-if="showPagination" + :value="pagination.currentPage" + :per-page="pagination.perPage" + :total-items="pagination.totalItems" + :link-gen="paginationLinkGenerator" + :prev-text="__('Prev')" + :next-text="__('Next')" + :label-next-page="__('Go to next page')" + :label-prev-page="__('Go to previous page')" + align="center" + class="gl-mt-3" + /> + </div> +</template> diff --git a/app/assets/javascripts/admin/abuse_reports/constants.js b/app/assets/javascripts/admin/abuse_reports/constants.js new file mode 100644 index 00000000000..ee2e9ab2cbf --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/constants.js @@ -0,0 +1,81 @@ +import { getUsers } from '~/rest_api'; +import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue'; +import UserToken from '~/vue_shared/components/filtered_search_bar/tokens/user_token.vue'; +import { + OPERATORS_IS, + TOKEN_TITLE_STATUS, +} from '~/vue_shared/components/filtered_search_bar/constants'; +import { __ } from '~/locale'; + +const STATUS_OPTIONS = [ + { value: 'closed', title: __('Closed') }, + { value: 'open', title: __('Open') }, +]; + +export const FILTERED_SEARCH_TOKEN_USER = { + type: 'user', + icon: 'user', + title: __('User'), + token: UserToken, + unique: true, + operators: OPERATORS_IS, + fetchUsers: getUsers, + defaultUsers: [], +}; + +export const FILTERED_SEARCH_TOKEN_REPORTER = { + ...FILTERED_SEARCH_TOKEN_USER, + type: 'reporter', + title: __('Reporter'), +}; + +export const FILTERED_SEARCH_TOKEN_STATUS = { + type: 'status', + icon: 'status', + title: TOKEN_TITLE_STATUS, + token: BaseToken, + unique: true, + options: STATUS_OPTIONS, + operators: OPERATORS_IS, +}; + +export const DEFAULT_SORT = 'created_at_desc'; + +export const SORT_OPTIONS = [ + { + id: 10, + title: __('Created date'), + sortDirection: { + descending: DEFAULT_SORT, + ascending: 'created_at_asc', + }, + }, + { + id: 20, + title: __('Updated date'), + sortDirection: { + descending: 'updated_at_desc', + ascending: 'updated_at_asc', + }, + }, +]; + +export const isValidSortKey = (key) => + SORT_OPTIONS.some( + (sort) => sort.sortDirection.ascending === key || sort.sortDirection.descending === key, + ); + +export const FILTERED_SEARCH_TOKEN_CATEGORY = { + type: 'category', + icon: 'label', + title: __('Category'), + token: BaseToken, + unique: true, + operators: OPERATORS_IS, +}; + +export const FILTERED_SEARCH_TOKENS = [ + FILTERED_SEARCH_TOKEN_USER, + FILTERED_SEARCH_TOKEN_REPORTER, + FILTERED_SEARCH_TOKEN_STATUS, +]; diff --git a/app/assets/javascripts/admin/abuse_reports/index.js b/app/assets/javascripts/admin/abuse_reports/index.js new file mode 100644 index 00000000000..dbc466af2d2 --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/index.js @@ -0,0 +1,31 @@ +import Vue from 'vue'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import AbuseReportsApp from './components/app.vue'; + +export const initAbuseReportsApp = () => { + const el = document.querySelector('#js-abuse-reports-list-app'); + + if (!el) { + return null; + } + + const { abuseReportsData } = el.dataset; + const { categories, reports, pagination } = convertObjectPropsToCamelCase( + JSON.parse(abuseReportsData), + { + deep: true, + }, + ); + + return new Vue({ + el, + provide: { categories }, + render: (createElement) => + createElement(AbuseReportsApp, { + props: { + abuseReports: reports, + pagination, + }, + }), + }); +}; diff --git a/app/assets/javascripts/admin/abuse_reports/utils.js b/app/assets/javascripts/admin/abuse_reports/utils.js new file mode 100644 index 00000000000..84221901089 --- /dev/null +++ b/app/assets/javascripts/admin/abuse_reports/utils.js @@ -0,0 +1,6 @@ +import { FILTERED_SEARCH_TOKEN_CATEGORY } from './constants'; + +export const buildFilteredSearchCategoryToken = (categories) => { + const options = categories.map((c) => ({ value: c, title: c })); + return { ...FILTERED_SEARCH_TOKEN_CATEGORY, options }; +}; diff --git a/app/assets/javascripts/admin/application_settings/network_outbound.js b/app/assets/javascripts/admin/application_settings/network_outbound.js new file mode 100644 index 00000000000..ad7ed85131c --- /dev/null +++ b/app/assets/javascripts/admin/application_settings/network_outbound.js @@ -0,0 +1,28 @@ +export default () => { + const denyAllRequests = document.querySelector('.js-deny-all-requests'); + + if (!denyAllRequests) { + return; + } + + denyAllRequests.addEventListener('change', () => { + const denyAll = denyAllRequests.checked; + const allowLocalRequests = document.querySelectorAll('.js-allow-local-requests'); + const denyAllRequestsWarning = document.querySelector('.js-deny-all-requests-warning'); + + if (denyAll) { + denyAllRequestsWarning.classList.remove('gl-display-none'); + } else { + denyAllRequestsWarning.classList.add('gl-display-none'); + } + + allowLocalRequests.forEach((allowLocalRequest) => { + /* eslint-disable no-param-reassign */ + if (denyAll) { + allowLocalRequest.checked = false; + } + allowLocalRequest.disabled = denyAll; + /* eslint-enable no-param-reassign */ + }); + }); +}; diff --git a/app/assets/javascripts/admin/broadcast_messages/components/base.vue b/app/assets/javascripts/admin/broadcast_messages/components/base.vue index f869d21d55f..c28cd266617 100644 --- a/app/assets/javascripts/admin/broadcast_messages/components/base.vue +++ b/app/assets/javascripts/admin/broadcast_messages/components/base.vue @@ -2,7 +2,7 @@ import { GlPagination } from '@gitlab/ui'; import { redirectTo } from '~/lib/utils/url_utility'; import { buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; -import { createAlert, VARIANT_DANGER } from '~/flash'; +import { createAlert, VARIANT_DANGER } from '~/alert'; import { s__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; import { NEW_BROADCAST_MESSAGE } from '../constants'; diff --git a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue index 36796708e78..65aa4cba074 100644 --- a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue +++ b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue @@ -12,16 +12,25 @@ import { } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; -import { createAlert, VARIANT_DANGER } from '~/flash'; +import { createAlert, VARIANT_DANGER } from '~/alert'; import { redirectTo } from '~/lib/utils/url_utility'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { BROADCAST_MESSAGES_PATH, THEMES, TYPES, TYPE_BANNER } from '../constants'; +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; +import SafeHtml from '~/vue_shared/directives/safe_html'; +import { + BROADCAST_MESSAGES_PATH, + MESSAGES_PREVIEW_PATH, + THEMES, + TYPES, + TYPE_BANNER, +} from '../constants'; import MessageFormGroup from './message_form_group.vue'; import DatetimePicker from './datetime_picker.vue'; const FORM_HEADERS = { headers: { 'Content-Type': 'application/json; charset=utf-8' } }; export default { + DEFAULT_DEBOUNCE_AND_THROTTLE_MS, name: 'MessageForm', components: { DatetimePicker, @@ -36,6 +45,9 @@ export default { GlFormTextarea, MessageFormGroup, }, + directives: { + SafeHtml, + }, mixins: [glFeatureFlagsMixin()], inject: ['targetAccessLevelOptions'], i18n: { @@ -81,6 +93,7 @@ export default { })), startsAt: new Date(this.broadcastMessage.startsAt.getTime()), endsAt: new Date(this.broadcastMessage.endsAt.getTime()), + renderedMessage: '', }; }, computed: { @@ -91,7 +104,7 @@ export default { return this.message.trim() === ''; }, messagePreview() { - return this.messageBlank ? this.$options.i18n.messagePlaceholder : this.message; + return this.messageBlank ? this.$options.i18n.messagePlaceholder : this.renderedMessage; }, isAddForm() { return !this.broadcastMessage.id; @@ -114,6 +127,11 @@ export default { }); }, }, + watch: { + message() { + this.renderPreview(); + }, + }, methods: { async onSubmit() { this.loading = true; @@ -140,13 +158,25 @@ export default { } return true; }, + + async renderPreview() { + try { + const res = await axios.post(MESSAGES_PREVIEW_PATH, this.formPayload, FORM_HEADERS); + this.renderedMessage = res.data; + } catch (e) { + this.renderedMessage = ''; + } + }, + }, + safeHtmlConfig: { + ADD_TAGS: ['use'], }, }; </script> <template> <gl-form @submit.prevent="onSubmit"> <gl-broadcast-message class="gl-my-6" :type="type" :theme="theme" :dismissible="dismissable"> - {{ messagePreview }} + <div v-safe-html:[$options.safeHtmlConfig]="messagePreview"></div> </gl-broadcast-message> <message-form-group :label="$options.i18n.message" label-for="message-textarea"> @@ -154,6 +184,7 @@ export default { id="message-textarea" v-model="message" size="sm" + :debounce="$options.DEFAULT_DEBOUNCE_AND_THROTTLE_MS" :placeholder="$options.i18n.messagePlaceholder" /> </message-form-group> diff --git a/app/assets/javascripts/admin/broadcast_messages/constants.js b/app/assets/javascripts/admin/broadcast_messages/constants.js index 6250d5a943d..323ac6857f6 100644 --- a/app/assets/javascripts/admin/broadcast_messages/constants.js +++ b/app/assets/javascripts/admin/broadcast_messages/constants.js @@ -1,6 +1,7 @@ import { s__ } from '~/locale'; export const BROADCAST_MESSAGES_PATH = '/admin/broadcast_messages'; +export const MESSAGES_PREVIEW_PATH = '/admin/broadcast_messages/preview'; export const TYPE_BANNER = 'banner'; export const TYPE_NOTIFICATION = 'notification'; diff --git a/app/assets/javascripts/admin/deploy_keys/components/table.vue b/app/assets/javascripts/admin/deploy_keys/components/table.vue index be85ee43891..134498af348 100644 --- a/app/assets/javascripts/admin/deploy_keys/components/table.vue +++ b/app/assets/javascripts/admin/deploy_keys/components/table.vue @@ -5,7 +5,7 @@ import { __ } from '~/locale'; import Api, { DEFAULT_PER_PAGE } from '~/api'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { cleanLeadingSeparator } from '~/lib/utils/url_utility'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import csrf from '~/lib/utils/csrf'; export default { diff --git a/app/assets/javascripts/admin/statistics_panel/store/actions.js b/app/assets/javascripts/admin/statistics_panel/store/actions.js index 4f952698d7a..7372f03ec0b 100644 --- a/app/assets/javascripts/admin/statistics_panel/store/actions.js +++ b/app/assets/javascripts/admin/statistics_panel/store/actions.js @@ -1,5 +1,5 @@ import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/admin/users/components/actions/activate.vue b/app/assets/javascripts/admin/users/components/actions/activate.vue index 3a54035c587..0099c8da8e6 100644 --- a/app/assets/javascripts/admin/users/components/actions/activate.vue +++ b/app/assets/javascripts/admin/users/components/actions/activate.vue @@ -41,7 +41,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.activate, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/approve.vue b/app/assets/javascripts/admin/users/components/actions/approve.vue index 5a8c675822d..52560ebe5b1 100644 --- a/app/assets/javascripts/admin/users/components/actions/approve.vue +++ b/app/assets/javascripts/admin/users/components/actions/approve.vue @@ -43,7 +43,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.approve, - attributes: [{ variant: 'confirm', 'data-qa-selector': 'approve_user_confirm_button' }], + attributes: { variant: 'confirm', 'data-qa-selector': 'approve_user_confirm_button' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue index 898a688c203..203d076914f 100644 --- a/app/assets/javascripts/admin/users/components/actions/ban.vue +++ b/app/assets/javascripts/admin/users/components/actions/ban.vue @@ -56,7 +56,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.ban, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/block.vue b/app/assets/javascripts/admin/users/components/actions/block.vue index d25dd400f9b..d50b76aaa92 100644 --- a/app/assets/javascripts/admin/users/components/actions/block.vue +++ b/app/assets/javascripts/admin/users/components/actions/block.vue @@ -42,7 +42,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.block, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/deactivate.vue b/app/assets/javascripts/admin/users/components/actions/deactivate.vue index c85f3f01675..ab1069601d2 100644 --- a/app/assets/javascripts/admin/users/components/actions/deactivate.vue +++ b/app/assets/javascripts/admin/users/components/actions/deactivate.vue @@ -51,7 +51,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.deactivate, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/reject.vue b/app/assets/javascripts/admin/users/components/actions/reject.vue index bac08de1d5e..2b9c4acfcb5 100644 --- a/app/assets/javascripts/admin/users/components/actions/reject.vue +++ b/app/assets/javascripts/admin/users/components/actions/reject.vue @@ -54,7 +54,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.reject, - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/unban.vue b/app/assets/javascripts/admin/users/components/actions/unban.vue index beede2d37d7..42b6fb3bdd4 100644 --- a/app/assets/javascripts/admin/users/components/actions/unban.vue +++ b/app/assets/javascripts/admin/users/components/actions/unban.vue @@ -37,7 +37,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.unban, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, messageHtml, }, diff --git a/app/assets/javascripts/admin/users/components/actions/unblock.vue b/app/assets/javascripts/admin/users/components/actions/unblock.vue index 720f2efd932..f94e128a945 100644 --- a/app/assets/javascripts/admin/users/components/actions/unblock.vue +++ b/app/assets/javascripts/admin/users/components/actions/unblock.vue @@ -32,7 +32,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.unblock, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, }, }); diff --git a/app/assets/javascripts/admin/users/components/actions/unlock.vue b/app/assets/javascripts/admin/users/components/actions/unlock.vue index 55ea3e0aba7..c78c260b4fe 100644 --- a/app/assets/javascripts/admin/users/components/actions/unlock.vue +++ b/app/assets/javascripts/admin/users/components/actions/unlock.vue @@ -31,7 +31,7 @@ export default { }, actionPrimary: { text: I18N_USER_ACTIONS.unlock, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, }, }); diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue index f569cda0a4b..e55622d40ba 100644 --- a/app/assets/javascripts/admin/users/components/users_table.vue +++ b/app/assets/javascripts/admin/users/components/users_table.vue @@ -1,6 +1,6 @@ <script> import { GlSkeletonLoader, GlTable } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertNodeIdsFromGraphQLIds } from '~/graphql_shared/utils'; import { thWidthPercent } from '~/lib/utils/table_utility'; import { s__, __ } from '~/locale'; diff --git a/app/assets/javascripts/airflow/dags/components/dags.vue b/app/assets/javascripts/airflow/dags/components/dags.vue deleted file mode 100644 index 88eb3fd5aba..00000000000 --- a/app/assets/javascripts/airflow/dags/components/dags.vue +++ /dev/null @@ -1,111 +0,0 @@ -<script> -import { GlTableLite, GlEmptyState, GlPagination, GlTooltipDirective } from '@gitlab/ui'; -import { s__ } from '~/locale'; -import { setUrlParams } from '~/lib/utils/url_utility'; -import { formatDate } from '~/lib/utils/datetime/date_format_utility'; -import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; -import IncubationAlert from '~/vue_shared/components/incubation/incubation_alert.vue'; - -export default { - name: 'AirflowDags', - components: { - GlTableLite, - GlEmptyState, - IncubationAlert, - GlPagination, - TimeAgo, - }, - directives: { - GlTooltip: GlTooltipDirective, - }, - props: { - dags: { - type: Array, - required: true, - }, - pagination: { - type: Object, - required: true, - }, - }, - computed: { - fields() { - return [ - { key: 'dag_name', label: this.$options.i18n.dagLabel }, - { key: 'schedule', label: this.$options.scheduleLabel }, - { key: 'next_run', label: this.$options.nextRunLabel }, - { key: 'is_active', label: this.$options.isActiveLabel }, - { key: 'is_paused', label: this.$options.isPausedLabel }, - { key: 'fileloc', label: this.$options.fileLocLabel }, - ]; - }, - hasPagination() { - return this.dags.length > 0; - }, - prevPage() { - return this.pagination.page > 1 ? this.pagination.page - 1 : null; - }, - nextPage() { - return !this.pagination.isLastPage ? this.pagination.page + 1 : null; - }, - emptyState() { - return { - svgPath: '/assets/illustrations/empty-state/empty-dag-md.svg', - }; - }, - }, - methods: { - generateLink(page) { - return setUrlParams({ page }); - }, - formatDate(dateString) { - return formatDate(new Date(dateString)); - }, - }, - i18n: { - emptyStateLabel: s__('Airflow|There are no DAGs to show'), - emptyStateDescription: s__( - 'Airflow|Either the Airflow instance does not contain DAGs or has yet to be configured', - ), - dagLabel: s__('Airflow|DAG'), - scheduleLabel: s__('Airflow|Schedule'), - nextRunLabel: s__('Airflow|Next run'), - isActiveLabel: s__('Airflow|Is active'), - isPausedLabel: s__('Airflow|Is paused'), - fileLocLabel: s__('Airflow|DAG file location'), - featureName: s__('Airflow|GitLab Airflow integration'), - }, - linkToFeedbackIssue: - 'https://gitlab.com/gitlab-org/incubation-engineering/airflow/meta/-/issues/2', -}; -</script> - -<template> - <div> - <incubation-alert - :feature-name="$options.i18n.featureName" - :link-to-feedback-issue="$options.linkToFeedbackIssue" - /> - <gl-empty-state - v-if="!dags.length" - :title="$options.i18n.emptyStateLabel" - :description="$options.i18n.emptyStateDescription" - :svg-path="emptyState.svgPath" - /> - <gl-table-lite v-else :items="dags" :fields="fields" class="gl-mt-0!"> - <template #cell(next_run)="data"> - <time-ago v-gl-tooltip.hover :time="data.value" :title="formatDate(data.value)" /> - </template> - </gl-table-lite> - <gl-pagination - v-if="hasPagination" - :value="pagination.page" - :prev-page="prevPage" - :next-page="nextPage" - :total-items="pagination.totalItems" - :per-page="pagination.perPage" - :link-gen="generateLink" - align="center" - /> - </div> -</template> diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/alert.js index 483f1d2c7a0..006c4f50d09 100644 --- a/app/assets/javascripts/flash.js +++ b/app/assets/javascripts/alert.js @@ -15,7 +15,7 @@ export const VARIANT_TIP = 'tip'; * * @example * // Render a new alert - * import { createAlert, VARIANT_WARNING } from '~/flash'; + * import { createAlert, VARIANT_WARNING } from '~/alert'; * * createAlert({ message: 'My error message' }); * createAlert({ message: 'My warning message', variant: VARIANT_WARNING }); diff --git a/app/assets/javascripts/alerts_settings/components/alerts_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_form.vue index 38bcdef3e04..b9e37b9ede7 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_form.vue @@ -5,8 +5,7 @@ import { GlLink, GlFormGroup, GlFormCheckbox, - GlDropdown, - GlDropdownItem, + GlCollapsibleListbox, } from '@gitlab/ui'; import { I18N_ALERT_SETTINGS_FORM, @@ -22,8 +21,7 @@ export default { GlLink, GlFormGroup, GlFormCheckbox, - GlDropdown, - GlDropdownItem, + GlCollapsibleListbox, }, inject: ['service', 'alertSettings'], data() { @@ -40,9 +38,6 @@ export default { TAKING_INCIDENT_ACTION_DOCS_LINK, ISSUE_TEMPLATES_DOCS_LINK, computed: { - issueTemplateHeader() { - return this.issueTemplate || NO_ISSUE_TEMPLATE_SELECTED.name; - }, formData() { return { create_issue: this.createIssueEnabled, @@ -53,12 +48,6 @@ export default { }, }, methods: { - selectIssueTemplate(templateKey) { - this.issueTemplate = templateKey; - }, - isTemplateSelected(templateKey) { - return templateKey === this.issueTemplate; - }, updateAlertsIntegrationSettings() { this.loading = true; @@ -99,23 +88,13 @@ export default { <span class="gl-font-weight-normal gl-pl-2">{{ $options.i18n.introLinkText }}</span> </gl-link> </label> - <gl-dropdown + <gl-collapsible-listbox id="alert-integration-settings-issue-template" + v-model="issueTemplate" + :items="templates" + block data-qa-selector="incident_templates_dropdown" - :text="issueTemplateHeader" - :block="true" - > - <gl-dropdown-item - v-for="template in templates" - :key="template.key" - data-qa-selector="incident_templates_item" - is-check-item - :is-checked="isTemplateSelected(template.key)" - @click="selectIssueTemplate(template.key)" - > - {{ template.name }} - </gl-dropdown-item> - </gl-dropdown> + /> </gl-form-group> <gl-form-group class="gl-pl-0 gl-mb-5"> diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue index 7dd33da435a..cc8913c2f45 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue @@ -2,7 +2,7 @@ import { GlButton, GlAlert, GlTabs, GlTab } from '@gitlab/ui'; import createHttpIntegrationMutation from 'ee_else_ce/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql'; import updateHttpIntegrationMutation from 'ee_else_ce/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql'; -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { fetchPolicies } from '~/lib/graphql'; import { HTTP_STATUS_FORBIDDEN } from '~/lib/utils/http_status'; import { typeSet, i18n, tabIndices } from '../constants'; diff --git a/app/assets/javascripts/alerts_settings/constants.js b/app/assets/javascripts/alerts_settings/constants.js index b93119d6e6a..de7240009bc 100644 --- a/app/assets/javascripts/alerts_settings/constants.js +++ b/app/assets/javascripts/alerts_settings/constants.js @@ -183,7 +183,7 @@ export const I18N_ALERT_SETTINGS_FORM = { }, }; -export const NO_ISSUE_TEMPLATE_SELECTED = { key: '', name: __('No template selected') }; +export const NO_ISSUE_TEMPLATE_SELECTED = { value: '', text: __('No template selected') }; export const TAKING_INCIDENT_ACTION_DOCS_LINK = '/help/operations/metrics/alerts#trigger-actions-from-alerts'; export const ISSUE_TEMPLATES_DOCS_LINK = diff --git a/app/assets/javascripts/alerts_settings/utils/cache_updates.js b/app/assets/javascripts/alerts_settings/utils/cache_updates.js index 2e64312b0e0..e03ebffd17a 100644 --- a/app/assets/javascripts/alerts_settings/utils/cache_updates.js +++ b/app/assets/javascripts/alerts_settings/utils/cache_updates.js @@ -1,5 +1,5 @@ import produce from 'immer'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { DELETE_INTEGRATION_ERROR, ADD_INTEGRATION_ERROR } from './error_messages'; diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue index a688e2f497b..704b4ce9c8a 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue @@ -4,7 +4,7 @@ import { mapActions, mapState, mapGetters } from 'vuex'; import { getCookie, setCookie } from '~/lib/utils/common_utils'; import ValueStreamMetrics from '~/analytics/shared/components/value_stream_metrics.vue'; import { VSA_METRICS_GROUPS } from '~/analytics/shared/constants'; -import { toYmd } from '~/analytics/shared/utils'; +import { toYmd, generateValueStreamsDashboardLink } from '~/analytics/shared/utils'; import PathNavigation from '~/analytics/cycle_analytics/components/path_navigation.vue'; import StageTable from '~/analytics/cycle_analytics/components/stage_table.vue'; import ValueStreamFilters from '~/analytics/cycle_analytics/components/value_stream_filters.vue'; @@ -48,12 +48,13 @@ export default { 'selectedStageEvents', 'selectedStageError', 'stageCounts', - 'endpoints', 'features', 'createdBefore', 'createdAfter', 'pagination', 'hasNoAccessError', + 'groupPath', + 'namespace', ]), ...mapGetters(['pathNavigationData', 'filterParams']), isLoaded() { @@ -98,8 +99,25 @@ export default { } return 0; }, + hasCycleAnalyticsForGroups() { + return this.features?.cycleAnalyticsForGroups; + }, metricsRequests() { - return this.features?.cycleAnalyticsForGroups ? METRICS_REQUESTS : SUMMARY_METRICS_REQUEST; + return this.hasCycleAnalyticsForGroups ? METRICS_REQUESTS : SUMMARY_METRICS_REQUEST; + }, + showLinkToDashboard() { + return Boolean( + this.features?.groupLevelAnalyticsDashboard && this.features?.groupAnalyticsDashboardsPage, + ); + }, + dashboardsPath() { + const { + namespace: { fullPath }, + groupPath, + } = this; + return this.showLinkToDashboard + ? generateValueStreamsDashboardLink(groupPath, [fullPath]) + : null; }, query() { return { @@ -150,8 +168,7 @@ export default { <div> <h3>{{ $options.i18n.pageTitle }}</h3> <value-stream-filters - :group-id="endpoints.groupId" - :group-path="endpoints.groupPath" + :group-path="groupPath" :has-project-filter="false" :start-date="createdAfter" :end-date="createdBefore" @@ -169,10 +186,11 @@ export default { /> </div> <value-stream-metrics - :request-path="endpoints.fullPath" + :request-path="namespace.fullPath" :request-params="filterParams" :requests="metricsRequests" :group-by="$options.VSA_METRICS_GROUPS" + :dashboards-path="dashboardsPath" /> <gl-loading-icon v-if="isLoading" size="lg" /> <stage-table diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue index ac41bc4917c..d305132ae33 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/path_navigation.vue @@ -66,33 +66,38 @@ export default { <template #title>{{ pathItem.title }}</template> <div class="gl-px-4"> <div class="gl-display-flex gl-justify-content-space-between"> - <div class="gl-pr-4 gl-pb-4"> + <div class="gl-pr-4 gl-pb-3"> {{ s__('ValueStreamEvent|Stage time (median)') }} </div> - <div class="gl-pb-4 gl-font-weight-bold">{{ pathItem.metric }}</div> + <div class="gl-pb-3 gl-font-weight-bold">{{ pathItem.metric }}</div> </div> </div> <div class="gl-px-4"> <div class="gl-display-flex gl-justify-content-space-between"> - <div class="gl-pr-4 gl-pb-4"> + <div class="gl-pr-4 gl-pb-3"> {{ s__('ValueStreamEvent|Items in stage') }} </div> - <div class="gl-pb-4 gl-font-weight-bold"> + <div class="gl-pb-3 gl-font-weight-bold"> <formatted-stage-count :stage-count="pathItem.stageCount" /> </div> </div> </div> + <div class="gl-px-4"> + <div class="gl-pb-3 gl-font-style-italic"> + {{ s__('ValueStreamEvent|Only items that reached their stop event.') }} + </div> + </div> <div class="gl-px-4 gl-pt-4 gl-border-t-1 gl-border-t-solid gl-border-gray-50"> <div v-if="pathItem.startEventHtmlDescription" class="gl-display-flex gl-flex-direction-row" > - <div class="gl-display-flex gl-flex-direction-column gl-pr-4 gl-pb-4 metric-label"> + <div class="gl-display-flex gl-flex-direction-column gl-pr-4 gl-pb-3 metric-label"> {{ s__('ValueStreamEvent|Start') }} </div> <div v-safe-html="pathItem.startEventHtmlDescription" - class="gl-display-flex gl-flex-direction-column gl-pb-4 stage-event-description" + class="gl-display-flex gl-flex-direction-column gl-pb-3 stage-event-description" ></div> </div> <div diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue index 17decb6b448..4c7e18f9895 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue @@ -31,10 +31,6 @@ export default { required: false, default: true, }, - groupId: { - type: Number, - required: true, - }, groupPath: { type: String, required: true, @@ -82,9 +78,7 @@ export default { <div> <projects-dropdown-filter v-if="hasProjectFilter" - :key="groupId" class="js-projects-dropdown-filter project-select gl-mb-2 gl-lg-mb-0" - :group-id="groupId" :group-namespace="groupPath" :query-params="projectsQueryParams" :multi-select="$options.multiProjectSelect" diff --git a/app/assets/javascripts/analytics/cycle_analytics/constants.js b/app/assets/javascripts/analytics/cycle_analytics/constants.js index 2758d686fb1..ebb2775b378 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/constants.js +++ b/app/assets/javascripts/analytics/cycle_analytics/constants.js @@ -32,11 +32,6 @@ export const I18N_VSA_ERROR_SELECTED_STAGE = __( 'There was an error fetching data for the selected stage', ); -export const OVERVIEW_METRICS = { - TIME_SUMMARY: 'TIME_SUMMARY', - RECENT_ACTIVITY: 'RECENT_ACTIVITY', -}; - export const SUMMARY_METRICS_REQUEST = [ { endpoint: METRIC_TYPE_SUMMARY, name: __('recent activity'), request: getValueStreamMetrics }, ]; @@ -45,3 +40,6 @@ export const METRICS_REQUESTS = [ { endpoint: METRIC_TYPE_TIME_SUMMARY, name: __('time summary'), request: getValueStreamMetrics }, ...SUMMARY_METRICS_REQUEST, ]; + +export const MILESTONES_ENDPOINT = '/-/milestones.json'; +export const LABELS_ENDPOINT = '/-/labels.json'; diff --git a/app/assets/javascripts/analytics/cycle_analytics/store/actions.js b/app/assets/javascripts/analytics/cycle_analytics/store/actions.js index 4a201e00582..32fe0abe83e 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/store/actions.js +++ b/app/assets/javascripts/analytics/cycle_analytics/store/actions.js @@ -6,9 +6,15 @@ import { getValueStreamStageCounts, } from '~/api/analytics_api'; import { normalizeHeaders, parseIntPagination } from '~/lib/utils/common_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; -import { DEFAULT_VALUE_STREAM, I18N_VSA_ERROR_STAGE_MEDIAN } from '../constants'; +import { + DEFAULT_VALUE_STREAM, + I18N_VSA_ERROR_STAGE_MEDIAN, + LABELS_ENDPOINT, + MILESTONES_ENDPOINT, +} from '../constants'; +import { constructPathWithNamespace } from '../utils'; import * as types from './mutation_types'; export const setSelectedValueStream = ({ commit, dispatch }, valueStream) => { @@ -18,7 +24,7 @@ export const setSelectedValueStream = ({ commit, dispatch }, valueStream) => { export const fetchValueStreamStages = ({ commit, state }) => { const { - endpoints: { fullPath }, + namespace: { fullPath }, selectedValueStream: { id }, } = state; commit(types.REQUEST_VALUE_STREAM_STAGES); @@ -41,7 +47,7 @@ export const receiveValueStreamsSuccess = ({ commit, dispatch }, data = []) => { export const fetchValueStreams = ({ commit, dispatch, state }) => { const { - endpoints: { fullPath }, + namespace: { fullPath }, } = state; commit(types.REQUEST_VALUE_STREAMS); @@ -180,7 +186,8 @@ export const initializeVsa = async ({ commit, dispatch }, initialData = {}) => { commit(types.INITIALIZE_VSA, initialData); const { - endpoints: { fullPath, groupPath, milestonesPath = '', labelsPath = '' }, + groupPath, + namespace, selectedAuthor, selectedMilestone, selectedAssigneeList, @@ -189,10 +196,10 @@ export const initializeVsa = async ({ commit, dispatch }, initialData = {}) => { } = initialData; dispatch('filters/setEndpoints', { - labelsEndpoint: labelsPath, - milestonesEndpoint: milestonesPath, + labelsEndpoint: constructPathWithNamespace(namespace, LABELS_ENDPOINT), + milestonesEndpoint: constructPathWithNamespace(namespace, MILESTONES_ENDPOINT), groupEndpoint: groupPath, - projectEndpoint: fullPath, + projectEndpoint: namespace.fullPath, }); dispatch('filters/initialize', { diff --git a/app/assets/javascripts/analytics/cycle_analytics/store/getters.js b/app/assets/javascripts/analytics/cycle_analytics/store/getters.js index 83068cabf0f..f5ed922c602 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/store/getters.js +++ b/app/assets/javascripts/analytics/cycle_analytics/store/getters.js @@ -15,11 +15,11 @@ export const pathNavigationData = ({ stages, medians, stageCounts, selectedStage export const requestParams = (state) => { const { - endpoints: { fullPath }, + namespace: { fullPath }, selectedValueStream: { id: valueStreamId }, selectedStage: { id: stageId = null }, } = state; - return { requestPath: fullPath, valueStreamId, stageId }; + return { namespacePath: fullPath, valueStreamId, stageId }; }; export const paginationParams = ({ pagination: { page, sort, direction } }) => ({ diff --git a/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js b/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js index 8567529caf2..4af96fc96e3 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js +++ b/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js @@ -1,15 +1,16 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { PAGINATION_SORT_FIELD_END_EVENT, PAGINATION_SORT_DIRECTION_DESC } from '../constants'; import { formatMedianValues } from '../utils'; +import { PAGINATION_SORT_FIELD_END_EVENT, PAGINATION_SORT_DIRECTION_DESC } from '../constants'; import * as types from './mutation_types'; export default { [types.INITIALIZE_VSA]( state, - { endpoints, features, createdBefore, createdAfter, pagination = {} }, + { groupPath, features, createdBefore, createdAfter, pagination = {}, namespace = {} }, ) { - state.endpoints = endpoints; + state.groupPath = groupPath; + state.namespace = namespace; state.createdBefore = createdBefore; state.createdAfter = createdAfter; state.features = features; diff --git a/app/assets/javascripts/analytics/cycle_analytics/store/state.js b/app/assets/javascripts/analytics/cycle_analytics/store/state.js index 00dd2e53883..0c51656c59f 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/store/state.js +++ b/app/assets/javascripts/analytics/cycle_analytics/store/state.js @@ -6,7 +6,11 @@ import { export default () => ({ id: null, features: {}, - endpoints: {}, + groupPath: {}, + namespace: { + name: null, + fullPath: null, + }, createdAfter: null, createdBefore: null, stages: [], diff --git a/app/assets/javascripts/analytics/cycle_analytics/utils.js b/app/assets/javascripts/analytics/cycle_analytics/utils.js index 428bb11b950..9265ff952e0 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/utils.js +++ b/app/assets/javascripts/analytics/cycle_analytics/utils.js @@ -1,5 +1,6 @@ import { parseSeconds } from '~/lib/utils/datetime_utility'; import { formatTimeAsSummary } from '~/lib/utils/datetime/date_format_utility'; +import { joinPaths } from '~/lib/utils/url_utility'; /** * Takes the stages and median data, combined with the selected stage, to build an @@ -77,7 +78,11 @@ export const filterStagesByHiddenStatus = (stages = [], isHidden = true) => */ const extractFeatures = (gon) => ({ + // licensed feature toggles cycleAnalyticsForGroups: Boolean(gon?.licensed_features?.cycleAnalyticsForGroups), + groupLevelAnalyticsDashboard: Boolean(gon?.licensed_features?.groupLevelAnalyticsDashboard), + // feature flags + groupAnalyticsDashboardsPage: Boolean(gon?.features?.groupAnalyticsDashboardsPage), }); /** @@ -87,27 +92,21 @@ const extractFeatures = (gon) => ({ * @returns {Object} - The initial data to load the app with */ export const buildCycleAnalyticsInitialData = ({ - fullPath, - requestPath, projectId, - groupId, groupPath, - labelsPath, - milestonesPath, stage, createdAfter, createdBefore, + namespaceName, + namespaceFullPath, gon, } = {}) => { return { projectId: parseInt(projectId, 10), - endpoints: { - requestPath, - fullPath, - labelsPath, - milestonesPath, - groupId: parseInt(groupId, 10), - groupPath, + groupPath: `groups/${groupPath}`, + namespace: { + name: namespaceName, + fullPath: namespaceFullPath, }, createdAfter: new Date(createdAfter), createdBefore: new Date(createdBefore), @@ -115,3 +114,6 @@ export const buildCycleAnalyticsInitialData = ({ features: extractFeatures(gon), }; }; + +export const constructPathWithNamespace = ({ fullPath }, endpoint) => + joinPaths('/', fullPath, endpoint); diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue index 5bb60d91f1e..98193de4a12 100644 --- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue +++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue @@ -32,11 +32,6 @@ export default { GlTruncate, }, props: { - groupId: { - type: Number, - required: false, - default: null, - }, groupNamespace: { type: String, required: true, diff --git a/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue b/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue index cc7b554f32c..3082897af76 100644 --- a/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue +++ b/app/assets/javascripts/analytics/shared/components/value_stream_metrics.vue @@ -1,9 +1,10 @@ <script> import { GlSkeletonLoader } from '@gitlab/ui'; import { isEqual, keyBy } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sprintf, s__ } from '~/locale'; import { fetchMetricsData, removeFlash } from '../utils'; +import ValueStreamsDashboardLink from './value_streams_dashboard_link.vue'; import MetricTile from './metric_tile.vue'; const extractMetricsGroupData = (keyList = [], data = []) => { @@ -28,6 +29,7 @@ export default { components: { GlSkeletonLoader, MetricTile, + ValueStreamsDashboardLink, }, props: { requestPath: { @@ -52,6 +54,11 @@ export default { required: false, default: () => [], }, + dashboardsPath: { + type: String, + required: false, + default: null, + }, }, data() { return { @@ -76,6 +83,10 @@ export default { this.fetchData(); }, methods: { + shouldDisplayDashboardLink(index) { + // When we have groups of metrics, we should only display the link for the first group + return index === 0 && this.dashboardsPath; + }, fetchData() { removeFlash(); this.isLoading = true; @@ -110,7 +121,7 @@ export default { <template v-else> <div v-if="hasGroupedMetrics" class="gl-flex-direction-column"> <div - v-for="group in groupedMetrics" + v-for="(group, groupIndex) in groupedMetrics" :key="group.key" class="gl-mb-7" data-testid="vsa-metrics-group" @@ -123,6 +134,11 @@ export default { :metric="metric" class="gl-mt-5 gl-pr-10" /> + <value-streams-dashboard-link + v-if="shouldDisplayDashboardLink(groupIndex)" + class="gl-mt-5" + :request-path="dashboardsPath" + /> </div> </div> </div> diff --git a/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue new file mode 100644 index 00000000000..95a6447ebaf --- /dev/null +++ b/app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue @@ -0,0 +1,30 @@ +<script> +import { GlIcon, GlLink } from '@gitlab/ui'; +import { __ } from '~/locale'; + +export default { + name: 'ValueStreamsDashboardLink', + components: { GlIcon, GlLink }, + props: { + requestPath: { + type: String, + required: true, + }, + }, + i18n: { + title: __('Related'), + linkText: __('Value Streams Dashboard | DORA'), + }, +}; +</script> +<template> + <div class="gl-display-flex gl-flex-direction-column" data-testid="vsd-link"> + <div class="gl-display-flex gl-mb-2"> + <span>{{ $options.i18n.title }}</span> + </div> + <div class="gl-display-flex gl-align-items-baseline"> + <gl-link :href="requestPath">{{ $options.i18n.linkText }}</gl-link + > <gl-icon name="dashboard" /> + </div> + </div> +</template> diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js index aafbf642766..a85f3fb3730 100644 --- a/app/assets/javascripts/analytics/shared/utils.js +++ b/app/assets/javascripts/analytics/shared/utils.js @@ -1,6 +1,7 @@ import { flatten } from 'lodash'; import dateFormat from '~/lib/dateformat'; import { slugify } from '~/lib/utils/text_utility'; +import { joinPaths } from '~/lib/utils/url_utility'; import { urlQueryToFilter } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils'; import { dateFormats, METRICS_POPOVER_CONTENT } from './constants'; @@ -119,3 +120,21 @@ export const fetchMetricsData = (requests = [], requestPath, params) => { prepareTimeMetricsData(flatten(responses), METRICS_POPOVER_CONTENT), ); }; + +/** + * Generates a URL link to the VSD dashboard based on the group + * and project paths passed into the method. + * + * @param {String} groupPath - Path of the specified group + * @param {Array} projectPaths - Array of project paths to include in the `query` parameter + * @returns a URL or blank string if there is no groupPath set + */ +export const generateValueStreamsDashboardLink = (groupPath, projectPaths = []) => { + if (groupPath.length) { + const query = projectPaths.length ? `?query=${projectPaths.join(',')}` : ''; + const dashboardsSlug = '/-/analytics/dashboards/value_streams_dashboard'; + const segments = [gon.relative_url_root || '', '/', groupPath, dashboardsSlug]; + return joinPaths(...segments).concat(query); + } + return ''; +}; diff --git a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue index 5651789e2c7..1fd1f91bda3 100644 --- a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue +++ b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue @@ -1,7 +1,7 @@ <script> import { GlSkeletonLoader } from '@gitlab/ui'; import { GlSingleStat } from '@gitlab/ui/dist/charts'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { number } from '~/lib/utils/unit_format'; import { __, s__ } from '~/locale'; import usageTrendsCountQuery from '../graphql/queries/usage_trends_count.query.graphql'; diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index b02dd9321b3..87c74438d00 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import axios from './lib/utils/axios_utils'; import { joinPaths } from './lib/utils/url_utility'; diff --git a/app/assets/javascripts/api/analytics_api.js b/app/assets/javascripts/api/analytics_api.js index 66ed30130bb..35c9fa20e56 100644 --- a/app/assets/javascripts/api/analytics_api.js +++ b/app/assets/javascripts/api/analytics_api.js @@ -2,8 +2,8 @@ import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { buildApiUrl } from './api_utils'; -const PROJECT_VSA_METRICS_BASE = '/:request_path/-/analytics/value_stream_analytics'; -const PROJECT_VSA_PATH_BASE = '/:request_path/-/analytics/value_stream_analytics/value_streams'; +const PROJECT_VSA_METRICS_BASE = '/:namespace_path/-/analytics/value_stream_analytics'; +const PROJECT_VSA_PATH_BASE = '/:namespace_path/-/analytics/value_stream_analytics/value_streams'; const PROJECT_VSA_STAGES_PATH = `${PROJECT_VSA_PATH_BASE}/:value_stream_id/stages`; const PROJECT_VSA_STAGE_DATA_PATH = `${PROJECT_VSA_STAGES_PATH}/:stage_id`; @@ -15,71 +15,77 @@ export const DEPLOYS_METRIC_TYPE = 'deploys'; export const METRIC_TYPE_SUMMARY = 'summary'; export const METRIC_TYPE_TIME_SUMMARY = 'time_summary'; -const buildProjectMetricsPath = (requestPath) => - buildApiUrl(PROJECT_VSA_METRICS_BASE).replace(':request_path', requestPath); +const buildProjectMetricsPath = (namespacePath) => + buildApiUrl(PROJECT_VSA_METRICS_BASE).replace(':namespace_path', namespacePath); -const buildProjectValueStreamPath = (requestPath, valueStreamId = null) => { +const buildProjectValueStreamPath = (namespacePath, valueStreamId = null) => { if (valueStreamId) { return buildApiUrl(PROJECT_VSA_STAGES_PATH) - .replace(':request_path', requestPath) + .replace(':namespace_path', namespacePath) .replace(':value_stream_id', valueStreamId); } - return buildApiUrl(PROJECT_VSA_PATH_BASE).replace(':request_path', requestPath); + return buildApiUrl(PROJECT_VSA_PATH_BASE).replace(':namespace_path', namespacePath); }; -const buildValueStreamStageDataPath = ({ requestPath, valueStreamId = null, stageId = null }) => +const buildValueStreamStageDataPath = ({ namespacePath, valueStreamId = null, stageId = null }) => buildApiUrl(PROJECT_VSA_STAGE_DATA_PATH) - .replace(':request_path', requestPath) + .replace(':namespace_path', namespacePath) .replace(':value_stream_id', valueStreamId) .replace(':stage_id', stageId); -export const getProjectValueStreams = (requestPath) => { - const url = buildProjectValueStreamPath(requestPath); +export const getProjectValueStreams = (namespacePath) => { + const url = buildProjectValueStreamPath(namespacePath); return axios.get(url); }; -export const getProjectValueStreamStages = (requestPath, valueStreamId) => { - const url = buildProjectValueStreamPath(requestPath, valueStreamId); +export const getProjectValueStreamStages = (namespacePath, valueStreamId) => { + const url = buildProjectValueStreamPath(namespacePath, valueStreamId); return axios.get(url); }; // NOTE: legacy VSA request use a different path -// the `requestPath` provides a full url for the request -export const getProjectValueStreamStageData = ({ requestPath, stageId, params }) => - axios.get(joinPaths(requestPath, 'events', stageId), { params }); +// the `namespacePath` provides a full url for the request +export const getProjectValueStreamStageData = ({ namespacePath, stageId, params }) => + axios.get(joinPaths(namespacePath, 'events', stageId), { params }); /** * Dedicated project VSA paths */ -export const getValueStreamStageMedian = ({ requestPath, valueStreamId, stageId }, params = {}) => { - const stageBase = buildValueStreamStageDataPath({ requestPath, valueStreamId, stageId }); +export const getValueStreamStageMedian = ( + { namespacePath, valueStreamId, stageId }, + params = {}, +) => { + const stageBase = buildValueStreamStageDataPath({ namespacePath, valueStreamId, stageId }); return axios.get(joinPaths(stageBase, 'median'), { params }); }; export const getValueStreamStageRecords = ( - { requestPath, valueStreamId, stageId }, + { namespacePath, valueStreamId, stageId }, params = {}, ) => { - const stageBase = buildValueStreamStageDataPath({ requestPath, valueStreamId, stageId }); + const stageBase = buildValueStreamStageDataPath({ namespacePath, valueStreamId, stageId }); return axios.get(joinPaths(stageBase, 'records'), { params }); }; -export const getValueStreamStageCounts = ({ requestPath, valueStreamId, stageId }, params = {}) => { - const stageBase = buildValueStreamStageDataPath({ requestPath, valueStreamId, stageId }); +export const getValueStreamStageCounts = ( + { namespacePath, valueStreamId, stageId }, + params = {}, +) => { + const stageBase = buildValueStreamStageDataPath({ namespacePath, valueStreamId, stageId }); return axios.get(joinPaths(stageBase, 'count'), { params }); }; export const getValueStreamMetrics = ({ endpoint = METRIC_TYPE_SUMMARY, - requestPath, + requestPath: namespacePath, params = {}, }) => { - const metricBase = buildProjectMetricsPath(requestPath); + const metricBase = buildProjectMetricsPath(namespacePath); return axios.get(joinPaths(metricBase, endpoint), { params }); }; -export const getValueStreamSummaryMetrics = (requestPath, params = {}) => { - const metricBase = buildProjectMetricsPath(requestPath); +export const getValueStreamSummaryMetrics = (namespacePath, params = {}) => { + const metricBase = buildProjectMetricsPath(namespacePath); return axios.get(joinPaths(metricBase, 'summary'), { params }); }; diff --git a/app/assets/javascripts/api/user_api.js b/app/assets/javascripts/api/user_api.js index 45fddc3a696..bcb0f079d3d 100644 --- a/app/assets/javascripts/api/user_api.js +++ b/app/assets/javascripts/api/user_api.js @@ -1,5 +1,5 @@ import { DEFAULT_PER_PAGE } from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import axios from '../lib/utils/axios_utils'; import { buildApiUrl } from './api_utils'; diff --git a/app/assets/javascripts/artifacts/components/artifact_row.vue b/app/assets/javascripts/artifacts/components/artifact_row.vue index fffdfce60a7..f37c4c6f107 100644 --- a/app/assets/javascripts/artifacts/components/artifact_row.vue +++ b/app/assets/javascripts/artifacts/components/artifact_row.vue @@ -1,7 +1,8 @@ <script> -import { GlButtonGroup, GlButton, GlBadge, GlFriendlyWrap } from '@gitlab/ui'; +import { GlButtonGroup, GlButton, GlBadge, GlFriendlyWrap, GlFormCheckbox } from '@gitlab/ui'; import { numberToHumanSize } from '~/lib/utils/number_utils'; -import { I18N_EXPIRED, I18N_DOWNLOAD, I18N_DELETE } from '../constants'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { I18N_EXPIRED, I18N_DOWNLOAD, I18N_DELETE, BULK_DELETE_FEATURE_FLAG } from '../constants'; export default { name: 'ArtifactRow', @@ -10,13 +11,19 @@ export default { GlButton, GlBadge, GlFriendlyWrap, + GlFormCheckbox, }, + mixins: [glFeatureFlagsMixin()], inject: ['canDestroyArtifacts'], props: { artifact: { type: Object, required: true, }, + isSelected: { + type: Boolean, + required: true, + }, isLastRow: { type: Boolean, required: true, @@ -32,6 +39,16 @@ export default { artifactSize() { return numberToHumanSize(this.artifact.size); }, + canBulkDestroyArtifacts() { + return this.glFeatures[BULK_DELETE_FEATURE_FLAG] && this.canDestroyArtifacts; + }, + }, + methods: { + handleInput(checked) { + if (checked === this.isSelected) return; + + this.$emit('selectArtifact', this.artifact, checked); + }, }, i18n: { expired: I18N_EXPIRED, @@ -46,6 +63,9 @@ export default { :class="{ 'gl-border-b-solid gl-border-b-1 gl-border-gray-100': !isLastRow }" > <div class="gl-display-inline-flex gl-align-items-center gl-w-full"> + <span v-if="canBulkDestroyArtifacts" class="gl-pl-5"> + <gl-form-checkbox :checked="isSelected" @input="handleInput" /> + </span> <span class="gl-w-half gl-pl-8 gl-display-flex gl-align-items-center" data-testid="job-artifact-row-name" diff --git a/app/assets/javascripts/artifacts/components/artifacts_bulk_delete.vue b/app/assets/javascripts/artifacts/components/artifacts_bulk_delete.vue new file mode 100644 index 00000000000..cc08551fdb7 --- /dev/null +++ b/app/assets/javascripts/artifacts/components/artifacts_bulk_delete.vue @@ -0,0 +1,182 @@ +<script> +import { GlButton, GlModal, GlSprintf } from '@gitlab/ui'; +import { createAlert } from '~/alert'; +import { TYPENAME_PROJECT } from '~/graphql_shared/constants'; +import { convertToGraphQLId } from '~/graphql_shared/utils'; +import getJobArtifactsQuery from '../graphql/queries/get_job_artifacts.query.graphql'; +import bulkDestroyJobArtifactsMutation from '../graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql'; +import { removeArtifactFromStore } from '../graphql/cache_update'; +import { + I18N_BULK_DELETE_BANNER, + I18N_BULK_DELETE_CLEAR_SELECTION, + I18N_BULK_DELETE_DELETE_SELECTED, + I18N_BULK_DELETE_MODAL_TITLE, + I18N_BULK_DELETE_BODY, + I18N_BULK_DELETE_ACTION, + I18N_BULK_DELETE_PARTIAL_ERROR, + I18N_BULK_DELETE_ERROR, + I18N_MODAL_CANCEL, + BULK_DELETE_MODAL_ID, +} from '../constants'; + +export default { + name: 'ArtifactsBulkDelete', + components: { + GlButton, + GlModal, + GlSprintf, + }, + inject: ['projectId'], + props: { + selectedArtifacts: { + type: Array, + required: true, + }, + queryVariables: { + type: Object, + required: true, + }, + }, + data() { + return { + isModalVisible: false, + isDeleting: false, + }; + }, + computed: { + checkedCount() { + return this.selectedArtifacts.length || 0; + }, + modalActionPrimary() { + return { + text: I18N_BULK_DELETE_ACTION(this.checkedCount), + attributes: { + loading: this.isDeleting, + variant: 'danger', + }, + }; + }, + modalActionCancel() { + return { + text: I18N_MODAL_CANCEL, + attributes: { + loading: this.isDeleting, + }, + }; + }, + }, + methods: { + async onConfirmDelete(e) { + // don't close modal until deletion is complete + if (e) { + e.preventDefault(); + } + this.isDeleting = true; + + try { + await this.$apollo.mutate({ + mutation: bulkDestroyJobArtifactsMutation, + variables: { + projectId: convertToGraphQLId(TYPENAME_PROJECT, this.projectId), + ids: this.selectedArtifacts, + }, + update: (store, { data }) => { + const { errors, destroyedCount, destroyedIds } = data.bulkDestroyJobArtifacts; + if (errors?.length) { + createAlert({ + message: I18N_BULK_DELETE_PARTIAL_ERROR, + captureError: true, + error: new Error(errors.join(' ')), + }); + } + if (destroyedIds?.length) { + this.$emit('deleted', destroyedCount); + + // Remove deleted artifacts from the cache + destroyedIds.forEach((id) => { + removeArtifactFromStore(store, id, getJobArtifactsQuery, this.queryVariables); + }); + store.gc(); + + this.$emit('clearSelectedArtifacts'); + } + }, + }); + } catch (error) { + this.onError(error); + } finally { + this.isDeleting = false; + this.isModalVisible = false; + } + }, + onError(error) { + createAlert({ + message: I18N_BULK_DELETE_ERROR, + captureError: true, + error, + }); + }, + handleClearSelection() { + this.$emit('clearSelectedArtifacts'); + }, + handleModalShow() { + this.isModalVisible = true; + }, + handleModalHide() { + this.isModalVisible = false; + }, + }, + i18n: { + banner: I18N_BULK_DELETE_BANNER, + clearSelection: I18N_BULK_DELETE_CLEAR_SELECTION, + deleteSelected: I18N_BULK_DELETE_DELETE_SELECTED, + modalTitle: I18N_BULK_DELETE_MODAL_TITLE, + modalBody: I18N_BULK_DELETE_BODY, + }, + BULK_DELETE_MODAL_ID, +}; +</script> +<template> + <div class="gl-my-4 gl-p-4 gl-border-1 gl-border-solid gl-border-gray-100"> + <div class="gl-display-flex gl-align-items-center"> + <div> + <gl-sprintf :message="$options.i18n.banner(checkedCount)"> + <template #strong="{ content }"> + <strong>{{ content }}</strong> + </template> + </gl-sprintf> + </div> + <div class="gl-ml-auto"> + <gl-button + variant="default" + data-testid="bulk-delete-clear-button" + @click="handleClearSelection" + > + {{ $options.i18n.clearSelection }} + </gl-button> + <gl-button + variant="danger" + data-testid="bulk-delete-delete-button" + @click="handleModalShow" + > + {{ $options.i18n.deleteSelected }} + </gl-button> + </div> + </div> + <gl-modal + size="sm" + :modal-id="$options.BULK_DELETE_MODAL_ID" + :visible="isModalVisible" + :title="$options.i18n.modalTitle(checkedCount)" + :action-primary="modalActionPrimary" + :action-cancel="modalActionCancel" + @hide="handleModalHide" + @primary="onConfirmDelete" + > + <gl-sprintf + data-testid="bulk-delete-modal-content" + :message="$options.i18n.modalBody(checkedCount)" + /> + </gl-modal> + </div> +</template> diff --git a/app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue b/app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue index 4a826d0d462..7d675251ffd 100644 --- a/app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue +++ b/app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { DynamicScroller, DynamicScrollerItem } from 'vendor/vue-virtual-scroller'; import getJobArtifactsQuery from '../graphql/queries/get_job_artifacts.query.graphql'; import destroyArtifactMutation from '../graphql/mutations/destroy_artifact.mutation.graphql'; @@ -25,6 +25,10 @@ export default { type: Object, required: true, }, + selectedArtifacts: { + type: Array, + required: true, + }, queryVariables: { type: Object, required: true, @@ -52,6 +56,9 @@ export default { isLastRow(index) { return index === this.artifacts.nodes.length - 1; }, + isSelected(item) { + return this.selectedArtifacts.includes(item.id); + }, showModal(item) { this.deletingArtifactId = item.id; this.deletingArtifactName = item.name; @@ -98,7 +105,9 @@ export default { <dynamic-scroller-item :item="item" :active="active" :class="{ active }"> <artifact-row :artifact="item" + :is-selected="isSelected(item)" :is-last-row="isLastRow(index)" + v-on="$listeners" @delete="showModal(item)" /> </dynamic-scroller-item> diff --git a/app/assets/javascripts/artifacts/components/job_artifacts_table.vue b/app/assets/javascripts/artifacts/components/job_artifacts_table.vue index 5743ff3ec9e..ba4026190a2 100644 --- a/app/assets/javascripts/artifacts/components/job_artifacts_table.vue +++ b/app/assets/javascripts/artifacts/components/job_artifacts_table.vue @@ -8,11 +8,13 @@ import { GlBadge, GlIcon, GlPagination, + GlFormCheckbox, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import getJobArtifactsQuery from '../graphql/queries/get_job_artifacts.query.graphql'; import { totalArtifactsSizeForJob, mapArchivesToJobNodes, mapBooleansToJobNodes } from '../utils'; import { @@ -33,7 +35,11 @@ import { INITIAL_NEXT_PAGE_CURSOR, JOBS_PER_PAGE, INITIAL_LAST_PAGE_SIZE, + BULK_DELETE_FEATURE_FLAG, + I18N_BULK_DELETE_CONFIRMATION_TOAST, } from '../constants'; +import JobCheckbox from './job_checkbox.vue'; +import ArtifactsBulkDelete from './artifacts_bulk_delete.vue'; import ArtifactsTableRowDetails from './artifacts_table_row_details.vue'; import FeedbackBanner from './feedback_banner.vue'; @@ -56,11 +62,15 @@ export default { GlBadge, GlIcon, GlPagination, + GlFormCheckbox, CiIcon, TimeAgo, + JobCheckbox, + ArtifactsBulkDelete, ArtifactsTableRowDetails, FeedbackBanner, }, + mixins: [glFeatureFlagsMixin()], inject: ['projectPath', 'canDestroyArtifacts'], apollo: { jobArtifacts: { @@ -68,9 +78,8 @@ export default { variables() { return this.queryVariables; }, - update({ project: { jobs: { nodes = [], pageInfo = {}, count = 0 } = {} } }) { + update({ project: { jobs: { nodes = [], pageInfo = {} } = {} } }) { this.pageInfo = pageInfo; - this.count = count; return nodes .map(mapArchivesToJobNodes) .map(mapBooleansToJobNodes) @@ -93,9 +102,9 @@ export default { data() { return { jobArtifacts: [], - count: 0, pageInfo: {}, expandedJobs: [], + selectedArtifacts: [], pagination: INITIAL_PAGINATION_STATE, }; }, @@ -110,7 +119,9 @@ export default { }; }, showPagination() { - return this.count > JOBS_PER_PAGE; + const { hasNextPage, hasPreviousPage } = this.pageInfo; + + return hasNextPage || hasPreviousPage; }, prevPage() { return Number(this.pageInfo.hasPreviousPage); @@ -118,6 +129,21 @@ export default { nextPage() { return Number(this.pageInfo.hasNextPage); }, + fields() { + return [ + this.canBulkDestroyArtifacts && { + key: 'checkbox', + label: '', + }, + ...this.$options.fields, + ]; + }, + anyArtifactsSelected() { + return Boolean(this.selectedArtifacts.length); + }, + canBulkDestroyArtifacts() { + return this.glFeatures[BULK_DELETE_FEATURE_FLAG] && this.canDestroyArtifacts; + }, }, methods: { refetchArtifacts() { @@ -158,6 +184,19 @@ export default { this.expandedJobs.splice(this.expandedJobs.indexOf(id), 1); } }, + selectArtifact(artifactNode, checked) { + if (checked) { + this.selectedArtifacts.push(artifactNode.id); + } else { + this.selectedArtifacts.splice(this.selectedArtifacts.indexOf(artifactNode.id), 1); + } + }, + clearSelectedArtifacts() { + this.selectedArtifacts = []; + }, + showDeletedToast(deletedCount) { + this.$toast.show(I18N_BULK_DELETE_CONFIRMATION_TOAST(deletedCount)); + }, downloadPath(job) { return job.archive?.downloadPath; }, @@ -217,9 +256,16 @@ export default { <template> <div> <feedback-banner /> + <artifacts-bulk-delete + v-if="canBulkDestroyArtifacts && anyArtifactsSelected" + :selected-artifacts="selectedArtifacts" + :query-variables="queryVariables" + @clearSelectedArtifacts="clearSelectedArtifacts" + @deleted="showDeletedToast" + /> <gl-table :items="jobArtifacts" - :fields="$options.fields" + :fields="fields" :busy="$apollo.queries.jobArtifacts.loading" stacked="sm" details-td-class="gl-bg-gray-10! gl-p-0! gl-overflow-auto" @@ -227,6 +273,29 @@ export default { <template #table-busy> <gl-loading-icon size="lg" /> </template> + <template v-if="canBulkDestroyArtifacts" #head(checkbox)> + <gl-form-checkbox + :disabled="!anyArtifactsSelected" + :checked="anyArtifactsSelected" + :indeterminate="anyArtifactsSelected" + @change="clearSelectedArtifacts" + /> + </template> + <template + v-if="canBulkDestroyArtifacts" + #cell(checkbox)="{ item: { hasArtifacts, artifacts } }" + > + <job-checkbox + :has-artifacts="hasArtifacts" + :selected-artifacts=" + artifacts.nodes.filter((node) => selectedArtifacts.includes(node.id)) + " + :unselected-artifacts=" + artifacts.nodes.filter((node) => !selectedArtifacts.includes(node.id)) + " + @selectArtifact="selectArtifact" + /> + </template> <template #cell(artifacts)="{ item: { id, artifacts, hasArtifacts }, toggleDetails, detailsShowing }" > @@ -323,8 +392,10 @@ export default { <template #row-details="{ item: { artifacts } }"> <artifacts-table-row-details :artifacts="artifacts" + :selected-artifacts="selectedArtifacts" :query-variables="queryVariables" @refetch="refetchArtifacts" + @selectArtifact="selectArtifact" /> </template> </gl-table> diff --git a/app/assets/javascripts/artifacts/components/job_checkbox.vue b/app/assets/javascripts/artifacts/components/job_checkbox.vue new file mode 100644 index 00000000000..ce49b3f8678 --- /dev/null +++ b/app/assets/javascripts/artifacts/components/job_checkbox.vue @@ -0,0 +1,52 @@ +<script> +import { GlFormCheckbox } from '@gitlab/ui'; + +export default { + name: 'JobCheckbox', + components: { + GlFormCheckbox, + }, + props: { + hasArtifacts: { + type: Boolean, + required: true, + }, + selectedArtifacts: { + type: Array, + required: true, + }, + unselectedArtifacts: { + type: Array, + required: true, + }, + }, + computed: { + disabled() { + return !this.hasArtifacts; + }, + checked() { + return this.hasArtifacts && this.unselectedArtifacts.length === 0; + }, + indeterminate() { + return this.selectedArtifacts.length > 0 && this.unselectedArtifacts.length > 0; + }, + }, + methods: { + handleInput(checked) { + if (checked) { + this.unselectedArtifacts.forEach((node) => this.$emit('selectArtifact', node, true)); + } else { + this.selectedArtifacts.forEach((node) => this.$emit('selectArtifact', node, false)); + } + }, + }, +}; +</script> +<template> + <gl-form-checkbox + :disabled="disabled" + :checked="checked" + :indeterminate="indeterminate" + @input="handleInput" + /> +</template> diff --git a/app/assets/javascripts/artifacts/constants.js b/app/assets/javascripts/artifacts/constants.js index da562b03bf8..4ac20d963d1 100644 --- a/app/assets/javascripts/artifacts/constants.js +++ b/app/assets/javascripts/artifacts/constants.js @@ -54,6 +54,45 @@ export const I18N_FEEDBACK_BANNER_BODY = s__( export const I18N_FEEDBACK_BANNER_BUTTON = s__('Artifacts|Take a quick survey'); export const FEEDBACK_URL = 'https://gitlab.fra1.qualtrics.com/jfe/form/SV_cI9rAUI20Vo2St8'; +export const BULK_DELETE_FEATURE_FLAG = 'ciJobArtifactBulkDestroy'; +export const I18N_BULK_DELETE_BANNER = (count) => + sprintf( + n__( + 'Artifacts|%{strongStart}%{count}%{strongEnd} artifact selected', + 'Artifacts|%{strongStart}%{count}%{strongEnd} artifacts selected', + count, + ), + { + count, + }, + ); +export const I18N_BULK_DELETE_CLEAR_SELECTION = s__('Artifacts|Clear selection'); +export const I18N_BULK_DELETE_DELETE_SELECTED = s__('Artifacts|Delete selected'); + +export const BULK_DELETE_MODAL_ID = 'artifacts-bulk-delete-modal'; +export const I18N_BULK_DELETE_MODAL_TITLE = (count) => + n__('Artifacts|Delete %d artifact?', 'Artifacts|Delete %d artifacts?', count); +export const I18N_BULK_DELETE_BODY = (count) => + sprintf( + n__( + 'Artifacts|The selected artifact will be permanently deleted. Any reports generated from these artifacts will be empty.', + 'Artifacts|The selected artifacts will be permanently deleted. Any reports generated from these artifacts will be empty.', + count, + ), + { count }, + ); +export const I18N_BULK_DELETE_ACTION = (count) => + n__('Artifacts|Delete %d artifact', 'Artifacts|Delete %d artifacts', count); + +export const I18N_BULK_DELETE_PARTIAL_ERROR = s__( + 'Artifacts|An error occurred while deleting. Some artifacts may not have been deleted.', +); +export const I18N_BULK_DELETE_ERROR = s__( + 'Artifacts|Something went wrong while deleting. Please refresh the page to try again.', +); +export const I18N_BULK_DELETE_CONFIRMATION_TOAST = (count) => + n__('Artifacts|%d selected artifact deleted', 'Artifacts|%d selected artifacts deleted', count); + export const INITIAL_CURRENT_PAGE = 1; export const INITIAL_PREVIOUS_PAGE_CURSOR = ''; export const INITIAL_NEXT_PAGE_CURSOR = ''; diff --git a/app/assets/javascripts/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql b/app/assets/javascripts/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql new file mode 100644 index 00000000000..421b9258ca0 --- /dev/null +++ b/app/assets/javascripts/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql @@ -0,0 +1,7 @@ +mutation bulkDestroyJobArtifacts($projectId: ProjectID!, $ids: [CiJobArtifactID!]!) { + bulkDestroyJobArtifacts(input: { projectId: $projectId, ids: $ids }) { + destroyedCount + destroyedIds + errors + } +} diff --git a/app/assets/javascripts/artifacts/index.js b/app/assets/javascripts/artifacts/index.js index a62b3daa961..6e795fd9bd7 100644 --- a/app/assets/javascripts/artifacts/index.js +++ b/app/assets/javascripts/artifacts/index.js @@ -1,3 +1,4 @@ +import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; @@ -5,6 +6,7 @@ import { parseBoolean } from '~/lib/utils/common_utils'; import App from './components/app.vue'; Vue.use(VueApollo); +Vue.use(GlToast); const apolloProvider = new VueApollo({ defaultClient: createDefaultClient(), @@ -17,13 +19,19 @@ export const initArtifactsTable = () => { return false; } - const { projectPath, canDestroyArtifacts, artifactsManagementFeedbackImagePath } = el.dataset; + const { + projectPath, + projectId, + canDestroyArtifacts, + artifactsManagementFeedbackImagePath, + } = el.dataset; return new Vue({ el, apolloProvider, provide: { projectPath, + projectId, canDestroyArtifacts: parseBoolean(canDestroyArtifacts), artifactsManagementFeedbackImagePath, }, diff --git a/app/assets/javascripts/authentication/mount_2fa.js b/app/assets/javascripts/authentication/mount_2fa.js index 52ed67b8c7b..29dcab9ed4d 100644 --- a/app/assets/javascripts/authentication/mount_2fa.js +++ b/app/assets/javascripts/authentication/mount_2fa.js @@ -1,29 +1,9 @@ -import $ from 'jquery'; -import initU2F from './u2f'; -import U2FRegister from './u2f/register'; -import initWebauthn from './webauthn'; -import WebAuthnRegister from './webauthn/register'; +import { initWebauthnAuthenticate, initWebauthnRegister } from './webauthn'; export const mount2faAuthentication = () => { - if (gon.webauthn) { - initWebauthn(); - } else { - initU2F(); - } + initWebauthnAuthenticate(); }; export const mount2faRegistration = () => { - const el = $('#js-register-token-2fa'); - - if (!el.length) { - return; - } - - if (gon.webauthn) { - const webauthnRegister = new WebAuthnRegister(el, gon.webauthn); - webauthnRegister.start(); - } else { - const u2fRegister = new U2FRegister(el, gon.u2f); - u2fRegister.start(); - } + initWebauthnRegister(); }; diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue index 484c6524d0e..98ed2a31730 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/manage_two_factor_form.vue @@ -6,10 +6,8 @@ import { __ } from '~/locale'; export const i18n = { currentPassword: __('Current password'), confirmTitle: __('Are you sure?'), - confirmWebAuthn: __( - 'This will invalidate your registered applications and U2F / WebAuthn devices.', - ), - confirm: __('This will invalidate your registered applications and U2F devices.'), + confirmWebAuthn: __('This will invalidate your registered applications and WebAuthn devices.'), + confirm: __('This will invalidate your registered applications and WebAuthn devices.'), disableTwoFactor: __('Disable two-factor authentication'), disable: __('Disable'), cancel: __('Cancel'), diff --git a/app/assets/javascripts/authentication/u2f/authenticate.js b/app/assets/javascripts/authentication/u2f/authenticate.js deleted file mode 100644 index 22eca904f32..00000000000 --- a/app/assets/javascripts/authentication/u2f/authenticate.js +++ /dev/null @@ -1,106 +0,0 @@ -import $ from 'jquery'; -import { template as lodashTemplate, omit } from 'lodash'; -import U2FError from './error'; -import importU2FLibrary from './util'; - -// Authenticate U2F (universal 2nd factor) devices for users to authenticate with. -// -// State Flow #1: setup -> in_progress -> authenticated -> POST to server -// State Flow #2: setup -> in_progress -> error -> setup -export default class U2FAuthenticate { - constructor(container, form, u2fParams, fallbackButton, fallbackUI) { - this.u2fUtils = null; - this.container = container; - this.renderAuthenticated = this.renderAuthenticated.bind(this); - this.renderError = this.renderError.bind(this); - this.renderInProgress = this.renderInProgress.bind(this); - this.renderTemplate = this.renderTemplate.bind(this); - this.authenticate = this.authenticate.bind(this); - this.start = this.start.bind(this); - this.appId = u2fParams.app_id; - this.challenge = u2fParams.challenge; - this.form = form; - this.fallbackButton = fallbackButton; - this.fallbackUI = fallbackUI; - if (this.fallbackButton) { - this.fallbackButton.addEventListener('click', this.switchToFallbackUI.bind(this)); - } - - // The U2F Javascript API v1.1 requires a single challenge, with - // _no challenges per-request_. The U2F Javascript API v1.0 requires a - // challenge per-request, which is done by copying the single challenge - // into every request. - // - // In either case, we don't need the per-request challenges that the server - // has generated, so we can remove them. - // - // Note: The server library fixes this behaviour in (unreleased) version 1.0.0. - // This can be removed once we upgrade. - // https://github.com/castle/ruby-u2f/commit/103f428071a81cd3d5f80c2e77d522d5029946a4 - this.signRequests = u2fParams.sign_requests.map((request) => omit(request, 'challenge')); - - this.templates = { - inProgress: '#js-authenticate-token-2fa-in-progress', - error: '#js-authenticate-token-2fa-error', - authenticated: '#js-authenticate-token-2fa-authenticated', - }; - } - - start() { - return importU2FLibrary() - .then((utils) => { - this.u2fUtils = utils; - this.renderInProgress(); - }) - .catch(() => this.switchToFallbackUI()); - } - - authenticate() { - return this.u2fUtils.sign( - this.appId, - this.challenge, - this.signRequests, - (response) => { - if (response.errorCode) { - const error = new U2FError(response.errorCode, 'authenticate'); - return this.renderError(error); - } - return this.renderAuthenticated(JSON.stringify(response)); - }, - 10, - ); - } - - renderTemplate(name, params) { - const templateString = $(this.templates[name]).html(); - const template = lodashTemplate(templateString); - return this.container.html(template(params)); - } - - renderInProgress() { - this.renderTemplate('inProgress'); - return this.authenticate(); - } - - renderError(error) { - this.renderTemplate('error', { - error_message: error.message(), - error_name: error.errorCode, - }); - return this.container.find('#js-token-2fa-try-again').on('click', this.renderInProgress); - } - - renderAuthenticated(deviceResponse) { - this.renderTemplate('authenticated'); - const container = this.container[0]; - container.querySelector('#js-device-response').value = deviceResponse; - container.querySelector(this.form).submit(); - this.fallbackButton.classList.add('hidden'); - } - - switchToFallbackUI() { - this.fallbackButton.classList.add('hidden'); - this.container[0].classList.add('hidden'); - this.fallbackUI.classList.remove('hidden'); - } -} diff --git a/app/assets/javascripts/authentication/u2f/error.js b/app/assets/javascripts/authentication/u2f/error.js deleted file mode 100644 index ca0fc0700ad..00000000000 --- a/app/assets/javascripts/authentication/u2f/error.js +++ /dev/null @@ -1,26 +0,0 @@ -import { __ } from '~/locale'; - -export default class U2FError { - constructor(errorCode, u2fFlowType) { - this.errorCode = errorCode; - this.message = this.message.bind(this); - this.httpsDisabled = window.location.protocol !== 'https:'; - this.u2fFlowType = u2fFlowType; - } - - message() { - if (this.errorCode === window.u2f.ErrorCodes.BAD_REQUEST && this.httpsDisabled) { - return __( - 'U2F only works with HTTPS-enabled websites. Contact your administrator for more details.', - ); - } else if (this.errorCode === window.u2f.ErrorCodes.DEVICE_INELIGIBLE) { - if (this.u2fFlowType === 'authenticate') { - return __('This device has not been registered with us.'); - } - if (this.u2fFlowType === 'register') { - return __('This device has already been registered with us.'); - } - } - return __('There was a problem communicating with your device.'); - } -} diff --git a/app/assets/javascripts/authentication/u2f/index.js b/app/assets/javascripts/authentication/u2f/index.js deleted file mode 100644 index f129acca1c3..00000000000 --- a/app/assets/javascripts/authentication/u2f/index.js +++ /dev/null @@ -1,17 +0,0 @@ -import $ from 'jquery'; -import U2FAuthenticate from './authenticate'; - -export default () => { - if (!gon.u2f) return; - - const u2fAuthenticate = new U2FAuthenticate( - $('#js-authenticate-token-2fa'), - '#js-login-token-2fa-form', - gon.u2f, - document.querySelector('#js-login-2fa-device'), - document.querySelector('.js-2fa-form'), - ); - u2fAuthenticate.start(); - // needed in rspec (FakeU2fDevice) - gl.u2fAuthenticate = u2fAuthenticate; -}; diff --git a/app/assets/javascripts/authentication/u2f/register.js b/app/assets/javascripts/authentication/u2f/register.js deleted file mode 100644 index 6c98f0978bc..00000000000 --- a/app/assets/javascripts/authentication/u2f/register.js +++ /dev/null @@ -1,102 +0,0 @@ -import $ from 'jquery'; -import { template as lodashTemplate } from 'lodash'; -import { __ } from '~/locale'; -import U2FError from './error'; -import importU2FLibrary from './util'; - -// Register U2F (universal 2nd factor) devices for users to authenticate with. -// -// State Flow #1: setup -> in_progress -> registered -> POST to server -// State Flow #2: setup -> in_progress -> error -> setup -export default class U2FRegister { - constructor(container, u2fParams) { - this.u2fUtils = null; - this.container = container; - this.renderNotSupported = this.renderNotSupported.bind(this); - this.renderRegistered = this.renderRegistered.bind(this); - this.renderError = this.renderError.bind(this); - this.renderInProgress = this.renderInProgress.bind(this); - this.renderSetup = this.renderSetup.bind(this); - this.renderTemplate = this.renderTemplate.bind(this); - this.register = this.register.bind(this); - this.start = this.start.bind(this); - this.appId = u2fParams.app_id; - this.registerRequests = u2fParams.register_requests; - this.signRequests = u2fParams.sign_requests; - - this.templates = { - message: '#js-register-2fa-message', - setup: '#js-register-token-2fa-setup', - error: '#js-register-token-2fa-error', - registered: '#js-register-token-2fa-registered', - }; - } - - start() { - return importU2FLibrary() - .then((utils) => { - this.u2fUtils = utils; - this.renderSetup(); - }) - .catch(() => this.renderNotSupported()); - } - - register() { - return this.u2fUtils.register( - this.appId, - this.registerRequests, - this.signRequests, - (response) => { - if (response.errorCode) { - const error = new U2FError(response.errorCode, 'register'); - return this.renderError(error); - } - return this.renderRegistered(JSON.stringify(response)); - }, - 10, - ); - } - - renderTemplate(name, params) { - const templateString = $(this.templates[name]).html(); - const template = lodashTemplate(templateString); - return this.container.html(template(params)); - } - - renderSetup() { - this.renderTemplate('setup'); - return this.container.find('#js-setup-token-2fa-device').on('click', this.renderInProgress); - } - - renderInProgress() { - this.renderTemplate('message', { - message: __( - 'Trying to communicate with your device. Plug it in (if needed) and press the button on the device now.', - ), - }); - return this.register(); - } - - renderError(error) { - this.renderTemplate('error', { - error_message: error.message(), - error_name: error.errorCode, - }); - return this.container.find('#js-token-2fa-try-again').on('click', this.renderSetup); - } - - renderRegistered(deviceResponse) { - this.renderTemplate('registered'); - // Prefer to do this instead of interpolating using Underscore templates - // because of JSON escaping issues. - return this.container.find('#js-device-response').val(deviceResponse); - } - - renderNotSupported() { - return this.renderTemplate('message', { - message: __( - "Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).", - ), - }); - } -} diff --git a/app/assets/javascripts/authentication/u2f/util.js b/app/assets/javascripts/authentication/u2f/util.js deleted file mode 100644 index b706481c02f..00000000000 --- a/app/assets/javascripts/authentication/u2f/util.js +++ /dev/null @@ -1,40 +0,0 @@ -function isOpera(userAgent) { - return userAgent.indexOf('Opera') >= 0 || userAgent.indexOf('OPR') >= 0; -} - -function getOperaVersion(userAgent) { - const match = userAgent.match(/OPR[^0-9]*([0-9]+)[^0-9]+/); - return match ? parseInt(match[1], 10) : false; -} - -function isChrome(userAgent) { - return userAgent.indexOf('Chrom') >= 0 && !isOpera(userAgent); -} - -function getChromeVersion(userAgent) { - const match = userAgent.match(/Chrom(?:e|ium)\/([0-9]+)\./); - return match ? parseInt(match[1], 10) : false; -} - -export function canInjectU2fApi(userAgent) { - const isSupportedChrome = isChrome(userAgent) && getChromeVersion(userAgent) >= 41; - const isSupportedOpera = isOpera(userAgent) && getOperaVersion(userAgent) >= 40; - const isMobile = - userAgent.indexOf('droid') >= 0 || - userAgent.indexOf('CriOS') >= 0 || - /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent); - return (isSupportedChrome || isSupportedOpera) && !isMobile; -} - -export default function importU2FLibrary() { - if (window.u2f) { - return Promise.resolve(window.u2f); - } - - const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : ''; - if (canInjectU2fApi(userAgent) || (gon && gon.test_env)) { - return import(/* webpackMode: "eager" */ 'vendor/u2f').then(() => window.u2f); - } - - return Promise.reject(); -} diff --git a/app/assets/javascripts/authentication/webauthn/authenticate.js b/app/assets/javascripts/authentication/webauthn/authenticate.js index 47cb7a40f76..748945a680b 100644 --- a/app/assets/javascripts/authentication/webauthn/authenticate.js +++ b/app/assets/javascripts/authentication/webauthn/authenticate.js @@ -1,3 +1,4 @@ +import { WEBAUTHN_AUTHENTICATE } from './constants'; import WebAuthnError from './error'; import WebAuthnFlow from './flow'; import { supported, convertGetParams, convertGetResponse } from './util'; @@ -44,7 +45,7 @@ export default class WebAuthnAuthenticate { this.renderAuthenticated(JSON.stringify(convertedResponse)); }) .catch((err) => { - this.flow.renderError(new WebAuthnError(err, 'authenticate')); + this.flow.renderError(new WebAuthnError(err, WEBAUTHN_AUTHENTICATE)); }); } diff --git a/app/assets/javascripts/authentication/webauthn/components/registration.vue b/app/assets/javascripts/authentication/webauthn/components/registration.vue new file mode 100644 index 00000000000..84132a7d062 --- /dev/null +++ b/app/assets/javascripts/authentication/webauthn/components/registration.vue @@ -0,0 +1,226 @@ +<script> +import { + GlAlert, + GlButton, + GlForm, + GlFormInput, + GlFormGroup, + GlLink, + GlLoadingIcon, + GlSprintf, +} from '@gitlab/ui'; +import { + I18N_BUTTON_REGISTER, + I18N_BUTTON_SETUP, + I18N_BUTTON_TRY_AGAIN, + I18N_DEVICE_NAME, + I18N_DEVICE_NAME_DESCRIPTION, + I18N_DEVICE_NAME_PLACEHOLDER, + I18N_ERROR_HTTP, + I18N_ERROR_UNSUPPORTED_BROWSER, + I18N_INFO_TEXT, + I18N_NOTICE, + I18N_PASSWORD, + I18N_PASSWORD_DESCRIPTION, + I18N_STATUS_SUCCESS, + I18N_STATUS_WAITING, + STATE_ERROR, + STATE_READY, + STATE_SUCCESS, + STATE_UNSUPPORTED, + STATE_WAITING, + WEBAUTHN_DOCUMENTATION_PATH, + WEBAUTHN_REGISTER, +} from '~/authentication/webauthn/constants'; +import WebAuthnError from '~/authentication/webauthn/error'; +import { + convertCreateParams, + convertCreateResponse, + isHTTPS, + supported, +} from '~/authentication/webauthn/util'; +import csrf from '~/lib/utils/csrf'; + +export default { + name: 'WebAuthnRegistration', + components: { + GlAlert, + GlButton, + GlForm, + GlFormInput, + GlFormGroup, + GlLink, + GlLoadingIcon, + GlSprintf, + }, + I18N_BUTTON_REGISTER, + I18N_BUTTON_SETUP, + I18N_BUTTON_TRY_AGAIN, + I18N_DEVICE_NAME, + I18N_DEVICE_NAME_DESCRIPTION, + I18N_DEVICE_NAME_PLACEHOLDER, + I18N_ERROR_HTTP, + I18N_ERROR_UNSUPPORTED_BROWSER, + I18N_INFO_TEXT, + I18N_NOTICE, + I18N_PASSWORD, + I18N_PASSWORD_DESCRIPTION, + I18N_STATUS_SUCCESS, + I18N_STATUS_WAITING, + STATE_ERROR, + STATE_READY, + STATE_SUCCESS, + STATE_UNSUPPORTED, + STATE_WAITING, + WEBAUTHN_DOCUMENTATION_PATH, + inject: ['initialError', 'passwordRequired', 'targetPath'], + data() { + return { + csrfToken: csrf.token, + form: { deviceName: '', password: '' }, + state: STATE_UNSUPPORTED, + errorMessage: this.initialError, + credentials: null, + }; + }, + computed: { + disabled() { + const isEmptyDeviceName = this.form.deviceName.trim() === ''; + const isEmptyPassword = this.form.password.trim() === ''; + + if (this.passwordRequired === false) { + return isEmptyDeviceName; + } + + return isEmptyDeviceName || isEmptyPassword; + }, + }, + created() { + if (this.errorMessage) { + this.state = STATE_ERROR; + return; + } + + if (supported()) { + this.state = STATE_READY; + return; + } + + this.errorMessage = isHTTPS() ? I18N_ERROR_UNSUPPORTED_BROWSER : I18N_ERROR_HTTP; + }, + methods: { + isCurrentState(state) { + return this.state === state; + }, + async onRegister() { + this.state = STATE_WAITING; + + try { + const credentials = await navigator.credentials.create({ + publicKey: convertCreateParams(gon.webauthn.options), + }); + + this.credentials = JSON.stringify(convertCreateResponse(credentials)); + this.state = STATE_SUCCESS; + } catch (error) { + this.errorMessage = new WebAuthnError(error, WEBAUTHN_REGISTER).message(); + this.state = STATE_ERROR; + } + }, + }, +}; +</script> + +<template> + <div> + <template v-if="isCurrentState($options.STATE_UNSUPPORTED)"> + <gl-alert variant="danger" :dismissible="false">{{ errorMessage }}</gl-alert> + </template> + + <template v-else-if="isCurrentState($options.STATE_READY)"> + <div class="row"> + <div class="col-md-5"> + <gl-button variant="confirm" @click="onRegister">{{ + $options.I18N_BUTTON_SETUP + }}</gl-button> + </div> + <div class="col-md-7"> + <p>{{ $options.I18N_INFO_TEXT }}</p> + </div> + </div> + </template> + + <template v-else-if="isCurrentState($options.STATE_WAITING)"> + <gl-alert :dismissible="false"> + {{ $options.I18N_STATUS_WAITING }} + <gl-loading-icon /> + </gl-alert> + </template> + + <template v-else-if="isCurrentState($options.STATE_SUCCESS)"> + <p>{{ $options.I18N_STATUS_SUCCESS }}</p> + <gl-alert :dismissible="false" class="gl-mb-5"> + <gl-sprintf :message="$options.I18N_NOTICE"> + <template #link="{ content }"> + <gl-link :href="$options.WEBAUTHN_DOCUMENTATION_PATH" target="_blank">{{ + content + }}</gl-link> + </template> + </gl-sprintf> + </gl-alert> + + <div class="row"> + <gl-form method="post" :action="targetPath" class="col-md-9" data-testid="create-webauthn"> + <gl-form-group + v-if="passwordRequired" + :description="$options.I18N_PASSWORD_DESCRIPTION" + :label="$options.I18N_PASSWORD" + label-for="webauthn-registration-current-password" + > + <gl-form-input + id="webauthn-registration-current-password" + v-model="form.password" + name="current_password" + type="password" + autocomplete="current-password" + data-testid="current-password-input" + /> + </gl-form-group> + + <gl-form-group + :description="$options.I18N_DEVICE_NAME_DESCRIPTION" + :label="$options.I18N_DEVICE_NAME" + label-for="device-name" + > + <gl-form-input + id="device-name" + v-model="form.deviceName" + name="device_registration[name]" + :placeholder="$options.I18N_DEVICE_NAME_PLACEHOLDER" + data-testid="device-name-input" + /> + </gl-form-group> + + <input type="hidden" name="device_registration[device_response]" :value="credentials" /> + <input :value="csrfToken" type="hidden" name="authenticity_token" /> + + <gl-button type="submit" :disabled="disabled" variant="confirm">{{ + $options.I18N_BUTTON_REGISTER + }}</gl-button> + </gl-form> + </div> + </template> + + <template v-else-if="isCurrentState($options.STATE_ERROR)"> + <gl-alert + variant="danger" + :dismissible="false" + class="gl-mb-5" + :secondary-button-text="$options.I18N_BUTTON_TRY_AGAIN" + @secondaryAction="onRegister" + > + {{ errorMessage }} + </gl-alert> + </template> + </div> +</template> diff --git a/app/assets/javascripts/authentication/webauthn/constants.js b/app/assets/javascripts/authentication/webauthn/constants.js new file mode 100644 index 00000000000..c41e6d2bd58 --- /dev/null +++ b/app/assets/javascripts/authentication/webauthn/constants.js @@ -0,0 +1,46 @@ +import { __ } from '~/locale'; +import { helpPagePath } from '~/helpers/help_page_helper'; + +export const I18N_BUTTON_REGISTER = __('Register device'); +export const I18N_BUTTON_SETUP = __('Set up new device'); +export const I18N_BUTTON_TRY_AGAIN = __('Try again?'); +export const I18N_DEVICE_NAME = __('Device name'); +export const I18N_DEVICE_NAME_DESCRIPTION = __( + 'Excluding USB security keys, you should include the browser name together with the device name.', +); +export const I18N_DEVICE_NAME_PLACEHOLDER = __('Macbook Touch ID on Edge'); +export const I18N_ERROR_HTTP = __( + 'WebAuthn only works with HTTPS-enabled websites. Contact your administrator for more details.', +); +export const I18N_ERROR_UNSUPPORTED_BROWSER = __( + "Your browser doesn't support WebAuthn. Please use a supported browser, e.g. Chrome (67+) or Firefox (60+).", +); +export const I18N_INFO_TEXT = __( + 'Your device needs to be set up. Plug it in (if needed) and click the button on the left.', +); +export const I18N_NOTICE = __( + 'You must save your recovery codes after you first register a two-factor authenticator, so you do not lose access to your account. %{linkStart}See the documentation on managing your WebAuthn device for more information.%{linkEnd}', +); +export const I18N_PASSWORD = __('Current password'); +export const I18N_PASSWORD_DESCRIPTION = __( + 'Your current password is required to register a new device.', +); +export const I18N_STATUS_SUCCESS = __( + 'Your device was successfully set up! Give it a name and register it with the GitLab server.', +); +export const I18N_STATUS_WAITING = __( + 'Trying to communicate with your device. Plug it in (if needed) and press the button on the device now.', +); + +export const STATE_ERROR = 'error'; +export const STATE_READY = 'ready'; +export const STATE_SUCCESS = 'success'; +export const STATE_UNSUPPORTED = 'unsupported'; +export const STATE_WAITING = 'waiting'; + +export const WEBAUTHN_AUTHENTICATE = 'authenticate'; +export const WEBAUTHN_REGISTER = 'register'; +export const WEBAUTHN_DOCUMENTATION_PATH = helpPagePath( + 'user/profile/account/two_factor_authentication', + { anchor: 'set-up-a-webauthn-device' }, +); diff --git a/app/assets/javascripts/authentication/webauthn/error.js b/app/assets/javascripts/authentication/webauthn/error.js index a1a3f861c25..40dbecd8bc9 100644 --- a/app/assets/javascripts/authentication/webauthn/error.js +++ b/app/assets/javascripts/authentication/webauthn/error.js @@ -1,5 +1,6 @@ import { __ } from '~/locale'; -import { isHTTPS, FLOW_AUTHENTICATE, FLOW_REGISTER } from './util'; +import { WEBAUTHN_AUTHENTICATE, WEBAUTHN_REGISTER } from './constants'; +import { isHTTPS } from './util'; export default class WebAuthnError { constructor(error, flowType) { @@ -13,9 +14,9 @@ export default class WebAuthnError { message() { if (this.errorName === 'NotSupportedError') { return __('Your device is not compatible with GitLab. Please try another device'); - } else if (this.errorName === 'InvalidStateError' && this.flowType === FLOW_AUTHENTICATE) { + } else if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_AUTHENTICATE) { return __('This device has not been registered with us.'); - } else if (this.errorName === 'InvalidStateError' && this.flowType === FLOW_REGISTER) { + } else if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_REGISTER) { return __('This device has already been registered with us.'); } else if (this.errorName === 'SecurityError' && this.httpsDisabled) { return __( diff --git a/app/assets/javascripts/authentication/webauthn/index.js b/app/assets/javascripts/authentication/webauthn/index.js index bbf694c7698..1fbe89d1097 100644 --- a/app/assets/javascripts/authentication/webauthn/index.js +++ b/app/assets/javascripts/authentication/webauthn/index.js @@ -1,7 +1,12 @@ import $ from 'jquery'; import WebAuthnAuthenticate from './authenticate'; +import WebAuthnRegister from './register'; + +export const initWebauthnAuthenticate = () => { + if (!gon.webauthn) { + return; + } -export default () => { const webauthnAuthenticate = new WebAuthnAuthenticate( $('#js-authenticate-token-2fa'), '#js-login-token-2fa-form', @@ -11,3 +16,14 @@ export default () => { ); webauthnAuthenticate.start(); }; + +export const initWebauthnRegister = () => { + const el = $('#js-register-token-2fa'); + + if (!el.length) { + return; + } + + const webauthnRegister = new WebAuthnRegister(el, gon.webauthn); + webauthnRegister.start(); +}; diff --git a/app/assets/javascripts/authentication/webauthn/register.js b/app/assets/javascripts/authentication/webauthn/register.js index 62ebf85abe4..c00d3ede2c1 100644 --- a/app/assets/javascripts/authentication/webauthn/register.js +++ b/app/assets/javascripts/authentication/webauthn/register.js @@ -2,6 +2,7 @@ import { __ } from '~/locale'; import WebAuthnError from './error'; import WebAuthnFlow from './flow'; import { supported, isHTTPS, convertCreateParams, convertCreateResponse } from './util'; +import { WEBAUTHN_REGISTER } from './constants'; // Register WebAuthn devices for users to authenticate with. // @@ -40,7 +41,7 @@ export default class WebAuthnRegister { publicKey: this.webauthnOptions, }) .then((cred) => this.renderRegistered(JSON.stringify(convertCreateResponse(cred)))) - .catch((err) => this.flow.renderError(new WebAuthnError(err, 'register'))); + .catch((err) => this.flow.renderError(new WebAuthnError(err, WEBAUTHN_REGISTER))); } renderSetup() { diff --git a/app/assets/javascripts/authentication/webauthn/registration.js b/app/assets/javascripts/authentication/webauthn/registration.js new file mode 100644 index 00000000000..67906a24857 --- /dev/null +++ b/app/assets/javascripts/authentication/webauthn/registration.js @@ -0,0 +1,22 @@ +import Vue from 'vue'; +import WebAuthnRegistration from '~/authentication/webauthn/components/registration.vue'; +import { parseBoolean } from '~/lib/utils/common_utils'; + +export const initWebAuthnRegistration = () => { + const el = document.querySelector('#js-device-registration'); + + if (!el) { + return null; + } + + const { initialError, passwordRequired, targetPath } = el.dataset; + + return new Vue({ + el, + name: 'WebAuthnRegistrationRoot', + provide: { initialError, passwordRequired: parseBoolean(passwordRequired), targetPath }, + render(h) { + return h(WebAuthnRegistration); + }, + }); +}; diff --git a/app/assets/javascripts/authentication/webauthn/util.js b/app/assets/javascripts/authentication/webauthn/util.js index 2a0740cf488..0ff0f0e6a29 100644 --- a/app/assets/javascripts/authentication/webauthn/util.js +++ b/app/assets/javascripts/authentication/webauthn/util.js @@ -1,9 +1,6 @@ export function supported() { return Boolean( - navigator.credentials && - navigator.credentials.create && - navigator.credentials.get && - window.PublicKeyCredential, + navigator.credentials?.create && navigator.credentials?.get && window.PublicKeyCredential, ); } @@ -11,9 +8,6 @@ export function isHTTPS() { return window.location.protocol.startsWith('https'); } -export const FLOW_AUTHENTICATE = 'authenticate'; -export const FLOW_REGISTER = 'register'; - /** * Converts a base64 string to an ArrayBuffer * diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 1855fb9ed8c..de67e01d650 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -7,7 +7,7 @@ import { getEmojiScoreWithIntent } from '~/emoji/utils'; import { getCookie, setCookie, scrollToElement } from '~/lib/utils/common_utils'; import * as Emoji from '~/emoji'; import { dispose, fixTitle } from '~/tooltips'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from './lib/utils/axios_utils'; import { isInVueNoteablePage } from './lib/utils/dom_utils'; import { __ } from './locale'; diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index c95c90d5daf..1a80030c7e6 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -3,7 +3,7 @@ import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui'; import { escape, debounce } from 'lodash'; import { mapActions, mapState } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { s__, sprintf } from '~/locale'; import createEmptyBadge from '../empty_badge'; import { PLACEHOLDERS } from '../constants'; diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index a7a21d65475..09f997d73aa 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -1,7 +1,7 @@ <script> import { GlSprintf, GlModal } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { __, s__ } from '~/locale'; import Badge from './badge.vue'; import BadgeForm from './badge_form.vue'; @@ -26,7 +26,7 @@ export default { primaryProps() { return { text: __('Delete badge'), - attributes: [{ category: 'primary' }, { variant: 'danger' }], + attributes: { category: 'primary', variant: 'danger' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue index cc524c71c1e..b78874d372c 100644 --- a/app/assets/javascripts/batch_comments/components/draft_note.vue +++ b/app/assets/javascripts/batch_comments/components/draft_note.vue @@ -1,5 +1,5 @@ <script> -import { GlBadge } from '@gitlab/ui'; +import { GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; import NoteableNote from '~/notes/components/noteable_note.vue'; @@ -11,6 +11,7 @@ export default { }, directives: { SafeHtml, + GlTooltip: GlTooltipDirective, }, props: { draft: { @@ -95,7 +96,15 @@ export default { @mouseleave.native="handleMouseLeave(draft)" > <template #note-header-info> - <gl-badge variant="warning" class="gl-mr-2">{{ __('Pending') }}</gl-badge> + <gl-badge + v-gl-tooltip + variant="warning" + size="sm" + class="gl-mr-2" + :title="__('Pending comments are hidden until you submit your review.')" + > + {{ __('Pending') }} + </gl-badge> </template> <template v-if="!isEditingDraft" #after-note-body> <div diff --git a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue index 4ac0c8c4894..ca9cb03ca37 100644 --- a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue +++ b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue @@ -55,21 +55,25 @@ export default { <template> <gl-disclosure-dropdown :items="listItems" dropup data-qa-selector="review_preview_dropdown"> <template #toggle> - <gl-button - >{{ __('Pending comments') }} <drafts-count variant="neutral" /><gl-icon - class="dropdown-chevron" - name="chevron-up" - /></gl-button> + <gl-button> + {{ __('Pending comments') }} + <drafts-count variant="neutral" /> + <gl-icon class="dropdown-chevron" name="chevron-up" /> + </gl-button> </template> <template #header> - <p class="gl-dropdown-header-top"> - {{ n__('%d pending comment', '%d pending comments', draftsCount) }} - </p> + <div + class="gl-display-flex gl-align-items-center gl-p-4! gl-min-h-8 gl-border-b-1 gl-border-b-solid gl-border-b-gray-200" + > + <span class="gl-flex-grow-1 gl-font-weight-bold gl-font-sm gl-pr-2"> + {{ n__('%d pending comment', '%d pending comments', draftsCount) }} + </span> + </div> </template> <template #list-item="{ item }"> - <preview-item :draft="item" :is-last="item.last" @click="onClickDraft(item)" /> + <preview-item :draft="item" :is-last="item.last" /> </template> </gl-disclosure-dropdown> </template> diff --git a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue index ed0481e7a48..beda251aa1e 100644 --- a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue +++ b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue @@ -9,7 +9,7 @@ import { GlFormCheckbox, } from '@gitlab/ui'; import { mapGetters, mapActions } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { scrollToElement } from '~/lib/utils/common_utils'; import Autosave from '~/autosave'; diff --git a/app/assets/javascripts/batch_comments/index.js b/app/assets/javascripts/batch_comments/index.js index 65fd34dcb00..2a8786134cc 100644 --- a/app/assets/javascripts/batch_comments/index.js +++ b/app/assets/javascripts/batch_comments/index.js @@ -1,17 +1,25 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; import { mapActions, mapGetters } from 'vuex'; +import { apolloProvider } from '~/graphql_shared/issuable_client'; import store from '~/mr_notes/stores'; export const initReviewBar = () => { const el = document.getElementById('js-review-bar'); + Vue.use(VueApollo); + // eslint-disable-next-line no-new new Vue({ el, store, + apolloProvider, components: { ReviewBar: () => import('./components/review_bar.vue'), }, + provide: { + newSavedRepliesPath: el.dataset.savedRepliesNewPath, + }, computed: { ...mapGetters('batchComments', ['draftsCount']), }, diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js index feac6f10b1e..f6eae7c0c83 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js @@ -1,5 +1,5 @@ import { isEmpty } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { scrollToElement } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; import { CHANGES_TAB, DISCUSSION_TAB, SHOW_TAB } from '../../../constants'; @@ -167,3 +167,5 @@ export const expandAllDiscussions = ({ dispatch, state }) => export const toggleResolveDiscussion = ({ commit }, draftId) => { commit(types.TOGGLE_RESOLVE_DISCUSSION, draftId); }; + +export const clearDrafts = ({ commit }) => commit(types.CLEAR_DRAFTS); diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js index df523a692d3..67bcc53ac7d 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutation_types.js @@ -14,3 +14,5 @@ export const RECEIVE_PUBLISH_REVIEW_ERROR = 'RECEIVE_PUBLISH_REVIEW_ERROR'; export const RECEIVE_DRAFT_UPDATE_SUCCESS = 'RECEIVE_DRAFT_UPDATE_SUCCESS'; export const TOGGLE_RESOLVE_DISCUSSION = 'TOGGLE_RESOLVE_DISCUSSION'; + +export const CLEAR_DRAFTS = 'CLEAR_DRAFTS'; diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js index dabfe864575..384d7904ac7 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/mutations.js @@ -62,4 +62,7 @@ export default { return draft; }); }, + [types.CLEAR_DRAFTS](state) { + state.drafts = []; + }, }; diff --git a/app/assets/javascripts/behaviors/copy_code.js b/app/assets/javascripts/behaviors/copy_code.js index 970864eef74..218a402772f 100644 --- a/app/assets/javascripts/behaviors/copy_code.js +++ b/app/assets/javascripts/behaviors/copy_code.js @@ -5,6 +5,8 @@ import { setAttributes } from '~/lib/utils/dom_utils'; class CopyCodeButton extends HTMLElement { connectedCallback() { + if (this.querySelector('.btn')) return; + this.for = uniqueId('code-'); const target = this.parentNode.querySelector('pre'); diff --git a/app/assets/javascripts/behaviors/copy_to_clipboard.js b/app/assets/javascripts/behaviors/copy_to_clipboard.js index 4b337dce8f3..834defe336b 100644 --- a/app/assets/javascripts/behaviors/copy_to_clipboard.js +++ b/app/assets/javascripts/behaviors/copy_to_clipboard.js @@ -10,10 +10,10 @@ const CLIPBOARD_ERROR_EVENT = 'clipboard-error'; const I18N_ERROR_MESSAGE = __('Copy failed. Please manually copy the value.'); function showTooltip(target, title) { - const { title: originalTitle } = target.dataset; + const { originalTitle } = target.dataset; once('hidden', (tooltip) => { - if (tooltip.target === target) { + if (originalTitle && tooltip.target === target) { target.setAttribute('title', originalTitle); target.setAttribute('aria-label', originalTitle); fixTitle(target); diff --git a/app/assets/javascripts/behaviors/date_picker.js b/app/assets/javascripts/behaviors/date_picker.js index efd89ec4330..11fe01ca48d 100644 --- a/app/assets/javascripts/behaviors/date_picker.js +++ b/app/assets/javascripts/behaviors/date_picker.js @@ -27,7 +27,10 @@ export default function initDatePickers() { $('.js-clear-due-date,.js-clear-start-date').on('click', (e) => { e.preventDefault(); - const calendar = $(e.target).siblings('.datepicker').data('pikaday'); + const calendar = $(e.target) + .siblings('.issuable-form-select-holder') + .children('.datepicker') + .data('pikaday'); calendar.setDate(null); }); } diff --git a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js index 19ebab36481..36317444af9 100644 --- a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js @@ -164,7 +164,7 @@ export class CopyAsGFM { static nodeToGFM(node) { return Promise.all([ - import(/* webpackChunkName: 'gfm_copy_extra' */ 'prosemirror-model'), + import(/* webpackChunkName: 'gfm_copy_extra' */ '@tiptap/pm/model'), import(/* webpackChunkName: 'gfm_copy_extra' */ './schema'), import(/* webpackChunkName: 'gfm_copy_extra' */ './serializer'), ]) diff --git a/app/assets/javascripts/behaviors/markdown/render_json_table.js b/app/assets/javascripts/behaviors/markdown/render_json_table.js index 4d9ac1d266b..aa0e7d38113 100644 --- a/app/assets/javascripts/behaviors/markdown/render_json_table.js +++ b/app/assets/javascripts/behaviors/markdown/render_json_table.js @@ -1,7 +1,7 @@ import { memoize } from 'lodash'; import Vue from 'vue'; import { __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; // Async import component since we might not need it... const JSONTable = memoize(() => diff --git a/app/assets/javascripts/behaviors/markdown/render_observability.js b/app/assets/javascripts/behaviors/markdown/render_observability.js index 704d85cf22e..6346fb8ab48 100644 --- a/app/assets/javascripts/behaviors/markdown/render_observability.js +++ b/app/assets/javascripts/behaviors/markdown/render_observability.js @@ -1,25 +1,19 @@ import Vue from 'vue'; -import { darkModeEnabled } from '~/lib/utils/color_utils'; -import { setUrlParams } from '~/lib/utils/url_utility'; - -export function getFrameSrc(url) { - return `${setUrlParams({ theme: darkModeEnabled() ? 'dark' : 'light' }, url)}&kiosk`; -} +import ObservabilityApp from '~/observability/components/observability_app.vue'; +import { SKELETON_VARIANT_EMBED, INLINE_EMBED_DIMENSIONS } from '~/observability/constants'; const mountVueComponent = (element) => { - const url = [element.dataset.frameUrl]; - + const url = element.dataset.frameUrl; return new Vue({ el: element, render(h) { - return h('iframe', { - style: { - height: '366px', - width: '768px', - }, - attrs: { - src: getFrameSrc(url), - frameBorder: '0', + return h(ObservabilityApp, { + props: { + observabilityIframeSrc: url, + inlineEmbed: true, + skeletonVariant: SKELETON_VARIANT_EMBED, + height: INLINE_EMBED_DIMENSIONS.HEIGHT, + width: INLINE_EMBED_DIMENSIONS.WIDTH, }, }); }, @@ -27,7 +21,5 @@ const mountVueComponent = (element) => { }; export default function renderObservability(elements) { - elements.forEach((element) => { - mountVueComponent(element); - }); + return elements.map(mountVueComponent); } diff --git a/app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js index 66007aa9e3d..bd9e41ac0ba 100644 --- a/app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js +++ b/app/assets/javascripts/behaviors/markdown/render_sandboxed_mermaid.js @@ -8,7 +8,7 @@ import { } from '~/lib/utils/url_utility'; import { darkModeEnabled } from '~/lib/utils/color_utils'; import { setAttributes, isElementVisible } from '~/lib/utils/dom_utils'; -import { createAlert, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_WARNING } from '~/alert'; import { unrestrictedPages } from './constants'; // Renders diagrams and flowcharts from text using Mermaid in any element with the diff --git a/app/assets/javascripts/behaviors/markdown/schema.js b/app/assets/javascripts/behaviors/markdown/schema.js index 1b0f46ff4cb..31bab23c8b0 100644 --- a/app/assets/javascripts/behaviors/markdown/schema.js +++ b/app/assets/javascripts/behaviors/markdown/schema.js @@ -1,4 +1,4 @@ -import { Schema } from 'prosemirror-model'; +import { Schema } from '@tiptap/pm/model'; import editorExtensions from './editor_extensions'; const nodes = editorExtensions.nodes.reduce( diff --git a/app/assets/javascripts/behaviors/preview_markdown.js b/app/assets/javascripts/behaviors/preview_markdown.js index 32e395e4f3c..dc408f5a950 100644 --- a/app/assets/javascripts/behaviors/preview_markdown.js +++ b/app/assets/javascripts/behaviors/preview_markdown.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { renderGFM } from '~/behaviors/markdown/render_gfm'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/behaviors/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts.js index 12fdb2e2981..22a8be92e52 100644 --- a/app/assets/javascripts/behaviors/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts.js @@ -26,12 +26,10 @@ export default function initPageShortcuts() { // the pages above have their own shortcuts sub-classes instantiated elsewhere // TODO: replace this whitelist with something more automated/maintainable + // https://gitlab.com/gitlab-org/gitlab/-/issues/392845 if (page && !pagesWithCustomShortcuts.includes(page)) { import(/* webpackChunkName: 'shortcutsBundle' */ './shortcuts/shortcuts') - .then(({ default: Shortcuts }) => { - const shortcuts = new Shortcuts(); - window.toggleShortcutsHelp = shortcuts.onToggleHelp; - }) + .then(({ default: Shortcuts }) => new Shortcuts()) .catch(() => {}); } return false; diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index 7a1577e97d5..6a7ce4f1c41 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -124,8 +124,11 @@ export default class Shortcuts { e.preventDefault(); }); + const shortcutsModalTriggerEvent = 'click.shortcutsModalTrigger'; // eslint-disable-next-line @gitlab/no-global-event-off - $('.js-shortcuts-modal-trigger').off('click').on('click', this.onToggleHelp); + $(document) + .off(shortcutsModalTriggerEvent) + .on(shortcutsModalTriggerEvent, '.js-shortcuts-modal-trigger', this.onToggleHelp); if (shouldDisableShortcuts()) { disableShortcuts(); diff --git a/app/assets/javascripts/blame/blame_redirect.js b/app/assets/javascripts/blame/blame_redirect.js index 155e2a3a2cd..f528fdb1f69 100644 --- a/app/assets/javascripts/blame/blame_redirect.js +++ b/app/assets/javascripts/blame/blame_redirect.js @@ -1,5 +1,5 @@ import { setUrlParams } from '~/lib/utils/url_utility'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; export default function redirectToCorrectBlamePage() { diff --git a/app/assets/javascripts/blame/streaming/index.js b/app/assets/javascripts/blame/streaming/index.js new file mode 100644 index 00000000000..935343cca2e --- /dev/null +++ b/app/assets/javascripts/blame/streaming/index.js @@ -0,0 +1,56 @@ +import { renderHtmlStreams } from '~/streaming/render_html_streams'; +import { handleStreamedAnchorLink } from '~/streaming/handle_streamed_anchor_link'; +import { createAlert } from '~/alert'; +import { __ } from '~/locale'; +import { rateLimitStreamRequests } from '~/streaming/rate_limit_stream_requests'; +import { toPolyfillReadable } from '~/streaming/polyfills'; + +export async function renderBlamePageStreams(firstStreamPromise) { + const element = document.querySelector('#blame-stream-container'); + + if (!element || !firstStreamPromise) return; + + const stopAnchorObserver = handleStreamedAnchorLink(element); + const { dataset } = document.querySelector('#blob-content-holder'); + const totalExtraPages = parseInt(dataset.totalExtraPages, 10); + const { pagesUrl } = dataset; + + const remainingStreams = rateLimitStreamRequests({ + factory: (index) => { + const url = new URL(pagesUrl); + // page numbers start with 1 + // the first page is already rendered in the document + // the second page is passed with the 'firstStreamPromise' + url.searchParams.set('page', index + 3); + return fetch(url).then((response) => toPolyfillReadable(response.body)); + }, + // we don't want to overload gitaly with concurrent requests + // https://gitlab.com/gitlab-org/gitlab/-/issues/391842#note_1281695095 + // using 5 as a good starting point + maxConcurrentRequests: 5, + total: totalExtraPages, + }); + + try { + await renderHtmlStreams( + [firstStreamPromise.then(toPolyfillReadable), ...remainingStreams], + element, + ); + } catch (error) { + createAlert({ + message: __('Blame could not be loaded as a single page.'), + primaryButton: { + text: __('View blame as separate pages'), + clickHandler() { + const newUrl = new URL(window.location); + newUrl.searchParams.delete('streaming'); + window.location.href = newUrl; + }, + }, + }); + throw error; + } finally { + stopAnchorObserver(); + document.querySelector('#blame-stream-loading').remove(); + } +} diff --git a/app/assets/javascripts/blob/csv/index.js b/app/assets/javascripts/blob/csv/index.js index 4cf6c169c68..ed8e1ffa318 100644 --- a/app/assets/javascripts/blob/csv/index.js +++ b/app/assets/javascripts/blob/csv/index.js @@ -10,6 +10,7 @@ export default () => { return createElement(CsvViewer, { props: { csv: el.dataset.data, + remoteFile: true, }, }); }, diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index 2ea3c93625d..7ccb66f18a9 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Api from '~/api'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import toast from '~/vue_shared/plugins/global_toast'; diff --git a/app/assets/javascripts/blob/notebook/notebook_viewer.vue b/app/assets/javascripts/blob/notebook/notebook_viewer.vue index ade92f2562b..acbd231c94a 100644 --- a/app/assets/javascripts/blob/notebook/notebook_viewer.vue +++ b/app/assets/javascripts/blob/notebook/notebook_viewer.vue @@ -83,4 +83,9 @@ export default { .output img { min-width: 0; /* https://www.w3.org/TR/css-flexbox-1/#min-size-auto */ } + +.output .markdown { + display: block; + width: 100%; +} </style> diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 5e85e4cea38..bdaefe8383c 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { renderGFM } from '~/behaviors/markdown/render_gfm'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { REPO_BLOB_LOAD_VIEWER_START, diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js index 509d399273d..01d35a0980f 100644 --- a/app/assets/javascripts/blob_edit/blob_bundle.js +++ b/app/assets/javascripts/blob_edit/blob_bundle.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { setCookie } from '~/lib/utils/common_utils'; import Tracking from '~/tracking'; import NewCommitForm from '../new_commit_form'; diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js index a3d11d90ed2..f021553ae98 100644 --- a/app/assets/javascripts/blob_edit/edit_blob.js +++ b/app/assets/javascripts/blob_edit/edit_blob.js @@ -4,7 +4,7 @@ import { SourceEditorExtension } from '~/editor/extensions/source_editor_extensi import { FileTemplateExtension } from '~/editor/extensions/source_editor_file_template_ext'; import { ToolbarExtension } from '~/editor/extensions/source_editor_toolbar_ext'; import SourceEditor from '~/editor/source_editor'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown'; import { insertFinalNewline } from '~/lib/utils/text_utility'; @@ -68,9 +68,9 @@ export default class EditBlob { blobContent: editorEl.innerText, }); this.editor.use([ + { definition: ToolbarExtension }, { definition: SourceEditorExtension }, { definition: FileTemplateExtension }, - { definition: ToolbarExtension }, ]); fileNameEl.addEventListener('change', () => { diff --git a/app/assets/javascripts/boards/components/board_add_new_column.vue b/app/assets/javascripts/boards/components/board_add_new_column.vue index c5411ec313a..90f7059da86 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column.vue @@ -1,13 +1,24 @@ <script> -import { GlFormRadio, GlFormRadioGroup, GlTooltipDirective as GlTooltip } from '@gitlab/ui'; +import { + GlTooltipDirective as GlTooltip, + GlButton, + GlCollapsibleListbox, + GlIcon, +} from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; import BoardAddNewColumnForm from '~/boards/components/board_add_new_column_form.vue'; +import { __ } from '~/locale'; export default { + i18n: { + value: __('Value'), + noResults: __('No matching results'), + }, components: { BoardAddNewColumnForm, - GlFormRadio, - GlFormRadioGroup, + GlButton, + GlCollapsibleListbox, + GlIcon, }, directives: { GlTooltip, @@ -17,6 +28,7 @@ export default { return { selectedId: null, selectedLabel: null, + selectedIdValid: true, }; }, computed: { @@ -25,6 +37,15 @@ export default { columnForSelected() { return this.getListByLabelId(this.selectedId); }, + items() { + return ( + this.labels.map((i) => ({ + ...i, + text: i.title, + value: i.id, + })) || [] + ); + }, }, created() { this.filterItems(); @@ -33,6 +54,7 @@ export default { ...mapActions(['createList', 'fetchLabels', 'highlightList', 'setAddColumnFormVisibility']), addList() { if (!this.selectedLabel) { + this.selectedIdValid = false; return; } @@ -61,53 +83,67 @@ export default { this.selectedLabel = { ...label }; } }, + onHide() { + this.searchValue = ''; + this.$emit('filter-items', ''); + this.$emit('hide'); + }, }, }; </script> <template> <board-add-new-column-form - :loading="labelsLoading" - :none-selected="__('Select a label')" - :search-placeholder="__('Search labels')" - :selected-id="selectedId" + :selected-id-valid="selectedIdValid" @filter-items="filterItems" @add-list="addList" > - <template #selected> - <template v-if="selectedLabel"> - <span - class="dropdown-label-box gl-top-0 gl-flex-shrink-0" - :style="{ - backgroundColor: selectedLabel.color, - }" - ></span> - <div class="gl-text-truncate">{{ selectedLabel.title }}</div> - </template> - </template> - - <template #items> - <gl-form-radio-group - v-if="labels.length > 0" - class="gl-overflow-y-auto gl-px-5 gl-pt-3" - :checked="selectedId" - @change="setSelectedItem" + <template #dropdown> + <gl-collapsible-listbox + class="gl-mb-3 gl-max-w-full" + :items="items" + searchable + :search-placeholder="__('Search labels')" + :searching="labelsLoading" + :selected="selectedId" + :no-results-text="$options.i18n.noResults" + @select="setSelectedItem" + @search="filterItems" + @hidden="onHide" > - <label - v-for="label in labels" - :key="label.id" - class="gl-display-flex gl-mb-5 gl-font-weight-normal gl-overflow-break-word" - > - <gl-form-radio :value="label.id" /> - <span - class="dropdown-label-box gl-top-0 gl-flex-shrink-0" - :style="{ - backgroundColor: label.color, - }" - ></span> - <span>{{ label.title }}</span> - </label> - </gl-form-radio-group> + <template #toggle> + <gl-button + class="gl-max-w-full gl-display-flex gl-align-items-center gl-text-truncate" + :class="{ 'gl-inset-border-1-red-400!': !selectedIdValid }" + button-text-classes="gl-display-flex" + > + <template v-if="selectedLabel"> + <span + class="dropdown-label-box gl-top-0 gl-flex-shrink-0" + :style="{ + backgroundColor: selectedLabel.color, + }" + ></span> + <div class="gl-text-truncate">{{ selectedLabel.title }}</div> + </template> + + <template v-else>{{ __('Select a label') }}</template> + <gl-icon class="dropdown-chevron gl-ml-2" name="chevron-down" /> + </gl-button> + </template> + + <template #list-item="{ item }"> + <label class="gl-display-flex gl-font-weight-normal gl-overflow-break-word gl-mb-0"> + <span + class="dropdown-label-box gl-top-0 gl-flex-shrink-0" + :style="{ + backgroundColor: item.color, + }" + ></span> + <span>{{ item.title }}</span> + </label> + </template> + </gl-collapsible-listbox> </template> </board-add-new-column-form> </template> diff --git a/app/assets/javascripts/boards/components/board_add_new_column_form.vue b/app/assets/javascripts/boards/components/board_add_new_column_form.vue index 1899d42fa4d..259423df07f 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column_form.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column_form.vue @@ -1,12 +1,5 @@ <script> -import { - GlButton, - GlDropdown, - GlFormGroup, - GlIcon, - GlSearchBoxByType, - GlSkeletonLoader, -} from '@gitlab/ui'; +import { GlButton, GlFormGroup } from '@gitlab/ui'; import { mapActions } from 'vuex'; import { __ } from '~/locale'; @@ -15,81 +8,34 @@ export default { add: __('Add to board'), cancel: __('Cancel'), newList: __('New list'), - noResults: __('No matching results'), scope: __('Scope'), scopeDescription: __('Issues must match this scope to appear in this list.'), - selected: __('Selected'), requiredFieldFeedback: __('This field is required.'), }, components: { GlButton, - GlDropdown, GlFormGroup, - GlIcon, - GlSearchBoxByType, - GlSkeletonLoader, }, props: { - loading: { - type: Boolean, - required: true, - }, searchLabel: { type: String, required: false, default: null, }, - noneSelected: { - type: String, - required: true, - }, - searchPlaceholder: { - type: String, + selectedIdValid: { + type: Boolean, required: true, }, - selectedId: { - type: [Number, String], - required: false, - default: null, - }, }, data() { return { searchValue: '', - selectedIdValid: true, }; }, - computed: { - toggleClassList() { - return `gl-max-w-full gl-display-flex gl-align-items-center gl-text-trunate ${ - this.selectedIdValid ? '' : 'gl-inset-border-1-red-400!' - }`; - }, - }, - watch: { - selectedId(val) { - if (val) { - this.$refs.dropdown.hide(true); - this.selectedIdValid = true; - } - }, - }, methods: { ...mapActions(['setAddColumnFormVisibility']), - setFocus() { - this.$refs.searchBox.focusInput(); - }, - onHide() { - this.searchValue = ''; - this.$emit('filter-items', ''); - this.$emit('hide'); - }, onSubmit() { - if (!this.selectedId) { - this.selectedIdValid = false; - } else { - this.$emit('add-list'); - } + this.$emit('add-list'); }, }, }; @@ -126,44 +72,7 @@ export default { :state="selectedIdValid" :invalid-feedback="$options.i18n.requiredFieldFeedback" > - <gl-dropdown - ref="dropdown" - class="gl-mb-3 gl-max-w-full" - :toggle-class="toggleClassList" - boundary="viewport" - @shown="setFocus" - @hide="onHide" - > - <template #button-content> - <slot name="selected"> - <div>{{ noneSelected }}</div> - </slot> - <gl-icon class="dropdown-chevron gl-flex-shrink-0" name="chevron-down" /> - </template> - - <template #header> - <gl-search-box-by-type - ref="searchBox" - v-model="searchValue" - debounce="250" - class="gl-mt-0!" - :placeholder="searchPlaceholder" - @input="$emit('filter-items', $event)" - /> - </template> - - <div v-if="loading" class="gl-px-5"> - <gl-skeleton-loader :width="400" :height="172"> - <rect width="380" height="20" x="10" y="15" rx="4" /> - <rect width="280" height="20" x="10" y="50" rx="4" /> - <rect width="330" height="20" x="10" y="85" rx="4" /> - </gl-skeleton-loader> - </div> - - <slot v-else name="items"> - <p class="gl-mx-5">{{ $options.i18n.noResults }}</p> - </slot> - </gl-dropdown> + <slot name="dropdown"></slot> </gl-form-group> </div> <div class="gl-display-flex gl-mb-4"> diff --git a/app/assets/javascripts/boards/components/board_app.vue b/app/assets/javascripts/boards/components/board_app.vue index d41fc1e9300..48dfcf81f1e 100644 --- a/app/assets/javascripts/boards/components/board_app.vue +++ b/app/assets/javascripts/boards/components/board_app.vue @@ -1,6 +1,6 @@ <script> import { mapGetters } from 'vuex'; -import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import { refreshCurrentPage, queryToObject } from '~/lib/utils/url_utility'; import BoardContent from '~/boards/components/board_content.vue'; import BoardSettingsSidebar from '~/boards/components/board_settings_sidebar.vue'; import BoardTopBar from '~/boards/components/board_top_bar.vue'; @@ -11,14 +11,19 @@ export default { BoardSettingsSidebar, BoardTopBar, }, - inject: ['initialBoardId'], + inject: ['initialBoardId', 'initialFilterParams'], data() { return { boardId: this.initialBoardId, + filterParams: { ...this.initialFilterParams }, + isShowingEpicsSwimlanes: Boolean(queryToObject(window.location.search).group_by), }; }, computed: { ...mapGetters(['isSidebarOpen']), + isSwimlanesOn() { + return (gon?.licensed_features?.swimlanes && this.isShowingEpicsSwimlanes) ?? false; + }, }, created() { window.addEventListener('popstate', refreshCurrentPage); @@ -30,14 +35,29 @@ export default { switchBoard(id) { this.boardId = id; }, + setFilters(filters) { + const filterParams = { ...filters }; + if (filterParams.groupBy) delete filterParams.groupBy; + this.filterParams = filterParams; + }, }, }; </script> <template> <div class="boards-app gl-relative" :class="{ 'is-compact': isSidebarOpen }"> - <board-top-bar :board-id="boardId" @switchBoard="switchBoard" /> - <board-content :board-id="boardId" /> + <board-top-bar + :board-id="boardId" + :is-swimlanes-on="isSwimlanesOn" + @switchBoard="switchBoard" + @setFilters="setFilters" + @toggleSwimlanes="isShowingEpicsSwimlanes = $event" + /> + <board-content + :board-id="boardId" + :is-swimlanes-on="isSwimlanesOn" + :filter-params="filterParams" + /> <board-settings-sidebar /> </div> </template> diff --git a/app/assets/javascripts/boards/components/board_column.vue b/app/assets/javascripts/boards/components/board_column.vue index 708e1539c6e..83ba538168a 100644 --- a/app/assets/javascripts/boards/components/board_column.vue +++ b/app/assets/javascripts/boards/components/board_column.vue @@ -20,6 +20,10 @@ export default { type: String, required: true, }, + filters: { + type: Object, + required: true, + }, }, computed: { ...mapState(['filterParams', 'highlightedLists']), @@ -33,11 +37,14 @@ export default { isListDraggable() { return isListDraggable(this.list); }, + filtersToUse() { + return this.isApolloBoard ? this.filters : this.filterParams; + }, }, watch: { filterParams: { handler() { - if (this.list.id && !this.list.collapsed) { + if (!this.isApolloBoard && this.list.id && !this.list.collapsed) { this.fetchItemsForList({ listId: this.list.id }); } }, @@ -46,7 +53,7 @@ export default { }, 'list.id': { handler(id) { - if (id) { + if (!this.isApolloBoard && id) { this.fetchItemsForList({ listId: this.list.id }); } }, @@ -83,13 +90,13 @@ export default { class="board-inner gl-display-flex gl-flex-direction-column gl-relative gl-h-full gl-rounded-base gl-bg-gray-50" :class="{ 'board-column-highlighted': highlighted }" > - <board-list-header :list="list" /> + <board-list-header :list="list" :filter-params="filtersToUse" /> <board-list ref="board-list" :board-id="boardId" :board-items="listItems" :list="list" - :filter-params="filterParams" + :filter-params="filtersToUse" /> </div> </div> diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue index 8a37719eae8..84a8781db1c 100644 --- a/app/assets/javascripts/boards/components/board_content.vue +++ b/app/assets/javascripts/boards/components/board_content.vue @@ -3,9 +3,10 @@ import { GlAlert } from '@gitlab/ui'; import { breakpoints } from '@gitlab/ui/dist/utils'; import { sortBy, throttle } from 'lodash'; import Draggable from 'vuedraggable'; -import { mapState, mapGetters, mapActions } from 'vuex'; +import { mapState, mapActions } from 'vuex'; import { contentTop } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; +import eventHub from '~/boards/eventhub'; import { formatBoardLists } from 'ee_else_ce/boards/boards_util'; import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column.vue'; import { defaultSortableOptions } from '~/sortable/constants'; @@ -44,6 +45,14 @@ export default { type: String, required: true, }, + filterParams: { + type: Object, + required: true, + }, + isSwimlanesOn: { + type: Boolean, + required: true, + }, }, data() { return { @@ -80,7 +89,6 @@ export default { }, computed: { ...mapState(['boardLists', 'error', 'addColumnForm']), - ...mapGetters(['isSwimlanesOn']), addColumnFormVisible() { return this.addColumnForm?.visible; }, @@ -92,7 +100,7 @@ export default { }), fullPath: this.fullPath, boardId: this.boardId, - filterParams: this.filterParams, + filters: this.filterParams, }; }, boardListsToUse() { @@ -126,6 +134,12 @@ export default { return this.isApolloBoard ? this.apolloError : this.error; }, }, + created() { + eventHub.$on('updateBoard', this.refetchLists); + }, + beforeDestroy() { + eventHub.$off('updateBoard', this.refetchLists); + }, mounted() { this.setBoardHeight(); @@ -152,6 +166,9 @@ export default { this.boardHeight = `${window.innerHeight - this.$el.getBoundingClientRect().top}px`; } }, + refetchLists() { + this.$apollo.queries.boardListsApollo.refetch(); + }, }, }; </script> @@ -176,6 +193,7 @@ export default { ref="board" :board-id="boardId" :list="list" + :filters="filterParams" :data-draggable-item-type="$options.draggableItemTypes.list" :class="{ 'gl-xs-display-none!': addColumnFormVisible }" /> @@ -190,6 +208,7 @@ export default { ref="swimlanes" :lists="boardListsToUse" :can-admin-list="canAdminList" + :filters="filterParams" :style="{ height: boardHeight }" /> diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue index 6227f185eda..675878683ab 100644 --- a/app/assets/javascripts/boards/components/board_content_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue @@ -6,9 +6,9 @@ import SidebarDropdownWidget from 'ee_else_ce/sidebar/components/sidebar_dropdow import { __, sprintf } from '~/locale'; import BoardSidebarTimeTracker from '~/boards/components/sidebar/board_sidebar_time_tracker.vue'; import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.vue'; -import { BoardType, ISSUABLE, INCIDENT } from '~/boards/constants'; +import { ISSUABLE, INCIDENT } from '~/boards/constants'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import SidebarAssigneesWidget from '~/sidebar/components/assignees/sidebar_assignees_widget.vue'; import SidebarConfidentialityWidget from '~/sidebar/components/confidential/sidebar_confidentiality_widget.vue'; import SidebarDateWidget from '~/sidebar/components/date/sidebar_date_widget.vue'; @@ -16,7 +16,6 @@ import SidebarSeverityWidget from '~/sidebar/components/severity/sidebar_severit import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue'; import SidebarTodoWidget from '~/sidebar/components/todo_toggle/sidebar_todo_widget.vue'; import SidebarLabelsWidget from '~/sidebar/components/labels/labels_select_widget/labels_select_root.vue'; -import { LabelType } from '~/sidebar/components/labels/labels_select_widget/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { @@ -98,7 +97,7 @@ export default { return this.activeBoardItem?.referencePath?.split('#')[0] || ''; }, parentType() { - return this.isGroupBoard ? BoardType.group : BoardType.project; + return this.isGroupBoard ? WORKSPACE_GROUP : WORKSPACE_PROJECT; }, createLabelTitle() { return sprintf(__('Create %{workspace} label'), { @@ -114,7 +113,7 @@ export default { return this.isGroupBoard ? this.groupPathForActiveIssue : this.projectPathForActiveIssue; }, labelType() { - return this.isGroupBoard ? LabelType.group : LabelType.project; + return this.isGroupBoard ? WORKSPACE_GROUP : WORKSPACE_PROJECT; }, labelsFilterPath() { return this.isGroupBoard diff --git a/app/assets/javascripts/boards/components/board_filtered_search.vue b/app/assets/javascripts/boards/components/board_filtered_search.vue index 1bc5d910561..2e14afad963 100644 --- a/app/assets/javascripts/boards/components/board_filtered_search.vue +++ b/app/assets/javascripts/boards/components/board_filtered_search.vue @@ -1,7 +1,7 @@ <script> import { pickBy, isEmpty, mapValues } from 'lodash'; import { mapActions } from 'vuex'; -import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils'; +import { getIdFromGraphQLId, isGid, convertToGraphQLId } from '~/graphql_shared/utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { updateHistory, setUrlParams, queryToObject } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; @@ -23,6 +23,7 @@ import { } from '~/vue_shared/components/filtered_search_bar/constants'; import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { AssigneeFilterType } from '~/boards/constants'; +import { TYPENAME_ITERATION } from '~/graphql_shared/constants'; import eventHub from '../eventhub'; export default { @@ -30,7 +31,7 @@ export default { search: __('Search'), }, components: { FilteredSearch }, - inject: ['initialFilterParams'], + inject: ['initialFilterParams', 'isApolloBoard'], props: { tokens: { type: Array, @@ -334,11 +335,23 @@ export default { }, ); }, + formattedFilterParams() { + const filtersCopy = { ...this.filterParams }; + if (this.filterParams?.iterationId) { + filtersCopy.iterationId = convertToGraphQLId( + TYPENAME_ITERATION, + this.filterParams.iterationId, + ); + } + + return filtersCopy; + }, }, created() { eventHub.$on('updateTokens', this.updateTokens); if (!isEmpty(this.eeFilters)) { this.filterParams = this.eeFilters; + this.$emit('setFilters', this.formattedFilterParams); } }, beforeDestroy() { @@ -349,6 +362,7 @@ export default { updateTokens() { const rawFilterParams = queryToObject(window.location.search, { gatherArrays: true }); this.filterParams = convertObjectPropsToCamelCase(rawFilterParams, {}); + this.$emit('setFilters', this.formattedFilterParams); this.filteredSearchKey += 1; }, handleFilter(filters) { @@ -360,7 +374,11 @@ export default { replace: true, }); - this.performSearch(); + if (this.isApolloBoard) { + this.$emit('setFilters', this.formattedFilterParams); + } else { + this.performSearch(); + } }, getFilterParams(filters = []) { const notFilters = filters.filter((item) => item.value.operator === '!='); diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index a71bde54a8f..9ea801dc9a2 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -4,6 +4,7 @@ import { mapActions, mapState } from 'vuex'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { visitUrl, updateHistory, getParameterByName } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; +import eventHub from '~/boards/eventhub'; import { formType } from '../constants'; import createBoardMutation from '../graphql/board_create.mutation.graphql'; @@ -57,6 +58,9 @@ export default { isProjectBoard: { default: false, }, + isApolloBoard: { + default: false, + }, }, props: { canAdminBoard: { @@ -124,14 +128,12 @@ export default { primaryProps() { return { text: this.buttonText, - attributes: [ - { - variant: this.buttonKind, - disabled: this.submitDisabled, - loading: this.isLoading, - 'data-qa-selector': 'save_changes_button', - }, - ], + attributes: { + variant: this.buttonKind, + disabled: this.submitDisabled, + loading: this.isLoading, + 'data-qa-selector': 'save_changes_button', + }, }; }, cancelProps() { @@ -213,13 +215,23 @@ export default { } else { try { const board = await this.createOrUpdateBoard(); - this.setBoard(board); + if (this.isApolloBoard) { + if (this.board.id) { + eventHub.$emit('updateBoard', board); + } else { + this.$emit('addBoard', board); + } + } else { + this.setBoard(board); + } this.cancel(); - const param = getParameterByName('group_by') - ? `?group_by=${getParameterByName('group_by')}` - : ''; - updateHistory({ url: `${this.boardBaseUrl}/${getIdFromGraphQLId(board.id)}${param}` }); + if (!this.isApolloBoard) { + const param = getParameterByName('group_by') + ? `?group_by=${getParameterByName('group_by')}` + : ''; + updateHistory({ url: `${this.boardBaseUrl}/${getIdFromGraphQLId(board.id)}${param}` }); + } } catch { this.setError({ message: this.$options.i18n.saveErrorMessage }); } finally { @@ -278,7 +290,7 @@ export default { @hide.prevent > <gl-alert - v-if="error" + v-if="!isApolloBoard && error" class="gl-mb-3" variant="danger" :dismissible="true" diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index 6f2b35f5191..a47db661445 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -59,6 +59,10 @@ export default { type: Array, required: true, }, + filterParams: { + type: Object, + required: true, + }, }, data() { return { @@ -108,7 +112,7 @@ export default { }, }, computed: { - ...mapState(['pageInfoByListId', 'listsFlags', 'filterParams', 'isUpdateIssueOrderInProgress']), + ...mapState(['pageInfoByListId', 'listsFlags', 'isUpdateIssueOrderInProgress']), boardListItems() { return this.isApolloBoard ? this.currentList?.[`${this.issuableType}s`].nodes || [] @@ -125,7 +129,7 @@ export default { }; }, listItemsCount() { - return this.isEpicBoard ? this.list.epicsCount : this.boardList?.issuesCount; + return this.isEpicBoard ? this.list.metadata.epicsCount : this.boardList?.issuesCount; }, paginatedIssueText() { return sprintf(__('Showing %{pageSize} of %{total} %{issuableType}'), { @@ -260,6 +264,10 @@ export default { this.showIssueForm = !this.showIssueForm; } }, + isObservableItem(index) { + // observe every 6 item of 10 to achieve smooth loading state + return index !== 0 && index % 6 === 0; + }, onReachingListBottom() { if (!this.loadingMore && this.hasNextPage) { this.showCount = true; @@ -393,8 +401,14 @@ export default { :list="list" :list-items-length="boardListItems.length" /> + <gl-intersection-observer + v-if="isObservableItem(index)" + data-testid="board-card-gl-io" + @appear="onReachingListBottom" + /> </board-card> - <gl-intersection-observer @appear="onReachingListBottom"> + <div> + <!-- for supporting previous structure with intersection observer --> <li v-if="showCount" class="board-list-count gl-text-center gl-text-secondary gl-py-4" @@ -409,7 +423,7 @@ export default { <span v-if="showingAllItems">{{ showingAllItemsText }}</span> <span v-else>{{ paginatedIssueText }}</span> </li> - </gl-intersection-observer> + </div> </component> </div> </template> diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue index 749fae0c426..f4358315d45 100644 --- a/app/assets/javascripts/boards/components/board_list_header.vue +++ b/app/assets/javascripts/boards/components/board_list_header.vue @@ -1,18 +1,18 @@ <script> import { GlButton, - GlButtonGroup, GlLabel, GlTooltip, GlIcon, GlSprintf, GlTooltipDirective, + GlDisclosureDropdown, } from '@gitlab/ui'; -import { mapActions, mapGetters, mapState } from 'vuex'; +import { mapActions, mapState } from 'vuex'; import { isListDraggable } from '~/boards/boards_util'; import { isScopedLabel, parseBoolean } from '~/lib/utils/common_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; -import { n__, s__, __ } from '~/locale'; +import { n__, s__ } from '~/locale'; import sidebarEventHub from '~/sidebar/event_hub'; import Tracking from '~/tracking'; import { formatDate } from '~/lib/utils/datetime_utility'; @@ -25,14 +25,15 @@ import ItemCount from './item_count.vue'; export default { i18n: { - newIssue: __('New issue'), - newEpic: s__('Boards|New epic'), - listSettings: __('List settings'), + newIssue: s__('Boards|Create new issue'), + listActions: s__('Boards|List actions'), + newEpic: s__('Boards|Create new epic'), + listSettings: s__('Boards|Edit list settings'), expand: s__('Boards|Expand'), collapse: s__('Boards|Collapse'), }, components: { - GlButtonGroup, + GlDisclosureDropdown, GlButton, GlLabel, GlTooltip, @@ -75,16 +76,22 @@ export default { required: false, default: false, }, + filterParams: { + type: Object, + required: true, + }, }, computed: { - ...mapState(['activeId', 'filterParams', 'boardId']), - ...mapGetters(['isSwimlanesOn']), + ...mapState(['activeId', 'boardId']), isLoggedIn() { return Boolean(this.currentUserId); }, listType() { return this.list.listType; }, + itemsCount() { + return this.isEpicBoard ? this.list.metadata.epicsCount : this.boardList?.issuesCount; + }, listAssignee() { return this.list?.assignee?.username || ''; }, @@ -111,7 +118,10 @@ export default { }, showListHeaderActions() { if (this.isLoggedIn) { - return this.isNewIssueShown || this.isNewEpicShown || this.isSettingsShown; + return ( + (this.isNewIssueShown || this.isNewEpicShown || this.isSettingsShown) && + !this.list.collapsed + ); } return false; }, @@ -162,6 +172,50 @@ export default { canShowTotalWeight() { return this.weightFeatureAvailable && !this.isLoading; }, + actionListItems() { + const items = []; + + if (this.isNewIssueShown) { + const newIssueText = this.$options.i18n.newIssue; + items.push({ + text: newIssueText, + action: this.showNewIssueForm, + extraAttrs: { + 'data-testid': 'newIssueBtn', + title: newIssueText, + 'aria-label': newIssueText, + }, + }); + } + + if (this.isNewEpicShown) { + const newEpicText = this.$options.i18n.newEpic; + items.push({ + text: newEpicText, + action: this.showNewEpicForm, + extraAttrs: { + 'data-testid': 'newEpicBtn', + title: newEpicText, + 'aria-label': newEpicText, + }, + }); + } + + if (this.isSettingsShown) { + const listSettingsText = this.$options.i18n.listSettings; + items.push({ + text: listSettingsText, + action: this.openSidebarSettings, + extraAttrs: { + 'data-testid': 'settingsBtn', + title: listSettingsText, + 'aria-label': listSettingsText, + }, + }); + } + + return items; + }, }, apollo: { boardList: { @@ -188,6 +242,9 @@ export default { }, methods: { ...mapActions(['updateList', 'setActiveId', 'toggleListCollapsed']), + closeListActions() { + this.$refs.headerListActions?.close(); + }, openSidebarSettings() { if (this.activeId === inactiveId) { sidebarEventHub.$emit('sidebar.closeAll'); @@ -196,13 +253,14 @@ export default { this.setActiveId({ id: this.list.id, sidebarType: LIST }); this.track('click_button', { label: 'list_settings' }); + + this.closeListActions(); }, showScopedLabels(label) { return this.scopedLabelsAvailable && isScopedLabel(label); }, - showNewIssueForm() { - if (this.isSwimlanesOn) { + if (this.isSwimlanesHeader) { eventHub.$emit('open-unassigned-lane'); this.$nextTick(() => { eventHub.$emit(`${toggleFormEventPrefix.issue}${this.list.id}`); @@ -210,9 +268,13 @@ export default { } else { eventHub.$emit(`${toggleFormEventPrefix.issue}${this.list.id}`); } + + this.closeListActions(); }, showNewEpicForm() { eventHub.$emit(`${toggleFormEventPrefix.epic}${this.list.id}`); + + this.closeListActions(); }, toggleExpanded() { const collapsed = !this.list.collapsed; @@ -392,7 +454,7 @@ export default { <gl-icon class="gl-mr-2" :name="countIcon" :size="14" /> <item-count v-if="!isLoading" - :items-size="isEpicBoard ? list.epicsCount : boardList.issuesCount" + :items-size="itemsCount" :max-issue-count="list.maxIssueCount" /> </span> @@ -407,44 +469,24 @@ export default { <!-- EE end --> </span> </div> - <gl-button-group v-if="showListHeaderActions" class="board-list-button-group gl-pl-2"> - <gl-button - v-if="isNewIssueShown" - v-show="!list.collapsed" - ref="newIssueBtn" - v-gl-tooltip.hover - :aria-label="$options.i18n.newIssue" - :title="$options.i18n.newIssue" - class="no-drag" - size="small" - icon="plus" - @click="showNewIssueForm" - /> - - <gl-button - v-if="isNewEpicShown" - v-show="!list.collapsed" - v-gl-tooltip.hover - :aria-label="$options.i18n.newEpic" - :title="$options.i18n.newEpic" - class="no-drag" - size="small" - icon="plus" - @click="showNewEpicForm" - /> - - <gl-button - v-if="isSettingsShown" - ref="settingsBtn" - v-gl-tooltip.hover - :aria-label="$options.i18n.listSettings" - class="no-drag" - size="small" - :title="$options.i18n.listSettings" - icon="settings" - @click="openSidebarSettings" - /> - </gl-button-group> + <gl-disclosure-dropdown + v-if="showListHeaderActions" + ref="headerListActions" + v-gl-tooltip.hover.top="{ + title: $options.i18n.listActions, + boundary: 'viewport', + }" + data-testid="header-list-actions" + class="gl-py-2 gl-ml-3" + :aria-label="$options.i18n.listActions" + :title="$options.i18n.listActions" + category="tertiary" + icon="ellipsis_v" + :text-sr-only="true" + :items="actionListItems" + no-caret + placement="right" + /> </h3> </header> </template> diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue index c0c2699b63d..afa20f63913 100644 --- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue @@ -136,11 +136,11 @@ export default { size="sm" :action-primary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ { text: $options.i18n.modalAction, - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" :action-secondary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ { text: $options.i18n.modalCancel, - attributes: [{ variant: 'default' }], + attributes: { variant: 'default' }, } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" @primary="handleModalPrimary" > diff --git a/app/assets/javascripts/boards/components/board_top_bar.vue b/app/assets/javascripts/boards/components/board_top_bar.vue index 2e20ed70bb0..fad57758be1 100644 --- a/app/assets/javascripts/boards/components/board_top_bar.vue +++ b/app/assets/javascripts/boards/components/board_top_bar.vue @@ -35,6 +35,10 @@ export default { type: String, required: true, }, + isSwimlanesOn: { + type: Boolean, + required: true, + }, }, data() { return { @@ -56,10 +60,28 @@ export default { return !this.isApolloBoard; }, update(data) { - return data.workspace.board; + const { board } = data.workspace; + return { + ...board, + labels: board.labels?.nodes, + }; }, }, }, + computed: { + hasScope() { + if (this.board.labels?.length > 0) { + return true; + } + let hasScope = false; + ['assignee', 'iterationCadence', 'iteration', 'milestone', 'weight'].forEach((attr) => { + if (this.board[attr] !== null && this.board[attr] !== undefined) { + hasScope = true; + } + }); + return hasScope; + }, + }, }; </script> @@ -73,15 +95,27 @@ export default { > <boards-selector :board-apollo="board" @switchBoard="$emit('switchBoard', $event)" /> <new-board-button /> - <issue-board-filtered-search v-if="isIssueBoard" /> - <epic-board-filtered-search v-else /> + <issue-board-filtered-search + v-if="isIssueBoard" + :board="board" + @setFilters="$emit('setFilters', $event)" + /> + <epic-board-filtered-search + v-else + :board="board" + @setFilters="$emit('setFilters', $event)" + /> </div> <div class="filter-dropdown-container gl-md-display-flex gl-flex-direction-column gl-md-flex-direction-row gl-align-items-flex-start" > <toggle-labels /> - <toggle-epics-swimlanes v-if="swimlanesFeatureAvailable && isSignedIn" /> - <config-toggle /> + <toggle-epics-swimlanes + v-if="swimlanesFeatureAvailable && isSignedIn" + :is-swimlanes-on="isSwimlanesOn" + @toggleSwimlanes="$emit('toggleSwimlanes', $event)" + /> + <config-toggle :board-has-scope="hasScope" /> <board-add-new-column-trigger v-if="canAdminList" /> <toggle-focus /> </div> diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index a1a49386b37..4aec286a5f4 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -8,6 +8,7 @@ import { GlDropdownItem, GlModalDirective, } from '@gitlab/ui'; +import { produce } from 'immer'; import { throttle } from 'lodash'; import { mapActions, mapState } from 'vuex'; @@ -89,6 +90,9 @@ export default { parentType() { return this.boardType; }, + boardQuery() { + return this.isGroupBoard ? groupBoardsQuery : projectBoardsQuery; + }, loading() { return this.loadingRecentBoards || this.loadingBoards; }, @@ -155,9 +159,6 @@ export default { name: node.name, })); }, - boardQuery() { - return this.isGroupBoard ? groupBoardsQuery : projectBoardsQuery; - }, recentBoardsQuery() { return this.isGroupBoard ? groupRecentBoardsQuery : projectRecentBoardsQuery; }, @@ -191,6 +192,29 @@ export default { }, }); }, + addBoard(board) { + const { defaultClient: store } = this.$apollo.provider.clients; + + const sourceData = store.readQuery({ + query: this.boardQuery, + variables: { fullPath: this.fullPath }, + }); + + const newData = produce(sourceData, (draftState) => { + draftState[this.parentType].boards.edges = [ + ...draftState[this.parentType].boards.edges, + { node: board }, + ]; + }); + + store.writeQuery({ + query: this.boardQuery, + variables: { fullPath: this.fullPath }, + data: newData, + }); + + this.$emit('switchBoard', board.id); + }, isScrolledUp() { const { content } = this.$refs; @@ -226,14 +250,12 @@ export default { boardType: this.boardType, }); }, - fullBoardId(boardId) { - return fullBoardId(boardId); - }, async switchBoard(boardId, e) { if (isMetaKey(e)) { window.open(`${this.boardBaseUrl}/${boardId}`, '_blank'); } else if (this.isApolloBoard) { - this.$emit('switchBoard', this.fullBoardId(boardId)); + this.$emit('switchBoard', fullBoardId(boardId)); + updateHistory({ url: `${this.boardBaseUrl}/${boardId}` }); } else { this.unsetActiveId(); this.fetchCurrentBoard(boardId); @@ -357,6 +379,7 @@ export default { :weights="weights" :current-board="boardToUse" :current-page="currentPage" + @addBoard="addBoard" @cancel="cancel" /> </span> diff --git a/app/assets/javascripts/boards/components/config_toggle.vue b/app/assets/javascripts/boards/components/config_toggle.vue index 7002fd44294..dd3b9472879 100644 --- a/app/assets/javascripts/boards/components/config_toggle.vue +++ b/app/assets/javascripts/boards/components/config_toggle.vue @@ -16,6 +16,13 @@ export default { }, mixins: [Tracking.mixin()], inject: ['canAdminList'], + props: { + boardHasScope: { + type: Boolean, + required: false, + default: false, + }, + }, computed: { ...mapGetters(['hasScope']), buttonText() { @@ -40,7 +47,7 @@ export default { v-gl-modal-directive="'board-config-modal'" v-gl-tooltip :title="tooltipTitle" - :class="{ 'dot-highlight': hasScope }" + :class="{ 'dot-highlight': hasScope || boardHasScope }" data-qa-selector="boards_config_button" @click.prevent="showPage" > diff --git a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue index 7749391ec6f..cdcc7b8e5a6 100644 --- a/app/assets/javascripts/boards/components/issue_board_filtered_search.vue +++ b/app/assets/javascripts/boards/components/issue_board_filtered_search.vue @@ -1,12 +1,11 @@ <script> import { GlFilteredSearchToken } from '@gitlab/ui'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; -import { mapActions } from 'vuex'; import { orderBy } from 'lodash'; import BoardFilteredSearch from 'ee_else_ce/boards/components/board_filtered_search.vue'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; -import issueBoardFilters from '~/boards/issue_board_filters'; +import issueBoardFilters from 'ee_else_ce/boards/issue_board_filters'; import { TYPENAME_USER } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; @@ -47,11 +46,18 @@ export default { }, components: { BoardFilteredSearch }, inject: ['isSignedIn', 'releasesFetchPath', 'fullPath', 'isGroupBoard'], + props: { + board: { + type: Object, + required: false, + default: () => {}, + }, + }, computed: { tokensCE() { const { issue, incident } = this.$options.i18n; const { types } = this.$options; - const { fetchUsers, fetchLabels } = issueBoardFilters( + const { fetchUsers, fetchLabels, fetchMilestones } = issueBoardFilters( this.$apollo, this.fullPath, this.isGroupBoard, @@ -135,7 +141,7 @@ export default { token: MilestoneToken, unique: true, shouldSkipSort: true, - fetchMilestones: this.fetchMilestones, + fetchMilestones, }, { icon: 'issues', @@ -176,7 +182,6 @@ export default { }, }, methods: { - ...mapActions(['fetchMilestones']), preloadedUsers() { return gon?.current_user_id ? [ @@ -194,5 +199,10 @@ export default { </script> <template> - <board-filtered-search data-testid="issue-board-filtered-search" :tokens="tokens" /> + <board-filtered-search + data-testid="issue-board-filtered-search" + :tokens="tokens" + :board="board" + @setFilters="$emit('setFilters', $event)" + /> </template> diff --git a/app/assets/javascripts/boards/constants.js b/app/assets/javascripts/boards/constants.js index 712e3e1ac4a..b557dc9205e 100644 --- a/app/assets/javascripts/boards/constants.js +++ b/app/assets/javascripts/boards/constants.js @@ -1,5 +1,5 @@ import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_EPIC, TYPE_ISSUE, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { s__, __ } from '~/locale'; import updateEpicSubscriptionMutation from '~/sidebar/queries/update_epic_subscription.mutation.graphql'; import updateEpicTitleMutation from '~/sidebar/queries/update_epic_title.mutation.graphql'; @@ -12,19 +12,6 @@ import groupBoardQuery from './graphql/group_board.query.graphql'; import projectBoardQuery from './graphql/project_board.query.graphql'; import listIssuesQuery from './graphql/lists_issues.query.graphql'; -/* eslint-disable-next-line @gitlab/require-i18n-strings */ -export const AssigneeIdParamValues = ['Any', 'None']; - -export const issuableTypes = { - issue: 'issue', - epic: 'epic', -}; - -export const BoardType = { - project: 'project', - group: 'group', -}; - export const ListType = { assignee: 'assignee', milestone: 'milestone', @@ -64,10 +51,10 @@ export const INCIDENT = 'INCIDENT'; export const flashAnimationDuration = 2000; export const boardQuery = { - [BoardType.group]: { + [WORKSPACE_GROUP]: { query: groupBoardQuery, }, - [BoardType.project]: { + [WORKSPACE_PROJECT]: { query: projectBoardQuery, }, }; @@ -94,7 +81,7 @@ export const titleQueries = { [TYPE_ISSUE]: { mutation: issueSetTitleMutation, }, - [issuableTypes.epic]: { + [TYPE_EPIC]: { mutation: updateEpicTitleMutation, }, }; @@ -103,7 +90,7 @@ export const subscriptionQueries = { [TYPE_ISSUE]: { mutation: issueSetSubscriptionMutation, }, - [issuableTypes.epic]: { + [TYPE_EPIC]: { mutation: updateEpicSubscriptionMutation, }, }; @@ -143,6 +130,7 @@ export const MilestoneFilterType = { started: 'Started', upcoming: 'Upcoming', }; +/* eslint-enable @gitlab/require-i18n-strings */ export const DraggableItemTypes = { card: 'card', @@ -155,7 +143,6 @@ export const MilestoneIDs = { }; export default { - BoardType, ListType, }; @@ -178,3 +165,5 @@ export const BOARD_CARD_MOVE_TO_POSITIONS_OPTIONS = [ action: () => {}, }, ]; + +export const GroupByParamType = {}; diff --git a/app/assets/javascripts/boards/graphql/group_board_milestones.query.graphql b/app/assets/javascripts/boards/graphql/group_board_milestones.query.graphql index 9e6c26063e9..14811b435e1 100644 --- a/app/assets/javascripts/boards/graphql/group_board_milestones.query.graphql +++ b/app/assets/javascripts/boards/graphql/group_board_milestones.query.graphql @@ -1,5 +1,5 @@ query GroupBoardMilestones($fullPath: ID!, $searchTerm: String, $state: MilestoneStateEnum) { - group(fullPath: $fullPath) { + workspace: group(fullPath: $fullPath) { id milestones( includeAncestors: true diff --git a/app/assets/javascripts/boards/graphql/project_board_milestones.query.graphql b/app/assets/javascripts/boards/graphql/project_board_milestones.query.graphql index 02aa08f90ef..9af92a6ff2d 100644 --- a/app/assets/javascripts/boards/graphql/project_board_milestones.query.graphql +++ b/app/assets/javascripts/boards/graphql/project_board_milestones.query.graphql @@ -1,5 +1,5 @@ query ProjectBoardMilestones($fullPath: ID!, $searchTerm: String, $state: MilestoneStateEnum) { - project(fullPath: $fullPath) { + workspace: project(fullPath: $fullPath) { id milestones( searchTitle: $searchTerm diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 4c6f341828c..67388284d31 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -3,9 +3,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import BoardApp from '~/boards/components/board_app.vue'; import '~/boards/filters/due_date_filters'; -import { BoardType } from '~/boards/constants'; import store from '~/boards/stores'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { NavigationType, isLoggedIn, @@ -68,8 +67,8 @@ function mountBoardApp(el) { initialFilterParams, boardBaseUrl: el.dataset.boardBaseUrl, boardType, - isGroupBoard: boardType === BoardType.group, - isProjectBoard: boardType === BoardType.project, + isGroupBoard: boardType === WORKSPACE_GROUP, + isProjectBoard: boardType === WORKSPACE_PROJECT, currentUserId: gon.current_user_id || null, boardWeight: el.dataset.boardWeight ? parseInt(el.dataset.boardWeight, 10) : null, labelsManagePath: el.dataset.labelsManagePath, diff --git a/app/assets/javascripts/boards/issue_board_filters.js b/app/assets/javascripts/boards/issue_board_filters.js index 7e9b68778d5..27efb3f775c 100644 --- a/app/assets/javascripts/boards/issue_board_filters.js +++ b/app/assets/javascripts/boards/issue_board_filters.js @@ -1,5 +1,7 @@ import groupBoardMembers from '~/boards/graphql/group_board_members.query.graphql'; import projectBoardMembers from '~/boards/graphql/project_board_members.query.graphql'; +import groupBoardMilestonesQuery from './graphql/group_board_milestones.query.graphql'; +import projectBoardMilestonesQuery from './graphql/project_board_milestones.query.graphql'; import boardLabels from './graphql/board_labels.query.graphql'; export default function issueBoardFilters(apollo, fullPath, isGroupBoard) { @@ -37,8 +39,27 @@ export default function issueBoardFilters(apollo, fullPath, isGroupBoard) { .then(transformLabels); }; + const fetchMilestones = (searchTerm) => { + const variables = { + fullPath, + searchTerm, + }; + + const query = isGroupBoard ? groupBoardMilestonesQuery : projectBoardMilestonesQuery; + + return apollo + .query({ + query, + variables, + }) + .then(({ data }) => { + return data.workspace?.milestones.nodes; + }); + }; + return { fetchLabels, fetchUsers, + fetchMilestones, }; } diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index 1b4e6334723..a144054d680 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -1,7 +1,6 @@ import * as Sentry from '@sentry/browser'; import { sortBy } from 'lodash'; import { - BoardType, ListType, inactiveId, flashAnimationDuration, @@ -34,7 +33,7 @@ import totalCountAndWeightQuery from 'ee_else_ce/boards/graphql/board_lists_defe import { fetchPolicies } from '~/lib/graphql'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { defaultClient as gqlClient } from '~/graphql_shared/issuable_client'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { queryToObject } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; @@ -61,7 +60,7 @@ export default { return gqlClient .query({ - query: boardType === BoardType.group ? groupBoardQuery : projectBoardQuery, + query: boardType === WORKSPACE_GROUP ? groupBoardQuery : projectBoardQuery, variables, }) .then(({ data }) => { @@ -139,8 +138,8 @@ export default { boardId: fullBoardId, filters: filterParams, ...(issuableType === TYPE_ISSUE && { - isGroup: boardType === BoardType.group, - isProject: boardType === BoardType.project, + isGroup: boardType === WORKSPACE_GROUP, + isProject: boardType === WORKSPACE_PROJECT, }), }; @@ -234,8 +233,8 @@ export default { const variables = { fullPath, searchTerm, - isGroup: boardType === BoardType.group, - isProject: boardType === BoardType.project, + isGroup: boardType === WORKSPACE_GROUP, + isProject: boardType === WORKSPACE_PROJECT, }; commit(types.RECEIVE_LABELS_REQUEST); @@ -268,10 +267,10 @@ export default { }; let query; - if (boardType === BoardType.project) { + if (boardType === WORKSPACE_PROJECT) { query = projectBoardMilestonesQuery; } - if (boardType === BoardType.group) { + if (boardType === WORKSPACE_GROUP) { query = groupBoardMilestonesQuery; } @@ -286,8 +285,8 @@ export default { variables, }) .then(({ data }) => { - const errors = data[boardType]?.errors; - const milestones = data[boardType]?.milestones.nodes; + const errors = data.workspace?.errors; + const milestones = data.workspace?.milestones.nodes; if (errors?.[0]) { throw new Error(errors[0]); @@ -431,8 +430,8 @@ export default { boardId: fullBoardId, id: listId, filters: filterParams, - isGroup: boardType === BoardType.group, - isProject: boardType === BoardType.project, + isGroup: boardType === WORKSPACE_GROUP, + isProject: boardType === WORKSPACE_PROJECT, first: DEFAULT_BOARD_LIST_ITEMS_SIZE, after: fetchNext ? state.pageInfoByListId[listId].endCursor : undefined, }; @@ -710,7 +709,7 @@ export default { ) => { const input = formatIssueInput(issueInput, boardConfig); - if (boardType === BoardType.project) { + if (boardType === WORKSPACE_PROJECT) { input.projectPath = fullPath; } diff --git a/app/assets/javascripts/boards/stores/mutations.js b/app/assets/javascripts/boards/stores/mutations.js index fef5862f319..505c011b034 100644 --- a/app/assets/javascripts/boards/stores/mutations.js +++ b/app/assets/javascripts/boards/stores/mutations.js @@ -1,18 +1,19 @@ import { cloneDeep, pull, union } from 'lodash'; import Vue from 'vue'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { TYPE_EPIC } from '~/issues/constants'; import { s__, __ } from '~/locale'; import { formatIssue } from '../boards_util'; -import { issuableTypes } from '../constants'; import * as mutationTypes from './mutation_types'; const updateListItemsCount = ({ state, listId, value }) => { const list = state.boardLists[listId]; - if (state.issuableType === issuableTypes.epic) { - Vue.set(state.boardLists, listId, { ...list, epicsCount: list.epicsCount + value }); - } else { - Vue.set(state.boardLists, listId, { ...list }); + if (state.issuableType === TYPE_EPIC) { + const listItem = cloneDeep(state.boardLists[listId]); + listItem.metadataepicsCount += value; + Vue.set(state.boardLists[listId], listId, listItem); } + Vue.set(state.boardLists, listId, { ...list }); }; export const removeItemFromList = ({ state, listId, itemId, reordering = false }) => { diff --git a/app/assets/javascripts/branches/divergence_graph.js b/app/assets/javascripts/branches/divergence_graph.js index d05b53f1a50..54abc9c45a7 100644 --- a/app/assets/javascripts/branches/divergence_graph.js +++ b/app/assets/javascripts/branches/divergence_graph.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import DivergenceGraph from './components/divergence_graph.vue'; diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_settings.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_settings.vue index 3c6114b38ce..257c3309e10 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_settings.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_settings.vue @@ -38,6 +38,10 @@ export default { required: false, default: 0, }, + pageInfo: { + type: Object, + required: true, + }, variables: { type: Array, required: true, @@ -87,8 +91,12 @@ export default { :entity="entity" :is-loading="isLoading" :max-variable-limit="maxVariableLimit" + :page-info="pageInfo" :variables="variables" + @handle-prev-page="$emit('handle-prev-page')" + @handle-next-page="$emit('handle-next-page')" @set-selected-variable="setSelectedVariable" + @sort-changed="(val) => $emit('sort-changed', val)" /> <ci-variable-modal v-if="showModal" diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue index 6e39bda0b07..9db9bea63b2 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_shared.vue @@ -1,10 +1,12 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { mapEnvironmentNames, reportMessageToSentry } from '../utils'; import { ADD_MUTATION_ACTION, DELETE_MUTATION_ACTION, + SORT_DIRECTIONS, UPDATE_MUTATION_ACTION, environmentFetchErrorText, genericMutationErrorText, @@ -16,6 +18,7 @@ export default { components: { CiVariableSettings, }, + mixins: [glFeatureFlagsMixin()], inject: ['endpoint'], props: { areScopedVariablesAvailable: { @@ -97,6 +100,7 @@ export default { loadingCounter: 0, maxVariableLimit: 0, pageInfo: {}, + sortDirection: SORT_DIRECTIONS.ASC, }; }, apollo: { @@ -107,6 +111,8 @@ export default { variables() { return { fullPath: this.fullPath || undefined, + first: this.pageSize, + sort: this.sortDirection, }; }, update(data) { @@ -116,21 +122,23 @@ export default { this.maxVariableLimit = this.queryData.ciVariables.lookup(data)?.limit || 0; this.pageInfo = this.queryData.ciVariables.lookup(data)?.pageInfo || this.pageInfo; - this.hasNextPage = this.pageInfo?.hasNextPage || false; - // Because graphQL has a limit of 100 items, - // we batch load all the variables by making successive queries - // to keep the same UX. As a safeguard, we make sure that we cannot go over - // 20 consecutive API calls, which means 2000 variables loaded maximum. - if (!this.hasNextPage) { - this.isLoadingMoreItems = false; - } else if (this.loadingCounter < 20) { - this.hasNextPage = false; - this.fetchMoreVariables(); - this.loadingCounter += 1; - } else { - createAlert({ message: this.$options.tooManyCallsError }); - reportMessageToSentry(this.componentName, this.$options.tooManyCallsError, {}); + if (!this.glFeatures?.ciVariablesPages) { + this.hasNextPage = this.pageInfo?.hasNextPage || false; + // Because graphQL has a limit of 100 items, + // we batch load all the variables by making successive queries + // to keep the same UX. As a safeguard, we make sure that we cannot go over + // 20 consecutive API calls, which means 2000 variables loaded maximum. + if (!this.hasNextPage) { + this.isLoadingMoreItems = false; + } else if (this.loadingCounter < 20) { + this.hasNextPage = false; + this.fetchMoreVariables(); + this.loadingCounter += 1; + } else { + createAlert({ message: this.$options.tooManyCallsError }); + reportMessageToSentry(this.componentName, this.$options.tooManyCallsError, {}); + } } }, error() { @@ -172,6 +180,9 @@ export default { this.isLoadingMoreItems ); }, + pageSize() { + return this.glFeatures?.ciVariablesPages ? 20 : 100; + }, }, methods: { addVariable(variable) { @@ -189,6 +200,31 @@ export default { }, }); }, + handlePrevPage() { + this.$apollo.queries.ciVariables.fetchMore({ + variables: { + before: this.pageInfo.startCursor, + first: null, + last: this.pageSize, + }, + }); + }, + handleNextPage() { + this.$apollo.queries.ciVariables.fetchMore({ + variables: { + after: this.pageInfo.endCursor, + first: this.pageSize, + last: null, + }, + }); + }, + async handleSortChanged({ sortDesc }) { + this.sortDirection = sortDesc ? SORT_DIRECTIONS.DESC : SORT_DIRECTIONS.ASC; + + // Wait for the new sort direction to be updated and then refetch + await this.$nextTick(); + this.$apollo.queries.ciVariables.refetch(); + }, updateVariable(variable) { this.variableMutation(UPDATE_MUTATION_ACTION, variable); }, @@ -230,13 +266,17 @@ export default { <ci-variable-settings :are-scoped-variables-available="areScopedVariablesAvailable" :entity="entity" + :environments="environments" :hide-environment-scope="hideEnvironmentScope" :is-loading="isLoading" - :variables="ciVariables" :max-variable-limit="maxVariableLimit" - :environments="environments" + :page-info="pageInfo" + :variables="ciVariables" @add-variable="addVariable" @delete-variable="deleteVariable" + @handle-prev-page="handlePrevPage" + @handle-next-page="handleNextPage" + @sort-changed="handleSortChanged" @update-variable="updateVariable" /> </template> diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue index 345a8def49d..5e367ff33b2 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue @@ -4,6 +4,7 @@ import { GlButton, GlLoadingIcon, GlModalDirective, + GlKeysetPagination, GlTable, GlTooltipDirective, } from '@gitlab/ui'; @@ -56,6 +57,7 @@ export default { components: { GlAlert, GlButton, + GlKeysetPagination, GlLoadingIcon, GlTable, }, @@ -78,6 +80,10 @@ export default { type: Number, required: true, }, + pageInfo: { + type: Object, + required: true, + }, variables: { type: Array, required: true, @@ -165,6 +171,28 @@ export default { > {{ exceedsVariableLimitText }} </gl-alert> + <div + v-if="glFeatures.ciVariablesPages" + class="ci-variable-actions gl-display-flex gl-justify-content-end gl-my-3" + > + <gl-button + v-if="!isTableEmpty" + data-qa-selector="reveal_ci_variable_value_button" + @click="toggleHiddenState" + >{{ valuesButtonText }}</gl-button + > + <gl-button + v-gl-modal-directive="$options.modalId" + class="gl-mx-3" + data-qa-selector="add_ci_variable_button" + variant="confirm" + category="primary" + :aria-label="__('Add')" + :disabled="exceedsVariableLimit" + @click="setSelectedVariable()" + >{{ __('Add variable') }}</gl-button + > + </div> <gl-table v-if="!isLoading" :fields="fields" @@ -174,11 +202,13 @@ export default { sort-by="key" sort-direction="asc" stacked="lg" - table-class="text-secondary" + table-class="gl-border-t" fixed show-empty sort-icon-left no-sort-reset + no-local-sorting + @sort-changed="(val) => $emit('sort-changed', val)" > <template #table-colgroup="scope"> <col v-for="field in scope.fields" :key="field.key" :style="field.customStyle" /> @@ -275,7 +305,7 @@ export default { > {{ exceedsVariableLimitText }} </gl-alert> - <div class="ci-variable-actions gl-display-flex gl-mt-5"> + <div v-if="!glFeatures.ciVariablesPages" class="ci-variable-actions gl-display-flex gl-mt-5"> <gl-button v-gl-modal-directive="$options.modalId" class="gl-mr-3" @@ -294,5 +324,14 @@ export default { >{{ valuesButtonText }}</gl-button > </div> + <div v-else class="gl-display-flex gl-justify-content-center gl-mt-6"> + <gl-keyset-pagination + v-bind="pageInfo" + :prev-text="__('Previous')" + :next-text="__('Next')" + @prev="$emit('handle-prev-page')" + @next="$emit('handle-next-page')" + /> + </div> </div> </template> diff --git a/app/assets/javascripts/ci/ci_variable_list/constants.js b/app/assets/javascripts/ci/ci_variable_list/constants.js index 627ace1b28e..c77d8c67bc8 100644 --- a/app/assets/javascripts/ci/ci_variable_list/constants.js +++ b/app/assets/javascripts/ci/ci_variable_list/constants.js @@ -2,6 +2,11 @@ import { __, s__ } from '~/locale'; export const ADD_CI_VARIABLE_MODAL_ID = 'add-ci-variable'; +export const SORT_DIRECTIONS = { + ASC: 'KEY_ASC', + DESC: 'KEY_DESC', +}; + // This const will be deprecated once we remove VueX from the section export const displayText = { variableText: __('Variable'), diff --git a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/group_variables.query.graphql b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/group_variables.query.graphql index 538502fdd3b..4a64a24573e 100644 --- a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/group_variables.query.graphql +++ b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/group_variables.query.graphql @@ -1,10 +1,17 @@ #import "~/ci/ci_variable_list/graphql/fragments/ci_variable.fragment.graphql" #import "~/graphql_shared/fragments/page_info.fragment.graphql" -query getGroupVariables($after: String, $first: Int = 100, $fullPath: ID!) { +query getGroupVariables( + $after: String + $before: String + $first: Int + $fullPath: ID! + $last: Int + $sort: CiVariableSort = KEY_ASC +) { group(fullPath: $fullPath) { id - ciVariables(after: $after, first: $first) { + ciVariables(after: $after, before: $before, first: $first, last: $last, sort: $sort) { limit pageInfo { ...PageInfo diff --git a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/project_variables.query.graphql b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/project_variables.query.graphql index af0cd2d0b2c..03a7142080b 100644 --- a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/project_variables.query.graphql +++ b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/project_variables.query.graphql @@ -1,10 +1,17 @@ #import "~/ci/ci_variable_list/graphql/fragments/ci_variable.fragment.graphql" #import "~/graphql_shared/fragments/page_info.fragment.graphql" -query getProjectVariables($after: String, $first: Int = 100, $fullPath: ID!) { +query getProjectVariables( + $after: String + $before: String + $first: Int + $fullPath: ID! + $last: Int + $sort: CiVariableSort = KEY_ASC +) { project(fullPath: $fullPath) { id - ciVariables(after: $after, first: $first) { + ciVariables(after: $after, before: $before, first: $first, last: $last, sort: $sort) { limit pageInfo { ...PageInfo diff --git a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/variables.query.graphql b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/variables.query.graphql index b8dd6f5f562..adf539a44ae 100644 --- a/app/assets/javascripts/ci/ci_variable_list/graphql/queries/variables.query.graphql +++ b/app/assets/javascripts/ci/ci_variable_list/graphql/queries/variables.query.graphql @@ -1,8 +1,14 @@ #import "~/ci/ci_variable_list/graphql/fragments/ci_variable.fragment.graphql" #import "~/graphql_shared/fragments/page_info.fragment.graphql" -query getVariables($after: String, $first: Int = 100) { - ciVariables(after: $after, first: $first) { +query getVariables( + $after: String + $before: String + $first: Int + $last: Int + $sort: CiVariableSort = KEY_ASC +) { + ciVariables(after: $after, before: $before, first: $first, last: $last, sort: $sort) { pageInfo { ...PageInfo } diff --git a/app/assets/javascripts/ci/ci_variable_list/graphql/settings.js b/app/assets/javascripts/ci/ci_variable_list/graphql/settings.js index cafe3df35d0..7ed0418d5f4 100644 --- a/app/assets/javascripts/ci/ci_variable_list/graphql/settings.js +++ b/app/assets/javascripts/ci/ci_variable_list/graphql/settings.js @@ -205,33 +205,40 @@ export const mergeVariables = (existing, incoming, { args }) => { return result; }; -export const cacheConfig = { - cacheConfig: { - typePolicies: { - Query: { - fields: { - ciVariables: { - keyArgs: false, - merge: mergeVariables, +export const mergeOnlyIncomings = (_, incoming) => { + return incoming; +}; + +export const generateCacheConfig = (isVariablePagesEnabled = false) => { + const merge = isVariablePagesEnabled ? mergeOnlyIncomings : mergeVariables; + return { + cacheConfig: { + typePolicies: { + Query: { + fields: { + ciVariables: { + keyArgs: false, + merge, + }, }, }, - }, - Project: { - fields: { - ciVariables: { - keyArgs: ['fullPath', 'endpoint', 'id'], - merge: mergeVariables, + Project: { + fields: { + ciVariables: { + keyArgs: ['fullPath'], + merge, + }, }, }, - }, - Group: { - fields: { - ciVariables: { - keyArgs: ['fullPath'], - merge: mergeVariables, + Group: { + fields: { + ciVariables: { + keyArgs: ['fullPath'], + merge, + }, }, }, }, }, - }, + }; }; diff --git a/app/assets/javascripts/ci/ci_variable_list/index.js b/app/assets/javascripts/ci/ci_variable_list/index.js index 4270c3c67fc..3ed56201f0d 100644 --- a/app/assets/javascripts/ci/ci_variable_list/index.js +++ b/app/assets/javascripts/ci/ci_variable_list/index.js @@ -5,7 +5,7 @@ import { parseBoolean } from '~/lib/utils/common_utils'; import CiAdminVariables from './components/ci_admin_variables.vue'; import CiGroupVariables from './components/ci_group_variables.vue'; import CiProjectVariables from './components/ci_project_variables.vue'; -import { cacheConfig, resolvers } from './graphql/settings'; +import { generateCacheConfig, resolvers } from './graphql/settings'; const mountCiVariableListApp = (containerEl) => { const { @@ -42,8 +42,13 @@ const mountCiVariableListApp = (containerEl) => { Vue.use(VueApollo); + // If the feature flag `ci_variables_pages` is enabled, + // we are using the default cache config with pages. const apolloProvider = new VueApollo({ - defaultClient: createDefaultClient(resolvers, cacheConfig), + defaultClient: createDefaultClient( + resolvers, + generateCacheConfig(window.gon?.features?.ciVariablesPages), + ), }); return new Vue({ diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue index 891c40482d3..1192f0bf418 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/text_editor.vue @@ -2,6 +2,7 @@ import { EDITOR_READY_EVENT } from '~/editor/constants'; import { CiSchemaExtension } from '~/editor/extensions/source_editor_ci_schema_ext'; import SourceEditor from '~/vue_shared/components/source_editor.vue'; +import eventHub, { SCROLL_EDITOR_TO_BOTTOM } from '~/ci/pipeline_editor/event_hub'; import { SOURCE_EDITOR_DEBOUNCE } from '../../constants'; export default { @@ -16,6 +17,12 @@ export default { }, inject: ['ciConfigPath'], inheritAttrs: false, + created() { + eventHub.$on(SCROLL_EDITOR_TO_BOTTOM, this.scrollEditorToBottom); + }, + beforeDestroy() { + eventHub.$off(SCROLL_EDITOR_TO_BOTTOM, this.scrollEditorToBottom); + }, methods: { onCiConfigUpdate(content) { this.$emit('updateCiConfig', content); @@ -24,6 +31,10 @@ export default { instance.use({ definition: CiSchemaExtension }); instance.registerCiSchema(); }, + scrollEditorToBottom() { + const editor = this.$refs.editor.getEditor(); + editor.setScrollTop(editor.getScrollHeight()); + }, }, readyEvent: EDITOR_READY_EVENT, }; diff --git a/app/assets/javascripts/ci/pipeline_editor/components/header/validation_segment.vue b/app/assets/javascripts/ci/pipeline_editor/components/header/validation_segment.vue index 84c0eef441f..8553256f13a 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/header/validation_segment.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/header/validation_segment.vue @@ -1,8 +1,7 @@ <script> -import { GlIcon, GlLink, GlLoadingIcon } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; +import { GlIcon, GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import { s__, sprintf } from '~/locale'; import getAppStatus from '~/ci/pipeline_editor/graphql/queries/client/app_status.query.graphql'; -import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue'; import { EDITOR_APP_STATUS_EMPTY, EDITOR_APP_STATUS_LINT_UNAVAILABLE, @@ -11,15 +10,20 @@ import { } from '../../constants'; export const i18n = { - empty: __( - "We'll continuously validate your pipeline configuration. The validation results will appear here.", + empty: s__( + "Pipelines|We'll continuously validate your pipeline configuration. The validation results will appear here.", ), - learnMore: __('Learn more'), loading: s__('Pipelines|Validating GitLab CI configuration…'), - invalid: s__('Pipelines|This GitLab CI configuration is invalid.'), - invalidWithReason: s__('Pipelines|This GitLab CI configuration is invalid: %{reason}.'), - unavailableValidation: s__('Pipelines|Configuration validation currently not available.'), - valid: s__('Pipelines|Pipeline syntax is correct.'), + invalid: s__( + 'Pipelines|This GitLab CI configuration is invalid. %{linkStart}Learn more%{linkEnd}', + ), + invalidWithReason: s__( + 'Pipelines|This GitLab CI configuration is invalid: %{reason}. %{linkStart}Learn more%{linkEnd}', + ), + unavailableValidation: s__( + 'Pipelines|Unable to validate CI/CD configuration. See the %{linkStart}GitLab CI/CD troubleshooting guide%{linkEnd} for more details.', + ), + valid: s__('Pipelines|Pipeline syntax is correct. %{linkStart}Learn more%{linkEnd}'), }; export default { @@ -28,10 +32,10 @@ export default { GlIcon, GlLink, GlLoadingIcon, - TooltipOnTruncate, + GlSprintf, }, inject: { - lintUnavailableHelpPagePath: { + ciTroubleshootingPath: { default: '', }, ymlHelpPagePath: { @@ -54,49 +58,48 @@ export default { }, }, computed: { - helpPath() { - return this.isLintUnavailable ? this.lintUnavailableHelpPagePath : this.ymlHelpPagePath; + APP_STATUS_CONFIG() { + return { + [EDITOR_APP_STATUS_EMPTY]: { + icon: 'check', + message: this.$options.i18n.empty, + }, + [EDITOR_APP_STATUS_LINT_UNAVAILABLE]: { + icon: 'time-out', + link: this.ciTroubleshootingPath, + message: this.$options.i18n.unavailableValidation, + }, + [EDITOR_APP_STATUS_VALID]: { + icon: 'check', + message: this.$options.i18n.valid, + }, + }; }, - isEmpty() { - return this.appStatus === EDITOR_APP_STATUS_EMPTY; + currentAppStatusConfig() { + return this.APP_STATUS_CONFIG[this.appStatus] || {}; }, - isLintUnavailable() { - return this.appStatus === EDITOR_APP_STATUS_LINT_UNAVAILABLE; + hasLink() { + return this.appStatus !== EDITOR_APP_STATUS_EMPTY; + }, + helpPath() { + return this.currentAppStatusConfig.link || this.ymlHelpPagePath; }, isLoading() { return this.appStatus === EDITOR_APP_STATUS_LOADING; }, - isValid() { - return this.appStatus === EDITOR_APP_STATUS_VALID; - }, icon() { - switch (this.appStatus) { - case EDITOR_APP_STATUS_EMPTY: - return 'check'; - case EDITOR_APP_STATUS_LINT_UNAVAILABLE: - return 'time-out'; - case EDITOR_APP_STATUS_VALID: - return 'check'; - default: - return 'warning-solid'; - } + return this.currentAppStatusConfig.icon || 'warning-solid'; }, message() { const [reason] = this.ciConfig?.errors || []; - switch (this.appStatus) { - case EDITOR_APP_STATUS_EMPTY: - return this.$options.i18n.empty; - case EDITOR_APP_STATUS_LINT_UNAVAILABLE: - return this.$options.i18n.unavailableValidation; - case EDITOR_APP_STATUS_VALID: - return this.$options.i18n.valid; - default: - // Only display first error as a reason - return this.ciConfig?.errors?.length > 0 - ? sprintf(this.$options.i18n.invalidWithReason, { reason }, false) - : this.$options.i18n.invalid; - } + return ( + this.currentAppStatusConfig.message || + // Only display first error as a reason + (reason + ? sprintf(this.$options.i18n.invalidWithReason, { reason }, false) + : this.$options.i18n.invalid) + ); }, }, }; @@ -108,18 +111,14 @@ export default { <gl-loading-icon size="sm" inline /> {{ $options.i18n.loading }} </template> - - <span v-else class="gl-display-inline-flex gl-white-space-nowrap gl-max-w-full"> - <tooltip-on-truncate :title="message" class="gl-text-truncate"> + <span v-else data-testid="validation-segment"> + <span class="gl-max-w-full" data-qa-selector="validation_message_content"> <gl-icon :name="icon" /> - <span data-qa-selector="validation_message_content" data-testid="validationMsg"> - {{ message }} - </span> - </tooltip-on-truncate> - <span v-if="!isEmpty" class="gl-flex-shrink-0 gl-pl-2"> - <gl-link data-testid="learnMoreLink" :href="helpPath"> - {{ $options.i18n.learnMore }} - </gl-link> + <gl-sprintf :message="message"> + <template v-if="hasLink" #link="{ content }"> + <gl-link :href="helpPath">{{ content }}</gl-link> + </template> + </gl-sprintf> </span> </span> </div> diff --git a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item.vue b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item.vue new file mode 100644 index 00000000000..c2ae7d7be49 --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item.vue @@ -0,0 +1,39 @@ +<script> +import { GlFormGroup, GlAccordionItem, GlFormInput } from '@gitlab/ui'; +import { i18n } from '../constants'; + +export default { + i18n, + components: { + GlAccordionItem, + GlFormInput, + GlFormGroup, + }, + props: { + job: { + type: Object, + required: true, + }, + }, +}; +</script> +<template> + <gl-accordion-item :title="$options.i18n.IMAGE"> + <div class="gl-display-flex"> + <gl-form-group class="gl-flex-grow-1 gl-mr-3" :label="$options.i18n.IMAGE_NAME"> + <gl-form-input + :value="job.image.name" + data-testid="image-name-input" + @input="$emit('update-job', 'image.name', $event)" + /> + </gl-form-group> + <gl-form-group class="gl-flex-grow-1" :label="$options.i18n.IMAGE_ENTRYPOINT"> + <gl-form-input + :value="job.image.entrypoint.join(' ')" + data-testid="image-entrypoint-input" + @input="$emit('update-job', 'image.entrypoint', $event.split(' '))" + /> + </gl-form-group> + </div> + </gl-accordion-item> +</template> diff --git a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/job_setup_item.vue b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/job_setup_item.vue new file mode 100644 index 00000000000..a25b3ca09fd --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/job_setup_item.vue @@ -0,0 +1,89 @@ +<script> +import { + GlAccordionItem, + GlFormGroup, + GlFormInput, + GlFormTextarea, + GlTokenSelector, + GlFormCombobox, +} from '@gitlab/ui'; +import { mapState } from 'vuex'; +import { i18n } from '../constants'; + +export default { + i18n, + components: { + GlAccordionItem, + GlFormGroup, + GlFormInput, + GlFormTextarea, + GlFormCombobox, + GlTokenSelector, + }, + props: { + tagOptions: { + type: Array, + required: true, + }, + job: { + type: Object, + required: true, + }, + isNameValid: { + type: Boolean, + required: true, + }, + isScriptValid: { + type: Boolean, + required: true, + }, + }, + computed: { + ...mapState(['availableStages']), + }, +}; +</script> +<template> + <gl-accordion-item :title="$options.i18n.JOB_SETUP" visible> + <gl-form-group + :invalid-feedback="$options.i18n.THIS_FIELD_IS_REQUIRED" + :state="isNameValid" + :label="$options.i18n.JOB_NAME" + > + <gl-form-input + :value="job.name" + :state="isNameValid" + data-testid="job-name-input" + @input="$emit('update-job', 'name', $event)" + /> + </gl-form-group> + <gl-form-combobox + :value="job.stage" + :token-list="availableStages" + :label-text="$options.i18n.STAGE" + data-testid="job-stage-input" + @input="$emit('update-job', 'stage', $event)" + /> + <gl-form-group + :invalid-feedback="$options.i18n.THIS_FIELD_IS_REQUIRED" + :state="isScriptValid" + :label="$options.i18n.SCRIPT" + > + <gl-form-textarea + :value="job.script" + :state="isScriptValid" + :no-resize="false" + data-testid="job-script-input" + @input="$emit('update-job', 'script', $event)" + /> + </gl-form-group> + <gl-form-group :label="$options.i18n.TAGS"> + <gl-token-selector + :dropdown-items="tagOptions" + :selected-tokens="job.tags" + data-testid="job-tags-input" + @input="$emit('update-job', 'tags', $event)" + /> + </gl-form-group> + </gl-accordion-item> +</template> diff --git a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/constants.js b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/constants.js index 1c122fd5e38..994a6e719fe 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/constants.js +++ b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/constants.js @@ -1,7 +1,41 @@ -import { s__ } from '~/locale'; +import { __, s__ } from '~/locale'; export const DRAWER_CONTAINER_CLASS = '.content-wrapper'; +export const JOB_TEMPLATE = { + name: '', + stage: '', + script: '', + tags: [], + image: { + name: '', + entrypoint: [''], + }, + services: [ + { + name: '', + entrypoint: [''], + }, + ], + artifacts: { + paths: [''], + exclude: [''], + }, + cache: { + paths: [''], + key: '', + }, +}; + export const i18n = { ADD_JOB: s__('JobAssistant|Add job'), + SCRIPT: s__('JobAssistant|Script'), + JOB_NAME: s__('JobAssistant|Job name'), + JOB_SETUP: s__('JobAssistant|Job Setup'), + STAGE: s__('JobAssistant|Stage (optional)'), + TAGS: s__('JobAssistant|Tags (optional)'), + IMAGE: s__('JobAssistant|Image'), + IMAGE_NAME: s__('JobAssistant|Image name (optional)'), + IMAGE_ENTRYPOINT: s__('JobAssistant|Image entrypoint (optional)'), + THIS_FIELD_IS_REQUIRED: __('This field is required'), }; diff --git a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/job_assistant_drawer.vue b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/job_assistant_drawer.vue index 65c87df21cb..9f68b97b329 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/job_assistant_drawer.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/job_assistant_drawer.vue @@ -1,13 +1,25 @@ <script> -import { GlDrawer, GlButton } from '@gitlab/ui'; +import { GlDrawer, GlAccordion, GlButton } from '@gitlab/ui'; +import { stringify } from 'yaml'; +import { mapMutations, mapState } from 'vuex'; +import { set, omit, trim } from 'lodash'; import { getContentWrapperHeight } from '~/lib/utils/dom_utils'; -import { DRAWER_CONTAINER_CLASS, i18n } from './constants'; +import eventHub, { SCROLL_EDITOR_TO_BOTTOM } from '~/ci/pipeline_editor/event_hub'; +import { UPDATE_CI_CONFIG } from '~/ci/pipeline_editor/store/mutation_types'; +import getAllRunners from '~/ci/runner/graphql/list/all_runners.query.graphql'; +import { DRAWER_CONTAINER_CLASS, JOB_TEMPLATE, i18n } from './constants'; +import { removeEmptyObj, trimFields } from './utils'; +import JobSetupItem from './accordion_items/job_setup_item.vue'; +import ImageItem from './accordion_items/image_item.vue'; export default { i18n, components: { GlDrawer, + GlAccordion, GlButton, + JobSetupItem, + ImageItem, }, props: { isVisible: { @@ -21,15 +33,84 @@ export default { default: 200, }, }, + data() { + return { + isNameValid: true, + isScriptValid: true, + job: JSON.parse(JSON.stringify(JOB_TEMPLATE)), + }; + }, + apollo: { + runners: { + query: getAllRunners, + update(data) { + return data?.runners?.nodes || []; + }, + }, + }, computed: { + ...mapState(['currentCiFileContent']), + tagOptions() { + const options = []; + this.runners?.forEach((runner) => options.push(...runner.tagList)); + return [...new Set(options)].map((tag) => { + return { + id: tag, + name: tag, + }; + }); + }, drawerHeightOffset() { return getContentWrapperHeight(DRAWER_CONTAINER_CLASS); }, }, methods: { + ...mapMutations({ + updateCiConfig: UPDATE_CI_CONFIG, + }), closeDrawer() { + this.clearJob(); this.$emit('close-job-assistant-drawer'); }, + addCiConfig() { + this.isNameValid = this.validate(this.job.name); + this.isScriptValid = this.validate(this.job.script); + + if (!this.isNameValid || !this.isScriptValid) { + return; + } + + const newJobString = this.generateYmlString(); + this.updateCiConfig(`${this.currentCiFileContent}\n${newJobString}`); + eventHub.$emit(SCROLL_EDITOR_TO_BOTTOM); + + this.closeDrawer(); + }, + generateYmlString() { + let job = JSON.parse(JSON.stringify(this.job)); + const jobName = job.name; + job = omit(job, ['name']); + job.tags = job.tags.map((tag) => tag.name); // Tag item is originally an option object, we need a string here to match `.gitlab-ci.yml` rules + const cleanedJob = trimFields(removeEmptyObj(job)); + return stringify({ [jobName]: cleanedJob }); + }, + clearJob() { + this.job = JSON.parse(JSON.stringify(JOB_TEMPLATE)); + this.isNameValid = true; + this.isScriptValid = true; + }, + updateJob(key, value) { + set(this.job, key, value); + if (key === 'name') { + this.isNameValid = this.validate(this.job.name); + } + if (key === 'script') { + this.isScriptValid = this.validate(this.job.script); + } + }, + validate(value) { + return trim(value) !== ''; + }, }, }; </script> @@ -44,6 +125,16 @@ export default { <template #title> <h2 class="gl-m-0 gl-font-lg">{{ $options.i18n.ADD_JOB }}</h2> </template> + <gl-accordion :header-level="3"> + <job-setup-item + :tag-options="tagOptions" + :job="job" + :is-name-valid="isNameValid" + :is-script-valid="isScriptValid" + @update-job="updateJob" + /> + <image-item :job="job" @update-job="updateJob" /> + </gl-accordion> <template #footer> <div class="gl-display-flex gl-justify-content-end"> <gl-button @@ -51,11 +142,15 @@ export default { class="gl-mr-3" data-testid="cancel-button" @click="closeDrawer" - >{{ __('Cancel') }}</gl-button - > - <gl-button category="primary" variant="confirm" data-testid="confirm-button">{{ - __('Add') - }}</gl-button> + >{{ __('Cancel') }} + </gl-button> + <gl-button + category="primary" + variant="confirm" + data-testid="confirm-button" + @click="addCiConfig" + >{{ __('Add') }} + </gl-button> </div> </template> </gl-drawer> diff --git a/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/utils.js b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/utils.js new file mode 100644 index 00000000000..83e7574c4de --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/components/job_assistant_drawer/utils.js @@ -0,0 +1,22 @@ +import { isEmpty, isObject, isArray, isString, reject, omitBy, mapValues, map, trim } from 'lodash'; + +const isEmptyValue = (val) => (isObject(val) || isString(val)) && isEmpty(val); +const trimText = (val) => (isString(val) ? trim(val) : val); + +export const removeEmptyObj = (obj) => { + if (isArray(obj)) { + return reject(map(obj, removeEmptyObj), isEmptyValue); + } else if (isObject(obj)) { + return omitBy(mapValues(obj, removeEmptyObj), isEmptyValue); + } + return obj; +}; + +export const trimFields = (data) => { + if (isArray(data)) { + return data.map(trimFields); + } else if (isObject(data)) { + return mapValues(data, trimFields); + } + return trimText(data); +}; diff --git a/app/assets/javascripts/ci/pipeline_editor/event_hub.js b/app/assets/javascripts/ci/pipeline_editor/event_hub.js new file mode 100644 index 00000000000..c64eaf5ef5c --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/event_hub.js @@ -0,0 +1,5 @@ +import createEventHub from '~/helpers/event_hub_factory'; + +export default createEventHub(); + +export const SCROLL_EDITOR_TO_BOTTOM = Symbol('scrollEditorToBottom'); diff --git a/app/assets/javascripts/ci/pipeline_editor/index.js b/app/assets/javascripts/ci/pipeline_editor/index.js index 6d91c339833..d65a7c321ce 100644 --- a/app/assets/javascripts/ci/pipeline_editor/index.js +++ b/app/assets/javascripts/ci/pipeline_editor/index.js @@ -12,6 +12,7 @@ import getPipelineEtag from './graphql/queries/client/pipeline_etag.query.graphq import { resolvers } from './graphql/resolvers'; import typeDefs from './graphql/typedefs.graphql'; import PipelineEditorApp from './pipeline_editor_app.vue'; +import createStore from './store'; export const initPipelineEditor = (selector = '#js-pipeline-editor') => { const el = document.querySelector(selector); @@ -29,12 +30,12 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => { ciExamplesHelpPagePath, ciHelpPagePath, ciLintPath, + ciTroubleshootingPath, defaultBranch, emptyStateIllustrationPath, helpPaths, includesHelpPagePath, lintHelpPagePath, - lintUnavailableHelpPagePath, needsHelpPagePath, newMergeRequestPath, pipelinePagePath, @@ -111,14 +112,18 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => { }, }); + const store = createStore(); + return new Vue({ el, + store, apolloProvider, provide: { ciConfigPath, ciExamplesHelpPagePath, ciHelpPagePath, ciLintPath, + ciTroubleshootingPath, configurationPaths, dataMethod: 'graphql', defaultBranch, @@ -126,7 +131,6 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => { helpPaths, includesHelpPagePath, lintHelpPagePath, - lintUnavailableHelpPagePath, needsHelpPagePath, newMergeRequestPath, pipelinePagePath, diff --git a/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue b/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue index ff848a973e3..7b3c4d6f74f 100644 --- a/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue +++ b/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue @@ -1,10 +1,12 @@ <script> import { GlLoadingIcon, GlModal } from '@gitlab/ui'; +import { mapState, mapMutations } from 'vuex'; +import { parse } from 'yaml'; import { fetchPolicies } from '~/lib/graphql'; import { mergeUrlParams, queryToObject, redirectTo } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; - import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils'; +import { UPDATE_CI_CONFIG, UPDATE_AVAILABLE_STAGES } from './store/mutation_types'; import ConfirmUnsavedChangesDialog from './components/ui/confirm_unsaved_changes_dialog.vue'; import PipelineEditorEmptyState from './components/ui/pipeline_editor_empty_state.vue'; @@ -44,7 +46,6 @@ export default { data() { return { ciConfigData: {}, - currentCiFileContent: '', failureType: null, failureReasons: [], hasBranchLoaded: false, @@ -94,7 +95,7 @@ export default { const fileContent = rawBlob ?? ''; this.lastCommittedContent = fileContent; - this.currentCiFileContent = fileContent; + this.updateCiConfig(fileContent); // If rawBlob is defined and returns a string, it means that there is // a CI config file with empty content. If `rawBlob` is not defined @@ -155,6 +156,10 @@ export default { this.isLintUnavailable = false; } } + + if (data?.ciConfig?.mergedYaml) { + this.updateAvailableStages(parse(data.ciConfig.mergedYaml).stages); + } }, error() { // We are not using `reportFailure` here because we don't @@ -231,6 +236,7 @@ export default { }, }, computed: { + ...mapState(['currentCiFileContent']), hasUnsavedChanges() { return this.lastCommittedContent !== this.currentCiFileContent; }, @@ -294,6 +300,10 @@ export default { this.checkShouldSkipStartScreen(); }, methods: { + ...mapMutations({ + updateCiConfig: UPDATE_CI_CONFIG, + updateAvailableStages: UPDATE_AVAILABLE_STAGES, + }), checkShouldSkipStartScreen() { const params = queryToObject(window.location.search); this.shouldSkipStartScreen = Boolean(params?.add_new_config_file); @@ -344,7 +354,7 @@ export default { }, resetContent() { this.showResetConfirmationModal = false; - this.currentCiFileContent = this.lastCommittedContent; + this.updateCiConfig(this.lastCommittedContent); }, setAppStatus(appStatus) { if (EDITOR_APP_VALID_STATUSES.includes(appStatus)) { @@ -361,9 +371,6 @@ export default { showErrorAlert({ type, reasons = [] }) { this.reportFailure(type, reasons); }, - updateCiConfig(ciFileContent) { - this.currentCiFileContent = ciFileContent; - }, updateCommitSha() { this.isFetchingCommitSha = true; this.$apollo.queries.commitSha.refetch(); diff --git a/app/assets/javascripts/ci/pipeline_editor/store/index.js b/app/assets/javascripts/ci/pipeline_editor/store/index.js new file mode 100644 index 00000000000..d7d5aed79e2 --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/store/index.js @@ -0,0 +1,12 @@ +import Vue from 'vue'; +import Vuex from 'vuex'; +import mutations from './mutations'; +import state from './state'; + +Vue.use(Vuex); + +export default () => + new Vuex.Store({ + mutations, + state: state(), + }); diff --git a/app/assets/javascripts/ci/pipeline_editor/store/mutation_types.js b/app/assets/javascripts/ci/pipeline_editor/store/mutation_types.js new file mode 100644 index 00000000000..035d3c90c14 --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/store/mutation_types.js @@ -0,0 +1,2 @@ +export const UPDATE_CI_CONFIG = 'UPDATE_CI_CONFIG'; +export const UPDATE_AVAILABLE_STAGES = 'UPDATE_AVAILABLE_STAGES'; diff --git a/app/assets/javascripts/ci/pipeline_editor/store/mutations.js b/app/assets/javascripts/ci/pipeline_editor/store/mutations.js new file mode 100644 index 00000000000..552c1df9a2c --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/store/mutations.js @@ -0,0 +1,10 @@ +import * as types from './mutation_types'; + +export default { + [types.UPDATE_CI_CONFIG](state, content) { + state.currentCiFileContent = content; + }, + [types.UPDATE_AVAILABLE_STAGES](state, stages) { + state.availableStages = stages || []; + }, +}; diff --git a/app/assets/javascripts/ci/pipeline_editor/store/state.js b/app/assets/javascripts/ci/pipeline_editor/store/state.js new file mode 100644 index 00000000000..34146cd54c4 --- /dev/null +++ b/app/assets/javascripts/ci/pipeline_editor/store/state.js @@ -0,0 +1,4 @@ +export default () => ({ + currentCiFileContent: '', + availableStages: [], +}); diff --git a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue index 8837b7a1917..5337d0da80c 100644 --- a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue @@ -43,6 +43,7 @@ const i18n = { defaultError: __('Something went wrong on our end. Please try again.'), refsLoadingErrorTitle: s__('Pipeline|Branches or tags could not be loaded.'), submitErrorTitle: s__('Pipeline|Pipeline cannot be run.'), + configButtonTitle: s__('Pipelines|Go to the pipeline editor'), warningTitle: __('The form contains the following warning:'), maxWarningsSummary: __('%{total} warnings found: showing first %{warningsDisplayed}'), removeVariableLabel: s__('CiVariables|Remove variable'), @@ -81,6 +82,14 @@ export default { type: String, required: true, }, + pipelinesEditorPath: { + type: String, + required: true, + }, + canViewPipelineEditor: { + type: Boolean, + required: true, + }, defaultBranch: { type: String, required: true, @@ -373,9 +382,18 @@ export default { :dismissible="false" variant="danger" class="gl-mb-4" - data-testid="run-pipeline-error-alert" > - <span v-safe-html="error"></span> + <span v-safe-html="error" data-testid="run-pipeline-error-alert" class="block"></span> + <gl-button + v-if="canViewPipelineEditor" + class="gl-my-3" + data-testid="ci-cd-pipeline-configuration" + variant="confirm" + :aria-label="$options.i18n.configButtonTitle" + :href="pipelinesEditorPath" + > + {{ $options.i18n.configButtonTitle }} + </gl-button> </gl-alert> <gl-alert v-if="shouldShowWarning" diff --git a/app/assets/javascripts/ci/pipeline_new/index.js b/app/assets/javascripts/ci/pipeline_new/index.js index 71c76aeab36..a466313a6cd 100644 --- a/app/assets/javascripts/ci/pipeline_new/index.js +++ b/app/assets/javascripts/ci/pipeline_new/index.js @@ -14,6 +14,8 @@ const mountPipelineNewForm = (el) => { fileParam, maxWarnings, pipelinesPath, + pipelinesEditorPath, + canViewPipelineEditor, projectId, projectPath, refParam, @@ -43,6 +45,8 @@ const mountPipelineNewForm = (el) => { fileParams, maxWarnings: Number(maxWarnings), pipelinesPath, + pipelinesEditorPath, + canViewPipelineEditor, projectId, projectPath, refParam, diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue b/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue index 16bfc7f3abe..92c824fb5a1 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/delete_pipeline_schedule_modal.vue @@ -10,11 +10,11 @@ export default { ), actionPrimary: { text: s__('PipelineSchedules|Delete pipeline schedule'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, actionCancel: { text: __('Cancel'), - attributes: [], + attributes: {}, }, }, components: { diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue index d03de91ea07..6695c6179cf 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue @@ -70,10 +70,12 @@ export default { }, update(data) { const { pipelineSchedules: { nodes: list = [], count } = {} } = data.project || {}; + const currentUser = data.currentUser || {}; return { list, count, + currentUser, }; }, error() { @@ -279,6 +281,7 @@ export default { <pipeline-schedules-table v-else :schedules="schedules.list" + :current-user="schedules.currentUser" @showTakeOwnershipModal="setTakeOwnershipModal" @showDeleteModal="setDeleteModal" @playPipelineSchedule="playPipelineSchedule" diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue b/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue index 45b4f618e17..5bd58bfd95d 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/table/cells/pipeline_schedule_actions.vue @@ -23,13 +23,20 @@ export default { type: Object, required: true, }, + currentUser: { + type: Object, + required: true, + }, }, computed: { canPlay() { return this.schedule.userPermissions.playPipelineSchedule; }, + isCurrentUserOwner() { + return this.schedule.owner.username === this.currentUser.username; + }, canTakeOwnership() { - return this.schedule.userPermissions.takeOwnershipPipelineSchedule; + return !this.isCurrentUserOwner && this.schedule.userPermissions.adminPipelineSchedule; }, canUpdate() { return this.schedule.userPermissions.updatePipelineSchedule; diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/table/pipeline_schedules_table.vue b/app/assets/javascripts/ci/pipeline_schedules/components/table/pipeline_schedules_table.vue index e8cfc5b29f3..0b95e2037e8 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/table/pipeline_schedules_table.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/table/pipeline_schedules_table.vue @@ -59,6 +59,10 @@ export default { type: Array, required: true, }, + currentUser: { + type: Object, + required: true, + }, }, }; </script> @@ -94,6 +98,7 @@ export default { <template #cell(actions)="{ item }"> <pipeline-schedule-actions :schedule="item" + :current-user="currentUser" @showTakeOwnershipModal="$emit('showTakeOwnershipModal', $event)" @showDeleteModal="$emit('showDeleteModal', $event)" @playPipelineSchedule="$emit('playPipelineSchedule', $event)" diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue index 3ac52d4735d..7863b0e3ef0 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal.vue @@ -27,12 +27,10 @@ export default { actionPrimary() { return { text: this.$options.i18n.takeOwnership, - attributes: [ - { - variant: 'confirm', - category: 'primary', - }, - ], + attributes: { + variant: 'confirm', + category: 'primary', + }, }; }, }, diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue index 7ded3945a32..b4d84309c5f 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue +++ b/app/assets/javascripts/ci/pipeline_schedules/components/take_ownership_modal_legacy.vue @@ -27,14 +27,12 @@ export default { actionPrimary() { return { text: this.$options.i18n.takeOwnership, - attributes: [ - { - variant: 'confirm', - category: 'primary', - href: this.ownershipUrl, - 'data-method': 'post', - }, - ], + attributes: { + variant: 'confirm', + category: 'primary', + href: this.ownershipUrl, + 'data-method': 'post', + }, }; }, }, diff --git a/app/assets/javascripts/ci/pipeline_schedules/graphql/queries/get_pipeline_schedules.query.graphql b/app/assets/javascripts/ci/pipeline_schedules/graphql/queries/get_pipeline_schedules.query.graphql index 9f6cb429cca..6167c7dc577 100644 --- a/app/assets/javascripts/ci/pipeline_schedules/graphql/queries/get_pipeline_schedules.query.graphql +++ b/app/assets/javascripts/ci/pipeline_schedules/graphql/queries/get_pipeline_schedules.query.graphql @@ -1,4 +1,8 @@ query getPipelineSchedulesQuery($projectPath: ID!, $status: PipelineScheduleStatus) { + currentUser { + id + username + } project(fullPath: $projectPath) { id pipelineSchedules(status: $status) { @@ -25,13 +29,13 @@ query getPipelineSchedulesQuery($projectPath: ID!, $status: PipelineScheduleStat realNextRun owner { id + username avatarUrl name webPath } userPermissions { playPipelineSchedule - takeOwnershipPipelineSchedule updatePipelineSchedule adminPipelineSchedule } diff --git a/app/assets/javascripts/ci/reports/constants.js b/app/assets/javascripts/ci/reports/constants.js index bad6fa1e7b9..1137236d355 100644 --- a/app/assets/javascripts/ci/reports/constants.js +++ b/app/assets/javascripts/ci/reports/constants.js @@ -1,10 +1,3 @@ -export const fieldTypes = { - codeBlock: 'codeBlock', - link: 'link', - seconds: 'seconds', - text: 'text', -}; - export const LOADING = 'LOADING'; export const ERROR = 'ERROR'; export const SUCCESS = 'SUCCESS'; @@ -15,10 +8,6 @@ export const STATUS_NEUTRAL = 'neutral'; export const STATUS_NOT_FOUND = 'not_found'; export const ICON_WARNING = 'warning'; -export const ICON_SUCCESS = 'success'; -export const ICON_NOTFOUND = 'notfound'; -export const ICON_PENDING = 'pending'; -export const ICON_FAILED = 'failed'; export const status = { LOADING, @@ -26,9 +15,6 @@ export const status = { SUCCESS, }; -export const ACCESSIBILITY_ISSUE_ERROR = 'error'; -export const ACCESSIBILITY_ISSUE_WARNING = 'warning'; - /** * Slot names for the ReportSection component, corresponding to the success, * loading and error statuses. diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue index 5401c7c1c28..79600012838 100644 --- a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue +++ b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue @@ -1,9 +1,13 @@ <script> import { GlSprintf, GlLink, GlModalDirective } from '@gitlab/ui'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; +import { redirectTo, setUrlParams } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; import RunnerInstructionsModal from '~/vue_shared/components/runner_instructions/runner_instructions_modal.vue'; import RunnerPlatformsRadioGroup from '~/ci/runner/components/runner_platforms_radio_group.vue'; -import RunnerFormFields from '~/ci/runner/components/runner_form_fields.vue'; -import { DEFAULT_PLATFORM, DEFAULT_ACCESS_LEVEL } from '../constants'; +import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue'; +import { DEFAULT_PLATFORM, PARAM_KEY_PLATFORM } from '../constants'; +import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage'; export default { name: 'AdminNewRunnerApp', @@ -12,7 +16,7 @@ export default { GlSprintf, RunnerInstructionsModal, RunnerPlatformsRadioGroup, - RunnerFormFields, + RunnerCreateForm, }, directives: { GlModal: GlModalDirective, @@ -26,17 +30,24 @@ export default { data() { return { platform: DEFAULT_PLATFORM, - runner: { - description: '', - maintenanceNote: '', - paused: false, - accessLevel: DEFAULT_ACCESS_LEVEL, - runUntagged: false, - tagList: '', - maximumTimeout: ' ', - }, }; }, + methods: { + onSaved(runner) { + const registerUrl = setUrlParams( + { [PARAM_KEY_PLATFORM]: this.platform }, + runner.registerAdminUrl, + ); + saveAlertToLocalStorage({ + message: s__('Runners|Runner created.'), + variant: VARIANT_SUCCESS, + }); + redirectTo(registerUrl); + }, + onError(error) { + createAlert({ message: error.message }); + }, + }, modalId: 'runners-legacy-registration-instructions-modal', }; </script> @@ -73,6 +84,6 @@ export default { <hr aria-hidden="true" /> - <runner-form-fields v-model="runner" /> + <runner-create-form @saved="onSaved" @error="onError" /> </div> </template> diff --git a/app/assets/javascripts/ci/runner/admin_register_runner/admin_register_runner_app.vue b/app/assets/javascripts/ci/runner/admin_register_runner/admin_register_runner_app.vue new file mode 100644 index 00000000000..cd38dc07157 --- /dev/null +++ b/app/assets/javascripts/ci/runner/admin_register_runner/admin_register_runner_app.vue @@ -0,0 +1,69 @@ +<script> +import { GlButton } from '@gitlab/ui'; +import { getParameterByName, updateHistory, mergeUrlParams } from '~/lib/utils/url_utility'; +import { PARAM_KEY_PLATFORM, DEFAULT_PLATFORM } from '../constants'; +import RegistrationInstructions from '../components/registration/registration_instructions.vue'; +import PlatformsDrawer from '../components/registration/platforms_drawer.vue'; + +export default { + name: 'AdminRegisterRunnerApp', + components: { + GlButton, + RegistrationInstructions, + PlatformsDrawer, + }, + props: { + runnerId: { + type: String, + required: true, + }, + runnersPath: { + type: String, + required: true, + }, + }, + data() { + return { + platform: getParameterByName(PARAM_KEY_PLATFORM) || DEFAULT_PLATFORM, + isDrawerOpen: false, + }; + }, + watch: { + platform(platform) { + updateHistory({ + url: mergeUrlParams({ [PARAM_KEY_PLATFORM]: platform }, window.location.href), + }); + }, + }, + methods: { + onSelectPlatform(platform) { + this.platform = platform; + }, + onToggleDrawer(val = !this.isDrawerOpen) { + this.isDrawerOpen = val; + }, + }, +}; +</script> +<template> + <div> + <registration-instructions + :runner-id="runnerId" + :platform="platform" + @toggleDrawer="onToggleDrawer" + > + <template #runner-list-name>{{ s__('Runners|Admin area › Runners') }}</template> + </registration-instructions> + + <platforms-drawer + :platform="platform" + :open="isDrawerOpen" + @selectPlatform="onSelectPlatform" + @close="onToggleDrawer(false)" + /> + + <gl-button :href="runnersPath" variant="confirm">{{ + s__('Runners|Go to runners page') + }}</gl-button> + </div> +</template> diff --git a/app/assets/javascripts/ci/runner/admin_register_runner/index.js b/app/assets/javascripts/ci/runner/admin_register_runner/index.js new file mode 100644 index 00000000000..bd43a5e8ce9 --- /dev/null +++ b/app/assets/javascripts/ci/runner/admin_register_runner/index.js @@ -0,0 +1,36 @@ +import Vue from 'vue'; +import VueApollo from 'vue-apollo'; +import createDefaultClient from '~/lib/graphql'; +import { showAlertFromLocalStorage } from '../local_storage_alert/show_alert_from_local_storage'; +import AdminRegisterRunnerApp from './admin_register_runner_app.vue'; + +Vue.use(VueApollo); + +export const initAdminRegisterRunner = (selector = '#js-admin-register-runner') => { + showAlertFromLocalStorage(); + + const el = document.querySelector(selector); + + if (!el) { + return null; + } + + const { runnerId, runnersPath } = el.dataset; + + const apolloProvider = new VueApollo({ + defaultClient: createDefaultClient(), + }); + + return new Vue({ + el, + apolloProvider, + render(h) { + return h(AdminRegisterRunnerApp, { + props: { + runnerId, + runnersPath, + }, + }); + }, + }); +}; diff --git a/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue b/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue index 8d4303778af..36fb1cee525 100644 --- a/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue +++ b/app/assets/javascripts/ci/runner/admin_runner_show/admin_runner_show_app.vue @@ -1,5 +1,5 @@ <script> -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { redirectTo } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue index ce2c511ddd4..d452adb34d9 100644 --- a/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue +++ b/app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlLink } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { updateHistory } from '~/lib/utils/url_utility'; import { fetchPolicies } from '~/lib/graphql'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -128,8 +128,8 @@ export default { return isSearchFiltered(this.search); }, shouldShowCreateRunnerWorkflow() { - // create_runner_workflow feature flag - return this.glFeatures.createRunnerWorkflow; + // create_runner_workflow_for_admin feature flag + return this.glFeatures.createRunnerWorkflowForAdmin; }, }, watch: { diff --git a/app/assets/javascripts/ci/runner/components/registration/cli_command.vue b/app/assets/javascripts/ci/runner/components/registration/cli_command.vue new file mode 100644 index 00000000000..95b135c83a7 --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/cli_command.vue @@ -0,0 +1,42 @@ +<script> +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; + +export default { + components: { + ClipboardButton, + }, + props: { + prompt: { + type: String, + required: false, + default: '', + }, + command: { + type: [Array, String], + required: false, + default: '', + }, + }, + computed: { + lines() { + if (typeof this.command === 'string') { + return [this.command]; + } + return this.command; + }, + clipboard() { + return this.lines.join(''); + }, + }, +}; +</script> +<template> + <div class="gl-display-flex gl-gap-3 gl-align-items-flex-start"> + <!-- eslint-disable vue/require-v-for-key--> + <pre + class="gl-w-full" + ><span v-if="prompt" class="gl-user-select-none">{{ prompt }} </span><template v-for="line in lines">{{ line }}<br class="gl-user-select-none"/></template></pre> + <!-- eslint-enable vue/require-v-for-key--> + <clipboard-button :text="clipboard" :title="__('Copy')" /> + </div> +</template> diff --git a/app/assets/javascripts/ci/runner/components/registration/platforms_drawer.vue b/app/assets/javascripts/ci/runner/components/registration/platforms_drawer.vue new file mode 100644 index 00000000000..ff182c61ccf --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/platforms_drawer.vue @@ -0,0 +1,135 @@ +<script> +import { GlDrawer, GlFormGroup, GlFormSelect, GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; +import { getContentWrapperHeight } from '~/lib/utils/dom_utils'; +import { DRAWER_Z_INDEX } from '~/lib/utils/constants'; + +import { + DEFAULT_PLATFORM, + MACOS_PLATFORM, + LINUX_PLATFORM, + WINDOWS_PLATFORM, + INSTALL_HELP_URL, +} from '../../constants'; +import { installScript, platformArchitectures } from './utils'; + +import CliCommand from './cli_command.vue'; + +export default { + components: { + GlDrawer, + GlFormGroup, + GlFormSelect, + GlIcon, + GlLink, + GlSprintf, + CliCommand, + }, + props: { + open: { + type: Boolean, + required: true, + }, + platform: { + type: String, + required: false, + default: DEFAULT_PLATFORM, + }, + }, + data() { + return { + selectedPlatform: this.platform, + selectedArchitecture: null, + }; + }, + computed: { + drawerHeightOffset() { + return getContentWrapperHeight('.content-wrapper'); + }, + architectureOptions() { + return platformArchitectures({ platform: this.selectedPlatform }); + }, + script() { + return installScript({ + platform: this.selectedPlatform, + architecture: this.selectedArchitecture, + }); + }, + }, + watch: { + selectedPlatform() { + this.selectedArchitecture = + this.architectureOptions.find((value) => value === this.selectedArchitecture) || + this.architectureOptions[0]; + + this.$emit('selectPlatform', this.selectedPlatform); + }, + }, + created() { + [this.selectedArchitecture] = this.architectureOptions; + }, + methods: { + onClose() { + this.$emit('close'); + }, + }, + platformOptions: [ + /* eslint-disable @gitlab/require-i18n-strings */ + { value: LINUX_PLATFORM, text: 'Linux' }, + { value: MACOS_PLATFORM, text: 'macOS' }, + { value: WINDOWS_PLATFORM, text: 'Windows' }, + /* eslint-enable @gitlab/require-i18n-strings */ + ], + INSTALL_HELP_URL, + DRAWER_Z_INDEX, +}; +</script> +<template> + <gl-drawer + :open="open" + :header-height="drawerHeightOffset" + :z-index="$options.DRAWER_Z_INDEX" + data-testid="runner-platforms-drawer" + @close="onClose" + > + <template #title> + <h2 class="gl-my-0 gl-font-size-h2 gl-line-height-24"> + {{ s__('Runners|Install GitLab Runner') }} + </h2> + </template> + <div> + <p>{{ s__('Runners|Select platform specifications to install GitLab Runner.') }}</p> + + <gl-form-group :label="s__('Runners|Environment')" label-for="runner-environment-select"> + <gl-form-select + id="runner-environment-select" + v-model="selectedPlatform" + :options="$options.platformOptions" + /> + </gl-form-group> + + <gl-form-group :label="s__('Runners|Architecture')" label-for="runner-architecture-select"> + <gl-form-select + id="runner-architecture-select" + v-model="selectedArchitecture" + :options="architectureOptions" + /> + </gl-form-group> + + <cli-command :command="script" /> + + <p> + <gl-sprintf + :message=" + s__('Runners|See more %{linkStart}installation methods and architectures%{linkEnd}.') + " + > + <template #link="{ content }"> + <gl-link :href="$options.INSTALL_HELP_URL"> + {{ content }} <gl-icon name="external-link" /> + </gl-link> + </template> + </gl-sprintf> + </p> + </div> + </gl-drawer> +</template> diff --git a/app/assets/javascripts/ci/runner/components/registration/registration_instructions.vue b/app/assets/javascripts/ci/runner/components/registration/registration_instructions.vue new file mode 100644 index 00000000000..2f3c172666d --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/registration_instructions.vue @@ -0,0 +1,241 @@ +<script> +import { GlIcon, GlLink, GlSprintf, GlSkeletonLoader } from '@gitlab/ui'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import { createAlert } from '~/alert'; +import { s__, sprintf } from '~/locale'; +import { convertToGraphQLId } from '~/graphql_shared/utils'; +import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants'; + +import runnerForRegistrationQuery from '../../graphql/register/runner_for_registration.query.graphql'; +import { + STATUS_ONLINE, + EXECUTORS_HELP_URL, + SERVICE_COMMANDS_HELP_URL, + RUNNER_REGISTRATION_POLLING_INTERVAL_MS, + I18N_FETCH_ERROR, + I18N_REGISTRATION_SUCCESS, +} from '../../constants'; +import { captureException } from '../../sentry_utils'; + +import CliCommand from './cli_command.vue'; +import { commandPrompt, registerCommand, runCommand } from './utils'; + +export default { + name: 'RegistrationInstructions', + components: { + GlIcon, + GlLink, + GlSkeletonLoader, + GlSprintf, + ClipboardButton, + CliCommand, + }, + props: { + runnerId: { + type: String, + required: true, + }, + platform: { + type: String, + required: true, + }, + }, + data() { + return { + runner: null, + token: null, + }; + }, + apollo: { + runner: { + query: runnerForRegistrationQuery, + variables() { + return { + id: convertToGraphQLId(TYPENAME_CI_RUNNER, this.runnerId), + }; + }, + manual: true, + result({ data }) { + if (data?.runner) { + const { ephemeralAuthenticationToken, ...runner } = data.runner; + this.runner = runner; + + // The token is available in the API for a limited amount of time + // preserve its original value if it is missing after polling. + this.token = ephemeralAuthenticationToken || this.token; + } + }, + error(error) { + createAlert({ message: I18N_FETCH_ERROR }); + captureException({ error, component: this.$options.name }); + }, + pollInterval() { + if (this.runner?.status === STATUS_ONLINE) { + // stop polling + return 0; + } + return RUNNER_REGISTRATION_POLLING_INTERVAL_MS; + }, + }, + }, + computed: { + loading() { + return this.$apollo.queries.runner.loading; + }, + description() { + return this.runner?.description; + }, + heading() { + if (this.description) { + return sprintf( + s__('Runners|Register "%{runnerDescription}" runner'), + { + runnerDescription: this.description, + }, + false, + ); + } + return s__('Runners|Register runner'); + }, + status() { + return this.runner?.status; + }, + tokenMessage() { + if (this.token) { + return s__( + 'Runners|The %{boldStart}runner token%{boldEnd} %{token} displays %{boldStart}only for a short time%{boldEnd}, and is stored in the %{codeStart}config.toml%{codeEnd} after you register the runner. It will not be visible once the runner is registered.', + ); + } + return s__( + 'Runners|The %{boldStart}runner token%{boldEnd} is no longer visible, it is stored in the %{codeStart}config.toml%{codeEnd} if you have registered the runner.', + ); + }, + commandPrompt() { + return commandPrompt({ platform: this.platform }); + }, + registerCommand() { + return registerCommand({ + platform: this.platform, + registrationToken: this.token, + description: this.description, + }); + }, + runCommand() { + return runCommand({ platform: this.platform }); + }, + }, + methods: { + toggleDrawer() { + this.$emit('toggleDrawer'); + }, + }, + EXECUTORS_HELP_URL, + SERVICE_COMMANDS_HELP_URL, + STATUS_ONLINE, + I18N_REGISTRATION_SUCCESS, +}; +</script> +<template> + <div> + <h1 class="gl-font-size-h1">{{ heading }}</h1> + + <p> + <gl-sprintf + :message=" + s__( + 'Runners|GitLab Runner must be installed before you can register a runner. %{linkStart}How do I install GitLab Runner?%{linkEnd}', + ) + " + > + <template #link="{ content }"> + <gl-link data-testid="runner-install-link" @click="toggleDrawer">{{ content }}</gl-link> + </template> + </gl-sprintf> + </p> + + <section> + <h2 class="gl-font-size-h2">{{ s__('Runners|Step 1') }}</h2> + <p> + {{ + s__( + 'Runners|Copy and paste the following command into your command line to register the runner.', + ) + }} + </p> + <gl-skeleton-loader v-if="loading" /> + <template v-else> + <cli-command :prompt="commandPrompt" :command="registerCommand" /> + <p> + <gl-icon name="information-o" class="gl-text-blue-600!" /> + <gl-sprintf :message="tokenMessage"> + <template #token> + <code data-testid="runner-token">{{ token }}</code> + <clipboard-button + :text="token" + :title="__('Copy')" + size="small" + category="tertiary" + class="gl-border-none!" + /> + </template> + <template #bold="{ content }" + ><span class="gl-font-weight-bold">{{ content }}</span></template + > + <template #code="{ content }" + ><code>{{ content }}</code></template + > + </gl-sprintf> + </p> + </template> + </section> + <section> + <h2 class="gl-font-size-h2">{{ s__('Runners|Step 2') }}</h2> + <p> + <gl-sprintf + :message=" + s__( + 'Runners|Choose an executor when prompted by the command line. Executors run builds in different environments. %{linkStart}Not sure which one to select?%{linkEnd}', + ) + " + > + <template #link="{ content }"> + <gl-link :href="$options.EXECUTORS_HELP_URL" target="_blank"> + {{ content }} <gl-icon name="external-link" /> + </gl-link> + </template> + </gl-sprintf> + </p> + </section> + <section> + <h2 class="gl-font-size-h2">{{ s__('Runners|Step 3 (optional)') }}</h2> + <p>{{ s__('Runners|Manually verify that the runner is available to pick up jobs.') }}</p> + <cli-command :prompt="commandPrompt" :command="runCommand" /> + <p> + <gl-sprintf + :message=" + s__( + 'Runners|This may not be needed if you manage your runner as a %{linkStart}system or user service%{linkEnd}.', + ) + " + > + <template #link="{ content }"> + <gl-link :href="$options.SERVICE_COMMANDS_HELP_URL" target="_blank"> + {{ content }} <gl-icon name="external-link" /> + </gl-link> + </template> + </gl-sprintf> + </p> + </section> + <section v-if="status == $options.STATUS_ONLINE"> + <h2 class="gl-font-size-h2">🎉 {{ $options.I18N_REGISTRATION_SUCCESS }}</h2> + + <p class="gl-pl-6"> + <gl-sprintf :message="s__('Runners|To view the runner, go to %{runnerListName}.')"> + <template #runnerListName> + <span class="gl-font-weight-bold"><slot name="runner-list-name"></slot></span> + </template> + </gl-sprintf> + </p> + </section> + </div> +</template> diff --git a/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue b/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue index ac2793654c8..6ce88fc54de 100644 --- a/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue +++ b/app/assets/javascripts/ci/runner/components/registration/registration_token_reset_dropdown_item.vue @@ -1,6 +1,6 @@ <script> import { GlDropdownItem, GlLoadingIcon, GlModal, GlModalDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_GROUP, TYPENAME_PROJECT } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { __, s__ } from '~/locale'; @@ -73,13 +73,13 @@ export default { actionPrimary() { return { text: i18n.modalAction, - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }; }, actionSecondary() { return { text: i18n.modalCancel, - attributes: [{ variant: 'default' }], + attributes: { variant: 'default' }, }; }, }, diff --git a/app/assets/javascripts/ci/runner/components/registration/scripts/linux/install.sh b/app/assets/javascripts/ci/runner/components/registration/scripts/linux/install.sh new file mode 100644 index 00000000000..a8ba2592128 --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/scripts/linux/install.sh @@ -0,0 +1,12 @@ +# Download the binary for your system +sudo curl -L --output /usr/local/bin/gitlab-runner ${GITLAB_CI_RUNNER_DOWNLOAD_LOCATION} + +# Give it permission to execute +sudo chmod +x /usr/local/bin/gitlab-runner + +# Create a GitLab Runner user +sudo useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash + +# Install and run as a service +sudo gitlab-runner install --user=gitlab-runner --working-directory=/home/gitlab-runner +sudo gitlab-runner start diff --git a/app/assets/javascripts/ci/runner/components/registration/scripts/osx/install.sh b/app/assets/javascripts/ci/runner/components/registration/scripts/osx/install.sh new file mode 100644 index 00000000000..76c893bacfc --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/scripts/osx/install.sh @@ -0,0 +1,11 @@ +# Download the binary for your system +sudo curl --output /usr/local/bin/gitlab-runner ${GITLAB_CI_RUNNER_DOWNLOAD_LOCATION} + +# Give it permission to execute +sudo chmod +x /usr/local/bin/gitlab-runner + +# The rest of the commands execute as the user who will run the runner +# Register the runner (steps below), then run +cd ~ +gitlab-runner install +gitlab-runner start diff --git a/app/assets/javascripts/ci/runner/components/registration/scripts/windows/install.ps1 b/app/assets/javascripts/ci/runner/components/registration/scripts/windows/install.ps1 new file mode 100644 index 00000000000..019363fc3f7 --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/scripts/windows/install.ps1 @@ -0,0 +1,13 @@ +# Run PowerShell: https://docs.microsoft.com/en-us/powershell/scripting/windows-powershell/starting-windows-powershell?view=powershell-7#with-administrative-privileges-run-as-administrator +# Create a folder somewhere on your system, for example: C:\GitLab-Runner +New-Item -Path 'C:\GitLab-Runner' -ItemType Directory + +# Change to the folder +cd 'C:\GitLab-Runner' + +# Download binary +Invoke-WebRequest -Uri "${GITLAB_CI_RUNNER_DOWNLOAD_LOCATION}" -OutFile "gitlab-runner.exe" + +# Register the runner (steps below), then run +.\gitlab-runner.exe install +.\gitlab-runner.exe start diff --git a/app/assets/javascripts/ci/runner/components/registration/utils.js b/app/assets/javascripts/ci/runner/components/registration/utils.js new file mode 100644 index 00000000000..94d75bc4562 --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/registration/utils.js @@ -0,0 +1,109 @@ +/* eslint-disable @gitlab/require-i18n-strings */ +import { + DEFAULT_PLATFORM, + LINUX_PLATFORM, + MACOS_PLATFORM, + WINDOWS_PLATFORM, + DOWNLOAD_LOCATIONS, +} from '../../constants'; +import linuxInstall from './scripts/linux/install.sh?raw'; +import osxInstall from './scripts/osx/install.sh?raw'; +import windowsInstall from './scripts/windows/install.ps1?raw'; + +const OS = { + [LINUX_PLATFORM]: { + shell: 'bash', + commandPrompt: '$', + executable: 'gitlab-runner', + }, + [MACOS_PLATFORM]: { + shell: 'bash', + commandPrompt: '$', + executable: 'gitlab-runner', + }, + [WINDOWS_PLATFORM]: { + shell: 'powershell', + commandPrompt: '>', + executable: '.\\gitlab-runner.exe', + }, +}; + +const escapedParam = (param, shell = 'bash') => { + let escaped; + if (shell === 'bash') { + // replace single-quotes by the sequence '\'' + escaped = param.replaceAll("'", "'\\''"); + } else if (shell === 'powershell') { + // replace single-quotes by the sequence '' + // https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7.3 + escaped = param.replaceAll("'", "''"); + } + // surround with single quotes. + return `'${escaped}'`; +}; + +export const commandPrompt = ({ platform }) => { + return (OS[platform] || OS[DEFAULT_PLATFORM]).commandPrompt; +}; + +export const executable = ({ platform }) => { + return (OS[platform] || OS[DEFAULT_PLATFORM]).executable; +}; + +const shell = ({ platform }) => { + return (OS[platform] || OS[DEFAULT_PLATFORM]).shell; +}; + +export const registerCommand = ({ + platform, + url = gon.gitlab_url, + registrationToken, + description, +}) => { + const lines = [`${executable({ platform })} register`]; + if (url) { + lines.push(` --url ${url}`); + } + if (registrationToken) { + lines.push(` --registration-token ${registrationToken}`); + } + if (description) { + const escapedDescription = escapedParam(description, shell({ platform })); + lines.push(` --description ${escapedDescription}`); + } + return lines; +}; + +export const runCommand = ({ platform }) => { + return `${executable({ platform })} run`; +}; + +const importInstallScript = ({ platform = DEFAULT_PLATFORM }) => { + switch (platform) { + case LINUX_PLATFORM: + return linuxInstall; + case MACOS_PLATFORM: + return osxInstall; + case WINDOWS_PLATFORM: + return windowsInstall; + default: + return ''; + } +}; + +export const platformArchitectures = ({ platform }) => { + return DOWNLOAD_LOCATIONS[platform].map(({ arch }) => arch); +}; + +export const installScript = ({ platform, architecture }) => { + const downloadLocation = DOWNLOAD_LOCATIONS[platform].find(({ arch }) => arch === architecture) + .url; + + return importInstallScript({ platform }) + .replace( + // eslint-disable-next-line no-template-curly-in-string + '${GITLAB_CI_RUNNER_DOWNLOAD_LOCATION}', + downloadLocation, + ) + .trim(); +}; diff --git a/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue b/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue index 8dde3ac4e19..e7b26ec6d4e 100644 --- a/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue +++ b/app/assets/javascripts/ci/runner/components/runner_bulk_delete.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlModalDirective, GlModal, GlSprintf } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__, n__, sprintf } from '~/locale'; import checkedRunnerIdsQuery from '../graphql/list/checked_runner_ids.query.graphql'; import BulkRunnerDelete from '../graphql/list/bulk_runner_delete.mutation.graphql'; diff --git a/app/assets/javascripts/ci/runner/components/runner_create_form.vue b/app/assets/javascripts/ci/runner/components/runner_create_form.vue new file mode 100644 index 00000000000..5d2a3c53842 --- /dev/null +++ b/app/assets/javascripts/ci/runner/components/runner_create_form.vue @@ -0,0 +1,71 @@ +<script> +import { GlForm, GlButton } from '@gitlab/ui'; +import RunnerFormFields from '~/ci/runner/components/runner_form_fields.vue'; +import runnerCreateMutation from '~/ci/runner/graphql/new/runner_create.mutation.graphql'; +import { modelToUpdateMutationVariables } from 'ee_else_ce/ci/runner/runner_update_form_utils'; +import { captureException } from '../sentry_utils'; +import { DEFAULT_ACCESS_LEVEL } from '../constants'; + +export default { + name: 'RunnerCreateForm', + components: { + GlForm, + GlButton, + RunnerFormFields, + }, + data() { + return { + saving: false, + runner: { + description: '', + maintenanceNote: '', + paused: false, + accessLevel: DEFAULT_ACCESS_LEVEL, + runUntagged: false, + tagList: '', + maximumTimeout: '', + }, + }; + }, + methods: { + async onSubmit() { + this.saving = true; + try { + const { + data: { + runnerCreate: { errors, runner }, + }, + } = await this.$apollo.mutate({ + mutation: runnerCreateMutation, + variables: modelToUpdateMutationVariables(this.runner), + }); + + if (errors?.length) { + this.$emit('error', new Error(errors.join(' '))); + } else { + this.onSuccess(runner); + } + } catch (error) { + captureException({ error, component: this.$options.name }); + this.$emit('error', error); + } finally { + this.saving = false; + } + }, + onSuccess(runner) { + this.$emit('saved', runner); + }, + }, +}; +</script> +<template> + <gl-form @submit.prevent="onSubmit"> + <runner-form-fields v-model="runner" /> + + <div class="gl-display-flex"> + <gl-button type="submit" variant="confirm" class="js-no-auto-disable" :loading="saving"> + {{ __('Submit') }} + </gl-button> + </div> + </gl-form> +</template> diff --git a/app/assets/javascripts/ci/runner/components/runner_delete_button.vue b/app/assets/javascripts/ci/runner/components/runner_delete_button.vue index f02e6bce5c3..020487fc727 100644 --- a/app/assets/javascripts/ci/runner/components/runner_delete_button.vue +++ b/app/assets/javascripts/ci/runner/components/runner_delete_button.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlModalDirective, GlTooltipDirective } from '@gitlab/ui'; import runnerDeleteMutation from '~/ci/runner/graphql/shared/runner_delete.mutation.graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sprintf, s__ } from '~/locale'; import { captureException } from '~/ci/runner/sentry_utils'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; diff --git a/app/assets/javascripts/ci/runner/components/runner_jobs.vue b/app/assets/javascripts/ci/runner/components/runner_jobs.vue index 9003eba3636..f5287f597ab 100644 --- a/app/assets/javascripts/ci/runner/components/runner_jobs.vue +++ b/app/assets/javascripts/ci/runner/components/runner_jobs.vue @@ -1,6 +1,6 @@ <script> import { GlSkeletonLoader } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import runnerJobsQuery from '../graphql/show/runner_jobs.query.graphql'; import { I18N_FETCH_ERROR, I18N_NO_JOBS_FOUND, RUNNER_DETAILS_JOBS_PAGE_SIZE } from '../constants'; import { captureException } from '../sentry_utils'; diff --git a/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue b/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue index d2f7912fabb..2cff11c1aa1 100644 --- a/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue +++ b/app/assets/javascripts/ci/runner/components/runner_list_empty_state.vue @@ -43,8 +43,8 @@ export default { }, computed: { shouldShowCreateRunnerWorkflow() { - // create_runner_workflow feature flag - return this.newRunnerPath && this.glFeatures?.createRunnerWorkflow; + // create_runner_workflow_for_admin feature flag + return this.newRunnerPath && this.glFeatures?.createRunnerWorkflowForAdmin; }, }, modalId: 'runners-empty-state-instructions-modal', diff --git a/app/assets/javascripts/ci/runner/components/runner_pause_button.vue b/app/assets/javascripts/ci/runner/components/runner_pause_button.vue index 2c80518e772..a27af232e97 100644 --- a/app/assets/javascripts/ci/runner/components/runner_pause_button.vue +++ b/app/assets/javascripts/ci/runner/components/runner_pause_button.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlTooltipDirective } from '@gitlab/ui'; import runnerToggleActiveMutation from '~/ci/runner/graphql/shared/runner_toggle_active.mutation.graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { captureException } from '~/ci/runner/sentry_utils'; import { I18N_PAUSE, I18N_PAUSE_TOOLTIP, I18N_RESUME, I18N_RESUME_TOOLTIP } from '../constants'; diff --git a/app/assets/javascripts/ci/runner/components/runner_projects.vue b/app/assets/javascripts/ci/runner/components/runner_projects.vue index 4a6e90b44a9..4cfc57340f5 100644 --- a/app/assets/javascripts/ci/runner/components/runner_projects.vue +++ b/app/assets/javascripts/ci/runner/components/runner_projects.vue @@ -1,7 +1,7 @@ <script> import { GlSearchBoxByType, GlSkeletonLoader } from '@gitlab/ui'; import { sprintf, formatNumber } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import runnerProjectsQuery from '../graphql/show/runner_projects.query.graphql'; import { I18N_ASSIGNED_PROJECTS, diff --git a/app/assets/javascripts/ci/runner/components/runner_update_form.vue b/app/assets/javascripts/ci/runner/components/runner_update_form.vue index a9790d06ca7..dd8e965cecd 100644 --- a/app/assets/javascripts/ci/runner/components/runner_update_form.vue +++ b/app/assets/javascripts/ci/runner/components/runner_update_form.vue @@ -13,7 +13,7 @@ import { modelToUpdateMutationVariables, runnerToModel, } from 'ee_else_ce/ci/runner/runner_update_form_utils'; -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { redirectTo } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import { captureException } from '~/ci/runner/sentry_utils'; diff --git a/app/assets/javascripts/ci/runner/components/search_tokens/tag_token.vue b/app/assets/javascripts/ci/runner/components/search_tokens/tag_token.vue index 6e7c41885f8..1de7775090a 100644 --- a/app/assets/javascripts/ci/runner/components/search_tokens/tag_token.vue +++ b/app/assets/javascripts/ci/runner/components/search_tokens/tag_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchSuggestion, GlToken } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; diff --git a/app/assets/javascripts/ci/runner/constants.js b/app/assets/javascripts/ci/runner/constants.js index 318eb7e74bd..6237dcd0c03 100644 --- a/app/assets/javascripts/ci/runner/constants.js +++ b/app/assets/javascripts/ci/runner/constants.js @@ -105,10 +105,15 @@ export const I18N_JOBS = s__('Runners|Jobs'); export const I18N_ASSIGNED_PROJECTS = s__('Runners|Assigned Projects (%{projectCount})'); export const I18N_FILTER_PROJECTS = s__('Runners|Filter projects'); export const I18N_CLEAR_FILTER_PROJECTS = __('Clear'); -export const I18N_NONE = __('None'); export const I18N_NO_JOBS_FOUND = s__('Runners|This runner has not run any jobs.'); export const I18N_NO_PROJECTS_FOUND = __('No projects found'); +// Runner registration + +export const I18N_REGISTRATION_SUCCESS = s__("Runners|You've created a new runner!"); + +export const RUNNER_REGISTRATION_POLLING_INTERVAL_MS = 2000; + // Styles export const RUNNER_TAG_BADGE_VARIANT = 'info'; @@ -129,6 +134,8 @@ export const PARAM_KEY_SORT = 'sort'; export const PARAM_KEY_AFTER = 'after'; export const PARAM_KEY_BEFORE = 'before'; +export const PARAM_KEY_PLATFORM = 'platform'; + // CiRunnerType export const INSTANCE_TYPE = 'INSTANCE_TYPE'; @@ -182,9 +189,62 @@ export const MACOS_PLATFORM = 'osx'; export const WINDOWS_PLATFORM = 'windows'; export const AWS_PLATFORM = 'aws'; +export const DOWNLOAD_LOCATIONS = { + [LINUX_PLATFORM]: [ + { + arch: 'amd64', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-amd64', + }, + { + arch: '386', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-386', + }, + { + arch: 'arm', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-arm', + }, + { + arch: 'arm64', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-arm64', + }, + ], + [MACOS_PLATFORM]: [ + { + arch: 'amd64', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-darwin-amd64', + }, + { + arch: 'arm64', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-darwin-arm64', + }, + ], + [WINDOWS_PLATFORM]: [ + { + arch: 'amd64', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-windows-amd64.exe', + }, + { + arch: '386', + url: + 'https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-windows-386.exe', + }, + ], +}; + export const DEFAULT_PLATFORM = LINUX_PLATFORM; // Runner docs are in a separate repository and are not shipped with GitLab // they are rendered as external URLs. +export const INSTALL_HELP_URL = 'https://docs.gitlab.com/runner/install'; +export const EXECUTORS_HELP_URL = 'https://docs.gitlab.com/runner/executors/'; +export const SERVICE_COMMANDS_HELP_URL = + 'https://docs.gitlab.com/runner/commands/#service-related-commands'; export const DOCKER_HELP_URL = 'https://docs.gitlab.com/runner/install/docker.html'; export const KUBERNETES_HELP_URL = 'https://docs.gitlab.com/runner/install/kubernetes.html'; diff --git a/app/assets/javascripts/ci/runner/graphql/new/runner_create.mutation.graphql b/app/assets/javascripts/ci/runner/graphql/new/runner_create.mutation.graphql new file mode 100644 index 00000000000..d14a594e378 --- /dev/null +++ b/app/assets/javascripts/ci/runner/graphql/new/runner_create.mutation.graphql @@ -0,0 +1,9 @@ +mutation runnerCreate($input: RunnerCreateInput!) { + runnerCreate(input: $input) { + runner { + id + registerAdminUrl + } + errors + } +} diff --git a/app/assets/javascripts/ci/runner/graphql/register/runner_for_registration.query.graphql b/app/assets/javascripts/ci/runner/graphql/register/runner_for_registration.query.graphql new file mode 100644 index 00000000000..f6cee807620 --- /dev/null +++ b/app/assets/javascripts/ci/runner/graphql/register/runner_for_registration.query.graphql @@ -0,0 +1,8 @@ +query getRunnerForRegistration($id: CiRunnerID!) { + runner(id: $id) { + id + description + ephemeralAuthenticationToken + status + } +} diff --git a/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue b/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue index 273a9aa823c..2db3a2f42a7 100644 --- a/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue +++ b/app/assets/javascripts/ci/runner/group_runner_show/group_runner_show_app.vue @@ -1,5 +1,5 @@ <script> -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { redirectTo } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue b/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue index e66a1c7b1aa..294d06a66e7 100644 --- a/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue +++ b/app/assets/javascripts/ci/runner/group_runners/group_runners_app.vue @@ -1,6 +1,6 @@ <script> import { GlLink } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { updateHistory } from '~/lib/utils/url_utility'; import { fetchPolicies } from '~/lib/graphql'; import { upgradeStatusTokenConfig } from 'ee_else_ce/ci/runner/components/search_tokens/upgrade_status_token_config'; diff --git a/app/assets/javascripts/ci/runner/local_storage_alert/show_alert_from_local_storage.js b/app/assets/javascripts/ci/runner/local_storage_alert/show_alert_from_local_storage.js index d768a06494a..bad3ca6024e 100644 --- a/app/assets/javascripts/ci/runner/local_storage_alert/show_alert_from_local_storage.js +++ b/app/assets/javascripts/ci/runner/local_storage_alert/show_alert_from_local_storage.js @@ -7,7 +7,7 @@ export const showAlertFromLocalStorage = async () => { if (alertOptions) { try { - const { createAlert } = await import('~/flash'); + const { createAlert } = await import('~/alert'); createAlert(JSON.parse(alertOptions)); } catch { // ignore when the alert data cannot be parsed diff --git a/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue b/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue index 4593c9ae52b..843342b20df 100644 --- a/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue +++ b/app/assets/javascripts/ci/runner/runner_edit/runner_edit_app.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_CI_RUNNER } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import RunnerHeader from '../components/runner_header.vue'; diff --git a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue index f0af0da4bb4..697162b50ae 100644 --- a/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue +++ b/app/assets/javascripts/clusters/agents/components/revoke_token_button.vue @@ -78,16 +78,17 @@ export default { primaryModalProps() { return { text: this.$options.i18n.revokeButton, - attributes: [ - { disabled: this.loading || this.disableModalSubmit, loading: this.loading }, - { variant: 'danger' }, - ], + attributes: { + disabled: this.loading || this.disableModalSubmit, + loading: this.loading, + variant: 'danger', + }, }; }, cancelModalProps() { return { text: this.$options.i18n.modalCancel, - attributes: [], + attributes: {}, }; }, disableModalSubmit() { diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index a788703fd08..c94c91654fc 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -1,7 +1,7 @@ import { GlToast } from '@gitlab/ui'; import Visibility from 'visibilityjs'; import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import AccessorUtilities from '~/lib/utils/accessor'; import Poll from '~/lib/utils/poll'; import { s__ } from '~/locale'; diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js deleted file mode 100644 index c6ca895778d..00000000000 --- a/app/assets/javascripts/clusters/constants.js +++ /dev/null @@ -1,16 +0,0 @@ -// These need to match the enum found in app/models/clusters/cluster.rb -export const CLUSTER_TYPE = { - INSTANCE: 'instance_type', - GROUP: 'group_type', - PROJECT: 'project_type', -}; - -// These need to match the available providers in app/models/clusters/providers/ -export const PROVIDER_TYPE = { - GCP: 'gcp', -}; - -// These are only used client-side - -export const LOGGING_MODE = 'logging'; -export const BLOCKING_MODE = 'blocking'; diff --git a/app/assets/javascripts/clusters_list/components/delete_agent_button.vue b/app/assets/javascripts/clusters_list/components/delete_agent_button.vue index 7a028858d10..913db87f019 100644 --- a/app/assets/javascripts/clusters_list/components/delete_agent_button.vue +++ b/app/assets/javascripts/clusters_list/components/delete_agent_button.vue @@ -77,16 +77,17 @@ export default { primaryModalProps() { return { text: this.$options.i18n.modalAction, - attributes: [ - { disabled: this.loading || this.disableModalSubmit, loading: this.loading }, - { variant: 'danger' }, - ], + attributes: { + disabled: this.loading || this.disableModalSubmit, + loading: this.loading, + variant: 'danger', + }, }; }, cancelModalProps() { return { text: this.$options.i18n.modalCancel, - attributes: [], + attributes: {}, }; }, disableModalSubmit() { diff --git a/app/assets/javascripts/clusters_list/store/actions.js b/app/assets/javascripts/clusters_list/store/actions.js index 77d6d5eb009..1ea18dcc97d 100644 --- a/app/assets/javascripts/clusters_list/store/actions.js +++ b/app/assets/javascripts/clusters_list/store/actions.js @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/browser'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import Poll from '~/lib/utils/poll'; diff --git a/app/assets/javascripts/commit/components/signature_badge.vue b/app/assets/javascripts/commit/components/signature_badge.vue new file mode 100644 index 00000000000..344536df093 --- /dev/null +++ b/app/assets/javascripts/commit/components/signature_badge.vue @@ -0,0 +1,94 @@ +<script> +import { GlBadge, GlLink, GlPopover } from '@gitlab/ui'; +import { helpPagePath } from '~/helpers/help_page_helper'; +import { typeConfig, statusConfig } from '../constants'; +import X509CertificateDetails from './x509_certificate_details.vue'; + +export default { + components: { + GlBadge, + GlPopover, + GlLink, + X509CertificateDetails, + }, + props: { + signature: { + type: Object, + required: true, + }, + }, + computed: { + statusConfig() { + return this.$options.statusConfig?.[this.signature?.verificationStatus]; + }, + typeConfig() { + // eslint-disable-next-line no-underscore-dangle + return this.$options.typeConfig?.[this.signature?.__typename]; + }, + }, + methods: { + helpPagePath, + getSubjectKeyIdentifierToDisplay(subjectKeyIdentifier) { + // we need to remove : to not trigger secret detection scan + return subjectKeyIdentifier.replaceAll(':', ' '); + }, + }, + typeConfig, + statusConfig, +}; +</script> +<template> + <span + v-if="statusConfig && typeConfig" + class="gl-display-flex gl-align-items-center gl-hover-cursor-pointer gl-ml-2" + > + <button + id="signature" + tabindex="0" + data-testid="signature-badge" + role="button" + variant="link" + class="gl-border-0 gl-outline-0! gl-p-0 gl-bg-transparent" + :aria-label="statusConfig.label" + > + <gl-badge :variant="statusConfig.variant" size="md" data-testid="signature-status"> + {{ statusConfig.label }} + </gl-badge> + </button> + <gl-popover target="signature" triggers="focus" data-testid="signature-info"> + <template #title> + {{ statusConfig.title }} + </template> + <p data-testid="signature-description"> + {{ statusConfig.description }} + </p> + <p v-if="typeConfig.keyLabel" data-testid="signature-key-label"> + {{ typeConfig.keyLabel }} + <span class="gl-font-monospace" data-testid="signature-key"> + {{ signature[typeConfig.keyNamespace] || __('Unknown') }} + </span> + </p> + <x509-certificate-details + v-if="signature.x509Certificate" + :title="typeConfig.subjectTitle" + :subject="signature.x509Certificate.subject" + :subject-key-identifier=" + getSubjectKeyIdentifierToDisplay(signature.x509Certificate.subjectKeyIdentifier) + " + /> + <x509-certificate-details + v-if="signature.x509Certificate && signature.x509Certificate.x509Issuer" + :title="typeConfig.issuerTitle" + :subject="signature.x509Certificate.x509Issuer.subject" + :subject-key-identifier=" + getSubjectKeyIdentifierToDisplay( + signature.x509Certificate.x509Issuer.subjectKeyIdentifier, + ) + " + /> + <gl-link :href="helpPagePath(typeConfig.helpLink.path)"> + {{ typeConfig.helpLink.label }} + </gl-link> + </gl-popover> + </span> +</template> diff --git a/app/assets/javascripts/commit/components/x509_certificate_details.vue b/app/assets/javascripts/commit/components/x509_certificate_details.vue new file mode 100644 index 00000000000..6880fab9043 --- /dev/null +++ b/app/assets/javascripts/commit/components/x509_certificate_details.vue @@ -0,0 +1,45 @@ +<script> +import { X509_CERTIFICATE_KEY_IDENTIFIER_TITLE } from '../constants'; + +export default { + props: { + subject: { + type: String, + required: true, + }, + title: { + type: String, + required: true, + }, + subjectKeyIdentifier: { + type: String, + required: true, + }, + }, + computed: { + subjectValues() { + return this.subject.split(','); + }, + subjectKeyIdentifierToDisplay() { + return this.subjectKeyIdentifier.replaceAll(':', ' '); + }, + }, + i18n: { + keyIdentifierTitle: X509_CERTIFICATE_KEY_IDENTIFIER_TITLE, + }, +}; +</script> + +<template> + <div> + <strong>{{ title }}</strong> + <ul class="gl-pl-5"> + <li v-for="value in subjectValues" :key="value" data-testid="subject-value"> + {{ value }} + </li> + <li data-testid="key-identifier"> + {{ $options.i18n.keyIdentifierTitle }} {{ subjectKeyIdentifierToDisplay }} + </li> + </ul> + </div> +</template> diff --git a/app/assets/javascripts/commit/constants.js b/app/assets/javascripts/commit/constants.js new file mode 100644 index 00000000000..4f865e99e46 --- /dev/null +++ b/app/assets/javascripts/commit/constants.js @@ -0,0 +1,104 @@ +import { __, s__ } from '~/locale'; + +export const X509_CERTIFICATE_KEY_IDENTIFIER_TITLE = __('Subject Key Identifier:'); + +export const verificationStatuses = { + VERIFIED: 'VERIFIED', + UNVERIFIED: 'UNVERIFIED', + UNVERIFIED_KEY: 'UNVERIFIED_KEY', + UNKNOWN_KEY: 'UNKNOWN_KEY', + OTHER_USER: 'OTHER_USER', + SAME_USER_DIFFERENT_EMAIL: 'SAME_USER_DIFFERENT_EMAIL', + MULTIPLE_SIGNATURES: 'MULTIPLE_SIGNATURES', + REVOKED_KEY: 'REVOKED_KEY', +}; + +export const signatureTypes = { + /* eslint-disable @gitlab/require-i18n-strings */ + GPG: 'GpgSignature', + X509: 'X509Signature', + SSH: 'SshSignature', + /* eslint-enable @gitlab/require-i18n-strings */ +}; + +const UNVERIFIED_CONFIG = { + variant: 'muted', + label: __('Unverified'), + title: __('Unverified signature'), + description: __('This commit was signed with an unverified signature.'), +}; + +export const statusConfig = { + [verificationStatuses.VERIFIED]: { + variant: 'success', + label: __('Verified'), + title: __('Verified commit'), + description: __( + 'This commit was signed with a verified signature and the committer email was verified to belong to the same user.', + ), + }, + [verificationStatuses.UNVERIFIED]: { + ...UNVERIFIED_CONFIG, + }, + [verificationStatuses.UNVERIFIED_KEY]: { + ...UNVERIFIED_CONFIG, + }, + [verificationStatuses.UNKNOWN_KEY]: { + ...UNVERIFIED_CONFIG, + }, + [verificationStatuses.OTHER_USER]: { + variant: 'muted', + label: __('Unverified'), + title: __("Different user's signature"), + description: __('This commit was signed with an unverified signature.'), + }, + [verificationStatuses.SAME_USER_DIFFERENT_EMAIL]: { + variant: 'muted', + label: __('Unverified'), + title: __('GPG key mismatch'), + description: __( + 'This commit was signed with a verified signature, but the committer email is not associated with the GPG Key.', + ), + }, + [verificationStatuses.MULTIPLE_SIGNATURES]: { + variant: 'muted', + label: __('Unverified'), + title: __('Multiple signatures'), + description: __('This commit was signed with multiple signatures.'), + }, + [verificationStatuses.REVOKED_KEY]: { + variant: 'muted', + label: __('Unverified'), + title: s__('CommitSignature|Unverified signature'), + description: s__('CommitSignature|This commit was signed with a key that was revoked.'), + }, +}; + +export const typeConfig = { + [signatureTypes.GPG]: { + keyLabel: __('GPG Key ID:'), + keyNamespace: 'gpgKeyPrimaryKeyid', + helpLink: { + label: __('Learn about signing commits'), + path: 'user/project/repository/gpg_signed_commits/index.md', + }, + }, + [signatureTypes.X509]: { + keyLabel: '', + helpLink: { + label: __('Learn more about X.509 signed commits'), + path: '/user/project/repository/x509_signed_commits/index.md', + }, + subjectTitle: __('Certificate Subject'), + issuerTitle: __('Certificate Issuer'), + keyIdentifierTitle: __('Subject Key Identifier:'), + }, + [signatureTypes.SSH]: { + keyLabel: __('SSH key fingerprint:'), + keyNamespace: 'keyFingerprintSha256', + helpLink: { + label: __('Learn about signing commits with SSH keys.'), + path: '/user/project/repository/ssh_signed_commits/index.md', + }, + }, +}; diff --git a/app/assets/javascripts/commit_merge_requests.js b/app/assets/javascripts/commit_merge_requests.js index d40cbe589c0..38abb7bebb0 100644 --- a/app/assets/javascripts/commit_merge_requests.js +++ b/app/assets/javascripts/commit_merge_requests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from './lib/utils/axios_utils'; import { n__, s__ } from './locale'; diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue index 196f5537a90..97762ff549b 100644 --- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue +++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import Api from '~/api'; import { __ } from '~/locale'; import state from '../state'; diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/formatting_bubble_menu.vue b/app/assets/javascripts/content_editor/components/bubble_menus/formatting_bubble_menu.vue index 354db88f11c..06b80a65528 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/formatting_bubble_menu.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/formatting_bubble_menu.vue @@ -7,6 +7,7 @@ import Heading from '../../extensions/heading'; import Audio from '../../extensions/audio'; import Video from '../../extensions/video'; import Image from '../../extensions/image'; +import DrawioDiagram from '../../extensions/drawio_diagram'; import ToolbarButton from '../toolbar_button.vue'; import BubbleMenu from './bubble_menu.vue'; @@ -26,7 +27,7 @@ export default { if (from === to) return false; const includes = [Paragraph.name, Heading.name]; - const excludes = [Image.name, Audio.name, Video.name]; + const excludes = [Image.name, Audio.name, Video.name, DrawioDiagram.name]; return ( includes.some((type) => editor.isActive(type)) && diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue b/app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue index 310bb1be81f..a14d49922fb 100644 --- a/app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue +++ b/app/assets/javascripts/content_editor/components/bubble_menus/media_bubble_menu.vue @@ -11,23 +11,26 @@ import { } from '@gitlab/ui'; import { __ } from '~/locale'; import Audio from '../../extensions/audio'; +import DrawioDiagram from '../../extensions/drawio_diagram'; import Image from '../../extensions/image'; import Video from '../../extensions/video'; import EditorStateObserver from '../editor_state_observer.vue'; import { acceptedMimes } from '../../services/upload_helpers'; import BubbleMenu from './bubble_menu.vue'; -const MEDIA_TYPES = [Audio.name, Image.name, Video.name]; +const MEDIA_TYPES = [Audio.name, Image.name, Video.name, DrawioDiagram.name]; export default { i18n: { copySourceLabels: { [Audio.name]: __('Copy audio URL'), + [DrawioDiagram.name]: __('Copy diagram URL'), [Image.name]: __('Copy image URL'), [Video.name]: __('Copy video URL'), }, editLabels: { [Audio.name]: __('Edit audio description'), + [DrawioDiagram.name]: __('Edit diagram description'), [Image.name]: __('Edit image description'), [Video.name]: __('Edit video description'), }, @@ -38,6 +41,7 @@ export default { }, deleteLabels: { [Audio.name]: __('Delete audio'), + [DrawioDiagram.name]: __('Delete diagram'), [Image.name]: __('Delete image'), [Video.name]: __('Delete video'), }, @@ -86,6 +90,9 @@ export default { showProgressIndicator() { return this.isUploading || this.isUpdating; }, + isDrawioDiagram() { + return this.mediaType === DrawioDiagram.name; + }, }, methods: { shouldShow() { @@ -156,10 +163,21 @@ export default { this.isUpdating = false; }, + resetMediaInfo() { + this.mediaTitle = null; + this.mediaAlt = null; + this.mediaCanonicalSrc = null; + this.isUploading = false; + }, + replaceMedia() { this.$refs.fileSelector.click(); }, + editDiagram() { + this.tiptapEditor.chain().focus().createOrEditDiagram().run(); + }, + onFileSelect(e) { this.tiptapEditor .chain() @@ -191,6 +209,8 @@ export default { class="gl-shadow gl-rounded-base gl-bg-white" plugin-key="bubbleMenuMedia" :should-show="shouldShow" + @show="updateMediaInfoToState" + @hidden="resetMediaInfo" > <editor-state-observer @transaction="updateMediaInfoToState"> <gl-button-group v-if="!isEditing" class="gl-display-flex gl-align-items-center"> @@ -240,6 +260,19 @@ export default { @click="startEditingMedia" /> <gl-button + v-if="isDrawioDiagram" + v-gl-tooltip + variant="default" + category="tertiary" + size="medium" + data-testid="edit-diagram" + :aria-label="replaceLabel" + title="Edit diagram" + icon="diagram" + @click="editDiagram" + /> + <gl-button + v-else v-gl-tooltip variant="default" category="tertiary" diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index 237808983ee..9e08a257abf 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -1,7 +1,9 @@ <script> import { EditorContent as TiptapEditorContent } from '@tiptap/vue-2'; -import { __ } from '~/locale'; -import { VARIANT_DANGER } from '~/flash'; +import { GlSprintf, GlLink } from '@gitlab/ui'; +import { __, s__ } from '~/locale'; +import { VARIANT_DANGER } from '~/alert'; +import EditorModeDropdown from '~/vue_shared/components/markdown/editor_mode_dropdown.vue'; import { createContentEditor } from '../services/create_content_editor'; import { ALERT_EVENT, TIPTAP_AUTOFOCUS_OPTIONS } from '../constants'; import ContentEditorAlert from './content_editor_alert.vue'; @@ -16,6 +18,8 @@ import LoadingIndicator from './loading_indicator.vue'; export default { components: { + GlSprintf, + GlLink, LoadingIndicator, ContentEditorAlert, ContentEditorProvider, @@ -26,6 +30,7 @@ export default { LinkBubbleMenu, MediaBubbleMenu, EditorStateObserver, + EditorModeDropdown, }, props: { renderMarkdown: { @@ -51,17 +56,32 @@ export default { required: false, default: '', }, + placeholder: { + type: String, + required: false, + default: '', + }, autofocus: { type: [String, Boolean], required: false, default: false, validator: (autofocus) => TIPTAP_AUTOFOCUS_OPTIONS.includes(autofocus), }, - useBottomToolbar: { + quickActionsDocsPath: { + type: String, + required: false, + default: '', + }, + drawioEnabled: { type: Boolean, required: false, default: false, }, + editable: { + type: Boolean, + required: false, + default: true, + }, }, data() { return { @@ -76,9 +96,20 @@ export default { this.setSerializedContent(markdown); } }, + editable(value) { + this.contentEditor.setEditable(value); + }, }, created() { - const { renderMarkdown, uploadsPath, extensions, serializerConfig, autofocus } = this; + const { + renderMarkdown, + uploadsPath, + extensions, + serializerConfig, + autofocus, + drawioEnabled, + editable, + } = this; // This is a non-reactive attribute intentionally since this is a complex object. this.contentEditor = createContentEditor({ @@ -86,8 +117,10 @@ export default { uploadsPath, extensions, serializerConfig, + drawioEnabled, tiptapOptions: { autofocus, + editable, }, }); }, @@ -104,10 +137,10 @@ export default { try { await this.contentEditor.setSerializedContent(markdown); - this.contentEditor.setEditable(true); this.notifyLoadingSuccess(); this.latestMarkdown = markdown; } catch { + this.contentEditor.setEditable(false); this.contentEditor.eventHub.$emit(ALERT_EVENT, { message: __( 'An error occurred while trying to render the content editor. Please try again.', @@ -115,10 +148,10 @@ export default { variant: VARIANT_DANGER, actionLabel: __('Retry'), action: () => { + this.contentEditor.setEditable(true); this.setSerializedContent(markdown); }, }); - this.contentEditor.setEditable(false); this.notifyLoadingError(); } }, @@ -149,6 +182,16 @@ export default { markdown: this.latestMarkdown, }); }, + handleEditorModeChanged(mode) { + if (mode === 'markdown') { + this.$emit('enableMarkdownEditor'); + } + }, + }, + i18n: { + quickActionsText: s__( + 'ContentEditor|For %{quickActionsDocsLinkStart}quick actions%{quickActionsDocsLinkEnd}, type %{keyboardStart}/%{keyboardEnd}.', + ), }, }; </script> @@ -168,30 +211,37 @@ export default { class="md-area" :class="{ 'is-focused': focused }" > - <formatting-toolbar - v-if="!useBottomToolbar" - ref="toolbar" - class="gl-border-b" - @enableMarkdownEditor="$emit('enableMarkdownEditor')" - /> + <formatting-toolbar ref="toolbar" @enableMarkdownEditor="$emit('enableMarkdownEditor')" /> <div class="gl-relative gl-mt-4"> <formatting-bubble-menu /> <code-block-bubble-menu /> <link-bubble-menu /> <media-bubble-menu /> + <div v-if="placeholder && !markdown && !focused" class="gl-absolute gl-text-gray-400"> + {{ placeholder }} + </div> <tiptap-editor-content class="md" data-testid="content_editor_editablebox" :editor="contentEditor.tiptapEditor" /> <loading-indicator v-if="isLoading" /> + <div class="gl-display-flex gl-border-t gl-py-2 gl-text-secondary"> + <div class="gl-w-full"> + <template v-if="quickActionsDocsPath"> + <gl-sprintf :message="$options.i18n.quickActionsText"> + <template #keyboard="{ content }"> + <kbd>{{ content }}</kbd> + </template> + <template #quickActionsDocsLink="{ content }"> + <gl-link :href="quickActionsDocsPath" target="_blank">{{ content }}</gl-link> + </template> + </gl-sprintf> + </template> + </div> + <editor-mode-dropdown size="small" value="richText" @input="handleEditorModeChanged" /> + </div> </div> - <formatting-toolbar - v-if="useBottomToolbar" - ref="toolbar" - class="gl-border-t" - @enableMarkdownEditor="$emit('enableMarkdownEditor')" - /> </div> </div> </content-editor-provider> diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue index 36ca3b8cfb6..a5be63fa89f 100644 --- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue +++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue @@ -1,5 +1,5 @@ <script> -import EditorModeDropdown from '~/vue_shared/components/markdown/editor_mode_dropdown.vue'; +import { GlTabs, GlTab } from '@gitlab/ui'; import trackUIControl from '../services/track_ui_control'; import ToolbarButton from './toolbar_button.vue'; import ToolbarImageButton from './toolbar_image_button.vue'; @@ -10,7 +10,8 @@ import ToolbarMoreDropdown from './toolbar_more_dropdown.vue'; export default { components: { - EditorModeDropdown, + GlTabs, + GlTab, ToolbarButton, ToolbarTextStyleDropdown, ToolbarLinkButton, @@ -22,95 +23,88 @@ export default { trackToolbarControlExecution({ contentType, value }) { trackUIControl({ property: contentType, value }); }, - handleEditorModeChanged(mode) { - if (mode === 'markdown') { - this.$emit('enableMarkdownEditor'); - } - }, }, }; </script> <template> - <div class="gl-display-flex gl-flex-wrap gl-pb-3 gl-pt-3"> - <toolbar-text-style-dropdown - data-testid="text-styles" - class="gl-mr-3" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="bold" - content-type="bold" - icon-name="bold" - class="gl-mx-2" - editor-command="toggleBold" - :label="__('Bold text')" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="italic" - content-type="italic" - icon-name="italic" - class="gl-mx-2" - editor-command="toggleItalic" - :label="__('Italic text')" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="blockquote" - content-type="blockquote" - icon-name="quote" - class="gl-mx-2" - editor-command="toggleBlockquote" - :label="__('Insert a quote')" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="code" - content-type="code" - icon-name="code" - class="gl-mx-2" - editor-command="toggleCode" - :label="__('Code')" - @execute="trackToolbarControlExecution" - /> - <toolbar-link-button data-testid="link" @execute="trackToolbarControlExecution" /> - <toolbar-button - data-testid="bullet-list" - content-type="bulletList" - icon-name="list-bulleted" - class="gl-mx-2 gl-display-none gl-sm-display-inline" - editor-command="toggleBulletList" - :label="__('Add a bullet list')" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="ordered-list" - content-type="orderedList" - icon-name="list-numbered" - class="gl-mx-2 gl-display-none gl-sm-display-inline" - editor-command="toggleOrderedList" - :label="__('Add a numbered list')" - @execute="trackToolbarControlExecution" - /> - <toolbar-button - data-testid="task-list" - content-type="taskList" - icon-name="list-task" - class="gl-mx-2 gl-display-none gl-sm-display-inline" - editor-command="toggleTaskList" - :label="__('Add a checklist')" - @execute="trackToolbarControlExecution" - /> - <toolbar-image-button - ref="imageButton" - data-testid="image" - @execute="trackToolbarControlExecution" - /> - <toolbar-table-button data-testid="table" @execute="trackToolbarControlExecution" /> - <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" /> - - <editor-mode-dropdown class="gl-ml-auto" value="richText" @input="handleEditorModeChanged" /> - </div> + <gl-tabs content-class="gl-display-none"> + <gl-tab title-link-class="gl-py-4 gl-px-3" :title="__('Write')" /> + <template #tabs-end> + <div class="gl-ml-auto gl-py-2 gl-display-flex gl-flex-wrap gl-align-items-end"> + <toolbar-text-style-dropdown + data-testid="text-styles" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="bold" + content-type="bold" + icon-name="bold" + editor-command="toggleBold" + :label="__('Bold text')" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="italic" + content-type="italic" + icon-name="italic" + editor-command="toggleItalic" + :label="__('Italic text')" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="blockquote" + content-type="blockquote" + icon-name="quote" + editor-command="toggleBlockquote" + :label="__('Insert a quote')" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="code" + content-type="code" + icon-name="code" + editor-command="toggleCode" + :label="__('Code')" + @execute="trackToolbarControlExecution" + /> + <toolbar-link-button data-testid="link" @execute="trackToolbarControlExecution" /> + <toolbar-button + data-testid="bullet-list" + content-type="bulletList" + icon-name="list-bulleted" + class="gl-display-none gl-sm-display-inline" + editor-command="toggleBulletList" + :label="__('Add a bullet list')" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="ordered-list" + content-type="orderedList" + icon-name="list-numbered" + class="gl-display-none gl-sm-display-inline" + editor-command="toggleOrderedList" + :label="__('Add a numbered list')" + @execute="trackToolbarControlExecution" + /> + <toolbar-button + data-testid="task-list" + content-type="taskList" + icon-name="list-task" + class="gl-display-none gl-sm-display-inline" + editor-command="toggleTaskList" + :label="__('Add a checklist')" + @execute="trackToolbarControlExecution" + /> + <toolbar-image-button + ref="imageButton" + data-testid="image" + @execute="trackToolbarControlExecution" + /> + <toolbar-table-button data-testid="table" @execute="trackToolbarControlExecution" /> + <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" /> + </div> + </template> + </gl-tabs> </template> <style> .gl-spinner-container { diff --git a/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue b/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue index ca17443081c..99ba8c51948 100644 --- a/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue +++ b/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue @@ -9,7 +9,7 @@ export default { GlDisclosureDropdown, GlTooltip, }, - inject: ['tiptapEditor'], + inject: ['tiptapEditor', 'contentEditor'], data() { return { toggleId: uniqueId('dropdown-toggle-btn-'), @@ -53,6 +53,14 @@ export default { text: __('PlantUML diagram'), action: () => this.insert('diagram', { language: 'plantuml' }), }, + ...(this.contentEditor.drawioEnabled + ? [ + { + text: __('Create or edit diagram'), + action: () => this.execute('createOrEditDiagram', 'drawioDiagram'), + }, + ] + : []), { text: __('Table of contents'), action: () => this.execute('insertTableOfContents', 'tableOfContents'), diff --git a/app/assets/javascripts/content_editor/components/toolbar_text_style_dropdown.vue b/app/assets/javascripts/content_editor/components/toolbar_text_style_dropdown.vue index 9c1d1faca48..bd30bdcea0c 100644 --- a/app/assets/javascripts/content_editor/components/toolbar_text_style_dropdown.vue +++ b/app/assets/javascripts/content_editor/components/toolbar_text_style_dropdown.vue @@ -76,6 +76,8 @@ export default { :disabled="!activeItem" :data-qa-text-style="activeItemLabel" data-qa-selector="text_style_dropdown" + size="small" + toggle-class="btn-default-tertiary" @select="execute" /> </editor-state-observer> diff --git a/app/assets/javascripts/content_editor/components/wrappers/table_cell_base.vue b/app/assets/javascripts/content_editor/components/wrappers/table_cell_base.vue index 6456540a0dd..4d948f4ec05 100644 --- a/app/assets/javascripts/content_editor/components/wrappers/table_cell_base.vue +++ b/app/assets/javascripts/content_editor/components/wrappers/table_cell_base.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlDropdownDivider } from '@gitlab/ui'; import { NodeViewWrapper, NodeViewContent } from '@tiptap/vue-2'; -import { selectedRect as getSelectedRect } from '@_ueberdosis/prosemirror-tables'; +import { selectedRect as getSelectedRect } from '@tiptap/pm/tables'; import { __ } from '~/locale'; const TABLE_CELL_HEADER = 'th'; diff --git a/app/assets/javascripts/content_editor/constants/index.js b/app/assets/javascripts/content_editor/constants/index.js index 14862727811..6a3740a5952 100644 --- a/app/assets/javascripts/content_editor/constants/index.js +++ b/app/assets/javascripts/content_editor/constants/index.js @@ -47,6 +47,7 @@ export const KEYDOWN_EVENT = 'keydown'; export const PARSE_HTML_PRIORITY_LOWEST = 1; export const PARSE_HTML_PRIORITY_DEFAULT = 50; +export const PARSE_HTML_PRIORITY_HIGH = 75; export const PARSE_HTML_PRIORITY_HIGHEST = 100; export const EXTENSION_PRIORITY_LOWER = 75; diff --git a/app/assets/javascripts/content_editor/extensions/attachment.js b/app/assets/javascripts/content_editor/extensions/attachment.js index 9634730f637..0d5b8e56a6c 100644 --- a/app/assets/javascripts/content_editor/extensions/attachment.js +++ b/app/assets/javascripts/content_editor/extensions/attachment.js @@ -1,5 +1,5 @@ import { Extension } from '@tiptap/core'; -import { Plugin, PluginKey } from 'prosemirror-state'; +import { Plugin, PluginKey } from '@tiptap/pm/state'; import { handleFileEvent } from '../services/upload_helpers'; export default Extension.create({ diff --git a/app/assets/javascripts/content_editor/extensions/color_chip.js b/app/assets/javascripts/content_editor/extensions/color_chip.js index deb5029a1f0..c49b541bbaf 100644 --- a/app/assets/javascripts/content_editor/extensions/color_chip.js +++ b/app/assets/javascripts/content_editor/extensions/color_chip.js @@ -1,6 +1,6 @@ import { Node } from '@tiptap/core'; -import { Plugin, PluginKey } from 'prosemirror-state'; -import { Decoration, DecorationSet } from 'prosemirror-view'; +import { Plugin, PluginKey } from '@tiptap/pm/state'; +import { Decoration, DecorationSet } from '@tiptap/pm/view'; import { isValidColorExpression } from '~/lib/utils/color_utils'; import { PARSE_HTML_PRIORITY_HIGHEST } from '../constants'; diff --git a/app/assets/javascripts/content_editor/extensions/drawio_diagram.js b/app/assets/javascripts/content_editor/extensions/drawio_diagram.js new file mode 100644 index 00000000000..8c3012ecf59 --- /dev/null +++ b/app/assets/javascripts/content_editor/extensions/drawio_diagram.js @@ -0,0 +1,41 @@ +import { create } from '~/drawio/content_editor_facade'; +import { launchDrawioEditor } from '~/drawio/drawio_editor'; +import { PARSE_HTML_PRIORITY_HIGHEST } from '../constants'; +import createAssetResolver from '../services/asset_resolver'; +import Image from './image'; + +export default Image.extend({ + name: 'drawioDiagram', + addOptions() { + return { + ...this.parent?.(), + uploadsPath: null, + renderMarkdown: null, + }; + }, + parseHTML() { + return [ + { + priority: PARSE_HTML_PRIORITY_HIGHEST, + tag: 'a.no-attachment-icon[data-canonical-src$="drawio.svg"]', + }, + { + tag: 'img[src]', + }, + ]; + }, + addCommands() { + return { + createOrEditDiagram: () => () => { + launchDrawioEditor({ + editorFacade: create({ + tiptapEditor: this.editor, + drawioNodeName: this.name, + uploadsPath: this.options.uploadsPath, + assetResolver: createAssetResolver({ renderMarkdown: this.options.renderMarkdown }), + }), + }); + }, + }; + }, +}); diff --git a/app/assets/javascripts/content_editor/extensions/external_keydown_handler.js b/app/assets/javascripts/content_editor/extensions/external_keydown_handler.js index e940614083e..e48100c15a7 100644 --- a/app/assets/javascripts/content_editor/extensions/external_keydown_handler.js +++ b/app/assets/javascripts/content_editor/extensions/external_keydown_handler.js @@ -1,5 +1,5 @@ import { Extension } from '@tiptap/core'; -import { Plugin, PluginKey } from 'prosemirror-state'; +import { Plugin, PluginKey } from '@tiptap/pm/state'; import { KEYDOWN_EVENT } from '../constants'; /** diff --git a/app/assets/javascripts/content_editor/extensions/image.js b/app/assets/javascripts/content_editor/extensions/image.js index fc4c108b773..58c16297886 100644 --- a/app/assets/javascripts/content_editor/extensions/image.js +++ b/app/assets/javascripts/content_editor/extensions/image.js @@ -1,5 +1,5 @@ import { Image } from '@tiptap/extension-image'; -import { PARSE_HTML_PRIORITY_HIGHEST } from '../constants'; +import { PARSE_HTML_PRIORITY_HIGH } from '../constants'; const resolveImageEl = (element) => element.nodeName === 'IMG' ? element : element.querySelector('img'); @@ -77,7 +77,7 @@ export default Image.extend({ parseHTML() { return [ { - priority: PARSE_HTML_PRIORITY_HIGHEST, + priority: PARSE_HTML_PRIORITY_HIGH, tag: 'a.no-attachment-icon', }, { diff --git a/app/assets/javascripts/content_editor/extensions/paste_markdown.js b/app/assets/javascripts/content_editor/extensions/paste_markdown.js index 848c4c12a9a..0a9a0d8d4c1 100644 --- a/app/assets/javascripts/content_editor/extensions/paste_markdown.js +++ b/app/assets/javascripts/content_editor/extensions/paste_markdown.js @@ -1,7 +1,7 @@ import { Extension } from '@tiptap/core'; -import { Plugin, PluginKey } from 'prosemirror-state'; +import { Plugin, PluginKey } from '@tiptap/pm/state'; import { __ } from '~/locale'; -import { VARIANT_DANGER } from '~/flash'; +import { VARIANT_DANGER } from '~/alert'; import createMarkdownDeserializer from '../services/gl_api_markdown_deserializer'; import { ALERT_EVENT, EXTENSION_PRIORITY_HIGHEST } from '../constants'; import CodeBlockHighlight from './code_block_highlight'; diff --git a/app/assets/javascripts/content_editor/extensions/suggestions.js b/app/assets/javascripts/content_editor/extensions/suggestions.js index a9628c78add..eb53a3a61b3 100644 --- a/app/assets/javascripts/content_editor/extensions/suggestions.js +++ b/app/assets/javascripts/content_editor/extensions/suggestions.js @@ -2,7 +2,7 @@ import { Node } from '@tiptap/core'; import { VueRenderer } from '@tiptap/vue-2'; import tippy from 'tippy.js'; import Suggestion from '@tiptap/suggestion'; -import { PluginKey } from 'prosemirror-state'; +import { PluginKey } from '@tiptap/pm/state'; import { isFunction, uniqueId, memoize } from 'lodash'; import axios from '~/lib/utils/axios_utils'; import { initEmojiMap, getAllEmoji } from '~/emoji'; diff --git a/app/assets/javascripts/content_editor/extensions/table.js b/app/assets/javascripts/content_editor/extensions/table.js index d7456ab4094..de8170eff93 100644 --- a/app/assets/javascripts/content_editor/extensions/table.js +++ b/app/assets/javascripts/content_editor/extensions/table.js @@ -1,6 +1,6 @@ import { Table } from '@tiptap/extension-table'; import { debounce } from 'lodash'; -import { VARIANT_WARNING } from '~/flash'; +import { VARIANT_WARNING } from '~/alert'; import { __ } from '~/locale'; import { getMarkdownSource } from '../services/markdown_sourcemap'; import { shouldRenderHTMLTable } from '../services/serialization_helpers'; diff --git a/app/assets/javascripts/content_editor/services/content_editor.js b/app/assets/javascripts/content_editor/services/content_editor.js index 514ab9699bc..a988e1df2a6 100644 --- a/app/assets/javascripts/content_editor/services/content_editor.js +++ b/app/assets/javascripts/content_editor/services/content_editor.js @@ -1,12 +1,14 @@ /* eslint-disable no-underscore-dangle */ export class ContentEditor { - constructor({ tiptapEditor, serializer, deserializer, assetResolver, eventHub }) { + constructor({ tiptapEditor, serializer, deserializer, assetResolver, eventHub, drawioEnabled }) { this._tiptapEditor = tiptapEditor; this._serializer = serializer; this._deserializer = deserializer; this._eventHub = eventHub; this._assetResolver = assetResolver; this._pristineDoc = null; + + this.drawioEnabled = drawioEnabled; } get tiptapEditor() { diff --git a/app/assets/javascripts/content_editor/services/create_content_editor.js b/app/assets/javascripts/content_editor/services/create_content_editor.js index 61c6be574d0..9d536793287 100644 --- a/app/assets/javascripts/content_editor/services/create_content_editor.js +++ b/app/assets/javascripts/content_editor/services/create_content_editor.js @@ -16,6 +16,7 @@ import DescriptionList from '../extensions/description_list'; import Details from '../extensions/details'; import DetailsContent from '../extensions/details_content'; import Diagram from '../extensions/diagram'; +import DrawioDiagram from '../extensions/drawio_diagram'; import Document from '../extensions/document'; import Dropcursor from '../extensions/dropcursor'; import Emoji from '../extensions/emoji'; @@ -74,7 +75,7 @@ const createTiptapEditor = ({ extensions = [], ...options } = {}) => extensions: [...extensions], editorProps: { attributes: { - class: 'gl-outline-0!', + class: 'gl-shadow-none!', }, }, ...options, @@ -86,6 +87,7 @@ export const createContentEditor = ({ extensions = [], serializerConfig = { marks: {}, nodes: {} }, tiptapOptions, + drawioEnabled = false, } = {}) => { if (!isFunction(renderMarkdown)) { throw new Error(PROVIDE_SERIALIZER_OR_RENDERER_ERROR); @@ -157,6 +159,9 @@ export const createContentEditor = ({ ]; const allExtensions = [...builtInContentEditorExtensions, ...extensions]; + + if (drawioEnabled) allExtensions.push(DrawioDiagram.configure({ uploadsPath, renderMarkdown })); + const trackedExtensions = allExtensions.map(trackInputRulesAndShortcuts); const tiptapEditor = createTiptapEditor({ extensions: trackedExtensions, ...tiptapOptions }); const serializer = createMarkdownSerializer({ serializerConfig }); @@ -173,5 +178,6 @@ export const createContentEditor = ({ eventHub, deserializer, assetResolver, + drawioEnabled, }); }; diff --git a/app/assets/javascripts/content_editor/services/gl_api_markdown_deserializer.js b/app/assets/javascripts/content_editor/services/gl_api_markdown_deserializer.js index 796dc06ad93..91f8aaf6324 100644 --- a/app/assets/javascripts/content_editor/services/gl_api_markdown_deserializer.js +++ b/app/assets/javascripts/content_editor/services/gl_api_markdown_deserializer.js @@ -1,4 +1,4 @@ -import { DOMParser as ProseMirrorDOMParser } from 'prosemirror-model'; +import { DOMParser as ProseMirrorDOMParser } from '@tiptap/pm/model'; import { replaceCommentsWith } from '~/lib/utils/dom_utils'; export default ({ render }) => { @@ -18,10 +18,7 @@ export default ({ render }) => { */ return { deserialize: async ({ schema, markdown }) => { - const html = await render(markdown); - - if (!html) return {}; - + const html = markdown ? await render(markdown) : '<p></p>'; const parser = new DOMParser(); const { body } = parser.parseFromString(`<body>${html}</body>`, 'text/html'); diff --git a/app/assets/javascripts/content_editor/services/hast_to_prosemirror_converter.js b/app/assets/javascripts/content_editor/services/hast_to_prosemirror_converter.js index 28a50adca6b..c8972515c25 100644 --- a/app/assets/javascripts/content_editor/services/hast_to_prosemirror_converter.js +++ b/app/assets/javascripts/content_editor/services/hast_to_prosemirror_converter.js @@ -19,7 +19,7 @@ * visit-parents documentation: https://github.com/syntax-tree/unist-util-visit-parents */ -import { Mark } from 'prosemirror-model'; +import { Mark } from '@tiptap/pm/model'; import { visitParents, SKIP } from 'unist-util-visit-parents'; import { isFunction, isString, noop, mapValues } from 'lodash'; diff --git a/app/assets/javascripts/content_editor/services/markdown_serializer.js b/app/assets/javascripts/content_editor/services/markdown_serializer.js index 4e29f85004b..e27a427372c 100644 --- a/app/assets/javascripts/content_editor/services/markdown_serializer.js +++ b/app/assets/javascripts/content_editor/services/markdown_serializer.js @@ -12,6 +12,7 @@ import DescriptionItem from '../extensions/description_item'; import DescriptionList from '../extensions/description_list'; import Details from '../extensions/details'; import DetailsContent from '../extensions/details_content'; +import DrawioDiagram from '../extensions/drawio_diagram'; import Comment from '../extensions/comment'; import Diagram from '../extensions/diagram'; import Emoji from '../extensions/emoji'; @@ -134,6 +135,10 @@ const defaultSerializerConfig = { [CodeBlockHighlight.name]: preserveUnchanged(renderCodeBlock), [Comment.name]: renderComment, [Diagram.name]: preserveUnchanged(renderCodeBlock), + [DrawioDiagram.name]: preserveUnchanged({ + render: renderImage, + inline: true, + }), [DescriptionList.name]: renderHTMLNode('dl', true), [DescriptionItem.name]: (state, node, parent, index) => { if (index === 1) state.ensureNewLine(); diff --git a/app/assets/javascripts/content_editor/services/upload_helpers.js b/app/assets/javascripts/content_editor/services/upload_helpers.js index 09f0738b51b..de1a187b246 100644 --- a/app/assets/javascripts/content_editor/services/upload_helpers.js +++ b/app/assets/javascripts/content_editor/services/upload_helpers.js @@ -1,20 +1,30 @@ -import { VARIANT_DANGER } from '~/flash'; +import { VARIANT_DANGER } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { extractFilename, readFileAsDataURL } from './utils'; export const acceptedMimes = { - image: ['image/jpeg', 'image/png', 'image/gif', 'image/jpg'], - audio: [ - 'audio/basic', - 'audio/mid', - 'audio/mpeg', - 'audio/x-aiff', - 'audio/ogg', - 'audio/vorbis', - 'audio/vnd.wav', - ], - video: ['video/mp4', 'video/quicktime'], + drawioDiagram: { + mimes: ['image/svg+xml'], + ext: 'drawio.svg', + }, + image: { + mimes: ['image/jpeg', 'image/png', 'image/gif', 'image/jpg'], + }, + audio: { + mimes: [ + 'audio/basic', + 'audio/mid', + 'audio/mpeg', + 'audio/x-aiff', + 'audio/ogg', + 'audio/vorbis', + 'audio/vnd.wav', + ], + }, + video: { + mimes: ['video/mp4', 'video/quicktime'], + }, }; const extractAttachmentLinkUrl = (html) => { @@ -128,8 +138,8 @@ const uploadAttachment = async ({ editor, file, uploadsPath, renderMarkdown, eve export const handleFileEvent = ({ editor, file, uploadsPath, renderMarkdown, eventHub }) => { if (!file) return false; - for (const [type, mimes] of Object.entries(acceptedMimes)) { - if (mimes.includes(file?.type)) { + for (const [type, { mimes, ext }] of Object.entries(acceptedMimes)) { + if (mimes.includes(file?.type) && (!ext || file?.name.endsWith(ext))) { uploadContent({ type, editor, file, uploadsPath, renderMarkdown, eventHub }); return true; diff --git a/app/assets/javascripts/contextual_sidebar.js b/app/assets/javascripts/contextual_sidebar.js index f2ff77daf02..ea444b5c146 100644 --- a/app/assets/javascripts/contextual_sidebar.js +++ b/app/assets/javascripts/contextual_sidebar.js @@ -38,9 +38,6 @@ export default class ContextualSidebar { this.toggleCollapsedSidebar(value, true); } }); - this.$page.on('transitionstart transitionend', () => { - $(document).trigger('content.resize'); - }); $(window).on( 'resize', diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index 17e6cc87ff8..ce99d5da3cc 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -9,7 +9,6 @@ import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; import { __ } from '~/locale'; import RefSelector from '~/ref/components/ref_selector.vue'; import { REF_TYPE_BRANCHES, REF_TYPE_TAGS } from '~/ref/constants'; -import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; import { xAxisLabelFormatter, dateFormatter } from '../utils'; const GRAPHS_PATH_REGEX = /^(.*?)\/-\/graphs/g; @@ -26,7 +25,6 @@ export default { GlAreaChart, GlButton, GlLoadingIcon, - ResizableChartContainer, RefSelector, }, props: { @@ -249,18 +247,15 @@ export default { <div data-testid="contributors-charts"> <h4 class="gl-mb-2 gl-mt-5">{{ __('Commits to') }} {{ branch }}</h4> <span>{{ __('Excluding merge commits. Limited to 6,000 commits.') }}</span> - <resizable-chart-container> - <template #default="{ width }"> - <gl-area-chart - class="gl-mb-5" - :width="width" - :data="masterChartData" - :option="masterChartOptions" - :height="masterChartHeight" - @created="onMasterChartCreated" - /> - </template> - </resizable-chart-container> + <gl-area-chart + class="gl-mb-5" + responsive + width="auto" + :data="masterChartData" + :option="masterChartOptions" + :height="masterChartHeight" + @created="onMasterChartCreated" + /> <div class="row"> <div @@ -272,17 +267,14 @@ export default { <p class="gl-mb-3"> {{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }}) </p> - <resizable-chart-container> - <template #default="{ width }"> - <gl-area-chart - :width="width" - :data="contributor.dates" - :option="individualChartOptions" - :height="individualChartHeight" - @created="onIndividualChartCreated" - /> - </template> - </resizable-chart-container> + <gl-area-chart + responsive + width="auto" + :data="contributor.dates" + :option="individualChartOptions" + :height="individualChartHeight" + @created="onIndividualChartCreated" + /> </div> </div> </div> diff --git a/app/assets/javascripts/contributors/stores/actions.js b/app/assets/javascripts/contributors/stores/actions.js index 3a6f4191031..5a8349aa1fd 100644 --- a/app/assets/javascripts/contributors/stores/actions.js +++ b/app/assets/javascripts/contributors/stores/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import service from '../services/contributors_service'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue index c67b544eacd..b13b0ede9f0 100644 --- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue +++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue @@ -48,15 +48,13 @@ export default { addDeployFreezeButton() { return { text: this.isEditing ? __('Save deploy freeze') : __('Add deploy freeze'), - attributes: [ - { variant: 'confirm' }, - { - disabled: - !isValidCron(this.freezeStartCron) || - !isValidCron(this.freezeEndCron) || - !this.selectedTimezone, - }, - ], + attributes: { + variant: 'confirm', + disabled: + !isValidCron(this.freezeStartCron) || + !isValidCron(this.freezeEndCron) || + !this.selectedTimezone, + }, }; }, invalidFreezeStartCron() { diff --git a/app/assets/javascripts/deploy_freeze/store/actions.js b/app/assets/javascripts/deploy_freeze/store/actions.js index 76a4eaaff3f..77d3037ff57 100644 --- a/app/assets/javascripts/deploy_freeze/store/actions.js +++ b/app/assets/javascripts/deploy_freeze/store/actions.js @@ -1,5 +1,5 @@ import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { logError } from '~/lib/logger'; import { __ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue index db5e9a954cf..5fc15578827 100644 --- a/app/assets/javascripts/deploy_keys/components/app.vue +++ b/app/assets/javascripts/deploy_keys/components/app.vue @@ -1,6 +1,6 @@ <script> import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; import eventHub from '../eventhub'; diff --git a/app/assets/javascripts/deploy_keys/components/confirm_modal.vue b/app/assets/javascripts/deploy_keys/components/confirm_modal.vue index 1932435c42a..25551d7b5cb 100644 --- a/app/assets/javascripts/deploy_keys/components/confirm_modal.vue +++ b/app/assets/javascripts/deploy_keys/components/confirm_modal.vue @@ -22,11 +22,11 @@ export default { title: __('Do you want to remove this deploy key?'), actionPrimary: { text: __('Remove deploy key'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, actionSecondary: { text: __('Cancel'), - attributes: [{ category: 'tertiary' }], + attributes: { category: 'tertiary' }, }, static: true, modalId: 'confirm-remove-deploy-key', diff --git a/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue b/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue index 57fae608efa..c49ab1ac43c 100644 --- a/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue +++ b/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue @@ -9,7 +9,7 @@ import { GlSprintf, GlLink, } from '@gitlab/ui'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { formatDate } from '~/lib/utils/datetime_utility'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; @@ -66,6 +66,11 @@ export default { }, }, methods: { + getWritePackageRegistryHelpText() { + return this.tokenType === 'group' + ? this.$options.translations.groupWritePackageRegistryHelp + : this.$options.translations.projectWritePackageRegistryHelp; + }, defaultData() { return { expiresAt: null, @@ -110,7 +115,7 @@ export default { id: 'deploy_token_write_package_registry', isShown: this.$props.packagesRegistryEnabled, value: false, - helpText: this.$options.translations.writePackageRegistryHelp, + helpText: this.getWritePackageRegistryHelpText(), scopeName: 'write_package_registry', }, ], diff --git a/app/assets/javascripts/deploy_tokens/deploy_token_translations.js b/app/assets/javascripts/deploy_tokens/deploy_token_translations.js index 3767e9e6170..410864a83a2 100644 --- a/app/assets/javascripts/deploy_tokens/deploy_token_translations.js +++ b/app/assets/javascripts/deploy_tokens/deploy_token_translations.js @@ -32,9 +32,12 @@ const translations = { readRegistryHelp: s__('DeployTokens|Allows read-only access to registry images.'), writeRegistryHelp: s__('DeployTokens|Allows read and write access to registry images.'), readPackageRegistryHelp: s__('DeployTokens|Allows read-only access to the package registry.'), - writePackageRegistryHelp: s__( + groupWritePackageRegistryHelp: s__( 'DeployTokens|Allows read and write access to the package registry.', ), + projectWritePackageRegistryHelp: s__( + 'DeployTokens|Allows read, write and delete access to the package registry.', + ), createTokenFailedAlert: s__('DeployTokens|Failed to create a new deployment token'), }; diff --git a/app/assets/javascripts/deprecated_notes.js b/app/assets/javascripts/deprecated_notes.js index 7503df9194b..0008c3504ce 100644 --- a/app/assets/javascripts/deprecated_notes.js +++ b/app/assets/javascripts/deprecated_notes.js @@ -16,7 +16,7 @@ import $ from 'jquery'; import { escape, uniqueId } from 'lodash'; import Vue from 'vue'; import { renderGFM } from '~/behaviors/markdown/render_gfm'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { sanitize } from '~/lib/dompurify'; import '~/lib/utils/jquery_at_who'; import AjaxCache from '~/lib/utils/ajax_cache'; @@ -53,9 +53,9 @@ const MAX_VISIBLE_COMMIT_LIST_COUNT = 3; const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm; export default class Notes { - static initialize(notes_url, note_ids, last_fetched_at, view, enableGFM) { + static initialize(notes_url, last_fetched_at, view, enableGFM) { if (!this.instance) { - this.instance = new Notes(notes_url, note_ids, last_fetched_at, view, enableGFM); + this.instance = new Notes(notes_url, last_fetched_at, view, enableGFM); } } @@ -63,7 +63,7 @@ export default class Notes { return this.instance; } - constructor(notes_url, note_ids, last_fetched_at, view, enableGFM = defaultAutocompleteConfig) { + constructor(notes_url, last_fetched_at, view, enableGFM = defaultAutocompleteConfig) { this.updateTargetButtons = this.updateTargetButtons.bind(this); this.updateComment = this.updateComment.bind(this); this.visibilityChange = this.visibilityChange.bind(this); @@ -85,9 +85,9 @@ export default class Notes { this.postComment = this.postComment.bind(this); this.clearAlertWrapper = this.clearAlert.bind(this); this.onHashChange = this.onHashChange.bind(this); + this.note_ids = []; this.notes_url = notes_url; - this.note_ids = note_ids; this.enableGFM = enableGFM; // Used to keep track of updated notes while people are editing things this.updatedNotesTrackingMap = {}; @@ -449,8 +449,6 @@ export default class Notes { return; } - this.note_ids.push(noteEntity.id); - if ($notesList.length) { $notesList.find('.system-note.being-posted').remove(); } @@ -497,7 +495,6 @@ export default class Notes { if (!Notes.isNewNote(noteEntity, this.note_ids)) { return; } - this.note_ids.push(noteEntity.id); const form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`); @@ -745,7 +742,7 @@ export default class Notes { $noteAvatar.append($targetNoteBadge); this.revertNoteEditForm($targetNote); - renderGFM($noteEntityEl.get(0)); + renderGFM(Notes.getNodeToRender($noteEntityEl)); // Find the note's `li` element by ID and replace it with the updated HTML const $note_li = $(`.note-row-${noteEntity.id}`); @@ -1396,8 +1393,28 @@ export default class Notes { /** * Check if note does not exist on page */ - static isNewNote(noteEntity, noteIds) { - return $.inArray(noteEntity.id, noteIds) === -1; + static isNewNote(noteEntity, note_ids) { + if (note_ids.length === 0) { + Notes.loadNotesIds(note_ids); + } + const isNewEntry = $.inArray(noteEntity.id, note_ids) === -1; + if (isNewEntry) { + note_ids.push(noteEntity.id); + } + return isNewEntry; + } + + /** + * Load notes ids + */ + static loadNotesIds(note_ids) { + const $notesList = $('.main-notes-list li[id^=note_]'); + for (const $noteItem of $notesList) { + if (Notes.isNodeTypeElement($noteItem)) { + const noteId = parseInt($noteItem.id.split('_')[1], 10); + note_ids.push(noteId); + } + } } /** @@ -1422,7 +1439,7 @@ export default class Notes { const $note = $(noteHtml); $note.addClass('fade-in-full'); - renderGFM($note.get(0)); + renderGFM(Notes.getNodeToRender($note)); $notesList.append($note); return $note; } @@ -1431,11 +1448,20 @@ export default class Notes { const $updatedNote = $(noteHtml); $updatedNote.addClass('fade-in'); - renderGFM($updatedNote.get(0)); + renderGFM(Notes.getNodeToRender($updatedNote)); $note.replaceWith($updatedNote); return $updatedNote; } + static getNodeToRender($note) { + for (const $item of $note) { + if (Notes.isNodeTypeElement($item)) { + return $item; + } + } + return ''; + } + /** * Get data from Form attributes to use for saving/submitting comment. */ @@ -1829,4 +1855,11 @@ export default class Notes { return $closeBtn.text($closeBtn.data('originalText')); } + + /** + * Function to check if node is element to avoid comment and text + */ + static isNodeTypeElement($node) { + return $node.nodeType === Node.ELEMENT_NODE; + } } diff --git a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue index 3091c6703b4..680a101b118 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue @@ -1,16 +1,19 @@ <script> import { GlButton, GlLink, GlTooltipDirective } from '@gitlab/ui'; -import { ApolloMutation } from 'vue-apollo'; -import { createAlert } from '~/flash'; -import { s__ } from '~/locale'; +import * as Sentry from '@sentry/browser'; +import { createAlert } from '~/alert'; +import { __, s__ } from '~/locale'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; import { updateGlobalTodoCount } from '~/sidebar/utils'; +import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import DesignNotePin from '~/vue_shared/components/design_management/design_note_pin.vue'; import { isLoggedIn } from '~/lib/utils/common_utils'; -import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../../constants'; +import { TYPENAME_NOTE, TYPENAME_DISCUSSION } from '~/graphql_shared/constants'; +import { ACTIVE_DISCUSSION_SOURCE_TYPES, DELETE_NOTE_ERROR_MSG } from '../../constants'; import createNoteMutation from '../../graphql/mutations/create_note.mutation.graphql'; import toggleResolveDiscussionMutation from '../../graphql/mutations/toggle_resolve_discussion.mutation.graphql'; +import destroyNoteMutation from '../../graphql/mutations/destroy_note.mutation.graphql'; import activeDiscussionQuery from '../../graphql/queries/active_discussion.query.graphql'; import getDesignQuery from '../../graphql/queries/get_design.query.graphql'; import allVersionsMixin from '../../mixins/all_versions'; @@ -23,8 +26,14 @@ import DesignReplyForm from './design_reply_form.vue'; import ToggleRepliesWidget from './toggle_replies_widget.vue'; export default { + i18n: { + deleteNote: { + confirmationText: __('Are you sure you want to delete this comment?'), + primaryModalBtnText: __('Delete comment'), + errorText: DELETE_NOTE_ERROR_MSG, + }, + }, components: { - ApolloMutation, DesignNote, DesignNotePin, DesignNoteSignedOut, @@ -97,9 +106,9 @@ export default { }, data() { return { - discussionComment: '', isFormRendered: false, activeDiscussion: {}, + noteToDelete: null, isResolving: false, shouldChangeResolvedStatus: false, areRepliesCollapsed: this.discussion.resolved, @@ -107,10 +116,9 @@ export default { }; }, computed: { - mutationPayload() { + mutationVariables() { return { noteableId: this.noteableId, - body: this.discussionComment, discussionId: this.discussion.id, }; }, @@ -156,19 +164,21 @@ export default { onDone({ data: { createNote } }) { if (hasErrors(createNote)) { createAlert({ message: ADD_DISCUSSION_COMMENT_ERROR }); + } else { + /** + * https://gitlab.com/gitlab-org/gitlab/-/issues/388314 + * + * Hide the form once the create note mutation is completed. + */ + this.hideForm(); } - this.discussionComment = ''; - this.hideForm(); + if (this.shouldChangeResolvedStatus) { this.toggleResolvedStatus(); } }, - onCreateNoteError(err) { - this.$emit('create-note-error', err); - }, hideForm() { this.isFormRendered = false; - this.discussionComment = ''; }, showForm() { this.$emit('open-form', this.discussion.id); @@ -219,13 +229,65 @@ export default { const { source } = activeDiscussion; return ALLOWED_ACTIVE_DISCUSSION_SOURCES.includes(source) && this.isDiscussionActive; }, + async showDeleteNoteConfirmationModal(note) { + const isLast = note?.discussion?.notes?.nodes.length === 1; + this.noteToDelete = { ...note, isLast }; + + const confirmed = await confirmAction(this.$options.i18n.deleteNote.confirmationText, { + primaryBtnVariant: 'danger', + primaryBtnText: this.$options.i18n.deleteNote.primaryModalBtnText, + }); + + if (confirmed) { + await this.deleteNote(); + } + }, + async deleteNote() { + const { id, discussion, isLast } = this.noteToDelete; + try { + await this.$apollo.mutate({ + mutation: destroyNoteMutation, + variables: { + input: { + id, + }, + }, + update: (cache, { data }) => { + const { errors } = data.destroyNote; + + if (errors?.length) { + this.$emit('delete-note-error', errors[0]); + } + + const objectToIdentify = isLast + ? { __typename: TYPENAME_DISCUSSION, id: discussion?.id } + : { __typename: TYPENAME_NOTE, id }; + + cache.modify({ + id: cache.identify(objectToIdentify), + fields: (_, { DELETE }) => DELETE, + }); + }, + optimisticResponse: { + destroyNote: { + note: null, + errors: [], + __typename: 'DestroyNotePayload', + }, + }, + }); + } catch (error) { + this.$emit('delete-note-error', this.$options.i18n.deleteNote.errorText); + Sentry.captureException(error); + } + }, }, createNoteMutation, }; </script> <template> - <div class="design-discussion-wrapper"> + <div class="design-discussion-wrapper" @click="$emit('update-active-discussion')"> <design-note-pin :is-resolved="discussion.resolved" :label="discussion.index" /> <ul class="design-discussion bordered-box gl-relative gl-p-0 gl-list-style-none" @@ -235,9 +297,10 @@ export default { :note="firstNote" :markdown-preview-path="markdownPreviewPath" :is-resolving="isResolving" + :is-discussion="true" :noteable-id="noteableId" :class="{ 'gl-bg-blue-50': isDiscussionActive }" - @error="$emit('update-note-error', $event)" + @delete-note="showDeleteNoteConfirmationModal($event)" > <template v-if="isLoggedIn && discussion.resolvable" #resolve-discussion> <gl-button @@ -279,8 +342,9 @@ export default { :markdown-preview-path="markdownPreviewPath" :is-resolving="isResolving" :noteable-id="noteableId" + :is-discussion="false" :class="{ 'gl-bg-blue-50': isDiscussionActive }" - @error="$emit('update-note-error', $event)" + @delete-note="showDeleteNoteConfirmationModal($event)" /> <li v-show="isReplyPlaceholderVisible" @@ -296,33 +360,24 @@ export default { :placeholder-text="__('Reply…')" @focus="showForm" /> - <apollo-mutation + <design-reply-form v-else - #default="{ mutate, loading }" - :mutation="$options.createNoteMutation" - :variables="{ - input: mutationPayload, - }" - @done="onDone" - @error="onCreateNoteError" + :design-note-mutation="$options.createNoteMutation" + :mutation-variables="mutationVariables" + :markdown-preview-path="markdownPreviewPath" + :noteable-id="noteableId" + :discussion-id="discussion.id" + :is-discussion="false" + @note-submit-complete="onDone" + @cancel-form="hideForm" > - <design-reply-form - v-model="discussionComment" - :is-saving="loading" - :markdown-preview-path="markdownPreviewPath" - :noteable-id="noteableId" - :discussion-id="discussion.id" - @submit-form="mutate" - @cancel-form="hideForm" - > - <template v-if="discussion.resolvable" #resolve-checkbox> - <label data-testid="resolve-checkbox"> - <input v-model="shouldChangeResolvedStatus" type="checkbox" /> - {{ resolveCheckboxText }} - </label> - </template> - </design-reply-form> - </apollo-mutation> + <template v-if="discussion.resolvable" #resolve-checkbox> + <label data-testid="resolve-checkbox"> + <input v-model="shouldChangeResolvedStatus" type="checkbox" /> + {{ resolveCheckboxText }} + </label> + </template> + </design-reply-form> </template> </li> </ul> diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index af4bf7eb14d..b92a2392948 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -1,6 +1,13 @@ <script> -import { GlAvatar, GlAvatarLink, GlButton, GlLink, GlTooltipDirective } from '@gitlab/ui'; -import { ApolloMutation } from 'vue-apollo'; +import { + GlAvatar, + GlAvatarLink, + GlButton, + GlDropdown, + GlDropdownItem, + GlLink, + GlTooltipDirective, +} from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; @@ -14,13 +21,16 @@ import DesignReplyForm from './design_reply_form.vue'; export default { i18n: { editCommentLabel: __('Edit comment'), + moreActionsLabel: __('More actions'), + deleteCommentText: __('Delete comment'), }, components: { - ApolloMutation, DesignReplyForm, GlAvatar, GlAvatarLink, GlButton, + GlDropdown, + GlDropdownItem, GlLink, TimeAgoTooltip, TimelineEntryItem, @@ -39,6 +49,11 @@ export default { required: false, default: '', }, + isDiscussion: { + type: Boolean, + required: false, + default: false, + }, noteableId: { type: String, required: true, @@ -46,8 +61,8 @@ export default { }, data() { return { - noteText: this.note.body, isEditing: false, + isError: true, }; }, computed: { @@ -63,20 +78,24 @@ export default { isNoteLinked() { return extractDesignNoteId(this.$route.hash) === this.noteAnchorId; }, - mutationPayload() { + mutationVariables() { return { id: this.note.id, - body: this.noteText, }; }, isEditButtonVisible() { - return !this.isEditing && this.note.userPermissions.adminNote; + return !this.isEditing && this.adminPermissions; + }, + isMoreActionsButtonVisible() { + return !this.isEditing && this.adminPermissions; + }, + adminPermissions() { + return this.note.userPermissions.adminNote; }, }, methods: { hideForm() { this.isEditing = false; - this.noteText = this.note.body; }, onDone({ data }) { this.hideForm(); @@ -132,6 +151,30 @@ export default { size="small" @click="isEditing = true" /> + <gl-dropdown + v-if="isMoreActionsButtonVisible" + v-gl-tooltip.hover + class="gl-display-none gl-sm-display-inline-flex! gl-ml-3" + icon="ellipsis_v" + category="tertiary" + data-qa-selector="design_discussion_actions_ellipsis_dropdown" + data-testid="more-actions-dropdown" + :text="$options.i18n.moreActionsLabel" + text-sr-only + :title="$options.i18n.moreActionsLabel" + :aria-label="$options.i18n.moreActionsLabel" + no-caret + left + > + <gl-dropdown-item + variant="danger" + data-qa-selector="delete_design_note_button" + data-testid="delete-note-button" + @click="$emit('delete-note', note)" + > + {{ $options.i18n.deleteCommentText }} + </gl-dropdown-item> + </gl-dropdown> </div> </div> <template v-if="!isEditing"> @@ -143,26 +186,18 @@ export default { ></div> <slot name="resolved-status"></slot> </template> - <apollo-mutation + <design-reply-form v-else - #default="{ mutate, loading }" - :mutation="$options.updateNoteMutation" - :variables="{ - input: mutationPayload, - }" - @error="$emit('error', $event)" - @done="onDone" - > - <design-reply-form - v-model="noteText" - :is-saving="loading" - :markdown-preview-path="markdownPreviewPath" - :is-new-comment="false" - :noteable-id="noteableId" - class="gl-mt-5" - @submit-form="mutate" - @cancel-form="hideForm" - /> - </apollo-mutation> + :markdown-preview-path="markdownPreviewPath" + :design-note-mutation="$options.updateNoteMutation" + :mutation-variables="mutationVariables" + :value="note.body" + :is-new-comment="false" + :is-discussion="isDiscussion" + :noteable-id="noteableId" + class="gl-mt-5" + @note-submit-complete="onDone" + @cancel-form="hideForm" + /> </timeline-entry-item> </template> diff --git a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue index 830f16b50ee..4fd90130284 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue @@ -1,5 +1,5 @@ <script> -import { GlButton } from '@gitlab/ui'; +import { GlButton, GlAlert } from '@gitlab/ui'; import { helpPagePath } from '~/helpers/help_page_helper'; import { s__ } from '~/locale'; import Autosave from '~/autosave'; @@ -7,6 +7,12 @@ import { isLoggedIn } from '~/lib/utils/common_utils'; import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; +import { + ADD_DISCUSSION_COMMENT_ERROR, + ADD_IMAGE_DIFF_NOTE_ERROR, + UPDATE_IMAGE_DIFF_NOTE_ERROR, + UPDATE_NOTE_ERROR, +} from '../../utils/error_messages'; export default { name: 'DesignReplyForm', @@ -23,22 +29,29 @@ export default { components: { MarkdownField, GlButton, + GlAlert, }, props: { + designNoteMutation: { + type: Object, + required: true, + }, + mutationVariables: { + type: Object, + required: false, + default: null, + }, markdownPreviewPath: { type: String, required: false, default: '', }, - value: { - type: String, - required: true, - }, - isSaving: { + isNewComment: { type: Boolean, - required: true, + required: false, + default: true, }, - isNewComment: { + isDiscussion: { type: Boolean, required: false, default: true, @@ -52,16 +65,24 @@ export default { required: false, default: 'new', }, + value: { + type: String, + required: false, + default: '', + }, }, data() { return { - formText: this.value, + noteText: this.value, + saving: false, + noteUpdateDirty: false, isLoggedIn: isLoggedIn(), + errorMessage: '', }; }, computed: { hasValue() { - return this.value.trim().length > 0; + return this.noteText.length > 0; }, buttonText() { return this.isNewComment @@ -75,18 +96,69 @@ export default { mounted() { this.focusInput(); }, + beforeDestroy() { + /** + * https://gitlab.com/gitlab-org/gitlab/-/issues/388314 + * Reply form closes and component destroys + * only when comment submission was successful, + * so we're safe to clear autosave data here conditionally. + */ + this.$nextTick(() => { + if (!this.noteUpdateDirty) { + this.autosaveDiscussion.reset(); + } + }); + }, methods: { + handleInput() { + /** + * While the form is saving using ctrl+enter + * Do not mark it as dirty. + * + */ + if (!this.saving) { + this.noteUpdateDirty = true; + } + }, submitForm() { if (this.hasValue) { - this.$emit('submit-form'); - this.autosaveDiscussion.reset(); + this.saving = true; + this.$apollo + .mutate({ + mutation: this.designNoteMutation, + variables: { + input: { + ...this.mutationVariables, + body: this.noteText, + }, + }, + update: () => { + this.noteUpdateDirty = false; + }, + }) + .then((response) => { + this.$emit('note-submit-complete', response); + }) + .catch(() => { + this.errorMessage = this.getErrorMessage(); + }) + .finally(() => { + this.saving = false; + }); } }, + getErrorMessage() { + if (this.isNewComment) { + return this.isDiscussion ? ADD_IMAGE_DIFF_NOTE_ERROR : ADD_DISCUSSION_COMMENT_ERROR; + } + return this.isDiscussion ? UPDATE_IMAGE_DIFF_NOTE_ERROR : UPDATE_NOTE_ERROR; + }, cancelComment() { - if (this.hasValue && this.formText !== this.value) { + if (this.hasValue && this.noteUpdateDirty) { this.confirmCancelCommentModal(); } else { this.$emit('cancel-form'); + this.noteUpdateDirty = false; } }, async confirmCancelCommentModal() { @@ -130,24 +202,29 @@ export default { <template> <form class="new-note common-note-form" @submit.prevent> + <div v-if="errorMessage" class="gl-pb-3"> + <gl-alert variant="danger" @dismiss="errorMessage = null"> + {{ errorMessage }} + </gl-alert> + </div> <markdown-field :markdown-preview-path="markdownPreviewPath" :enable-autocomplete="true" - :textarea-value="value" + :textarea-value="noteText" :markdown-docs-path="$options.markdownDocsPath" class="bordered-box" > <template #textarea> <textarea ref="textarea" - :value="value" + v-model.trim="noteText" class="note-textarea js-gfm-input js-autosize markdown-area" dir="auto" data-supports-quick-actions="false" data-qa-selector="note_textarea" :aria-label="__('Description')" :placeholder="__('Write a comment…')" - @input="$emit('input', $event.target.value)" + @input="handleInput" @keydown.meta.enter="submitForm" @keydown.ctrl.enter="submitForm" @keyup.esc.stop="cancelComment" @@ -159,7 +236,8 @@ export default { <div class="note-form-actions gl-display-flex"> <gl-button ref="submitButton" - :disabled="!hasValue || isSaving" + :disabled="!hasValue" + :loading="saving" class="gl-mr-3 gl-w-auto!" category="primary" variant="confirm" diff --git a/app/assets/javascripts/design_management/components/design_sidebar.vue b/app/assets/javascripts/design_management/components/design_sidebar.vue index 24cc93f5eaf..c34d5cea0c2 100644 --- a/app/assets/javascripts/design_management/components/design_sidebar.vue +++ b/app/assets/javascripts/design_management/components/design_sidebar.vue @@ -57,7 +57,6 @@ export default { }, data() { return { - isResolvedDiscussionsExpanded: this.resolvedDiscussionsExpanded, discussionWithOpenForm: '', isLoggedIn: isLoggedIn(), }; @@ -87,13 +86,13 @@ export default { unresolvedDiscussions() { return this.discussions.filter((discussion) => !discussion.resolved); }, - }, - watch: { - resolvedDiscussionsExpanded(resolvedDiscussionsExpanded) { - this.isResolvedDiscussionsExpanded = resolvedDiscussionsExpanded; - }, - isResolvedDiscussionsExpanded() { - this.$emit('toggleResolvedComments'); + isResolvedDiscussionsExpanded: { + get() { + return this.resolvedDiscussionsExpanded; + }, + set(isExpanded) { + this.$emit('toggleResolvedComments', isExpanded); + }, }, }, mounted() { @@ -129,7 +128,7 @@ export default { </script> <template> - <div class="image-notes gl-pt-0" @click="handleSidebarClick"> + <div class="image-notes gl-pt-0" @click.self="handleSidebarClick"> <div class="gl-py-4 gl-mb-4 gl-display-flex gl-justify-content-space-between gl-align-items-center gl-border-b-1 gl-border-b-solid gl-border-b-gray-100" > @@ -179,8 +178,9 @@ export default { data-testid="unresolved-discussion" @create-note-error="$emit('onDesignDiscussionError', $event)" @update-note-error="$emit('updateNoteError', $event)" + @delete-note-error="$emit('deleteNoteError', $event)" @resolve-discussion-error="$emit('resolveDiscussionError', $event)" - @click.native.stop="updateActiveDiscussion(discussion.notes[0].id)" + @update-active-discussion="updateActiveDiscussion(discussion.notes[0].id)" @open-form="updateDiscussionWithOpenForm" /> <gl-accordion v-if="hasResolvedDiscussions" :header-level="3" class="gl-mb-5"> @@ -202,9 +202,10 @@ export default { :discussion-with-open-form="discussionWithOpenForm" data-testid="resolved-discussion" @error="$emit('onDesignDiscussionError', $event)" - @updateNoteError="$emit('updateNoteError', $event)" + @update-note-error="$emit('updateNoteError', $event)" + @delete-note-error="$emit('deleteNoteError', $event)" @open-form="updateDiscussionWithOpenForm" - @click.native.stop="updateActiveDiscussion(discussion.notes[0].id)" + @update-active-discussion="updateActiveDiscussion(discussion.notes[0].id)" /> </gl-accordion-item> </gl-accordion> diff --git a/app/assets/javascripts/design_management/components/toolbar/index.vue b/app/assets/javascripts/design_management/components/toolbar/index.vue index 6d571365306..cd76b6c1885 100644 --- a/app/assets/javascripts/design_management/components/toolbar/index.vue +++ b/app/assets/javascripts/design_management/components/toolbar/index.vue @@ -60,7 +60,8 @@ export default { }, image: { type: String, - required: true, + required: false, + default: '', }, isLoading: { type: Boolean, diff --git a/app/assets/javascripts/design_management/constants.js b/app/assets/javascripts/design_management/constants.js index afe621ac3c5..6720245b5f1 100644 --- a/app/assets/javascripts/design_management/constants.js +++ b/app/assets/javascripts/design_management/constants.js @@ -1,3 +1,4 @@ +import { __ } from '~/locale'; // WARNING: replace this with something // more sensical as per https://gitlab.com/gitlab-org/gitlab/issues/118611 export const VALID_DESIGN_FILE_MIMETYPE = { @@ -14,3 +15,7 @@ export const ACTIVE_DISCUSSION_SOURCE_TYPES = { export const DESIGN_DETAIL_LAYOUT_CLASSLIST = ['design-detail-layout', 'overflow-hidden', 'm-0']; export const MAXIMUM_FILE_UPLOAD_LIMIT = 10; + +export const DELETE_NOTE_ERROR_MSG = __( + 'Something went wrong when deleting a comment. Please try again.', +); diff --git a/app/assets/javascripts/design_management/graphql/mutations/destroy_note.mutation.graphql b/app/assets/javascripts/design_management/graphql/mutations/destroy_note.mutation.graphql new file mode 100644 index 00000000000..58fb05e2140 --- /dev/null +++ b/app/assets/javascripts/design_management/graphql/mutations/destroy_note.mutation.graphql @@ -0,0 +1,8 @@ +mutation destroyNote($input: DestroyNoteInput!) { + destroyNote(input: $input) { + errors + note { + id + } + } +} diff --git a/app/assets/javascripts/design_management/index.js b/app/assets/javascripts/design_management/index.js index b856ac6c627..80b146c9209 100644 --- a/app/assets/javascripts/design_management/index.js +++ b/app/assets/javascripts/design_management/index.js @@ -8,7 +8,14 @@ import createRouter from './router'; export default () => { const el = document.querySelector('.js-design-management'); - const { issueIid, projectPath, issuePath, registerPath, signInPath } = el.dataset; + const { + issueIid, + projectPath, + issuePath, + registerPath, + signInPath, + savedRepliesNewPath, + } = el.dataset; const router = createRouter(issuePath); apolloProvider.clients.defaultClient.cache.writeQuery({ @@ -32,6 +39,7 @@ export default () => { issueIid, registerPath, signInPath, + newSavedRepliesPath: savedRepliesNewPath, }, mounted() { performanceMarkAndMeasure({ diff --git a/app/assets/javascripts/design_management/mixins/all_designs.js b/app/assets/javascripts/design_management/mixins/all_designs.js index b783ec43cd1..b182e68260a 100644 --- a/app/assets/javascripts/design_management/mixins/all_designs.js +++ b/app/assets/javascripts/design_management/mixins/all_designs.js @@ -1,6 +1,6 @@ import { propertyOf } from 'lodash'; import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql'; -import { createAlert, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_WARNING } from '~/alert'; import { s__ } from '~/locale'; import { DESIGNS_ROUTE_NAME } from '../router/constants'; import allVersionsMixin from './all_versions'; diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue index f448e2f9e3d..0251ffe28f9 100644 --- a/app/assets/javascripts/design_management/pages/design/index.vue +++ b/app/assets/javascripts/design_management/pages/design/index.vue @@ -2,9 +2,8 @@ import { GlAlert } from '@gitlab/ui'; import { isNull } from 'lodash'; import Mousetrap from 'mousetrap'; -import { ApolloMutation } from 'vue-apollo'; import { keysFor, ISSUE_CLOSE_DESIGN } from '~/behaviors/shortcuts/keybindings'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { fetchPolicies } from '~/lib/graphql'; import { updateGlobalTodoCount } from '~/sidebar/utils'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -34,13 +33,11 @@ import { getPageLayoutElement, } from '../../utils/design_management_utils'; import { - ADD_DISCUSSION_COMMENT_ERROR, - ADD_IMAGE_DIFF_NOTE_ERROR, UPDATE_IMAGE_DIFF_NOTE_ERROR, DESIGN_NOT_FOUND_ERROR, DESIGN_VERSION_NOT_EXIST_ERROR, - UPDATE_NOTE_ERROR, TOGGLE_TODO_ERROR, + DELETE_NOTE_ERROR, designDeletionError, } from '../../utils/error_messages'; import { trackDesignDetailView, servicePingDesignDetailView } from '../../utils/tracking'; @@ -50,7 +47,6 @@ const DEFAULT_MAX_SCALE = 2; export default { components: { - ApolloMutation, DesignReplyForm, DesignPresentation, DesignScaler, @@ -90,7 +86,6 @@ export default { data() { return { design: {}, - comment: '', annotationCoordinates: null, errorMessage: '', scale: DEFAULT_SCALE, @@ -129,9 +124,6 @@ export default { markdownPreviewPath() { return `/${this.projectPath}/preview_markdown?target_type=Issue`; }, - isSubmitButtonDisabled() { - return this.comment.trim().length === 0; - }, designVariables() { return { fullPath: this.projectPath, @@ -140,11 +132,10 @@ export default { atVersion: this.designsVersion, }; }, - mutationPayload() { + mutationVariables() { const { x, y, width, height } = this.annotationCoordinates; return { noteableId: this.design.id, - body: this.comment, position: { headSha: this.design.diffRefs.headSha, baseSha: this.design.diffRefs.baseSha, @@ -196,13 +187,23 @@ export default { Mousetrap.unbind(keysFor(ISSUE_CLOSE_DESIGN)); }, methods: { - addImageDiffNoteToStore(store, { data: { createImageDiffNote } }) { + addImageDiffNoteToStore({ data }) { + const { createImageDiffNote } = data; + /** + * https://gitlab.com/gitlab-org/gitlab/-/issues/388314 + * + * The getClient method is not documented. In future, + * need to check for any alternative. + */ + const { cache } = this.$apollo.getClient(); + updateStoreAfterAddImageDiffNote( - store, + cache, createImageDiffNote, getDesignQuery, this.designVariables, ); + this.closeCommentForm(data); }, updateImageDiffNoteInStore(store, { data: { repositionImageDiffNote } }) { return updateStoreAfterRepositionImageDiffNote( @@ -249,7 +250,7 @@ export default { }, onQueryError(message) { // because we redirect user to /designs (the issue page), - // we want to create these flashes on the issue page + // we want to create these alerts on the issue page createAlert({ message }); this.$router.push({ name: this.$options.DESIGNS_ROUTE_NAME }); }, @@ -257,14 +258,8 @@ export default { this.errorMessage = message; if (e) throw e; }, - onCreateImageDiffNoteError(e) { - this.onError(ADD_IMAGE_DIFF_NOTE_ERROR, e); - }, - onUpdateNoteError(e) { - this.onError(UPDATE_NOTE_ERROR, e); - }, - onDesignDiscussionError(e) { - this.onError(ADD_DISCUSSION_COMMENT_ERROR, e); + onDeleteNoteError(e) { + this.onError(DELETE_NOTE_ERROR, e); }, onUpdateImageDiffNoteError(e) { this.onError(UPDATE_IMAGE_DIFF_NOTE_ERROR, e); @@ -285,7 +280,6 @@ export default { } }, closeCommentForm(data) { - this.comment = ''; this.annotationCoordinates = null; if (data?.data && !isNull(this.prevCurrentUserTodos)) { @@ -324,8 +318,8 @@ export default { const diffNoteGid = noteId ? toDiffNoteGid(noteId) : undefined; return this.updateActiveDiscussion(diffNoteGid, ACTIVE_DISCUSSION_SOURCE_TYPES.url); }, - toggleResolvedComments() { - this.resolvedDiscussionsExpanded = !this.resolvedDiscussionsExpanded; + toggleResolvedComments(newValue) { + this.resolvedDiscussionsExpanded = newValue; }, setMaxScale(event) { this.maxScale = 1 / event; @@ -394,35 +388,24 @@ export default { :resolved-discussions-expanded="resolvedDiscussionsExpanded" :markdown-preview-path="markdownPreviewPath" :is-loading="isLoading" - @onDesignDiscussionError="onDesignDiscussionError" - @onCreateImageDiffNoteError="onCreateImageDiffNoteError" - @updateNoteError="onUpdateNoteError" + @deleteNoteError="onDeleteNoteError" @resolveDiscussionError="onResolveDiscussionError" @toggleResolvedComments="toggleResolvedComments" @todoError="onTodoError" > <template #reply-form> - <apollo-mutation + <design-reply-form v-if="isAnnotating" - #default="{ mutate, loading }" - :mutation="$options.createImageDiffNoteMutation" - :variables="{ - input: mutationPayload, - }" - :update="addImageDiffNoteToStore" - @done="closeCommentForm" - @error="onCreateImageDiffNoteError" - > - <design-reply-form - ref="newDiscussionForm" - v-model="comment" - :is-saving="loading" - :markdown-preview-path="markdownPreviewPath" - :noteable-id="design.id" - @submit-form="mutate" - @cancel-form="closeCommentForm" - /> </apollo-mutation - ></template> + ref="newDiscussionForm" + :design-note-mutation="$options.createImageDiffNoteMutation" + :mutation-variables="mutationVariables" + :markdown-preview-path="markdownPreviewPath" + :noteable-id="design.id" + :is-discussion="true" + @note-submit-complete="addImageDiffNoteToStore" + @cancel-form="closeCommentForm" + /> + </template> </design-sidebar> </div> </template> diff --git a/app/assets/javascripts/design_management/utils/cache_update.js b/app/assets/javascripts/design_management/utils/cache_update.js index cfec5828c85..9ef0f336d43 100644 --- a/app/assets/javascripts/design_management/utils/cache_update.js +++ b/app/assets/javascripts/design_management/utils/cache_update.js @@ -2,7 +2,7 @@ import produce from 'immer'; import { differenceBy } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { extractCurrentDiscussion, extractDesign, extractDesigns } from './design_management_utils'; import { ADD_IMAGE_DIFF_NOTE_ERROR, diff --git a/app/assets/javascripts/design_management/utils/error_messages.js b/app/assets/javascripts/design_management/utils/error_messages.js index 42f752efc9e..1ed054abe22 100644 --- a/app/assets/javascripts/design_management/utils/error_messages.js +++ b/app/assets/javascripts/design_management/utils/error_messages.js @@ -13,7 +13,13 @@ export const UPDATE_IMAGE_DIFF_NOTE_ERROR = s__( 'DesignManagement|Could not update discussion. Please try again.', ); -export const UPDATE_NOTE_ERROR = s__('DesignManagement|Could not update note. Please try again.'); +export const UPDATE_NOTE_ERROR = s__( + 'DesignManagement|Could not update comment. Please try again.', +); + +export const DELETE_NOTE_ERROR = s__( + 'DesignManagement|Could not delete comment. Please try again.', +); export const UPLOAD_DESIGN_ERROR = s__( 'DesignManagement|Error uploading a new design. Please try again.', diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index 65816495432..e3cd43ac22f 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { merge } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import FilesCommentButton from './files_comment_button'; diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 35d1a564178..9ccba88f7e6 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -11,7 +11,7 @@ import { MR_COMMITS_NEXT_COMMIT, MR_COMMITS_PREVIOUS_COMMIT, } from '~/behaviors/shortcuts/keybindings'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { isSingleViewStyle } from '~/helpers/diffs_helper'; import { helpPagePath } from '~/helpers/help_page_helper'; import { parseBoolean } from '~/lib/utils/common_utils'; @@ -21,6 +21,7 @@ import PanelResizer from '~/vue_shared/components/panel_resizer.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import notesEventHub from '~/notes/event_hub'; +import { DynamicScroller, DynamicScrollerItem } from 'vendor/vue-virtual-scroller'; import { TREE_LIST_WIDTH_STORAGE_KEY, INITIAL_TREE_WIDTH, @@ -53,15 +54,14 @@ import HiddenFilesWarning from './hidden_files_warning.vue'; import NoChanges from './no_changes.vue'; import TreeList from './tree_list.vue'; import VirtualScrollerScrollSync from './virtual_scroller_scroll_sync'; +import PreRenderer from './pre_renderer.vue'; export default { name: 'DiffsApp', components: { - DynamicScroller: () => - import('vendor/vue-virtual-scroller').then(({ DynamicScroller }) => DynamicScroller), - DynamicScrollerItem: () => - import('vendor/vue-virtual-scroller').then(({ DynamicScrollerItem }) => DynamicScrollerItem), - PreRenderer: () => import('./pre_renderer.vue').then((PreRenderer) => PreRenderer), + DynamicScroller, + DynamicScrollerItem, + PreRenderer, VirtualScrollerScrollSync, CompareVersions, DiffFile, @@ -95,6 +95,10 @@ export default { type: String, required: true, }, + endpointDiffForPath: { + type: String, + required: true, + }, endpointCoverage: { type: String, required: false, @@ -226,6 +230,7 @@ export default { 'isVirtualScrollingEnabled', 'isBatchLoading', 'isBatchLoadingError', + 'flatBlobsList', ]), ...mapGetters(['isNotesFetched', 'getNoteableData']), diffs() { @@ -241,7 +246,7 @@ export default { return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request; }, renderDiffFiles() { - return this.diffFiles.length > 0; + return this.flatBlobsList.length > 0; }, renderFileTree() { return this.renderDiffFiles && this.showTreeList; @@ -253,7 +258,7 @@ export default { return this.startVersion === null && this.latestDiff; }, showFileByFileNavigation() { - return this.diffFiles.length > 1 && this.viewDiffsFileByFile; + return this.flatBlobsList.length > 1 && this.viewDiffsFileByFile; }, currentFileNumber() { return this.currentDiffIndex + 1; @@ -264,9 +269,9 @@ export default { return currentDiffIndex >= 1 ? currentDiffIndex : null; }, nextFileNumber() { - const { currentFileNumber, diffFiles } = this; + const { currentFileNumber, flatBlobsList } = this; - return currentFileNumber < diffFiles.length ? currentFileNumber + 1 : null; + return currentFileNumber < flatBlobsList.length ? currentFileNumber + 1 : null; }, visibleWarning() { let visible = false; @@ -321,6 +326,7 @@ export default { endpoint: this.endpoint, endpointMetadata: this.endpointMetadata, endpointBatch: this.endpointBatch, + endpointDiffForPath: this.endpointDiffForPath, endpointCoverage: this.endpointCoverage, endpointUpdateUser: this.endpointUpdateUser, projectPath: this.projectPath, @@ -385,7 +391,7 @@ export default { this.subscribeToEvents(); this.unwatchDiscussions = this.$watch( - () => `${this.diffFiles.length}:${this.$store.state.notes.discussions.length}`, + () => `${this.flatBlobsList.length}:${this.$store.state.notes.discussions.length}`, () => { this.setDiscussions(); @@ -572,8 +578,8 @@ export default { }, jumpToFile(step) { const targetIndex = this.currentDiffIndex + step; - if (targetIndex >= 0 && targetIndex < this.diffFiles.length) { - this.scrollToFile({ path: this.diffFiles[targetIndex].file_path }); + if (targetIndex >= 0 && targetIndex < this.flatBlobsList.length) { + this.scrollToFile({ path: this.flatBlobsList[targetIndex].path }); } }, setTreeDisplay() { @@ -582,7 +588,7 @@ export default { if (storedTreeShow !== null) { showTreeList = parseBoolean(storedTreeShow); - } else if (!bp.isDesktop() || (!this.isBatchLoading && this.diffFiles.length <= 1)) { + } else if (!bp.isDesktop() || (!this.isBatchLoading && this.flatBlobsList.length <= 1)) { showTreeList = false; } @@ -753,7 +759,7 @@ export default { /> <gl-sprintf :message="__('File %{current} of %{total}')"> <template #current>{{ currentFileNumber }}</template> - <template #total>{{ diffFiles.length }}</template> + <template #total>{{ flatBlobsList.length }}</template> </gl-sprintf> </div> <gl-loading-icon v-else-if="retrievingBatches" size="lg" /> diff --git a/app/assets/javascripts/diffs/components/diff_code_quality.vue b/app/assets/javascripts/diffs/components/diff_code_quality.vue index 11aa856619b..5392c631c14 100644 --- a/app/assets/javascripts/diffs/components/diff_code_quality.vue +++ b/app/assets/javascripts/diffs/components/diff_code_quality.vue @@ -28,7 +28,7 @@ export default { <template> <div data-testid="diff-codequality" - class="gl-relative codequality-findings-list gl-border-top-1 gl-border-bottom-1 gl-bg-gray-10 gl-pl-5 gl-pt-4 gl-pb-4" + class="gl-relative codequality-findings-list gl-border-top-1 gl-border-bottom-1 gl-bg-gray-10 gl-text-black-normal gl-pl-5 gl-pt-4 gl-pb-4" > <h4 data-testid="diff-codequality-findings-heading" diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue index 8fcbc4b5cce..53a55aac1ec 100644 --- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue @@ -2,7 +2,7 @@ import { GlTooltipDirective, GlIcon, GlLoadingIcon } from '@gitlab/ui'; import { mapActions } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__, sprintf } from '~/locale'; import { UNFOLD_COUNT, INLINE_DIFF_LINES_KEY } from '../constants'; import * as utils from '../store/utils'; diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 564f776edd2..c19174dda8a 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -5,7 +5,7 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { IdState } from 'vendor/vue-virtual-scroller'; import DiffContent from 'jh_else_ce/diffs/components/diff_content.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { hasDiff } from '~/helpers/diffs_helper'; import { diffViewerErrors } from '~/ide/constants'; import { scrollToElement } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue index dfca6d61270..1f5c9b4f2f5 100644 --- a/app/assets/javascripts/diffs/components/diff_row.vue +++ b/app/assets/javascripts/diffs/components/diff_row.vue @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57842 * */ import { memoize } from 'lodash'; import { isLoggedIn } from '~/lib/utils/common_utils'; +import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin'; import { PARALLEL_DIFF_VIEW_TYPE, CONFLICT_MARKER_THEIR, @@ -24,6 +25,10 @@ import * as utils from './diff_row_utils'; export default { DiffGutterAvatars, CodeQualityGutterIcon: () => import('ee_component/diffs/components/code_quality_gutter_icon.vue'), + + // Temporary mixin for migration from Vue.js 2 to @vue/compat + mixins: [compatFunctionalMixin], + props: { fileHash: { type: String, diff --git a/app/assets/javascripts/diffs/components/file_row_stats.vue b/app/assets/javascripts/diffs/components/file_row_stats.vue index 784f74e498f..f99f363a6be 100644 --- a/app/assets/javascripts/diffs/components/file_row_stats.vue +++ b/app/assets/javascripts/diffs/components/file_row_stats.vue @@ -10,7 +10,7 @@ export default { </script> <template> - <span v-once class="file-row-stats"> + <span class="file-row-stats"> <span class="cgreen"> +{{ file.addedLines }} </span> <span class="cred"> -{{ file.removedLines }} </span> </span> diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 8bb1872567c..ab08c72b08f 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -2,9 +2,10 @@ import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; import micromatch from 'micromatch'; +import { debounce } from 'lodash'; import { getModifierKey } from '~/constants'; import { s__, sprintf } from '~/locale'; -import FileTree from '~/vue_shared/components/file_tree.vue'; +import { RecycleScroller } from 'vendor/vue-virtual-scroller'; import DiffFileRow from './diff_file_row.vue'; const MODIFIER_KEY = getModifierKey(); @@ -15,7 +16,8 @@ export default { }, components: { GlIcon, - FileTree, + DiffFileRow, + RecycleScroller, }, props: { hideFileStats: { @@ -26,6 +28,10 @@ export default { data() { return { search: '', + scrollerHeight: 0, + resizeObserver: null, + rowHeight: 0, + debouncedHeightCalc: null, }; }, computed: { @@ -61,12 +67,51 @@ export default { return acc; }, []); }, + // Flatten the treeList so there's no nested trees + // This gives us fixed row height for virtual scrolling + // in: [{ path: 'a', tree: [{ path: 'b' }] }, { path: 'c' }] + // out: [{ path: 'a', tree: [{ path: 'b' }] }, { path: 'b' }, { path: 'c' }] + flatFilteredTreeList() { + const result = []; + const createFlatten = (level) => (item) => { + result.push({ + ...item, + level: item.isHeader ? 0 : level, + key: item.key || item.path, + }); + if (item.opened || item.isHeader) { + item.tree.forEach(createFlatten(level + 1)); + } + }; + + this.filteredTreeList.forEach(createFlatten(0)); + + return result; + }, + }, + created() { + this.debouncedHeightCalc = debounce(this.calculateScrollerHeight, 50); + }, + mounted() { + const heightProp = getComputedStyle(this.$refs.wrapper).getPropertyValue('--file-row-height'); + this.rowHeight = parseInt(heightProp, 10); + this.calculateScrollerHeight(); + this.resizeObserver = new ResizeObserver(() => { + this.debouncedHeightCalc(); + }); + this.resizeObserver.observe(this.$refs.scrollRoot); + }, + beforeDestroy() { + this.resizeObserver.disconnect(); }, methods: { ...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile']), clearSearch() { this.search = ''; }, + calculateScrollerHeight() { + this.scrollerHeight = this.$refs.scrollRoot.clientHeight; + }, }, searchPlaceholder: sprintf(s__('MergeRequest|Search (e.g. *.vue) (%{MODIFIER_KEY}P)'), { MODIFIER_KEY, @@ -76,8 +121,12 @@ export default { </script> <template> - <div class="tree-list-holder d-flex flex-column" data-qa-selector="file_tree_container"> - <div class="gl-mb-3 position-relative tree-list-search d-flex"> + <div + ref="wrapper" + class="tree-list-holder d-flex flex-column" + data-qa-selector="file_tree_container" + > + <div class="gl-pb-3 position-relative tree-list-search d-flex"> <div class="flex-fill d-flex"> <gl-icon name="search" class="position-absolute tree-list-icon" /> <label for="diff-tree-search" class="sr-only">{{ $options.searchPlaceholder }}</label> @@ -89,6 +138,7 @@ export default { name="diff-tree-search" class="form-control" data-testid="diff-tree-search" + data-qa-selector="diff_tree_search" /> <button v-show="search" @@ -101,24 +151,37 @@ export default { </button> </div> </div> - <div :class="{ 'pt-0 tree-list-blobs': !renderTreeList || search }" class="tree-list-scroll"> - <template v-if="filteredTreeList.length"> - <file-tree - v-for="file in filteredTreeList" - :key="file.key" - :file="file" - :level="0" - :viewed-files="viewedDiffFileIds" - :hide-file-stats="hideFileStats" - :file-row-component="$options.DiffFileRow" - :current-diff-file-id="currentDiffFileId" - :style="{ '--level': 0 }" - :class="{ 'tree-list-parent': file.tree.length }" - class="gl-relative" - @toggleTreeOpen="toggleTreeOpen" - @clickFile="(path) => scrollToFile({ path })" - /> - </template> + <div + ref="scrollRoot" + :class="{ 'tree-list-blobs': !renderTreeList || search }" + class="gl-flex-grow-1" + > + <recycle-scroller + v-if="flatFilteredTreeList.length" + :style="{ height: `${scrollerHeight}px` }" + :items="flatFilteredTreeList" + :item-size="rowHeight" + :buffer="100" + key-field="key" + > + <template #default="{ item }"> + <diff-file-row + :file="item" + :level="item.level" + :viewed-files="viewedDiffFileIds" + :hide-file-stats="hideFileStats" + :current-diff-file-id="currentDiffFileId" + :style="{ '--level': item.level }" + :class="{ 'tree-list-parent': item.tree.length }" + class="gl-relative" + @toggleTreeOpen="toggleTreeOpen" + @clickFile="(path) => scrollToFile({ path })" + /> + </template> + <template #after> + <div class="tree-list-gutter"></div> + </template> + </recycle-scroller> <p v-else class="prepend-top-20 append-bottom-20 text-center"> {{ s__('MergeRequest|No files found') }} </p> diff --git a/app/assets/javascripts/diffs/constants.js b/app/assets/javascripts/diffs/constants.js index 6c0c9c4e1d0..873c4819669 100644 --- a/app/assets/javascripts/diffs/constants.js +++ b/app/assets/javascripts/diffs/constants.js @@ -6,10 +6,8 @@ export const OLD_NO_NEW_LINE_TYPE = 'old-nonewline'; export const NEW_NO_NEW_LINE_TYPE = 'new-nonewline'; export const CONTEXT_LINE_TYPE = 'context'; export const EMPTY_CELL_TYPE = 'empty-cell'; -export const COMMENT_FORM_TYPE = 'commentForm'; export const DIFF_NOTE_TYPE = 'DiffNote'; export const LEGACY_DIFF_NOTE_TYPE = 'LegacyDiffNote'; -export const NOTE_TYPE = 'Note'; export const NEW_LINE_TYPE = 'new'; export const OLD_LINE_TYPE = 'old'; export const TEXT_DIFF_POSITION_TYPE = 'text'; @@ -17,14 +15,10 @@ export const IMAGE_DIFF_POSITION_TYPE = 'image'; export const LINE_POSITION_LEFT = 'left'; export const LINE_POSITION_RIGHT = 'right'; -export const LINE_SIDE_LEFT = 'left-side'; -export const LINE_SIDE_RIGHT = 'right-side'; export const DIFF_VIEW_COOKIE_NAME = 'diff_view'; export const DIFF_WHITESPACE_COOKIE_NAME = 'diff_whitespace'; export const LINE_HOVER_CLASS_NAME = 'is-over'; -export const LINE_UNFOLD_CLASS_NAME = 'unfold js-unfold'; -export const CONTEXT_LINE_CLASS_NAME = 'diff-expanded'; export const UNFOLD_COUNT = 20; export const COUNT_OF_AVATARS_IN_GUTTER = 3; @@ -46,14 +40,12 @@ export const TREE_HIDE_STATS_WIDTH = 260; export const OLD_LINE_KEY = 'old_line'; export const NEW_LINE_KEY = 'new_line'; export const TYPE_KEY = 'type'; -export const LEFT_LINE_KEY = 'left'; export const MAX_RENDERING_DIFF_LINES = 500; export const MAX_RENDERING_BULK_ROWS = 30; export const MIN_RENDERING_MS = 2; export const START_RENDERING_INDEX = 200; export const INLINE_DIFF_LINES_KEY = 'highlighted_diff_lines'; -export const PARALLEL_DIFF_LINES_KEY = 'parallel_diff_lines'; export const DIFF_COMPARE_BASE_VERSION_INDEX = -1; export const DIFF_COMPARE_HEAD_VERSION_INDEX = -2; diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js index 7da5ef54b80..00a08434dac 100644 --- a/app/assets/javascripts/diffs/index.js +++ b/app/assets/javascripts/diffs/index.js @@ -1,5 +1,7 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; import { mapActions, mapState, mapGetters } from 'vuex'; +import { apolloProvider } from '~/graphql_shared/issuable_client'; import { getCookie, parseBoolean, removeCookie } from '~/lib/utils/common_utils'; import notesStore from '~/mr_notes/stores'; @@ -11,20 +13,28 @@ import { getReviewsForMergeRequest } from './utils/file_reviews'; import { getDerivedMergeRequestInformation } from './utils/merge_request'; export default function initDiffsApp(store = notesStore) { + const el = document.getElementById('js-diffs-app'); + const { dataset } = el; + + Vue.use(VueApollo); + const vm = new Vue({ - el: '#js-diffs-app', + el, name: 'MergeRequestDiffs', components: { DiffsApp, }, store, + apolloProvider, + provide: { + newSavedRepliesPath: dataset.savedRepliesNewPath, + }, data() { - const { dataset } = document.querySelector(this.$options.el); - return { endpoint: dataset.endpoint, endpointMetadata: dataset.endpointMetadata || '', endpointBatch: dataset.endpointBatch || '', + endpointDiffForPath: dataset.endpointDiffForPath || '', endpointCoverage: dataset.endpointCoverage || '', endpointCodequality: dataset.endpointCodequality || '', endpointUpdateUser: dataset.updateCurrentUserPath, @@ -86,6 +96,7 @@ export default function initDiffsApp(store = notesStore) { endpoint: this.endpoint, endpointMetadata: this.endpointMetadata, endpointBatch: this.endpointBatch, + endpointDiffForPath: this.endpointDiffForPath, endpointCoverage: this.endpointCoverage, endpointCodequality: this.endpointCodequality, endpointUpdateUser: this.endpointUpdateUser, diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 9f90de9abde..9236e14beb1 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -5,7 +5,7 @@ import { historyPushState, scrollToElement, } from '~/lib/utils/common_utils'; -import { createAlert, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_WARNING } from '~/alert'; import { diffViewerModes } from '~/ide/constants'; import axios from '~/lib/utils/axios_utils'; @@ -14,6 +14,8 @@ import Poll from '~/lib/utils/poll'; import { mergeUrlParams, getLocationHash } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; import notesEventHub from '~/notes/event_hub'; +import { generateTreeList } from '~/diffs/utils/tree_worker_utils'; +import { sortTree } from '~/ide/stores/utils'; import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE, @@ -52,7 +54,6 @@ import { isCollapsed } from '../utils/diff_file'; import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews'; import { getDerivedMergeRequestInformation } from '../utils/merge_request'; import { queueRedisHllEvents } from '../utils/queue_events'; -import TreeWorker from '../workers/tree_worker?worker'; import * as types from './mutation_types'; import { getDiffPositionByLineCode, @@ -68,6 +69,7 @@ export const setBaseConfig = ({ commit }, options) => { endpoint, endpointMetadata, endpointBatch, + endpointDiffForPath, endpointCoverage, endpointUpdateUser, projectPath, @@ -81,6 +83,7 @@ export const setBaseConfig = ({ commit }, options) => { endpoint, endpointMetadata, endpointBatch, + endpointDiffForPath, endpointCoverage, endpointUpdateUser, projectPath, @@ -199,21 +202,12 @@ export const fetchDiffFilesBatch = ({ commit, state, dispatch }) => { }; export const fetchDiffFilesMeta = ({ commit, state }) => { - const worker = new TreeWorker(); const urlParams = { view: 'inline', w: state.showWhitespace ? '0' : '1', }; commit(types.SET_LOADING, true); - eventHub.$emit(EVT_PERF_MARK_FILE_TREE_START); - - worker.addEventListener('message', ({ data }) => { - commit(types.SET_TREE_DATA, data); - eventHub.$emit(EVT_PERF_MARK_FILE_TREE_END); - - worker.terminate(); - }); return axios .get(mergeUrlParams(urlParams, state.endpointMetadata)) @@ -225,18 +219,24 @@ export const fetchDiffFilesMeta = ({ commit, state }) => { commit(types.SET_MERGE_REQUEST_DIFFS, data.merge_request_diffs || []); commit(types.SET_DIFF_METADATA, strippedData); - worker.postMessage(data.diff_files); + eventHub.$emit(EVT_PERF_MARK_FILE_TREE_START); + const { treeEntries, tree } = generateTreeList(data.diff_files); + eventHub.$emit(EVT_PERF_MARK_FILE_TREE_END); + commit(types.SET_TREE_DATA, { + treeEntries, + tree: sortTree(tree), + }); return data; }) .catch((error) => { - worker.terminate(); - if (error.response.status === HTTP_STATUS_NOT_FOUND) { createAlert({ message: __('Building your merge request. Wait a few moments, then refresh this page.'), variant: VARIANT_WARNING, }); + } else { + throw error; } }); }; @@ -821,20 +821,20 @@ export function moveToNeighboringCommit({ dispatch, state }, { direction }) { } } -export const setCurrentDiffFileIdFromNote = ({ commit, state, rootGetters }, noteId) => { +export const setCurrentDiffFileIdFromNote = ({ commit, getters, rootGetters }, noteId) => { const note = rootGetters.notesById[noteId]; if (!note) return; const fileHash = rootGetters.getDiscussion(note.discussion_id).diff_file?.file_hash; - if (fileHash && state.diffFiles.some((f) => f.file_hash === fileHash)) { + if (fileHash && getters.flatBlobsList.some((f) => f.fileHash === fileHash)) { commit(types.SET_CURRENT_DIFF_FILE, fileHash); } }; -export const navigateToDiffFileIndex = ({ commit, state }, index) => { - const fileHash = state.diffFiles[index].file_hash; +export const navigateToDiffFileIndex = ({ commit, getters }, index) => { + const { fileHash } = getters.flatBlobsList[index]; document.location.hash = fileHash; commit(types.SET_CURRENT_DIFF_FILE, fileHash); diff --git a/app/assets/javascripts/diffs/store/getters.js b/app/assets/javascripts/diffs/store/getters.js index 3a85c1a9fe1..10a6a872fe4 100644 --- a/app/assets/javascripts/diffs/store/getters.js +++ b/app/assets/javascripts/diffs/store/getters.js @@ -90,6 +90,12 @@ export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) = export const getDiffFileByHash = (state) => (fileHash) => state.diffFiles.find((file) => file.file_hash === fileHash); +export function isTreePathLoaded(state) { + return (path) => { + return Boolean(state.treeEntries[path]?.diffLoaded); + }; +} + export const flatBlobsList = (state) => Object.values(state.treeEntries).filter((f) => f.type === 'blob'); @@ -148,7 +154,7 @@ export const fileLineCodequality = () => () => { export const currentDiffIndex = (state) => Math.max( 0, - state.diffFiles.findIndex((diff) => diff.file_hash === state.currentDiffFileId), + flatBlobsList(state).findIndex((diff) => diff.fileHash === state.currentDiffFileId), ); export const diffLines = (state) => (file) => { diff --git a/app/assets/javascripts/diffs/store/modules/diff_state.js b/app/assets/javascripts/diffs/store/modules/diff_state.js index 329db1fe2cf..593c28f20ec 100644 --- a/app/assets/javascripts/diffs/store/modules/diff_state.js +++ b/app/assets/javascripts/diffs/store/modules/diff_state.js @@ -16,6 +16,7 @@ export default () => ({ removedLines: null, endpoint: '', endpointUpdateUser: '', + endpointDiffForPath: '', basePath: '', commit: null, startVersion: null, // Null unless a target diff is selected for comparison that is not the "base" diff diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index d2b798245fc..5e7fe8b5cd8 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -15,6 +15,7 @@ import { prepareDiffData, isDiscussionApplicableToLine, updateLineInFile, + markTreeEntriesLoaded, } from './utils'; function updateDiffFilesInState(state, files) { @@ -33,6 +34,7 @@ export default { endpoint, endpointMetadata, endpointBatch, + endpointDiffForPath, endpointCoverage, endpointUpdateUser, projectPath, @@ -46,6 +48,7 @@ export default { endpoint, endpointMetadata, endpointBatch, + endpointDiffForPath, endpointCoverage, endpointUpdateUser, projectPath, @@ -80,9 +83,15 @@ export default { }, [types.SET_DIFF_DATA_BATCH](state, data) { - state.diffFiles = prepareDiffData({ - diff: data, - priorFiles: state.diffFiles, + Object.assign(state, { + diffFiles: prepareDiffData({ + diff: data, + priorFiles: state.diffFiles, + }), + treeEntries: markTreeEntriesLoaded({ + priorEntries: state.treeEntries, + loadedFiles: data.diff_files, + }), }); }, diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 0519ca3d715..3739ef0cd55 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -19,6 +19,8 @@ import { } from '../constants'; import { prepareRawDiffFile } from '../utils/diff_file'; +const SHA1 = /\b([a-f0-9]{40})\b/; + export const isAdded = (line) => ['new', 'new-nonewline'].includes(line.type); export const isRemoved = (line) => ['old', 'old-nonewline'].includes(line.type); export const isUnchanged = (line) => !line.type; @@ -556,3 +558,44 @@ export const allDiscussionWrappersExpanded = (diff) => { return discussionsExpanded; }; + +export function isUrlHashNoteLink(urlHash) { + const id = urlHash.replace(/^#/, ''); + + return id.startsWith('note'); +} + +export function isUrlHashFileHeader(urlHash) { + const id = urlHash.replace(/^#/, ''); + + return id.startsWith('diff-content'); +} + +export function parseUrlHashAsFileHash(urlHash, currentDiffFileId = '') { + const isNoteLink = isUrlHashNoteLink(urlHash); + let id = urlHash.replace(/^#/, ''); + + if (isNoteLink && currentDiffFileId) { + id = currentDiffFileId; + } else if (isUrlHashFileHeader(urlHash)) { + id = id.replace('diff-content-', ''); + } else if (!SHA1.test(id) || isNoteLink) { + id = null; + } + + return id; +} + +export function markTreeEntriesLoaded({ priorEntries, loadedFiles }) { + const newEntries = { ...priorEntries }; + + loadedFiles.forEach((newFile) => { + const entry = newEntries[newFile.new_path]; + + if (entry) { + entry.diffLoaded = true; + } + }); + + return newEntries; +} diff --git a/app/assets/javascripts/diffs/utils/tree_worker_utils.js b/app/assets/javascripts/diffs/utils/tree_worker_utils.js index a90c1a5c64e..8689809cfa9 100644 --- a/app/assets/javascripts/diffs/utils/tree_worker_utils.js +++ b/app/assets/javascripts/diffs/utils/tree_worker_utils.js @@ -85,6 +85,11 @@ export const generateTreeList = (files) => { if (type === 'blob') { Object.assign(entry, { changed: true, + diffLoaded: false, + filePaths: { + old: file.old_path, + new: file.new_path, + }, tempFile: file.new_file, deleted: file.deleted_file, fileHash: file.file_hash, diff --git a/app/assets/javascripts/diffs/workers/tree_worker.js b/app/assets/javascripts/diffs/workers/tree_worker.js deleted file mode 100644 index 04010a99b52..00000000000 --- a/app/assets/javascripts/diffs/workers/tree_worker.js +++ /dev/null @@ -1,19 +0,0 @@ -import { sortTree } from '~/ide/stores/utils'; -import { generateTreeList } from '../utils/tree_worker_utils'; - -// eslint-disable-next-line no-restricted-globals -self.addEventListener('message', (e) => { - const { data } = e; - - if (data === undefined) { - return; - } - - const { treeEntries, tree } = generateTreeList(data); - - // eslint-disable-next-line no-restricted-globals - self.postMessage({ - treeEntries, - tree: sortTree(tree), - }); -}); diff --git a/app/assets/javascripts/drawio/constants.js b/app/assets/javascripts/drawio/constants.js new file mode 100644 index 00000000000..2e1e074db3b --- /dev/null +++ b/app/assets/javascripts/drawio/constants.js @@ -0,0 +1,15 @@ +/* + * TODO: Make this URL configurable + */ +export const DRAWIO_EDITOR_URL = + 'https://embed.diagrams.net/?ui=sketch&noSaveBtn=1&saveAndExit=1&keepmodified=1&spin=1&embed=1&libraries=1&configure=1&proto=json&toSvg=1'; // TODO Make it configurable + +export const DRAWIO_FRAME_ID = 'drawio-frame'; + +export const DARK_BACKGROUND_COLOR = '#202020'; + +export const DIAGRAM_BACKGROUND_COLOR = '#ffffff'; + +export const DRAWIO_IFRAME_TIMEOUT = 4000; + +export const DIAGRAM_MAX_SIZE = 10 * 1024 * 1024; // 1MB diff --git a/app/assets/javascripts/drawio/content_editor_facade.js b/app/assets/javascripts/drawio/content_editor_facade.js new file mode 100644 index 00000000000..1c41194c1f5 --- /dev/null +++ b/app/assets/javascripts/drawio/content_editor_facade.js @@ -0,0 +1,80 @@ +import axios from '~/lib/utils/axios_utils'; + +/** + * A set of functions to decouple the content_editor component from + * the draw.io editor. + * It allows the draw.io editor to obtain a selected drawio_diagram + * and replace it or insert a new drawio_diagram node without coupling + * the drawio_editor to the Content Editor implementation details + * * + * @param {Object} params Factory function parameters + * @param {Object} params.tiptapEditor See https://tiptap.dev/api/editor + * @param {String} params.drawioNodeName Name of the drawio_diagram node in + * the ProseMirror document + * @param {String} params.uploadsPath API endpoint to upload files + * @param {Object} params.assetResolver See + * app/assets/javascripts/content_editor/services/asset_resolver.js + * + * @returns A content_editor_facade object with operations + * to get a selected diagram, upload a diagram, insert a new one in the + * Content Editor, and update an existing’s diagram URL. + */ +export const create = ({ tiptapEditor, drawioNodeName, uploadsPath, assetResolver }) => ({ + getDiagram: async () => { + const { node } = tiptapEditor.state.selection; + + if (!node || node.type.name !== drawioNodeName) { + return null; + } + + const { src } = node.attrs; + const response = await axios.get(src, { responseType: 'text' }); + const diagramSvg = response.data; + const contentType = response.headers['content-type']; + const filename = src.split('/').pop(); + + return { + diagramURL: src, + filename, + diagramSvg, + contentType, + }; + }, + updateDiagram: async ({ uploadResults: { file_path: canonicalSrc } }) => { + const src = await assetResolver.resolveUrl(canonicalSrc); + + tiptapEditor + .chain() + .focus() + .updateAttributes(drawioNodeName, { + src, + canonicalSrc, + }) + .run(); + }, + insertDiagram: async ({ uploadResults: { file_path: canonicalSrc } }) => { + const src = await assetResolver.resolveUrl(canonicalSrc); + + tiptapEditor + .chain() + .focus() + .insertContent({ + type: drawioNodeName, + attrs: { + src, + canonicalSrc, + }, + }) + .run(); + }, + uploadDiagram: async ({ filename, diagramSvg }) => { + const blob = new Blob([diagramSvg], { type: 'image/svg+xml' }); + const formData = new FormData(); + + formData.append('file', blob, filename); + + const response = await axios.post(uploadsPath, formData); + + return response.data; + }, +}); diff --git a/app/assets/javascripts/drawio/drawio_editor.js b/app/assets/javascripts/drawio/drawio_editor.js new file mode 100644 index 00000000000..38d1cadcc63 --- /dev/null +++ b/app/assets/javascripts/drawio/drawio_editor.js @@ -0,0 +1,277 @@ +import _ from 'lodash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; +import { darkModeEnabled } from '~/lib/utils/color_utils'; +import { __ } from '~/locale'; +import { setAttributes } from '~/lib/utils/dom_utils'; +import { + DARK_BACKGROUND_COLOR, + DRAWIO_EDITOR_URL, + DRAWIO_FRAME_ID, + DIAGRAM_BACKGROUND_COLOR, + DRAWIO_IFRAME_TIMEOUT, + DIAGRAM_MAX_SIZE, +} from './constants'; + +function updateDrawioEditorState(drawIOEditorState, data) { + Object.assign(drawIOEditorState, data); +} + +function postMessageToDrawioEditor(drawIOEditorState, message) { + const { origin } = new URL(DRAWIO_EDITOR_URL); + + drawIOEditorState.iframe.contentWindow.postMessage(JSON.stringify(message), origin); +} + +function disposeDrawioEditor(drawIOEditorState) { + drawIOEditorState.disposeEventListener(); + drawIOEditorState.iframe.remove(); +} + +function getSvg(data) { + const svgPath = atob(data.substring(data.indexOf(',') + 1)); + + return `<?xml version="1.0" encoding="UTF-8"?>\n\ + <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n\ + ${svgPath}`; +} + +async function saveDiagram(drawIOEditorState, editorFacade) { + const { newDiagram, diagramMarkdown, filename, diagramSvg } = drawIOEditorState; + const filenameWithExt = filename.endsWith('.drawio.svg') ? filename : `${filename}.drawio.svg`; + + postMessageToDrawioEditor(drawIOEditorState, { + action: 'spinner', + show: true, + messageKey: 'saving', + }); + + try { + const uploadResults = await editorFacade.uploadDiagram({ + filename: filenameWithExt, + diagramSvg, + }); + + if (newDiagram) { + editorFacade.insertDiagram({ uploadResults }); + } else { + editorFacade.updateDiagram({ diagramMarkdown, uploadResults }); + } + + createAlert({ + message: __('Diagram saved successfully.'), + variant: VARIANT_SUCCESS, + fadeTransition: true, + }); + setTimeout(() => disposeDrawioEditor(drawIOEditorState), 10); + } catch { + postMessageToDrawioEditor(drawIOEditorState, { action: 'spinner', show: false }); + postMessageToDrawioEditor(drawIOEditorState, { + action: 'dialog', + titleKey: 'error', + modified: true, + buttonKey: 'close', + messageKey: 'errorSavingFile', + }); + } +} + +function promptName(drawIOEditorState, name, errKey) { + postMessageToDrawioEditor(drawIOEditorState, { + action: 'prompt', + titleKey: 'filename', + okKey: 'save', + defaultValue: name || '', + }); + + if (errKey !== null) { + postMessageToDrawioEditor(drawIOEditorState, { + action: 'dialog', + titleKey: 'error', + messageKey: errKey, + buttonKey: 'ok', + }); + } +} + +function sendLoadDiagramMessage(drawIOEditorState) { + postMessageToDrawioEditor(drawIOEditorState, { + action: 'load', + xml: drawIOEditorState.diagramSvg, + border: 8, + background: DIAGRAM_BACKGROUND_COLOR, + dark: drawIOEditorState.dark, + title: drawIOEditorState.filename, + }); +} + +async function loadExistingDiagram(drawIOEditorState, editorFacade) { + let diagram = null; + + try { + diagram = await editorFacade.getDiagram(); + } catch (e) { + throw new Error(__('Cannot load the diagram into the diagrams.net editor')); + } + + if (diagram) { + const { diagramMarkdown, filename, diagramSvg, contentType, diagramURL } = diagram; + const resolvedURL = new URL(diagramURL, window.location.origin); + const diagramSvgSize = new Blob([diagramSvg]).size; + + if (contentType !== 'image/svg+xml') { + throw new Error(__('The selected image is not a valid SVG diagram')); + } + + if (resolvedURL.origin !== window.location.origin) { + throw new Error(__('The selected image is not an asset uploaded in the application')); + } + + if (diagramSvgSize > DIAGRAM_MAX_SIZE) { + throw new Error(__('The selected image is too large.')); + } + + updateDrawioEditorState(drawIOEditorState, { + newDiagram: false, + filename, + diagramMarkdown, + diagramSvg, + }); + } else { + updateDrawioEditorState(drawIOEditorState, { + newDiagram: true, + }); + } + + sendLoadDiagramMessage(drawIOEditorState); +} + +async function prepareEditor(drawIOEditorState, editorFacade) { + const { iframe } = drawIOEditorState; + + iframe.style.cursor = 'wait'; + + try { + await loadExistingDiagram(drawIOEditorState, editorFacade); + + iframe.style.visibility = 'visible'; + iframe.style.cursor = ''; + window.scrollTo(0, 0); + } catch (e) { + createAlert({ + message: e.message, + error: e, + }); + disposeDrawioEditor(drawIOEditorState); + } +} + +function configureDrawIOEditor(drawIOEditorState) { + postMessageToDrawioEditor(drawIOEditorState, { + action: 'configure', + config: { + darkColor: DARK_BACKGROUND_COLOR, + settingsName: 'gitlab', + }, + colorSchemeMeta: drawIOEditorState.dark, // For transparent iframe background in dark mode + }); + updateDrawioEditorState(drawIOEditorState, { + initialized: true, + }); +} + +function onDrawIOEditorMessage(drawIOEditorState, editorFacade, evt) { + if (_.isNil(evt) || evt.source !== drawIOEditorState.iframe.contentWindow) { + return; + } + + const msg = JSON.parse(evt.data); + + if (msg.event === 'configure') { + configureDrawIOEditor(drawIOEditorState); + } else if (msg.event === 'init') { + prepareEditor(drawIOEditorState, editorFacade); + } else if (msg.event === 'exit') { + disposeDrawioEditor(drawIOEditorState); + } else if (msg.event === 'prompt') { + updateDrawioEditorState(drawIOEditorState, { + filename: msg.value, + }); + + if (!drawIOEditorState.filename) { + promptName(drawIOEditorState, 'diagram.drawio.svg', 'filenameShort'); + } else { + saveDiagram(drawIOEditorState, editorFacade); + } + } else if (msg.event === 'export') { + updateDrawioEditorState(drawIOEditorState, { + diagramSvg: getSvg(msg.data), + }); + // TODO Add this to draw.io editor configuration + sendLoadDiagramMessage(drawIOEditorState); // Save removes diagram from the editor, so we need to reload it. + postMessageToDrawioEditor(drawIOEditorState, { action: 'status', modified: true }); // And set editor modified flag to true. + if (!drawIOEditorState.filename) { + promptName(drawIOEditorState, 'diagram.drawio.svg', null); + } else { + saveDiagram(drawIOEditorState, editorFacade); + } + } +} + +function createEditorIFrame(drawIOEditorState) { + const iframe = document.createElement('iframe'); + + setAttributes(iframe, { + id: DRAWIO_FRAME_ID, + src: DRAWIO_EDITOR_URL, + class: 'drawio-editor', + }); + + document.body.appendChild(iframe); + + setTimeout(() => { + if (drawIOEditorState.initialized === false) { + disposeDrawioEditor(drawIOEditorState); + createAlert({ message: __('The diagrams.net editor could not be loaded.') }); + } + }, DRAWIO_IFRAME_TIMEOUT); + + updateDrawioEditorState(drawIOEditorState, { + iframe, + }); +} + +function attachDrawioIFrameMessageListener(drawIOEditorState, editorFacade) { + const evtHandler = (evt) => { + onDrawIOEditorMessage(drawIOEditorState, editorFacade, evt); + }; + + window.addEventListener('message', evtHandler); + + // Stores a function in the editor state object that allows disposing + // the message event listener when the editor exits. + updateDrawioEditorState(drawIOEditorState, { + disposeEventListener: () => { + window.removeEventListener('message', evtHandler); + }, + }); +} + +const createDrawioEditorState = ({ filename = null }) => ({ + newDiagram: true, + filename, + diagramSvg: null, + diagramMarkdown: null, + iframe: null, + isBusy: false, + initialized: false, + dark: darkModeEnabled(), + disposeEventListener: null, +}); + +export function launchDrawioEditor({ editorFacade, filename }) { + const drawIOEditorState = createDrawioEditorState({ filename }); + + // The execution order of these two functions matter + attachDrawioIFrameMessageListener(drawIOEditorState, editorFacade); + createEditorIFrame(drawIOEditorState); +} diff --git a/app/assets/javascripts/drawio/markdown_field_editor_facade.js b/app/assets/javascripts/drawio/markdown_field_editor_facade.js new file mode 100644 index 00000000000..4ef203c7aa0 --- /dev/null +++ b/app/assets/javascripts/drawio/markdown_field_editor_facade.js @@ -0,0 +1,72 @@ +import { insertMarkdownText, resolveSelectedImage } from '~/lib/utils/text_markdown'; +import axios from '~/lib/utils/axios_utils'; + +/** + * A set of functions to decouple the markdown_field component from + * the draw.io editor. + * It allows the draw.io editor to obtain a selected drawio_diagram + * and replace it or insert a new drawio_diagram node without coupling + * the drawio_editor to the Markdown Field implementation details + * + * @param {Object} params Factory function parameters + * @param {Object} params.textArea Textarea used to edit and display markdown source + * @param {String} params.markdownPreviewPath API endpoint to render Markdown + * @param {String} params.uploadsPath API endpoint to upload files + * + * @returns A markdown_field_facade object with operations + * with operations to get a selected diagram, upload a diagram, + * insert a new one in the Markdown Field, and update + * an existing’s diagram URL. + */ +export const create = ({ textArea, markdownPreviewPath, uploadsPath }) => ({ + getDiagram: async () => { + const image = await resolveSelectedImage(textArea, markdownPreviewPath); + + if (!image) { + return null; + } + + const { imageURL, imageMarkdown, filename } = image; + const response = await axios.get(imageURL, { responseType: 'text' }); + const diagramSvg = response.data; + const contentType = response.headers['content-type']; + + return { + diagramURL: imageURL, + diagramMarkdown: imageMarkdown, + filename, + diagramSvg, + contentType, + }; + }, + updateDiagram: ({ uploadResults, diagramMarkdown }) => { + textArea.focus(); + + // eslint-disable-next-line no-param-reassign + textArea.value = textArea.value.replace(diagramMarkdown, uploadResults.link.markdown); + textArea.dispatchEvent(new Event('input')); + }, + insertDiagram: ({ uploadResults }) => { + textArea.focus(); + const markdown = textArea.value; + const selectedMD = markdown.substring(textArea.selectionStart, textArea.selectionEnd); + + // This method dispatches the input event. + insertMarkdownText({ + textArea, + text: markdown, + tag: uploadResults.link.markdown, + selected: selectedMD, + }); + }, + uploadDiagram: async ({ filename, diagramSvg }) => { + const blob = new Blob([diagramSvg], { type: 'image/svg+xml' }); + const formData = new FormData(); + + formData.append('file', blob, filename); + + const response = await axios.post(uploadsPath, formData); + + return response.data; + }, +}); diff --git a/app/assets/javascripts/editor/components/source_editor_toolbar.vue b/app/assets/javascripts/editor/components/source_editor_toolbar.vue index c72145f9d2f..67b909d37c3 100644 --- a/app/assets/javascripts/editor/components/source_editor_toolbar.vue +++ b/app/assets/javascripts/editor/components/source_editor_toolbar.vue @@ -2,7 +2,7 @@ import { isEmpty } from 'lodash'; import { GlButtonGroup } from '@gitlab/ui'; import getToolbarItemsQuery from '~/editor/graphql/get_items.query.graphql'; -import { EDITOR_TOOLBAR_LEFT_GROUP, EDITOR_TOOLBAR_RIGHT_GROUP } from '~/editor/constants'; +import { EDITOR_TOOLBAR_BUTTON_GROUPS } from '~/editor/constants'; import SourceEditorToolbarButton from './source_editor_toolbar_button.vue'; export default { @@ -34,8 +34,7 @@ export default { return nodes.map((item) => { return { ...item, - group: - (this.$options.groups.includes(item.group) && item.group) || EDITOR_TOOLBAR_RIGHT_GROUP, + group: EDITOR_TOOLBAR_BUTTON_GROUPS[item.group] || EDITOR_TOOLBAR_BUTTON_GROUPS.settings, }; }); }, @@ -46,24 +45,38 @@ export default { return !isEmpty(this.getGroupItems(group)); }, }, - groups: [EDITOR_TOOLBAR_LEFT_GROUP, EDITOR_TOOLBAR_RIGHT_GROUP], + groups: EDITOR_TOOLBAR_BUTTON_GROUPS, }; </script> <template> <section v-if="isVisible" id="se-toolbar" - class="gl-py-3 gl-px-5 gl-bg-white gl-border-t gl-border-b gl-display-flex gl-justify-content-space-between gl-align-items-center" + class="gl-py-3 gl-px-5 gl-bg-white gl-border-t gl-border-b gl-display-flex gl-align-items-center" > - <div v-for="group in $options.groups" :key="group"> - <gl-button-group v-if="hasGroupItems(group)"> - <source-editor-toolbar-button - v-for="item in getGroupItems(group)" - :key="item.id" - :button="item" - @click="$emit('click', item)" - /> - </gl-button-group> - </div> + <gl-button-group v-if="hasGroupItems($options.groups.file)"> + <source-editor-toolbar-button + v-for="item in getGroupItems($options.groups.file)" + :key="item.id" + :button="item" + @click="$emit('click', item)" + /> + </gl-button-group> + <gl-button-group v-if="hasGroupItems($options.groups.edit)"> + <source-editor-toolbar-button + v-for="item in getGroupItems($options.groups.edit)" + :key="item.id" + :button="item" + @click="$emit('click', item)" + /> + </gl-button-group> + <gl-button-group v-if="hasGroupItems($options.groups.settings)" class="gl-ml-auto"> + <source-editor-toolbar-button + v-for="item in getGroupItems($options.groups.settings)" + :key="item.id" + :button="item" + @click="$emit('click', item)" + /> + </gl-button-group> </section> </template> diff --git a/app/assets/javascripts/editor/constants.js b/app/assets/javascripts/editor/constants.js index d235319dfd7..2be671ec7d8 100644 --- a/app/assets/javascripts/editor/constants.js +++ b/app/assets/javascripts/editor/constants.js @@ -1,3 +1,4 @@ +import { KeyMod, KeyCode } from 'monaco-editor'; import { getModifierKey } from '~/constants'; import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; import { s__, __, sprintf } from '~/locale'; @@ -15,15 +16,15 @@ export const EDITOR_TYPE_DIFF = 'vs.editor.IDiffEditor'; export const EDITOR_CODE_INSTANCE_FN = 'createInstance'; export const EDITOR_DIFF_INSTANCE_FN = 'createDiffInstance'; -export const EDITOR_TOOLBAR_LEFT_GROUP = 'left'; -export const EDITOR_TOOLBAR_RIGHT_GROUP = 'right'; +export const EDITOR_TOOLBAR_BUTTON_GROUPS = { + file: 'file', // external helpers (file-tree, etc.) + edit: 'edit', // formatting the text in the editor (bold, italic, add link, etc.) + settings: 'settings', // editor-wide settings (soft-wrap, full-screen, etc.) +}; export const SOURCE_EDITOR_INSTANCE_ERROR_NO_EL = s__( 'SourceEditor|"el" parameter is required for createInstance()', ); -export const ERROR_INSTANCE_REQUIRED_FOR_EXTENSION = s__( - 'SourceEditor|Source Editor instance is required to set up an extension.', -); export const EDITOR_EXTENSION_DEFINITION_ERROR = s__( 'SourceEditor|Extension definition should be either a class or a function', ); @@ -73,7 +74,8 @@ export const EXTENSION_MARKDOWN_BUTTONS = [ }), data: { mdTag: '**', - mdShortcuts: '["mod+b"]', + // eslint-disable-next-line no-bitwise + mdShortcuts: [KeyMod.CtrlCmd | KeyCode.KeyB], }, }, { @@ -83,7 +85,8 @@ export const EXTENSION_MARKDOWN_BUTTONS = [ }), data: { mdTag: '_', - mdShortcuts: '["mod+i"]', + // eslint-disable-next-line no-bitwise + mdShortcuts: [KeyMod.CtrlCmd | KeyCode.KeyI], }, }, { @@ -93,7 +96,8 @@ export const EXTENSION_MARKDOWN_BUTTONS = [ }), data: { mdTag: '~~', - mdShortcuts: '["mod+shift+x]', + // eslint-disable-next-line no-bitwise + mdShortcuts: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyX], }, }, { @@ -114,13 +118,14 @@ export const EXTENSION_MARKDOWN_BUTTONS = [ }, { id: 'link', - label: sprintf(s__('MarkdownEditor|Add a link (%{modifier_key}K)'), { + label: sprintf(s__('MarkdownEditor|Add a link (%{modifierKey}K)'), { modifierKey, }), data: { mdTag: '[{text}](url)', mdSelect: 'url', - mdShortcuts: '["mod+k"]', + // eslint-disable-next-line no-bitwise + mdShortcuts: [KeyMod.CtrlCmd | KeyCode.KeyK], }, }, { @@ -166,3 +171,4 @@ export const EXTENSION_MARKDOWN_BUTTONS = [ }, }, ]; +export const EXTENSION_SOFTWRAP_ID = 'soft-wrap'; diff --git a/app/assets/javascripts/editor/extensions/source_editor_extension_base.js b/app/assets/javascripts/editor/extensions/source_editor_extension_base.js index 0590bb7455a..8ec83e4df1c 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_extension_base.js +++ b/app/assets/javascripts/editor/extensions/source_editor_extension_base.js @@ -1,8 +1,11 @@ import { Range } from 'monaco-editor'; +import { __ } from '~/locale'; import { EDITOR_TYPE_CODE, EXTENSION_BASE_LINE_LINK_ANCHOR_CLASS, EXTENSION_BASE_LINE_NUMBERS_CLASS, + EDITOR_TOOLBAR_BUTTON_GROUPS, + EXTENSION_SOFTWRAP_ID, } from '../constants'; const hashRegexp = /#?L/g; @@ -24,6 +27,13 @@ export class SourceEditorExtension { return 'BaseExtension'; } + onSetup(instance) { + this.toolbarButtons = []; + if (instance.toolbar) { + this.setupToolbar(instance); + } + } + // eslint-disable-next-line class-methods-use-this onUse(instance) { SourceEditorExtension.highlightLines(instance); @@ -32,6 +42,31 @@ export class SourceEditorExtension { } } + onBeforeUnuse(instance) { + const ids = this.toolbarButtons.map((item) => item.id); + if (instance.toolbar) { + instance.toolbar.removeItems(ids); + } + } + + setupToolbar(instance) { + this.toolbarButtons = [ + { + id: EXTENSION_SOFTWRAP_ID, + label: __('Soft wrap'), + icon: 'soft-wrap', + selected: instance.getOption(116) === 'on', + group: EDITOR_TOOLBAR_BUTTON_GROUPS.settings, + category: 'primary', + selectedLabel: __('No wrap'), + selectedIcon: 'soft-unwrap', + class: 'soft-wrap-toggle', + onClick: () => instance.toggleSoftwrap(), + }, + ]; + instance.toolbar.addItems(this.toolbarButtons); + } + static onMouseMoveHandler(e) { const target = e.target.element; if (target.classList.contains(EXTENSION_BASE_LINE_NUMBERS_CLASS)) { @@ -108,6 +143,16 @@ export class SourceEditorExtension { highlightLines(instance, bounds = null) { SourceEditorExtension.highlightLines(instance, bounds); }, + + toggleSoftwrap(instance) { + const isSoftWrapped = instance.getOption(116) === 'on'; + instance.updateOptions({ wordWrap: isSoftWrapped ? 'off' : 'on' }); + if (instance.toolbar) { + instance.toolbar.updateItem(EXTENSION_SOFTWRAP_ID, { + selected: !isSoftWrapped, + }); + } + }, }; } } diff --git a/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js b/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js index 6105a577996..0a5843ec631 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js @@ -1,5 +1,5 @@ import { insertMarkdownText } from '~/lib/utils/text_markdown'; -import { EDITOR_TOOLBAR_RIGHT_GROUP, EXTENSION_MARKDOWN_BUTTONS } from '../constants'; +import { EDITOR_TOOLBAR_BUTTON_GROUPS, EXTENSION_MARKDOWN_BUTTONS } from '../constants'; export class EditorMarkdownExtension { static get extensionName() { @@ -8,6 +8,7 @@ export class EditorMarkdownExtension { onSetup(instance) { this.toolbarButtons = []; + this.actions = []; if (instance.toolbar) { this.setupToolbar(instance); } @@ -17,14 +18,30 @@ export class EditorMarkdownExtension { if (instance.toolbar) { instance.toolbar.removeItems(ids); } + this.actions.forEach((action) => { + action.dispose(); + }); + this.actions = []; } setupToolbar(instance) { this.toolbarButtons = EXTENSION_MARKDOWN_BUTTONS.map((btn) => { + if (btn.data.mdShortcuts) { + this.actions.push( + instance.addAction({ + id: btn.id, + label: btn.label, + keybindings: btn.data.mdShortcuts, + run(inst) { + inst.insertMarkdown(btn.data); + }, + }), + ); + } return { ...btn, icon: btn.id, - group: EDITOR_TOOLBAR_RIGHT_GROUP, + group: EDITOR_TOOLBAR_BUTTON_GROUPS.edit, category: 'tertiary', onClick: (e) => instance.insertMarkdown(e), }; @@ -66,12 +83,8 @@ export class EditorMarkdownExtension { instance.setPosition(pos); }, insertMarkdown: (instance, e) => { - const { - mdTag: tag, - mdBlock: blockTag, - mdPrepend, - mdSelect: select, - } = e.currentTarget.dataset; + const { mdTag: tag, mdBlock: blockTag, mdPrepend, mdSelect: select } = + e.currentTarget?.dataset || e; insertMarkdownText({ tag, diff --git a/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js b/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js index 58ddaa94d5e..f8ff533f53f 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js @@ -1,7 +1,7 @@ import { KeyMod, KeyCode, Emitter } from 'monaco-editor'; import { debounce } from 'lodash'; import { BLOB_PREVIEW_ERROR } from '~/blob_edit/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sanitize } from '~/lib/dompurify'; import axios from '~/lib/utils/axios_utils'; import syntaxHighlight from '~/syntax_highlight'; @@ -14,7 +14,7 @@ import { EXTENSION_MARKDOWN_PREVIEW_UPDATE_DELAY, EXTENSION_MARKDOWN_PREVIEW_LABEL, EXTENSION_MARKDOWN_HIDE_PREVIEW_LABEL, - EDITOR_TOOLBAR_RIGHT_GROUP, + EDITOR_TOOLBAR_BUTTON_GROUPS, } from '../constants'; const fetchPreview = (text, previewMarkdownPath) => { @@ -116,7 +116,7 @@ export class EditorMarkdownPreviewExtension { label: EXTENSION_MARKDOWN_PREVIEW_LABEL, icon: 'live-preview', selected: false, - group: EDITOR_TOOLBAR_RIGHT_GROUP, + group: EDITOR_TOOLBAR_BUTTON_GROUPS.settings, category: 'primary', selectedLabel: EXTENSION_MARKDOWN_HIDE_PREVIEW_LABEL, onClick: () => instance.togglePreview(), diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json index 57477a993c5..a5080332b78 100644 --- a/app/assets/javascripts/editor/schema/ci.json +++ b/app/assets/javascripts/editor/schema/ci.json @@ -318,6 +318,10 @@ "cyclonedx": { "$ref": "#/definitions/string_file_list", "markdownDescription": "Path to file or list of files with cyclonedx report(s). [Learn More](https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportscyclonedx)." + }, + "load_performance": { + "$ref": "#/definitions/string_file_list", + "markdownDescription": "Path to file or list of files with load performance testing report(s). [Learn More](https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportsload_performance)." } } } @@ -537,7 +541,7 @@ }, "entrypoint": { "type": "array", - "description": "Command or script that should be executed as the container's entrypoint. It will be translated to Docker's --entrypoint option while creating the container. The syntax is similar to Dockerfile's ENTRYPOINT directive, where each shell token is a separate string in the array.", + "markdownDescription": "Command or script that should be executed as the container's entrypoint. It will be translated to Docker's --entrypoint option while creating the container. The syntax is similar to Dockerfile's ENTRYPOINT directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", "minItems": 1, "items": { "type": "string" @@ -572,7 +576,7 @@ }, "command": { "type": "array", - "description": "Command or script that should be used as the container's command. It will be translated to arguments passed to Docker after the image's name. The syntax is similar to Dockerfile's CMD directive, where each shell token is a separate string in the array.", + "markdownDescription": "Command or script that should be used as the container's command. It will be translated to arguments passed to Docker after the image's name. The syntax is similar to Dockerfile's CMD directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", "minItems": 1, "items": { "type": "string" @@ -580,8 +584,12 @@ }, "alias": { "type": "string", - "description": "Additional alias that can be used to access the service from the job's container. Read Accessing the services for more information.", + "markdownDescription": "Additional alias that can be used to access the service from the job's container. Read Accessing the services for more information. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", "minLength": 1 + }, + "variables": { + "$ref": "#/definitions/jobVariables", + "markdownDescription": "Additional environment variables that are passed exclusively to the service. Service variables cannot reference themselves. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)" } }, "required": [ diff --git a/app/assets/javascripts/editor/utils.js b/app/assets/javascripts/editor/utils.js index df9d3f2b9fb..cea9a8971b7 100644 --- a/app/assets/javascripts/editor/utils.js +++ b/app/assets/javascripts/editor/utils.js @@ -16,17 +16,18 @@ export const setupEditorTheme = () => { monacoEditor.setTheme(theme ? themeName : DEFAULT_THEME); }; -export const getBlobLanguage = (blobPath) => { +export const getBlobLanguage = (path) => { const defaultLanguage = 'plaintext'; - if (!blobPath) { + if (!path) { return defaultLanguage; } - const ext = `.${blobPath.split('.').pop()}`; + const blobPath = path.split('/').pop(); + const ext = blobPath.includes('.') ? `.${blobPath.split('.').pop()}` : blobPath; const language = monacoLanguages .getLanguages() - .find((lang) => lang.extensions.indexOf(ext) !== -1); + .find((lang) => lang.extensions.indexOf(ext.toLowerCase()) !== -1); return language ? language.id : defaultLanguage; }; diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue index 4f4c32af113..bbac6866636 100644 --- a/app/assets/javascripts/emoji/components/emoji_group.vue +++ b/app/assets/javascripts/emoji/components/emoji_group.vue @@ -1,5 +1,10 @@ <script> +import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin'; + export default { + // Temporary mixin for migration from Vue.js 2 to @vue/compat + mixins: [compatFunctionalMixin], + props: { emojis: { type: Array, diff --git a/app/assets/javascripts/entrypoints/super_sidebar.js b/app/assets/javascripts/entrypoints/super_sidebar.js new file mode 100644 index 00000000000..308077f98b1 --- /dev/null +++ b/app/assets/javascripts/entrypoints/super_sidebar.js @@ -0,0 +1,5 @@ +import '~/webpack'; +import '~/commons'; +import { initSuperSidebar } from '~/super_sidebar/super_sidebar_bundle'; + +initSuperSidebar(); diff --git a/app/assets/javascripts/environments/components/canary_update_modal.vue b/app/assets/javascripts/environments/components/canary_update_modal.vue index cacd868bed0..aff7d34f191 100644 --- a/app/assets/javascripts/environments/components/canary_update_modal.vue +++ b/app/assets/javascripts/environments/components/canary_update_modal.vue @@ -42,7 +42,7 @@ export default { modalId: CANARY_UPDATE_MODAL, actionPrimary: { text: s__('CanaryIngress|Change ratio'), - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, actionCancel: { text: __('Cancel') }, static: true, diff --git a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue index 8259574f8e3..53a93bbce30 100644 --- a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue +++ b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue @@ -135,7 +135,7 @@ export default { csrf, cancelProps: { text: __('Cancel'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, docsPath: helpPagePath('ci/environments/index.md', { anchor: 'retry-or-roll-back-a-deployment' }), }; diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue index 78e1b8d5cb2..47f38980acc 100644 --- a/app/assets/javascripts/environments/components/delete_environment_modal.vue +++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue @@ -1,6 +1,6 @@ <script> import { GlTooltipDirective, GlModal } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; import deleteEnvironmentMutation from '../graphql/mutations/delete_environment.mutation.graphql'; @@ -29,7 +29,7 @@ export default { primaryProps() { return { text: s__('Environments|Delete environment'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/environments/components/deployment.vue b/app/assets/javascripts/environments/components/deployment.vue index b00a0777a03..01b8208fd55 100644 --- a/app/assets/javascripts/environments/components/deployment.vue +++ b/app/assets/javascripts/environments/components/deployment.vue @@ -10,7 +10,7 @@ import { import { __, s__ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import deploymentDetails from '../graphql/queries/deployment_details.query.graphql'; import DeploymentStatusBadge from './deployment_status_badge.vue'; import Commit from './commit.vue'; diff --git a/app/assets/javascripts/environments/components/edit_environment.vue b/app/assets/javascripts/environments/components/edit_environment.vue index 901d0f5b34d..b63a6897a39 100644 --- a/app/assets/javascripts/environments/components/edit_environment.vue +++ b/app/assets/javascripts/environments/components/edit_environment.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import EnvironmentForm from './environment_form.vue'; diff --git a/app/assets/javascripts/environments/components/environment_form.vue b/app/assets/javascripts/environments/components/environment_form.vue index ee5d95ae6f0..62ceb66d803 100644 --- a/app/assets/javascripts/environments/components/environment_form.vue +++ b/app/assets/javascripts/environments/components/environment_form.vue @@ -17,7 +17,7 @@ export default { GlLink, GlSprintf, }, - inject: ['protectedEnvironmentSettingsPath'], + inject: { protectedEnvironmentSettingsPath: { default: '' } }, props: { environment: { required: true, diff --git a/app/assets/javascripts/environments/components/kubernetes_agent_info.vue b/app/assets/javascripts/environments/components/kubernetes_agent_info.vue new file mode 100644 index 00000000000..c4f6d225444 --- /dev/null +++ b/app/assets/javascripts/environments/components/kubernetes_agent_info.vue @@ -0,0 +1,101 @@ +<script> +import { GlIcon, GlLink, GlSprintf, GlLoadingIcon, GlAlert } from '@gitlab/ui'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import { getAgentLastContact, getAgentStatus } from '~/clusters_list/clusters_util'; +import { TOKEN_STATUS_ACTIVE } from '~/clusters/agents/constants'; +import { AGENT_STATUSES } from '~/clusters_list/constants'; +import { s__ } from '~/locale'; +import getK8sClusterAgentQuery from '../graphql/queries/k8s_cluster_agent.query.graphql'; + +export default { + components: { + GlIcon, + GlLink, + GlSprintf, + GlLoadingIcon, + TimeAgoTooltip, + GlAlert, + }, + props: { + agentName: { + required: true, + type: String, + }, + agentId: { + required: true, + type: String, + }, + agentProjectPath: { + required: true, + type: String, + }, + }, + apollo: { + clusterAgent: { + query: getK8sClusterAgentQuery, + variables() { + return { + agentName: this.agentName, + projectPath: this.agentProjectPath, + tokenStatus: TOKEN_STATUS_ACTIVE, + }; + }, + update: (data) => data?.project?.clusterAgent, + error() { + this.clusterAgent = null; + }, + }, + }, + data() { + return { + clusterAgent: null, + }; + }, + computed: { + isLoading() { + return this.$apollo.queries.clusterAgent.loading; + }, + agentLastContact() { + return getAgentLastContact(this.clusterAgent.tokens.nodes); + }, + agentStatus() { + return getAgentStatus(this.agentLastContact); + }, + }, + methods: {}, + i18n: { + loadingError: s__('ClusterAgents|An error occurred while loading your agent'), + agentId: s__('ClusterAgents|Agent ID #%{agentId}'), + neverConnectedText: s__('ClusterAgents|Never'), + }, + AGENT_STATUSES, +}; +</script> +<template> + <gl-loading-icon v-if="isLoading" inline /> + <div v-else-if="clusterAgent" class="gl-text-gray-900"> + <gl-icon name="kubernetes-agent" class="gl-text-gray-500" /> + <gl-link :href="clusterAgent.webPath" class="gl-mr-3"> + <gl-sprintf :message="$options.i18n.agentId" + ><template #agentId>{{ agentId }}</template></gl-sprintf + > + </gl-link> + <span class="gl-mr-3" data-testid="agent-status"> + <gl-icon + :name="$options.AGENT_STATUSES[agentStatus].icon" + :class="$options.AGENT_STATUSES[agentStatus].class" + /> + {{ $options.AGENT_STATUSES[agentStatus].name }} + </span> + + <span data-testid="agent-last-used-date"> + <gl-icon name="calendar" /> + <time-ago-tooltip v-if="agentLastContact" :time="agentLastContact" /> + <span v-else>{{ $options.i18n.neverConnectedText }}</span> + </span> + </div> + + <gl-alert v-else variant="danger" :dismissible="false"> + {{ $options.i18n.loadingError }} + </gl-alert> +</template> diff --git a/app/assets/javascripts/environments/components/kubernetes_overview.vue b/app/assets/javascripts/environments/components/kubernetes_overview.vue new file mode 100644 index 00000000000..cfb18cc4f82 --- /dev/null +++ b/app/assets/javascripts/environments/components/kubernetes_overview.vue @@ -0,0 +1,73 @@ +<script> +import { GlCollapse, GlButton } from '@gitlab/ui'; +import { __, s__ } from '~/locale'; +import KubernetesAgentInfo from './kubernetes_agent_info.vue'; + +export default { + components: { + GlCollapse, + GlButton, + KubernetesAgentInfo, + }, + props: { + agentName: { + required: true, + type: String, + }, + agentId: { + required: true, + type: String, + }, + agentProjectPath: { + required: true, + type: String, + }, + }, + data() { + return { + isVisible: false, + }; + }, + computed: { + chevronIcon() { + return this.isVisible ? 'chevron-down' : 'chevron-right'; + }, + label() { + return this.isVisible ? this.$options.i18n.collapse : this.$options.i18n.expand; + }, + }, + methods: { + toggleCollapse() { + this.isVisible = !this.isVisible; + }, + }, + i18n: { + collapse: __('Collapse'), + expand: __('Expand'), + sectionTitle: s__('Environment|Kubernetes overview'), + }, +}; +</script> +<template> + <div class="gl-px-4"> + <p class="gl-font-weight-bold gl-text-gray-500 gl-display-flex gl-mb-0"> + <gl-button + :icon="chevronIcon" + :aria-label="label" + category="tertiary" + size="small" + class="gl-mr-3" + @click="toggleCollapse" + />{{ $options.i18n.sectionTitle }} + </p> + <gl-collapse :visible="isVisible" class="gl-md-pl-7 gl-md-pr-5 gl-mt-4"> + <template v-if="isVisible"> + <kubernetes-agent-info + :agent-name="agentName" + :agent-id="agentId" + :agent-project-path="agentProjectPath" + class="gl-mb-5" + /></template> + </gl-collapse> + </div> +</template> diff --git a/app/assets/javascripts/environments/components/new_environment.vue b/app/assets/javascripts/environments/components/new_environment.vue index bb4d6ab3428..4b58d133817 100644 --- a/app/assets/javascripts/environments/components/new_environment.vue +++ b/app/assets/javascripts/environments/components/new_environment.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import EnvironmentForm from './environment_form.vue'; diff --git a/app/assets/javascripts/environments/components/new_environment_item.vue b/app/assets/javascripts/environments/components/new_environment_item.vue index 73dfd993c5b..2ec6e12b8b3 100644 --- a/app/assets/javascripts/environments/components/new_environment_item.vue +++ b/app/assets/javascripts/environments/components/new_environment_item.vue @@ -11,6 +11,7 @@ import { import { __, s__ } from '~/locale'; import { truncate } from '~/lib/utils/text_utility'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import isLastDeployment from '../graphql/queries/is_last_deployment.query.graphql'; import ExternalUrl from './environment_external_url.vue'; import Actions from './environment_actions.vue'; @@ -22,6 +23,7 @@ import Terminal from './environment_terminal_button.vue'; import Delete from './environment_delete.vue'; import Deployment from './deployment.vue'; import DeployBoardWrapper from './deploy_board_wrapper.vue'; +import KubernetesOverview from './kubernetes_overview.vue'; export default { components: { @@ -42,6 +44,7 @@ export default { Terminal, TimeAgoTooltip, Delete, + KubernetesOverview, EnvironmentAlert: () => import('ee_component/environments/components/environment_alert.vue'), EnvironmentApproval: () => import('ee_component/environments/components/environment_approval.vue'), @@ -49,6 +52,7 @@ export default { directives: { GlTooltip, }, + mixins: [glFeatureFlagsMixin()], inject: ['helpPagePath'], props: { environment: { @@ -162,6 +166,18 @@ export default { rolloutStatus() { return this.environment?.rolloutStatus; }, + agent() { + return this.environment?.agent || {}; + }, + isKubernetesOverviewAvailable() { + return this.glFeatures?.kasUserAccessProject; + }, + hasRequiredAgentData() { + return this.agent.project && this.agent.id && this.agent.name; + }, + showKubernetesOverview() { + return this.isKubernetesOverviewAvailable && this.hasRequiredAgentData; + }, }, methods: { toggleCollapse() { @@ -184,6 +200,13 @@ export default { 'gl-md-pl-7', 'gl-bg-gray-10', ], + kubernetesOverviewClasses: [ + 'gl-border-gray-100', + 'gl-border-t-solid', + 'gl-border-1', + 'gl-py-4', + 'gl-bg-gray-10', + ], }; </script> <template> @@ -340,6 +363,13 @@ export default { </template> </gl-sprintf> </div> + <div v-if="showKubernetesOverview" :class="$options.kubernetesOverviewClasses"> + <kubernetes-overview + :agent-project-path="agent.project" + :agent-name="agent.name" + :agent-id="agent.id" + /> + </div> <div v-if="rolloutStatus" :class="$options.deployBoardClasses"> <deploy-board-wrapper :rollout-status="rolloutStatus" diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index 162ad598c8c..dc0c5dc0f46 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -33,7 +33,7 @@ export default { primaryProps() { return { text: s__('Environments|Stop environment'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/environments/graphql/queries/k8s_cluster_agent.query.graphql b/app/assets/javascripts/environments/graphql/queries/k8s_cluster_agent.query.graphql new file mode 100644 index 00000000000..999ae74239f --- /dev/null +++ b/app/assets/javascripts/environments/graphql/queries/k8s_cluster_agent.query.graphql @@ -0,0 +1,19 @@ +query getK8sClusterAgentQuery( + $projectPath: ID! + $agentName: String! + $tokenStatus: AgentTokenStatus! +) { + project(fullPath: $projectPath) { + id + clusterAgent(name: $agentName) { + id + webPath + tokens(status: $tokenStatus) { + nodes { + id + lastUsedAt + } + } + } + } +} diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js index 5e936ad8c96..f8e94cf3ea9 100644 --- a/app/assets/javascripts/environments/mixins/environments_mixin.js +++ b/app/assets/javascripts/environments/mixins/environments_mixin.js @@ -3,7 +3,7 @@ */ import { isEqual, isFunction, omitBy } from 'lodash'; import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import Poll from '~/lib/utils/poll'; import { getParameterByName } from '~/lib/utils/url_utility'; import { s__, __ } from '~/locale'; diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue index b02c3cd2cba..61c0ddef639 100644 --- a/app/assets/javascripts/error_tracking/components/error_details.vue +++ b/app/assets/javascripts/error_tracking/components/error_details.vue @@ -13,7 +13,7 @@ import { GlIcon, } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; -import { createAlert, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_WARNING } from '~/alert'; import { __, sprintf, n__ } from '~/locale'; import Tracking from '~/tracking'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; diff --git a/app/assets/javascripts/error_tracking/store/actions.js b/app/assets/javascripts/error_tracking/store/actions.js index 603f8611005..adbce7750fa 100644 --- a/app/assets/javascripts/error_tracking/store/actions.js +++ b/app/assets/javascripts/error_tracking/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { visitUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import service from '../services'; diff --git a/app/assets/javascripts/error_tracking/store/details/actions.js b/app/assets/javascripts/error_tracking/store/details/actions.js index 1409399940a..89b9432c377 100644 --- a/app/assets/javascripts/error_tracking/store/details/actions.js +++ b/app/assets/javascripts/error_tracking/store/details/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import Poll from '~/lib/utils/poll'; import { __ } from '~/locale'; import service from '../../services'; diff --git a/app/assets/javascripts/error_tracking/store/list/actions.js b/app/assets/javascripts/error_tracking/store/list/actions.js index f633711add3..84e4463ca21 100644 --- a/app/assets/javascripts/error_tracking/store/list/actions.js +++ b/app/assets/javascripts/error_tracking/store/list/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import Poll from '~/lib/utils/poll'; import { __ } from '~/locale'; import Service from '../../services'; diff --git a/app/assets/javascripts/error_tracking_settings/store/actions.js b/app/assets/javascripts/error_tracking_settings/store/actions.js index 4d6fe767f3a..368dd438f89 100644 --- a/app/assets/javascripts/error_tracking_settings/store/actions.js +++ b/app/assets/javascripts/error_tracking_settings/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue index 366ee6bb05b..9fb5d9f0943 100644 --- a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue +++ b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue @@ -84,11 +84,9 @@ export default { cancelActionProps() { return { text: this.$options.translations.cancelActionLabel, - attributes: [ - { - category: 'secondary', - }, - ], + attributes: { + category: 'secondary', + }, }; }, canRegenerateInstanceId() { @@ -98,14 +96,12 @@ export default { return this.canUserRotateToken ? { text: this.$options.translations.instanceIdRegenerateActionLabel, - attributes: [ - { - category: 'secondary', - disabled: !this.canRegenerateInstanceId, - loading: this.isRotating, - variant: 'danger', - }, - ], + attributes: { + category: 'secondary', + disabled: !this.canRegenerateInstanceId, + loading: this.isRotating, + variant: 'danger', + }, } : null; }, diff --git a/app/assets/javascripts/feature_flags/components/environments_dropdown.vue b/app/assets/javascripts/feature_flags/components/environments_dropdown.vue index ce5f7915dbf..57727cb945e 100644 --- a/app/assets/javascripts/feature_flags/components/environments_dropdown.vue +++ b/app/assets/javascripts/feature_flags/components/environments_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlSearchBoxByType } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue index 89400bc4742..420c34a88f1 100644 --- a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue +++ b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue @@ -8,7 +8,7 @@ import { GlSearchBoxByType, } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/feature_flags/constants.js b/app/assets/javascripts/feature_flags/constants.js index f697f203cf5..1993ec7abf2 100644 --- a/app/assets/javascripts/feature_flags/constants.js +++ b/app/assets/javascripts/feature_flags/constants.js @@ -1,4 +1,3 @@ -import { property } from 'lodash'; import { s__ } from '~/locale'; export const ROLLOUT_STRATEGY_ALL_USERS = 'default'; @@ -9,15 +8,8 @@ export const ROLLOUT_STRATEGY_GITLAB_USER_LIST = 'gitlabUserList'; export const PERCENT_ROLLOUT_GROUP_ID = 'default'; -export const DEFAULT_PERCENT_ROLLOUT = '100'; - export const ALL_ENVIRONMENTS_NAME = '*'; -export const INTERNAL_ID_PREFIX = 'internal_'; - -export const fetchPercentageParams = property(['parameters', 'percentage']); -export const fetchUserIdParams = property(['parameters', 'userIds']); - export const NEW_VERSION_FLAG = 'new_version_flag'; export const LEGACY_FLAG = 'legacy_flag'; diff --git a/app/assets/javascripts/feature_flags/store/edit/actions.js b/app/assets/javascripts/feature_flags/store/edit/actions.js index 97c22781ac5..585bb1be0c4 100644 --- a/app/assets/javascripts/feature_flags/store/edit/actions.js +++ b/app/assets/javascripts/feature_flags/store/edit/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js index a9542a9667e..e2218c1ba2e 100644 --- a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js +++ b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js index 397ba879866..50fca995c81 100644 --- a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js +++ b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js @@ -72,6 +72,38 @@ export default (IssuableTokenKeys, disableTargetBranchFilter = false) => { IssuableTokenKeys.tokenKeysWithAlternative.push(targetBranchToken); } + const approvedToken = { + token: { + formattedKey: __('Approved'), + key: 'approved', + type: 'string', + param: '', + symbol: '', + icon: 'approval', + tag: __('Yes or No'), + lowercaseValueOnSubmit: true, + capitalizeTokenValue: true, + hideNotEqual: true, + }, + conditions: [ + { + url: 'approved=yes', + tokenKey: 'approved', + value: __('Yes'), + operator: '=', + }, + { + url: 'approved=no', + tokenKey: 'approved', + value: __('No'), + operator: '=', + }, + ], + }; + + IssuableTokenKeys.tokenKeys.splice(3, 0, approvedToken.token); + IssuableTokenKeys.conditions.push(...approvedToken.conditions); + const approvedBy = { token: { formattedKey: TOKEN_TITLE_APPROVED_BY, @@ -117,8 +149,8 @@ export default (IssuableTokenKeys, disableTargetBranchFilter = false) => { ], }; - const tokenPosition = 3; - IssuableTokenKeys.tokenKeys.splice(tokenPosition, 0, ...[approvedBy.token]); + const tokenPosition = 4; + IssuableTokenKeys.tokenKeys.splice(tokenPosition, 0, approvedBy.token); IssuableTokenKeys.tokenKeysWithAlternative.splice( tokenPosition, 0, diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js index 1f8baa470d8..892e9130fe8 100644 --- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js +++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js @@ -138,6 +138,11 @@ export default class AvailableDropdownMappings { gl: DropdownNonUser, element: this.container.querySelector('#js-dropdown-wip'), }, + approved: { + reference: null, + gl: DropdownNonUser, + element: this.container.querySelector('#js-dropdown-approved'), + }, [TOKEN_TYPE_CONFIDENTIAL]: { reference: null, gl: DropdownNonUser, diff --git a/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js b/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js index 23591fc0667..e1330433362 100644 --- a/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js +++ b/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import AjaxFilter from './droplab/plugins/ajax_filter'; import DropdownUtils from './dropdown_utils'; diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js index 8c50c1860ec..bb33c3ad935 100644 --- a/app/assets/javascripts/filtered_search/dropdown_emoji.js +++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import Ajax from './droplab/plugins/ajax'; import Filter from './droplab/plugins/filter'; diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index ab95986dc62..3046ad42e24 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import Ajax from './droplab/plugins/ajax'; import Filter from './droplab/plugins/filter'; diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index 16c70fdd069..d865354881a 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -1,7 +1,8 @@ import { last } from 'lodash'; import recentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_PROJECT } from '~/issues/constants'; import { ENTER_KEY_CODE, BACKSPACE_KEY_CODE, @@ -82,7 +83,7 @@ export default class FilteredSearchManager { ); const fullPath = this.searchHistoryDropdownElement ? this.searchHistoryDropdownElement.dataset.fullPath - : 'project'; + : WORKSPACE_PROJECT; const recentSearchesKey = `${fullPath}-${recentSearchesStorageKeys[this.page]}`; this.recentSearchesService = new RecentSearchesService(recentSearchesKey); } diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js index 33fda7533e4..409f6a4a9dc 100644 --- a/app/assets/javascripts/filtered_search/visual_token_value.js +++ b/app/assets/javascripts/filtered_search/visual_token_value.js @@ -4,7 +4,7 @@ import * as Emoji from '~/emoji'; import FilteredSearchContainer from '~/filtered_search/container'; import DropdownUtils from '~/filtered_search/dropdown_utils'; import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import AjaxCache from '~/lib/utils/ajax_cache'; import UsersCache from '~/lib/utils/users_cache'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js index ad339155a59..b45c98b46f6 100644 --- a/app/assets/javascripts/gpg_badges.js +++ b/app/assets/javascripts/gpg_badges.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { queryToObject } from '~/lib/utils/url_utility'; import { loadingIconForLegacyJS } from '~/loading_icon_for_legacy_js'; diff --git a/app/assets/javascripts/grafana_integration/store/actions.js b/app/assets/javascripts/grafana_integration/store/actions.js index db2fd3cc256..76e21f09719 100644 --- a/app/assets/javascripts/grafana_integration/store/actions.js +++ b/app/assets/javascripts/grafana_integration/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; @@ -29,7 +29,7 @@ export const updateGrafanaIntegration = ({ state, dispatch }) => export const receiveGrafanaIntegrationUpdateSuccess = () => { /** * The operations_controller currently handles successful requests - * by creating a flash banner messsage to notify the user. + * by creating an alert banner message to notify the user. */ refreshCurrentPage(); }; diff --git a/app/assets/javascripts/graphql_shared/constants.js b/app/assets/javascripts/graphql_shared/constants.js index 3c4ca4c197e..77fca45c949 100644 --- a/app/assets/javascripts/graphql_shared/constants.js +++ b/app/assets/javascripts/graphql_shared/constants.js @@ -26,3 +26,4 @@ export const TYPENAME_USER = 'User'; export const TYPENAME_VULNERABILITIES_SCANNER = 'Vulnerabilities::Scanner'; export const TYPENAME_VULNERABILITY = 'Vulnerability'; export const TYPENAME_WORK_ITEM = 'WorkItem'; +export const TYPE_USERS_SAVED_REPLY = 'Users::SavedReply'; diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index 4a5536986bd..22629dfb7d8 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -152,6 +152,7 @@ "WorkItemWidgetLabels", "WorkItemWidgetMilestone", "WorkItemWidgetNotes", + "WorkItemWidgetNotifications", "WorkItemWidgetProgress", "WorkItemWidgetRequirementLegacy", "WorkItemWidgetStartAndDueDate", @@ -159,4 +160,4 @@ "WorkItemWidgetTestReports", "WorkItemWidgetWeight" ] -}
\ No newline at end of file +} diff --git a/app/assets/javascripts/graphql_shared/queries/get_users_by_usernames.query.graphql b/app/assets/javascripts/graphql_shared/queries/get_users_by_usernames.query.graphql deleted file mode 100644 index 07398867544..00000000000 --- a/app/assets/javascripts/graphql_shared/queries/get_users_by_usernames.query.graphql +++ /dev/null @@ -1,9 +0,0 @@ -#import "../fragments/user.fragment.graphql" - -query getUsersByUsernames($usernames: [String!]) { - users(usernames: $usernames) { - nodes { - ...User - } - } -} diff --git a/app/assets/javascripts/group.js b/app/assets/javascripts/group.js index cc70d832edc..3b64606b141 100644 --- a/app/assets/javascripts/group.js +++ b/app/assets/javascripts/group.js @@ -1,6 +1,6 @@ import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { getGroupPathAvailability } from '~/rest_api'; import axios from '~/lib/utils/axios_utils'; diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index 148bf0a98ee..82eddf5603f 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -1,6 +1,6 @@ <script> import { GlLoadingIcon, GlModal, GlEmptyState } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { HTTP_STATUS_FORBIDDEN } from '~/lib/utils/http_status'; import { mergeUrlParams, getParameterByName } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; @@ -59,7 +59,7 @@ export default { primaryProps() { return { text: __('Leave group'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/groups/components/group_name_and_path.vue b/app/assets/javascripts/groups/components/group_name_and_path.vue index 5f997ecc7ba..1f9fc68a612 100644 --- a/app/assets/javascripts/groups/components/group_name_and_path.vue +++ b/app/assets/javascripts/groups/components/group_name_and_path.vue @@ -18,7 +18,7 @@ import { debounce } from 'lodash'; import { s__, __ } from '~/locale'; import { getGroupPathAvailability } from '~/rest_api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { slugify } from '~/lib/utils/text_utility'; import axios from '~/lib/utils/axios_utils'; import { helpPagePath } from '~/helpers/help_page_helper'; diff --git a/app/assets/javascripts/groups/components/invite_members_banner.vue b/app/assets/javascripts/groups/components/invite_members_banner.vue index 7afea815197..a0a775e2916 100644 --- a/app/assets/javascripts/groups/components/invite_members_banner.vue +++ b/app/assets/javascripts/groups/components/invite_members_banner.vue @@ -45,10 +45,7 @@ export default { }); }, openModal() { - eventHub.$emit('openModal', { - source: this.$options.openModalSource, - }); - this.track(this.$options.buttonClickEvent); + eventHub.$emit('openModal', { source: this.$options.openModalSource }); }, }, i18n: { @@ -59,7 +56,6 @@ export default { button_text: s__('InviteMembersBanner|Invite your colleagues'), }, displayEvent: 'invite_members_banner_displayed', - buttonClickEvent: 'invite_members_banner_button_clicked', openModalSource: 'invite_members_banner', dismissEvent: 'invite_members_banner_dismissed', }; diff --git a/app/assets/javascripts/groups/constants.js b/app/assets/javascripts/groups/constants.js index 6fb12cd6270..6f5b03788a8 100644 --- a/app/assets/javascripts/groups/constants.js +++ b/app/assets/javascripts/groups/constants.js @@ -12,7 +12,6 @@ export const ACTIVE_TAB_SHARED = 'shared'; export const ACTIVE_TAB_ARCHIVED = 'archived'; export const GROUPS_LIST_HOLDER_CLASS = '.js-groups-list-holder'; -export const GROUPS_FILTER_FORM_CLASS = '.js-group-filter-form'; export const CONTENT_LIST_CLASS = '.groups-list'; export const COMMON_STR = { diff --git a/app/assets/javascripts/groups/settings/components/access_dropdown.vue b/app/assets/javascripts/groups/settings/components/access_dropdown.vue index db8e424e166..8bc5f28ebfb 100644 --- a/app/assets/javascripts/groups/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/groups/settings/components/access_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlDropdownSectionHeader, GlSearchBoxByType } from '@gitlab/ui'; import { debounce, intersectionWith, groupBy, differenceBy, intersectionBy } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__, n__ } from '~/locale'; import { getSubGroups } from '../api/access_dropdown_api'; import { LEVEL_TYPES } from '../constants'; diff --git a/app/assets/javascripts/groups/store/utils.js b/app/assets/javascripts/groups/store/utils.js index 371b3aa9d52..d4b583483bd 100644 --- a/app/assets/javascripts/groups/store/utils.js +++ b/app/assets/javascripts/groups/store/utils.js @@ -1,3 +1,5 @@ +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; + export const getGroupItemMicrodata = ({ type }) => { const defaultMicrodata = { itemscope: true, @@ -9,14 +11,14 @@ export const getGroupItemMicrodata = ({ type }) => { }; switch (type) { - case 'group': + case WORKSPACE_GROUP: return { ...defaultMicrodata, itemtype: 'https://schema.org/Organization', itemprop: 'subOrganization', imageItemprop: 'logo', }; - case 'project': + case WORKSPACE_PROJECT: return { ...defaultMicrodata, itemtype: 'https://schema.org/SoftwareSourceCode', diff --git a/app/assets/javascripts/header.js b/app/assets/javascripts/header.js index 6c9354b663f..9cb96283689 100644 --- a/app/assets/javascripts/header.js +++ b/app/assets/javascripts/header.js @@ -28,7 +28,7 @@ export default function initTodoToggle() { }); } -function initStatusTriggers() { +export function initStatusTriggers() { const setStatusModalTriggerEl = document.querySelector('.js-set-status-modal-trigger'); if (setStatusModalTriggerEl) { diff --git a/app/assets/javascripts/header_search/components/app.vue b/app/assets/javascripts/header_search/components/app.vue index ace0d77c431..c0a06706fc6 100644 --- a/app/assets/javascripts/header_search/components/app.vue +++ b/app/assets/javascripts/header_search/components/app.vue @@ -12,10 +12,20 @@ import { debounce } from 'lodash'; import { visitUrl } from '~/lib/utils/url_utility'; import { truncate } from '~/lib/utils/text_utility'; import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; -import { s__, sprintf } from '~/locale'; +import { sprintf } from '~/locale'; import Tracking from '~/tracking'; import DropdownKeyboardNavigation from '~/vue_shared/components/dropdown_keyboard_navigation.vue'; import { + SEARCH_GITLAB, + SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN, + SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN, + SEARCH_DESCRIBED_BY_DEFAULT, + SEARCH_DESCRIBED_BY_UPDATED, + SEARCH_RESULTS_LOADING, + SEARCH_RESULTS_SCOPE, + KBD_HELP, +} from '~/vue_shared/global_search/constants'; +import { FIRST_DROPDOWN_INDEX, SEARCH_BOX_INDEX, SEARCH_INPUT_DESCRIPTION, @@ -34,26 +44,14 @@ import HeaderSearchScopedItems from './header_search_scoped_items.vue'; export default { name: 'HeaderSearchApp', i18n: { - searchGitlab: s__('GlobalSearch|Search GitLab'), - searchInputDescribeByNoDropdown: s__( - 'GlobalSearch|Type and press the enter key to submit search.', - ), - searchInputDescribeByWithDropdown: s__( - 'GlobalSearch|Type for new suggestions to appear below.', - ), - searchDescribedByDefault: s__( - 'GlobalSearch|%{count} default results provided. Use the up and down arrow keys to navigate search results list.', - ), - searchDescribedByUpdated: s__( - 'GlobalSearch|Results updated. %{count} results available. Use the up and down arrow keys to navigate search results list, or ENTER to submit.', - ), - searchResultsLoading: s__('GlobalSearch|Search results are loading'), - searchResultsScope: s__('GlobalSearch|in %{scope}'), - kbdHelp: sprintf( - s__('GlobalSearch|Use the shortcut key %{kbdOpen}/%{kbdClose} to start a search'), - { kbdOpen: '<kbd>', kbdClose: '</kbd>' }, - false, - ), + SEARCH_GITLAB, + SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN, + SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN, + SEARCH_DESCRIBED_BY_DEFAULT, + SEARCH_DESCRIBED_BY_UPDATED, + SEARCH_RESULTS_LOADING, + SEARCH_RESULTS_SCOPE, + KBD_HELP, }, directives: { Outside, GlTooltip: GlTooltipDirective, GlResizeObserverDirective }, components: { @@ -113,9 +111,9 @@ export default { searchInputDescribeBy() { if (this.isLoggedIn) { - return this.$options.i18n.searchInputDescribeByWithDropdown; + return this.$options.i18n.SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN; } - return this.$options.i18n.searchInputDescribeByNoDropdown; + return this.$options.i18n.SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN; }, dropdownResultsDescription() { if (!this.showSearchDropdown) { @@ -123,14 +121,14 @@ export default { } if (this.showDefaultItems) { - return sprintf(this.$options.i18n.searchDescribedByDefault, { + return sprintf(this.$options.i18n.SEARCH_DESCRIBED_BY_DEFAULT, { count: this.searchOptions.length, }); } return this.loading - ? this.$options.i18n.searchResultsLoading - : sprintf(this.$options.i18n.searchDescribedByUpdated, { + ? this.$options.i18n.SEARCH_RESULTS_LOADING + : sprintf(this.$options.i18n.SEARCH_DESCRIBED_BY_UPDATED, { count: this.searchOptions.length, }); }, @@ -154,7 +152,7 @@ export default { return this.searchBarItem?.icon; }, scopeTokenTitle() { - return sprintf(this.$options.i18n.searchResultsScope, { + return sprintf(this.$options.i18n.SEARCH_RESULTS_SCOPE, { scope: this.infieldHelpContent, }); }, @@ -230,7 +228,7 @@ export default { <form v-outside="closeDropdown" role="search" - :aria-label="$options.i18n.searchGitlab" + :aria-label="$options.i18n.SEARCH_GITLAB" class="header-search gl-relative gl-rounded-base gl-w-full" :class="searchBarClasses" data-testid="header-search-form" @@ -243,7 +241,7 @@ export default { class="gl-z-index-1" data-qa-selector="search_term_field" autocomplete="off" - :placeholder="$options.i18n.searchGitlab" + :placeholder="$options.i18n.SEARCH_GITLAB" :aria-activedescendant="currentFocusedId" :aria-describedby="$options.SEARCH_INPUT_DESCRIPTION" @focus="openDropdown" @@ -267,7 +265,7 @@ export default { :size="16" />{{ getTruncatedScope( - sprintf($options.i18n.searchResultsScope, { + sprintf($options.i18n.SEARCH_RESULTS_SCOPE, { scope: infieldHelpContent, }), ) @@ -277,7 +275,7 @@ export default { v-show="!isFocused" v-gl-tooltip.bottom.hover.html class="gl-absolute gl-right-3 gl-top-0 gl-z-index-1 keyboard-shortcut-helper" - :title="$options.i18n.kbdHelp" + :title="$options.i18n.KBD_HELP" >/</kbd > <span :id="$options.SEARCH_INPUT_DESCRIPTION" role="region" class="gl-sr-only">{{ diff --git a/app/assets/javascripts/header_search/components/header_search_autocomplete_items.vue b/app/assets/javascripts/header_search/components/header_search_autocomplete_items.vue index c85fb4f4158..1838214def6 100644 --- a/app/assets/javascripts/header_search/components/header_search_autocomplete_items.vue +++ b/app/assets/javascripts/header_search/components/header_search_autocomplete_items.vue @@ -9,27 +9,23 @@ import { } from '@gitlab/ui'; import { mapState, mapGetters } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { s__ } from '~/locale'; import highlight from '~/lib/utils/highlight'; import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants'; import { truncateNamespace } from '~/lib/utils/text_utility'; - import { GROUPS_CATEGORY, PROJECTS_CATEGORY, MERGE_REQUEST_CATEGORY, ISSUES_CATEGORY, RECENT_EPICS_CATEGORY, - LARGE_AVATAR_PX, - SMALL_AVATAR_PX, -} from '../constants'; + AUTOCOMPLETE_ERROR_MESSAGE, +} from '~/vue_shared/global_search/constants'; +import { LARGE_AVATAR_PX, SMALL_AVATAR_PX } from '../constants'; export default { name: 'HeaderSearchAutocompleteItems', i18n: { - autocompleteErrorMessage: s__( - 'GlobalSearch|There was an error fetching search autocomplete suggestions.', - ), + AUTOCOMPLETE_ERROR_MESSAGE, }, components: { GlDropdownItem, @@ -165,7 +161,7 @@ export default { :dismissible="false" variant="danger" > - {{ $options.i18n.autocompleteErrorMessage }} + {{ $options.i18n.AUTOCOMPLETE_ERROR_MESSAGE }} </gl-alert> </div> </template> diff --git a/app/assets/javascripts/header_search/components/header_search_default_items.vue b/app/assets/javascripts/header_search/components/header_search_default_items.vue index 04deaba7b0f..f0d398297e9 100644 --- a/app/assets/javascripts/header_search/components/header_search_default_items.vue +++ b/app/assets/javascripts/header_search/components/header_search_default_items.vue @@ -1,12 +1,12 @@ <script> import { GlDropdownItem, GlDropdownSectionHeader } from '@gitlab/ui'; import { mapState, mapGetters } from 'vuex'; -import { __ } from '~/locale'; +import { ALL_GITLAB } from '~/vue_shared/global_search/constants'; export default { name: 'HeaderSearchDefaultItems', i18n: { - allGitLab: __('All GitLab'), + ALL_GITLAB, }, components: { GlDropdownSectionHeader, @@ -26,7 +26,7 @@ export default { return ( this.searchContext?.project?.name || this.searchContext?.group?.name || - this.$options.i18n.allGitLab + this.$options.i18n.ALL_GITLAB ); }, }, diff --git a/app/assets/javascripts/header_search/components/header_search_scoped_items.vue b/app/assets/javascripts/header_search/components/header_search_scoped_items.vue index f5be1bcb786..1ef88492b23 100644 --- a/app/assets/javascripts/header_search/components/header_search_scoped_items.vue +++ b/app/assets/javascripts/header_search/components/header_search_scoped_items.vue @@ -3,10 +3,14 @@ import { GlDropdownItem, GlIcon, GlToken } from '@gitlab/ui'; import { mapState, mapGetters } from 'vuex'; import { s__, sprintf } from '~/locale'; import { truncate } from '~/lib/utils/text_utility'; +import { SCOPED_SEARCH_ITEM_ARIA_LABEL } from '~/vue_shared/global_search/constants'; import { SCOPE_TOKEN_MAX_LENGTH } from '../constants'; export default { name: 'HeaderSearchScopedItems', + i18n: { + SCOPED_SEARCH_ITEM_ARIA_LABEL, + }, components: { GlDropdownItem, GlIcon, @@ -28,7 +32,7 @@ export default { return this.currentFocusedOption?.html_id === option.html_id; }, ariaLabel(option) { - return sprintf(s__('GlobalSearch| %{search} %{description} %{scope}'), { + return sprintf(this.$options.i18n.SCOPED_SEARCH_ITEM_ARIA_LABEL, { search: this.search, description: option.description || option.icon, scope: option.scope || '', diff --git a/app/assets/javascripts/header_search/constants.js b/app/assets/javascripts/header_search/constants.js index 65e113e5084..b9bb4e573fd 100644 --- a/app/assets/javascripts/header_search/constants.js +++ b/app/assets/javascripts/header_search/constants.js @@ -1,45 +1,9 @@ -import { s__ } from '~/locale'; - -export const MSG_ISSUES_ASSIGNED_TO_ME = s__('GlobalSearch|Issues assigned to me'); - -export const MSG_ISSUES_IVE_CREATED = s__("GlobalSearch|Issues I've created"); - -export const MSG_MR_ASSIGNED_TO_ME = s__('GlobalSearch|Merge requests assigned to me'); - -export const MSG_MR_IM_REVIEWER = s__("GlobalSearch|Merge requests that I'm a reviewer"); - -export const MSG_MR_IVE_CREATED = s__("GlobalSearch|Merge requests I've created"); - -export const MSG_IN_ALL_GITLAB = s__('GlobalSearch|all GitLab'); - -export const MSG_IN_GROUP = s__('GlobalSearch|group'); - -export const MSG_IN_PROJECT = s__('GlobalSearch|project'); - export const ICON_PROJECT = 'project'; export const ICON_GROUP = 'group'; export const ICON_SUBGROUP = 'subgroup'; -export const GROUPS_CATEGORY = s__('GlobalSearch|Groups'); - -export const PROJECTS_CATEGORY = s__('GlobalSearch|Projects'); - -export const USERS_CATEGORY = s__('GlobalSearch|Users'); - -export const ISSUES_CATEGORY = s__('GlobalSearch|Recent issues'); - -export const MERGE_REQUEST_CATEGORY = s__('GlobalSearch|Recent merge requests'); - -export const RECENT_EPICS_CATEGORY = s__('GlobalSearch|Recent epics'); - -export const IN_THIS_PROJECT_CATEGORY = s__('GlobalSearch|In this project'); - -export const SETTINGS_CATEGORY = s__('GlobalSearch|Settings'); - -export const HELP_CATEGORY = s__('GlobalSearch|Help'); - export const LARGE_AVATAR_PX = 32; export const SMALL_AVATAR_PX = 16; @@ -64,18 +28,6 @@ export const IS_SEARCHING = 'is-searching'; export const IS_FOCUSED = 'is-focused'; export const IS_NOT_FOCUSED = 'is-not-focused'; -export const DROPDOWN_ORDER = [ - MERGE_REQUEST_CATEGORY, - ISSUES_CATEGORY, - RECENT_EPICS_CATEGORY, - GROUPS_CATEGORY, - PROJECTS_CATEGORY, - USERS_CATEGORY, - IN_THIS_PROJECT_CATEGORY, - SETTINGS_CATEGORY, - HELP_CATEGORY, -]; - export const FETCH_TYPES = ['generic', 'search']; export const SEARCH_INPUT_FIELD_MAX_WIDTH = '640px'; diff --git a/app/assets/javascripts/header_search/store/getters.js b/app/assets/javascripts/header_search/store/getters.js index 3da9d2cd961..f86463b94d1 100644 --- a/app/assets/javascripts/header_search/store/getters.js +++ b/app/assets/javascripts/header_search/store/getters.js @@ -7,14 +7,16 @@ import { MSG_MR_ASSIGNED_TO_ME, MSG_MR_IM_REVIEWER, MSG_MR_IVE_CREATED, - ICON_GROUP, - ICON_SUBGROUP, - ICON_PROJECT, MSG_IN_ALL_GITLAB, PROJECTS_CATEGORY, GROUPS_CATEGORY, - SEARCH_SHORTCUTS_MIN_CHARACTERS, DROPDOWN_ORDER, +} from '~/vue_shared/global_search/constants'; +import { + ICON_GROUP, + ICON_SUBGROUP, + ICON_PROJECT, + SEARCH_SHORTCUTS_MIN_CHARACTERS, } from '../constants'; export const searchQuery = (state) => { @@ -36,6 +38,10 @@ export const searchQuery = (state) => { }; export const scopedIssuesPath = (state) => { + if (state.searchContext?.project?.id && !state.searchContext?.project_metadata?.issues_path) { + return false; + } + return ( state.searchContext?.project_metadata?.issues_path || state.searchContext?.group_metadata?.issues_path || @@ -54,7 +60,7 @@ export const scopedMRPath = (state) => { export const defaultSearchOptions = (state, getters) => { const userName = gon.current_username; - return [ + const issues = [ { html_id: 'default-issues-assigned', title: MSG_ISSUES_ASSIGNED_TO_ME, @@ -65,6 +71,9 @@ export const defaultSearchOptions = (state, getters) => { title: MSG_ISSUES_IVE_CREATED, url: `${getters.scopedIssuesPath}/?author_username=${userName}`, }, + ]; + + const mergeRequests = [ { html_id: 'default-mrs-assigned', title: MSG_MR_ASSIGNED_TO_ME, @@ -81,6 +90,7 @@ export const defaultSearchOptions = (state, getters) => { url: `${getters.scopedMRPath}/?author_username=${userName}`, }, ]; + return [...(getters.scopedIssuesPath ? issues : []), ...mergeRequests]; }; export const projectUrl = (state) => { diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue index 838debf1ceb..6bbad88715f 100644 --- a/app/assets/javascripts/ide/components/ide.vue +++ b/app/assets/javascripts/ide/components/ide.vue @@ -82,7 +82,7 @@ export default { eventHub.$on('skip-beforeunload', this.handleSkipBeforeUnload); if (this.themeName) - document.querySelector('.navbar-gitlab').classList.add(`theme-${this.themeName}`); + document.querySelector('.navbar-gitlab')?.classList.add(`theme-${this.themeName}`); }, destroyed() { eventHub.$off('skip-beforeunload', this.handleSkipBeforeUnload); diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue index dbfaeba9708..4d728bd35d4 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue @@ -1,7 +1,7 @@ <script> import { GlModal, GlButton } from '@gitlab/ui'; import { mapActions, mapState, mapGetters } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, sprintf } from '~/locale'; import { modalTypes } from '../../constants'; import { trimPathComponents, getPathParent } from '../../utils'; @@ -50,13 +50,13 @@ export default { actionPrimary() { return { text: this.buttonLabel, - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }; }, actionCancel() { return { text: i18n.cancelButtonText, - attributes: [{ variant: 'default' }], + attributes: { variant: 'default' }, }; }, isCreatingNewFile() { diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index b95f8bb5acb..9e29cd94a20 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -12,7 +12,7 @@ import { import { SourceEditorExtension } from '~/editor/extensions/source_editor_extension_base'; import { EditorWebIdeExtension } from '~/editor/extensions/source_editor_webide_ext'; import SourceEditor from '~/editor/source_editor'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import ModelManager from '~/ide/lib/common/model_manager'; import { defaultDiffEditorOptions, defaultEditorOptions } from '~/ide/lib/editor_options'; import { __ } from '~/locale'; @@ -27,6 +27,8 @@ import { performanceMarkAndMeasure } from '~/performance/utils'; import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue'; import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils'; import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; +import { markRaw } from '~/lib/utils/vue3compat/mark_raw'; + import { leftSidebarViews, viewerTypes, @@ -66,7 +68,7 @@ export default { images: {}, rules: {}, globalEditor: null, - modelManager: new ModelManager(), + modelManager: markRaw(new ModelManager()), isEditorLoading: true, unwatchCiYaml: null, SELivepreviewExtension: null, @@ -212,7 +214,7 @@ export default { }, mounted() { if (!this.globalEditor) { - this.globalEditor = new SourceEditor(); + this.globalEditor = markRaw(new SourceEditor()); } this.initEditor(); @@ -284,14 +286,16 @@ export default { const instanceOptions = isDiff ? defaultDiffEditorOptions : defaultEditorOptions; const method = isDiff ? EDITOR_DIFF_INSTANCE_FN : EDITOR_CODE_INSTANCE_FN; - this.editor = this.globalEditor[method]({ - el: this.$refs.editor, - blobPath: this.file.path, - blobGlobalId: this.file.key, - blobContent: this.content || this.file.content, - ...instanceOptions, - ...this.editorOptions, - }); + this.editor = markRaw( + this.globalEditor[method]({ + el: this.$refs.editor, + blobPath: this.file.path, + blobGlobalId: this.file.key, + blobContent: this.content || this.file.content, + ...instanceOptions, + ...this.editorOptions, + }), + ); this.editor.use([ { definition: SourceEditorExtension, diff --git a/app/assets/javascripts/ide/index.js b/app/assets/javascripts/ide/index.js index 29c44d2f596..967c83b320f 100644 --- a/app/assets/javascripts/ide/index.js +++ b/app/assets/javascripts/ide/index.js @@ -72,6 +72,7 @@ export const initLegacyWebIDE = (el, options = {}) => { environmentsGuidanceAlertDismissed: !parseBoolean(el.dataset.enableEnvironmentsGuidance), previewMarkdownPath: el.dataset.previewMarkdownPath, userPreferencesPath: el.dataset.userPreferencesPath, + learnGitlabSource: parseBoolean(el.dataset.learnGitlabSource), }); }, beforeDestroy() { diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js index b7445d3ad0a..0106eeae162 100644 --- a/app/assets/javascripts/ide/stores/actions.js +++ b/app/assets/javascripts/ide/stores/actions.js @@ -1,6 +1,6 @@ import { escape } from 'lodash'; import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status'; import { visitUrl } from '~/lib/utils/url_utility'; import { __, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index cd8088bf667..9f1eae03685 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { leftSidebarViews, PERMISSION_READ_MR, MAX_MR_FILES_AUTO_OPEN } from '../../constants'; import service from '../../services'; diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js index 7a6a267e7d0..f4fa52b2d4d 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -1,5 +1,5 @@ import { escape } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, sprintf } from '~/locale'; import { logError } from '~/lib/logger'; import api from '~/api'; diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index d490b8c5dad..572465f7587 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -1,6 +1,7 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { addNumericSuffix } from '~/ide/utils'; import { sprintf, __ } from '~/locale'; +import Tracking from '~/tracking'; import { leftSidebarViews } from '../../../constants'; import eventHub from '../../../eventhub'; import { parseCommitError } from '../../../lib/errors'; @@ -162,6 +163,10 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo ); } + if (rootState.learnGitlabSource) { + Tracking.event(undefined, 'commit', { label: 'web_ide_learn_gitlab_source' }); + } + dispatch('setLastCommitMessage', data); dispatch('updateCommitMessage', ''); return dispatch('updateFilesAfterCommit', { diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js b/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js index a7085c7d04c..b5bb2c7bdf8 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js @@ -2,9 +2,3 @@ export const scopes = { assigned: 'assigned-to-me', created: 'created-by-me', }; - -export const states = { - opened: 'opened', - closed: 'closed', - merged: 'merged', -}; diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/state.js b/app/assets/javascripts/ide/stores/modules/merge_requests/state.js index 4748ccfa2e6..0a2f778c715 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/state.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/state.js @@ -1,7 +1,7 @@ -import { states } from './constants'; +import { STATUS_OPEN } from '~/issues/constants'; export default () => ({ isLoading: false, mergeRequests: [], - state: states.opened, + state: STATUS_OPEN, }); diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js index 874cc5094d3..411ff0beaba 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_UNPROCESSABLE_ENTITY } from '~/lib/utils/http_status'; import * as terminalService from '../../../../services/terminals'; diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js index 4aa0768d394..463634c946d 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import * as messages from '../messages'; import * as types from '../mutation_types'; diff --git a/app/assets/javascripts/ide/stores/state.js b/app/assets/javascripts/ide/stores/state.js index 356bbf28a48..013a0c3ce8f 100644 --- a/app/assets/javascripts/ide/stores/state.js +++ b/app/assets/javascripts/ide/stores/state.js @@ -32,4 +32,5 @@ export default () => ({ environmentsGuidanceAlertDetected: false, previewMarkdownPath: '', userPreferencesPath: '', + learnGitlabSource: false, }); diff --git a/app/assets/javascripts/import_entities/components/group_dropdown.vue b/app/assets/javascripts/import_entities/components/group_dropdown.vue index f351a9a392f..5b9e80f9d68 100644 --- a/app/assets/javascripts/import_entities/components/group_dropdown.vue +++ b/app/assets/javascripts/import_entities/components/group_dropdown.vue @@ -3,7 +3,7 @@ import { GlDropdown, GlSearchBoxByType } from '@gitlab/ui'; import { debounce } from 'lodash'; import { s__ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import searchNamespacesWhereUserCanCreateProjectsQuery from '~/projects/new/queries/search_namespaces_where_user_can_create_projects.query.graphql'; import { DEBOUNCE_DELAY } from '~/vue_shared/components/filtered_search_bar/constants'; import { MINIMUM_SEARCH_LENGTH } from '~/graphql_shared/constants'; diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue index 6dc0b2cec24..ec2ab9d0c3d 100644 --- a/app/assets/javascripts/import_entities/components/import_status.vue +++ b/app/assets/javascripts/import_entities/components/import_status.vue @@ -7,21 +7,22 @@ import { STATUSES } from '../constants'; const STATISTIC_ITEMS = { diff_note: __('Diff notes'), issue: __('Issues'), - issue_attachment: s__('GithubImporter|Issue attachments'), + issue_attachment: s__('GithubImporter|Issue links'), issue_event: __('Issue events'), label: __('Labels'), lfs_object: __('LFS objects'), - merge_request_attachment: s__('GithubImporter|Merge request attachments'), + merge_request_attachment: s__('GithubImporter|Merge request links'), milestone: __('Milestones'), note: __('Notes'), - note_attachment: s__('GithubImporter|Note attachments'), + note_attachment: s__('GithubImporter|Note links'), protected_branch: __('Protected branches'), + collaborator: s__('GithubImporter|Collaborators'), pull_request: s__('GithubImporter|Pull requests'), pull_request_merged_by: s__('GithubImporter|PR mergers'), pull_request_review: s__('GithubImporter|PR reviews'), pull_request_review_request: s__('GithubImporter|PR reviews'), release: __('Releases'), - release_attachment: s__('GithubImporter|Release attachments'), + release_attachment: s__('GithubImporter|Release links'), }; // support both camel case and snake case versions diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue b/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue index ed7c9e7abe9..d91f314a86c 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue @@ -1,16 +1,9 @@ <script> -import { - GlButton, - GlDropdown, - GlDropdownItem, - GlIcon, - GlTooltipDirective as GlTooltip, -} from '@gitlab/ui'; +import { GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective as GlTooltip } from '@gitlab/ui'; export default { components: { GlIcon, - GlButton, GlDropdown, GlDropdownItem, }, @@ -18,10 +11,6 @@ export default { GlTooltip, }, props: { - isProjectsImportEnabled: { - type: Boolean, - required: true, - }, isFinished: { type: Boolean, required: true, @@ -46,7 +35,7 @@ export default { <template> <span class="gl-white-space-nowrap gl-inline-flex gl-align-items-center"> <gl-dropdown - v-if="isProjectsImportEnabled && (isAvailableForImport || isFinished)" + v-if="isAvailableForImport || isFinished" :text="isFinished ? __('Re-import with projects') : __('Import with projects')" :disabled="isInvalid" variant="confirm" @@ -59,16 +48,6 @@ export default { isFinished ? __('Re-import without projects') : __('Import without projects') }}</gl-dropdown-item> </gl-dropdown> - <gl-button - v-else-if="isAvailableForImport || isFinished" - :disabled="isInvalid" - variant="confirm" - category="secondary" - data-qa-selector="import_group_button" - @click="$emit('import-group')" - > - {{ isFinished ? __('Re-import') : __('Import') }} - </gl-button> <gl-icon v-if="isFinished" v-gl-tooltip diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue index 7d2ddd2176b..2e6e7cddf8f 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue @@ -1,7 +1,6 @@ <script> import { GlAlert, - GlButton, GlDropdown, GlDropdownItem, GlEmptyState, @@ -15,7 +14,7 @@ import { GlTooltipDirective, } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__, __, n__, sprintf } from '~/locale'; import { HTTP_STATUS_TOO_MANY_REQUESTS } from '~/lib/utils/http_status'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -50,7 +49,6 @@ const DEFAULT_TD_CLASSES = 'gl-vertical-align-top!'; export default { components: { GlAlert, - GlButton, GlDropdown, GlDropdownItem, GlEmptyState, @@ -106,7 +104,7 @@ export default { reimportRequests: [], importTargets: {}, unavailableFeaturesAlertVisible: true, - helpUrl: helpPagePath('ee/user/group/import', { + helpUrl: helpPagePath('user/group/import/index', { anchor: 'visibility-rules', }), }; @@ -165,10 +163,6 @@ export default { ], computed: { - isProjectsImportEnabled() { - return Boolean(this.glFeatures.bulkImportProjects); - }, - groups() { return this.bulkImportSourceGroups?.nodes ?? []; }, @@ -707,11 +701,11 @@ export default { </gl-sprintf> </span> <gl-dropdown - v-if="isProjectsImportEnabled" :text="s__('BulkImport|Import with projects')" :disabled="!hasSelectedGroups" variant="confirm" category="primary" + data-testid="import-selected-groups-dropdown" class="gl-ml-4" split @click="importSelectedGroups({ migrateProjects: true })" @@ -720,15 +714,6 @@ export default { {{ s__('BulkImport|Import without projects') }} </gl-dropdown-item> </gl-dropdown> - <gl-button - v-else - category="primary" - variant="confirm" - class="gl-ml-4" - :disabled="!hasSelectedGroups" - @click="importSelectedGroups" - >{{ s__('BulkImport|Import selected') }}</gl-button - > <span class="gl-ml-3"> <gl-icon name="information-o" :size="12" class="gl-text-blue-600" /> <gl-sprintf @@ -804,7 +789,6 @@ export default { </template> <template #cell(actions)="{ item: group, index }"> <import-actions-cell - :is-projects-import-enabled="isProjectsImportEnabled" :is-finished="group.flags.isFinished" :is-available-for-import="group.flags.isAvailableForImport" :is-invalid="group.flags.isInvalid" diff --git a/app/assets/javascripts/import_entities/import_groups/index.js b/app/assets/javascripts/import_entities/import_groups/index.js index 494a845b1f9..8efc6484794 100644 --- a/app/assets/javascripts/import_entities/import_groups/index.js +++ b/app/assets/javascripts/import_entities/import_groups/index.js @@ -31,6 +31,7 @@ export function mountImportGroupsApp(mountElement) { return new Vue({ el: mountElement, + name: 'ImportGroupsRoot', apolloProvider, render(createElement) { return createElement(ImportTable, { diff --git a/app/assets/javascripts/import_entities/import_groups/services/status_poller.js b/app/assets/javascripts/import_entities/import_groups/services/status_poller.js index 6ad5e448a40..10496fce11b 100644 --- a/app/assets/javascripts/import_entities/import_groups/services/status_poller.js +++ b/app/assets/javascripts/import_entities/import_groups/services/status_poller.js @@ -1,5 +1,5 @@ import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import Poll from '~/lib/utils/poll'; import { s__ } from '~/locale'; diff --git a/app/assets/javascripts/import_entities/import_projects/index.js b/app/assets/javascripts/import_entities/import_projects/index.js index 485511510f7..66ffd378426 100644 --- a/app/assets/javascripts/import_entities/import_projects/index.js +++ b/app/assets/javascripts/import_entities/import_projects/index.js @@ -69,10 +69,13 @@ export default function mountImportProjectsTable({ return new Vue({ el: mountElement, + name: 'ImportProjectsRoot', store, apolloProvider, render(createElement) { - return createElement(Component, { props: { ...props, ...extraProps(mountElement.dataset) } }); + // We are using attrs instead of props so root-level component with inheritAttrs + // will be able to pass them down + return createElement(Component, { attrs: { ...props, ...extraProps(mountElement.dataset) } }); }, }); } diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js index e0db585eb3e..e3c32028b13 100644 --- a/app/assets/javascripts/import_entities/import_projects/store/actions.js +++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js @@ -1,6 +1,6 @@ import Visibility from 'visibilityjs'; import _ from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { HTTP_STATUS_TOO_MANY_REQUESTS } from '~/lib/utils/http_status'; @@ -141,7 +141,7 @@ const fetchImportFactory = (importPath = isRequired()) => ( }) .catch((e) => { const serverErrorMessage = e?.response?.data?.errors; - const flashMessage = serverErrorMessage + const alertMessage = serverErrorMessage ? sprintf( s__('ImportProjects|Importing the project failed: %{reason}'), { @@ -152,7 +152,7 @@ const fetchImportFactory = (importPath = isRequired()) => ( : s__('ImportProjects|Importing the project failed'); createAlert({ - message: flashMessage, + message: alertMessage, }); commit(types.RECEIVE_IMPORT_ERROR, repoId); @@ -179,7 +179,7 @@ export const cancelImportFactory = (cancelImportPath) => ({ state, commit }, { r }) .catch((e) => { const serverErrorMessage = e?.response?.data?.errors; - const flashMessage = serverErrorMessage + const alertMessage = serverErrorMessage ? sprintf( s__('ImportProjects|Cancelling project import failed: %{reason}'), { @@ -190,7 +190,7 @@ export const cancelImportFactory = (cancelImportPath) => ({ state, commit }, { r : s__('ImportProjects|Cancelling project import failed'); createAlert({ - message: flashMessage, + message: alertMessage, }); }); }; diff --git a/app/assets/javascripts/incidents/constants.js b/app/assets/javascripts/incidents/constants.js index ee3f30de880..dde40ec2983 100644 --- a/app/assets/javascripts/incidents/constants.js +++ b/app/assets/javascripts/incidents/constants.js @@ -44,7 +44,6 @@ export const ESCALATION_STATUSES = { RESOLVED: s__('AlertManagement|Resolved'), }; -export const DEFAULT_PAGE_SIZE = 20; export const TH_CREATED_AT_TEST_ID = { 'data-testid': 'incident-management-created-at-sort' }; export const TH_SEVERITY_TEST_ID = { 'data-testid': 'incident-management-severity-sort' }; export const TH_ESCALATION_STATUS_TEST_ID = { 'data-testid': 'incident-management-status-sort' }; diff --git a/app/assets/javascripts/incidents_settings/incidents_settings_service.js b/app/assets/javascripts/incidents_settings/incidents_settings_service.js index d3850114350..195544c746e 100644 --- a/app/assets/javascripts/incidents_settings/incidents_settings_service.js +++ b/app/assets/javascripts/incidents_settings/incidents_settings_service.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; import { ERROR_MSG } from './constants'; diff --git a/app/assets/javascripts/init_deprecated_notes.js b/app/assets/javascripts/init_deprecated_notes.js index 5f918b0d2f5..8657a1dcb67 100644 --- a/app/assets/javascripts/init_deprecated_notes.js +++ b/app/assets/javascripts/init_deprecated_notes.js @@ -2,9 +2,9 @@ import Notes from './deprecated_notes'; export default () => { const dataEl = document.querySelector('.js-notes-data'); - const { notesUrl, notesIds, now, diffView, enableGFM } = JSON.parse(dataEl.innerHTML); + const { notesUrl, now, diffView, enableGFM } = JSON.parse(dataEl.innerHTML); // Create a singleton so that we don't need to assign // into the window object, we can just access the current isntance with Notes.instance - Notes.initialize(notesUrl, notesIds, now, diffView, enableGFM); + Notes.initialize(notesUrl, now, diffView, enableGFM); }; diff --git a/app/assets/javascripts/integrations/constants.js b/app/assets/javascripts/integrations/constants.js index 5d08520bb5c..6b5a828c009 100644 --- a/app/assets/javascripts/integrations/constants.js +++ b/app/assets/javascripts/integrations/constants.js @@ -32,6 +32,8 @@ export const integrationFormSections = { JIRA_TRIGGER: 'jira_trigger', JIRA_ISSUES: 'jira_issues', TRIGGER: 'trigger', + APPLE_APP_STORE: 'apple_app_store', + GOOGLE_PLAY: 'google_play', }; export const integrationFormSectionComponents = { @@ -40,6 +42,8 @@ export const integrationFormSectionComponents = { [integrationFormSections.JIRA_TRIGGER]: 'IntegrationSectionJiraTrigger', [integrationFormSections.JIRA_ISSUES]: 'IntegrationSectionJiraIssues', [integrationFormSections.TRIGGER]: 'IntegrationSectionTrigger', + [integrationFormSections.APPLE_APP_STORE]: 'IntegrationSectionAppleAppStore', + [integrationFormSections.GOOGLE_PLAY]: 'IntegrationSectionGooglePlay', }; export const integrationTriggerEvents = { @@ -90,7 +94,7 @@ export const billingPlanNames = { [billingPlans.ULTIMATE]: s__('BillingPlans|Ultimate'), }; -export const INTEGRATION_TYPE_SLACK = 'slack'; +const INTEGRATION_TYPE_SLACK = 'slack'; const INTEGRATION_TYPE_SLACK_APPLICATION = 'gitlab_slack_application'; const INTEGRATION_TYPE_MATTERMOST = 'mattermost'; diff --git a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue index bc6aa231a93..024f562b71d 100644 --- a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue +++ b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue @@ -11,7 +11,7 @@ export default { primaryProps() { return { text: __('Save'), - attributes: [{ variant: 'confirm' }, { category: 'primary' }], + attributes: { variant: 'confirm', category: 'primary' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue index d671ec33bcb..f119668048d 100644 --- a/app/assets/javascripts/integrations/edit/components/integration_form.vue +++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue @@ -59,9 +59,6 @@ export default { return this.propsSource.editable; }, hasSections() { - if (this.hasSlackNotificationsDisabled) { - return false; - } return this.customState.sections.length !== 0; }, fieldsWithoutSection() { @@ -70,17 +67,11 @@ export default { : this.propsSource.fields; }, hasFieldsWithoutSection() { - if (this.hasSlackNotificationsDisabled) { - return false; - } return this.fieldsWithoutSection.length; }, isSlackIntegration() { return this.propsSource.type === INTEGRATION_FORM_TYPE_SLACK; }, - hasSlackNotificationsDisabled() { - return this.isSlackIntegration && !this.glFeatures.integrationSlackAppNotifications; - }, showHelpHtml() { if (this.isSlackIntegration) { return this.helpHtml; @@ -90,7 +81,6 @@ export default { shouldUpgradeSlack() { return ( this.isSlackIntegration && - this.glFeatures.integrationSlackAppNotifications && this.customState.shouldUpgradeSlack && (this.hasFieldsWithoutSection || this.hasSections) ); diff --git a/app/assets/javascripts/integrations/edit/components/integration_forms/section.vue b/app/assets/javascripts/integrations/edit/components/integration_forms/section.vue index ce39954735a..5335b7b6ee2 100644 --- a/app/assets/javascripts/integrations/edit/components/integration_forms/section.vue +++ b/app/assets/javascripts/integrations/edit/components/integration_forms/section.vue @@ -28,6 +28,14 @@ export default { import( /* webpackChunkName: 'integrationSectionTrigger' */ '~/integrations/edit/components/sections/trigger.vue' ), + IntegrationSectionAppleAppStore: () => + import( + /* webpackChunkName: 'IntegrationSectionAppleAppStore' */ '~/integrations/edit/components/sections/apple_app_store.vue' + ), + IntegrationSectionGooglePlay: () => + import( + /* webpackChunkName: 'IntegrationSectionGooglePlay' */ '~/integrations/edit/components/sections/google_play.vue' + ), }, directives: { SafeHtml, diff --git a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue index 41cd650f932..e766064a69b 100644 --- a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue +++ b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue @@ -9,7 +9,7 @@ export default { }, primaryProps: { text: __('Reset'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, cancelProps: { text: __('Cancel'), diff --git a/app/assets/javascripts/integrations/edit/components/sections/apple_app_store.vue b/app/assets/javascripts/integrations/edit/components/sections/apple_app_store.vue new file mode 100644 index 00000000000..775600a9a62 --- /dev/null +++ b/app/assets/javascripts/integrations/edit/components/sections/apple_app_store.vue @@ -0,0 +1,73 @@ +<script> +import { mapGetters } from 'vuex'; +import { sprintf, s__ } from '~/locale'; +import UploadDropzoneField from '../upload_dropzone_field.vue'; +import Connection from './connection.vue'; + +export default { + name: 'IntegrationSectionAppleAppStore', + components: { + Connection, + UploadDropzoneField, + }, + data() { + return { + dropzoneAllowList: ['.p8'], + }; + }, + i18n: { + dropzoneDescription: s__( + 'AppleAppStore|Drag your Private Key file here or %{linkStart}click to upload%{linkEnd}.', + ), + dropzoneErrorMessage: s__( + 'AppleAppStore|Error: You are trying to upload something other than a Private Key file.', + ), + dropzoneConfirmMessage: s__('AppleAppStore|Drop your Private Key file to start the upload.'), + dropzoneEmptyInputName: s__('AppleAppStore|The Apple App Store Connect Private Key (.p8)'), + dropzoneNonEmptyInputName: s__( + 'AppleAppStore|Upload a new Apple App Store Connect Private Key (replace %{currentFileName})', + ), + dropzoneNonEmptyInputHelp: s__('AppleAppStore|Leave empty to use your current Private Key.'), + }, + computed: { + ...mapGetters(['propsSource']), + dynamicFields() { + return this.propsSource.fields.filter( + (field) => field.name !== 'app_store_private_key_file_name', + ); + }, + fileNameField() { + return this.propsSource.fields.find( + (field) => field.name === 'app_store_private_key_file_name', + ); + }, + dropzoneLabel() { + return this.fileNameField.value + ? sprintf(this.$options.i18n.dropzoneNonEmptyInputName, { + currentFileName: this.fileNameField.value, + }) + : this.$options.i18n.dropzoneEmptyInputName; + }, + dropzoneHelpText() { + return this.fileNameField.value ? this.$options.i18n.dropzoneNonEmptyInputHelp : ''; + }, + }, +}; +</script> + +<template> + <span> + <connection :fields="dynamicFields" /> + + <upload-dropzone-field + name="service[app_store_private_key]" + :label="dropzoneLabel" + :help-text="dropzoneHelpText" + file-input-name="service[app_store_private_key_file_name]" + :allow-list="dropzoneAllowList" + :description="$options.i18n.dropzoneDescription" + :error-message="$options.i18n.dropzoneErrorMessage" + :confirm-message="$options.i18n.dropzoneConfirmMessage" + /> + </span> +</template> diff --git a/app/assets/javascripts/integrations/edit/components/sections/google_play.vue b/app/assets/javascripts/integrations/edit/components/sections/google_play.vue new file mode 100644 index 00000000000..3094e24241a --- /dev/null +++ b/app/assets/javascripts/integrations/edit/components/sections/google_play.vue @@ -0,0 +1,75 @@ +<script> +import { mapGetters } from 'vuex'; +import { sprintf, s__ } from '~/locale'; +import UploadDropzoneField from '../upload_dropzone_field.vue'; +import Connection from './connection.vue'; + +export default { + name: 'IntegrationSectionGooglePlay', + components: { + Connection, + UploadDropzoneField, + }, + data() { + return { + dropzoneAllowList: ['.json'], + }; + }, + i18n: { + dropzoneDescription: s__( + 'GooglePlay|Drag your key file here or %{linkStart}click to upload%{linkEnd}.', + ), + dropzoneErrorMessage: s__( + "GooglePlay|Error: The file you're trying to upload is not a service account key.", + ), + dropzoneConfirmMessage: s__('GooglePlay|Drag your key file to start the upload.'), + dropzoneEmptyInputName: s__('GooglePlay|Service account key (.json)'), + dropzoneNonEmptyInputName: s__( + 'GooglePlay|Upload a new service account key (replace %{currentFileName})', + ), + dropzoneNoneEmpyInputHelp: s__( + 'GooglePlay|Leave empty to use your current service account key.', + ), + }, + computed: { + ...mapGetters(['propsSource']), + dynamicFields() { + return this.propsSource.fields.filter( + (field) => field.name !== 'service_account_key_file_name', + ); + }, + fileNameField() { + return this.propsSource.fields.find( + (field) => field.name === 'service_account_key_file_name', + ); + }, + dropzoneLabel() { + return this.fileNameField.value + ? sprintf(this.$options.i18n.dropzoneNonEmptyInputName, { + currentFileName: this.fileNameField.value, + }) + : this.$options.i18n.dropzoneEmptyInputName; + }, + dropzoneHelpText() { + return this.fileNameField.value ? this.$options.i18n.dropzoneNoneEmpyInputHelp : ''; + }, + }, +}; +</script> + +<template> + <span> + <connection :fields="dynamicFields" /> + + <upload-dropzone-field + name="service[service_account_key]" + :label="dropzoneLabel" + :help-text="dropzoneHelpText" + file-input-name="service[service_account_key_file_name]" + :allow-list="dropzoneAllowList" + :description="$options.i18n.dropzoneDescription" + :error-message="$options.i18n.dropzoneErrorMessage" + :confirm-message="$options.i18n.dropzoneConfirmMessage" + /> + </span> +</template> diff --git a/app/assets/javascripts/integrations/edit/components/upload_dropzone_field.vue b/app/assets/javascripts/integrations/edit/components/upload_dropzone_field.vue new file mode 100644 index 00000000000..fbed2547c05 --- /dev/null +++ b/app/assets/javascripts/integrations/edit/components/upload_dropzone_field.vue @@ -0,0 +1,143 @@ +<script> +import { GlLink, GlSprintf, GlAlert, GlFormGroup } from '@gitlab/ui'; +import { validateFileFromAllowList } from '~/lib/utils/file_upload'; +import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue'; +import { s__ } from '~/locale'; + +const i18n = Object.freeze({ + description: s__('Integrations|Drag your file here or %{linkStart}click to upload%{linkEnd}.'), + errorMessage: s__( + 'Integrations|Error: You are trying to upload something other than an allowed file.', + ), + confirmMessage: s__('Integrations|Drop your file to start the upload.'), +}); + +export default { + name: 'UploadDropzoneField', + components: { + UploadDropzone, + GlLink, + GlSprintf, + GlAlert, + GlFormGroup, + }, + i18n, + props: { + name: { + type: String, + required: true, + default: null, + }, + label: { + type: String, + required: true, + default: null, + }, + helpText: { + type: String, + required: false, + default: null, + }, + fileInputName: { + type: String, + required: true, + default: null, + }, + allowList: { + type: Array, + required: false, + default: null, + }, + description: { + type: String, + required: false, + default: i18n.description, + }, + errorMessage: { + type: String, + required: false, + default: i18n.errorMessage, + }, + confirmMessage: { + type: String, + required: false, + default: i18n.confirmMessage, + }, + }, + data() { + return { + fileName: null, + fileContents: null, + uploadError: false, + inputDisabled: true, + }; + }, + computed: { + dropzoneDescription() { + return this.fileName ?? this.description; + }, + }, + methods: { + clearError() { + this.uploadError = false; + }, + onChange(file) { + this.clearError(); + this.inputDisabled = false; + this.fileName = file?.name; + this.readFile(file); + }, + isValidFileType(file) { + return validateFileFromAllowList(file.name, this.allowList); + }, + onError() { + this.uploadError = this.errorMessage; + }, + readFile(file) { + const reader = new FileReader(); + reader.readAsText(file); + reader.onload = (evt) => { + this.fileContents = evt.target.result; + }; + }, + }, +}; +</script> +<template> + <gl-form-group :label="label" :label-for="name"> + <upload-dropzone + input-field-name="service[dropzone_file_name]" + :is-file-valid="isValidFileType" + :valid-file-mimetypes="allowList" + :should-update-input-on-file-drop="true" + :single-file-selection="true" + :enable-drag-behavior="false" + :drop-to-start-message="confirmMessage" + @change="onChange" + @error="onError" + > + <template #upload-text="{ openFileUpload }"> + <gl-sprintf :message="dropzoneDescription"> + <template #link="{ content }"> + <gl-link @click.stop="openFileUpload">{{ content }}</gl-link> + </template> + </gl-sprintf> + </template> + + <template #invalid-drag-data-slot> + {{ errorMessage }} + </template> + </upload-dropzone> + <gl-alert v-if="uploadError" variant="danger" :dismissible="true" @dismiss="clearError"> + {{ uploadError }} + </gl-alert> + <input :name="name" type="hidden" :disabled="inputDisabled" :value="fileContents || false" /> + <input + :name="fileInputName" + type="hidden" + :disabled="inputDisabled" + :value="fileName || false" + /> + <span>{{ helpText }}</span> + </gl-form-group> +</template> diff --git a/app/assets/javascripts/integrations/index/components/integrations_table.vue b/app/assets/javascripts/integrations/index/components/integrations_table.vue index 62f0fe4d6bf..439c243f418 100644 --- a/app/assets/javascripts/integrations/index/components/integrations_table.vue +++ b/app/assets/javascripts/integrations/index/components/integrations_table.vue @@ -1,9 +1,7 @@ <script> import { GlIcon, GlLink, GlTable, GlTooltipDirective } from '@gitlab/ui'; -import { INTEGRATION_TYPE_SLACK } from '~/integrations/constants'; import { sprintf, s__, __ } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { components: { @@ -15,7 +13,6 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, - mixins: [glFeatureFlagsMixin()], props: { integrations: { type: Array, @@ -58,15 +55,6 @@ export default { }, ]; }, - filteredIntegrations() { - if (this.glFeatures.integrationSlackAppNotifications) { - return this.integrations.filter( - (integration) => - !(integration.name === INTEGRATION_TYPE_SLACK && integration.active === false), - ); - } - return this.integrations; - }, }, methods: { getStatusTooltipTitle(integration) { @@ -79,7 +67,7 @@ export default { </script> <template> - <gl-table :items="filteredIntegrations" :fields="fields" :empty-text="emptyText" show-empty fixed> + <gl-table :items="integrations" :fields="fields" :empty-text="emptyText" show-empty fixed> <template #cell(active)="{ item }"> <gl-icon v-if="item.active" diff --git a/app/assets/javascripts/invite_members/components/group_select.vue b/app/assets/javascripts/invite_members/components/group_select.vue index e7f5211dc25..0e9781d77fe 100644 --- a/app/assets/javascripts/invite_members/components/group_select.vue +++ b/app/assets/javascripts/invite_members/components/group_select.vue @@ -114,6 +114,7 @@ export default { defaultFetchOptions: { exclude_internal: true, active: true, + order_by: 'similarity', }, }; </script> diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue index 607c888b85a..812e39e6392 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -51,6 +51,8 @@ export default { MembersTokenSelect, ModalConfetti, UserLimitNotification, + ActiveTrialNotification: () => + import('ee_component/invite_members/components/active_trial_notification.vue'), }, mixins: [Tracking.mixin({ category: INVITE_MEMBER_MODAL_TRACKING_CATEGORY })], inject: ['newProjectPath'], @@ -421,7 +423,6 @@ export default { :new-users-to-invite="newUsersToInvite" :root-group-id="rootId" :users-limit-dataset="usersLimitDataset" - :active-trial-dataset="activeTrialDataset" :full-path="fullPath" @close="onClose" @cancel="onCancel" @@ -504,6 +505,10 @@ export default { </div> </template> + <template #active-trial-alert> + <active-trial-notification v-if="!isCelebration" :active-trial-dataset="activeTrialDataset" /> + </template> + <template #select="{ exceptionState, inputId }"> <members-token-select v-model="newUsersToInvite" diff --git a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue index 42645110e48..6d1a3ceba16 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue @@ -1,15 +1,16 @@ <script> -import { GlButton, GlLink, GlIcon } from '@gitlab/ui'; +import { GlButton, GlLink, GlDropdownItem } from '@gitlab/ui'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; import { TRIGGER_ELEMENT_BUTTON, - TRIGGER_ELEMENT_SIDE_NAV, TRIGGER_DEFAULT_QA_SELECTOR, + TRIGGER_ELEMENT_WITH_EMOJI, + TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI, } from '../constants'; export default { - components: { GlButton, GlLink, GlIcon }, + components: { GlButton, GlLink, GlDropdownItem }, props: { displayText: { type: String, @@ -40,16 +41,6 @@ export default { required: false, default: 'button', }, - event: { - type: String, - required: false, - default: '', - }, - label: { - type: String, - required: false, - default: '', - }, qaSelector: { type: String, required: false, @@ -58,21 +49,11 @@ export default { }, computed: { componentAttributes() { - const baseAttributes = { + return { class: this.classes, 'data-qa-selector': this.qaSelector, 'data-test-id': 'invite-members-button', }; - - if (this.event && this.label) { - return { - ...baseAttributes, - 'data-track-action': this.event, - 'data-track-label': this.label, - }; - } - - return baseAttributes; }, }, methods: { @@ -84,7 +65,8 @@ export default { }, }, TRIGGER_ELEMENT_BUTTON, - TRIGGER_ELEMENT_SIDE_NAV, + TRIGGER_ELEMENT_WITH_EMOJI, + TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI, }; </script> @@ -99,16 +81,22 @@ export default { {{ displayText }} </gl-button> <gl-link - v-else-if="checkTrigger($options.TRIGGER_ELEMENT_SIDE_NAV)" + v-else-if="checkTrigger($options.TRIGGER_ELEMENT_WITH_EMOJI)" v-bind="componentAttributes" - data-is-link="true" @click="openModal" > - <span class="nav-icon-container"> - <gl-icon :name="icon" /> - </span> - <span class="nav-item-name"> {{ displayText }} </span> + {{ displayText }} + <gl-emoji class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" :data-name="icon" /> </gl-link> + <gl-dropdown-item + v-else-if="checkTrigger($options.TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI)" + v-bind="componentAttributes" + button-class="top-nav-menu-item" + @click="openModal" + > + {{ displayText }} + <gl-emoji class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" :data-name="icon" /> + </gl-dropdown-item> <gl-link v-else v-bind="componentAttributes" data-is-link="true" @click="openModal"> {{ displayText }} </gl-link> diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue index 1e3b6093f0b..20dc32b3c9b 100644 --- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue +++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue @@ -1,5 +1,14 @@ <script> -import { GlFormGroup, GlFormSelect, GlModal, GlDatepicker, GlLink, GlSprintf } from '@gitlab/ui'; +import { + GlFormGroup, + GlFormSelect, + GlModal, + GlDatepicker, + GlLink, + GlSprintf, + GlButton, +} from '@gitlab/ui'; + import Tracking from '~/tracking'; import { sprintf } from '~/locale'; import ContentTransition from '~/vue_shared/components/content_transition.vue'; @@ -33,6 +42,7 @@ export default { GlLink, GlModal, GlSprintf, + GlButton, ContentTransition, }, mixins: [Tracking.mixin()], @@ -246,13 +256,10 @@ export default { data-qa-selector="invite_members_modal_content" data-testid="invite-modal" size="sm" + dialog-class="gl-mx-5" :title="modalTitle" :header-close-label="$options.HEADER_CLOSE_LABEL" - :action-primary="actionPrimary" - :action-cancel="actionCancel" @shown="onShowModal" - @primary="onSubmit" - @cancel="onCancel" @close="onClose" @hidden="onReset" > @@ -330,5 +337,29 @@ export default { <slot :name="key"></slot> </template> </content-transition> + + <template #modal-footer> + <div + class="gl-m-0 gl-xs-w-full gl-display-flex gl-xs-flex-direction-column! gl-flex-direction-row-reverse" + > + <gl-button + class="gl-xs-w-full gl-xs-mb-3! gl-sm-ml-3!" + data-testid="invite-modal-submit" + v-bind="actionPrimary.attributes" + @click="onSubmit" + > + {{ actionPrimary.text }} + </gl-button> + + <gl-button + class="gl-xs-w-full" + data-testid="invite-modal-cancel" + v-bind="actionCancel.attributes" + @click="onCancel" + > + {{ actionCancel.text }} + </gl-button> + </div> + </template> </gl-modal> </template> diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js index ac0b708c55e..86badd16d6c 100644 --- a/app/assets/javascripts/invite_members/constants.js +++ b/app/assets/javascripts/invite_members/constants.js @@ -19,7 +19,9 @@ export const GROUP_FILTERS = { export const USERS_FILTER_ALL = 'all'; export const USERS_FILTER_SAML_PROVIDER_ID = 'saml_provider_id'; export const TRIGGER_ELEMENT_BUTTON = 'button'; -export const TRIGGER_ELEMENT_SIDE_NAV = 'side-nav'; +export const TOP_NAV_INVITE_MEMBERS_COMPONENT = 'invite_members'; +export const TRIGGER_ELEMENT_WITH_EMOJI = 'text-emoji'; +export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji'; export const INVITE_MEMBER_MODAL_TRACKING_CATEGORY = 'invite_members_modal'; export const TRIGGER_DEFAULT_QA_SELECTOR = 'invite_members_button'; export const MEMBERS_MODAL_DEFAULT_TITLE = s__('InviteMembersModal|Invite members'); @@ -76,7 +78,6 @@ export const READ_MORE_TEXT = s__( export const INVITE_BUTTON_TEXT = s__('InviteMembersModal|Invite'); export const INVITE_BUTTON_TEXT_DISABLED = s__('InviteMembersModal|Manage members'); export const CANCEL_BUTTON_TEXT = s__('InviteMembersModal|Cancel'); -export const CANCEL_BUTTON_TEXT_DISABLED = s__('InviteMembersModal|Explore paid plans'); export const HEADER_CLOSE_LABEL = s__('InviteMembersModal|Close invite team members'); export const MEMBER_ERROR_LIST_TEXT = s__( 'InviteMembersModal|Review the invite errors and try again:', diff --git a/app/assets/javascripts/invite_members/utils/trigger_successful_invite_alert.js b/app/assets/javascripts/invite_members/utils/trigger_successful_invite_alert.js index 4d3a7951265..e556582742b 100644 --- a/app/assets/javascripts/invite_members/utils/trigger_successful_invite_alert.js +++ b/app/assets/javascripts/invite_members/utils/trigger_successful_invite_alert.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import AccessorUtilities from '~/lib/utils/accessor'; import { TOAST_MESSAGE_LOCALSTORAGE_KEY, TOAST_MESSAGE_SUCCESSFUL } from '../constants'; diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue index 736da92fa9f..c1de507cd80 100644 --- a/app/assets/javascripts/issuable/components/csv_export_modal.vue +++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue @@ -1,7 +1,7 @@ <script> import { GlModal, GlSprintf, GlIcon } from '@gitlab/ui'; +import { TYPE_ISSUE } from '~/issues/constants'; import { __, n__ } from '~/locale'; -import { ISSUABLE_TYPE } from '../constants'; export default { actionCancel: { @@ -19,7 +19,7 @@ export default { }, inject: { issuableType: { - default: ISSUABLE_TYPE.issues, + default: TYPE_ISSUE, }, email: { default: '', @@ -47,14 +47,17 @@ export default { href: this.exportCsvPath, variant: 'confirm', 'data-method': 'post', - 'data-qa-selector': `export_${this.issuableType}_button`, + 'data-qa-selector': `export_issues_button`, 'data-track-action': 'click_button', - 'data-track-label': `export_${this.issuableType}_csv`, + 'data-track-label': this.dataTrackLabel, }, }; }, isIssue() { - return this.issuableType === ISSUABLE_TYPE.issues; + return this.issuableType === TYPE_ISSUE; + }, + dataTrackLabel() { + return this.isIssue ? 'export_issues_csv' : 'export_merge-requests_csv'; }, exportText() { return this.isIssue ? __('Export issues') : __('Export merge requests'); diff --git a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue index dadb1419649..2cc01c302ec 100644 --- a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue +++ b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue @@ -7,8 +7,8 @@ import { GlTooltipDirective, GlModalDirective, } from '@gitlab/ui'; +import { TYPE_ISSUE } from '~/issues/constants'; import { __ } from '~/locale'; -import { ISSUABLE_TYPE } from '../constants'; import CsvExportModal from './csv_export_modal.vue'; import CsvImportModal from './csv_import_modal.vue'; @@ -34,7 +34,7 @@ export default { }, inject: { issuableType: { - default: ISSUABLE_TYPE.issues, + default: TYPE_ISSUE, }, showExportButton: { default: false, diff --git a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue index 0e58f3793bc..03f10e9e812 100644 --- a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue +++ b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue @@ -2,7 +2,7 @@ import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { mapGetters } from 'vuex'; import { sprintf, __ } from '~/locale'; -import { TYPE_ISSUE, WorkspaceType } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST, WORKSPACE_PROJECT } from '~/issues/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue'; @@ -13,7 +13,7 @@ const NoteableTypeText = { export default { TYPE_ISSUE, - WorkspaceType, + WORKSPACE_PROJECT, components: { GlIcon, ConfidentialityBadge, @@ -32,7 +32,7 @@ export default { return this.getNoteableData.confidential; }, isMergeRequest() { - return this.getNoteableData.targetType === 'merge_request'; + return this.getNoteableData.targetType === TYPE_MERGE_REQUEST; }, warningIconsMeta() { return [ @@ -60,7 +60,7 @@ export default { <confidentiality-badge v-if="isConfidential" data-testid="confidential" - :workspace-type="$options.WorkspaceType.project" + :workspace-type="$options.WORKSPACE_PROJECT" :issuable-type="$options.TYPE_ISSUE" /> <template v-for="meta in warningIconsMeta"> diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue index 608c1deac64..c4b9bdb150b 100644 --- a/app/assets/javascripts/issuable/components/related_issuable_item.vue +++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue @@ -101,26 +101,22 @@ export default { :class="{ 'issuable-info-container': !canReorder, 'card-body': canReorder, - 'gl-pr-2': canRemove, }" - class="item-body d-flex align-items-center gl-py-3 gl-px-5" + class="item-body gl-display-flex gl-align-items-center gl-gap-3 gl-mx-n2" > <div - class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 flex-xl-nowrap gl-min-h-7" + class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 gl-gap-2 gl-px-3 gl-py-2 py-xl-0 flex-xl-nowrap gl-min-h-7" > <!-- Title area: Status icon (XL) and title --> - <div class="item-title d-flex align-items-xl-center mb-xl-0 gl-min-w-0"> - <div ref="iconElementXL"> - <gl-icon - v-if="hasState" - ref="iconElementXL" - class="gl-mr-3" - :class="iconClasses" - :name="iconName" - :title="stateTitle" - :aria-label="state" - /> - </div> + <div class="item-title gl-display-flex gl-gap-3 gl-min-w-0"> + <gl-icon + v-if="hasState" + ref="iconElementXL" + :class="iconClasses" + :name="iconName" + :title="stateTitle" + :aria-label="state" + /> <gl-tooltip :target="() => $refs.iconElementXL"> <span v-safe-html="stateTitle"></span> </gl-tooltip> @@ -129,42 +125,46 @@ export default { v-gl-tooltip name="eye-slash" :title="__('Confidential')" - class="confidential-icon gl-mr-2 align-self-baseline align-self-md-auto mt-xl-0" + class="confidential-icon" :aria-label="__('Confidential')" /> - <gl-link - :href="computedPath" - class="sortable-link gl-font-weight-normal" - @click="handleTitleClick" - > + <gl-link :href="computedPath" class="sortable-link" @click="handleTitleClick"> {{ title }} </gl-link> </div> <!-- Info area: meta, path, and assignees --> - <div class="item-info-area d-flex flex-xl-grow-1 flex-shrink-0"> + <div + class="item-info-area gl-display-flex gl-flex-grow-1 gl-flex-shrink-0 gl-gap-3 gl-ml-6 ml-xl-0" + > <!-- Meta area: path and attributes --> <!-- If there is no room beside the path, meta attributes are put ABOVE it (flex-wrap-reverse). --> <!-- See design: https://gitlab-org.gitlab.io/gitlab-design/hosted/pedro/%2383-issue-mr-rows-cards-spec-previews/#artboard16 --> <div - class="item-meta d-flex flex-wrap-reverse justify-content-start justify-content-md-between" + class="item-meta gl-display-flex gl-md-justify-content-space-between gl-gap-3 gl-flex-wrap-wrap-reverse" > <!-- Path area: status icon (<XL), path, issue # --> <div - class="item-path-area item-path-id d-flex align-items-center mr-2 mt-2 mt-xl-0 ml-xl-2" + class="item-path-area item-path-id gl-display-flex gl-align-items-center gl-flex-wrap gl-gap-3" > <gl-tooltip :target="() => $refs.iconElement"> <span v-safe-html="stateTitle"></span> </gl-tooltip> - <span v-gl-tooltip :title="itemPath" class="path-id-text d-inline-block">{{ - itemPath - }}</span> + <span + v-if="itemPath" + v-gl-tooltip + :title="itemPath" + class="path-id-text d-inline-block" + >{{ itemPath }}</span + > <span>{{ pathIdSeparator }}{{ itemId }}</span> </div> <!-- Attributes area: CI, epic count, weight, milestone --> <!-- They have a different order on large screen sizes --> - <div class="item-attributes-area d-flex align-items-center mt-2 mt-xl-0"> + <div + class="item-attributes-area gl-display-flex gl-align-items-center gl-flex-wrap gl-gap-3" + > <span v-if="hasPipeline" class="mr-ci-status order-md-last"> <a :href="pipelineStatus.details_path"> <ci-icon v-gl-tooltip :status="pipelineStatus" :title="pipelineStatusTooltip" /> @@ -174,7 +174,7 @@ export default { <issue-milestone v-if="hasMilestone" :milestone="milestone" - class="d-flex align-items-center item-milestone order-md-first ml-md-0" + class="item-milestone gl-font-sm gl-display-flex gl-align-items-center order-md-first" /> <!-- Flex order for slots is defined in the parent component: e.g. related_issues_block.vue --> @@ -198,24 +198,17 @@ export default { <issue-assignees v-if="hasAssignees" :assignees="assignees" - class="item-assignees align-items-center align-self-end flex-shrink-0 order-md-2 d-none d-md-flex" + class="item-assignees gl-display-flex gl-align-items-center gl-align-self-end gl-flex-shrink-0 order-md-2" /> </div> </div> - - <!-- Assignees. On small layouts, these are put here, at the end of the card. --> - <issue-assignees - v-if="assignees.length !== 0" - :assignees="assignees" - class="item-assignees d-flex align-items-center align-self-end flex-shrink-0 d-md-none gl-ml-3" - /> </div> </div> <span v-if="isLocked" v-gl-tooltip - class="gl-px-3 gl-display-inline-block gl-cursor-not-allowed" + class="gl-display-inline-block gl-cursor-not-allowed" :title="lockedMessage" data-testid="lockIcon" > @@ -226,8 +219,9 @@ export default { v-gl-tooltip icon="close" category="tertiary" + size="small" :disabled="removeDisabled" - class="js-issue-item-remove-button gl-ml-3" + class="js-issue-item-remove-button" data-qa-selector="remove_related_issue_button" :title="__('Remove')" :aria-label="__('Remove')" diff --git a/app/assets/javascripts/issuable/components/status_box.vue b/app/assets/javascripts/issuable/components/status_box.vue index 0c75e44443d..9ffcf14c943 100644 --- a/app/assets/javascripts/issuable/components/status_box.vue +++ b/app/assets/javascripts/issuable/components/status_box.vue @@ -4,8 +4,7 @@ import Vue from 'vue'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { fetchPolicies } from '~/lib/graphql'; import { __ } from '~/locale'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; -import { IssuableStates } from '~/vue_shared/issuable/list/constants'; +import { STATUS_CLOSED, STATUS_OPEN, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; export const badgeState = Vue.observable({ state: '', @@ -76,15 +75,15 @@ export default { return [ CLASSES[this.state], { - 'gl-vertical-align-bottom': this.issuableType === IssuableType.MergeRequest, + 'gl-vertical-align-bottom': this.issuableType === TYPE_MERGE_REQUEST, }, ]; }, badgeVariant() { - if (this.state === IssuableStates.Opened) { + if (this.state === STATUS_OPEN) { return 'success'; - } else if (this.state === IssuableStates.Closed) { - return this.issuableType === IssuableType.MergeRequest ? 'danger' : 'info'; + } else if (this.state === STATUS_CLOSED) { + return this.issuableType === TYPE_MERGE_REQUEST ? 'danger' : 'info'; } return 'info'; }, diff --git a/app/assets/javascripts/issuable/constants.js b/app/assets/javascripts/issuable/constants.js index 5327f251fda..88fc6859acd 100644 --- a/app/assets/javascripts/issuable/constants.js +++ b/app/assets/javascripts/issuable/constants.js @@ -1,11 +1 @@ export const EVENT_ISSUABLE_VUE_APP_CHANGE = 'issuable_vue_app:change'; - -export const ISSUABLE_TYPE = { - issues: 'issues', - mergeRequests: 'merge-requests', -}; - -export const ISSUABLE_INDEX = { - ISSUE: 'issue_', - MERGE_REQUEST: 'merge_request_', -}; diff --git a/app/assets/javascripts/issuable/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable/issuable_bulk_update_actions.js index 201782a201a..e5a2388580b 100644 --- a/app/assets/javascripts/issuable/issuable_bulk_update_actions.js +++ b/app/assets/javascripts/issuable/issuable_bulk_update_actions.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { difference, intersection, union } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/issuable/issuable_label_selector.js b/app/assets/javascripts/issuable/issuable_label_selector.js index ad8bbf04d6f..76fd4cccf2e 100644 --- a/app/assets/javascripts/issuable/issuable_label_selector.js +++ b/app/assets/javascripts/issuable/issuable_label_selector.js @@ -1,11 +1,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import { - DropdownVariant, - LabelType, -} from '~/sidebar/components/labels/labels_select_widget/constants'; -import { WorkspaceType } from '~/issues/constants'; +import { DropdownVariant } from '~/sidebar/components/labels/labels_select_widget/constants'; +import { WORKSPACE_PROJECT } from '~/issues/constants'; import IssuableLabelSelector from '~/vue_shared/issuable/create/components/issuable_label_selector.vue'; Vue.use(VueApollo); @@ -43,11 +40,11 @@ export default () => { fullPath, initialLabels: JSON.parse(initialLabels), issuableType, - labelType: LabelType.project, + labelType: WORKSPACE_PROJECT, labelsFilterBasePath, labelsManagePath, variant: DropdownVariant.Embedded, - workspaceType: WorkspaceType.project, + workspaceType: WORKSPACE_PROJECT, }, render(createElement) { return createElement(IssuableLabelSelector); diff --git a/app/assets/javascripts/issuable/popover/components/mr_popover.vue b/app/assets/javascripts/issuable/popover/components/mr_popover.vue index 92994809362..af93430963e 100644 --- a/app/assets/javascripts/issuable/popover/components/mr_popover.vue +++ b/app/assets/javascripts/issuable/popover/components/mr_popover.vue @@ -1,14 +1,12 @@ <script> -/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlBadge, GlPopover, GlSkeletonLoader } from '@gitlab/ui'; +import { STATUS_CLOSED, STATUS_MERGED } from '~/issues/constants'; +import { __ } from '~/locale'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { mrStates, humanMRStates } from '../constants'; import query from '../queries/merge_request.query.graphql'; export default { - // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 - name: 'MRPopover', // eslint-disable-line @gitlab/require-i18n-strings components: { GlBadge, GlPopover, @@ -48,9 +46,9 @@ export default { }, badgeVariant() { switch (this.mergeRequest.state) { - case mrStates.merged: + case STATUS_MERGED: return 'info'; - case mrStates.closed: + case STATUS_CLOSED: return 'danger'; default: return 'success'; @@ -58,12 +56,12 @@ export default { }, stateHumanName() { switch (this.mergeRequest.state) { - case mrStates.merged: - return humanMRStates.merged; - case mrStates.closed: - return humanMRStates.closed; + case STATUS_MERGED: + return __('Merged'); + case STATUS_CLOSED: + return __('Closed'); default: - return humanMRStates.open; + return __('Open'); } }, title() { @@ -101,7 +99,9 @@ export default { <gl-badge class="gl-mr-3" :variant="badgeVariant"> {{ stateHumanName }} </gl-badge> - <span class="gl-text-secondary">Opened <time v-text="formattedTime"></time></span> + <span class="gl-text-secondary"> + {{ __('Opened') }} <time v-text="formattedTime"></time + ></span> </div> <ci-icon v-if="detailedStatus" :status="detailedStatus" /> </div> diff --git a/app/assets/javascripts/issuable/popover/constants.js b/app/assets/javascripts/issuable/popover/constants.js deleted file mode 100644 index 352bc635293..00000000000 --- a/app/assets/javascripts/issuable/popover/constants.js +++ /dev/null @@ -1,13 +0,0 @@ -import { __ } from '~/locale'; - -export const mrStates = { - merged: 'merged', - closed: 'closed', - open: 'open', -}; - -export const humanMRStates = { - merged: __('Merged'), - closed: __('Closed'), - open: __('Open'), -}; diff --git a/app/assets/javascripts/issues/constants.js b/app/assets/javascripts/issues/constants.js index ba05dd731f7..b7d885ed8a7 100644 --- a/app/assets/javascripts/issues/constants.js +++ b/app/assets/javascripts/issues/constants.js @@ -1,36 +1,25 @@ import { __ } from '~/locale'; +export const STATUS_ALL = 'all'; export const STATUS_CLOSED = 'closed'; +export const STATUS_MERGED = 'merged'; export const STATUS_OPEN = 'opened'; export const STATUS_REOPENED = 'reopened'; export const TITLE_LENGTH_MAX = 255; +export const TYPE_ALERT = 'alert'; export const TYPE_EPIC = 'epic'; +export const TYPE_INCIDENT = 'incident'; export const TYPE_ISSUE = 'issue'; +export const TYPE_MERGE_REQUEST = 'merge_request'; +export const TYPE_TEST_CASE = 'test_case'; + +export const WORKSPACE_GROUP = 'group'; +export const WORKSPACE_PROJECT = 'project'; export const IssuableStatusText = { [STATUS_CLOSED]: __('Closed'), [STATUS_OPEN]: __('Open'), [STATUS_REOPENED]: __('Open'), }; - -// Deprecated - use individual constants instead like `TYPE_ISSUE` above -export const IssuableType = { - Issue: 'issue', - Epic: 'epic', - MergeRequest: 'merge_request', - Alert: 'alert', - TestCase: 'test_case', -}; - -export const IssueType = { - Issue: 'issue', - Incident: 'incident', - TestCase: 'test_case', -}; - -export const WorkspaceType = { - project: 'project', - group: 'group', -}; diff --git a/app/assets/javascripts/issues/create_merge_request_dropdown.js b/app/assets/javascripts/issues/create_merge_request_dropdown.js index 977a505437d..c821c18bcb9 100644 --- a/app/assets/javascripts/issues/create_merge_request_dropdown.js +++ b/app/assets/javascripts/issues/create_merge_request_dropdown.js @@ -7,10 +7,14 @@ import { import confidentialMergeRequestState from '~/confidential_merge_request/state'; import DropLab from '~/filtered_search/droplab/drop_lab_deprecated'; import ISetter from '~/filtered_search/droplab/plugins/input_setter'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { + findInvalidBranchNameCharacters, + humanizeBranchValidationErrors, +} from '~/lib/utils/text_utility'; import api from '~/api'; // Todo: Remove this when fixing issue in input_setter plugin @@ -19,6 +23,12 @@ const InputSetter = { ...ISetter }; const CREATE_MERGE_REQUEST = 'create-mr'; const CREATE_BRANCH = 'create-branch'; +const VALIDATION_TYPE_BRANCH_UNAVAILABLE = 'branch_unavailable'; +const VALIDATION_TYPE_INVALID_CHARS = 'invalid_chars'; + +const INPUT_TARGET_BRANCH = 'branch'; +const INPUT_TARGET_REF = 'ref'; + function createEndpoint(projectPath, endpoint) { if (canCreateConfidentialMergeRequest()) { return endpoint.replace( @@ -30,6 +40,23 @@ function createEndpoint(projectPath, endpoint) { return endpoint; } +function getValidationError(target, inputValue, validationType) { + const invalidChars = findInvalidBranchNameCharacters(inputValue.value); + let text; + + if (invalidChars && validationType === VALIDATION_TYPE_INVALID_CHARS) { + text = humanizeBranchValidationErrors(invalidChars); + } + + if (validationType === VALIDATION_TYPE_BRANCH_UNAVAILABLE) { + text = + target === INPUT_TARGET_BRANCH + ? __('Branch is already taken') + : __('Source is not available'); + } + + return text; +} export default class CreateMergeRequestDropdown { constructor(wrapperEl) { this.wrapperEl = wrapperEl; @@ -124,18 +151,19 @@ export default class CreateMergeRequestDropdown { .then(({ data }) => { this.setUnavailableButtonState(false); - if (data.can_create_branch) { - this.available(); - this.enable(); - this.updateBranchName(data.suggested_branch_name); - - if (!this.droplabInitialized) { - this.droplabInitialized = true; - this.initDroplab(); - this.bindEvents(); - } - } else { + if (!data.can_create_branch) { this.hide(); + return; + } + + this.available(); + this.enable(); + this.updateBranchName(data.suggested_branch_name); + + if (!this.droplabInitialized) { + this.droplabInitialized = true; + this.initDroplab(); + this.bindEvents(); } }) .catch(() => { @@ -274,7 +302,7 @@ export default class CreateMergeRequestDropdown { const tags = data[Object.keys(data)[1]]; let result; - if (target === 'branch') { + if (target === INPUT_TARGET_BRANCH) { result = CreateMergeRequestDropdown.findByValue(branches, ref); } else { result = @@ -354,10 +382,10 @@ export default class CreateMergeRequestDropdown { } if (event.target === this.branchInput) { - target = 'branch'; + target = INPUT_TARGET_BRANCH; ({ value } = this.branchInput); } else if (event.target === this.refInput) { - target = 'ref'; + target = INPUT_TARGET_REF; if (event.target === document.activeElement) { value = event.target.value.slice(0, event.target.selectionStart) + @@ -382,7 +410,7 @@ export default class CreateMergeRequestDropdown { this.createBranchPath = this.wrapperEl.dataset.createBranchPath; this.createMrPath = this.wrapperEl.dataset.createMrPath; - if (target === 'branch') { + if (target === INPUT_TARGET_BRANCH) { this.branchIsValid = true; } else { this.refIsValid = true; @@ -473,7 +501,7 @@ export default class CreateMergeRequestDropdown { showAvailableMessage(target) { const { input, message } = this.getTargetData(target); - const text = target === 'branch' ? __('Branch name') : __('Source'); + const text = target === INPUT_TARGET_BRANCH ? __('Branch name') : __('Source'); this.removeMessage(target); input.classList.add('gl-field-success-outline'); @@ -484,7 +512,7 @@ export default class CreateMergeRequestDropdown { showCheckingMessage(target) { const { message } = this.getTargetData(target); - const text = target === 'branch' ? __('branch name') : __('source'); + const text = target === INPUT_TARGET_BRANCH ? __('branch name') : __('source'); this.removeMessage(target); message.classList.add('gl-text-gray-600'); @@ -492,10 +520,9 @@ export default class CreateMergeRequestDropdown { message.style.display = 'inline-block'; } - showNotAvailableMessage(target) { + showNotAvailableMessage(target, validationType = VALIDATION_TYPE_BRANCH_UNAVAILABLE) { const { input, message } = this.getTargetData(target); - const text = - target === 'branch' ? __('Branch is already taken') : __('Source is not available'); + const text = getValidationError(target, input, validationType); this.removeMessage(target); input.classList.add('gl-field-error-outline'); @@ -511,35 +538,35 @@ export default class CreateMergeRequestDropdown { updateBranchName(suggestedBranchName) { this.branchInput.value = suggestedBranchName; - this.updateCreatePaths('branch', suggestedBranchName); + this.updateInputState(INPUT_TARGET_BRANCH, suggestedBranchName, ''); + this.updateCreatePaths(INPUT_TARGET_BRANCH, suggestedBranchName); } updateInputState(target, ref, result) { // target - 'branch' or 'ref' - which the input field we are searching a ref for. // ref - string - what a user typed. // result - string - what has been found on backend. + if (target === INPUT_TARGET_BRANCH) this.updateTargetBranchInput(ref, result); + if (target === INPUT_TARGET_REF) this.updateRefInput(ref, result); + + if (this.inputsAreValid()) { + this.enable(); + } else { + this.disableCreateAction(); + } + } - // If a found branch equals exact the same text a user typed, - // that means a new branch cannot be created as it already exists. + updateRefInput(ref, result) { + this.refInput.dataset.value = ref; if (ref === result) { - if (target === 'branch') { - this.branchIsValid = false; - this.showNotAvailableMessage('branch'); - } else { - this.refIsValid = true; - this.refInput.dataset.value = ref; - this.showAvailableMessage('ref'); - this.updateCreatePaths(target, ref); - } - } else if (target === 'branch') { - this.branchIsValid = true; - this.showAvailableMessage('branch'); - this.updateCreatePaths(target, ref); + this.refIsValid = true; + this.showAvailableMessage(INPUT_TARGET_REF); + this.updateCreatePaths(INPUT_TARGET_REF, ref); } else { this.refIsValid = false; this.refInput.dataset.value = ref; this.disableCreateAction(); - this.showNotAvailableMessage('ref'); + this.showNotAvailableMessage(INPUT_TARGET_REF); // Show ref hint. if (result) { @@ -547,11 +574,24 @@ export default class CreateMergeRequestDropdown { this.refInput.setSelectionRange(ref.length, result.length); } } + } - if (this.inputsAreValid()) { - this.enable(); + updateTargetBranchInput(ref, result) { + const branchNameErrors = findInvalidBranchNameCharacters(ref); + const isInvalidString = branchNameErrors.length; + if (ref !== result && !isInvalidString) { + this.branchIsValid = true; + // If a found branch equals exact the same text a user typed, + // Or user typed input contains invalid chars, + // that means a new branch cannot be created as it already exists. + this.showAvailableMessage(INPUT_TARGET_BRANCH, VALIDATION_TYPE_BRANCH_UNAVAILABLE); + this.updateCreatePaths(INPUT_TARGET_BRANCH, ref); + } else if (isInvalidString) { + this.branchIsValid = false; + this.showNotAvailableMessage(INPUT_TARGET_BRANCH, VALIDATION_TYPE_INVALID_CHARS); } else { - this.disableCreateAction(); + this.branchIsValid = false; + this.showNotAvailableMessage(INPUT_TARGET_BRANCH); } } @@ -569,6 +609,7 @@ export default class CreateMergeRequestDropdown { pathReplacement, ); + this.wrapperEl.dataset.createBranchPath = this.createBranchPath; this.wrapperEl.dataset.createMrPath = this.createMrPath; } } diff --git a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue index a4a2feba716..2546bface58 100644 --- a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue +++ b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue @@ -4,12 +4,11 @@ import * as Sentry from '@sentry/browser'; import getIssuesQuery from 'ee_else_ce/issues/dashboard/queries/get_issues.query.graphql'; import IssueCardStatistics from 'ee_else_ce/issues/list/components/issue_card_statistics.vue'; import IssueCardTimeInfo from 'ee_else_ce/issues/list/components/issue_card_time_info.vue'; -import { STATUS_CLOSED } from '~/issues/constants'; +import { STATUS_ALL, STATUS_CLOSED, STATUS_OPEN } from '~/issues/constants'; import { CREATED_DESC, defaultTypeTokenOptions, i18n, - PAGE_SIZE, PARAM_STATE, UPDATED_DESC, urlSortParams, @@ -49,7 +48,7 @@ import { TOKEN_TYPE_TYPE, } from '~/vue_shared/components/filtered_search_bar/constants'; import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue'; -import { IssuableListTabs, IssuableStates } from '~/vue_shared/issuable/list/constants'; +import { DEFAULT_PAGE_SIZE, IssuableListTabs } from '~/vue_shared/issuable/list/constants'; import getIssuesCountsQuery from '../queries/get_issues_counts.query.graphql'; import { AutocompleteCache } from '../utils'; @@ -93,7 +92,7 @@ export default { data() { const state = getParameterByName(PARAM_STATE); - const defaultSortKey = state === IssuableStates.Closed ? UPDATED_DESC : CREATED_DESC; + const defaultSortKey = state === STATUS_CLOSED ? UPDATED_DESC : CREATED_DESC; const dashboardSortKey = getSortKey(this.initialSort); const graphQLSortKey = isSortKey(this.initialSort?.toUpperCase()) && this.initialSort.toUpperCase(); @@ -110,7 +109,7 @@ export default { pageInfo: {}, pageParams: getInitialPageParams(), sortKey, - state: state || IssuableStates.Opened, + state: state || STATUS_OPEN, }; }, apollo: { @@ -132,7 +131,6 @@ export default { skip() { return !this.hasSearch; }, - debounce: 200, }, issuesCounts: { query: getIssuesCountsQuery, @@ -149,7 +147,6 @@ export default { skip() { return !this.hasSearch; }, - debounce: 200, context: { isSingleRequest: true, }, @@ -314,9 +311,9 @@ export default { tabCounts() { const { openedIssues, closedIssues, allIssues } = this.issuesCounts; return { - [IssuableStates.Opened]: openedIssues?.count, - [IssuableStates.Closed]: closedIssues?.count, - [IssuableStates.All]: allIssues?.count, + [STATUS_OPEN]: openedIssues?.count, + [STATUS_CLOSED]: closedIssues?.count, + [STATUS_ALL]: allIssues?.count, }; }, urlFilterParams() { @@ -388,14 +385,14 @@ export default { handleNextPage() { this.pageParams = { afterCursor: this.pageInfo.endCursor, - firstPageSize: PAGE_SIZE, + firstPageSize: DEFAULT_PAGE_SIZE, }; scrollUp(); }, handlePreviousPage() { this.pageParams = { beforeCursor: this.pageInfo.startCursor, - lastPageSize: PAGE_SIZE, + lastPageSize: DEFAULT_PAGE_SIZE, }; scrollUp(); }, @@ -461,12 +458,20 @@ export default { @sort="handleSort" > <template #nav-actions> - <gl-button :href="rssPath" icon="rss"> - {{ $options.i18n.rssLabel }} - </gl-button> - <gl-button :href="calendarPath" icon="calendar"> - {{ $options.i18n.calendarLabel }} - </gl-button> + <gl-button + v-gl-tooltip + :href="rssPath" + icon="rss" + :title="$options.i18n.rssLabel" + class="has-tooltip btn-icon" + /> + <gl-button + v-gl-tooltip + :href="calendarPath" + icon="calendar" + :title="$options.i18n.calendarLabel" + class="has-tooltip btn-icon" + /> </template> <template #timeframe="{ issuable = {} }"> diff --git a/app/assets/javascripts/issues/index.js b/app/assets/javascripts/issues/index.js index 5b5f1d273d0..83387d3ac29 100644 --- a/app/assets/javascripts/issues/index.js +++ b/app/assets/javascripts/issues/index.js @@ -6,7 +6,7 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GLForm from '~/gl_form'; import { initIssuableHeaderWarnings, initIssuableSidebar } from '~/issuable'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors'; -import { IssueType } from '~/issues/constants'; +import { TYPE_INCIDENT } from '~/issues/constants'; import Issue from '~/issues/issue'; import { initTitleSuggestions, initTypePopover } from '~/issues/new'; import { initRelatedMergeRequests } from '~/issues/related_merge_requests'; @@ -59,11 +59,11 @@ export function initShow() { const { issueType, ...issuableData } = parseIssuableData(el); - if (issueType === IssueType.Incident) { + if (issueType === TYPE_INCIDENT) { initIncidentApp({ ...issuableData, issuableId: el.dataset.issuableId }, store); - initHeaderActions(store, IssueType.Incident); + initHeaderActions(store, TYPE_INCIDENT); initLinkedResources(); - initRelatedIssues(IssueType.Incident); + initRelatedIssues(TYPE_INCIDENT); } else { initIssueApp(issuableData, store); initHeaderActions(store); diff --git a/app/assets/javascripts/issues/issue.js b/app/assets/javascripts/issues/issue.js index de1c689e590..b7fd99d8042 100644 --- a/app/assets/javascripts/issues/issue.js +++ b/app/assets/javascripts/issues/issue.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { joinPaths } from '~/lib/utils/url_utility'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; import axios from '~/lib/utils/axios_utils'; import { addDelimiter } from '~/lib/utils/text_utility'; diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index 6c46013e4f9..5c4bf8f19e4 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -2,17 +2,23 @@ import { GlButton, GlFilteredSearchToken, GlTooltipDirective } from '@gitlab/ui'; import * as Sentry from '@sentry/browser'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; +import { isEmpty } from 'lodash'; import IssueCardStatistics from 'ee_else_ce/issues/list/components/issue_card_statistics.vue'; import IssueCardTimeInfo from 'ee_else_ce/issues/list/components/issue_card_time_info.vue'; import getIssuesQuery from 'ee_else_ce/issues/list/queries/get_issues.query.graphql'; import getIssuesCountsQuery from 'ee_else_ce/issues/list/queries/get_issues_counts.query.graphql'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { TYPENAME_USER } from '~/graphql_shared/constants'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { ITEM_TYPE } from '~/groups/constants'; import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue'; import IssuableByEmail from '~/issuable/components/issuable_by_email.vue'; -import { STATUS_CLOSED } from '~/issues/constants'; +import { + STATUS_ALL, + STATUS_CLOSED, + STATUS_OPEN, + WORKSPACE_GROUP, + WORKSPACE_PROJECT, +} from '~/issues/constants'; import axios from '~/lib/utils/axios_utils'; import { fetchPolicies } from '~/lib/graphql'; import { isPositiveInteger } from '~/lib/utils/number_utils'; @@ -46,7 +52,7 @@ import { TOKEN_TYPE_TYPE, } from '~/vue_shared/components/filtered_search_bar/constants'; import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue'; -import { IssuableListTabs, IssuableStates } from '~/vue_shared/issuable/list/constants'; +import { DEFAULT_PAGE_SIZE, IssuableListTabs } from '~/vue_shared/issuable/list/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import NewResourceDropdown from '~/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue'; import { @@ -56,7 +62,6 @@ import { i18n, ISSUE_REFERENCE, MAX_LIST_SIZE, - PAGE_SIZE, PARAM_FIRST_PAGE_SIZE, PARAM_LAST_PAGE_SIZE, PARAM_PAGE_AFTER, @@ -177,8 +182,8 @@ export default { pageParams: {}, showBulkEditSidebar: false, sortKey: CREATED_DESC, - state: IssuableStates.Opened, - pageSize: PAGE_SIZE, + state: STATUS_OPEN, + pageSize: DEFAULT_PAGE_SIZE, }; }, apollo: { @@ -206,9 +211,8 @@ export default { Sentry.captureException(error); }, skip() { - return !this.hasAnyIssues; + return !this.hasAnyIssues || isEmpty(this.pageParams); }, - debounce: 200, }, issuesCounts: { query: getIssuesCountsQuery, @@ -223,9 +227,8 @@ export default { Sentry.captureException(error); }, skip() { - return !this.hasAnyIssues; + return !this.hasAnyIssues || isEmpty(this.pageParams); }, - debounce: 200, context: { isSingleRequest: true, }, @@ -249,7 +252,7 @@ export default { }; }, namespace() { - return this.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP; + return this.isProject ? WORKSPACE_PROJECT : WORKSPACE_GROUP; }, defaultWorkItemTypes() { return [...defaultWorkItemTypes, ...this.eeWorkItemTypes]; @@ -275,7 +278,7 @@ export default { return this.sortKey === RELATIVE_POSITION_ASC; }, isOpenTab() { - return this.state === IssuableStates.Opened; + return this.state === STATUS_OPEN; }, showCsvButtons() { return this.isProject && this.isSignedIn; @@ -449,7 +452,7 @@ export default { return this.issues.length > 0 && (this.pageInfo.hasNextPage || this.pageInfo.hasPreviousPage); }, showPageSizeControls() { - return this.currentTabCount > PAGE_SIZE; + return this.currentTabCount > DEFAULT_PAGE_SIZE; }, sortOptions() { return getSortOptions({ @@ -461,9 +464,9 @@ export default { tabCounts() { const { openedIssues, closedIssues, allIssues } = this.issuesCounts; return { - [IssuableStates.Opened]: openedIssues?.count, - [IssuableStates.Closed]: closedIssues?.count, - [IssuableStates.All]: allIssues?.count, + [STATUS_OPEN]: openedIssues?.count, + [STATUS_CLOSED]: closedIssues?.count, + [STATUS_ALL]: allIssues?.count, }; }, currentTabCount() { @@ -726,7 +729,7 @@ export default { const lastPageSize = getParameterByName(PARAM_LAST_PAGE_SIZE); const state = getParameterByName(PARAM_STATE); - const defaultSortKey = state === IssuableStates.Closed ? UPDATED_DESC : CREATED_DESC; + const defaultSortKey = state === STATUS_CLOSED ? UPDATED_DESC : CREATED_DESC; const dashboardSortKey = getSortKey(sortValue); const graphQLSortKey = isSortKey(sortValue?.toUpperCase()) && sortValue.toUpperCase(); @@ -750,7 +753,7 @@ export default { getParameterByName(PARAM_PAGE_BEFORE), ); this.sortKey = sortKey; - this.state = state || IssuableStates.Opened; + this.state = state || STATUS_OPEN; }, }, }; diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js index 31a43c95f5e..99064a50e3f 100644 --- a/app/assets/javascripts/issues/list/constants.js +++ b/app/assets/javascripts/issues/list/constants.js @@ -33,7 +33,6 @@ import { export const ISSUE_REFERENCE = /^#\d+$/; export const MAX_LIST_SIZE = 10; -export const PAGE_SIZE = 20; export const PARAM_ASSIGNEE_ID = 'assignee_id'; export const PARAM_FIRST_PAGE_SIZE = 'first_page_size'; export const PARAM_LAST_PAGE_SIZE = 'last_page_size'; diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js index bbd081843ca..b086640cd12 100644 --- a/app/assets/javascripts/issues/list/utils.js +++ b/app/assets/javascripts/issues/list/utils.js @@ -16,6 +16,7 @@ import { TOKEN_TYPE_HEALTH, TOKEN_TYPE_LABEL, } from '~/vue_shared/components/filtered_search_bar/constants'; +import { DEFAULT_PAGE_SIZE } from '~/vue_shared/issuable/list/constants'; import { ALTERNATIVE_FILTER, API_PARAM, @@ -35,7 +36,6 @@ import { MILESTONE_DUE_ASC, MILESTONE_DUE_DESC, NORMAL_FILTER, - PAGE_SIZE, PARAM_ASSIGNEE_ID, POPULARITY_ASC, POPULARITY_DESC, @@ -56,7 +56,7 @@ import { export const getInitialPageParams = ( pageSize, - firstPageSize = pageSize ?? PAGE_SIZE, + firstPageSize = pageSize ?? DEFAULT_PAGE_SIZE, lastPageSize, afterCursor, beforeCursor, @@ -289,9 +289,9 @@ const formatData = (token) => { }; export const convertToApiParams = (filterTokens) => { - const params = {}; - const not = {}; - const or = {}; + const params = new Map(); + const not = new Map(); + const or = new Map(); filterTokens .filter((token) => token.type !== FILTERED_SEARCH_TERM) @@ -307,32 +307,34 @@ export const convertToApiParams = (filterTokens) => { obj = params; } const data = formatData(token); - Object.assign(obj, { - [apiField]: obj[apiField] ? [obj[apiField], data].flat() : data, - }); + obj.set(apiField, obj.has(apiField) ? [obj.get(apiField), data].flat() : data); }); - if (Object.keys(not).length) { - Object.assign(params, { not }); + if (not.size) { + params.set('not', Object.fromEntries(not)); } - if (Object.keys(or).length) { - Object.assign(params, { or }); + if (or.size) { + params.set('or', Object.fromEntries(or)); } - return params; + return Object.fromEntries(params); }; -export const convertToUrlParams = (filterTokens) => - filterTokens +export const convertToUrlParams = (filterTokens) => { + const urlParamsMap = filterTokens .filter((token) => token.type !== FILTERED_SEARCH_TERM) .reduce((acc, token) => { const filterType = getFilterType(token); const urlParam = filters[token.type][URL_PARAM][token.value.operator]?.[filterType]; - return Object.assign(acc, { - [urlParam]: acc[urlParam] ? [acc[urlParam], token.value.data].flat() : token.value.data, - }); - }, {}); + return acc.set( + urlParam, + acc.has(urlParam) ? [acc.get(urlParam), token.value.data].flat() : token.value.data, + ); + }, new Map()); + + return Object.fromEntries(urlParamsMap); +}; export const convertToSearchQuery = (filterTokens) => filterTokens diff --git a/app/assets/javascripts/issues/manual_ordering.js b/app/assets/javascripts/issues/manual_ordering.js index 1bb53dfd50d..f22062cf048 100644 --- a/app/assets/javascripts/issues/manual_ordering.js +++ b/app/assets/javascripts/issues/manual_ordering.js @@ -1,5 +1,5 @@ import Sortable from 'sortablejs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; import { getSortableDefaultOptions, sortableStart } from '~/sortable/utils'; diff --git a/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue index 149049247fb..c3f87699d58 100644 --- a/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue +++ b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue @@ -65,10 +65,10 @@ export default { <template> <div v-if="isFetchingMergeRequests || (!isFetchingMergeRequests && totalCount)"> - <div class="card card-slim gl-mt-5 gl-mb-0"> - <div class="card-header gl-bg-gray-10"> + <div class="card card-slim gl-mt-5 gl-mb-0 gl-bg-gray-10"> + <div class="card-header gl-px-5 gl-py-4 gl-bg-white"> <div - class="card-title gl-relative gl-display-flex gl-align-items-center gl-line-height-20 gl-font-weight-bold gl-m-0" + class="card-title gl-relative gl-display-flex gl-flex-wrap gl-align-items-center gl-line-height-20 gl-font-weight-bold gl-m-0" > <gl-link class="anchor gl-absolute gl-text-decoration-none" @@ -79,19 +79,29 @@ export default { {{ __('Related merge requests') }} </h3> <template v-if="totalCount"> - <gl-icon name="merge-request" class="gl-ml-5 gl-mr-2 gl-text-gray-500" /> - <span data-testid="count">{{ totalCount }}</span> + <gl-icon name="merge-request" class="gl-ml-3 gl-mr-2 gl-text-gray-500" /> + <span data-testid="count" class="gl-text-gray-500">{{ totalCount }}</span> </template> + <p + v-if="hasClosingMergeRequest && !isFetchingMergeRequests" + class="gl-font-sm gl-font-weight-normal gl-flex-basis-full gl-mb-0 gl-text-gray-500" + > + {{ closingMergeRequestsText }} + </p> </div> </div> <gl-loading-icon v-if="isFetchingMergeRequests" size="sm" label="Fetching related merge requests" - class="gl-py-3" + class="gl-py-4" /> - <ul v-else class="content-list related-items-list"> - <li v-for="mr in mergeRequests" :key="mr.id" class="list-item gl-m-0! gl-p-0!"> + <ul v-else class="content-list related-items-list gl-px-4! gl-py-3!"> + <li + v-for="mr in mergeRequests" + :key="mr.id" + class="list-item gl-m-0! gl-p-0! gl-border-b-0!" + > <related-issuable-item :id-key="mr.id" :display-reference="mr.reference" @@ -110,11 +120,5 @@ export default { </li> </ul> </div> - <div - v-if="hasClosingMergeRequest && !isFetchingMergeRequests" - class="issue-closed-by-widget second-block gl-mt-3" - > - {{ closingMergeRequestsText }} - </div> </div> </template> diff --git a/app/assets/javascripts/issues/related_merge_requests/store/actions.js b/app/assets/javascripts/issues/related_merge_requests/store/actions.js index 4c81f1d9bc1..ad5b61424dc 100644 --- a/app/assets/javascripts/issues/related_merge_requests/store/actions.js +++ b/app/assets/javascripts/issues/related_merge_requests/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { normalizeHeaders } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue index decb559ee81..15f97222971 100644 --- a/app/assets/javascripts/issues/show/components/app.vue +++ b/app/assets/javascripts/issues/show/components/app.vue @@ -1,19 +1,20 @@ <script> import { GlIcon, GlBadge, GlIntersectionObserver, GlTooltipDirective } from '@gitlab/ui'; import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { IssuableStatusText, STATUS_CLOSED, TYPE_EPIC, + TYPE_INCIDENT, TYPE_ISSUE, - WorkspaceType, + WORKSPACE_PROJECT, } from '~/issues/constants'; import Poll from '~/lib/utils/poll'; import { visitUrl } from '~/lib/utils/url_utility'; import { __, sprintf } from '~/locale'; import ConfidentialityBadge from '~/vue_shared/components/confidentiality_badge.vue'; -import { ISSUE_TYPE_PATH, INCIDENT_TYPE_PATH, INCIDENT_TYPE, POLLING_DELAY } from '../constants'; +import { ISSUE_TYPE_PATH, INCIDENT_TYPE_PATH, POLLING_DELAY } from '../constants'; import eventHub from '../event_hub'; import getIssueStateQuery from '../queries/get_issue_state.query.graphql'; import Service from '../services/index'; @@ -25,7 +26,7 @@ import PinnedLinks from './pinned_links.vue'; import TitleComponent from './title.vue'; export default { - WorkspaceType, + WORKSPACE_PROJECT, components: { GlIcon, GlBadge, @@ -52,11 +53,6 @@ export default { required: true, type: Boolean, }, - showInlineEditButton: { - type: Boolean, - required: false, - default: true, - }, enableAutocomplete: { type: Boolean, required: false, @@ -191,11 +187,6 @@ export default { required: false, default: null, }, - issueIid: { - type: Number, - required: false, - default: null, - }, }, data() { const store = new Store({ @@ -281,7 +272,7 @@ export default { }, }, created() { - this.flashContainer = null; + this.alert = null; this.service = new Service(this.endpoint); this.poll = new Poll({ resource: this.service, @@ -399,7 +390,7 @@ export default { ? { ...formState, issue_type: issueState.issueType } : formState; - this.clearFlash(); + this.alert?.dismiss(); return this.service .updateIssuable(issuablePayload) @@ -407,14 +398,14 @@ export default { .then((data) => { if ( !window.location.pathname.includes(data.web_url) && - issueState.issueType !== INCIDENT_TYPE + issueState.issueType !== TYPE_INCIDENT ) { visitUrl(data.web_url); } if (issueState.isDirty) { const URI = - issueState.issueType === INCIDENT_TYPE + issueState.issueType === TYPE_INCIDENT ? data.web_url.replace(ISSUE_TYPE_PATH, INCIDENT_TYPE_PATH) : data.web_url; visitUrl(URI); @@ -435,7 +426,7 @@ export default { errMsg += `. ${message}`; } - this.flashContainer = createAlert({ + this.alert = createAlert({ message: errMsg, }); }) @@ -452,13 +443,6 @@ export default { this.isStickyHeaderShowing = true; }, - clearFlash() { - if (this.flashContainer) { - this.flashContainer.close(); - this.flashContainer = null; - } - }, - handleSaveDescription(description) { this.updateFormState(); this.setFormState({ description }); @@ -509,7 +493,6 @@ export default { :can-update="canUpdate" :title-html="state.titleHtml" :title-text="state.titleText" - :show-inline-edit-button="showInlineEditButton" /> <gl-intersection-observer @@ -538,7 +521,7 @@ export default { <confidentiality-badge v-if="isConfidential" data-testid="confidential" - :workspace-type="$options.WorkspaceType.project" + :workspace-type="$options.WORKSPACE_PROJECT" :issuable-type="issuableType" /> <span @@ -570,7 +553,6 @@ export default { <component :is="descriptionComponent" :issue-id="issueId" - :issue-iid="issueIid" :can-update="canUpdate" :description-html="state.descriptionHtml" :description-text="state.descriptionText" diff --git a/app/assets/javascripts/issues/show/components/delete_issue_modal.vue b/app/assets/javascripts/issues/show/components/delete_issue_modal.vue index f86ee11e64b..26e82f10c3d 100644 --- a/app/assets/javascripts/issues/show/components/delete_issue_modal.vue +++ b/app/assets/javascripts/issues/show/components/delete_issue_modal.vue @@ -1,5 +1,6 @@ <script> import { GlModal } from '@gitlab/ui'; +import { TYPE_EPIC } from '~/issues/constants'; import csrf from '~/lib/utils/csrf'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { __, sprintf } from '~/locale'; @@ -40,7 +41,7 @@ export default { }; }, bodyText() { - return this.issueType.toLowerCase() === 'epic' + return this.issueType.toLowerCase() === TYPE_EPIC ? __('Delete this epic and all descendants?') : sprintf(__('%{issuableType} will be removed! Are you sure?'), { issuableType: capitalizeFirstCharacter(this.issueType), diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index bca895bf764..bdee6c5fe9a 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -1,35 +1,26 @@ <script> -import { GlModalDirective, GlToast } from '@gitlab/ui'; +import { GlToast } from '@gitlab/ui'; import $ from 'jquery'; -import { uniqueId } from 'lodash'; import Sortable from 'sortablejs'; import Vue from 'vue'; import getIssueDetailsQuery from 'ee_else_ce/work_items/graphql/get_issue_details.query.graphql'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils'; -import { TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; -import { createAlert } from '~/flash'; +import { convertToGraphQLId } from '~/graphql_shared/utils'; +import { TYPENAME_ISSUE, TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; -import { isMetaKey } from '~/lib/utils/common_utils'; -import { isPositiveInteger } from '~/lib/utils/number_utils'; -import { getParameterByName, setUrlParams, updateHistory } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; import { getSortableDefaultOptions, isDragging } from '~/sortable/utils'; import TaskList from '~/task_list'; -import Tracking from '~/tracking'; import addHierarchyChildMutation from '~/work_items/graphql/add_hierarchy_child.mutation.graphql'; import removeHierarchyChildMutation from '~/work_items/graphql/remove_hierarchy_child.mutation.graphql'; import createWorkItemMutation from '~/work_items/graphql/create_work_item.mutation.graphql'; import deleteWorkItemMutation from '~/work_items/graphql/delete_work_item.mutation.graphql'; -import workItemQuery from '~/work_items/graphql/work_item.query.graphql'; import projectWorkItemTypesQuery from '~/work_items/graphql/project_work_item_types.query.graphql'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import WorkItemDetailModal from '~/work_items/components/work_item_detail_modal.vue'; import { sprintfWorkItem, I18N_WORK_ITEM_ERROR_CREATING, I18N_WORK_ITEM_ERROR_DELETING, - TRACKING_CATEGORY_SHOW, TASK_TYPE_NAME, } from '~/work_items/constants'; import { renderGFM } from '~/behaviors/markdown/render_gfm'; @@ -51,12 +42,8 @@ const workItemTypes = { export default { directives: { SafeHtml, - GlModal: GlModalDirective, }, - components: { - WorkItemDetailModal, - }, - mixins: [animateMixin, glFeatureFlagMixin(), Tracking.mixin()], + mixins: [animateMixin], inject: ['fullPath', 'hasIterationsFeature'], props: { canUpdate: { @@ -97,11 +84,6 @@ export default { required: false, default: null, }, - issueIid: { - type: Number, - required: false, - default: null, - }, isUpdating: { type: Boolean, required: false, @@ -109,18 +91,12 @@ export default { }, }, data() { - const workItemId = getParameterByName('work_item_id'); - return { hasTaskListItemActions: false, preAnimation: false, pulseAnimation: false, initialUpdate: true, issueDetails: {}, - activeTask: {}, - workItemId: isPositiveInteger(workItemId) - ? convertToGraphQLId(TYPENAME_WORK_ITEM, workItemId) - : undefined, workItemTypes: [], }; }, @@ -129,21 +105,12 @@ export default { query: getIssueDetailsQuery, variables() { return { - fullPath: this.fullPath, - iid: String(this.issueIid), - }; - }, - update: (data) => data.workspace?.issuable, - }, - workItem: { - query: workItemQuery, - variables() { - return { - id: this.workItemId, + id: convertToGraphQLId(TYPENAME_ISSUE, this.issueId), }; }, + update: (data) => data.issue, skip() { - return !this.workItemId; + return !this.canUpdate || !this.issueId; }, }, workItemTypes: { @@ -156,10 +123,13 @@ export default { update(data) { return data.workspace?.workItemTypes?.nodes; }, + skip() { + return !this.canUpdate; + }, }, }, computed: { - taskWorkItemType() { + taskWorkItemTypeId() { return this.workItemTypes.find((type) => type.name === TASK_TYPE_NAME)?.id; }, issueGid() { @@ -188,12 +158,6 @@ export default { this.renderGFM(); this.updateTaskStatusText(); - if (this.workItemId) { - const taskLink = this.$el.querySelector( - `.gfm-issue[data-issue="${getIdFromGraphQLId(this.workItemId)}"]`, - ); - this.openWorkItemDetailModal(taskLink); - } }, beforeDestroy() { eventHub.$off('convert-task-list-item', this.convertTaskListItem); @@ -226,10 +190,10 @@ export default { }, renderSortableLists() { // We exclude GLFM table of contents which have a `section-nav` class on the root `ul`. - const lists = document.querySelectorAll( + const lists = this.$el.querySelectorAll?.( '.description .md > ul:not(.section-nav), .description .md > ul:not(.section-nav) ul, .description ol', ); - lists.forEach((list) => { + lists?.forEach((list) => { if (list.children.length <= 1) { return; } @@ -358,59 +322,17 @@ export default { this.$emit('saveDescription', newDescription); }, renderTaskListItemActions() { - if (!this.$el?.querySelectorAll) { - return; - } - - const taskListFields = this.$el.querySelectorAll('.task-list-item:not(.inapplicable)'); - - taskListFields.forEach((item) => { - const taskLink = item.querySelector('.gfm-issue'); - if (taskLink) { - const { issue, referenceType, issueType } = taskLink.dataset; - if (issueType !== workItemTypes.TASK) { - return; - } - const workItemId = convertToGraphQLId(TYPENAME_WORK_ITEM, issue); - this.addHoverListeners(taskLink, workItemId); - taskLink.classList.add('gl-link'); - taskLink.addEventListener('click', (e) => { - if (isMetaKey(e)) { - return; - } - e.preventDefault(); - this.openWorkItemDetailModal(taskLink); - this.workItemId = workItemId; - this.updateWorkItemIdUrlQuery(issue); - this.track('viewed_work_item_from_modal', { - category: TRACKING_CATEGORY_SHOW, - label: 'work_item_view', - property: `type_${referenceType}`, - }); - }); - return; - } + const taskListItems = this.$el.querySelectorAll?.( + '.task-list-item:not(.inapplicable, table .task-list-item)', + ); - const toggleClass = uniqueId('task-list-item-actions-'); - const dropdown = this.createTaskListItemActions({ canUpdate: this.canUpdate, toggleClass }); - this.addPointerEventListeners(item, `.${toggleClass}`); + taskListItems?.forEach((item) => { + const dropdown = this.createTaskListItemActions({ canUpdate: this.canUpdate }); this.insertNextToTaskListItemText(dropdown, item); + this.addPointerEventListeners(item, '.task-list-item-actions'); this.hasTaskListItemActions = true; }); }, - addHoverListeners(taskLink, id) { - let workItemPrefetch; - taskLink.addEventListener('mouseover', () => { - workItemPrefetch = setTimeout(() => { - this.workItemId = id; - }, 150); - }); - taskLink.addEventListener('mouseout', () => { - if (workItemPrefetch) { - clearTimeout(workItemPrefetch); - } - }); - }, insertNextToTaskListItemText(element, listItem) { const children = Array.from(listItem.children); const paragraph = children.find((el) => el.tagName === 'P'); @@ -427,27 +349,6 @@ export default { listItem.append(element); } }, - setActiveTask(el) { - const { parentElement } = el; - const lineNumbers = parentElement.dataset.sourcepos.match(/\b\d+(?=:)/g); - this.activeTask = { - title: parentElement.innerText, - lineNumberStart: lineNumbers[0], - lineNumberEnd: lineNumbers[1], - }; - }, - openWorkItemDetailModal(el) { - if (!el) { - return; - } - - this.setActiveTask(el); - this.$refs.detailsModal.show(); - }, - closeWorkItemDetailModal() { - this.workItemId = undefined; - this.updateWorkItemIdUrlQuery(undefined); - }, async createTask({ taskTitle, taskDescription, oldDescription }) { try { const { title, description } = extractTaskTitleAndDescription(taskTitle, taskDescription); @@ -468,7 +369,7 @@ export default { }, projectPath: this.fullPath, title, - workItemTypeId: this.taskWorkItemType, + workItemTypeId: this.taskWorkItemTypeId, }; const { data } = await this.$apollo.mutate({ @@ -532,16 +433,6 @@ export default { captureError: true, }); }, - handleDeleteTask(description) { - this.$emit('updateDescription', description); - this.$toast.show(s__('WorkItem|Task deleted')); - }, - updateWorkItemIdUrlQuery(workItemId) { - updateHistory({ - url: setUrlParams({ work_item_id: workItemId }), - replace: true, - }); - }, }, safeHtmlConfig: { ADD_TAGS: ['gl-emoji', 'copy-code'] }, }; @@ -569,16 +460,5 @@ export default { data-testid="textarea" > </textarea> - <work-item-detail-modal - ref="detailsModal" - :can-update="canUpdate" - :work-item-id="workItemId" - :issue-gid="issueGid" - :lock-version="lockVersion" - :line-number-start="activeTask.lineNumberStart" - :line-number-end="activeTask.lineNumberEnd" - @workItemDeleted="handleDeleteTask" - @close="closeWorkItemDetailModal" - /> </div> </template> diff --git a/app/assets/javascripts/issues/show/components/edit_actions.vue b/app/assets/javascripts/issues/show/components/edit_actions.vue index 120034b8d67..608e9aec1d7 100644 --- a/app/assets/javascripts/issues/show/components/edit_actions.vue +++ b/app/assets/javascripts/issues/show/components/edit_actions.vue @@ -1,17 +1,10 @@ <script> import { GlButton } from '@gitlab/ui'; -import { __ } from '~/locale'; import Tracking from '~/tracking'; import eventHub from '../event_hub'; import updateMixin from '../mixins/update'; import getIssueStateQuery from '../queries/get_issue_state.query.graphql'; -const issuableTypes = { - issue: __('Issue'), - epic: __('Epic'), - incident: __('Incident'), -}; - const trackingMixin = Tracking.mixin({ label: 'delete_issue' }); export default { @@ -55,11 +48,6 @@ export default { isSubmitEnabled() { return this.formState.title.trim() !== ''; }, - typeToShow() { - const { issueState, issuableType } = this; - const type = issueState.issueType ?? issuableType; - return issuableTypes[type]; - }, }, methods: { closeForm() { diff --git a/app/assets/javascripts/issues/show/components/fields/description.vue b/app/assets/javascripts/issues/show/components/fields/description.vue index 3bc24e8ce01..43fe1a7b8ea 100644 --- a/app/assets/javascripts/issues/show/components/fields/description.vue +++ b/app/assets/javascripts/issues/show/components/fields/description.vue @@ -75,7 +75,6 @@ export default { :quick-actions-docs-path="quickActionsDocsPath" :enable-autocomplete="enableAutocomplete" supports-quick-actions - use-bottom-toolbar autofocus @input="$emit('input', $event)" @keydown.meta.enter="updateIssuable" diff --git a/app/assets/javascripts/issues/show/components/fields/type.vue b/app/assets/javascripts/issues/show/components/fields/type.vue index 5ade1a86d30..775f25bdbc0 100644 --- a/app/assets/javascripts/issues/show/components/fields/type.vue +++ b/app/assets/javascripts/issues/show/components/fields/type.vue @@ -1,8 +1,8 @@ <script> -import { GlFormGroup, GlIcon, GlListbox } from '@gitlab/ui'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { GlFormGroup, GlIcon, GlCollapsibleListbox } from '@gitlab/ui'; +import { TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants'; import { __ } from '~/locale'; -import { issuableTypes, INCIDENT_TYPE } from '../../constants'; +import { issuableTypes } from '../../constants'; import getIssueStateQuery from '../../queries/get_issue_state.query.graphql'; import updateIssueStateMutation from '../../queries/update_issue_state.mutation.graphql'; @@ -16,7 +16,7 @@ export default { components: { GlFormGroup, GlIcon, - GlListbox, + GlCollapsibleListbox, }, inject: { canCreateIncident: { @@ -46,7 +46,7 @@ export default { }, computed: { shouldShowIncident() { - return this.issueType === INCIDENT_TYPE || this.canCreateIncident; + return this.issueType === TYPE_INCIDENT || this.canCreateIncident; }, }, methods: { @@ -60,7 +60,7 @@ export default { }); }, isShown(type) { - return type.value !== INCIDENT_TYPE || this.shouldShowIncident; + return type.value !== TYPE_INCIDENT || this.shouldShowIncident; }, }, }; @@ -73,7 +73,7 @@ export default { label-for="issuable-type" class="mb-2 mb-md-0" > - <gl-listbox + <gl-collapsible-listbox v-model="selectedIssueType" toggle-class="gl-mb-0" :items="$options.issuableTypes" @@ -88,6 +88,6 @@ export default { {{ item.text }} </span> </template> - </gl-listbox> + </gl-collapsible-listbox> </gl-form-group> </template> diff --git a/app/assets/javascripts/issues/show/components/header_actions.vue b/app/assets/javascripts/issues/show/components/header_actions.vue index 9d92b5cf954..84def374d13 100644 --- a/app/assets/javascripts/issues/show/components/header_actions.vue +++ b/app/assets/javascripts/issues/show/components/header_actions.vue @@ -2,7 +2,6 @@ import { GlButton, GlDropdown, - GlDropdownDivider, GlDropdownItem, GlLink, GlModal, @@ -10,9 +9,9 @@ import { GlTooltipDirective, } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; -import { IssueType, STATUS_CLOSED } from '~/issues/constants'; +import { STATUS_CLOSED, TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants'; import { ISSUE_STATE_EVENT_CLOSE, ISSUE_STATE_EVENT_REOPEN } from '~/issues/show/constants'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { visitUrl } from '~/lib/utils/url_utility'; @@ -20,6 +19,7 @@ import { s__, __, sprintf } from '~/locale'; import eventHub from '~/notes/event_hub'; import Tracking from '~/tracking'; import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue'; +import issuesEventHub from '../event_hub'; import promoteToEpicMutation from '../queries/promote_to_epic.mutation.graphql'; import updateIssueMutation from '../queries/update_issue.mutation.graphql'; import DeleteIssueModal from './delete_issue_modal.vue'; @@ -35,6 +35,8 @@ export default { }, deleteModalId: 'delete-modal-id', i18n: { + edit: __('Edit'), + editTitleAndDescription: __('Edit title and description'), promoteErrorMessage: __( 'Something went wrong while promoting the issue to an epic. Please try again.', ), @@ -47,7 +49,6 @@ export default { DeleteIssueModal, GlButton, GlDropdown, - GlDropdownDivider, GlDropdownItem, GlLink, GlModal, @@ -87,7 +88,7 @@ export default { default: '', }, issueType: { - default: IssueType.Issue, + default: TYPE_ISSUE, }, newIssuePath: { default: '', @@ -118,8 +119,8 @@ export default { }, issueTypeText() { const issueTypeTexts = { - [IssueType.Issue]: s__('HeaderAction|issue'), - [IssueType.Incident]: s__('HeaderAction|incident'), + [TYPE_ISSUE]: s__('HeaderAction|issue'), + [TYPE_INCIDENT]: s__('HeaderAction|incident'), }; return issueTypeTexts[this.issueType] ?? this.issueType; @@ -240,6 +241,9 @@ export default { this.toggleStateButtonLoading(false); }); }, + edit() { + issuesEventHub.$emit('open.form'); + }, }, }; </script> @@ -255,6 +259,9 @@ export default { data-testid="mobile-dropdown" :loading="isToggleStateButtonLoading" > + <gl-dropdown-item v-if="canUpdateIssue" @click="edit"> + {{ $options.i18n.edit }} + </gl-dropdown-item> <gl-dropdown-item v-if="showToggleIssueStateButton" :data-qa-selector="`mobile_${qaSelector}`" @@ -280,7 +287,6 @@ export default { {{ __('Submit as spam') }} </gl-dropdown-item> <template v-if="canDestroyIssue"> - <gl-dropdown-divider /> <gl-dropdown-item v-gl-modal="$options.deleteModalId" variant="danger" @@ -292,10 +298,23 @@ export default { </gl-dropdown> <gl-button + v-if="canUpdateIssue" + v-gl-tooltip.bottom + :title="$options.i18n.editTitleAndDescription" + :aria-label="$options.i18n.editTitleAndDescription" + class="js-issuable-edit gl-display-none gl-sm-display-block" + data-testid="edit-button" + @click="edit" + > + {{ $options.i18n.edit }} + </gl-button> + + <gl-button v-if="showToggleIssueStateButton" - class="gl-display-none gl-sm-display-inline-flex!" + class="gl-display-none gl-sm-display-inline-flex! gl-sm-ml-3" :data-qa-selector="qaSelector" :loading="isToggleStateButtonLoading" + data-testid="toggle-button" @click="toggleIssueState" > {{ buttonText }} @@ -304,7 +323,7 @@ export default { <gl-dropdown v-if="hasDesktopDropdown" v-gl-tooltip.hover - class="gl-display-none gl-sm-display-inline-flex! gl-ml-3" + class="gl-display-none gl-sm-display-inline-flex! gl-sm-ml-3" icon="ellipsis_v" category="tertiary" data-qa-selector="issue_actions_ellipsis_dropdown" @@ -338,8 +357,8 @@ export default { > {{ __('Submit as spam') }} </gl-dropdown-item> + <template v-if="canDestroyIssue"> - <gl-dropdown-divider /> <gl-dropdown-item v-gl-modal="$options.deleteModalId" variant="danger" diff --git a/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue b/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue index 40cb7fbb0ff..ac64c35bf15 100644 --- a/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue +++ b/app/assets/javascripts/issues/show/components/incidents/create_timeline_event.vue @@ -3,7 +3,7 @@ import { produce } from 'immer'; import { sortBy } from 'lodash'; import { GlIcon } from '@gitlab/ui'; import { sprintf } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { TYPENAME_ISSUE } from '~/graphql_shared/constants'; import { timelineFormI18n } from './constants'; @@ -113,7 +113,7 @@ export default { > <div v-if="hasTimelineEvents" - class="gl-display-flex gl-align-items-center gl-justify-content-center gl-align-self-start gl-bg-white gl-text-gray-200 gl-border-gray-100 gl-border-1 gl-border-solid gl-rounded-full gl-mt-2 gl-w-8 gl-h-8 gl-z-index-1" + class="gl-display-flex gl-align-items-center gl-justify-content-center gl-align-self-start gl-bg-white gl-text-gray-200 gl-border-gray-100 gl-border-1 gl-border-solid gl-rounded-full gl-mt-2 gl-w-8 gl-h-8 gl-flex-shrink-0 gl-p-3 gl-z-index-1" > <gl-icon name="comment" class="note-icon" /> </div> diff --git a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue index 997fadec602..4ec64ef838d 100644 --- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue +++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue @@ -1,6 +1,6 @@ <script> import { GlTab, GlTabs } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; import { s__ } from '~/locale'; import Tracking from '~/tracking'; @@ -35,7 +35,7 @@ export default { IncidentMetricTab: () => import('ee_component/issues/show/components/incidents/incident_metric_tab.vue'), }, - inject: ['fullPath', 'iid', 'uploadMetricsFeatureAvailable'], + inject: ['fullPath', 'iid', 'hasLinkedAlerts', 'uploadMetricsFeatureAvailable'], i18n: incidentTabsI18n, apollo: { alert: { @@ -59,20 +59,23 @@ export default { data() { return { alert: null, - activeTabIndex: 0, }; }, computed: { loading() { return this.$apollo.queries.alert.loading; }, + activeTabIndex() { + const { tabId } = this.$route.params; + return tabId ? this.tabMapping.tabNamesToIndex[tabId] : 0; + }, tabMapping() { const availableTabs = [TAB_NAMES.SUMMARY]; if (this.uploadMetricsFeatureAvailable) { availableTabs.push(TAB_NAMES.METRICS); } - if (this.alert) { + if (this.hasLinkedAlerts) { availableTabs.push(TAB_NAMES.ALERTS); } @@ -93,20 +96,25 @@ export default { return this.activeTabIndex; }, set(index) { - this.handleTabChange(index); - this.activeTabIndex = index; + const newPath = `/${this.tabMapping.tabIndexToName[index]}`; + // Only push if the new path differs from the old path. + if (newPath !== this.$route.path) { + this.$router.push(newPath); + this.updateJsIssueWidgets(index); + } }, }, }, mounted() { this.trackPageViews(); + this.updateJsIssueWidgets(this.activeTabIndex); }, methods: { trackPageViews() { const { category, action } = trackIncidentDetailsViewsOptions; Tracking.event(category, action); }, - handleTabChange(tabIndex) { + updateJsIssueWidgets(tabIndex) { /** * TODO: Implement a solution that does not violate Vue principles in using * DOM manipulation directly (#361618) @@ -153,7 +161,7 @@ export default { <incident-metric-tab /> </gl-tab> <gl-tab - v-if="alert" + v-if="hasLinkedAlerts" class="alert-management-details" :title="$options.i18n.alertsTitle" data-testid="alert-details-tab" diff --git a/app/assets/javascripts/issues/show/components/incidents/router.js b/app/assets/javascripts/issues/show/components/incidents/router.js new file mode 100644 index 00000000000..01326f3b5de --- /dev/null +++ b/app/assets/javascripts/issues/show/components/incidents/router.js @@ -0,0 +1,20 @@ +import Vue from 'vue'; +import VueRouter from 'vue-router'; + +Vue.use(VueRouter); + +export default (currentPath, currentTab = null) => { + // If navigating directly to a tab, determine the base + // path to initialize router, then set the current route. + const base = currentPath.replace(new RegExp(`/${currentTab}$`), ''); + + const router = new VueRouter({ + mode: 'history', + base, + routes: [{ path: '/:tabId', name: 'tab' }], + }); + + if (currentTab) router.push(`/${currentTab}`); + + return router; +}; diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue index 7944362a40f..243666b2323 100644 --- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue +++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_form.vue @@ -255,11 +255,10 @@ export default { </gl-form-group> </div> <gl-form-group class="gl-mb-0"> - <div class="gl-display-flex"> + <div class="gl-display-flex gl-flex-wrap gl-gap-3"> <gl-button variant="confirm" category="primary" - class="gl-mr-3" data-testid="save-button" :disabled="!isTimelineTextValid" :loading="isEventProcessed" @@ -271,7 +270,6 @@ export default { v-if="showSaveAndAdd" variant="confirm" category="secondary" - class="gl-mr-3 gl-ml-n2" data-testid="save-and-add-button" :disabled="!isTimelineTextValid" :loading="isEventProcessed" @@ -279,7 +277,7 @@ export default { > {{ $options.i18n.saveAndAdd }} </gl-button> - <gl-button class="gl-ml-n2" :disabled="isEventProcessed" @click="$emit('cancel')"> + <gl-button :disabled="isEventProcessed" @click="$emit('cancel')"> {{ $options.i18n.cancel }} </gl-button> <gl-button diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue index 10b80529a66..5aef4b1b809 100644 --- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue +++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue @@ -1,6 +1,6 @@ <script> import { formatDate } from '~/lib/utils/datetime_utility'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sprintf } from '~/locale'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending'; diff --git a/app/assets/javascripts/issues/show/components/incidents/utils.js b/app/assets/javascripts/issues/show/components/incidents/utils.js index ce33e91c3b8..2072961ce29 100644 --- a/app/assets/javascripts/issues/show/components/incidents/utils.js +++ b/app/assets/javascripts/issues/show/components/incidents/utils.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; export const displayAndLogError = (error) => diff --git a/app/assets/javascripts/issues/show/components/locked_warning.vue b/app/assets/javascripts/issues/show/components/locked_warning.vue index 4414e693ed0..482aad32daa 100644 --- a/app/assets/javascripts/issues/show/components/locked_warning.vue +++ b/app/assets/javascripts/issues/show/components/locked_warning.vue @@ -1,7 +1,13 @@ <script> import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; -import { IssuableType } from '~/issues/constants'; +import { + TYPE_ALERT, + TYPE_EPIC, + TYPE_ISSUE, + TYPE_MERGE_REQUEST, + TYPE_TEST_CASE, +} from '~/issues/constants'; export const i18n = Object.freeze({ alertMessage: __( @@ -20,7 +26,9 @@ export default { type: String, required: true, validator(value) { - return Object.values(IssuableType).includes(value); + return [TYPE_ALERT, TYPE_EPIC, TYPE_ISSUE, TYPE_MERGE_REQUEST, TYPE_TEST_CASE].includes( + value, + ); }, }, }, diff --git a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue index d0beb0f39b3..03d298e0ddf 100644 --- a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue +++ b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue @@ -13,7 +13,7 @@ export default { GlDropdown, GlDropdownItem, }, - inject: ['canUpdate', 'toggleClass'], + inject: ['canUpdate'], methods: { convertToTask() { eventHub.$emit('convert-task-list-item', this.$el.closest('li').dataset.sourcepos); @@ -35,7 +35,7 @@ export default { right :text="$options.i18n.taskActions" text-sr-only - :toggle-class="`task-list-item-actions gl-opacity-0 gl-p-2! ${toggleClass}`" + toggle-class="task-list-item-actions gl-opacity-0 gl-p-2!" > <gl-dropdown-item v-if="canUpdate" @click="convertToTask"> {{ $options.i18n.convertToTask }} diff --git a/app/assets/javascripts/issues/show/components/title.vue b/app/assets/javascripts/issues/show/components/title.vue index 6978f730e1d..2d2ef327018 100644 --- a/app/assets/javascripts/issues/show/components/title.vue +++ b/app/assets/javascripts/issues/show/components/title.vue @@ -1,17 +1,9 @@ <script> -import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { GlTooltipDirective } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { __ } from '~/locale'; -import eventHub from '../event_hub'; import animateMixin from '../mixins/animate'; export default { - i18n: { - editTitleAndDescription: __('Edit title and description'), - }, - components: { - GlButton, - }, directives: { GlTooltip: GlTooltipDirective, SafeHtml, @@ -35,11 +27,6 @@ export default { type: String, required: true, }, - showInlineEditButton: { - type: Boolean, - required: false, - default: false, - }, }, data() { return { @@ -60,9 +47,6 @@ export default { currentPageTitleScope[0] = `${this.titleText} (${this.issuableRef}) `; this.titleEl.textContent = currentPageTitleScope.join('·'); }, - edit() { - eventHub.$emit('open.form'); - }, }, }; </script> @@ -77,16 +61,8 @@ export default { }" class="title gl-font-size-h-display" data-qa-selector="title_content" + data-testid="issue-title" dir="auto" ></h1> - <gl-button - v-if="showInlineEditButton && canUpdate" - v-gl-tooltip.bottom - icon="pencil" - class="btn-edit js-issuable-edit" - :title="$options.i18n.editTitleAndDescription" - :aria-label="$options.i18n.editTitleAndDescription" - @click="edit" - /> </div> </template> diff --git a/app/assets/javascripts/issues/show/constants.js b/app/assets/javascripts/issues/show/constants.js index a100aaf88ad..4d8c11f9669 100644 --- a/app/assets/javascripts/issues/show/constants.js +++ b/app/assets/javascripts/issues/show/constants.js @@ -1,6 +1,5 @@ import { __ } from '~/locale'; -export const INCIDENT_TYPE = 'incident'; export const INCIDENT_TYPE_PATH = 'issues/incident'; export const ISSUE_STATE_EVENT_CLOSE = 'CLOSE'; export const ISSUE_STATE_EVENT_REOPEN = 'REOPEN'; diff --git a/app/assets/javascripts/issues/show/index.js b/app/assets/javascripts/issues/show/index.js index 1793ce66ad4..e677328cd2e 100644 --- a/app/assets/javascripts/issues/show/index.js +++ b/app/assets/javascripts/issues/show/index.js @@ -2,14 +2,16 @@ import Vue from 'vue'; import { mapGetters } from 'vuex'; import errorTrackingStore from '~/error_tracking/store'; import { apolloProvider } from '~/graphql_shared/issuable_client'; +import { TYPE_INCIDENT } from '~/issues/constants'; import { parseBoolean } from '~/lib/utils/common_utils'; import { scrollToTargetOnResize } from '~/lib/utils/resize_observer'; import IssueApp from './components/app.vue'; import HeaderActions from './components/header_actions.vue'; import IncidentTabs from './components/incidents/incident_tabs.vue'; import SentryErrorStackTrace from './components/sentry_error_stack_trace.vue'; -import { INCIDENT_TYPE, issueState } from './constants'; +import { issueState } from './constants'; import getIssueStateQuery from './queries/get_issue_state.query.graphql'; +import createRouter from './components/incidents/router'; const bootstrapApollo = (state = {}) => { return apolloProvider.clients.defaultClient.cache.writeQuery({ @@ -35,23 +37,28 @@ export function initIncidentApp(issueData = {}, store) { canUpdateTimelineEvent, iid, issuableId, + currentPath, + currentTab, projectNamespace, projectPath, projectId, + hasLinkedAlerts, slaFeatureAvailable, uploadMetricsFeatureAvailable, state, } = issueData; const fullPath = `${projectNamespace}/${projectPath}`; + const router = createRouter(currentPath, currentTab); return new Vue({ el, name: 'DescriptionRoot', apolloProvider, store, + router, provide: { - issueType: INCIDENT_TYPE, + issueType: TYPE_INCIDENT, canCreateIncident, canUpdateTimelineEvent, canUpdate, @@ -59,6 +66,7 @@ export function initIncidentApp(issueData = {}, store) { iid, issuableId, projectId, + hasLinkedAlerts: parseBoolean(hasLinkedAlerts), slaFeatureAvailable: parseBoolean(slaFeatureAvailable), uploadMetricsFeatureAvailable: parseBoolean(uploadMetricsFeatureAvailable), contentEditorOnIssues: gon.features.contentEditorOnIssues, @@ -125,7 +133,6 @@ export function initIssueApp(issueData, store) { isLocked: this.getNoteableData?.discussion_locked, issuableStatus: this.getNoteableData?.state, issueId: this.getNoteableData?.id, - issueIid: this.getNoteableData?.iid, }, }); }, @@ -142,7 +149,7 @@ export function initHeaderActions(store, type = '') { bootstrapApollo({ ...issueState, issueType: el.dataset.issueType }); const canCreate = - type === INCIDENT_TYPE ? el.dataset.canCreateIncident : el.dataset.canCreateIssue; + type === TYPE_INCIDENT ? el.dataset.canCreateIncident : el.dataset.canCreateIssue; return new Vue({ el, diff --git a/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_job.fragment.graphql b/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_job.fragment.graphql new file mode 100644 index 00000000000..f4a0b10672e --- /dev/null +++ b/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_job.fragment.graphql @@ -0,0 +1,11 @@ +#import "~/jobs/components/job/graphql/fragments/ci_variable.fragment.graphql" + +fragment BaseCiJob on CiJob { + id + manualVariables { + nodes { + ...ManualCiVariable + } + } + __typename +} diff --git a/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_variable.fragment.graphql b/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_variable.fragment.graphql new file mode 100644 index 00000000000..0479df7bc4c --- /dev/null +++ b/app/assets/javascripts/jobs/components/job/graphql/fragments/ci_variable.fragment.graphql @@ -0,0 +1,6 @@ +fragment ManualCiVariable on CiVariable { + __typename + id + key + value +} diff --git a/app/assets/javascripts/jobs/components/job/graphql/mutations/job_play_with_variables.mutation.graphql b/app/assets/javascripts/jobs/components/job/graphql/mutations/job_play_with_variables.mutation.graphql new file mode 100644 index 00000000000..520deef5136 --- /dev/null +++ b/app/assets/javascripts/jobs/components/job/graphql/mutations/job_play_with_variables.mutation.graphql @@ -0,0 +1,11 @@ +#import "~/jobs/components/job/graphql/fragments/ci_job.fragment.graphql" + +mutation playJobWithVariables($id: CiBuildID!, $variables: [CiVariableInput!]) { + jobPlay(input: { id: $id, variables: $variables }) { + job { + ...BaseCiJob + webPath + } + errors + } +} diff --git a/app/assets/javascripts/jobs/components/job/graphql/mutations/job_retry_with_variables.mutation.graphql b/app/assets/javascripts/jobs/components/job/graphql/mutations/job_retry_with_variables.mutation.graphql index 2b79892a072..e35d603ea71 100644 --- a/app/assets/javascripts/jobs/components/job/graphql/mutations/job_retry_with_variables.mutation.graphql +++ b/app/assets/javascripts/jobs/components/job/graphql/mutations/job_retry_with_variables.mutation.graphql @@ -1,14 +1,9 @@ +#import "~/jobs/components/job/graphql/fragments/ci_job.fragment.graphql" + mutation retryJobWithVariables($id: CiBuildID!, $variables: [CiVariableInput!]) { jobRetry(input: { id: $id, variables: $variables }) { job { - id - manualVariables { - nodes { - id - key - value - } - } + ...BaseCiJob webPath } errors diff --git a/app/assets/javascripts/jobs/components/job/graphql/queries/get_job.query.graphql b/app/assets/javascripts/jobs/components/job/graphql/queries/get_job.query.graphql index aaf1dec8e0f..95e3521091d 100644 --- a/app/assets/javascripts/jobs/components/job/graphql/queries/get_job.query.graphql +++ b/app/assets/javascripts/jobs/components/job/graphql/queries/get_job.query.graphql @@ -1,16 +1,11 @@ +#import "~/jobs/components/job/graphql/fragments/ci_job.fragment.graphql" + query getJob($fullPath: ID!, $id: JobID!) { project(fullPath: $fullPath) { id job(id: $id) { - id + ...BaseCiJob manualJob - manualVariables { - nodes { - id - key - value - } - } name } } diff --git a/app/assets/javascripts/jobs/components/job/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job/job_log_controllers.vue index e9809ac661b..ea7e13418f2 100644 --- a/app/assets/javascripts/jobs/components/job/job_log_controllers.vue +++ b/app/assets/javascripts/jobs/components/job/job_log_controllers.vue @@ -103,6 +103,8 @@ export default { } else { next(); } + }).catch(() => { + this.failureCount = null; }); } }, diff --git a/app/assets/javascripts/jobs/components/job/manual_variables_form.vue b/app/assets/javascripts/jobs/components/job/manual_variables_form.vue index 763eb6705aa..19a75ffaa85 100644 --- a/app/assets/javascripts/jobs/components/job/manual_variables_form.vue +++ b/app/assets/javascripts/jobs/components/job/manual_variables_form.vue @@ -10,16 +10,17 @@ import { GlTooltipDirective, } from '@gitlab/ui'; import { cloneDeep, uniqueId } from 'lodash'; -import { mapActions } from 'vuex'; import { fetchPolicies } from '~/lib/graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_CI_BUILD, TYPENAME_COMMIT_STATUS } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { JOB_GRAPHQL_ERRORS } from '~/jobs/constants'; import { helpPagePath } from '~/helpers/help_page_helper'; import { redirectTo } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; +import { reportMessageToSentry } from '~/jobs/utils'; import GetJob from './graphql/queries/get_job.query.graphql'; +import playJobWithVariablesMutation from './graphql/mutations/job_play_with_variables.mutation.graphql'; import retryJobWithVariablesMutation from './graphql/mutations/job_retry_with_variables.mutation.graphql'; // This component is a port of ~/jobs/components/job/legacy_manual_variables_form.vue @@ -54,8 +55,9 @@ export default { const jobVariables = cloneDeep(data?.project?.job?.manualVariables?.nodes); return [...jobVariables.reverse(), ...this.variables]; }, - error() { + error(error) { createAlert({ message: JOB_GRAPHQL_ERRORS.jobQueryErrorText }); + reportMessageToSentry(this.$options.name, error, {}); }, }, }, @@ -69,13 +71,14 @@ export default { required: true, }, }, - clearBtnSharedClasses: ['gl-flex-grow-0 gl-flex-basis-0'], + clearBtnSharedClasses: ['gl-flex-grow-0 gl-flex-basis-0 gl-m-0! gl-ml-3!'], inputTypes: { key: 'key', value: 'value', }, i18n: { - clearInputs: s__('CiVariables|Clear inputs'), + cancel: s__('CiVariables|Cancel'), + removeInputs: s__('CiVariables|Remove inputs'), formHelpText: s__( 'CiVariables|Specify variable values to be used in this run. The variables specified in the configuration file and %{linkStart}CI/CD settings%{linkEnd} are used by default.', ), @@ -86,14 +89,10 @@ export default { keyLabel: s__('CiVariables|Key'), keyPlaceholder: s__('CiVariables|Input variable key'), runAgainButtonText: s__('CiVariables|Run job again'), - triggerButtonText: s__('CiVariables|Run job'), + runButtonText: s__('CiVariables|Run job'), valueLabel: s__('CiVariables|Value'), valuePlaceholder: s__('CiVariables|Input variable value'), }, - variableValueKeys: { - rest: 'secret_value', - gql: 'value', - }, data() { return { job: {}, @@ -104,30 +103,63 @@ export default { value: '', }, ], - runAgainBtnDisabled: false, - triggerBtnDisabled: false, + runBtnDisabled: false, }; }, computed: { + mutationVariables() { + return { + id: convertToGraphQLId(TYPENAME_CI_BUILD, this.jobId), + variables: this.preparedVariables, + }; + }, preparedVariables() { - // filtering out 'id' along with empty variables to send only key, value in the mutation. - // This will be removed in: https://gitlab.com/gitlab-org/gitlab/-/issues/377268 - return this.variables .filter((variable) => variable.key !== '') - .map(({ key, value }) => ({ key, [this.valueKey]: value })); + .map(({ key, value }) => ({ key, value })); }, - valueKey() { + runBtnText() { return this.isRetryable - ? this.$options.variableValueKeys.gql - : this.$options.variableValueKeys.rest; + ? this.$options.i18n.runAgainButtonText + : this.$options.i18n.runButtonText; }, variableSettings() { return helpPagePath('ci/variables/index', { anchor: 'add-a-cicd-variable-to-a-project' }); }, }, methods: { - ...mapActions(['triggerManualJob']), + async playJob() { + try { + const { data } = await this.$apollo.mutate({ + mutation: playJobWithVariablesMutation, + variables: this.mutationVariables, + }); + if (data.jobPlay?.errors?.length) { + createAlert({ message: data.jobPlay.errors[0] }); + } else { + this.navigateToJob(data.jobPlay?.job?.webPath); + } + } catch (error) { + createAlert({ message: JOB_GRAPHQL_ERRORS.jobMutationErrorText }); + reportMessageToSentry(this.$options.name, error, {}); + } + }, + async retryJob() { + try { + const { data } = await this.$apollo.mutate({ + mutation: retryJobWithVariablesMutation, + variables: this.mutationVariables, + }); + if (data.jobRetry?.errors?.length) { + createAlert({ message: data.jobRetry.errors[0] }); + } else { + this.navigateToJob(data.jobRetry?.job?.webPath); + } + } catch (error) { + createAlert({ message: JOB_GRAPHQL_ERRORS.jobMutationErrorText }); + reportMessageToSentry(this.$options.name, error, {}); + } + }, addEmptyVariable() { const lastVar = this.variables[this.variables.length - 1]; @@ -153,37 +185,17 @@ export default { inputRef(type, id) { return `${this.$options.inputTypes[type]}-${id}`; }, - navigateToRetriedJob(retryPath) { - redirectTo(retryPath); + navigateToJob(path) { + redirectTo(path); }, - async retryJob() { - try { - const { data } = await this.$apollo.mutate({ - mutation: retryJobWithVariablesMutation, - variables: { - id: convertToGraphQLId(TYPENAME_CI_BUILD, this.jobId), - // we need to ensure no empty variables are passed to the API - variables: this.preparedVariables, - }, - }); - if (data.jobRetry?.errors?.length) { - createAlert({ message: data.jobRetry.errors[0] }); - } else { - this.navigateToRetriedJob(data.jobRetry?.job?.webPath); - } - } catch (error) { - createAlert({ message: JOB_GRAPHQL_ERRORS.retryMutationErrorText }); - } - }, - runAgain() { - this.runAgainBtnDisabled = true; - - this.retryJob(); - }, - triggerJob() { - this.triggerBtnDisabled = true; + runJob() { + this.runBtnDisabled = true; - this.triggerManualJob(this.preparedVariables); + if (this.isRetryable) { + this.retryJob(); + } else { + this.playJob(); + } }, }, }; @@ -197,7 +209,7 @@ export default { <div v-for="(variable, index) in variables" :key="variable.id" - class="gl-display-flex gl-align-items-center gl-mb-4" + class="gl-display-flex gl-align-items-center gl-mb-5" data-testid="ci-variable-row" > <gl-form-input-group class="gl-mr-4 gl-flex-grow-1"> @@ -232,12 +244,11 @@ export default { <gl-button v-if="canRemove(index)" v-gl-tooltip - :aria-label="$options.i18n.clearInputs" - :title="$options.i18n.clearInputs" + :aria-label="$options.i18n.removeInputs" + :title="$options.i18n.removeInputs" :class="$options.clearBtnSharedClasses" category="tertiary" - variant="danger" - icon="clear" + icon="remove" data-testid="delete-variable-btn" @click="deleteVariable(variable.id)" /> @@ -248,8 +259,7 @@ export default { :class="$options.clearBtnSharedClasses" data-testid="delete-variable-btn-placeholder" category="tertiary" - variant="danger" - icon="clear" + icon="remove" /> </div> @@ -271,37 +281,23 @@ export default { </template> </gl-sprintf> </div> - <div v-if="isRetryable" class="gl-display-flex gl-justify-content-center gl-mt-5"> + <div class="gl-display-flex gl-justify-content-center gl-mt-5"> <gl-button + v-if="isRetryable" class="gl-mt-5" - :aria-label="__('Cancel')" data-testid="cancel-btn" @click="$emit('hideManualVariablesForm')" - >{{ __('Cancel') }}</gl-button + >{{ $options.i18n.cancel }}</gl-button > <gl-button class="gl-mt-5" variant="confirm" category="primary" - :aria-label="__('Run manual job again')" - :disabled="runAgainBtnDisabled" + :disabled="runBtnDisabled" data-testid="run-manual-job-btn" - @click="runAgain" - > - {{ $options.i18n.runAgainButtonText }} - </gl-button> - </div> - <div v-else class="gl-display-flex gl-justify-content-center gl-mt-5"> - <gl-button - class="gl-mt-5" - variant="confirm" - category="primary" - :aria-label="__('Trigger manual job')" - :disabled="triggerBtnDisabled" - data-testid="trigger-manual-job-btn" - @click="triggerJob" + @click="runJob" > - {{ $options.i18n.triggerButtonText }} + {{ runBtnText }} </gl-button> </div> </div> diff --git a/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue b/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue index 913924cc7b1..a3f1a2c4be8 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/job_retry_forward_deployment_modal.vue @@ -30,18 +30,16 @@ export default { return { primaryProps: { text: this.$options.i18n.primaryText, - attributes: [ - { - 'data-method': 'post', - 'data-testid': 'retry-button-modal', - href: this.href, - variant: 'danger', - }, - ], + attributes: { + 'data-method': 'post', + 'data-testid': 'retry-button-modal', + href: this.href, + variant: 'danger', + }, }, cancelProps: { text: this.$options.i18n.cancel, - attributes: [{ category: 'secondary', variant: 'default' }], + attributes: { category: 'secondary', variant: 'default' }, }, }; }, diff --git a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue index 8100bc2d87a..d791705d80d 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlTooltipDirective } from '@gitlab/ui'; import { mapActions } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_COMMIT_STATUS } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue'; diff --git a/app/assets/javascripts/jobs/components/table/constants.js b/app/assets/javascripts/jobs/components/table/constants.js index 41ce6e4d64d..1b572e60c58 100644 --- a/app/assets/javascripts/jobs/components/table/constants.js +++ b/app/assets/javascripts/jobs/components/table/constants.js @@ -1,7 +1,6 @@ import { s__, __ } from '~/locale'; /* Error constants */ -export const POST_FAILURE = 'post_failure'; export const DEFAULT = 'default'; export const RAW_TEXT_WARNING = s__( 'Jobs|Raw text search is not currently supported for the jobs filtered search feature. Please use the available search tokens.', diff --git a/app/assets/javascripts/jobs/components/table/graphql/cache_config.js b/app/assets/javascripts/jobs/components/table/graphql/cache_config.js index 8bcd7ffd10f..5390c023da4 100644 --- a/app/assets/javascripts/jobs/components/table/graphql/cache_config.js +++ b/app/assets/javascripts/jobs/components/table/graphql/cache_config.js @@ -11,42 +11,48 @@ export default { }, CiJobConnection: { merge(existing = {}, incoming, { args = {} }) { - let nodes; + if (incoming.nodes) { + let nodes; - const areNodesEqual = isEqual(existing.nodes, incoming.nodes); - const statuses = Array.isArray(args.statuses) ? [...args.statuses] : args.statuses; - const { pageInfo } = incoming; + const areNodesEqual = isEqual(existing.nodes, incoming.nodes); + const statuses = Array.isArray(args.statuses) ? [...args.statuses] : args.statuses; + const { pageInfo } = incoming; - if (Object.keys(existing).length !== 0 && isEqual(existing?.statuses, args?.statuses)) { - if (areNodesEqual) { - if (incoming.pageInfo.hasNextPage) { - nodes = [...existing.nodes, ...incoming.nodes]; + if (Object.keys(existing).length !== 0 && isEqual(existing?.statuses, args?.statuses)) { + if (areNodesEqual) { + if (incoming.pageInfo.hasNextPage) { + nodes = [...existing.nodes, ...incoming.nodes]; + } else { + nodes = [...incoming.nodes]; + } } else { - nodes = [...incoming.nodes]; - } - } else { - if (!existing.pageInfo?.hasNextPage) { - nodes = [...incoming.nodes]; + if (!existing.pageInfo?.hasNextPage) { + nodes = [...incoming.nodes]; - return { - nodes, - statuses, - pageInfo, - count: incoming.count, - }; - } + return { + nodes, + statuses, + pageInfo, + }; + } - nodes = [...existing.nodes, ...incoming.nodes]; + nodes = [...existing.nodes, ...incoming.nodes]; + } + } else { + nodes = [...incoming.nodes]; } - } else { - nodes = [...incoming.nodes]; + + return { + nodes, + statuses, + pageInfo, + }; } return { - nodes, - statuses, - pageInfo, - count: incoming.count, + nodes: existing.nodes, + pageInfo: existing.pageInfo, + statuses: args.statuses, }; }, }, diff --git a/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs.query.graphql b/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs.query.graphql index 851be211b25..69719011079 100644 --- a/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs.query.graphql +++ b/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs.query.graphql @@ -2,7 +2,6 @@ query getJobs($fullPath: ID!, $after: String, $first: Int = 30, $statuses: [CiJo project(fullPath: $fullPath) { id jobs(after: $after, first: $first, statuses: $statuses) { - count pageInfo { endCursor hasNextPage diff --git a/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs_count.query.graphql b/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs_count.query.graphql new file mode 100644 index 00000000000..a4e02ae721a --- /dev/null +++ b/app/assets/javascripts/jobs/components/table/graphql/queries/get_jobs_count.query.graphql @@ -0,0 +1,8 @@ +query getJobsCount($fullPath: ID!, $statuses: [CiJobStatus!]) { + project(fullPath: $fullPath) { + id + jobs(statuses: $statuses) { + count + } + } +} diff --git a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue index 3209fc4b90d..3d87cea6445 100644 --- a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue +++ b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue @@ -1,11 +1,12 @@ <script> import { GlAlert, GlSkeletonLoader, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui'; import { __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { setUrlParams, updateHistory, queryToObject } from '~/lib/utils/url_utility'; import JobsFilteredSearch from '../filtered_search/jobs_filtered_search.vue'; import { validateQueryString } from '../filtered_search/utils'; import GetJobs from './graphql/queries/get_jobs.query.graphql'; +import GetJobsCount from './graphql/queries/get_jobs_count.query.graphql'; import JobsTable from './jobs_table.vue'; import JobsTableEmptyState from './jobs_table_empty_state.vue'; import JobsTableTabs from './jobs_table_tabs.vue'; @@ -13,7 +14,8 @@ import { RAW_TEXT_WARNING } from './constants'; export default { i18n: { - errorMsg: __('There was an error fetching the jobs for your project.'), + jobsFetchErrorMsg: __('There was an error fetching the jobs for your project.'), + jobsCountErrorMsg: __('There was an error fetching the number of jobs for your project.'), loadingAriaLabel: __('Loading'), }, filterSearchBoxStyles: @@ -43,15 +45,32 @@ export default { }; }, update(data) { - const { jobs: { nodes: list = [], pageInfo = {}, count } = {} } = data.project || {}; + const { jobs: { nodes: list = [], pageInfo = {} } = {} } = data.project || {}; return { list, pageInfo, - count, }; }, error() { - this.hasError = true; + this.error = this.$options.i18n.jobsFetchErrorMsg; + }, + }, + jobsCount: { + query: GetJobsCount, + context: { + isSingleRequest: true, + }, + variables() { + return { + fullPath: this.fullPath, + ...this.validatedQueryString, + }; + }, + update({ project }) { + return project?.jobs?.count || 0; + }, + error() { + this.error = this.$options.i18n.jobsCountErrorMsg; }, }, }, @@ -60,11 +79,11 @@ export default { jobs: { list: [], }, - hasError: false, - isAlertDismissed: false, + error: '', scope: null, infiniteScrollingTriggered: false, filterSearchTriggered: false, + jobsCount: null, count: 0, }; }, @@ -72,9 +91,6 @@ export default { loading() { return this.$apollo.queries.jobs.loading; }, - shouldShowAlert() { - return this.hasError && !this.isAlertDismissed; - }, // Show when on All tab with no jobs // Show only when not loading and filtered search has not been triggered // So we don't show empty state when results are empty on a filtered search @@ -95,9 +111,6 @@ export default { showFilteredSearch() { return !this.scope; }, - jobsCount() { - return this.jobs.count; - }, validatedQueryString() { const queryStringObject = queryToObject(window.location.search); @@ -146,6 +159,7 @@ export default { }); this.$apollo.queries.jobs.refetch({ statuses: filter.value.data }); + this.$apollo.queries.jobsCount.refetch({ statuses: filter.value.data }); } }); }, @@ -168,14 +182,14 @@ export default { <template> <div> <gl-alert - v-if="shouldShowAlert" + v-if="error" class="gl-mt-2" variant="danger" data-testid="jobs-table-error-alert" dismissible - @dismiss="isAlertDismissed = true" + @dismiss="error = ''" > - {{ $options.i18n.errorMsg }} + {{ error }} </gl-alert> <jobs-table-tabs diff --git a/app/assets/javascripts/jobs/constants.js b/app/assets/javascripts/jobs/constants.js index 027d896ba0e..40b3de7edd9 100644 --- a/app/assets/javascripts/jobs/constants.js +++ b/app/assets/javascripts/jobs/constants.js @@ -19,7 +19,7 @@ export const JOB_SIDEBAR_COPY = { }; export const JOB_GRAPHQL_ERRORS = { - retryMutationErrorText: __('There was an error running the job. Please try again.'), + jobMutationErrorText: __('There was an error running the job. Please try again.'), jobQueryErrorText: __('There was an error fetching the job.'), }; diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js index af2d720643f..b348478ccda 100644 --- a/app/assets/javascripts/jobs/store/actions.js +++ b/app/assets/javascripts/jobs/store/actions.js @@ -1,5 +1,5 @@ import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { setFaviconOverlay, resetFavicon } from '~/lib/utils/favicon'; import { HTTP_STATUS_FORBIDDEN } from '~/lib/utils/http_status'; @@ -22,7 +22,7 @@ export const init = ({ dispatch }, { endpoint, logState, pagePath }) => { pagePath, }); - return Promise.all([dispatch('fetchJob')]); + return dispatch('fetchJob'); }; export const setJobEndpoint = ({ commit }, endpoint) => commit(types.SET_JOB_ENDPOINT, endpoint); diff --git a/app/assets/javascripts/labels/components/promote_label_modal.vue b/app/assets/javascripts/labels/components/promote_label_modal.vue index 1b99a094c48..298cc20ab35 100644 --- a/app/assets/javascripts/labels/components/promote_label_modal.vue +++ b/app/assets/javascripts/labels/components/promote_label_modal.vue @@ -1,6 +1,6 @@ <script> import { GlSprintf, GlModal } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import { s__, __, sprintf } from '~/locale'; @@ -9,7 +9,7 @@ import eventHub from '../event_hub'; export default { primaryProps: { text: s__('Labels|Promote Label'), - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, cancelProps: { text: __('Cancel'), diff --git a/app/assets/javascripts/labels/create_label_dropdown.js b/app/assets/javascripts/labels/create_label_dropdown.js index 033ca9dd3ea..60ab0c92256 100644 --- a/app/assets/javascripts/labels/create_label_dropdown.js +++ b/app/assets/javascripts/labels/create_label_dropdown.js @@ -37,6 +37,8 @@ export default class CreateLabelDropdown { // eslint-disable-next-line @gitlab/no-global-event-off this.$newColorField.off('keyup change'); // eslint-disable-next-line @gitlab/no-global-event-off + this.$colorPreview.off('keyup change'); + // eslint-disable-next-line @gitlab/no-global-event-off this.$dropdownBack.off('click'); // eslint-disable-next-line @gitlab/no-global-event-off this.$cancelButton.off('click'); @@ -54,6 +56,10 @@ export default class CreateLabelDropdown { this.$newLabelField.on('keyup change', this.enableLabelCreateButton.bind(this)); this.$newColorField.on('keyup change', this.enableLabelCreateButton.bind(this)); + this.$colorPreview.on('keyup change', this.enableLabelCreateButton.bind(this)); + + this.$newColorField.on('input', this.updateColorPreview.bind(this)); + this.$colorPreview.on('input', this.updateColorPickerPreview.bind(this)); this.$dropdownBack.on('click', this.resetForm.bind(this)); @@ -73,7 +79,19 @@ export default class CreateLabelDropdown { e.stopPropagation(); this.$newColorField.val($this.data('color')).trigger('change'); - this.$colorPreview.css('background-color', $this.data('color')).parent().addClass('is-active'); + this.$colorPreview.val($this.data('color')).trigger('change'); + } + + updateColorPreview() { + const previewColor = this.$newColorField.val(); + return this.$colorPreview.val(previewColor); + // Updates the preview color with the hex-color input + } + + updateColorPickerPreview() { + const previewColor = this.$colorPreview.val(); + return this.$newColorField.val(previewColor); + // Updates the input color with the hex-color from the picker } enableLabelCreateButton() { @@ -92,7 +110,7 @@ export default class CreateLabelDropdown { this.$addList.prop('checked', this.addListDefault); - this.$colorPreview.css('background-color', '').parent().removeClass('is-active'); + this.$colorPreview.val(''); } saveLabel(e) { diff --git a/app/assets/javascripts/labels/group_label_subscription.js b/app/assets/javascripts/labels/group_label_subscription.js index c4f80d32a83..3683bb5d5e5 100644 --- a/app/assets/javascripts/labels/group_label_subscription.js +++ b/app/assets/javascripts/labels/group_label_subscription.js @@ -1,7 +1,8 @@ import $ from 'jquery'; import { __ } from '~/locale'; import { fixTitle, hide } from '~/tooltips'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import axios from '~/lib/utils/axios_utils'; const tooltipTitles = { @@ -65,7 +66,7 @@ export default class GroupLabelSubscription { static setNewTooltip($button) { if (!$button.hasClass('js-subscribe-button')) return; - const type = $button.hasClass('js-group-level') ? 'group' : 'project'; + const type = $button.hasClass('js-group-level') ? WORKSPACE_GROUP : WORKSPACE_PROJECT; const newTitle = tooltipTitles[type]; const $el = $('.js-unsubscribe-button', $button.closest('.label-actions-list')); diff --git a/app/assets/javascripts/labels/label_manager.js b/app/assets/javascripts/labels/label_manager.js index be515869bff..f4d7c610cae 100644 --- a/app/assets/javascripts/labels/label_manager.js +++ b/app/assets/javascripts/labels/label_manager.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import Sortable from 'sortablejs'; import { dispose } from '~/tooltips'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/labels/labels.js b/app/assets/javascripts/labels/labels.js index cd8cf0d354c..acb29e1a1f0 100644 --- a/app/assets/javascripts/labels/labels.js +++ b/app/assets/javascripts/labels/labels.js @@ -7,29 +7,39 @@ export default class Labels { this.cleanBinding(); this.addBinding(); this.updateColorPreview(); + this.updateColorPickerPreview(); } addBinding() { $(document).on('click', '.suggest-colors a', this.setSuggestedColor); + $(document).on('input', '.label-color-preview', this.updateColorPickerPreview); return $(document).on('input', 'input#label_color', this.updateColorPreview); } // eslint-disable-next-line class-methods-use-this cleanBinding() { $(document).off('click', '.suggest-colors a'); + $(document).off('input', '.label-color-preview'); return $(document).off('input', 'input#label_color'); } // eslint-disable-next-line class-methods-use-this updateColorPreview() { const previewColor = $('input#label_color').val(); - return $('div.label-color-preview').css('background-color', previewColor); + return $('.label-color-preview').val(previewColor); // Updates the preview color with the hex-color input } + // eslint-disable-next-line class-methods-use-this + updateColorPickerPreview() { + const previewColor = $('.label-color-preview').val(); + return $('input#label_color').val(previewColor); + // Updates the input color with the hex-color from the picker + } // Updates the preview color with a click on a suggested color setSuggestedColor(e) { const color = $(e.currentTarget).data('color'); $('input#label_color').val(color); this.updateColorPreview(); + this.updateColorPickerPreview(); // Notify the form, that color has changed $('.label-form').trigger('keyup'); return e.preventDefault(); diff --git a/app/assets/javascripts/labels/labels_select.js b/app/assets/javascripts/labels/labels_select.js index 515b0a79a03..587cc82f0fa 100644 --- a/app/assets/javascripts/labels/labels_select.js +++ b/app/assets/javascripts/labels/labels_select.js @@ -6,7 +6,7 @@ import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import IssuableBulkUpdateActions from '~/issuable/issuable_bulk_update_actions'; import { isScopedLabel } from '~/lib/utils/common_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { sprintf, __ } from '~/locale'; import CreateLabelDropdown from './create_label_dropdown'; diff --git a/app/assets/javascripts/labels/project_label_subscription.js b/app/assets/javascripts/labels/project_label_subscription.js index 9ca6ee5609c..1629d3b4d88 100644 --- a/app/assets/javascripts/labels/project_label_subscription.js +++ b/app/assets/javascripts/labels/project_label_subscription.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import { fixTitle } from '~/tooltips'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; @@ -68,7 +69,7 @@ export default class ProjectLabelSubscription { } static setNewTitle($button, originalTitle, newStatus) { - const type = /group/.test(originalTitle) ? 'group' : 'project'; + const type = /group/.test(originalTitle) ? WORKSPACE_GROUP : WORKSPACE_PROJECT; const newTitle = tooltipTitles[type][newStatus]; $button.attr('title', newTitle); diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js index b8138f34d45..f5078962b8f 100644 --- a/app/assets/javascripts/layout_nav.js +++ b/app/assets/javascripts/layout_nav.js @@ -70,10 +70,11 @@ function initDeferred() { } export default function initLayoutNav() { - const contextualSidebar = new ContextualSidebar(); - contextualSidebar.bindEvents(); - - initFlyOutNav(); + if (!gon.use_new_navigation) { + const contextualSidebar = new ContextualSidebar(); + contextualSidebar.bindEvents(); + initFlyOutNav(); + } requestIdleCallback(initDeferred); } diff --git a/app/assets/javascripts/lib/utils/constants.js b/app/assets/javascripts/lib/utils/constants.js index 2c8953237cf..fb69a61880a 100644 --- a/app/assets/javascripts/lib/utils/constants.js +++ b/app/assets/javascripts/lib/utils/constants.js @@ -26,3 +26,8 @@ export const DEFAULT_TH_CLASSES = export const DRAWER_Z_INDEX = 252; export const MIN_USERNAME_LENGTH = 2; + +export const BYTES_FORMAT_BYTES = 'Bytes'; +export const BYTES_FORMAT_KIB = 'KiB'; +export const BYTES_FORMAT_MIB = 'MiB'; +export const BYTES_FORMAT_GIB = 'GiB'; diff --git a/app/assets/javascripts/lib/utils/error_message.js b/app/assets/javascripts/lib/utils/error_message.js new file mode 100644 index 00000000000..4cea4257e7b --- /dev/null +++ b/app/assets/javascripts/lib/utils/error_message.js @@ -0,0 +1,20 @@ +export const USER_FACING_ERROR_MESSAGE_PREFIX = 'UF:'; + +const getMessageFromError = (error = '') => { + return error.message || error; +}; + +export const parseErrorMessage = (error = '') => { + const messageString = getMessageFromError(error); + + if (messageString.startsWith(USER_FACING_ERROR_MESSAGE_PREFIX)) { + return { + message: messageString.replace(USER_FACING_ERROR_MESSAGE_PREFIX, '').trim(), + userFacing: true, + }; + } + return { + message: messageString, + userFacing: false, + }; +}; diff --git a/app/assets/javascripts/lib/utils/file_upload.js b/app/assets/javascripts/lib/utils/file_upload.js index f99a4927338..c80d3f24d07 100644 --- a/app/assets/javascripts/lib/utils/file_upload.js +++ b/app/assets/javascripts/lib/utils/file_upload.js @@ -29,3 +29,10 @@ export const validateImageName = (file) => { const legalImageRegex = /^[\w.\-+]+\.(png|jpg|jpeg|gif|bmp|tiff|ico|webp)$/; return legalImageRegex.test(fileName) ? fileName : 'image.png'; }; + +export const validateFileFromAllowList = (fileName, allowList) => { + const parts = fileName.split('.'); + const ext = `.${parts[parts.length - 1]}`; + + return allowList.includes(ext); +}; diff --git a/app/assets/javascripts/lib/utils/number_utils.js b/app/assets/javascripts/lib/utils/number_utils.js index b0e31fe729b..d64f84d2040 100644 --- a/app/assets/javascripts/lib/utils/number_utils.js +++ b/app/assets/javascripts/lib/utils/number_utils.js @@ -1,5 +1,12 @@ import { sprintf, __ } from '~/locale'; -import { BYTES_IN_KIB, THOUSAND } from './constants'; +import { + BYTES_IN_KIB, + THOUSAND, + BYTES_FORMAT_BYTES, + BYTES_FORMAT_KIB, + BYTES_FORMAT_MIB, + BYTES_FORMAT_GIB, +} from './constants'; /** * Function that allows a number with an X amount of decimals @@ -64,25 +71,51 @@ export function bytesToGiB(number) { } /** - * Port of rails number_to_human_size * Formats the bytes in number into a more understandable - * representation (e.g., giving it 1500 yields 1.5 KB). + * representation. Returns an array with the first value being the human size + * and the second value being the format (e.g., [1.5, 'KiB']). * * @param {Number} size * @param {Number} digits - The number of digits to appear after the decimal point * @returns {String} */ -export function numberToHumanSize(size, digits = 2) { +export function numberToHumanSizeSplit(size, digits = 2) { const abs = Math.abs(size); if (abs < BYTES_IN_KIB) { - return sprintf(__('%{size} bytes'), { size }); + return [size.toString(), BYTES_FORMAT_BYTES]; } else if (abs < BYTES_IN_KIB ** 2) { - return sprintf(__('%{size} KiB'), { size: bytesToKiB(size).toFixed(digits) }); + return [bytesToKiB(size).toFixed(digits), BYTES_FORMAT_KIB]; } else if (abs < BYTES_IN_KIB ** 3) { - return sprintf(__('%{size} MiB'), { size: bytesToMiB(size).toFixed(digits) }); + return [bytesToMiB(size).toFixed(digits), BYTES_FORMAT_MIB]; + } + return [bytesToGiB(size).toFixed(digits), BYTES_FORMAT_GIB]; +} + +/** + * Port of rails number_to_human_size + * Formats the bytes in number into a more understandable + * representation (e.g., giving it 1500 yields 1.5 KB). + * + * @param {Number} size + * @param {Number} digits - The number of digits to appear after the decimal point + * @returns {String} + */ +export function numberToHumanSize(size, digits = 2) { + const [humanSize, format] = numberToHumanSizeSplit(size, digits); + + switch (format) { + case BYTES_FORMAT_BYTES: + return sprintf(__('%{size} bytes'), { size: humanSize }); + case BYTES_FORMAT_KIB: + return sprintf(__('%{size} KiB'), { size: humanSize }); + case BYTES_FORMAT_MIB: + return sprintf(__('%{size} MiB'), { size: humanSize }); + case BYTES_FORMAT_GIB: + return sprintf(__('%{size} GiB'), { size: humanSize }); + default: + return ''; } - return sprintf(__('%{size} GiB'), { size: bytesToGiB(size).toFixed(digits) }); } /** diff --git a/app/assets/javascripts/lib/utils/ref_validator.js b/app/assets/javascripts/lib/utils/ref_validator.js new file mode 100644 index 00000000000..d679a3b4198 --- /dev/null +++ b/app/assets/javascripts/lib/utils/ref_validator.js @@ -0,0 +1,145 @@ +import { __, sprintf } from '~/locale'; + +// this service validates tagName agains git ref format. +// the git spec can be found here: https://git-scm.com/docs/git-check-ref-format#_description + +// the ruby counterpart of the validator is here: +// lib/gitlab/git_ref_validator.rb + +const EXPANDED_PREFIXES = ['refs/heads/', 'refs/remotes/', 'refs/tags']; +const DISALLOWED_PREFIXES = ['-', '/']; +const DISALLOWED_POSTFIXES = ['/']; +const DISALLOWED_NAMES = ['HEAD', '@']; +const DISALLOWED_SUBSTRINGS = [' ', '\\', '~', ':', '..', '^', '?', '*', '[', '@{']; +const DISALLOWED_SEQUENCE_POSTFIXES = ['.lock', '.']; +const DISALLOWED_SEQUENCE_PREFIXES = ['.']; + +// eslint-disable-next-line no-control-regex +const CONTROL_CHARACTERS_REGEX = /[\x00-\x19\x7f]/; + +const toReadableString = (array) => array.map((item) => `"${item}"`).join(', '); + +const DisallowedPrefixesValidationMessage = sprintf( + __('Tag name should not start with %{prefixes}'), + { + prefixes: toReadableString([...EXPANDED_PREFIXES, ...DISALLOWED_PREFIXES]), + }, + false, +); + +const DisallowedPostfixesValidationMessage = sprintf( + __('Tag name should not end with %{postfixes}'), + { postfixes: toReadableString(DISALLOWED_POSTFIXES) }, + false, +); + +const DisallowedNameValidationMessage = sprintf( + __('Tag name cannot be one of the following: %{names}'), + { names: toReadableString(DISALLOWED_NAMES) }, + false, +); + +const EmptyNameValidationMessage = __('Tag name should not be empty'); + +const DisallowedSubstringsValidationMessage = sprintf( + __('Tag name should not contain any of the following: %{substrings}'), + { substrings: toReadableString(DISALLOWED_SUBSTRINGS) }, + false, +); + +const DisallowedSequenceEmptyValidationMessage = __( + `No slash-separated tag name component can be empty`, +); + +const DisallowedSequencePrefixesValidationMessage = sprintf( + __('No slash-separated component can begin with %{sequencePrefixes}'), + { sequencePrefixes: toReadableString(DISALLOWED_SEQUENCE_PREFIXES) }, + false, +); + +const DisallowedSequencePostfixesValidationMessage = sprintf( + __('No slash-separated component can end with %{sequencePostfixes}'), + { sequencePostfixes: toReadableString(DISALLOWED_SEQUENCE_POSTFIXES) }, + false, +); + +const ControlCharactersValidationMessage = __('Tag name should not contain any control characters'); + +export const validationMessages = { + EmptyNameValidationMessage, + DisallowedPrefixesValidationMessage, + DisallowedPostfixesValidationMessage, + DisallowedNameValidationMessage, + DisallowedSubstringsValidationMessage, + DisallowedSequenceEmptyValidationMessage, + DisallowedSequencePrefixesValidationMessage, + DisallowedSequencePostfixesValidationMessage, + ControlCharactersValidationMessage, +}; + +export class ValidationResult { + isValid = true; + validationErrors = []; + + addValidationError = (errorMessage) => { + this.isValid = false; + this.validationErrors.push(errorMessage); + }; +} + +export const validateTag = (refName) => { + if (typeof refName !== 'string') { + throw new Error('refName argument must be a string'); + } + + const validationResult = new ValidationResult(); + + if (!refName || refName.trim() === '') { + validationResult.addValidationError(EmptyNameValidationMessage); + return validationResult; + } + + if (CONTROL_CHARACTERS_REGEX.test(refName)) { + validationResult.addValidationError(ControlCharactersValidationMessage); + } + + if (DISALLOWED_NAMES.some((name) => name === refName)) { + validationResult.addValidationError(DisallowedNameValidationMessage); + } + + if ([...EXPANDED_PREFIXES, ...DISALLOWED_PREFIXES].some((prefix) => refName.startsWith(prefix))) { + validationResult.addValidationError(DisallowedPrefixesValidationMessage); + } + + if (DISALLOWED_POSTFIXES.some((postfix) => refName.endsWith(postfix))) { + validationResult.addValidationError(DisallowedPostfixesValidationMessage); + } + + if (DISALLOWED_SUBSTRINGS.some((substring) => refName.includes(substring))) { + validationResult.addValidationError(DisallowedSubstringsValidationMessage); + } + + const refNameParts = refName.split('/'); + + if (refNameParts.some((part) => part === '')) { + validationResult.addValidationError(DisallowedSequenceEmptyValidationMessage); + } + + if ( + refNameParts.some((part) => + DISALLOWED_SEQUENCE_PREFIXES.some((prefix) => part.startsWith(prefix)), + ) + ) { + validationResult.addValidationError(DisallowedSequencePrefixesValidationMessage); + } + + if ( + refNameParts.some((part) => + DISALLOWED_SEQUENCE_POSTFIXES.some((postfix) => part.endsWith(postfix)), + ) + ) { + validationResult.addValidationError(DisallowedSequencePostfixesValidationMessage); + } + + return validationResult; +}; diff --git a/app/assets/javascripts/lib/utils/resize_observer.js b/app/assets/javascripts/lib/utils/resize_observer.js index 5d194340b9e..1db863294f8 100644 --- a/app/assets/javascripts/lib/utils/resize_observer.js +++ b/app/assets/javascripts/lib/utils/resize_observer.js @@ -19,27 +19,31 @@ export function createResizeObserver() { * @param {Object} options * @param {string} options.targetId - id of element to scroll to * @param {string} options.container - Selector of element containing target + * @param {Element} options.component - Element containing target * * @return {ResizeObserver|null} - ResizeObserver instance if target looks like a note DOM ID */ export function scrollToTargetOnResize({ targetId = window.location.hash.slice(1), container = '#content-body', + containerId, } = {}) { if (!targetId) return null; const ro = createResizeObserver(); - const containerEl = document.querySelector(container); + const containerEl = + document.querySelector(`#${containerId}`) || document.querySelector(container); let interactionListenersAdded = false; - function keepTargetAtTop() { + function keepTargetAtTop(evt) { const anchorEl = document.getElementById(targetId); + const scrollContainer = containerId ? evt.target : document.documentElement; if (!anchorEl) return; const anchorTop = anchorEl.getBoundingClientRect().top + window.scrollY; const top = anchorTop - contentTop(); - document.documentElement.scrollTo({ + scrollContainer.scrollTo({ top, }); diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js index 05ed08931bb..2d5e9bc91f2 100644 --- a/app/assets/javascripts/lib/utils/text_markdown.js +++ b/app/assets/javascripts/lib/utils/text_markdown.js @@ -2,6 +2,7 @@ import $ from 'jquery'; import Shortcuts from '~/behaviors/shortcuts/shortcuts'; import { insertText } from '~/lib/utils/common_utils'; +import axios from '~/lib/utils/axios_utils'; const LINK_TAG_PATTERN = '[{text}](url)'; const INDENT_CHAR = ' '; @@ -625,11 +626,11 @@ export function addMarkdownListeners(form) { Shortcuts.initMarkdownEditorShortcuts($(this), updateTextForToolbarBtn); }); - // eslint-disable-next-line @gitlab/no-global-event-off - const $allToolbarBtns = $('.js-md', form) - .off('click') - .on('click', function () { - const $toolbarBtn = $(this); + const $allToolbarBtns = $(form) + .off('click', '.js-md, .saved-replies-dropdown li') + .on('click', '.js-md, .saved-replies-dropdown li', function () { + const $savedReplyContent = $('.js-saved-reply-content', this); + const $toolbarBtn = $savedReplyContent.length ? $savedReplyContent : $(this); return updateTextForToolbarBtn($toolbarBtn); }); @@ -669,3 +670,50 @@ export function removeMarkdownListeners(form) { // eslint-disable-next-line @gitlab/no-global-event-off return $('.js-md', form).off('click'); } + +/** + * If the textarea cursor is positioned in a Markdown image declaration, + * it uses the Markdown API to resolve the image’s absolute URL. + * @param {Object} textarea Textarea DOM element + * @param {String} markdownPreviewPath Markdown API path + * @returns {Object} an object containing the image’s absolute URL, filename, + * and the markdown declaration. If the textarea cursor is not positioned + * in an image, it returns null. + */ +export const resolveSelectedImage = async (textArea, markdownPreviewPath = '') => { + const { lines, startPos } = linesFromSelection(textArea); + + // image declarations can’t span more than one line in Markdown + if (lines > 0) { + return null; + } + + const selectedLine = lines[0]; + + if (!/!\[.+?\]\(.+?\)/.test(selectedLine)) return null; + + const lineSelectionStart = textArea.selectionStart - startPos; + const preExlm = selectedLine.substring(0, lineSelectionStart).lastIndexOf('!'); + const postClose = selectedLine.substring(lineSelectionStart).indexOf(')'); + + if (preExlm >= 0 && postClose >= 0) { + const imageMarkdown = selectedLine.substring(preExlm, lineSelectionStart + postClose + 1); + const { data } = await axios.post(markdownPreviewPath, { text: imageMarkdown }); + const parser = new DOMParser(); + + const dom = parser.parseFromString(data.body, 'text/html'); + const imageURL = dom.body.querySelector('a').getAttribute('href'); + + if (imageURL) { + const filename = imageURL.substring(imageURL.lastIndexOf('/') + 1); + + return { + imageMarkdown, + imageURL, + filename, + }; + } + } + + return null; +}; diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js index 367180714df..1bed38b7dbe 100644 --- a/app/assets/javascripts/lib/utils/text_utility.js +++ b/app/assets/javascripts/lib/utils/text_utility.js @@ -1,4 +1,5 @@ import { isString, memoize } from 'lodash'; +import { sprintf, __ } from '~/locale'; import { base64ToBuffer, bufferToBase64 } from '~/authentication/webauthn/util'; import { TRUNCATE_WIDTH_DEFAULT_WIDTH, @@ -525,3 +526,45 @@ export function base64DecodeUnicode(str) { const decoder = new TextDecoder('utf8'); return decoder.decode(base64ToBuffer(str)); } + +// returns an array of errors (if there are any) +const INVALID_BRANCH_NAME_CHARS = [' ', '~', '^', ':', '?', '*', '[', '..', '@{', '\\', '//']; + +/** + * Returns an array of invalid characters found in a branch name + * + * @param {String} name branch name to check + * @return {Array} Array of invalid characters found + */ +export const findInvalidBranchNameCharacters = (name) => { + const invalidChars = []; + + INVALID_BRANCH_NAME_CHARS.forEach((pattern) => { + if (name.indexOf(pattern) > -1) { + invalidChars.push(pattern); + } + }); + + return invalidChars; +}; + +/** + * Returns a string describing validation errors for a branch name + * + * @param {Array} invalidChars Array of invalid characters that were found + * @return {String} Error message describing on the invalid characters found + */ +export const humanizeBranchValidationErrors = (invalidChars = []) => { + const chars = invalidChars.filter((c) => INVALID_BRANCH_NAME_CHARS.includes(c)); + + if (chars.length && !chars.includes(' ')) { + return sprintf(__("Can't contain %{chars}"), { chars: chars.join(', ') }); + } else if (chars.includes(' ') && chars.length <= 1) { + return __("Can't contain spaces"); + } else if (chars.includes(' ') && chars.length > 1) { + return sprintf(__("Can't contain spaces, %{chars}"), { + chars: chars.filter((c) => c !== ' ').join(', '), + }); + } + return ''; +}; diff --git a/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js b/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js new file mode 100644 index 00000000000..ec8feb7d2e6 --- /dev/null +++ b/app/assets/javascripts/lib/utils/vue3compat/compat_functional_mixin.js @@ -0,0 +1,14 @@ +import Vue from 'vue'; + +export const compatFunctionalMixin = Vue.version.startsWith('3') + ? { + created() { + this.props = this.$props; + this.listeners = this.$listeners; + }, + } + : { + created() { + throw new Error('This mixin should not be executed in Vue.js 2'); + }, + }; diff --git a/app/assets/javascripts/lib/utils/vue3compat/mark_raw.js b/app/assets/javascripts/lib/utils/vue3compat/mark_raw.js new file mode 100644 index 00000000000..daafbad8ba1 --- /dev/null +++ b/app/assets/javascripts/lib/utils/vue3compat/mark_raw.js @@ -0,0 +1,9 @@ +// this will be replaced by markRaw from vue.js v3 +export function markRaw(obj) { + Object.defineProperty(obj, '__v_skip', { + value: true, + configurable: true, + }); + + return obj; +} diff --git a/app/assets/javascripts/locale/sprintf.js b/app/assets/javascripts/locale/sprintf.js index c8c6b51f374..12df67670f9 100644 --- a/app/assets/javascripts/locale/sprintf.js +++ b/app/assets/javascripts/locale/sprintf.js @@ -22,7 +22,9 @@ export default (input, parameters, escapeParameters = true) => { mappedParameters.forEach((key, parameterName) => { const parameterValue = mappedParameters.get(parameterName); const escapedParameterValue = escapeParameters ? escape(parameterValue) : parameterValue; - output = output.replace(new RegExp(`%{${parameterName}}`, 'g'), escapedParameterValue); + // Pass the param value as a function to ignore special replacement patterns like $` and $'. + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#syntax + output = output.replace(new RegExp(`%{${parameterName}}`, 'g'), () => escapedParameterValue); }); } diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4c715c4993f..a1539aba786 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -89,7 +89,7 @@ initRails(); function deferredInitialisation() { const $body = $('body'); - initTopNav(); + if (!gon.use_new_navigation) initTopNav(); initBreadcrumbs(); initTodoToggle(); initPrefetchLinks('.js-prefetch-document'); @@ -104,14 +104,6 @@ function deferredInitialisation() { initCopyCodeButton(); initGitlabVersionCheck(); - // Init super sidebar - if (gon.use_new_navigation) { - // eslint-disable-next-line promise/catch-or-return - import('./super_sidebar/super_sidebar_bundle').then(({ initSuperSidebar }) => { - initSuperSidebar(); - }); - } - addSelectOnFocusBehaviour('.js-select-on-focus'); const glTooltipDelay = localStorage.getItem('gl-tooltip-delay'); diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js index 68c5831db62..8e5b88d362e 100644 --- a/app/assets/javascripts/members/constants.js +++ b/app/assets/javascripts/members/constants.js @@ -192,8 +192,6 @@ export const MEMBER_STATE_ACTIVE = 2; export const BADGE_LABELS_AWAITING_SIGNUP = __('Awaiting user signup'); export const BADGE_LABELS_PENDING = __('Pending owner action'); -export const DAYS_TO_EXPIRE_SOON = 7; - export const LEAVE_MODAL_ID = 'member-leave-modal'; export const REMOVE_GROUP_LINK_MODAL_ID = 'remove-group-link-modal-id'; diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue index 707e8a0645f..c6feb684795 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import { debounce } from 'lodash'; import { mapActions } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { INTERACTIVE_RESOLVE_MODE } from '../constants'; diff --git a/app/assets/javascripts/merge_conflicts/store/actions.js b/app/assets/javascripts/merge_conflicts/store/actions.js index f84eaabf9e7..07a32a77c6a 100644 --- a/app/assets/javascripts/merge_conflicts/store/actions.js +++ b/app/assets/javascripts/merge_conflicts/store/actions.js @@ -1,5 +1,5 @@ import { setCookie } from '~/lib/utils/common_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { INTERACTIVE_RESOLVE_MODE, EDIT_RESOLVE_MODE } from '../constants'; diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index 61abdca0a5b..4277e535d20 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -1,7 +1,8 @@ /* eslint-disable func-names, no-underscore-dangle, consistent-return */ import $ from 'jquery'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { TYPE_MERGE_REQUEST } from '~/issues/constants'; import toast from '~/vue_shared/plugins/global_toast'; import { __ } from '~/locale'; import eventHub from '~/vue_merge_request_widget/event_hub'; @@ -27,7 +28,7 @@ function MergeRequest(opts) { if ($('.description.js-task-list-container').length) { this.taskList = new TaskList({ - dataType: 'merge_request', + dataType: TYPE_MERGE_REQUEST, fieldName: 'description', selector: '.detail-page-description', lockVersion: this.$el.data('lockVersion'), diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 46ee8fecfc5..d55e942dafa 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ import $ from 'jquery'; import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getCookie, isMetaClick, parseBoolean, scrollToElement } from '~/lib/utils/common_utils'; import { parseUrlPathname } from '~/lib/utils/url_utility'; import createEventHub from '~/helpers/event_hub_factory'; diff --git a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue index 1590e693c07..a5a4e683214 100644 --- a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue +++ b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue @@ -1,13 +1,13 @@ <script> -import { GlListbox } from '@gitlab/ui'; +import { GlCollapsibleListbox } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; export default { components: { - GlListbox, + GlCollapsibleListbox, }, props: { staticData: { @@ -124,7 +124,7 @@ export default { :name="inputName" data-testid="target-project-input" /> - <gl-listbox + <gl-collapsible-listbox v-model="selected" :items="filteredData" :toggle-text="current.text || dropdownHeader" diff --git a/app/assets/javascripts/milestones/components/delete_milestone_modal.vue b/app/assets/javascripts/milestones/components/delete_milestone_modal.vue index 4b3c1bd7d10..8e7428089e2 100644 --- a/app/assets/javascripts/milestones/components/delete_milestone_modal.vue +++ b/app/assets/javascripts/milestones/components/delete_milestone_modal.vue @@ -1,6 +1,6 @@ <script> import { GlSprintf, GlModal } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status'; import { redirectTo } from '~/lib/utils/url_utility'; @@ -103,7 +103,7 @@ Once deleted, it cannot be undone or recovered.`), }, primaryProps: { text: s__('Milestones|Delete milestone'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, cancelProps: { text: __('Cancel'), diff --git a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue index 9e537fa2c82..63791dcd011 100644 --- a/app/assets/javascripts/milestones/components/promote_milestone_modal.vue +++ b/app/assets/javascripts/milestones/components/promote_milestone_modal.vue @@ -1,6 +1,6 @@ <script> import { GlModal } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; @@ -80,11 +80,11 @@ export default { }, primaryAction: { text: s__('Milestones|Promote Milestone'), - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, cancelAction: { text: __('Cancel'), - attributes: [], + attributes: {}, }, }; </script> diff --git a/app/assets/javascripts/milestones/milestone.js b/app/assets/javascripts/milestones/milestone.js index d9e72340d62..20cc0352c33 100644 --- a/app/assets/javascripts/milestones/milestone.js +++ b/app/assets/javascripts/milestones/milestone.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sanitize } from '~/lib/dompurify'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/mirrors/mirror_repos.js b/app/assets/javascripts/mirrors/mirror_repos.js index 2995f19c470..299c9731ad7 100644 --- a/app/assets/javascripts/mirrors/mirror_repos.js +++ b/app/assets/javascripts/mirrors/mirror_repos.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { hide } from '~/tooltips'; diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js index 037120a0d81..68b18a34ded 100644 --- a/app/assets/javascripts/mirrors/ssh_mirror.js +++ b/app/assets/javascripts/mirrors/ssh_mirror.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { escape } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { backOff } from '~/lib/utils/common_utils'; import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status'; diff --git a/app/assets/javascripts/ml/experiment_tracking/constants.js b/app/assets/javascripts/ml/experiment_tracking/constants.js index 15462b519e1..11cf321ad51 100644 --- a/app/assets/javascripts/ml/experiment_tracking/constants.js +++ b/app/assets/javascripts/ml/experiment_tracking/constants.js @@ -1,19 +1,4 @@ -import { __, s__ } from '~/locale'; - -export const METRIC_KEY_PREFIX = 'metric.'; - -export const LIST_KEY_CREATED_AT = 'created_at'; - -export const BASE_SORT_FIELDS = Object.freeze([ - { - orderBy: 'name', - label: __('Name'), - }, - { - orderBy: LIST_KEY_CREATED_AT, - label: __('Created at'), - }, -]); +import { s__ } from '~/locale'; export const EMPTY_STATE_SVG = '/assets/illustrations/empty-state/empty-dag-md.svg'; diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/index.js b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/index.js new file mode 100644 index 00000000000..529bd6fe9f2 --- /dev/null +++ b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/index.js @@ -0,0 +1,3 @@ +import MlCandidatesShow from './ml_candidates_show.vue'; + +export default MlCandidatesShow; diff --git a/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue index d0c42905ee2..3c765de92a2 100644 --- a/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue +++ b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue @@ -1,11 +1,21 @@ <script> import { GlLink } from '@gitlab/ui'; -import { __ } from '~/locale'; import { FEATURE_NAME, FEATURE_FEEDBACK_ISSUE } from '~/ml/experiment_tracking/constants'; import IncubationAlert from '~/vue_shared/components/incubation/incubation_alert.vue'; +import { + TITLE_LABEL, + INFO_LABEL, + ID_LABEL, + STATUS_LABEL, + EXPERIMENT_LABEL, + ARTIFACTS_LABEL, + PARAMETERS_LABEL, + METRICS_LABEL, + METADATA_LABEL, +} from './translations'; export default { - name: 'MlCandidate', + name: 'MlCandidatesShow', components: { IncubationAlert, GlLink, @@ -17,29 +27,29 @@ export default { }, }, i18n: { - titleLabel: __('Model candidate details'), - infoLabel: __('Info'), - idLabel: __('ID'), - statusLabel: __('Status'), - experimentLabel: __('Experiment'), - artifactsLabel: __('Artifacts'), - parametersLabel: __('Parameters'), - metricsLabel: __('Metrics'), - metadataLabel: __('Metadata'), + TITLE_LABEL, + INFO_LABEL, + ID_LABEL, + STATUS_LABEL, + EXPERIMENT_LABEL, + ARTIFACTS_LABEL, + PARAMETERS_LABEL, + METRICS_LABEL, + METADATA_LABEL, }, computed: { sections() { return [ { - sectionName: this.$options.i18n.parametersLabel, + sectionName: this.$options.i18n.PARAMETERS_LABEL, sectionValues: this.candidate.params, }, { - sectionName: this.$options.i18n.metricsLabel, + sectionName: this.$options.i18n.METRICS_LABEL, sectionValues: this.candidate.metrics, }, { - sectionName: this.$options.i18n.metadataLabel, + sectionName: this.$options.i18n.METADATA_LABEL, sectionValues: this.candidate.metadata, }, ]; @@ -58,7 +68,7 @@ export default { /> <h3> - {{ $options.i18n.titleLabel }} + {{ $options.i18n.TITLE_LABEL }} </h3> <table class="candidate-details"> @@ -66,20 +76,20 @@ export default { <tr class="divider"></tr> <tr> - <td class="gl-text-secondary gl-font-weight-bold">{{ $options.i18n.infoLabel }}</td> - <td class="gl-font-weight-bold">{{ $options.i18n.idLabel }}</td> + <td class="gl-text-secondary gl-font-weight-bold">{{ $options.i18n.INFO_LABEL }}</td> + <td class="gl-font-weight-bold">{{ $options.i18n.ID_LABEL }}</td> <td>{{ candidate.info.iid }}</td> </tr> <tr> <td></td> - <td class="gl-font-weight-bold">{{ $options.i18n.statusLabel }}</td> + <td class="gl-font-weight-bold">{{ $options.i18n.STATUS_LABEL }}</td> <td>{{ candidate.info.status }}</td> </tr> <tr> <td></td> - <td class="gl-font-weight-bold">{{ $options.i18n.experimentLabel }}</td> + <td class="gl-font-weight-bold">{{ $options.i18n.EXPERIMENT_LABEL }}</td> <td> <gl-link :href="candidate.info.path_to_experiment">{{ candidate.info.experiment_name @@ -89,10 +99,10 @@ export default { <tr v-if="candidate.info.path_to_artifact"> <td></td> - <td class="gl-font-weight-bold">{{ $options.i18n.artifactsLabel }}</td> + <td class="gl-font-weight-bold">{{ $options.i18n.ARTIFACTS_LABEL }}</td> <td> <gl-link :href="candidate.info.path_to_artifact">{{ - $options.i18n.artifactsLabel + $options.i18n.ARTIFACTS_LABEL }}</gl-link> </td> </tr> diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js new file mode 100644 index 00000000000..caad145873e --- /dev/null +++ b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js @@ -0,0 +1,11 @@ +import { s__ } from '~/locale'; + +export const TITLE_LABEL = s__('MlExperimentTracking|Model candidate details'); +export const INFO_LABEL = s__('MlExperimentTracking|Info'); +export const ID_LABEL = s__('MlExperimentTracking|ID'); +export const STATUS_LABEL = s__('MlExperimentTracking|Status'); +export const EXPERIMENT_LABEL = s__('MlExperimentTracking|Experiment'); +export const ARTIFACTS_LABEL = s__('MlExperimentTracking|Artifacts'); +export const PARAMETERS_LABEL = s__('MlExperimentTracking|Parameters'); +export const METRICS_LABEL = s__('MlExperimentTracking|Metrics'); +export const METADATA_LABEL = s__('MlExperimentTracking|Metadata'); diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/constants.js b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/constants.js new file mode 100644 index 00000000000..4d34555ac2f --- /dev/null +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/constants.js @@ -0,0 +1,21 @@ +import { s__ } from '~/locale'; +import { helpPagePath } from '~/helpers/help_page_helper'; + +export const METRIC_KEY_PREFIX = 'metric.'; +export const LIST_KEY_CREATED_AT = 'created_at'; +export const BASE_SORT_FIELDS = Object.freeze([ + { + orderBy: 'name', + label: s__('MlExperimentTracking|Name'), + }, + { + orderBy: LIST_KEY_CREATED_AT, + label: s__('MlExperimentTracking|Created at'), + }, +]); +export const CREATE_CANDIDATE_HELP_PATH = helpPagePath( + 'user/project/ml/experiment_tracking/index.md', + { + anchor: 'tracking-new-experiments-and-trials', + }, +); diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/index.js b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/index.js new file mode 100644 index 00000000000..5903866b6dd --- /dev/null +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/index.js @@ -0,0 +1,3 @@ +import MlExperimentsShow from './ml_experiments_show.vue'; + +export default MlExperimentsShow; diff --git a/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue index c09aabb0d40..ca0a42fda10 100644 --- a/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue @@ -1,35 +1,54 @@ <script> -import { GlTable, GlLink, GlTooltipDirective } from '@gitlab/ui'; +import { GlTableLite, GlLink, GlEmptyState } from '@gitlab/ui'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants'; import { - LIST_KEY_CREATED_AT, - BASE_SORT_FIELDS, - METRIC_KEY_PREFIX, FEATURE_NAME, FEATURE_FEEDBACK_ISSUE, + EMPTY_STATE_SVG, } from '~/ml/experiment_tracking/constants'; -import { s__ } from '~/locale'; import { queryToObject, setUrlParams, visitUrl } from '~/lib/utils/url_utility'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import KeysetPagination from '~/vue_shared/components/incubation/pagination.vue'; import IncubationAlert from '~/vue_shared/components/incubation/incubation_alert.vue'; +import { + LIST_KEY_CREATED_AT, + BASE_SORT_FIELDS, + METRIC_KEY_PREFIX, + CREATE_CANDIDATE_HELP_PATH, +} from './constants'; +import * as translations from './translations'; export default { - name: 'MlExperiment', + name: 'MlExperimentsShow', components: { - GlTable, + GlTableLite, GlLink, + GlEmptyState, TimeAgo, IncubationAlert, RegistrySearch, KeysetPagination, }, - directives: { - GlTooltip: GlTooltipDirective, + props: { + candidates: { + type: Array, + required: true, + }, + metricNames: { + type: Array, + required: true, + }, + paramNames: { + type: Array, + required: true, + }, + pageInfo: { + type: Object, + required: true, + }, }, - inject: ['candidates', 'metricNames', 'paramNames', 'pageInfo'], data() { const query = queryToObject(window.location.search); @@ -54,13 +73,12 @@ export default { if (this.candidates.length === 0) return []; return [ - { key: 'name', label: this.$options.i18n.nameLabel }, - { key: 'created_at', label: this.$options.i18n.createdAtLabel }, - { key: 'user', label: this.$options.i18n.userLabel }, + { key: 'nameColumn', label: this.$options.i18n.NAME_LABEL }, + { key: 'created_at', label: this.$options.i18n.CREATED_AT_LABEL }, + { key: 'user', label: this.$options.i18n.USER_LABEL }, ...this.paramNames, ...this.metricNames, - { key: 'details', label: '' }, - { key: 'artifact', label: '' }, + { key: 'artifact', label: this.$options.i18n.ARTIFACTS_LABEL }, ]; }, displayPagination() { @@ -94,6 +112,18 @@ export default { return { ...filterByQuery, orderBy, orderByType, sort }; }, + tableItems() { + return this.candidates.map((candidate) => ({ + ...candidate, + nameColumn: { + name: candidate.name, + details_path: candidate.details, + }, + })); + }, + hasItems() { + return this.candidates.length > 0; + }, }, methods: { submitFilters() { @@ -110,33 +140,23 @@ export default { this.submitFilters(); }, }, - i18n: { - titleLabel: s__('MlExperimentTracking|Experiment candidates'), - emptyStateLabel: s__('MlExperimentTracking|No candidates to display'), - artifactsLabel: s__('MlExperimentTracking|Artifacts'), - detailsLabel: s__('MlExperimentTracking|Details'), - userLabel: s__('MlExperimentTracking|User'), - createdAtLabel: s__('MlExperimentTracking|Created at'), - nameLabel: s__('MlExperimentTracking|Name'), - noDataContent: s__('MlExperimentTracking|-'), - filterCandidatesLabel: s__('MlExperimentTracking|Filter candidates'), + i18n: translations, + constants: { + FEATURE_NAME, + FEATURE_FEEDBACK_ISSUE, + CREATE_CANDIDATE_HELP_PATH, + EMPTY_STATE_SVG, }, - FEATURE_NAME, - FEATURE_FEEDBACK_ISSUE, }; </script> <template> <div> <incubation-alert - :feature-name="$options.FEATURE_NAME" - :link-to-feedback-issue="$options.FEATURE_FEEDBACK_ISSUE" + :feature-name="$options.constants.FEATURE_NAME" + :link-to-feedback-issue="$options.constants.FEATURE_FEEDBACK_ISSUE" /> - <h3> - {{ $options.i18n.titleLabel }} - </h3> - <registry-search :filters="filters" :sorting="sorting" @@ -147,53 +167,54 @@ export default { @filter:clear="filters = []" /> - <gl-table - :fields="fields" - :items="candidates" - :empty-text="$options.i18n.emptyStateLabel" - show-empty - small - class="gl-mt-0! ml-candidate-table" - > - <template #cell()="data"> - <div v-gl-tooltip.hover :title="data.value">{{ data.value }}</div> - </template> - - <template #cell(artifact)="data"> - <gl-link - v-if="data.value" - v-gl-tooltip.hover - :href="data.value" - target="_blank" - :title="$options.i18n.artifactsLabel" - >{{ $options.i18n.artifactsLabel }}</gl-link - > - <div v-else v-gl-tooltip.hover :title="$options.i18n.artifactsLabel"> - {{ $options.i18n.noDataContent }} - </div> - </template> - - <template #cell(details)="data"> - <gl-link v-gl-tooltip.hover :href="data.value" :title="$options.i18n.detailsLabel">{{ - $options.i18n.detailsLabel - }}</gl-link> - </template> - - <template #cell(created_at)="data"> - <time-ago v-gl-tooltip.hover :time="data.value" :title="data.value" /> - </template> - - <template #cell(user)="data"> - <gl-link - v-if="data.value" - v-gl-tooltip.hover - :href="data.value.path" - :title="data.value.username" - >@{{ data.value.username }}</gl-link - > - <div v-else>{{ $options.i18n.noDataContent }}</div> - </template> - </gl-table> + <div v-if="hasItems" class="gl-overflow-x-auto"> + <gl-table-lite + :fields="fields" + :items="tableItems" + show-empty + small + class="gl-mt-0! ml-candidate-table" + > + <template #cell()="data"> + <div>{{ data.value }}</div> + </template> + + <template #cell(nameColumn)="data"> + <gl-link :href="data.value.details_path"> + <span v-if="data.value.name"> {{ data.value.name }}</span> + <span v-else class="gl-font-style-italic">{{ $options.i18n.NO_CANDIDATE_NAME }}</span> + </gl-link> + </template> + + <template #cell(artifact)="data"> + <gl-link v-if="data.value" :href="data.value" target="_blank">{{ + $options.i18n.ARTIFACTS_LABEL + }}</gl-link> + <div v-else class="gl-font-style-italic gl-text-gray-500"> + {{ $options.i18n.NO_ARTIFACT }} + </div> + </template> + + <template #cell(created_at)="data"> + <time-ago :time="data.value" /> + </template> + + <template #cell(user)="data"> + <gl-link v-if="data.value" :href="data.value.path">@{{ data.value.username }}</gl-link> + <div v-else>{{ $options.i18n.NO_DATA_CONTENT }}</div> + </template> + </gl-table-lite> + </div> + + <gl-empty-state + v-else + :title="$options.i18n.EMPTY_STATE_TITLE_LABEL" + :primary-button-text="$options.i18n.CREATE_NEW_LABEL" + :primary-button-link="$options.constants.CREATE_CANDIDATE_HELP_PATH" + :svg-path="$options.constants.EMPTY_STATE_SVG" + :description="$options.i18n.EMPTY_STATE_DESCRIPTION_LABEL" + class="gl-py-8" + /> <keyset-pagination v-if="displayPagination" v-bind="pageInfo" /> </div> diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/translations.js b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/translations.js new file mode 100644 index 00000000000..63b0d902b72 --- /dev/null +++ b/app/assets/javascripts/ml/experiment_tracking/routes/experiments/show/translations.js @@ -0,0 +1,16 @@ +import { s__ } from '~/locale'; + +export const ARTIFACTS_LABEL = s__('MlExperimentTracking|Artifacts'); +export const DETAILS_LABEL = s__('MlExperimentTracking|Details'); +export const USER_LABEL = s__('MlExperimentTracking|Author'); +export const CREATED_AT_LABEL = s__('MlExperimentTracking|Created at'); +export const NAME_LABEL = s__('MlExperimentTracking|Name'); +export const NO_DATA_CONTENT = s__('MlExperimentTracking|-'); +export const FILTER_CANDIDATES_LABEL = s__('MlExperimentTracking|Filter candidates'); +export const NO_CANDIDATE_NAME = s__('MlExperimentTracking|No name'); +export const NO_ARTIFACT = s__('MlExperimentTracking|No artifacts'); +export const CREATE_NEW_LABEL = s__('MlExperimentTracking|Create new candidates'); +export const EMPTY_STATE_DESCRIPTION_LABEL = s__( + 'MlExperimentTracking|No candidates logged for the query. Create new candidates using the MLflow client.', +); +export const EMPTY_STATE_TITLE_LABEL = s__('MlExperimentTracking|No candidates'); diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 2c185794d17..ab2b713ac9f 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -11,7 +11,7 @@ import { import Mousetrap from 'mousetrap'; import VueDraggable from 'vuedraggable'; import { mapActions, mapState, mapGetters } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import invalidUrl from '~/lib/utils/invalid_url'; import { ESC_KEY } from '~/lib/utils/keys'; import { mergeUrlParams, updateHistory } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/monitoring/constants.js b/app/assets/javascripts/monitoring/constants.js index 1b506c6564b..faef4b01c27 100644 --- a/app/assets/javascripts/monitoring/constants.js +++ b/app/assets/javascripts/monitoring/constants.js @@ -226,12 +226,6 @@ export const OVERVIEW_DASHBOARD_PATH = 'config/prometheus/common_metrics.yml'; */ export const OUT_OF_THE_BOX_DASHBOARDS_PATH_PREFIX = 'config/prometheus/'; -export const OPERATORS = { - greaterThan: '>', - equalTo: '==', - lessThan: '<', -}; - /** * Dashboard yml files support custom user-defined variables that * are rendered as input elements in the monitoring dashboard. diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js index 0ef365c6368..4fdc08487f2 100644 --- a/app/assets/javascripts/monitoring/stores/actions.js +++ b/app/assets/javascripts/monitoring/stores/actions.js @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/browser'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index d968c125068..2488c8aee9c 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -1,5 +1,8 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; import { mapActions, mapState, mapGetters } from 'vuex'; +import { apolloProvider } from '~/graphql_shared/issuable_client'; + import { renderGFM } from '~/behaviors/markdown/render_gfm'; import { parseBoolean } from '~/lib/utils/common_utils'; import store from '~/mr_notes/stores'; @@ -22,6 +25,8 @@ export default () => { return; } + Vue.use(VueApollo); + const notesFilterProps = getNotesFilterData(el); const notesDataset = el.dataset; @@ -33,8 +38,10 @@ export default () => { NotesApp, }, store, + apolloProvider, provide: { reportAbusePath: notesDataset.reportAbusePath, + newSavedRepliesPath: notesDataset.savedRepliesNewPath, }, data() { const noteableData = JSON.parse(notesDataset.noteableData); diff --git a/app/assets/javascripts/namespaces/leave_by_url.js b/app/assets/javascripts/namespaces/leave_by_url.js index 09757ce17fa..b7dd509f7f2 100644 --- a/app/assets/javascripts/namespaces/leave_by_url.js +++ b/app/assets/javascripts/namespaces/leave_by_url.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { initRails } from '~/lib/utils/rails_ujs'; import { getParameterByName } from '~/lib/utils/url_utility'; import { __, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/nav/components/new_nav_toggle.vue b/app/assets/javascripts/nav/components/new_nav_toggle.vue index da22a8d2fb7..ca6232fa4c4 100644 --- a/app/assets/javascripts/nav/components/new_nav_toggle.vue +++ b/app/assets/javascripts/nav/components/new_nav_toggle.vue @@ -1,7 +1,7 @@ <script> -import { GlBadge, GlToggle } from '@gitlab/ui'; +import { GlBadge, GlToggle, GlDisclosureDropdownItem } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import Tracking from '~/tracking'; @@ -18,6 +18,7 @@ export default { components: { GlBadge, GlToggle, + GlDisclosureDropdownItem, }, props: { enabled: { @@ -28,6 +29,11 @@ export default { type: String, required: true, }, + newNavigation: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -61,7 +67,18 @@ export default { </script> <template> - <li> + <gl-disclosure-dropdown-item v-if="newNavigation" @action="toggleNav"> + <div class="gl-new-dropdown-item-content"> + <div + class="gl-new-dropdown-item-text-wrapper gl-display-flex! gl-justify-content-space-between gl-align-items-center gl-py-2!" + > + {{ $options.i18n.toggleMenuItemLabel }} + <gl-toggle :value="isEnabled" :label="$options.i18n.toggleLabel" label-position="hidden" /> + </div> + </div> + </gl-disclosure-dropdown-item> + + <li v-else> <div class="gl-px-4 gl-py-2 gl-display-flex gl-justify-content-space-between gl-align-items-center" > @@ -74,7 +91,12 @@ export default { @click.prevent.stop="toggleNav" > {{ $options.i18n.toggleMenuItemLabel }} - <gl-toggle :value="isEnabled" :label="$options.i18n.toggleLabel" label-position="hidden" /> + <gl-toggle + :value="isEnabled" + :label="$options.i18n.toggleLabel" + label-position="hidden" + data-qa-selector="new_navigation_toggle" + /> </div> </li> </template> diff --git a/app/assets/javascripts/nav/components/top_nav_new_dropdown.vue b/app/assets/javascripts/nav/components/top_nav_new_dropdown.vue index bfcdcfc7292..2dfd77bc02e 100644 --- a/app/assets/javascripts/nav/components/top_nav_new_dropdown.vue +++ b/app/assets/javascripts/nav/components/top_nav_new_dropdown.vue @@ -1,5 +1,7 @@ <script> import { GlDropdown, GlDropdownDivider, GlDropdownItem, GlDropdownSectionHeader } from '@gitlab/ui'; +import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue'; +import { TOP_NAV_INVITE_MEMBERS_COMPONENT } from '~/invite_members/constants'; export default { components: { @@ -7,6 +9,7 @@ export default { GlDropdownDivider, GlDropdownItem, GlDropdownSectionHeader, + InviteMembersTrigger, }, props: { viewModel: { @@ -22,6 +25,11 @@ export default { return this.sections.length > 1; }, }, + methods: { + isInvitedMembers(menuItem) { + return menuItem.component === TOP_NAV_INVITE_MEMBERS_COMPONENT; + }, + }, }; </script> @@ -41,7 +49,16 @@ export default { {{ title }} </gl-dropdown-section-header> <template v-for="menuItem in menu_items"> + <invite-members-trigger + v-if="isInvitedMembers(menuItem)" + :key="`${index}_item_${menuItem.id}`" + :trigger-element="`dropdown-${menuItem.data.trigger_element}`" + :display-text="menuItem.title" + :icon="menuItem.icon" + :trigger-source="menuItem.data.trigger_source" + /> <gl-dropdown-item + v-else :key="`${index}_item_${menuItem.id}`" link-class="top-nav-menu-item" :href="menuItem.href" diff --git a/app/assets/javascripts/notebook/cells/output/error.vue b/app/assets/javascripts/notebook/cells/output/error.vue new file mode 100644 index 00000000000..9afc89cde4f --- /dev/null +++ b/app/assets/javascripts/notebook/cells/output/error.vue @@ -0,0 +1,40 @@ +<script> +import Prompt from '../prompt.vue'; +import Markdown from '../markdown.vue'; + +export default { + name: 'ErrorOutput', + components: { + Prompt, + Markdown, + }, + props: { + count: { + type: Number, + required: true, + }, + rawCode: { + type: Array, + required: true, + }, + index: { + type: Number, + required: true, + }, + }, + computed: { + parsedError() { + let parsed = this.rawCode.map((l) => l.replace(/\u001B\[[0-9][0-9;]*m/g, '')); // eslint-disable-line no-control-regex + parsed = ['```error', ...parsed, '```'].join('\n'); // eslint-disable-line @gitlab/require-i18n-strings + return { source: [parsed] }; + }, + }, +}; +</script> + +<template> + <div class="output"> + <prompt type="Out" :count="count" /> + <markdown :cell="parsedError" :hide-prompt="true" /> + </div> +</template> diff --git a/app/assets/javascripts/notebook/cells/output/index.vue b/app/assets/javascripts/notebook/cells/output/index.vue index bd01534089e..22bcb5dd66a 100644 --- a/app/assets/javascripts/notebook/cells/output/index.vue +++ b/app/assets/javascripts/notebook/cells/output/index.vue @@ -4,8 +4,10 @@ import HtmlOutput from './html.vue'; import ImageOutput from './image.vue'; import LatexOutput from './latex.vue'; import MarkdownOutput from './markdown.vue'; +import ErrorOutput from './error.vue'; const TEXT_MARKDOWN = 'text/markdown'; +const ERROR_OUTPUT_TYPE = 'error'; export default { props: { @@ -28,6 +30,8 @@ export default { outputType(output) { if (output.text) { return 'text/plain'; + } else if (output.output_type === ERROR_OUTPUT_TYPE) { + return 'error'; } else if (output.data['image/png']) { return 'image/png'; } else if (output.data['image/jpeg']) { @@ -56,6 +60,8 @@ export default { getComponent(output) { if (output.text) { return CodeOutput; + } else if (output.output_type === ERROR_OUTPUT_TYPE) { + return ErrorOutput; } else if (output.data['image/png']) { return ImageOutput; } else if (output.data['image/jpeg']) { @@ -80,6 +86,10 @@ export default { return output.text.join(''); } + if (output.output_type === ERROR_OUTPUT_TYPE) { + return output.traceback; + } + return this.dataForType(output, this.outputType(output)); }, }, diff --git a/app/assets/javascripts/notebook/index.vue b/app/assets/javascripts/notebook/index.vue index df9694b7cd8..5f254cae73d 100644 --- a/app/assets/javascripts/notebook/index.vue +++ b/app/assets/javascripts/notebook/index.vue @@ -60,6 +60,10 @@ export default { margin-bottom: 10px; } +.output .text-cell { + overflow-x: auto; +} + .cell pre { margin: 0; width: 100%; diff --git a/app/assets/javascripts/notes/components/comment_field_layout.vue b/app/assets/javascripts/notes/components/comment_field_layout.vue index cc372520c70..02d128eb119 100644 --- a/app/assets/javascripts/notes/components/comment_field_layout.vue +++ b/app/assets/javascripts/notes/components/comment_field_layout.vue @@ -76,7 +76,7 @@ export default { ></div> <noteable-warning v-if="hasWarning" - class="gl-border-b-1 gl-border-b-solid gl-border-b-gray-100 gl-rounded-base gl-rounded-bottom-left-none gl-rounded-bottom-right-none" + class="gl-py-4 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100 gl-rounded-base gl-rounded-bottom-left-none gl-rounded-bottom-right-none" :is-locked="isLocked" :is-confidential="isConfidential" :noteable-type="noteableType" diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 4f7256d0b0e..d78b48e0a6d 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -1,12 +1,11 @@ <script> import { GlAlert, GlButton, GlIcon, GlFormCheckbox, GlTooltipDirective } from '@gitlab/ui'; -import Autosize from 'autosize'; import $ from 'jquery'; import { mapActions, mapGetters, mapState } from 'vuex'; -import Autosave from '~/autosave'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { badgeState } from '~/issuable/components/status_box.vue'; +import { STATUS_CLOSED, STATUS_MERGED, STATUS_OPEN, STATUS_REOPENED } from '~/issues/constants'; import { HTTP_STATUS_UNPROCESSABLE_ENTITY } from '~/lib/utils/http_status'; import { capitalizeFirstCharacter, @@ -14,7 +13,7 @@ import { slugifyWithUnderscore, } from '~/lib/utils/text_utility'; import { sprintf } from '~/locale'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; +import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -35,7 +34,7 @@ export default { components: { NoteSignedOutWidget, DiscussionLockedWidget, - MarkdownField, + MarkdownEditor, GlAlert, GlButton, TimelineEntryItem, @@ -61,6 +60,14 @@ export default { errors: [], noteIsInternal: false, isSubmitting: false, + formFieldProps: { + 'aria-label': this.$options.i18n.comment, + placeholder: this.$options.i18n.bodyPlaceholder, + id: 'note-body', + name: 'note[note]', + class: 'js-note-text note-textarea js-gfm-input markdown-area', + 'data-qa-selector': 'comment_field', + }, }; }, computed: { @@ -95,16 +102,11 @@ export default { } return this.noteType === constants.COMMENT ? comment : startThread; }, - textareaPlaceholder() { - return this.noteIsInternal - ? this.$options.i18n.bodyPlaceholderInternal - : this.$options.i18n.bodyPlaceholder; - }, discussionsRequireResolution() { return this.getNoteableData.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE; }, isOpen() { - return this.openState === constants.OPENED || this.openState === constants.REOPENED; + return this.openState === STATUS_OPEN || this.openState === STATUS_REOPENED; }, canCreateNote() { return this.getNoteableData.current_user.can_create_note; @@ -152,7 +154,7 @@ export default { canToggleIssueState() { return ( this.getNoteableData.current_user.can_update && - this.openState !== constants.MERGED && + this.openState !== STATUS_MERGED && !this.closedAndLocked ); }, @@ -180,14 +182,27 @@ export default { containsLink() { return ATTACHMENT_REGEXP.test(this.note); }, + autosaveKey() { + if (this.isLoggedIn) { + const noteableType = capitalizeFirstCharacter(convertToCamelCase(this.noteableType)); + return `${this.$options.i18n.note}/${noteableType}/${this.getNoteableData.id}`; + } + + return null; + }, + }, + watch: { + noteIsInternal(val) { + this.formFieldProps.placeholder = val + ? this.$options.i18n.bodyPlaceholderInternal + : this.$options.i18n.bodyPlaceholder; + }, }, mounted() { // jQuery is needed here because it is a custom event being dispatched with jQuery. $(document).on('issuable:change', (e, isClosed) => { - this.toggleIssueLocalState(isClosed ? constants.CLOSED : constants.REOPENED); + this.toggleIssueLocalState(isClosed ? STATUS_CLOSED : STATUS_REOPENED); }); - - this.initAutoSave(); }, methods: { ...mapActions([ @@ -232,7 +247,6 @@ export default { } this.note = ''; // Empty textarea while being requested. Repopulate in catch - this.resizeTextarea(); this.stopPolling(); this.isSubmitting = true; @@ -249,7 +263,6 @@ export default { .catch(({ response }) => { this.handleSaveError(response); - this.discard(false); this.note = noteData.data.note.note; // Restore textarea content. this.removePlaceholderNotes(); }) @@ -286,20 +299,10 @@ export default { }), ); }, - discard(shouldClear = true) { - // `blur` is needed to clear slash commands autocomplete cache if event fired. - // `focus` is needed to remain cursor in the textarea. - this.$refs.textarea.blur(); - this.$refs.textarea.focus(); - - if (shouldClear) { - this.note = ''; - this.noteIsInternal = false; - this.resizeTextarea(); - this.$refs.markdownField.previewMarkdown = false; - } - - this.autosave.reset(); + discard() { + this.note = ''; + this.noteIsInternal = false; + this.$refs.markdownEditor.togglePreview(false); }, editCurrentUserLastNote() { if (this.note === '') { @@ -312,28 +315,15 @@ export default { } } }, - initAutoSave() { - if (this.isLoggedIn) { - const noteableType = capitalizeFirstCharacter(convertToCamelCase(this.noteableType)); - - this.autosave = new Autosave(this.$refs.textarea, [ - this.$options.i18n.note, - noteableType, - this.getNoteableData.id, - ]); - } - }, - resizeTextarea() { - this.$nextTick(() => { - Autosize.update(this.$refs.textarea); - }); - }, hasEmailParticipants() { return this.getNoteableData.issue_email_participants?.length; }, dismissError(index) { this.errors.splice(index, 1); }, + onInput(value) { + this.note = value; + }, }, }; </script> @@ -362,35 +352,24 @@ export default { :noteable-type="noteableType" :contains-link="containsLink" > - <markdown-field - ref="markdownField" - :is-submitting="isSubmitting" - :markdown-preview-path="markdownPreviewPath" + <markdown-editor + ref="markdownEditor" + :enable-content-editor="Boolean(glFeatures.contentEditorOnIssues)" + :value="note" + :render-markdown-path="markdownPreviewPath" :markdown-docs-path="markdownDocsPath" - :quick-actions-docs-path="quickActionsDocsPath" :add-spacing-classes="false" - :textarea-value="note" - > - <template #textarea> - <textarea - id="note-body" - ref="textarea" - v-model="note" - dir="auto" - :disabled="isSubmitting" - name="note[note]" - class="note-textarea js-vue-comment-form js-note-text js-gfm-input js-autosize markdown-area" - data-qa-selector="comment_field" - data-testid="comment-field" - data-supports-quick-actions="true" - :aria-label="$options.i18n.comment" - :placeholder="textareaPlaceholder" - @keydown.up="editCurrentUserLastNote()" - @keydown.meta.enter="handleEnter()" - @keydown.ctrl.enter="handleEnter()" - ></textarea> - </template> - </markdown-field> + :quick-actions-docs-path="quickActionsDocsPath" + :form-field-props="formFieldProps" + :autosave-key="autosaveKey" + :disabled="isSubmitting" + supports-quick-actions + autofocus + @keydown.up="editCurrentUserLastNote()" + @keydown.meta.enter="handleEnter()" + @keydown.ctrl.enter="handleEnter()" + @input="onInput" + /> </comment-field-layout> <div class="note-form-actions"> <template v-if="hasDrafts"> diff --git a/app/assets/javascripts/notes/components/discussion_locked_widget.vue b/app/assets/javascripts/notes/components/discussion_locked_widget.vue index 8ac3f6bea68..bcf9b4cf893 100644 --- a/app/assets/javascripts/notes/components/discussion_locked_widget.vue +++ b/app/assets/javascripts/notes/components/discussion_locked_widget.vue @@ -33,8 +33,10 @@ export default { </script> <template> - <div class="disabled-comment text-center"> - <span class="issuable-note-warning inline"> + <div class="disabled-comments gl-mt-3"> + <span + class="issuable-note-warning gl-display-inline-block gl-w-full gl-px-5 gl-py-4 gl-rounded-base" + > <gl-icon :size="16" name="lock" class="icon" /> <span v-if="isProjectArchived"> {{ projectArchivedWarning }} diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index abed95a9706..89cd252b94b 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -3,7 +3,7 @@ import { GlTooltipDirective, GlIcon, GlButton, GlDropdownItem } from '@gitlab/ui import { mapActions, mapGetters, mapState } from 'vuex'; import Api from '~/api'; import resolvedStatusMixin from '~/batch_comments/mixins/resolved_status'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { __, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue index 9d59994788e..21841680cab 100644 --- a/app/assets/javascripts/notes/components/note_awards_list.vue +++ b/app/assets/javascripts/notes/components/note_awards_list.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import AwardsList from '~/vue_shared/components/awards_list.vue'; diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index 20cf21cd1b6..eef011db7d2 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -208,7 +208,7 @@ export default { v-if="note.last_edited_at" :edited-at="note.last_edited_at" :edited-by="note.last_edited_by" - action-text="Edited" + :action-text="__('Edited')" class="note_edited_ago" /> <note-awards-list diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue index e0c3ed0c67a..25c82c29a29 100644 --- a/app/assets/javascripts/notes/components/note_edited_text.vue +++ b/app/assets/javascripts/notes/components/note_edited_text.vue @@ -1,10 +1,13 @@ <script> -/* eslint-disable @gitlab/vue-require-i18n-strings */ +import { GlSprintf, GlLink } from '@gitlab/ui'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import { EDITED_TEXT } from '../i18n'; export default { name: 'EditedNoteText', components: { + GlSprintf, + GlLink, TimeAgoTooltip, }, props: { @@ -33,19 +36,42 @@ export default { default: 'edited-text', }, }, + i18n: EDITED_TEXT, }; </script> <template> <div :class="className"> - {{ actionText }} - <template v-if="editedBy"> - by - <a :href="editedBy.path" :data-user-id="editedBy.id" class="js-user-link author-link"> - {{ editedBy.name }} - </a> - </template> - {{ actionDetailText }} - <time-ago-tooltip :time="editedAt" tooltip-placement="bottom" /> + <gl-sprintf v-if="editedBy" :message="$options.i18n.actionWithAuthor"> + <template #actionText> + {{ actionText }} + </template> + <template #actionDetail> + {{ actionDetailText }} + </template> + <template #timeago> + <time-ago-tooltip :time="editedAt" tooltip-placement="bottom" /> + </template> + <template #author> + <gl-link + :href="editedBy.path" + :data-user-id="editedBy.id" + class="js-user-link author-link gl-hover-text-decoration-underline" + > + {{ editedBy.name }} + </gl-link> + </template> + </gl-sprintf> + <gl-sprintf v-else :message="$options.i18n.actionWithoutAuthor"> + <template #actionText> + {{ actionText }} + </template> + <template #actionDetail> + {{ actionDetailText }} + </template> + <template #timeago> + <time-ago-tooltip :time="editedAt" tooltip-placement="bottom" /> + </template> + </gl-sprintf> </div> </template> diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index c83b3d870d7..7dc6b045b4d 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -68,6 +68,11 @@ export default { required: false, default: false, }, + noteUrl: { + type: String, + required: false, + default: '', + }, }, data() { return { @@ -85,7 +90,9 @@ export default { return this.expanded ? 'chevron-up' : 'chevron-down'; }, noteTimestampLink() { - return this.noteId ? `#note_${this.noteId}` : undefined; + if (this.noteUrl) return this.noteUrl; + + return this.noteId ? `#note_${getIdFromGraphQLId(this.noteId)}` : undefined; }, hasAuthor() { return this.author && Object.keys(this.author).length; @@ -159,15 +166,13 @@ export default { :data-user-id="authorId" :data-username="author.username" > - <span class="note-header-author-name gl-font-weight-bold"> - {{ authorName }} - </span> + <span class="note-header-author-name gl-font-weight-bold" v-text="authorName"></span> </a> <span v-if="!isSystemNote" class="text-nowrap author-username"> <a ref="authorUsernameLink" class="author-username-link" - :href="author.path" + :href="authorHref" @mouseenter="handleUsernameMouseEnter" @mouseleave="handleUsernameMouseLeave" ><span class="note-headline-light">@{{ author.username }}</span> diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index ff801cdccea..60ae573bae7 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -2,7 +2,7 @@ import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { mapActions, mapGetters } from 'vuex'; import DraftNote from '~/batch_comments/components/draft_note.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { clearDraft, getDiscussionReplyKey } from '~/lib/utils/autosave'; import { isLoggedIn } from '~/lib/utils/common_utils'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 93575ad57ff..80025d6f98a 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -6,7 +6,7 @@ import { mapGetters, mapActions } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import { INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { HTTP_STATUS_GONE } from '~/lib/utils/http_status'; import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending'; import { truncateSha } from '~/lib/utils/text_utility'; diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index 4437d461308..b0f7a4a4732 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -39,7 +39,7 @@ export default { }, liClasses() { return this.collapsed - ? 'gl-text-gray-500 gl-rounded-bottom-left-base gl-rounded-bottom-right-base' + ? 'gl-text-gray-500 gl-rounded-bottom-left-base! gl-rounded-bottom-right-base! replies-widget-collapsed' : 'gl-border-b'; }, buttonIcon() { @@ -76,7 +76,7 @@ export default { v-for="author in uniqueAuthors" :key="author.username" class="gl-mr-3 reply-author-avatar" - :link-href="author.path" + :link-href="author.path || author.webUrl" :img-alt="author.name" img-css-classes="gl-mr-0!" :img-src="author.avatar_url || author.avatarUrl" @@ -95,7 +95,7 @@ export default { <gl-sprintf :message="$options.i18n.lastReplyBy"> <template #name> <gl-link - :href="lastReply.author.path" + :href="lastReply.author.path || lastReply.author.webUrl" class="gl-text-body! gl-text-decoration-none! gl-mx-2" > {{ lastReply.author.name }} diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/notes/constants.js index 88f438975f6..15eb4f95910 100644 --- a/app/assets/javascripts/notes/constants.js +++ b/app/assets/javascripts/notes/constants.js @@ -1,3 +1,4 @@ +import { STATUS_CLOSED, STATUS_OPEN, STATUS_REOPENED } from '~/issues/constants'; import { __ } from '~/locale'; export const DISCUSSION_NOTE = 'DiscussionNote'; @@ -6,10 +7,6 @@ export const DISCUSSION = 'discussion'; export const NOTE = 'note'; export const SYSTEM_NOTE = 'systemNote'; export const COMMENT = 'comment'; -export const OPENED = 'opened'; -export const REOPENED = 'reopened'; -export const CLOSED = 'closed'; -export const MERGED = 'merged'; export const ISSUE_NOTEABLE_TYPE = 'Issue'; export const EPIC_NOTEABLE_TYPE = 'Epic'; export const MERGE_REQUEST_NOTEABLE_TYPE = 'MergeRequest'; @@ -43,13 +40,19 @@ export const DISCUSSION_FILTER_TYPES = { export const toggleStateErrorMessage = { Epic: { - [CLOSED]: __('Something went wrong while reopening the epic. Please try again later.'), - [OPENED]: __('Something went wrong while closing the epic. Please try again later.'), - [REOPENED]: __('Something went wrong while closing the epic. Please try again later.'), + [STATUS_CLOSED]: __('Something went wrong while reopening the epic. Please try again later.'), + [STATUS_OPEN]: __('Something went wrong while closing the epic. Please try again later.'), + [STATUS_REOPENED]: __('Something went wrong while closing the epic. Please try again later.'), }, MergeRequest: { - [CLOSED]: __('Something went wrong while reopening the merge request. Please try again later.'), - [OPENED]: __('Something went wrong while closing the merge request. Please try again later.'), - [REOPENED]: __('Something went wrong while closing the merge request. Please try again later.'), + [STATUS_CLOSED]: __( + 'Something went wrong while reopening the merge request. Please try again later.', + ), + [STATUS_OPEN]: __( + 'Something went wrong while closing the merge request. Please try again later.', + ), + [STATUS_REOPENED]: __( + 'Something went wrong while closing the merge request. Please try again later.', + ), }, }; diff --git a/app/assets/javascripts/notes/i18n.js b/app/assets/javascripts/notes/i18n.js index a758a55014a..4bf2a8d70a7 100644 --- a/app/assets/javascripts/notes/i18n.js +++ b/app/assets/javascripts/notes/i18n.js @@ -49,3 +49,8 @@ export const COMMENT_FORM = { 'Notes|Attachments are sent by email. Attachments over 10 MB are sent as links to your GitLab instance, and only accessible to project members.', ), }; + +export const EDITED_TEXT = { + actionWithAuthor: __('%{actionText} %{actionDetail} %{timeago} by %{author}'), + actionWithoutAuthor: __('%{actionText} %{actionDetail}'), +}; diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js index 2e09c9f2288..b884c6b6d19 100644 --- a/app/assets/javascripts/notes/index.js +++ b/app/assets/javascripts/notes/index.js @@ -1,4 +1,6 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; +import { apolloProvider } from '~/graphql_shared/issuable_client'; import { parseBoolean } from '~/lib/utils/common_utils'; import { getLocationHash } from '~/lib/utils/url_utility'; import NotesApp from './components/notes_app.vue'; @@ -11,6 +13,8 @@ export default () => { return; } + Vue.use(VueApollo); + const notesFilterProps = getNotesFilterData(el); const showTimelineViewToggle = parseBoolean(el.dataset.showTimelineViewToggle); @@ -50,9 +54,11 @@ export default () => { NotesApp, }, store, + apolloProvider, provide: { showTimelineViewToggle, reportAbusePath: notesDataset.reportAbusePath, + newSavedRepliesPath: notesDataset.savedRepliesNewPath, }, data() { return { diff --git a/app/assets/javascripts/notes/mixins/diff_line_note_form.js b/app/assets/javascripts/notes/mixins/diff_line_note_form.js index 9a140029c07..0509ff24959 100644 --- a/app/assets/javascripts/notes/mixins/diff_line_note_form.js +++ b/app/assets/javascripts/notes/mixins/diff_line_note_form.js @@ -1,7 +1,7 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import { getDraftReplyFormData, getDraftFormData } from '~/batch_comments/utils'; import { TEXT_DIFF_POSITION_TYPE, IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { clearDraft } from '~/lib/utils/autosave'; import { s__ } from '~/locale'; import { formatLineRange } from '~/notes/components/multiline_comment_utils'; diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js index 44751020173..63822a31cd1 100644 --- a/app/assets/javascripts/notes/mixins/resolvable.js +++ b/app/assets/javascripts/notes/mixins/resolvable.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; export default { diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index f6b9be6ee9b..cdfa0d11f56 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import Visibility from 'visibilityjs'; import Vue from 'vue'; import Api from '~/api'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { STATUS_CLOSED, STATUS_REOPENED, TYPE_ISSUE } from '~/issues/constants'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; import toast from '~/vue_shared/plugins/global_toast'; @@ -19,7 +19,6 @@ import { mergeUrlParams } from '~/lib/utils/url_utility'; import sidebarTimeTrackingEventHub from '~/sidebar/event_hub'; import TaskList from '~/task_list'; import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub'; -import SidebarStore from '~/sidebar/stores/sidebar_store'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { TYPENAME_NOTE } from '~/graphql_shared/constants'; import notesEventHub from '../event_hub'; @@ -407,7 +406,7 @@ export const emitStateChangedEvent = ({ getters }, data) => { const event = new CustomEvent(EVENT_ISSUABLE_VUE_APP_CHANGE, { detail: { data, - isClosed: getters.openState === constants.CLOSED, + isClosed: getters.openState === STATUS_CLOSED, }, }); @@ -415,9 +414,9 @@ export const emitStateChangedEvent = ({ getters }, data) => { }; export const toggleIssueLocalState = ({ commit }, newState) => { - if (newState === constants.CLOSED) { + if (newState === STATUS_CLOSED) { commit(types.CLOSE_ISSUE); - } else if (newState === constants.REOPENED) { + } else if (newState === STATUS_REOPENED) { commit(types.REOPEN_ISSUE); } }; @@ -467,12 +466,17 @@ export const saveNote = ({ commit, dispatch }, noteData) => { const processQuickActions = (res) => { const { - errors: { commands_only: commandsOnly, command_names: commandNames } = { + errors: { commands_only: commandsOnly } = { commands_only: null, command_names: [], }, + command_names: commandNames, } = res; - let message = commandsOnly; + const message = commandsOnly; + + if (commandNames?.indexOf('submit_review') >= 0) { + dispatch('batchComments/clearDrafts'); + } /* The following reply means that quick actions have been successfully applied: @@ -491,13 +495,6 @@ export const saveNote = ({ commit, dispatch }, noteData) => { confidentialWidget.setConfidentiality(); } - const commands = ['approve', 'merge', 'assign_reviewer', 'assign']; - const commandUpdatesAttentionRequest = commandNames[0].some((c) => commands.includes(c)); - - if (commandUpdatesAttentionRequest && SidebarStore.singleton.currentUserHasAttention) { - message = sprintf(__('%{message}. Your attention request was removed.'), { message }); - } - $('.js-gfm-input').trigger('clear-commands-cache.atwho'); createAlert({ @@ -759,10 +756,10 @@ export const submitSuggestion = ( const errorMessage = err.response.data?.message; - const flashMessage = errorMessage || defaultMessage; + const alertMessage = errorMessage || defaultMessage; createAlert({ - message: flashMessage, + message: alertMessage, parent: flashContainer, }); }) @@ -795,10 +792,10 @@ export const submitSuggestionBatch = ({ commit, dispatch, state }, { message, fl const errorMessage = err.response.data?.message; - const flashMessage = errorMessage || defaultMessage; + const alertMessage = errorMessage || defaultMessage; createAlert({ - message: flashMessage, + message: alertMessage, parent: flashContainer, }); }) diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index 5d532b68f1b..7a7aa0deb1d 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -1,4 +1,5 @@ import { isEqual } from 'lodash'; +import { STATUS_CLOSED, STATUS_REOPENED } from '~/issues/constants'; import { isInMRPage } from '~/lib/utils/common_utils'; import * as constants from '../constants'; import * as types from './mutation_types'; @@ -319,11 +320,11 @@ export default { }, [types.CLOSE_ISSUE](state) { - Object.assign(state.noteableData, { state: constants.CLOSED }); + Object.assign(state.noteableData, { state: STATUS_CLOSED }); }, [types.REOPEN_ISSUE](state) { - Object.assign(state.noteableData, { state: constants.REOPENED }); + Object.assign(state.noteableData, { state: STATUS_REOPENED }); }, [types.TOGGLE_STATE_BUTTON_LOADING](state, value) { diff --git a/app/assets/javascripts/observability/components/observability_app.vue b/app/assets/javascripts/observability/components/observability_app.vue index ff9cf6ff6c5..36cbe715149 100644 --- a/app/assets/javascripts/observability/components/observability_app.vue +++ b/app/assets/javascripts/observability/components/observability_app.vue @@ -2,7 +2,7 @@ import { darkModeEnabled } from '~/lib/utils/color_utils'; import { setUrlParams } from '~/lib/utils/url_utility'; -import { MESSAGE_EVENT_TYPE, SKELETON_VARIANTS_BY_ROUTE } from '../constants'; +import { MESSAGE_EVENT_TYPE, FULL_APP_DIMENSIONS } from '../constants'; import ObservabilitySkeleton from './skeleton/index.vue'; export default { @@ -14,25 +14,33 @@ export default { type: String, required: true, }, + inlineEmbed: { + type: Boolean, + required: false, + default: false, + }, + skeletonVariant: { + type: String, + required: false, + default: 'dashboards', + }, + height: { + type: String, + required: false, + default: FULL_APP_DIMENSIONS.HEIGHT, + }, + width: { + type: String, + required: false, + default: FULL_APP_DIMENSIONS.WIDTH, + }, }, computed: { iframeSrcWithParams() { - return setUrlParams( + return `${setUrlParams( { theme: darkModeEnabled() ? 'dark' : 'light', username: gon?.current_username }, this.observabilityIframeSrc, - ); - }, - getSkeletonVariant() { - const [, variant] = - Object.entries(SKELETON_VARIANTS_BY_ROUTE).find(([path]) => - this.$route.path.endsWith(path), - ) || []; - - const DEFAULT_SKELETON = 'dashboards'; - - if (!variant) return DEFAULT_SKELETON; - - return variant; + )}${this.inlineEmbed ? '&kiosk=inline-embed' : ''}`; }, }, mounted() { @@ -54,38 +62,24 @@ export default { this.$refs.observabilitySkeleton.onContentLoaded(); break; case MESSAGE_EVENT_TYPE.GOUI_ROUTE_UPDATE: - this.routeUpdateHandler(payload); + this.$emit('route-update', payload); break; default: break; } }, - routeUpdateHandler(payload) { - const isNewObservabilityPath = this.$route?.query?.observability_path !== payload?.url; - - const shouldNotHandleMessage = !payload.url || !isNewObservabilityPath; - - if (shouldNotHandleMessage) { - return; - } - - // this will update the `observability_path` query param on each route change inside Observability UI - this.$router.replace({ - name: this.$route.pathname, - query: { ...this.$route.query, observability_path: payload.url }, - }); - }, }, }; </script> <template> - <observability-skeleton ref="observabilitySkeleton" :variant="getSkeletonVariant"> + <observability-skeleton ref="observabilitySkeleton" :variant="skeletonVariant"> <iframe id="observability-ui-iframe" data-testid="observability-ui-iframe" frameborder="0" - height="100%" + :width="width" + :height="height" :src="iframeSrcWithParams" sandbox="allow-same-origin allow-forms allow-scripts" ></iframe> diff --git a/app/assets/javascripts/observability/components/skeleton/embed.vue b/app/assets/javascripts/observability/components/skeleton/embed.vue new file mode 100644 index 00000000000..7abaf2b1bc7 --- /dev/null +++ b/app/assets/javascripts/observability/components/skeleton/embed.vue @@ -0,0 +1,15 @@ +<script> +import { GlSkeletonLoader } from '@gitlab/ui'; + +export default { + components: { + GlSkeletonLoader, + }, +}; +</script> +<template> + <gl-skeleton-loader> + <rect y="5" width="400" height="30" rx="2" ry="2" /> + <rect y="50" width="400" height="80" rx="2" ry="2" /> + </gl-skeleton-loader> +</template> diff --git a/app/assets/javascripts/observability/components/skeleton/index.vue b/app/assets/javascripts/observability/components/skeleton/index.vue index c8f196a43f4..d91f2874943 100644 --- a/app/assets/javascripts/observability/components/skeleton/index.vue +++ b/app/assets/javascripts/observability/components/skeleton/index.vue @@ -8,10 +8,12 @@ import { OBSERVABILITY_ROUTES, TIMEOUT_ERROR_LABEL, TIMEOUT_ERROR_MESSAGE, + SKELETON_VARIANT_EMBED, } from '../../constants'; import DashboardsSkeleton from './dashboards.vue'; import ExploreSkeleton from './explore.vue'; import ManageSkeleton from './manage.vue'; +import EmbedSkeleton from './embed.vue'; export default { components: { @@ -19,11 +21,13 @@ export default { DashboardsSkeleton, ExploreSkeleton, ManageSkeleton, + EmbedSkeleton, GlAlert, }, SKELETON_VARIANTS_BY_ROUTE, SKELETON_STATE, OBSERVABILITY_ROUTES, + SKELETON_VARIANT_EMBED, i18n: { TIMEOUT_ERROR_LABEL, TIMEOUT_ERROR_MESSAGE, @@ -102,6 +106,7 @@ export default { <dashboards-skeleton v-if="isSkeletonShown($options.OBSERVABILITY_ROUTES.DASHBOARDS)" /> <explore-skeleton v-else-if="isSkeletonShown($options.OBSERVABILITY_ROUTES.EXPLORE)" /> <manage-skeleton v-else-if="isSkeletonShown($options.OBSERVABILITY_ROUTES.MANAGE)" /> + <embed-skeleton v-else-if="variant === $options.SKELETON_VARIANT_EMBED" /> <gl-skeleton-loader v-else> <rect y="2" width="10" height="8" /> @@ -122,12 +127,14 @@ export default { {{ $options.i18n.TIMEOUT_ERROR_MESSAGE }} </gl-alert> - <div - v-show="state === $options.SKELETON_STATE.HIDDEN" - data-testid="observability-wrapper" - class="gl-flex-grow-1 gl-display-flex gl-flex-direction-column gl-flex-align-items-stretch" - > - <slot></slot> - </div> + <transition> + <div + v-show="state === $options.SKELETON_STATE.HIDDEN" + data-testid="observability-wrapper" + class="gl-flex-grow-1 gl-display-flex gl-flex-direction-column gl-flex-align-items-stretch" + > + <slot></slot> + </div> + </transition> </div> </template> diff --git a/app/assets/javascripts/observability/constants.js b/app/assets/javascripts/observability/constants.js index e4827dd169f..6b97c51e997 100644 --- a/app/assets/javascripts/observability/constants.js +++ b/app/assets/javascripts/observability/constants.js @@ -17,6 +17,8 @@ export const SKELETON_VARIANTS_BY_ROUTE = Object.freeze({ [OBSERVABILITY_ROUTES.MANAGE]: 'manage', }); +export const SKELETON_VARIANT_EMBED = 'embed'; + export const SKELETON_STATE = Object.freeze({ ERROR: 'error', VISIBLE: 'visible', @@ -30,3 +32,13 @@ export const DEFAULT_TIMERS = Object.freeze({ export const TIMEOUT_ERROR_LABEL = __('Unable to load the page'); export const TIMEOUT_ERROR_MESSAGE = __('Reload the page to try again.'); + +export const INLINE_EMBED_DIMENSIONS = Object.freeze({ + HEIGHT: '366px', + WIDTH: '768px', +}); + +export const FULL_APP_DIMENSIONS = Object.freeze({ + HEIGHT: '100%', + WIDTH: '100%', +}); diff --git a/app/assets/javascripts/observability/index.js b/app/assets/javascripts/observability/index.js index cd342ebee3e..72ff1357551 100644 --- a/app/assets/javascripts/observability/index.js +++ b/app/assets/javascripts/observability/index.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import ObservabilityApp from './components/observability_app.vue'; +import { SKELETON_VARIANTS_BY_ROUTE } from './constants'; Vue.use(VueRouter); @@ -17,10 +18,41 @@ export default () => { return new Vue({ el, router, + computed: { + skeletonVariant() { + const [, variant] = + Object.entries(SKELETON_VARIANTS_BY_ROUTE).find(([path]) => + this.$route.path.endsWith(path), + ) || []; + + return variant; + }, + }, + methods: { + routeUpdateHandler(payload) { + const isNewObservabilityPath = this.$route?.query?.observability_path !== payload?.url; + + const shouldNotHandleMessage = !payload.url || !isNewObservabilityPath; + + if (shouldNotHandleMessage) { + return; + } + + // this will update the `observability_path` query param on each route change inside Observability UI + this.$router.replace({ + name: this.$route?.pathname, + query: { ...this.$route.query, observability_path: payload.url }, + }); + }, + }, render(h) { return h(ObservabilityApp, { props: { observabilityIframeSrc: el.dataset.observabilityIframeSrc, + skeletonVariant: this.skeletonVariant, + }, + on: { + 'route-update': (payload) => this.routeUpdateHandler(payload), }, }); }, diff --git a/app/assets/javascripts/operation_settings/store/actions.js b/app/assets/javascripts/operation_settings/store/actions.js index 5f60cab8bdd..7fa79da59c4 100644 --- a/app/assets/javascripts/operation_settings/store/actions.js +++ b/app/assets/javascripts/operation_settings/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; @@ -26,7 +26,7 @@ export const saveChanges = ({ state, dispatch }) => export const receiveSaveChangesSuccess = () => { /** * The operations_controller currently handles successful requests - * by creating a flash banner messsage to notify the user. + * by creating an alert banner message to notify the user. */ refreshCurrentPage(); }; diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue index 2da8ca2d8a8..0757ac5522a 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/delete_modal.vue @@ -85,7 +85,7 @@ export default { size="sm" :action-primary="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ { text: __('Delete'), - attributes: [{ variant: 'danger' }, { disabled: disablePrimaryButton }], + attributes: { variant: 'danger', disabled: disablePrimaryButton }, } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" :action-cancel="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ { text: __('Cancel'), diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue index c10d8be69a0..863d1c2629b 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue @@ -1,6 +1,6 @@ <script> import { GlEmptyState } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { n__ } from '~/locale'; import { joinPaths } from '~/lib/utils/url_utility'; import RegistryList from '~/packages_and_registries/shared/components/registry_list.vue'; @@ -87,6 +87,9 @@ export default { tags() { return this.containerRepository?.tags?.nodes || []; }, + hideBulkDelete() { + return !(this.containerRepository?.canDelete || false); + }, tagsPageInfo() { return this.containerRepository?.tags?.pageInfo; }, @@ -98,9 +101,6 @@ export default { sort: this.sort, }; }, - showMultiDeleteButton() { - return this.tags.some((tag) => tag.canDelete) && !this.isMobile; - }, hasNoTags() { return this.tags.length === 0; }, @@ -186,6 +186,7 @@ export default { /> <template v-else> <registry-list + :hidden-delete="hideBulkDelete" :title="listTitle" :pagination="tagsPageInfo" :items="tags" diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue index 38b601ac3ec..8e89128a382 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue @@ -109,9 +109,6 @@ export default { isInvalidTag() { return !this.tag.digest; }, - isDeleteDisabled() { - return this.disabled || !this.tag.canDelete; - }, }, }; </script> @@ -179,16 +176,16 @@ export default { </gl-sprintf> </span> </template> - <template #right-action> + <template v-if="tag.canDelete" #right-action> <gl-dropdown - :disabled="isDeleteDisabled" + :disabled="disabled" icon="ellipsis_v" :text="$options.i18n.MORE_ACTIONS_TEXT" :text-sr-only="true" category="tertiary" no-caret right - :class="{ 'gl-opacity-0 gl-pointer-events-none': isDeleteDisabled }" + :class="{ 'gl-opacity-0 gl-pointer-events-none': disabled }" data-testid="additional-actions" data-qa-selector="more_actions_menu" > diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue index 4f89d217623..f6f816f435c 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue @@ -1,5 +1,5 @@ <script> -import { GlTooltipDirective, GlIcon, GlSprintf, GlSkeletonLoader, GlButton } from '@gitlab/ui'; +import { GlTooltipDirective, GlSprintf, GlSkeletonLoader, GlButton } from '@gitlab/ui'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { n__ } from '~/locale'; import Tracking from '~/tracking'; @@ -28,7 +28,6 @@ export default { DeleteButton, GlSprintf, GlButton, - GlIcon, ListItem, GlSkeletonLoader, CleanupStatus, @@ -80,8 +79,8 @@ export default { }, tagsCountText() { return n__( - 'ContainerRegistry|%{count} Tag', - 'ContainerRegistry|%{count} Tags', + 'ContainerRegistry|%{count} tag', + 'ContainerRegistry|%{count} tags', this.item.tagsCount, ); }, @@ -152,7 +151,6 @@ export default { <span v-if="deleting">{{ $options.i18n.ROW_SCHEDULED_FOR_DELETION }}</span> <template v-else> <span class="gl-display-flex gl-align-items-center" data-testid="tags-count"> - <gl-icon name="tag" class="gl-mr-2" /> <gl-sprintf :message="tagsCountText"> <template #count> {{ item.tagsCount }} diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_tags.query.graphql b/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_tags.query.graphql index e57ac2a9efe..a0a80600603 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_tags.query.graphql +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/queries/get_container_repository_tags.query.graphql @@ -12,6 +12,7 @@ query getContainerRepositoryTags( containerRepository(id: $id) { id tagsCount + canDelete tags(after: $after, before: $before, first: $first, last: $last, name: $name, sort: $sort) { nodes { digest diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue index 83c0d2cdfca..2b5fb1a70ed 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue @@ -1,7 +1,7 @@ <script> import { GlResizeObserverDirective, GlEmptyState } from '@gitlab/ui'; import { GlBreakpointInstance } from '@gitlab/ui/dist/utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import Tracking from '~/tracking'; diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue index 8a038d7c974..6d9273d543f 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/list.vue @@ -10,7 +10,8 @@ import { } from '@gitlab/ui'; import { get } from 'lodash'; import getContainerRepositoriesQuery from 'shared_queries/container_registry/get_container_repositories.query.graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import Tracking from '~/tracking'; import PersistedSearch from '~/packages_and_registries/shared/components/persisted_search.vue'; import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants'; @@ -145,7 +146,7 @@ export default { return []; }, graphqlResource() { - return this.config.isGroupPage ? 'group' : 'project'; + return this.config.isGroupPage ? WORKSPACE_GROUP : WORKSPACE_PROJECT; }, queryVariables() { return { diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue index 45dc217b9e3..b24ec65464f 100644 --- a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue +++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue @@ -55,7 +55,7 @@ export default { modalButtons: { primary: { text: s__('DependencyProxy|Clear cache'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, secondary: { text: __('Cancel'), diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/details.vue b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/details.vue index bafcd78ad5d..bff32a124bc 100644 --- a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/details.vue +++ b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/details.vue @@ -9,7 +9,7 @@ import { TAG_LABEL, } from '~/packages_and_registries/harbor_registry/constants/index'; import { OPERATORS_IS } from '~/vue_shared/components/filtered_search_bar/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import TagsLoader from '~/packages_and_registries/shared/components/tags_loader.vue'; import ArtifactsList from '~/packages_and_registries/harbor_registry/components/details/artifacts_list.vue'; diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/harbor_tags.vue b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/harbor_tags.vue index 1323d347d10..8bc1ecba5fe 100644 --- a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/harbor_tags.vue +++ b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/harbor_tags.vue @@ -4,7 +4,7 @@ import TagsList from '~/packages_and_registries/harbor_registry/components/tags/ import { getHarborTags } from '~/rest_api'; import { FETCH_TAGS_ERROR_MESSAGE } from '~/packages_and_registries/harbor_registry/constants'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { formatPagination } from '~/packages_and_registries/harbor_registry/utils'; export default { diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue index 931a99649cb..1d8cb0f1360 100644 --- a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue +++ b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue @@ -12,7 +12,7 @@ import { dockerPushCommand, dockerLoginCommand, } from '~/packages_and_registries/harbor_registry/utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { SORT_FIELDS, CONNECTION_ERROR_TITLE, diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue index fd099ee4e69..fdc58e4bd05 100644 --- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue +++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/components/app.vue @@ -122,15 +122,15 @@ export default { modal: { packageDeletePrimaryAction: { text: __('Delete'), - attributes: [ - { variant: 'danger' }, - { category: 'primary' }, - { 'data-qa-selector': 'delete_modal_button' }, - ], + attributes: { + variant: 'danger', + category: 'primary', + 'data-qa-selector': 'delete_modal_button', + }, }, fileDeletePrimaryAction: { text: __('Delete'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, cancelAction: { text: __('Cancel'), diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/store/actions.js b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/store/actions.js index 223f427ce0e..62c4f96eff7 100644 --- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/store/actions.js +++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/details/store/actions.js @@ -1,5 +1,5 @@ import Api from '~/api'; -import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/alert'; import { DELETE_PACKAGE_ERROR_MESSAGE, DELETE_PACKAGE_FILE_ERROR_MESSAGE, diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/components/packages_list_app.vue b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/components/packages_list_app.vue index 0aeeb2c3d15..6ea1fff9ef0 100644 --- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/components/packages_list_app.vue +++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/components/packages_list_app.vue @@ -1,7 +1,7 @@ <script> import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { mapActions, mapState } from 'vuex'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import { historyReplaceState } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages_and_registries/shared/constants'; diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/constants.js b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/constants.js index 7af3fc1c2db..05673215a66 100644 --- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/constants.js +++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/constants.js @@ -6,7 +6,6 @@ export const FETCH_PACKAGES_LIST_ERROR_MESSAGE = __( export const DELETE_PACKAGE_SUCCESS_MESSAGE = __('Package deleted successfully'); export const DEFAULT_PAGE = 1; -export const DEFAULT_PAGE_SIZE = 20; export const GROUP_PAGE_TYPE = 'groups'; diff --git a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/stores/actions.js b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/stores/actions.js index 7a452abdc26..122123f49cd 100644 --- a/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/stores/actions.js +++ b/app/assets/javascripts/packages_and_registries/infrastructure_registry/list/stores/actions.js @@ -1,13 +1,13 @@ import Api from '~/api'; -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages_and_registries/shared/constants'; import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants'; +import { DEFAULT_PAGE_SIZE } from '~/vue_shared/issuable/list/constants'; import { FETCH_PACKAGES_LIST_ERROR_MESSAGE, DELETE_PACKAGE_SUCCESS_MESSAGE, DEFAULT_PAGE, - DEFAULT_PAGE_SIZE, MISSING_DELETE_PATH_ERROR, TERRAFORM_SEARCH_TYPE, } from '../constants'; diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue index 011a2668a8b..b167fff26b0 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/delete_modal.vue @@ -32,7 +32,7 @@ export default { modal: { packagesDeletePrimaryAction: { text: DELETE_PACKAGE_MODAL_PRIMARY_ACTION, - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, cancelAction: { text: __('Cancel'), diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/maven_installation.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/maven_installation.vue index 4510c7a7322..95b83d87792 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/maven_installation.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/maven_installation.vue @@ -13,6 +13,7 @@ import { TRACKING_LABEL_CODE_INSTRUCTION, TRACKING_LABEL_MAVEN_INSTALLATION, MAVEN_HELP_PATH, + MAVEN_INSTALLATION_COMMAND, } from '~/packages_and_registries/package_registry/constants'; import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; @@ -55,11 +56,6 @@ export default { <version>${this.appVersion}</version> </dependency>`; }, - - mavenInstallationCommand() { - return `mvn dependency:get -Dartifact=${this.appGroup}:${this.appName}:${this.appVersion}`; - }, - mavenSetupXml() { return `<repositories> <repository> @@ -135,6 +131,7 @@ export default { { value: 'groovy', label: s__('PackageRegistry|Gradle Groovy DSL') }, { value: 'kotlin', label: s__('PackageRegistry|Gradle Kotlin DSL') }, ], + MAVEN_INSTALLATION_COMMAND, }; </script> @@ -164,8 +161,9 @@ export default { /> <code-instruction + class="gl-w-20 gl-mt-5" :label="s__('PackageRegistry|Maven Command')" - :instruction="mavenInstallationCommand" + :instruction="$options.MAVEN_INSTALLATION_COMMAND" :copy-text="s__('PackageRegistry|Copy Maven command')" :tracking-action="$options.tracking.TRACKING_ACTION_COPY_MAVEN_COMMAND" :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION" diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue index d982df4f984..3d5ac528920 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue @@ -4,16 +4,22 @@ import VersionRow from '~/packages_and_registries/package_registry/components/de import PackagesListLoader from '~/packages_and_registries/shared/components/packages_list_loader.vue'; import RegistryList from '~/packages_and_registries/shared/components/registry_list.vue'; import DeleteModal from '~/packages_and_registries/package_registry/components/delete_modal.vue'; +import DeletePackageModal from '~/packages_and_registries/shared/components/delete_package_modal.vue'; import { + CANCEL_DELETE_PACKAGE_VERSION_TRACKING_ACTION, CANCEL_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION, + DELETE_PACKAGE_VERSION_TRACKING_ACTION, DELETE_PACKAGE_VERSIONS_TRACKING_ACTION, + REQUEST_DELETE_PACKAGE_VERSION_TRACKING_ACTION, REQUEST_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION, } from '~/packages_and_registries/package_registry/constants'; import Tracking from '~/tracking'; +import { packageTypeToTrackCategory } from '~/packages_and_registries/package_registry/utils'; export default { components: { DeleteModal, + DeletePackageModal, VersionRow, PackagesListLoader, RegistryList, @@ -42,6 +48,7 @@ export default { }, data() { return { + itemToBeDeleted: null, itemsToBeDeleted: [], }; }, @@ -52,8 +59,25 @@ export default { isListEmpty() { return this.versions.length === 0; }, + tracking() { + const category = this.itemToBeDeleted + ? packageTypeToTrackCategory(this.itemToBeDeleted.packageType) + : undefined; + return { + category, + }; + }, }, methods: { + deleteItemConfirmation() { + this.$emit('delete', [this.itemToBeDeleted]); + this.track(DELETE_PACKAGE_VERSION_TRACKING_ACTION); + this.itemToBeDeleted = null; + }, + deleteItemCanceled() { + this.track(CANCEL_DELETE_PACKAGE_VERSION_TRACKING_ACTION); + this.itemToBeDeleted = null; + }, deleteItemsCanceled() { this.track(CANCEL_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION); this.itemsToBeDeleted = []; @@ -63,7 +87,16 @@ export default { this.track(DELETE_PACKAGE_VERSIONS_TRACKING_ACTION); this.itemsToBeDeleted = []; }, + setItemToBeDeleted(item) { + this.itemToBeDeleted = { ...item }; + this.track(REQUEST_DELETE_PACKAGE_VERSION_TRACKING_ACTION); + }, setItemsToBeDeleted(items) { + if (items.length === 1) { + const [item] = items; + this.setItemToBeDeleted(item); + return; + } this.itemsToBeDeleted = items; this.track(REQUEST_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION); this.$refs.deletePackagesModal.show(); @@ -89,18 +122,22 @@ export default { @next-page="$emit('next-page')" > <template #default="{ first, item, isSelected, selectItem }"> - <!-- `first` prop is used to decide whether to show the top border - for the first element. We want to show the top border only when - user has permission to bulk delete versions. --> <version-row - :first="canDestroy && first" + :first="first" :package-entity="item" :selected="isSelected(item)" + @delete="setItemToBeDeleted(item)" @select="selectItem(item)" /> </template> </registry-list> + <delete-package-modal + :item-to-be-deleted="itemToBeDeleted" + @ok="deleteItemConfirmation" + @cancel="deleteItemCanceled" + /> + <delete-modal ref="deletePackagesModal" :items-to-be-deleted="itemsToBeDeleted" diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue index fdc6e75c932..ea6ebb614f4 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue @@ -28,6 +28,9 @@ export default { }, }, computed: { + isPrivatePackage() { + return !this.packageEntity.publicPackage; + }, pypiPipCommand() { // eslint-disable-next-line @gitlab/require-i18n-strings return `pip install ${this.packageEntity.name} --index-url ${this.packageEntity.pypiUrl}`; @@ -75,7 +78,7 @@ password = <your personal access token>`; :tracking-action="$options.tracking.TRACKING_ACTION_COPY_PIP_INSTALL_COMMAND" :tracking-label="$options.tracking.TRACKING_LABEL_CODE_INSTRUCTION" /> - <template #description> + <template v-if="isPrivatePackage" #description> <gl-sprintf :message="$options.i18n.tokenText"> <template #link="{ content }"> <gl-link diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue index 9f8f6328970..193a222853f 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue @@ -1,5 +1,7 @@ <script> import { + GlDropdown, + GlDropdownItem, GlFormCheckbox, GlIcon, GlLink, @@ -13,6 +15,7 @@ import PublishMethod from '~/packages_and_registries/shared/components/publish_m import ListItem from '~/vue_shared/components/registry/list_item.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { + DELETE_PACKAGE_TEXT, ERRORED_PACKAGE_TEXT, ERROR_PUBLISHING, PACKAGE_ERROR_STATUS, @@ -22,6 +25,8 @@ import { export default { name: 'PackageVersionRow', components: { + GlDropdown, + GlDropdownItem, GlFormCheckbox, GlIcon, GlLink, @@ -58,6 +63,7 @@ export default { }, }, i18n: { + deletePackage: DELETE_PACKAGE_TEXT, erroredPackageText: ERRORED_PACKAGE_TEXT, errorPublishing: ERROR_PUBLISHING, warningText: WARNING_TEXT, @@ -121,5 +127,19 @@ export default { </gl-sprintf> </span> </template> + + <template v-if="packageEntity.canDestroy" #right-action> + <gl-dropdown + icon="ellipsis_v" + :text="$options.i18n.moreActions" + :text-sr-only="true" + category="tertiary" + no-caret + > + <gl-dropdown-item variant="danger" @click="$emit('delete')">{{ + $options.i18n.deletePackage + }}</gl-dropdown-item> + </gl-dropdown> + </template> </list-item> </template> diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/functional/delete_packages.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/functional/delete_packages.vue index 0914c013108..b7e66d20e78 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/functional/delete_packages.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/functional/delete_packages.vue @@ -1,6 +1,6 @@ <script> import destroyPackagesMutation from '~/packages_and_registries/package_registry/graphql/mutations/destroy_packages.mutation.graphql'; -import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/alert'; import { DELETE_PACKAGE_ERROR_MESSAGE, diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue index 16f21bfe61d..c5354b7e7df 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue @@ -8,9 +8,10 @@ import { GlTooltipDirective, GlTruncate, } from '@gitlab/ui'; -import { s__, __ } from '~/locale'; +import { __ } from '~/locale'; import ListItem from '~/vue_shared/components/registry/list_item.vue'; import { + DELETE_PACKAGE_TEXT, ERRORED_PACKAGE_TEXT, ERROR_PUBLISHING, PACKAGE_ERROR_STATUS, @@ -91,7 +92,7 @@ export default { i18n: { erroredPackageText: ERRORED_PACKAGE_TEXT, createdAt: __('Created %{timestamp}'), - deletePackage: s__('PackageRegistry|Delete package'), + deletePackage: DELETE_PACKAGE_TEXT, errorPublishing: ERROR_PUBLISHING, warning: WARNING_TEXT, moreActions: __('More actions'), diff --git a/app/assets/javascripts/packages_and_registries/package_registry/constants.js b/app/assets/javascripts/packages_and_registries/package_registry/constants.js index d979ae5c08c..eda8d9e0066 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/constants.js +++ b/app/assets/javascripts/packages_and_registries/package_registry/constants.js @@ -27,15 +27,8 @@ export const PACKAGE_TYPE_DEBIAN = 'DEBIAN'; export const PACKAGE_TYPE_HELM = 'HELM'; export const TRACKING_LABEL_CODE_INSTRUCTION = 'code_instruction'; -export const TRACKING_LABEL_CONAN_INSTALLATION = 'conan_installation'; export const TRACKING_LABEL_MAVEN_INSTALLATION = 'maven_installation'; -export const TRACKING_LABEL_NPM_INSTALLATION = 'npm_installation'; -export const TRACKING_LABEL_NUGET_INSTALLATION = 'nuget_installation'; -export const TRACKING_LABEL_PYPI_INSTALLATION = 'pypi_installation'; -export const TRACKING_LABEL_COMPOSER_INSTALLATION = 'composer_installation'; - -export const TRACKING_ACTION_INSTALLATION = 'installation'; -export const TRACKING_ACTION_REGISTRY_SETUP = 'registry_setup'; +export const MAVEN_INSTALLATION_COMMAND = 'mvn install'; export const TRACKING_ACTION_COPY_CONAN_COMMAND = 'copy_conan_command'; export const TRACKING_ACTION_COPY_CONAN_SETUP_COMMAND = 'copy_conan_setup_command'; @@ -68,7 +61,6 @@ export const TRACKING_ACTION_COPY_COMPOSER_PACKAGE_INCLUDE_COMMAND = export const TRACKING_LABEL_PACKAGE_ASSET = 'package_assets'; -export const TRACKING_ACTION_DOWNLOAD_PACKAGE_ASSET = 'download_package_asset'; export const TRACKING_ACTION_EXPAND_PACKAGE_ASSET = 'expand_package_asset'; export const TRACKING_ACTION_COPY_PACKAGE_ASSET_SHA = 'copy_package_asset_sha'; @@ -119,6 +111,10 @@ export const DELETE_PACKAGE_VERSIONS_TRACKING_ACTION = 'delete_package_versions' export const REQUEST_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION = 'request_delete_package_versions'; export const CANCEL_DELETE_PACKAGE_VERSIONS_TRACKING_ACTION = 'cancel_delete_package_versions'; +export const DELETE_PACKAGE_VERSION_TRACKING_ACTION = 'delete_package_version'; +export const REQUEST_DELETE_PACKAGE_VERSION_TRACKING_ACTION = 'request_delete_package_version'; +export const CANCEL_DELETE_PACKAGE_VERSION_TRACKING_ACTION = 'cancel_delete_package_version'; + export const DELETE_PACKAGES_ERROR_MESSAGE = s__( 'PackageRegistry|Something went wrong while deleting packages.', ); @@ -127,6 +123,7 @@ export const DELETE_PACKAGES_SUCCESS_MESSAGE = s__('PackageRegistry|Packages del export const DELETE_PACKAGES_MODAL_TITLE = s__('PackageRegistry|Delete packages'); export const DELETE_PACKAGE_MODAL_PRIMARY_ACTION = s__('PackageRegistry|Permanently delete'); +export const DELETE_PACKAGE_TEXT = s__('PackageRegistry|Delete package'); export const DELETE_PACKAGE_SUCCESS_MESSAGE = s__('PackageRegistry|Package deleted successfully'); export const DELETE_PACKAGE_ERROR_MESSAGE = s__( 'PackageRegistry|Something went wrong while deleting the package.', @@ -142,8 +139,6 @@ export const PACKAGE_REGISTRY_TITLE = __('Package Registry'); export const PACKAGE_ERROR_STATUS = 'ERROR'; export const PACKAGE_DEFAULT_STATUS = 'DEFAULT'; -export const PACKAGE_HIDDEN_STATUS = 'HIDDEN'; -export const PACKAGE_PROCESSING_STATUS = 'PROCESSING'; export const NPM_PACKAGE_MANAGER = 'npm'; export const YARN_PACKAGE_MANAGER = 'yarn'; @@ -151,8 +146,6 @@ export const YARN_PACKAGE_MANAGER = 'yarn'; export const PROJECT_PACKAGE_ENDPOINT_TYPE = 'project'; export const INSTANCE_PACKAGE_ENDPOINT_TYPE = 'instance'; -export const PROJECT_RESOURCE_TYPE = 'project'; -export const GROUP_RESOURCE_TYPE = 'group'; export const GRAPHQL_PAGE_SIZE = 20; export const LIST_KEY_NAME = 'name'; diff --git a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_details.query.graphql b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_details.query.graphql index 109d535469b..b5313f929f8 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_details.query.graphql +++ b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_details.query.graphql @@ -15,6 +15,7 @@ query getPackageDetails( updatedAt status canDestroy + publicPackage npmUrl mavenUrl conanUrl diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue index 4591c2eca87..1ce2140894e 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue @@ -10,7 +10,7 @@ import { GlTabs, GlSprintf, } from '@gitlab/ui'; -import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/alert'; import { TYPENAME_PACKAGES_PACKAGE } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { numberToHumanSize } from '~/lib/utils/number_utils'; @@ -314,19 +314,19 @@ export default { modal: { packageDeletePrimaryAction: { text: s__('PackageRegistry|Permanently delete'), - attributes: [ - { variant: 'danger' }, - { category: 'primary' }, - { 'data-qa-selector': 'delete_modal_button' }, - ], + attributes: { + variant: 'danger', + category: 'primary', + 'data-qa-selector': 'delete_modal_button', + }, }, fileDeletePrimaryAction: { text: __('Delete'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, filesDeletePrimaryAction: { text: s__('PackageRegistry|Permanently delete assets'), - attributes: [{ variant: 'danger' }, { category: 'primary' }], + attributes: { variant: 'danger', category: 'primary' }, }, cancelAction: { text: __('Cancel'), diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue index 31c76c95e45..6e92a6420ac 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue @@ -1,12 +1,11 @@ <script> import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { historyReplaceState } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages_and_registries/shared/constants'; import { - PROJECT_RESOURCE_TYPE, - GROUP_RESOURCE_TYPE, GRAPHQL_PAGE_SIZE, DELETE_PACKAGE_SUCCESS_MESSAGE, EMPTY_LIST_HELP_URL, @@ -44,7 +43,7 @@ export default { return this.queryVariables; }, update(data) { - return data[this.graphqlResource].packages; + return data[this.graphqlResource]?.packages ?? {}; }, skip() { return !this.sort; @@ -64,7 +63,7 @@ export default { }; }, graphqlResource() { - return this.isGroupPage ? GROUP_RESOURCE_TYPE : PROJECT_RESOURCE_TYPE; + return this.isGroupPage ? WORKSPACE_GROUP : WORKSPACE_PROJECT; }, pageInfo() { return this.packages?.pageInfo ?? {}; diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue index 36eb65c623b..4c25c0f97de 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue +++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue @@ -72,7 +72,7 @@ export default { </script> <template> - <div> + <div data-testid="packages-and-registries-group-settings"> <gl-alert v-if="alertMessage" variant="warning" class="gl-mt-4" @dismiss="dismissAlert"> {{ alertMessage }} </gl-alert> diff --git a/app/assets/javascripts/packages_and_registries/settings/group/constants.js b/app/assets/javascripts/packages_and_registries/settings/group/constants.js index c93cd7f7d78..b47759df35f 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/constants.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/constants.js @@ -78,8 +78,4 @@ export const MAVEN_FORWARDING_FIELDS = { // Parameters -export const PACKAGES_DOCS_PATH = helpPagePath('user/packages/index'); -export const MAVEN_DUPLICATES_ALLOWED = 'mavenDuplicatesAllowed'; -export const MAVEN_DUPLICATE_EXCEPTION_REGEX = 'mavenDuplicateExceptionRegex'; - export const DEPENDENCY_PROXY_DOCS_PATH = helpPagePath('user/packages/dependency_proxy/index'); diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/container_expiration_policy_form.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/container_expiration_policy_form.vue index 11d8732426d..dd22d29d9a7 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/components/container_expiration_policy_form.vue +++ b/app/assets/javascripts/packages_and_registries/settings/project/components/container_expiration_policy_form.vue @@ -312,7 +312,7 @@ export default { > {{ __('Cancel') }} </gl-button> - <span class="gl-font-style-italic gl-text-gray-400">{{ + <span class="gl-font-style-italic gl-text-gray-500">{{ $options.i18n.EXPIRATION_POLICY_FOOTER_NOTE }}</span> </div> diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_dropdown.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_dropdown.vue index f06e3a41bd0..0bbb501011a 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_dropdown.vue +++ b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_dropdown.vue @@ -64,7 +64,7 @@ export default { </gl-form-select> </div> <template v-if="description" #description> - <span data-testid="description" class="gl-text-gray-400"> + <span data-testid="description" class="gl-text-gray-500"> {{ description }} </span> </template> diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue index 3fbbfd75ffb..749650e1060 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue +++ b/app/assets/javascripts/packages_and_registries/settings/project/components/expiration_input.vue @@ -101,7 +101,7 @@ export default { trim /> <template #description> - <span data-testid="description" class="gl-text-gray-400"> + <span data-testid="description" class="gl-text-gray-500"> <gl-sprintf :message="description"> <template #link="{ content }"> <gl-link :href="tagsRegexHelpPagePath">{{ content }}</gl-link> diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue index 2c1368262f2..4cc9cc190e8 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue +++ b/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue @@ -42,7 +42,7 @@ export default { </script> <template> - <div> + <div data-testid="packages-and-registries-project-settings"> <gl-alert v-if="showAlert" variant="success" diff --git a/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue b/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue index 7485f8282ee..1c8f80972df 100644 --- a/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue +++ b/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue @@ -125,7 +125,7 @@ export default { :select-item="selectItem" :is-selected="isSelected" :item="item" - :first="index === 0" + :first="!hiddenDelete && index === 0" ></slot> </div> diff --git a/app/assets/javascripts/pages/admin/abuse_reports/index.js b/app/assets/javascripts/pages/admin/abuse_reports/index.js index ab29f9149f7..7634f131e4d 100644 --- a/app/assets/javascripts/pages/admin/abuse_reports/index.js +++ b/app/assets/javascripts/pages/admin/abuse_reports/index.js @@ -1,3 +1,4 @@ +import { initAbuseReportsApp } from '~/admin/abuse_reports'; import initDeprecatedRemoveRowBehavior from '~/behaviors/deprecated_remove_row_behavior'; import UsersSelect from '~/users_select'; import AbuseReports from './abuse_reports'; @@ -6,3 +7,4 @@ new AbuseReports(); /* eslint-disable-line no-new */ new UsersSelect(); /* eslint-disable-line no-new */ initDeprecatedRemoveRowBehavior(); +initAbuseReportsApp(); diff --git a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue index 96477b9f476..7e6654140a9 100644 --- a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue +++ b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue @@ -207,6 +207,10 @@ export default { emailConfirmationSettingsOffHelpText: s__( 'ApplicationSettings|New users can sign up without confirming their email address.', ), + emailConfirmationSettingsSoftLabel: s__('ApplicationSettings|Soft'), + emailConfirmationSettingsSoftHelpText: s__( + 'ApplicationSettings|Send a confirmation email during sign up. New users can log in immediately, but must confirm their email within three days.', + ), emailConfirmationSettingsHardLabel: s__('ApplicationSettings|Hard'), emailConfirmationSettingsHardHelpText: s__( 'ApplicationSettings|Send a confirmation email during sign up. New users must confirm their email address before they can log in.', @@ -286,16 +290,23 @@ export default { v-model="form.emailConfirmationSetting" name="application_setting[email_confirmation_setting]" > - <gl-form-radio value="hard"> - {{ $options.i18n.emailConfirmationSettingsHardLabel }} - - <template #help> {{ $options.i18n.emailConfirmationSettingsHardHelpText }} </template> - </gl-form-radio> <gl-form-radio value="off"> {{ $options.i18n.emailConfirmationSettingsOffLabel }} <template #help> {{ $options.i18n.emailConfirmationSettingsOffHelpText }} </template> </gl-form-radio> + + <gl-form-radio value="soft"> + {{ $options.i18n.emailConfirmationSettingsSoftLabel }} + + <template #help> {{ $options.i18n.emailConfirmationSettingsSoftHelpText }} </template> + </gl-form-radio> + + <gl-form-radio value="hard"> + {{ $options.i18n.emailConfirmationSettingsHardLabel }} + + <template #help> {{ $options.i18n.emailConfirmationSettingsHardHelpText }} </template> + </gl-form-radio> </gl-form-radio-group> </gl-form-group> diff --git a/app/assets/javascripts/pages/admin/application_settings/network/index.js b/app/assets/javascripts/pages/admin/application_settings/network/index.js new file mode 100644 index 00000000000..841c68c5cd0 --- /dev/null +++ b/app/assets/javascripts/pages/admin/application_settings/network/index.js @@ -0,0 +1,3 @@ +import initNetworkOutbound from '~/admin/application_settings/network_outbound'; + +initNetworkOutbound(); diff --git a/app/assets/javascripts/pages/admin/application_settings/payload_downloader.js b/app/assets/javascripts/pages/admin/application_settings/payload_downloader.js index 97fb64f9971..54c1e37d899 100644 --- a/app/assets/javascripts/pages/admin/application_settings/payload_downloader.js +++ b/app/assets/javascripts/pages/admin/application_settings/payload_downloader.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js b/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js index 1cd19fc09a8..41862789185 100644 --- a/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js +++ b/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue index d5857294617..3bc785ee1b6 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue +++ b/app/assets/javascripts/pages/admin/jobs/index/components/cancel_jobs_modal.vue @@ -1,6 +1,6 @@ <script> import { GlModal } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { redirectTo } from '~/lib/utils/url_utility'; import { @@ -43,7 +43,7 @@ export default { }, primaryAction: { text: PRIMARY_ACTION_TEXT, - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }, cancelAction: { text: CANCEL_TEXT, diff --git a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue index 48241a213ef..3a91f8e2c55 100644 --- a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue +++ b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue @@ -72,7 +72,7 @@ export default { primaryProps() { return { text: __('Delete project'), - attributes: [{ variant: 'danger' }, { category: 'primary' }, { disabled: !this.canSubmit }], + attributes: { variant: 'danger', category: 'primary', disabled: !this.canSubmit }, }; }, }, diff --git a/app/assets/javascripts/pages/admin/runners/register/index.js b/app/assets/javascripts/pages/admin/runners/register/index.js new file mode 100644 index 00000000000..d7ee2ee369a --- /dev/null +++ b/app/assets/javascripts/pages/admin/runners/register/index.js @@ -0,0 +1,3 @@ +import { initAdminRegisterRunner } from '~/ci/runner/admin_register_runner'; + +initAdminRegisterRunner(); diff --git a/app/assets/javascripts/pages/dashboard/todos/index/todos.js b/app/assets/javascripts/pages/dashboard/todos/index/todos.js index 2fdf3c42935..f57b6144b69 100644 --- a/app/assets/javascripts/pages/dashboard/todos/index/todos.js +++ b/app/assets/javascripts/pages/dashboard/todos/index/todos.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { getGroups } from '~/api/groups_api'; import { getProjects } from '~/api/projects_api'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { addDelimiter } from '~/lib/utils/text_utility'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/pages/groups/new/components/app.vue b/app/assets/javascripts/pages/groups/new/components/app.vue index f01e5e595a3..8b68cb5f3bf 100644 --- a/app/assets/javascripts/pages/groups/new/components/app.vue +++ b/app/assets/javascripts/pages/groups/new/components/app.vue @@ -2,7 +2,7 @@ import importGroupIllustration from '@gitlab/svgs/dist/illustrations/group-import.svg'; import newGroupIllustration from '@gitlab/svgs/dist/illustrations/group-new.svg'; -import { __, s__ } from '~/locale'; +import { s__ } from '~/locale'; import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue'; import createGroupDescriptionDetails from './create_group_description_details.vue'; @@ -11,6 +11,15 @@ export default { NewNamespacePage, }, props: { + groupsUrl: { + type: String, + required: true, + }, + parentGroupUrl: { + type: String, + required: false, + default: null, + }, parentGroupName: { type: String, required: false, @@ -28,8 +37,16 @@ export default { }, }, computed: { - initialBreadcrumb() { - return this.parentGroupName || __('New group'); + initialBreadcrumbs() { + return this.parentGroupUrl + ? [ + { text: this.parentGroupName, href: this.parentGroupUrl }, + { text: s__('GroupsNew|New subgroup'), href: '#' }, + ] + : [ + { text: s__('GroupsNew|Groups'), href: this.groupsUrl }, + { text: s__('GroupsNew|New group'), href: '#' }, + ]; }, panels() { return [ @@ -68,7 +85,7 @@ export default { <template> <new-namespace-page :jump-to-last-persisted-panel="hasErrors" - :initial-breadcrumb="initialBreadcrumb" + :initial-breadcrumbs="initialBreadcrumbs" :panels="panels" :title="s__('GroupsNew|Create new group')" persistence-key="new_group_last_active_tab" diff --git a/app/assets/javascripts/pages/groups/new/group_path_validator.js b/app/assets/javascripts/pages/groups/new/group_path_validator.js index fa111032b2e..16f4f7b7f7e 100644 --- a/app/assets/javascripts/pages/groups/new/group_path_validator.js +++ b/app/assets/javascripts/pages/groups/new/group_path_validator.js @@ -1,6 +1,6 @@ import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import InputValidator from '~/validators/input_validator'; import { getGroupPathAvailability } from '~/rest_api'; diff --git a/app/assets/javascripts/pages/groups/new/index.js b/app/assets/javascripts/pages/groups/new/index.js index a555038ed5c..b16c5f3da9f 100644 --- a/app/assets/javascripts/pages/groups/new/index.js +++ b/app/assets/javascripts/pages/groups/new/index.js @@ -22,6 +22,8 @@ initFilePickers(); function initNewGroupCreation(el) { const { hasErrors, + groupsUrl, + parentGroupUrl, parentGroupName, importExistingGroupPath, verificationRequired, @@ -30,6 +32,8 @@ function initNewGroupCreation(el) { } = el.dataset; const props = { + groupsUrl, + parentGroupUrl, parentGroupName, importExistingGroupPath, hasErrors: parseBoolean(hasErrors), diff --git a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue index 3dcababb4fd..582aee3c9a3 100644 --- a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue +++ b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue @@ -10,11 +10,12 @@ import { } from '@gitlab/ui'; import { s__, __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { getBulkImportsHistory } from '~/rest_api'; import ImportStatus from '~/import_entities/components/import_status.vue'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; @@ -131,15 +132,15 @@ export default { }, getPresentationUrl(item) { - const suffix = item.entity_type === 'group' ? '/' : ''; + const suffix = item.entity_type === WORKSPACE_GROUP ? '/' : ''; return `${item.destination_full_path}${suffix}`; }, getEntityTooltip(item) { switch (item.entity_type) { - case 'project': + case WORKSPACE_PROJECT: return __('Project'); - case 'group': + case WORKSPACE_GROUP: return __('Group'); default: return ''; diff --git a/app/assets/javascripts/pages/import/history/components/import_error_details.vue b/app/assets/javascripts/pages/import/history/components/import_error_details.vue index 6af137cd722..9c26804f73d 100644 --- a/app/assets/javascripts/pages/import/history/components/import_error_details.vue +++ b/app/assets/javascripts/pages/import/history/components/import_error_details.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import API from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { DEFAULT_ERROR } from '../utils/error_messages'; export default { diff --git a/app/assets/javascripts/pages/import/history/components/import_history_app.vue b/app/assets/javascripts/pages/import/history/components/import_history_app.vue index 09b1b3a9c0f..938c2be89c5 100644 --- a/app/assets/javascripts/pages/import/history/components/import_history_app.vue +++ b/app/assets/javascripts/pages/import/history/components/import_history_app.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlEmptyState, GlIcon, GlLink, GlLoadingIcon, GlTable } from '@gitlab/ui'; import { s__, __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { getProjects } from '~/rest_api'; import ImportStatus from '~/import_entities/components/import_status.vue'; diff --git a/app/assets/javascripts/pages/profiles/index.js b/app/assets/javascripts/pages/profiles/index.js index 91b20a05196..b576aab9291 100644 --- a/app/assets/javascripts/pages/profiles/index.js +++ b/app/assets/javascripts/pages/profiles/index.js @@ -2,6 +2,7 @@ import $ from 'jquery'; import '~/profile/gl_crop'; import Profile from '~/profile/profile'; import initSearchSettings from '~/search_settings'; +import LengthValidator from '~/validators/length_validator'; import initPasswordPrompt from './password_prompt'; import { initTimezoneDropdown } from './init_timezone_dropdown'; @@ -19,6 +20,7 @@ $(document).on('input.ssh_key', '#key_key', function () { }); new Profile(); // eslint-disable-line no-new +new LengthValidator(); // eslint-disable-line no-new initSearchSettings(); initPasswordPrompt(); diff --git a/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue b/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue index 44728ea9cdf..7db94ea435e 100644 --- a/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue +++ b/app/assets/javascripts/pages/profiles/password_prompt/password_prompt_modal.vue @@ -33,7 +33,7 @@ export default { primaryProps() { return { text: I18N_PASSWORD_PROMPT_CONFIRM_BUTTON, - attributes: [{ variant: 'danger' }, { category: 'primary' }, { disabled: !this.isValid }], + attributes: { variant: 'danger', category: 'primary', disabled: !this.isValid }, }; }, }, diff --git a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js index 96c4d0e0670..ea6bca644ed 100644 --- a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js +++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js @@ -1,4 +1,5 @@ import { mount2faRegistration } from '~/authentication/mount_2fa'; +import { initWebAuthnRegistration } from '~/authentication/webauthn/registration'; import { initRecoveryCodes, initManageTwoFactorForm } from '~/authentication/two_factor_auth'; import { parseBoolean } from '~/lib/utils/common_utils'; @@ -15,6 +16,7 @@ if (skippable) { } mount2faRegistration(); +initWebAuthnRegistration(); initRecoveryCodes(); diff --git a/app/assets/javascripts/pages/projects/airflow/dags/index/index.js b/app/assets/javascripts/pages/projects/airflow/dags/index/index.js deleted file mode 100644 index 1d7cf4a5b8e..00000000000 --- a/app/assets/javascripts/pages/projects/airflow/dags/index/index.js +++ /dev/null @@ -1,27 +0,0 @@ -import Vue from 'vue'; -import AirflowDags from '~/airflow/dags/components/dags.vue'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; - -const initShowDags = () => { - const element = document.querySelector('#js-show-airflow-dags'); - if (!element) { - return null; - } - - const dags = JSON.parse(element.dataset.dags); - const pagination = convertObjectPropsToCamelCase(JSON.parse(element.dataset.pagination)); - - return new Vue({ - el: element, - render(h) { - return h(AirflowDags, { - props: { - dags, - pagination, - }, - }); - }, - }); -}; - -initShowDags(); diff --git a/app/assets/javascripts/pages/projects/blame/show/index.js b/app/assets/javascripts/pages/projects/blame/show/index.js index 1e4b9de90f2..f0fdd18c828 100644 --- a/app/assets/javascripts/pages/projects/blame/show/index.js +++ b/app/assets/javascripts/pages/projects/blame/show/index.js @@ -1,5 +1,10 @@ import initBlob from '~/pages/projects/init_blob'; import redirectToCorrectPage from '~/blame/blame_redirect'; +import { renderBlamePageStreams } from '~/blame/streaming'; -redirectToCorrectPage(); +if (new URLSearchParams(window.location.search).get('streaming')) { + renderBlamePageStreams(window.blamePageStream); +} else { + redirectToCorrectPage(); +} initBlob(); diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js index e45f9a10294..a0f391c912b 100644 --- a/app/assets/javascripts/pages/projects/blob/show/index.js +++ b/app/assets/javascripts/pages/projects/blob/show/index.js @@ -13,6 +13,9 @@ import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_sta import BlobContentViewer from '~/repository/components/blob_content_viewer.vue'; import '~/sourcegraph/load'; import createStore from '~/code_navigation/store'; +import { generateRefDestinationPath } from '~/repository/utils/ref_switcher_utils'; +import RefSelector from '~/ref/components/ref_selector.vue'; +import { visitUrl } from '~/lib/utils/url_utility'; Vue.use(Vuex); Vue.use(VueApollo); @@ -26,6 +29,33 @@ const router = new VueRouter({ mode: 'history' }); const viewBlobEl = document.querySelector('#js-view-blob-app'); +const initRefSwitcher = () => { + const refSwitcherEl = document.getElementById('js-tree-ref-switcher'); + + if (!refSwitcherEl) return false; + + const { projectId, projectRootPath, ref } = refSwitcherEl.dataset; + + return new Vue({ + el: refSwitcherEl, + render(createElement) { + return createElement(RefSelector, { + props: { + projectId, + value: ref, + }, + on: { + input(selectedRef) { + visitUrl(generateRefDestinationPath(projectRootPath, ref, selectedRef)); + }, + }, + }); + }, + }); +}; + +initRefSwitcher(); + if (viewBlobEl) { const { blobPath, projectPath, targetBranch, originalBranch } = viewBlobEl.dataset; diff --git a/app/assets/javascripts/pages/projects/boards/index.js b/app/assets/javascripts/pages/projects/boards/index.js index bde0007ec6a..23f5b083589 100644 --- a/app/assets/javascripts/pages/projects/boards/index.js +++ b/app/assets/javascripts/pages/projects/boards/index.js @@ -1,7 +1,5 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import initBoards from '~/boards'; -import UsersSelect from '~/users_select'; -new UsersSelect(); // eslint-disable-line no-new new ShortcutsNavigation(); // eslint-disable-line no-new initBoards(); diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/show/index.js index 667fd89af55..f871cd804e7 100644 --- a/app/assets/javascripts/pages/projects/commit/show/index.js +++ b/app/assets/javascripts/pages/projects/commit/show/index.js @@ -4,7 +4,7 @@ import Vue from 'vue'; import loadAwardsHandler from '~/awards_handler'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import Diff from '~/diff'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import initDeprecatedNotes from '~/init_deprecated_notes'; import { initDiffStatsDropdown } from '~/init_diff_stats_dropdown'; import axios from '~/lib/utils/axios_utils'; @@ -20,7 +20,9 @@ import { initReportAbuse } from '~/projects/report_abuse'; const hasPerfBar = document.querySelector('.with-performance-bar'); const performanceHeight = hasPerfBar ? 35 : 0; -initDiffStatsDropdown(document.querySelector('.navbar-gitlab').offsetHeight + performanceHeight); +initDiffStatsDropdown( + (document.querySelector('.navbar-gitlab')?.offsetHeight ?? 0) + performanceHeight, +); new ZenMode(); new ShortcutsNavigation(); diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue index 85fe3477d7c..2cfedd78bd8 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue @@ -12,7 +12,7 @@ import { } from '@gitlab/ui'; import { kebabCase } from 'lodash'; import { buildApiUrl } from '~/api/api_utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import csrf from '~/lib/utils/csrf'; import { redirectTo } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/pages/projects/forks/new/components/project_namespace.vue b/app/assets/javascripts/pages/projects/forks/new/components/project_namespace.vue index 5e0c5735bc0..12ddf538775 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/project_namespace.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/project_namespace.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlButtonGroup, GlCollapsibleListbox } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { MINIMUM_SEARCH_LENGTH } from '~/graphql_shared/constants'; import { s__ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue index 10bfcdc2294..b2e96471769 100644 --- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue +++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue @@ -1,5 +1,5 @@ <script> -import { GlAlert, GlButton, GlListbox, GlSprintf } from '@gitlab/ui'; +import { GlAlert, GlButton, GlCollapsibleListbox, GlSprintf } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; import { get } from 'lodash'; import { formatDate } from '~/lib/utils/datetime_utility'; @@ -12,7 +12,7 @@ export default { GlAlert, GlAreaChart, GlButton, - GlListbox, + GlCollapsibleListbox, GlSprintf, }, props: { @@ -98,7 +98,7 @@ export default { mappedCoverages() { return this.dailyCoverageData?.map((item, index) => ({ // A numerical index makes an item into a group header, so - // convert these to strings to get non-header GlListbox items + // convert these to strings to get non-header GlCollapsibleListbox items value: index.toString(), text: item.group_name, })); @@ -182,7 +182,7 @@ export default { {{ __('It seems that there is currently no available data for code coverage') }} </span> </gl-alert> - <gl-listbox + <gl-collapsible-listbox v-if="canShowData" :items="mappedCoverages" :selected="selectedCoverageIndex.toString()" diff --git a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js index 406959c80ea..f8cb8b30250 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js index af75c05b300..3ae8018714a 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/index/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js @@ -3,10 +3,9 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import { FILTERED_SEARCH } from '~/filtered_search/constants'; import { initBulkUpdateSidebar, initCsvImportExportButtons, initIssuableByEmail } from '~/issuable'; -import { ISSUABLE_INDEX } from '~/issuable/constants'; import initFilteredSearch from '~/pages/search/init_filtered_search'; -initBulkUpdateSidebar(ISSUABLE_INDEX.MERGE_REQUEST); +initBulkUpdateSidebar('merge_request_'); addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys); IssuableFilteredSearchTokenKeys.removeTokensForKeys('iteration'); diff --git a/app/assets/javascripts/pages/projects/ml/candidates/show/index.js b/app/assets/javascripts/pages/projects/ml/candidates/show/index.js index fee6258eddc..9dc85cded0e 100644 --- a/app/assets/javascripts/pages/projects/ml/candidates/show/index.js +++ b/app/assets/javascripts/pages/projects/ml/candidates/show/index.js @@ -1,4 +1,4 @@ import { initSimpleApp } from '~/helpers/init_simple_app_helper'; -import MlCandidate from '~/ml/experiment_tracking/components/ml_candidate.vue'; +import MlCandidateShow from '~/ml/experiment_tracking/routes/candidates/show'; -initSimpleApp('#js-show-ml-candidate', MlCandidate); +initSimpleApp('#js-show-ml-candidate', MlCandidateShow); diff --git a/app/assets/javascripts/pages/projects/ml/experiments/show/index.js b/app/assets/javascripts/pages/projects/ml/experiments/show/index.js index 0e64d8c17db..a90cabb3c68 100644 --- a/app/assets/javascripts/pages/projects/ml/experiments/show/index.js +++ b/app/assets/javascripts/pages/projects/ml/experiments/show/index.js @@ -1,32 +1,24 @@ import Vue from 'vue'; -import MlExperiment from '~/ml/experiment_tracking/components/ml_experiment.vue'; +import MlExperimentsShow from '~/ml/experiment_tracking/routes/experiments/show/ml_experiments_show.vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; const initShowExperiment = () => { const element = document.querySelector('#js-show-ml-experiment'); if (!element) { - return; + return undefined; } - const container = document.createElement('div'); - element.appendChild(container); + const props = { + candidates: JSON.parse(element.dataset.candidates), + metricNames: JSON.parse(element.dataset.metrics), + paramNames: JSON.parse(element.dataset.params), + pageInfo: convertObjectPropsToCamelCase(JSON.parse(element.dataset.pageInfo)), + }; - const candidates = JSON.parse(element.dataset.candidates); - const metricNames = JSON.parse(element.dataset.metrics); - const paramNames = JSON.parse(element.dataset.params); - const pageInfo = convertObjectPropsToCamelCase(JSON.parse(element.dataset.pageInfo)); - - // eslint-disable-next-line no-new - new Vue({ - el: container, - provide: { - candidates, - metricNames, - paramNames, - pageInfo, - }, + return new Vue({ + el: element, render(h) { - return h(MlExperiment); + return h(MlExperimentsShow, { props }); }, }); }; diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js index 5773737c41b..5f15a11e708 100644 --- a/app/assets/javascripts/pages/projects/project.js +++ b/app/assets/javascripts/pages/projects/project.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { setCookie } from '~/lib/utils/common_utils'; import initClonePanel from '~/clone_panel'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { serializeForm } from '~/lib/utils/forms'; import { mergeUrlParams } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js index 964c6ca9792..9ec56015405 100644 --- a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js +++ b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js @@ -6,6 +6,7 @@ import initDeployFreeze from '~/deploy_freeze'; import registrySettingsApp from '~/packages_and_registries/settings/project/registry_settings_bundle'; import { initInstallRunner } from '~/pages/shared/mount_runner_instructions'; import initSharedRunnersToggle from '~/projects/settings/mount_shared_runners_toggle'; +import initRefSwitcherBadges from '~/projects/settings/mount_ref_switcher_badges'; import initSettingsPanels from '~/settings_panels'; import { initTokenAccess } from '~/token_access'; import { initCiSecureFiles } from '~/ci_secure_files'; @@ -42,6 +43,7 @@ initArtifactsSettings(); initProjectRunners(); initSharedRunnersToggle(); +initRefSwitcherBadges(); initInstallRunner(); initTokenAccess(); initCiSecureFiles(); diff --git a/app/assets/javascripts/pages/projects/settings/repository/form.js b/app/assets/javascripts/pages/projects/settings/repository/form.js index 380091a3501..f64de693188 100644 --- a/app/assets/javascripts/pages/projects/settings/repository/form.js +++ b/app/assets/javascripts/pages/projects/settings/repository/form.js @@ -10,8 +10,8 @@ import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list'; import initSettingsPanels from '~/settings_panels'; export default () => { - new ProtectedTagCreate(); - new ProtectedTagEditList(); + new ProtectedTagCreate({ hasLicense: false }); + new ProtectedTagEditList({ hasLicense: false }); initDeployKeys(); initSettingsPanels(); new ProtectedBranchCreate({ hasLicense: false }); diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index f2bc4796324..2f29d96d85e 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -65,7 +65,7 @@ export default { releasesHelpText: s__( 'ProjectSettings|Combine git tags with release notes, release evidence, and assets to create a release.', ), - securityAndComplianceLabel: s__('ProjectSettings|Security & Compliance'), + securityAndComplianceLabel: s__('ProjectSettings|Security and Compliance'), snippetsLabel: s__('ProjectSettings|Snippets'), wikiLabel: s__('ProjectSettings|Wiki'), pucWarningLabel: s__('ProjectSettings|Warn about Potentially Unwanted Characters'), @@ -825,7 +825,7 @@ export default { </project-setting-row> <project-setting-row :label="$options.i18n.securityAndComplianceLabel" - :help-text="s__('ProjectSettings|Security & Compliance for this project')" + :help-text="s__('ProjectSettings|Security and compliance for this project.')" > <project-feature-setting v-model="securityAndComplianceAccessLevel" diff --git a/app/assets/javascripts/pages/registrations/new/index.js b/app/assets/javascripts/pages/registrations/new/index.js index eaafc0235a8..b8de2757284 100644 --- a/app/assets/javascripts/pages/registrations/new/index.js +++ b/app/assets/javascripts/pages/registrations/new/index.js @@ -1,7 +1,7 @@ import { trackNewRegistrations } from '~/google_tag_manager'; import NoEmojiValidator from '~/emoji/no_emoji_validator'; -import LengthValidator from '~/pages/sessions/new/length_validator'; +import LengthValidator from '~/validators/length_validator'; import UsernameValidator from '~/pages/sessions/new/username_validator'; import EmailFormatValidator from '~/pages/sessions/new/email_format_validator'; import { initLanguageSwitcher } from '~/language_switcher'; @@ -10,10 +10,7 @@ import Tracking from '~/tracking'; new UsernameValidator(); // eslint-disable-line no-new new LengthValidator(); // eslint-disable-line no-new new NoEmojiValidator(); // eslint-disable-line no-new - -if (gon.features.trialEmailValidation) { - new EmailFormatValidator(); // eslint-disable-line no-new -} +new EmailFormatValidator(); // eslint-disable-line no-new trackNewRegistrations(); diff --git a/app/assets/javascripts/pages/sessions/new/index.js b/app/assets/javascripts/pages/sessions/new/index.js index a84ed5f01ad..a8b4dca0845 100644 --- a/app/assets/javascripts/pages/sessions/new/index.js +++ b/app/assets/javascripts/pages/sessions/new/index.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import initVueAlerts from '~/vue_alerts'; import NoEmojiValidator from '~/emoji/no_emoji_validator'; import { initLanguageSwitcher } from '~/language_switcher'; -import LengthValidator from './length_validator'; +import LengthValidator from '~/validators/length_validator'; import OAuthRememberMe from './oauth_remember_me'; import preserveUrlFragment from './preserve_url_fragment'; import SigninTabsMemoizer from './signin_tabs_memoizer'; diff --git a/app/assets/javascripts/pages/sessions/new/username_validator.js b/app/assets/javascripts/pages/sessions/new/username_validator.js index 1848aa70cf0..664909a9012 100644 --- a/app/assets/javascripts/pages/sessions/new/username_validator.js +++ b/app/assets/javascripts/pages/sessions/new/username_validator.js @@ -1,6 +1,6 @@ import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import InputValidator from '~/validators/input_validator'; diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_content.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_content.vue index b19809aff53..8491d667213 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/wiki_content.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_content.vue @@ -1,7 +1,7 @@ <script> import { GlSkeletonLoader, GlAlert } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; import { handleLocationHash } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue index 0d2bbfbbc43..549c964cce4 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue @@ -351,6 +351,7 @@ export default { :enable-content-editor="isMarkdownFormat" :enable-preview="isMarkdownFormat" :autofocus="pageInfo.persisted" + :drawio-enabled="true" @contentEditor="notifyContentEditorActive" @markdownField="notifyContentEditorInactive" @keydown.ctrl.enter="submitFormShortcut" diff --git a/app/assets/javascripts/pages/shared/wikis/wikis.js b/app/assets/javascripts/pages/shared/wikis/wikis.js index 8d0105bc681..ec085eae199 100644 --- a/app/assets/javascripts/pages/shared/wikis/wikis.js +++ b/app/assets/javascripts/pages/shared/wikis/wikis.js @@ -16,6 +16,17 @@ export default class Wikis { sidebarToggles[i].addEventListener('click', (e) => this.handleToggleSidebar(e)); } + const listToggles = document.querySelectorAll('.js-wiki-list-toggle'); + + listToggles.forEach((listToggle) => { + listToggle.querySelector('.js-wiki-list-expand-button')?.addEventListener('click', () => { + listToggle.classList.remove('collapsed'); + }); + listToggle.querySelector('.js-wiki-list-collapse-button')?.addEventListener('click', () => { + listToggle.classList.add('collapsed'); + }); + }); + window.addEventListener('resize', () => this.renderSidebar()); this.renderSidebar(); diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js index fb761725c43..13bba06d425 100644 --- a/app/assets/javascripts/pages/users/activity_calendar.js +++ b/app/assets/javascripts/pages/users/activity_calendar.js @@ -1,7 +1,7 @@ import { select } from 'd3-selection'; import $ from 'jquery'; import { last } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import dateFormat from '~/lib/dateformat'; import axios from '~/lib/utils/axios_utils'; import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility'; @@ -58,7 +58,7 @@ export const getLevelFromContributions = (count) => { }; export default class ActivityCalendar { - constructor( + constructor({ container, activitiesContainer, timestamps, @@ -66,7 +66,8 @@ export default class ActivityCalendar { utcOffset = 0, firstDayOfWeek = firstDayOfWeekChoices.sunday, monthsAgo = 12, - ) { + onClickDay, + }) { this.calendarActivitiesPath = calendarActivitiesPath; this.clickDay = this.clickDay.bind(this); this.currentSelectedDate = ''; @@ -91,6 +92,7 @@ export default class ActivityCalendar { this.firstDayOfWeek = firstDayOfWeek; this.activitiesContainer = activitiesContainer; this.container = container; + this.onClickDay = onClickDay; // Loop through the timestamps to create a group of objects // The group of objects will be grouped based on the day of the week they are @@ -152,7 +154,8 @@ export default class ActivityCalendar { .append('svg') .attr('width', width) .attr('height', 169) - .attr('class', 'contrib-calendar'); + .attr('class', 'contrib-calendar') + .attr('data-testid', 'contrib-calendar'); } dayYPos(day) { @@ -181,6 +184,7 @@ export default class ActivityCalendar { }); return `translate(${this.daySizeWithSpace * i + 1 + this.daySizeWithSpace}, 18)`; }) + .attr('data-testid', 'user-contrib-cell-group') .selectAll('rect') .data((stamp) => stamp) .enter() @@ -192,6 +196,7 @@ export default class ActivityCalendar { .attr('data-level', (stamp) => getLevelFromContributions(stamp.count)) .attr('title', (stamp) => formatTooltipText(stamp)) .attr('class', 'user-contrib-cell has-tooltip') + .attr('data-testid', 'user-contrib-cell') .attr('data-html', true) .attr('data-container', 'body') .on('click', this.clickDay); @@ -281,6 +286,12 @@ export default class ActivityCalendar { this.currentSelectedDate.getDate(), ].join('-'); + if (this.onClickDay) { + this.onClickDay(date); + + return; + } + $(this.activitiesContainer) .empty() .append(loadingIconForLegacyJS({ size: 'lg' })); diff --git a/app/assets/javascripts/pages/users/show/index.js b/app/assets/javascripts/pages/users/show/index.js index f1b4e00c810..c213753257d 100644 --- a/app/assets/javascripts/pages/users/show/index.js +++ b/app/assets/javascripts/pages/users/show/index.js @@ -1,16 +1,7 @@ -import { s__ } from '~/locale'; -import { createAlert } from '~/flash'; +import { initProfileTabs, initUserAchievements } from '~/profile'; -if (window.gon.features?.profileTabsVue) { - import('~/profile') - .then(({ initProfileTabs }) => { - initProfileTabs(); - }) - .catch(() => { - createAlert({ - message: s__( - 'UserProfile|An error occurred loading the profile. Please refresh the page to try again.', - ), - }); - }); +if (gon.features?.profileTabsVue) { + initProfileTabs(); } + +initUserAchievements(); diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 90eafa85886..430022f9a9b 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -247,15 +247,15 @@ export default class UserTabs { $calendarWrap.find('.calendar-hint').text(calendarHint); // eslint-disable-next-line no-new - new ActivityCalendar( - '.tab-pane.active .js-contrib-calendar', - '.tab-pane.active .user-calendar-activities', - data, + new ActivityCalendar({ + container: '.tab-pane.active .js-contrib-calendar', + activitiesContainer: '.tab-pane.active .user-calendar-activities', + timestamps: data, calendarActivitiesPath, utcOffset, - gon.first_day_of_week, + firstDayOfWeek: gon.first_day_of_week, monthsAgo, - ); + }); } toggleLoading(status) { diff --git a/app/assets/javascripts/persistent_user_callout.js b/app/assets/javascripts/persistent_user_callout.js index 6ee33902a01..71dc8c3d020 100644 --- a/app/assets/javascripts/persistent_user_callout.js +++ b/app/assets/javascripts/persistent_user_callout.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from './lib/utils/axios_utils'; import { parseBoolean } from './lib/utils/common_utils'; import { __ } from './locale'; diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js index e37f63d4053..3130fe42c3c 100644 --- a/app/assets/javascripts/persistent_user_callouts.js +++ b/app/assets/javascripts/persistent_user_callouts.js @@ -22,6 +22,8 @@ const PERSISTENT_USER_CALLOUTS = [ '.js-ultimate-feature-removal-banner', '.js-geo-enable-hashed-storage-callout', '.js-geo-migrate-hashed-storage-callout', + '.js-unlimited-members-during-trial-alert', + '.js-branch-rules-info-callout', ]; const initCallouts = () => { diff --git a/app/assets/javascripts/pipeline_wizard/components/editor.vue b/app/assets/javascripts/pipeline_wizard/components/editor.vue index 0c063241173..c08d825e6af 100644 --- a/app/assets/javascripts/pipeline_wizard/components/editor.vue +++ b/app/assets/javascripts/pipeline_wizard/components/editor.vue @@ -5,6 +5,7 @@ import { CONTENT_UPDATE_DEBOUNCE } from '~/editor/constants'; import SourceEditor from '~/editor/source_editor'; import { YamlEditorExtension } from '~/editor/extensions/source_editor_yaml_ext'; import { SourceEditorExtension } from '~/editor/extensions/source_editor_extension_base'; +import { markRaw } from '~/lib/utils/vue3compat/mark_raw'; export default { name: 'YamlEditor', @@ -43,11 +44,13 @@ export default { }, }, mounted() { - this.editor = new SourceEditor().createInstance({ - el: this.$el, - blobPath: this.filename, - language: 'yaml', - }); + this.editor = markRaw( + new SourceEditor().createInstance({ + el: this.$el, + blobPath: this.filename, + language: 'yaml', + }), + ); [, this.yamlEditorExtension] = this.editor.use([ { definition: SourceEditorExtension }, { diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index 992e3d2f552..22895a31082 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -39,6 +39,9 @@ export default { confirmationModalDocLink: helpPagePath('/ci/pipelines/downstream_pipelines'), i18n: { bridgeBadgeText: __('Trigger job'), + bridgeRetryText: s__( + 'PipelineGraph|Downstream pipeline might not display in the graph while the new downstream pipeline is being created.', + ), unauthorizedTooltip: __('You are not authorized to run this manual job'), confirmationModal: { title: s__('PipelineGraph|Are you sure you want to retry %{jobName}?'), @@ -288,6 +291,10 @@ export default { }, pipelineActionRequestComplete() { this.$emit('pipelineActionRequestComplete'); + + if (this.isBridge) { + this.$toast.show(this.$options.i18n.bridgeRetryText); + } }, executePendingAction() { this.shouldTriggerActionClick = true; diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue index 605d40eddee..16f6aa5aaa4 100644 --- a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue +++ b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_app.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import { s__ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import GetFailedJobsQuery from '../../graphql/queries/get_failed_jobs.query.graphql'; import { prepareFailedJobs } from './utils'; diff --git a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue index 041b62e02ec..778f014bcd3 100644 --- a/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue +++ b/app/assets/javascripts/pipelines/components/jobs/failed_jobs_table.vue @@ -2,7 +2,7 @@ import { GlButton, GlLink, GlTableLite } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { __, s__ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { redirectTo } from '~/lib/utils/url_utility'; import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; import RetryFailedJobMutation from '../../graphql/mutations/retry_failed_job.mutation.graphql'; diff --git a/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue b/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue index f1ad312dcaa..661de43fe3c 100644 --- a/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue +++ b/app/assets/javascripts/pipelines/components/jobs/jobs_app.vue @@ -1,7 +1,7 @@ <script> import { GlIntersectionObserver, GlLoadingIcon, GlSkeletonLoader } from '@gitlab/ui'; import produce from 'immer'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import eventHub from '~/jobs/components/table/event_hub'; import JobsTable from '~/jobs/components/table/jobs_table.vue'; diff --git a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue index 7020bfc1e65..ffb6ab71b22 100644 --- a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue +++ b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue @@ -1,6 +1,6 @@ <script> import { GlTooltipDirective, GlButton, GlLoadingIcon, GlIcon } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { dasherize } from '~/lib/utils/text_utility'; diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue index ec42b738e03..936cd6f0be5 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue @@ -14,7 +14,7 @@ import { GlDropdown, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; import eventHub from '../../event_hub'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue index eb70b5fbb7a..9f38be668f2 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue @@ -42,7 +42,7 @@ export default { primaryProps() { return { text: s__('Pipeline|Stop pipeline'), - attributes: [{ variant: 'danger' }], + attributes: { variant: 'danger' }, }; }, cancelProps() { diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue index 4111823e0bb..640129b9c4c 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue @@ -1,7 +1,7 @@ <script> import { GlEmptyState, GlIcon, GlLoadingIcon, GlCollapsibleListbox } from '@gitlab/ui'; import { isEqual } from 'lodash'; -import { createAlert, VARIANT_INFO, VARIANT_WARNING } from '~/flash'; +import { createAlert, VARIANT_INFO, VARIANT_WARNING } from '~/alert'; import { getParameterByName } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; import Tracking from '~/tracking'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue index f34b3f56c5b..50d34070e61 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue @@ -1,6 +1,6 @@ <script> import { GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import { s__, __, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue index b57d0ac1fd7..81f46d5f2f9 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue @@ -2,7 +2,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui'; import { debounce } from 'lodash'; import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { FETCH_BRANCH_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants'; export default { diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue index 5846a1f6ed9..b32f5de2d7e 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue @@ -2,7 +2,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui'; import { debounce } from 'lodash'; import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { FETCH_TAG_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants'; export default { diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue index 73f7d3f52c3..a89354c671a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue @@ -8,7 +8,7 @@ import { } from '@gitlab/ui'; import { debounce } from 'lodash'; import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { ANY_TRIGGER_AUTHOR, FETCH_AUTHOR_ERROR_MESSAGE, diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue b/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue index 2d1f1945e5a..10db3e1c56b 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_case_details.vue @@ -66,7 +66,7 @@ export default { }, modalCloseButton: { text: __('Close'), - attributes: [{ variant: 'confirm' }], + attributes: { variant: 'confirm' }, }, }; </script> diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue index 1cd28e027f3..2974bd2dd37 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue @@ -100,7 +100,7 @@ export default { {{ __('Duration') }} </div> <div role="rowheader" class="table-section section-10"> - {{ __('Details'), }} + {{ __('Details') }} </div> </div> @@ -162,7 +162,7 @@ export default { </div> <div class="table-section section-10 section-wrap"> - <div role="rowheader" class="table-mobile-header">{{ __('Details'), }}</div> + <div role="rowheader" class="table-mobile-header">{{ __('Details') }}</div> <div class="table-mobile-content"> <gl-button v-gl-modal-directive="`test-case-details-${index}`">{{ __('View details') diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue b/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue index 7ab48da1a9d..2b7b2d78424 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue @@ -50,13 +50,13 @@ export default { {{ __('Failed') }} </div> <div role="rowheader" class="table-section section-10 gl-text-center"> - {{ __('Errors'), }} + {{ __('Errors') }} </div> <div role="rowheader" class="table-section section-10 gl-text-center"> - {{ __('Skipped'), }} + {{ __('Skipped') }} </div> <div role="rowheader" class="table-section section-10 gl-text-center"> - {{ __('Passed'), }} + {{ __('Passed') }} </div> <div role="rowheader" class="table-section section-10 gl-pr-5 gl-text-right"> {{ __('Total') }} diff --git a/app/assets/javascripts/pipelines/constants.js b/app/assets/javascripts/pipelines/constants.js index 820501089ed..ca146ac1e87 100644 --- a/app/assets/javascripts/pipelines/constants.js +++ b/app/assets/javascripts/pipelines/constants.js @@ -1,7 +1,6 @@ import { s__, __ } from '~/locale'; export const CANCEL_REQUEST = 'CANCEL_REQUEST'; -export const LAYOUT_CHANGE_DELAY = 300; export const FILTER_PIPELINES_SEARCH_DELAY = 200; export const ANY_TRIGGER_AUTHOR = 'Any'; export const SUPPORTED_FILTER_PARAMETERS = ['username', 'ref', 'status', 'source']; @@ -35,8 +34,6 @@ export const RAW_TEXT_WARNING = s__( export const DEFAULT = 'default'; export const DELETE_FAILURE = 'delete_pipeline_failure'; export const DRAW_FAILURE = 'draw_failure'; -export const EMPTY_PIPELINE_DATA = 'empty_data'; -export const INVALID_CI_CONFIG = 'invalid_ci_config'; export const LOAD_FAILURE = 'load_failure'; export const PARSE_FAILURE = 'parse_failure'; export const POST_FAILURE = 'post_failure'; diff --git a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js index e6770b71113..481953608e9 100644 --- a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js +++ b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js @@ -1,5 +1,5 @@ import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { helpPagePath } from '~/helpers/help_page_helper'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; import { HTTP_STATUS_UNAUTHORIZED } from '~/lib/utils/http_status'; diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index ba51347ad69..61847affa1f 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -1,5 +1,5 @@ import VueRouter from 'vue-router'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { pipelineTabName } from './constants'; import { createPipelineHeaderApp } from './pipeline_details_header'; diff --git a/app/assets/javascripts/pipelines/pipeline_tabs.js b/app/assets/javascripts/pipelines/pipeline_tabs.js index 6360ccc41bc..d94602c23b4 100644 --- a/app/assets/javascripts/pipelines/pipeline_tabs.js +++ b/app/assets/javascripts/pipelines/pipeline_tabs.js @@ -2,11 +2,13 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import Vuex from 'vuex'; import VueApollo from 'vue-apollo'; +import { GlToast } from '@gitlab/ui'; import PipelineTabs from 'ee_else_ce/pipelines/components/pipeline_tabs.vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import createTestReportsStore from './stores/test_reports'; import { getPipelineDefaultTab, reportToSentry } from './utils'; +Vue.use(GlToast); Vue.use(VueApollo); Vue.use(VueRouter); Vue.use(Vuex); diff --git a/app/assets/javascripts/pipelines/stores/test_reports/actions.js b/app/assets/javascripts/pipelines/stores/test_reports/actions.js index c77b4813e33..1b51bb804d0 100644 --- a/app/assets/javascripts/pipelines/stores/test_reports/actions.js +++ b/app/assets/javascripts/pipelines/stores/test_reports/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/pipelines/stores/test_reports/mutations.js b/app/assets/javascripts/pipelines/stores/test_reports/mutations.js index bff30acfe36..466574157f5 100644 --- a/app/assets/javascripts/pipelines/stores/test_reports/mutations.js +++ b/app/assets/javascripts/pipelines/stores/test_reports/mutations.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue index 3cb2dce87d3..c64fbc91d12 100644 --- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue +++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue @@ -38,11 +38,12 @@ export default { primaryProps() { return { text: __('Delete account'), - attributes: [ - { variant: 'danger', 'data-qa-selector': 'confirm_delete_account_button' }, - { category: 'primary' }, - { disabled: !this.canSubmit }, - ], + attributes: { + variant: 'danger', + 'data-qa-selector': 'confirm_delete_account_button', + category: 'primary', + disabled: !this.canSubmit, + }, }; }, cancelProps() { diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index 51e62984715..d96b5748abc 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -2,7 +2,7 @@ import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; import { escape } from 'lodash'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { createAlert, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_INFO } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __, s__, sprintf } from '~/locale'; @@ -60,11 +60,7 @@ Please update your Git repository remotes as soon as possible.`), primaryProps() { return { text: __('Update username'), - attributes: [ - { variant: 'confirm' }, - { category: 'primary' }, - { disabled: this.isRequestPending }, - ], + attributes: { variant: 'confirm', category: 'primary', disabled: this.isRequestPending }, }; }, cancelProps() { @@ -117,6 +113,7 @@ Please update your Git repository remotes as soon as possible.`), <input :id="$options.inputId" v-model="newUsername" + data-testid="new-username-input" :disabled="isRequestPending" class="form-control" required="required" diff --git a/app/assets/javascripts/profile/components/activity_calendar.vue b/app/assets/javascripts/profile/components/activity_calendar.vue new file mode 100644 index 00000000000..d359b478d35 --- /dev/null +++ b/app/assets/javascripts/profile/components/activity_calendar.vue @@ -0,0 +1,100 @@ +<script> +import { GlLoadingIcon, GlAlert } from '@gitlab/ui'; +import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { debounce } from 'lodash'; + +import { __ } from '~/locale'; +import AjaxCache from '~/lib/utils/ajax_cache'; +import ActivityCalendar from '~/pages/users/activity_calendar'; +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; +import { getVisibleCalendarPeriod } from '../utils'; + +export default { + i18n: { + errorAlertTitle: __('There was an error loading users activity calendar.'), + retry: __('Retry'), + calendarHint: __('Issues, merge requests, pushes, and comments.'), + }, + components: { GlLoadingIcon, GlAlert }, + inject: ['userCalendarPath', 'utcOffset'], + data() { + return { + isLoading: true, + showCalendar: true, + hasError: false, + }; + }, + mounted() { + this.renderActivityCalendar(); + window.addEventListener('resize', this.handleResize); + }, + beforeDestroy() { + window.removeEventListener('resize', this.handleResize); + }, + methods: { + async renderActivityCalendar() { + if (bp.getBreakpointSize() === 'xs') { + this.showCalendar = false; + + return; + } + + this.showCalendar = true; + this.isLoading = true; + this.hasError = false; + + try { + const data = await AjaxCache.retrieve(this.userCalendarPath); + + this.isLoading = false; + + // Wait for `calendarContainer` to render + await this.$nextTick(); + const monthsAgo = getVisibleCalendarPeriod(this.$refs.calendarContainer); + + // eslint-disable-next-line no-new + new ActivityCalendar({ + container: this.$refs.calendarSvgContainer, + timestamps: data, + utcOffset: this.utcOffset, + firstDayOfWeek: gon.first_day_of_week, + monthsAgo, + onClickDay: this.handleClickDay, + }); + } catch { + this.isLoading = false; + this.hasError = true; + } + }, + handleResize: debounce(function debouncedHandleResize() { + this.renderActivityCalendar(); + }, DEFAULT_DEBOUNCE_AND_THROTTLE_MS), + handleClickDay() { + // Render activities for specific day. + // Blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/378695 + }, + }, +}; +</script> + +<template> + <div v-if="showCalendar" ref="calendarContainer"> + <gl-loading-icon v-if="isLoading" size="md" /> + <gl-alert + v-else-if="hasError" + :title="$options.i18n.errorAlertTitle" + :dismissible="false" + variant="danger" + :primary-button-text="$options.i18n.retry" + @primaryAction="renderActivityCalendar" + /> + <div v-else class="gl-text-center"> + <div class="gl-display-inline-block gl-relative"> + <div ref="calendarSvgContainer"></div> + <p class="gl-absolute gl-right-0 gl-bottom-0 gl-mb-0 gl-font-sm"> + {{ $options.i18n.calendarHint }} + </p> + </div> + </div> + </div> +</template> diff --git a/app/assets/javascripts/profile/components/followers_tab.vue b/app/assets/javascripts/profile/components/followers_tab.vue index 47651c33eb8..5b69f835294 100644 --- a/app/assets/javascripts/profile/components/followers_tab.vue +++ b/app/assets/javascripts/profile/components/followers_tab.vue @@ -1,17 +1,24 @@ <script> -import { GlTab } from '@gitlab/ui'; +import { GlBadge, GlTab } from '@gitlab/ui'; import { s__ } from '~/locale'; export default { i18n: { title: s__('UserProfile|Followers'), }, - components: { GlTab }, + components: { + GlBadge, + GlTab, + }, + inject: ['followers'], }; </script> <template> - <gl-tab :title="$options.i18n.title"> - <!-- placeholder --> + <gl-tab> + <template #title> + <span>{{ $options.i18n.title }}</span> + <gl-badge size="sm" class="gl-ml-2">{{ followers }}</gl-badge> + </template> </gl-tab> </template> diff --git a/app/assets/javascripts/profile/components/following_tab.vue b/app/assets/javascripts/profile/components/following_tab.vue index 6d9631c5e89..d39d15a08f3 100644 --- a/app/assets/javascripts/profile/components/following_tab.vue +++ b/app/assets/javascripts/profile/components/following_tab.vue @@ -1,17 +1,24 @@ <script> -import { GlTab } from '@gitlab/ui'; +import { GlBadge, GlTab } from '@gitlab/ui'; import { s__ } from '~/locale'; export default { i18n: { title: s__('UserProfile|Following'), }, - components: { GlTab }, + components: { + GlBadge, + GlTab, + }, + inject: ['followees'], }; </script> <template> - <gl-tab :title="$options.i18n.title"> - <!-- placeholder --> + <gl-tab> + <template #title> + <span>{{ $options.i18n.title }}</span> + <gl-badge size="sm" class="gl-ml-2">{{ followees }}</gl-badge> + </template> </gl-tab> </template> diff --git a/app/assets/javascripts/profile/components/graphql/get_user_achievements.query.graphql b/app/assets/javascripts/profile/components/graphql/get_user_achievements.query.graphql new file mode 100644 index 00000000000..e60f383ad1c --- /dev/null +++ b/app/assets/javascripts/profile/components/graphql/get_user_achievements.query.graphql @@ -0,0 +1,21 @@ +query getUserAchievements($id: UserID!) { + user(id: $id) { + id + userAchievements { + nodes { + id + createdAt + achievement { + id + name + description + avatarUrl + namespace { + id + fullPath + } + } + } + } + } +} diff --git a/app/assets/javascripts/profile/components/overview_tab.vue b/app/assets/javascripts/profile/components/overview_tab.vue index e884c2d7083..76fb13919df 100644 --- a/app/assets/javascripts/profile/components/overview_tab.vue +++ b/app/assets/javascripts/profile/components/overview_tab.vue @@ -1,17 +1,18 @@ <script> import { GlTab } from '@gitlab/ui'; import { s__ } from '~/locale'; +import ActivityCalendar from './activity_calendar.vue'; export default { i18n: { title: s__('UserProfile|Overview'), }, - components: { GlTab }, + components: { GlTab, ActivityCalendar }, }; </script> <template> <gl-tab :title="$options.i18n.title"> - <!-- placeholder --> + <activity-calendar /> </gl-tab> </template> diff --git a/app/assets/javascripts/profile/components/profile_tabs.vue b/app/assets/javascripts/profile/components/profile_tabs.vue index 2425d56c52a..b39bfabb832 100644 --- a/app/assets/javascripts/profile/components/profile_tabs.vue +++ b/app/assets/javascripts/profile/components/profile_tabs.vue @@ -66,7 +66,12 @@ export default { </script> <template> - <gl-tabs> - <component :is="component" v-for="{ key, component } in $options.tabs" :key="key" /> + <gl-tabs nav-class="gl-bg-gray-10" align="center"> + <component + :is="component" + v-for="{ key, component } in $options.tabs" + :key="key" + class="container-fluid container-limited" + /> </gl-tabs> </template> diff --git a/app/assets/javascripts/profile/components/user_achievements.vue b/app/assets/javascripts/profile/components/user_achievements.vue new file mode 100644 index 00000000000..790b0e9f303 --- /dev/null +++ b/app/assets/javascripts/profile/components/user_achievements.vue @@ -0,0 +1,100 @@ +<script> +import { GlPopover, GlSprintf } from '@gitlab/ui'; +import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { s__ } from '~/locale'; +import { TYPENAME_USER } from '~/graphql_shared/constants'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; +import getUserAchievements from './graphql/get_user_achievements.query.graphql'; + +export default { + name: 'UserAchievements', + components: { GlPopover, GlSprintf }, + mixins: [timeagoMixin], + inject: ['rootUrl', 'userId'], + apollo: { + userAchievements: { + query: getUserAchievements, + variables() { + return { + id: convertToGraphQLId(TYPENAME_USER, this.userId), + }; + }, + update(data) { + return this.processNodes(data.user.userAchievements.nodes); + }, + error() { + return []; + }, + }, + }, + methods: { + processNodes(nodes) { + return nodes.slice(0, 3).map( + ({ + achievement, + createdAt, + achievement: { + namespace: { fullPath }, + }, + }) => { + return { + id: `user-achievement-${getIdFromGraphQLId(achievement.id)}`, + name: achievement.name, + timeAgo: this.timeFormatted(createdAt), + avatarUrl: achievement.avatarUrl || gon.gitlab_logo, + description: achievement.description, + namespace: { + fullPath, + webUrl: this.rootUrl + fullPath, + }, + }; + }, + ); + }, + }, + i18n: { + awardedBy: s__('Achievements|Awarded %{timeAgo} by %{namespace}'), + }, +}; +</script> + +<template> + <div class="gl-mb-3"> + <div + v-for="userAchievement in userAchievements" + :key="userAchievement.id" + class="gl-display-inline-block" + data-testid="user-achievement" + > + <img + :id="userAchievement.id" + :src="userAchievement.avatarUrl" + :alt="''" + tabindex="0" + class="gl-avatar gl-avatar-s32 gl-mx-2" + /> + <gl-popover triggers="hover focus" placement="top" :target="userAchievement.id"> + <div class="gl-font-weight-bold">{{ userAchievement.name }}</div> + <div> + <gl-sprintf :message="$options.i18n.awardedBy"> + <template #timeAgo> + <span>{{ userAchievement.timeAgo }}</span> + </template> + <template #namespace> + <a :href="userAchievement.namespace.webUrl">{{ + userAchievement.namespace.fullPath + }}</a> + </template> + </gl-sprintf> + </div> + <div + v-if="userAchievement.description" + class="gl-mt-5" + data-testid="achievement-description" + > + {{ userAchievement.description }} + </div> + </gl-popover> + </div> + </div> +</template> diff --git a/app/assets/javascripts/profile/constants.js b/app/assets/javascripts/profile/constants.js new file mode 100644 index 00000000000..e19994c6784 --- /dev/null +++ b/app/assets/javascripts/profile/constants.js @@ -0,0 +1,7 @@ +export const CALENDAR_PERIOD_6_MONTHS = 6; +export const CALENDAR_PERIOD_12_MONTHS = 12; +/* computation based on + * width = (group + 1) * this.daySizeWithSpace + this.getExtraWidthPadding(group); + * (see activity_calendar.js) + */ +export const OVERVIEW_CALENDAR_BREAKPOINT = 918; diff --git a/app/assets/javascripts/profile/index.js b/app/assets/javascripts/profile/index.js index 5378ed3d743..fbe0e3534d8 100644 --- a/app/assets/javascripts/profile/index.js +++ b/app/assets/javascripts/profile/index.js @@ -1,16 +1,52 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; + +import createDefaultClient from '~/lib/graphql'; import ProfileTabs from './components/profile_tabs.vue'; +import UserAchievements from './components/user_achievements.vue'; + +Vue.use(VueApollo); export const initProfileTabs = () => { const el = document.getElementById('js-profile-tabs'); if (!el) return false; + const { followees, followers, userCalendarPath, utcOffset } = el.dataset; + return new Vue({ el, + provide: { + followees: parseInt(followers, 10), + followers: parseInt(followees, 10), + userCalendarPath, + utcOffset, + }, render(createElement) { return createElement(ProfileTabs); }, }); }; + +export const initUserAchievements = () => { + const el = document.getElementById('js-user-achievements'); + + if (!el) return false; + + const { rootUrl, userId } = el.dataset; + + const apolloProvider = new VueApollo({ + defaultClient: createDefaultClient(), + }); + + return new Vue({ + el, + apolloProvider, + name: 'UserAchievements', + provide: { rootUrl, userId: parseInt(userId, 10) }, + render(createElement) { + return createElement(UserAchievements); + }, + }); +}; diff --git a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue index a33a20b49f6..d0d947ddd6e 100644 --- a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue +++ b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue @@ -1,6 +1,6 @@ <script> import { GlButton } from '@gitlab/ui'; -import { createAlert, VARIANT_DANGER, VARIANT_INFO } from '~/flash'; +import { createAlert, VARIANT_DANGER, VARIANT_INFO } from '~/alert'; import { INTEGRATION_VIEW_CONFIGS, i18n } from '../constants'; import IntegrationView from './integration_view.vue'; diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index c031c5e5e8e..e21f8557d68 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import Vue from 'vue'; -import { VARIANT_DANGER, VARIANT_INFO, createAlert } from '~/flash'; +import { VARIANT_DANGER, VARIANT_INFO, createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { parseBoolean } from '~/lib/utils/common_utils'; import { parseRailsFormFields } from '~/lib/utils/forms'; diff --git a/app/assets/javascripts/profile/utils.js b/app/assets/javascripts/profile/utils.js new file mode 100644 index 00000000000..5b757120544 --- /dev/null +++ b/app/assets/javascripts/profile/utils.js @@ -0,0 +1,13 @@ +import { + OVERVIEW_CALENDAR_BREAKPOINT, + CALENDAR_PERIOD_6_MONTHS, + CALENDAR_PERIOD_12_MONTHS, +} from './constants'; + +export const getVisibleCalendarPeriod = (calendarContainer) => { + const { width } = calendarContainer.getBoundingClientRect(); + + return width < OVERVIEW_CALENDAR_BREAKPOINT + ? CALENDAR_PERIOD_6_MONTHS + : CALENDAR_PERIOD_12_MONTHS; +}; diff --git a/app/assets/javascripts/projects/commit/components/branches_dropdown.vue b/app/assets/javascripts/projects/commit/components/branches_dropdown.vue index 0ed154c47dd..77e809e88ce 100644 --- a/app/assets/javascripts/projects/commit/components/branches_dropdown.vue +++ b/app/assets/javascripts/projects/commit/components/branches_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlCollapsibleListbox } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; -import { debounce } from 'lodash'; +import { debounce, uniqBy } from 'lodash'; import { I18N_NO_RESULTS_MESSAGE, I18N_BRANCH_HEADER, @@ -19,11 +19,6 @@ export default { required: false, default: '', }, - blanked: { - type: Boolean, - required: false, - default: false, - }, }, i18n: { noResultsMessage: I18N_NO_RESULTS_MESSAGE, @@ -32,26 +27,26 @@ export default { }, data() { return { - searchTerm: this.blanked ? '' : this.value, + searchTerm: '', }; }, computed: { ...mapGetters(['joinedBranches']), - ...mapState(['isFetching']), + ...mapState(['isFetching', 'branch']), listboxItems() { - return this.joinedBranches.map((value) => ({ value, text: value })); - }, - }, - watch: { - // Parent component can set the branch value (e.g. when the user selects a different project) - // and we need to keep the search term in sync with the selected value - value(val) { - this.searchTerm = val; - this.fetchBranches(this.searchTerm); + const selectedItem = { value: this.branch, text: this.branch }; + const transformedList = this.joinedBranches.map((value) => ({ value, text: value })); + + if (this.searchTerm) { + return transformedList; + } + + // Add selected item to top of list if not searching + return uniqBy([selectedItem].concat(transformedList), 'value'); }, }, mounted() { - this.fetchBranches(this.searchTerm); + this.fetchBranches(); }, methods: { ...mapActions(['fetchBranches']), @@ -70,8 +65,10 @@ export default { </script> <template> <gl-collapsible-listbox + class="gl-max-w-full" :header-text="$options.i18n.branchHeaderTitle" :toggle-text="value" + toggle-class="gl-w-full" :items="listboxItems" searchable :search-placeholder="$options.i18n.branchSearchPlaceholder" diff --git a/app/assets/javascripts/projects/commit/components/form_modal.vue b/app/assets/javascripts/projects/commit/components/form_modal.vue index f78afef1c17..28bbf67c090 100644 --- a/app/assets/javascripts/projects/commit/components/form_modal.vue +++ b/app/assets/javascripts/projects/commit/components/form_modal.vue @@ -41,11 +41,6 @@ export default { required: false, default: false, }, - isRevert: { - type: Boolean, - required: false, - default: false, - }, primaryActionEventName: { type: String, required: false, @@ -57,16 +52,16 @@ export default { checked: true, actionPrimary: { text: this.i18n.actionPrimaryText, - attributes: [ - { variant: 'confirm' }, - { category: 'primary' }, - { 'data-testid': 'submit-commit' }, - { 'data-qa-selector': 'submit_commit_button' }, - ], + attributes: { + variant: 'confirm', + category: 'primary', + 'data-testid': 'submit-commit', + 'data-qa-selector': 'submit_commit_button', + }, }, actionCancel: { text: this.i18n.actionCancelText, - attributes: [{ 'data-testid': 'cancel-commit' }], + attributes: { 'data-testid': 'cancel-commit' }, }, }; }, @@ -85,7 +80,6 @@ export default { ]), }, mounted() { - this.setSelectedProject(this.targetProjectId); eventHub.$on(this.openModal, this.show); }, methods: { @@ -141,7 +135,7 @@ export default { :value="targetProjectId" /> - <projects-dropdown :value="targetProjectName" @selectProject="setSelectedProject" /> + <projects-dropdown :value="targetProjectName" @input="setSelectedProject" /> </gl-form-group> <gl-form-group @@ -151,7 +145,7 @@ export default { > <input id="start_branch" type="hidden" name="start_branch" :value="branch" /> - <branches-dropdown :value="branch" :blanked="isRevert" @input="setBranch" /> + <branches-dropdown :value="branch" @input="setBranch" /> </gl-form-group> <gl-form-checkbox diff --git a/app/assets/javascripts/projects/commit/components/projects_dropdown.vue b/app/assets/javascripts/projects/commit/components/projects_dropdown.vue index d43f5b99e2c..fe54b62e2c8 100644 --- a/app/assets/javascripts/projects/commit/components/projects_dropdown.vue +++ b/app/assets/javascripts/projects/commit/components/projects_dropdown.vue @@ -1,6 +1,7 @@ <script> import { GlCollapsibleListbox } from '@gitlab/ui'; import { mapGetters, mapState } from 'vuex'; +import { debounce, uniqBy } from 'lodash'; import { I18N_NO_RESULTS_MESSAGE, I18N_PROJECT_HEADER, @@ -26,7 +27,7 @@ export default { }, data() { return { - filterTerm: this.value, + filterTerm: '', }; }, computed: { @@ -39,7 +40,18 @@ export default { ); }, listboxItems() { - return this.filteredResults.map(({ id, name }) => ({ value: id, text: name })); + const selectedItem = { value: this.selectedProject.id, text: this.selectedProject.name }; + const transformedList = this.filteredResults.map(({ id, name }) => ({ + value: id, + text: name, + })); + + if (this.filterTerm) { + return transformedList; + } + + // Add selected item to top of list if not searching + return uniqBy([selectedItem].concat(transformedList), 'value'); }, selectedProject() { return this.sortedProjects.find((project) => project.id === this.targetProjectId) || {}; @@ -47,28 +59,26 @@ export default { }, methods: { selectProject(value) { - this.$emit('selectProject', value); - - // when we select a project, we want the dropdown to filter to the selected project - const project = this.listboxItems.find((x) => x.value === value); - this.filterTerm = project?.text || ''; - }, - filterTermChanged(value) { - this.filterTerm = value; + this.$emit('input', value); }, + debouncedSearch: debounce(function debouncedSearch(value) { + this.filterTerm = value.trim(); + }, 250), }, }; </script> <template> <gl-collapsible-listbox + class="gl-max-w-full" :header-text="$options.i18n.projectHeaderTitle" :items="listboxItems" searchable :search-placeholder="$options.i18n.projectSearchPlaceholder" :selected="selectedProject.id" :toggle-text="selectedProject.name" + toggle-class="gl-w-full" :no-results-text="$options.i18n.noResultsMessage" - @search="filterTermChanged" + @search="debouncedSearch" @select="selectProject" /> </template> diff --git a/app/assets/javascripts/projects/commit/init_revert_commit_modal.js b/app/assets/javascripts/projects/commit/init_revert_commit_modal.js index 41be71932e5..849b2f4858c 100644 --- a/app/assets/javascripts/projects/commit/init_revert_commit_modal.js +++ b/app/assets/javascripts/projects/commit/init_revert_commit_modal.js @@ -49,7 +49,6 @@ export default function initInviteMembersModal(primaryActionEventName) { i18n: { ...I18N_REVERT_MODAL, ...I18N_MODAL }, openModal: OPEN_REVERT_MODAL, modalId: REVERT_MODAL_ID, - isRevert: true, primaryActionEventName, }, }), diff --git a/app/assets/javascripts/projects/commit/store/actions.js b/app/assets/javascripts/projects/commit/store/actions.js index cfff93eac5a..501006a8be5 100644 --- a/app/assets/javascripts/projects/commit/store/actions.js +++ b/app/assets/javascripts/projects/commit/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { PROJECT_BRANCHES_ERROR } from '../constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue index dafc4bc5abf..54d13ecc9c8 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue @@ -1,6 +1,6 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { getQueryHeaders, diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue index 62b1209131c..71f53613a3b 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon, GlLink } from '@gitlab/ui'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getQueryHeaders, toggleQueryPollingByVisibility, diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js index 9365066418b..5175f7f9151 100644 --- a/app/assets/javascripts/projects/commits/store/actions.js +++ b/app/assets/javascripts/projects/commits/store/actions.js @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/browser'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue index 10531e950f9..8af1667e26b 100644 --- a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue +++ b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlDropdownSectionHeader } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; @@ -149,6 +149,7 @@ export default { :key="branch" is-check-item :is-checked="selectedRevision === branch" + data-testid="branches-dropdown-item" @click="onClick(branch)" > {{ branch }} @@ -161,6 +162,7 @@ export default { :key="tag" is-check-item :is-checked="selectedRevision === tag" + data-testid="tags-dropdown-item" @click="onClick(tag)" > {{ tag }} diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue index 1e1677e947c..034bae3066d 100644 --- a/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue +++ b/app/assets/javascripts/projects/compare/components/revision_dropdown_legacy.vue @@ -1,6 +1,6 @@ <script> import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlDropdownSectionHeader } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; @@ -132,6 +132,7 @@ export default { :key="`branch${index}`" is-check-item :is-checked="selectedRevision === branch" + data-testid="branches-dropdown-item" @click="onClick(branch)" > {{ branch }} @@ -144,6 +145,7 @@ export default { :key="`tag${index}`" is-check-item :is-checked="selectedRevision === tag" + data-testid="tags-dropdown-item" @click="onClick(tag)" > {{ tag }} diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue index 64a16b462f5..06c0230c8e0 100644 --- a/app/assets/javascripts/projects/components/shared/delete_button.vue +++ b/app/assets/javascripts/projects/components/shared/delete_button.vue @@ -62,11 +62,11 @@ export default { return { primary: { text: __('Yes, delete project'), - attributes: [ - { variant: 'danger' }, - { disabled: this.confirmDisabled }, - { 'data-qa-selector': 'confirm_delete_button' }, - ], + attributes: { + variant: 'danger', + disabled: this.confirmDisabled, + 'data-qa-selector': 'confirm_delete_button', + }, }, cancel: { text: __('Cancel, keep project'), diff --git a/app/assets/javascripts/projects/new/components/app.vue b/app/assets/javascripts/projects/new/components/app.vue index 3100029eb31..1599661505f 100644 --- a/app/assets/javascripts/projects/new/components/app.vue +++ b/app/assets/javascripts/projects/new/components/app.vue @@ -59,6 +59,20 @@ export default { SafeHtml, }, props: { + projectsUrl: { + type: String, + required: true, + }, + parentGroupUrl: { + type: String, + required: false, + default: null, + }, + parentGroupName: { + type: String, + required: false, + default: '', + }, hasErrors: { type: Boolean, required: false, @@ -77,6 +91,14 @@ export default { }, computed: { + initialBreadcrumbs() { + return [ + this.parentGroupUrl + ? { text: this.parentGroupName, href: this.parentGroupUrl } + : { text: s__('ProjectsNew|Projects'), href: this.projectsUrl }, + { text: s__('ProjectsNew|New project'), href: '#' }, + ]; + }, availablePanels() { return this.isCiCdAvailable ? PANELS : PANELS.filter((p) => p.name !== CI_CD_PANEL); }, @@ -95,7 +117,7 @@ export default { <template> <new-namespace-page - :initial-breadcrumb="__('New project')" + :initial-breadcrumbs="initialBreadcrumbs" :panels="availablePanels" :jump-to-last-persisted-panel="hasErrors" :title="s__('ProjectsNew|Create new project')" diff --git a/app/assets/javascripts/projects/new/index.js b/app/assets/javascripts/projects/new/index.js index 910244c657b..7330874eefe 100644 --- a/app/assets/javascripts/projects/new/index.js +++ b/app/assets/javascripts/projects/new/index.js @@ -15,12 +15,18 @@ export function initNewProjectCreation() { newProjectGuidelines, hasErrors, isCiCdAvailable, + parentGroupUrl, + parentGroupName, + projectsUrl, } = el.dataset; const props = { hasErrors: parseBoolean(hasErrors), isCiCdAvailable: parseBoolean(isCiCdAvailable), newProjectGuidelines, + parentGroupUrl, + parentGroupName, + projectsUrl, }; const provide = { diff --git a/app/assets/javascripts/projects/project_find_file.js b/app/assets/javascripts/projects/project_find_file.js index 71329c4f461..a8b884a68a0 100644 --- a/app/assets/javascripts/projects/project_find_file.js +++ b/app/assets/javascripts/projects/project_find_file.js @@ -2,7 +2,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus'; import $ from 'jquery'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { sanitize } from '~/lib/dompurify'; import axios from '~/lib/utils/axios_utils'; import { spriteIcon } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index dcf7415a444..71c9e580420 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle, class-methods-use-this */ import { escape, find, countBy } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { n__, s__, __, sprintf } from '~/locale'; import { getUsers, getGroups, getDeployKeys } from './api/access_dropdown_api'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants'; @@ -469,6 +469,14 @@ export default class AccessDropdown { } } + if (this.accessLevel === ACCESS_LEVELS.CREATE && deployKeys.length) { + consolidatedData = consolidatedData.concat( + [{ type: 'divider' }], + [{ type: 'header', content: s__('AccessDropdown|Deploy Keys') }], + deployKeys, + ); + } + return consolidatedData; } @@ -506,7 +514,10 @@ export default class AccessDropdown { break; case LEVEL_TYPES.DEPLOY_KEY: groupRowEl = - this.accessLevel === ACCESS_LEVELS.PUSH ? this.deployKeyRowHtml(item, isActive) : ''; + this.accessLevel === ACCESS_LEVELS.PUSH || this.accessLevel === ACCESS_LEVELS.CREATE + ? this.deployKeyRowHtml(item, isActive) + : ''; + break; case LEVEL_TYPES.GROUP: groupRowEl = this.groupRowHtml(item, isActive); diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue index f2b1c749abc..3dcacf9eb34 100644 --- a/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue +++ b/app/assets/javascripts/projects/settings/branch_rules/components/edit/branch_dropdown.vue @@ -7,7 +7,7 @@ import { GlSprintf, GlLink, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__, sprintf } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; import branchesQuery from '../../queries/branches.query.graphql'; diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js b/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js index a98c2439cde..b71c33d2b91 100644 --- a/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js +++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/constants.js @@ -14,11 +14,6 @@ export const I18N = { wildcardsHelpText: s__( 'BranchRules|%{linkStart}Wildcards%{linkEnd} such as *-stable or production/ are supported', ), - forcePushTitle: s__('BranchRules|Force push'), - allowForcePushDescription: s__( - 'BranchRules|All users with push access are allowed to force push.', - ), - disallowForcePushDescription: s__('BranchRules|Force push is not allowed.'), approvalsTitle: s__('BranchRules|Approvals'), manageApprovalsLinkTitle: s__('BranchRules|Manage in merge request approvals'), approvalsDescription: s__( @@ -33,6 +28,19 @@ export const I18N = { allowedToPushHeader: s__('BranchRules|Allowed to push and merge (%{total})'), allowedToMergeHeader: s__('BranchRules|Allowed to merge (%{total})'), approvalsHeader: s__('BranchRules|Required approvals (%{total})'), + allowForcePushTitle: s__('BranchRules|Allows force push'), + doesNotAllowForcePushTitle: s__('BranchRules|Does not allow force push'), + forcePushDescription: s__('BranchRules|From users with push access.'), + requiresCodeOwnerApprovalTitle: s__('BranchRules|Requires approval from code owners'), + doesNotRequireCodeOwnerApprovalTitle: s__( + 'BranchRules|Does not require approval from code owners', + ), + requiresCodeOwnerApprovalDescription: s__( + 'BranchRules|Also rejects code pushes that change files listed in CODEOWNERS file.', + ), + doesNotRequireCodeOwnerApprovalDescription: s__( + 'BranchRules|Also accepts code pushes that change files listed in CODEOWNERS file.', + ), noData: s__('BranchRules|No data to display'), }; @@ -48,3 +56,9 @@ export const PROTECTED_BRANCHES_HELP_PATH = 'user/project/protected_branches'; export const APPROVALS_HELP_PATH = 'user/project/merge_requests/approvals/index.md'; export const STATUS_CHECKS_HELP_PATH = 'user/project/merge_requests/status_checks.md'; + +export const REQUIRED_ICON = 'check-circle-filled'; +export const NOT_REQUIRED_ICON = 'status-failed'; + +export const REQUIRED_ICON_CLASS = 'gl-fill-green-500'; +export const NOT_REQUIRED_ICON_CLASS = 'gl-text-red-500'; 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 740868e1d75..b0abe7ac463 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 @@ -1,5 +1,5 @@ <script> -import { GlSprintf, GlLink, GlLoadingIcon } from '@gitlab/ui'; +import { GlSprintf, GlLink, GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { sprintf, n__ } from '~/locale'; import { getParameterByName, mergeUrlParams } from '~/lib/utils/url_utility'; import { helpPagePath } from '~/helpers/help_page_helper'; @@ -12,6 +12,10 @@ import { BRANCH_PARAM_NAME, WILDCARDS_HELP_PATH, PROTECTED_BRANCHES_HELP_PATH, + REQUIRED_ICON, + NOT_REQUIRED_ICON, + REQUIRED_ICON_CLASS, + NOT_REQUIRED_ICON_CLASS, } from './constants'; const wildcardsHelpDocLink = helpPagePath(WILDCARDS_HELP_PATH); @@ -22,7 +26,7 @@ export default { i18n: I18N, wildcardsHelpDocLink, protectedBranchesHelpDocLink, - components: { Protection, GlSprintf, GlLink, GlLoadingIcon }, + components: { Protection, GlSprintf, GlLink, GlLoadingIcon, GlIcon }, inject: { projectPath: { default: '', @@ -33,6 +37,9 @@ export default { branchesPath: { default: '', }, + showStatusChecks: { default: false }, + showApprovers: { default: false }, + showCodeOwners: { default: false }, }, apollo: { project: { @@ -63,10 +70,28 @@ export default { }; }, computed: { - forcePushDescription() { - return this.branchProtection?.allowForcePush - ? this.$options.i18n.allowForcePushDescription - : this.$options.i18n.disallowForcePushDescription; + forcePushAttributes() { + const { allowForcePush } = this.branchProtection || {}; + const icon = allowForcePush ? REQUIRED_ICON : NOT_REQUIRED_ICON; + const iconClass = allowForcePush ? REQUIRED_ICON_CLASS : NOT_REQUIRED_ICON_CLASS; + const title = allowForcePush + ? this.$options.i18n.allowForcePushTitle + : this.$options.i18n.doesNotAllowForcePushTitle; + + return { icon, iconClass, title }; + }, + codeOwnersApprovalAttributes() { + const { codeOwnerApprovalRequired } = this.branchProtection || {}; + const icon = codeOwnerApprovalRequired ? REQUIRED_ICON : NOT_REQUIRED_ICON; + const iconClass = codeOwnerApprovalRequired ? REQUIRED_ICON_CLASS : NOT_REQUIRED_ICON_CLASS; + const title = codeOwnerApprovalRequired + ? this.$options.i18n.requiresCodeOwnerApprovalTitle + : this.$options.i18n.doesNotRequireCodeOwnerApprovalTitle; + const description = codeOwnerApprovalRequired + ? this.$options.i18n.requiresCodeOwnerApprovalDescription + : this.$options.i18n.doesNotRequireCodeOwnerApprovalDescription; + + return { icon, iconClass, title, description }; }, mergeAccessLevels() { const { mergeAccessLevels } = this.branchProtection || {}; @@ -98,7 +123,7 @@ export default { : this.$options.i18n.branchNameOrPattern; }, matchingBranchesLinkHref() { - return mergeUrlParams({ state: 'all', search: this.branch }, this.branchesPath); + return mergeUrlParams({ state: 'all', search: `^${this.branch}$` }, this.branchesPath); }, matchingBranchesLinkTitle() { const total = this.matchingBranchesCount; @@ -164,10 +189,6 @@ export default { :groups="pushAccessLevels.groups" /> - <!-- Force push --> - <strong>{{ $options.i18n.forcePushTitle }}</strong> - <p>{{ forcePushDescription }}</p> - <!-- Allowed to merge --> <protection :header="allowedToMergeHeader" @@ -178,9 +199,37 @@ export default { :groups="mergeAccessLevels.groups" /> + <!-- Force push --> + <div class="gl-display-flex gl-align-items-center"> + <gl-icon + :size="14" + data-testid="force-push-icon" + :name="forcePushAttributes.icon" + :class="forcePushAttributes.iconClass" + /> + <strong class="gl-ml-2">{{ forcePushAttributes.title }}</strong> + </div> + + <div class="gl-text-gray-400 gl-mb-2">{{ $options.i18n.forcePushDescription }}</div> + <!-- EE start --> + <!-- Code Owners --> + <div v-if="showCodeOwners"> + <div class="gl-display-flex gl-align-items-center"> + <gl-icon + data-testid="code-owners-icon" + :size="14" + :name="codeOwnersApprovalAttributes.icon" + :class="codeOwnersApprovalAttributes.iconClass" + /> + <strong class="gl-ml-2">{{ codeOwnersApprovalAttributes.title }}</strong> + </div> + + <div class="gl-text-gray-400">{{ codeOwnersApprovalAttributes.description }}</div> + </div> + <!-- Approvals --> - <template v-if="approvalsHeader"> + <template v-if="showApprovers"> <h4 class="gl-mb-1 gl-mt-5">{{ $options.i18n.approvalsTitle }}</h4> <gl-sprintf :message="$options.i18n.approvalsDescription"> <template #link="{ content }"> @@ -200,7 +249,7 @@ export default { </template> <!-- Status checks --> - <template v-if="statusChecksHeader"> + <template v-if="showStatusChecks"> <h4 class="gl-mb-1 gl-mt-5">{{ $options.i18n.statusChecksTitle }}</h4> <gl-sprintf :message="$options.i18n.statusChecksDescription"> <template #link="{ content }"> diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue index 9bff2f5506c..721248e53e3 100644 --- a/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue +++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/protection_row.vue @@ -101,12 +101,7 @@ export default { <div v-if="statusCheckUrl" class="gl-ml-7 gl-flex-grow-1">{{ statusCheckUrl }}</div> - <div - v-for="(item, index) in accessLevels" - :key="index" - data-testid="access-level" - class="gl-w-quarter" - > + <div v-for="(item, index) in accessLevels" :key="index" data-testid="access-level"> <span v-if="commaSeparateList && index > 0" data-testid="comma-separator">,</span> {{ item.accessLevelDescription }} </div> diff --git a/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js b/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js index 081d6cec958..c429c352bfa 100644 --- a/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js +++ b/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js @@ -1,6 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; +import { parseBoolean } from '~/lib/utils/common_utils'; import View from 'ee_else_ce/projects/settings/branch_rules/components/view/index.vue'; export default function mountBranchRules(el) { @@ -20,6 +21,9 @@ export default function mountBranchRules(el) { approvalRulesPath, statusChecksPath, branchesPath, + showStatusChecks, + showApprovers, + showCodeOwners, } = el.dataset; return new Vue({ @@ -31,6 +35,9 @@ export default function mountBranchRules(el) { approvalRulesPath, statusChecksPath, branchesPath, + showStatusChecks: parseBoolean(showStatusChecks), + showApprovers: parseBoolean(showApprovers), + showCodeOwners: parseBoolean(showCodeOwners), }, render(h) { return h(View); diff --git a/app/assets/javascripts/projects/settings/components/access_dropdown.vue b/app/assets/javascripts/projects/settings/components/access_dropdown.vue index cc47496971d..08a1c586f69 100644 --- a/app/assets/javascripts/projects/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/projects/settings/components/access_dropdown.vue @@ -9,7 +9,7 @@ import { GlSprintf, } from '@gitlab/ui'; import { debounce, intersectionWith, groupBy, differenceBy, intersectionBy } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__, n__ } from '~/locale'; import { getUsers, getGroups, getDeployKeys } from '../api/access_dropdown_api'; import { LEVEL_TYPES, ACCESS_LEVELS } from '../constants'; @@ -86,7 +86,10 @@ export default { return groupBy(this.preselectedItems, 'type'); }, showDeployKeys() { - return this.accessLevel === ACCESS_LEVELS.PUSH && this.deployKeys.length; + return ( + (this.accessLevel === ACCESS_LEVELS.PUSH || this.accessLevel === ACCESS_LEVELS.CREATE) && + this.deployKeys.length + ); }, toggleLabel() { const counts = Object.entries(this.selected).reduce((acc, [key, value]) => { diff --git a/app/assets/javascripts/projects/settings/constants.js b/app/assets/javascripts/projects/settings/constants.js index 9cf1afd334f..595cbc9c991 100644 --- a/app/assets/javascripts/projects/settings/constants.js +++ b/app/assets/javascripts/projects/settings/constants.js @@ -17,6 +17,7 @@ export const LEVEL_ID_PROP = { export const ACCESS_LEVELS = { MERGE: 'merge_access_levels', PUSH: 'push_access_levels', + CREATE: 'create_access_levels', }; export const ACCESS_LEVEL_NONE = 0; diff --git a/app/assets/javascripts/projects/settings/mount_ref_switcher_badges.js b/app/assets/javascripts/projects/settings/mount_ref_switcher_badges.js new file mode 100644 index 00000000000..527678250fb --- /dev/null +++ b/app/assets/javascripts/projects/settings/mount_ref_switcher_badges.js @@ -0,0 +1,31 @@ +import Vue from 'vue'; +import RefSelector from '~/ref/components/ref_selector.vue'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { generateRefDestinationPath } from './utils'; + +export default function initRefSwitcherBadges() { + const refSwitcherElements = document.getElementsByClassName('js-ref-switcher-badge'); + + if (refSwitcherElements.length === 0) return false; + + return Array.from(refSwitcherElements).forEach((element) => { + const { projectId, ref } = element.dataset; + + return new Vue({ + el: element, + render(createElement) { + return createElement(RefSelector, { + props: { + projectId, + value: ref, + }, + on: { + input(selectedRef) { + visitUrl(generateRefDestinationPath(selectedRef)); + }, + }, + }); + }, + }); + }); +} diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue index f3d392a0ec4..7709419b6f8 100644 --- a/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue +++ b/app/assets/javascripts/projects/settings/repository/branch_rules/app.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import branchRulesQuery from 'ee_else_ce/projects/settings/repository/branch_rules/graphql/queries/branch_rules.query.graphql'; import { expandSection } from '~/settings_panels'; import { scrollToElement } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue index fa96eee5f92..b565bda247d 100644 --- a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue +++ b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue @@ -27,6 +27,9 @@ export default { branchRulesPath: { default: '', }, + showCodeOwners: { default: false }, + showStatusChecks: { default: false }, + showApprovers: { default: false }, }, props: { name: { @@ -70,7 +73,7 @@ export default { return this.approvalDetails.length; }, detailsPath() { - return `${this.branchRulesPath}?branch=${this.name}`; + return `${this.branchRulesPath}?branch=${encodeURIComponent(this.name)}`; }, statusChecksText() { return sprintf(this.$options.i18n.statusChecks, { @@ -112,13 +115,13 @@ export default { if (this.branchProtection?.allowForcePush) { approvalDetails.push(this.$options.i18n.allowForcePush); } - if (this.branchProtection?.codeOwnerApprovalRequired) { + if (this.showCodeOwners && this.branchProtection?.codeOwnerApprovalRequired) { approvalDetails.push(this.$options.i18n.codeOwnerApprovalRequired); } - if (this.statusChecksTotal) { + if (this.showStatusChecks && this.statusChecksTotal) { approvalDetails.push(this.statusChecksText); } - if (this.approvalRulesTotal) { + if (this.showApprovers && this.approvalRulesTotal) { approvalDetails.push(this.approvalRulesText); } if (this.mergeAccessLevels.total > 0) { diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js b/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js index 042be089e09..a8736c87e22 100644 --- a/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js +++ b/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import BranchRulesApp from '~/projects/settings/repository/branch_rules/app.vue'; +import { parseBoolean } from '~/lib/utils/common_utils'; Vue.use(VueApollo); @@ -12,7 +13,13 @@ const apolloProvider = new VueApollo({ export default function mountBranchRules(el) { if (!el) return null; - const { projectPath, branchRulesPath } = el.dataset; + const { + projectPath, + branchRulesPath, + showCodeOwners, + showStatusChecks, + showApprovers, + } = el.dataset; return new Vue({ el, @@ -20,6 +27,9 @@ export default function mountBranchRules(el) { provide: { projectPath, branchRulesPath, + showCodeOwners: parseBoolean(showCodeOwners), + showStatusChecks: parseBoolean(showStatusChecks), + showApprovers: parseBoolean(showApprovers), }, render(createElement) { return createElement(BranchRulesApp); diff --git a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue index 3d553e71f71..47477d39b8a 100644 --- a/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue +++ b/app/assets/javascripts/projects/settings/topics/components/topics_token_selector.vue @@ -1,5 +1,6 @@ <script> -import { GlTokenSelector, GlAvatarLabeled } from '@gitlab/ui'; +import { GlTokenSelector, GlAvatarLabeled, GlFormGroup, GlLink, GlSprintf } from '@gitlab/ui'; +import { helpPagePath } from '~/helpers/help_page_helper'; import { s__ } from '~/locale'; import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants'; import searchProjectTopics from '~/graphql_shared/queries/project_topics_search.query.graphql'; @@ -8,8 +9,15 @@ export default { components: { GlTokenSelector, GlAvatarLabeled, + GlFormGroup, + GlLink, + GlSprintf, }, i18n: { + topicsTitle: s__('ProjectSettings|Topics'), + topicsHelpText: s__( + 'ProjectSettings|Topics are publicly visible even on private projects. Do not include sensitive information in topic names. %{linkStart}Learn more%{linkEnd}.', + ), placeholder: s__('ProjectSettings|Search for topic'), }, props: { @@ -51,6 +59,11 @@ export default { placeholderText() { return this.selectedTokens.length ? '' : this.$options.i18n.placeholder; }, + topicsHelpUrl() { + return helpPagePath('user/admin_area/index.html', { + anchor: 'administering-topics', + }); + }, }, methods: { handleEnter(event) { @@ -70,25 +83,34 @@ export default { }; </script> <template> - <gl-token-selector - ref="tokenSelector" - v-model="selectedTokens" - :dropdown-items="topics" - :loading="loading" - allow-user-defined-tokens - :placeholder="placeholderText" - @keydown.enter="handleEnter" - @text-input="filterTopics" - @input="onTokensUpdate" - > - <template #dropdown-item-content="{ dropdownItem }"> - <gl-avatar-labeled - :src="dropdownItem.avatarUrl" - :entity-name="dropdownItem.name" - :label="dropdownItem.title" - :size="32" - :shape="$options.AVATAR_SHAPE_OPTION_RECT" - /> + <gl-form-group id="project_topics" :label="$options.i18n.topicsTitle"> + <gl-token-selector + ref="tokenSelector" + v-model="selectedTokens" + :dropdown-items="topics" + :loading="loading" + allow-user-defined-tokens + :placeholder="placeholderText" + @keydown.enter="handleEnter" + @text-input="filterTopics" + @input="onTokensUpdate" + > + <template #dropdown-item-content="{ dropdownItem }"> + <gl-avatar-labeled + :src="dropdownItem.avatarUrl" + :entity-name="dropdownItem.name" + :label="dropdownItem.title" + :size="32" + :shape="$options.AVATAR_SHAPE_OPTION_RECT" + /> + </template> + </gl-token-selector> + <template #description> + <gl-sprintf :message="$options.i18n.topicsHelpText"> + <template #link="{ content }"> + <gl-link :href="topicsHelpUrl" target="_blank">{{ content }}</gl-link> + </template> + </gl-sprintf> </template> - </gl-token-selector> + </gl-form-group> </template> diff --git a/app/assets/javascripts/projects/settings/utils.js b/app/assets/javascripts/projects/settings/utils.js index ea4574119c0..9c19657bb39 100644 --- a/app/assets/javascripts/projects/settings/utils.js +++ b/app/assets/javascripts/projects/settings/utils.js @@ -1,3 +1,24 @@ +import { joinPaths } from '~/lib/utils/url_utility'; + +export const generateRefDestinationPath = (selectedRef) => { + const namespace = '-/settings/ci_cd'; + const { pathname } = window.location; + + if (!selectedRef || !pathname.includes(namespace)) { + return window.location.href; + } + + const [projectRootPath] = pathname.split(namespace); + + const destinationPath = joinPaths(projectRootPath, namespace); + + const newURL = new URL(window.location); + newURL.pathname = destinationPath; + newURL.searchParams.set('ref', selectedRef); + + return newURL.href; +}; + export const getAccessLevels = (accessLevels = {}) => { const total = accessLevels.edges?.length; const accessLevelTypes = { total, users: [], groups: [], roles: [] }; diff --git a/app/assets/javascripts/projects/star.js b/app/assets/javascripts/projects/star.js index 55c3d68cd11..f294811dfff 100644 --- a/app/assets/javascripts/projects/star.js +++ b/app/assets/javascripts/projects/star.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { spriteIcon } from '~/lib/utils/common_utils'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue index 9f9b6424125..5b620aa2300 100644 --- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue +++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import Visibility from 'visibilityjs'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import Poll from '~/lib/utils/poll'; import { __, s__, sprintf } from '~/locale'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; diff --git a/app/assets/javascripts/protected_branches/constants.js b/app/assets/javascripts/protected_branches/constants.js index ae5eaa8e622..b5d00cb7e82 100644 --- a/app/assets/javascripts/protected_branches/constants.js +++ b/app/assets/javascripts/protected_branches/constants.js @@ -9,12 +9,3 @@ export const LEVEL_TYPES = { GROUP: 'group', DEPLOY_KEY: 'deploy_key', }; - -export const LEVEL_ID_PROP = { - ROLE: 'access_level', - USER: 'user_id', - GROUP: 'group_id', - DEPLOY_KEY: 'deploy_key_id', -}; - -export const ACCESS_LEVEL_NONE = 0; diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js index 120f75d4f0c..cd37c0de6a5 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_create.js +++ b/app/assets/javascripts/protected_branches/protected_branch_create.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import CreateItemDropdown from '~/create_item_dropdown'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import AccessorUtilities from '~/lib/utils/accessor'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js index 1693d869b54..b6c86750723 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_edit.js +++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js @@ -1,5 +1,5 @@ import { find } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import AccessDropdown from '~/projects/settings/access_dropdown'; diff --git a/app/assets/javascripts/protected_tags/constants.js b/app/assets/javascripts/protected_tags/constants.js index 3e71ba62877..758b820c4c4 100644 --- a/app/assets/javascripts/protected_tags/constants.js +++ b/app/assets/javascripts/protected_tags/constants.js @@ -1,3 +1,14 @@ import { s__ } from '~/locale'; export const FAILED_TO_UPDATE_TAG_MESSAGE = s__('ProjectSettings|Failed to update tag!'); + +export const ACCESS_LEVELS = { + CREATE: 'create_access_levels', +}; + +export const LEVEL_TYPES = { + ROLE: 'role', + USER: 'user', + GROUP: 'group', + DEPLOY_KEY: 'deploy_key', +}; diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js index 75fd11cd074..365b9a3b142 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_create.js +++ b/app/assets/javascripts/protected_tags/protected_tag_create.js @@ -1,12 +1,21 @@ import $ from 'jquery'; -import { __ } from '~/locale'; -import CreateItemDropdown from '../create_item_dropdown'; -import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; +import CreateItemDropdown from '~/create_item_dropdown'; +import { createAlert } from '~/alert'; +import axios from '~/lib/utils/axios_utils'; +import { s__, __ } from '~/locale'; +import AccessDropdown from '~/projects/settings/access_dropdown'; +import { ACCESS_LEVELS, LEVEL_TYPES } from './constants'; export default class ProtectedTagCreate { - constructor() { + constructor({ hasLicense }) { + this.hasLicense = hasLicense; this.$form = $('.js-new-protected-tag'); this.buildDropdowns(); + this.bindEvents(); + } + + bindEvents() { + this.$form.on('submit', this.onFormSubmit.bind(this)); } buildDropdowns() { @@ -16,15 +25,14 @@ export default class ProtectedTagCreate { this.onSelectCallback = this.onSelect.bind(this); // Allowed to Create dropdown - this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({ + this.protectedTagAccessDropdown = new AccessDropdown({ $dropdown: $allowedToCreateDropdown, - data: gon.create_access_levels, + accessLevelsData: gon.create_access_levels, onSelect: this.onSelectCallback, + accessLevel: ACCESS_LEVELS.CREATE, + hasLicense: this.hasLicense, }); - // Select default - $allowedToCreateDropdown.data('deprecatedJQueryDropdown').selectRowAtIndex(0); - // Protected tag dropdown this.createItemDropdown = new CreateItemDropdown({ $dropdown: this.$form.find('.js-protected-tag-select'), @@ -39,7 +47,7 @@ export default class ProtectedTagCreate { onSelect() { // Enable submit button const $tagInput = this.$form.find('input[name="protected_tag[name]"]'); - const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes'); + const $allowedToCreateInput = this.protectedTagAccessDropdown.getSelectedItems(); this.$form .find('button[type="submit"]') @@ -49,4 +57,57 @@ export default class ProtectedTagCreate { static getProtectedTags(term, callback) { callback(gon.open_tags); } + + getFormData() { + const formData = { + authenticity_token: this.$form.find('input[name="authenticity_token"]').val(), + protected_tag: { + name: this.$form.find('input[name="protected_tag[name]"]').val(), + }, + }; + + Object.keys(ACCESS_LEVELS).forEach((level) => { + const accessLevel = ACCESS_LEVELS[level]; + const selectedItems = this.protectedTagAccessDropdown.getSelectedItems(); + const levelAttributes = []; + + selectedItems.forEach((item) => { + if (item.type === LEVEL_TYPES.USER) { + levelAttributes.push({ + user_id: item.user_id, + }); + } else if (item.type === LEVEL_TYPES.ROLE) { + levelAttributes.push({ + access_level: item.access_level, + }); + } else if (item.type === LEVEL_TYPES.GROUP) { + levelAttributes.push({ + group_id: item.group_id, + }); + } else if (item.type === LEVEL_TYPES.DEPLOY_KEY) { + levelAttributes.push({ + deploy_key_id: item.deploy_key_id, + }); + } + }); + + formData.protected_tag[`${accessLevel}_attributes`] = levelAttributes; + }); + + return formData; + } + + onFormSubmit(e) { + e.preventDefault(); + + axios[this.$form.attr('method')](this.$form.attr('action'), this.getFormData()) + .then(() => { + window.location.reload(); + }) + .catch(() => + createAlert({ + message: s__('ProjectSettings|Failed to protect the tag'), + }), + ); + } } diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js index 40c52eba99e..4fa3ac3be4b 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -1,57 +1,115 @@ -import { createAlert } from '~/flash'; -import axios from '../lib/utils/axios_utils'; -import { FAILED_TO_UPDATE_TAG_MESSAGE } from './constants'; -import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; +import { find } from 'lodash'; +import { createAlert } from '~/alert'; +import axios from '~/lib/utils/axios_utils'; +import AccessDropdown from '~/projects/settings/access_dropdown'; +import { ACCESS_LEVELS, LEVEL_TYPES, FAILED_TO_UPDATE_TAG_MESSAGE } from './constants'; export default class ProtectedTagEdit { constructor(options) { + this.hasLicense = options.hasLicense; + this.hasChanges = false; this.$wrap = options.$wrap; this.$allowedToCreateDropdownButton = this.$wrap.find('.js-allowed-to-create'); - this.onSelectCallback = this.onSelect.bind(this); + + this.$allowedToCreateDropdownContainer = this.$allowedToCreateDropdownButton.closest( + '.create_access_levels-container', + ); this.buildDropdowns(); } buildDropdowns() { // Allowed to create dropdown - this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({ + this.protectedTagAccessDropdown = new AccessDropdown({ + accessLevel: ACCESS_LEVELS.CREATE, + accessLevelsData: gon.create_access_levels, $dropdown: this.$allowedToCreateDropdownButton, - data: gon.create_access_levels, - onSelect: this.onSelectCallback, + onSelect: this.onSelectOption.bind(this), + onHide: this.onDropdownHide.bind(this), + hasLicense: this.hasLicense, }); } - onSelect() { - const $allowedToCreateInput = this.$wrap.find( - `input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`, - ); + onSelectOption() { + this.hasChanges = true; + } - // Do not update if one dropdown has not selected any option - if (!$allowedToCreateInput.length) return; + onDropdownHide() { + if (!this.hasChanges) { + return; + } - this.$allowedToCreateDropdownButton.disable(); + this.hasChanges = true; + this.updatePermissions(); + } + + updatePermissions() { + const formData = Object.keys(ACCESS_LEVELS).reduce((acc, level) => { + const accessLevelName = ACCESS_LEVELS[level]; + const inputData = this.protectedTagAccessDropdown.getInputData(accessLevelName); + acc[`${accessLevelName}_attributes`] = inputData; + + return acc; + }, {}); axios .patch(this.$wrap.data('url'), { - protected_tag: { - create_access_levels_attributes: [ - { - id: this.$allowedToCreateDropdownButton.data('accessLevelId'), - access_level: $allowedToCreateInput.val(), - }, - ], - }, + protected_tag: formData, }) - .then(() => { - this.$allowedToCreateDropdownButton.enable(); + .then(({ data }) => { + this.hasChanges = false; + + Object.keys(ACCESS_LEVELS).forEach((level) => { + const accessLevelName = ACCESS_LEVELS[level]; + + // The data coming from server will be the new persisted *state* for each dropdown + this.setSelectedItemsToDropdown(data[accessLevelName], `${accessLevelName}_dropdown`); + }); }) .catch(() => { - this.$allowedToCreateDropdownButton.enable(); - window.scrollTo({ top: 0, behavior: 'smooth' }); createAlert({ message: FAILED_TO_UPDATE_TAG_MESSAGE, }); }); } + + setSelectedItemsToDropdown(items = []) { + const itemsToAdd = items.map((currentItem) => { + if (currentItem.user_id) { + // Do this only for users for now + // get the current data for selected items + const selectedItems = this.protectedTagAccessDropdown.getSelectedItems(); + const currentSelectedItem = find(selectedItems, { + user_id: currentItem.user_id, + }); + + return { + id: currentItem.id, + user_id: currentItem.user_id, + type: LEVEL_TYPES.USER, + persisted: true, + name: currentSelectedItem.name, + username: currentSelectedItem.username, + avatar_url: currentSelectedItem.avatar_url, + }; + } else if (currentItem.group_id) { + return { + id: currentItem.id, + group_id: currentItem.group_id, + type: LEVEL_TYPES.GROUP, + persisted: true, + }; + } + + return { + id: currentItem.id, + access_level: currentItem.access_level, + type: LEVEL_TYPES.ROLE, + persisted: true, + }; + }); + + this.protectedTagAccessDropdown.setSelectedItems(itemsToAdd); + } } diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js index b35bf4d4606..8ceb970bf03 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js @@ -4,7 +4,8 @@ import $ from 'jquery'; import ProtectedTagEdit from './protected_tag_edit'; export default class ProtectedTagEditList { - constructor() { + constructor(options) { + this.hasLicense = options.hasLicense; this.$wrap = $('.protected-tags-list'); this.initEditForm(); } @@ -13,6 +14,7 @@ export default class ProtectedTagEditList { this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => { new ProtectedTagEdit({ $wrap: $(el), + hasLicense: this.hasLicense, }); }); } diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue index adae92a92e9..7ecc39a56e7 100644 --- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue +++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue @@ -182,7 +182,7 @@ export default { :checked="linkedIssueType" /> </gl-form-group> - <p class="bold"> + <p class="bold gl-mb-2"> {{ issuableInputText }} </p> </template> diff --git a/app/assets/javascripts/related_issues/components/related_issuable_input.vue b/app/assets/javascripts/related_issues/components/related_issuable_input.vue index 8d6a3110f35..1846b9cf8f4 100644 --- a/app/assets/javascripts/related_issues/components/related_issuable_input.vue +++ b/app/assets/javascripts/related_issues/components/related_issuable_input.vue @@ -182,7 +182,7 @@ export default { <div ref="issuableFormWrapper" :class="{ focus: isInputFocused }" - class="add-issuable-form-input-wrapper form-control gl-field-error-outline gl-h-auto gl-p-3 gl-pb-2" + class="add-issuable-form-input-wrapper form-control gl-field-error-outline gl-h-auto gl-px-3 gl-pt-2 gl-pb-0" role="button" @click="onIssuableFormWrapperClick" > diff --git a/app/assets/javascripts/related_issues/components/related_issues_block.vue b/app/assets/javascripts/related_issues/components/related_issues_block.vue index 4a130ade631..043d925198c 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_block.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_block.vue @@ -1,5 +1,5 @@ <script> -import { GlLink, GlIcon, GlButton } from '@gitlab/ui'; +import { GlLink, GlIcon, GlLoadingIcon, GlButton, GlCard } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; import { issuableIconMap, @@ -16,8 +16,10 @@ export default { name: 'RelatedIssuesBlock', components: { GlLink, - GlButton, GlIcon, + GlLoadingIcon, + GlButton, + GlCard, AddIssuableForm, RelatedIssuesList, }, @@ -181,64 +183,69 @@ export default { <template> <div id="related-issues" class="related-issues-block"> - <div class="card card-slim gl-overflow-hidden gl-mt-5 gl-mb-0"> - <div - :class="{ - 'gl-border-b-1': isOpen, - 'gl-border-b-0': !isOpen, - }" - class="gl-display-flex gl-justify-content-space-between gl-line-height-24 gl-py-3 gl-px-5 gl-bg-gray-10 gl-border-b-solid gl-border-b-gray-100" - > - <h3 class="card-title h5 gl-my-0 gl-display-flex gl-align-items-center gl-flex-grow-1"> - <gl-link - id="user-content-related-issues" - class="anchor position-absolute gl-text-decoration-none" - href="#related-issues" - aria-hidden="true" - /> - <slot name="header-text">{{ headerText }}</slot> - - <div class="js-related-issues-header-issue-count gl-display-inline-flex gl-mx-3"> - <span class="gl-display-inline-flex gl-align-items-center"> - <gl-icon :name="issuableTypeIcon" class="gl-mr-2 gl-text-gray-500" /> - {{ badgeLabel }} - </span> - </div> - </h3> - <slot name="header-actions"></slot> - <gl-button - v-if="canAdmin" - size="small" - data-qa-selector="related_issues_plus_button" - data-testid="related-issues-plus-button" - :aria-label="addIssuableButtonText" - class="gl-ml-3" - @click="addButtonClick" + <gl-card + class="gl-overflow-hidden gl-mt-5 gl-mb-0" + header-class="gl-p-0 gl-border-0" + body-class="gl-p-0 gl-bg-gray-10" + > + <template #header> + <div + :class="{ + 'gl-border-b-1': isOpen, + 'gl-border-b-0': !isOpen, + }" + class="gl-display-flex gl-justify-content-space-between gl-line-height-24 gl-pl-5 gl-pr-4 gl-py-4 gl-bg-white gl-border-b-solid gl-border-b-gray-100" > - <slot name="add-button-text">{{ __('Add') }}</slot> - </gl-button> - <div class="gl-pl-3 gl-ml-3 gl-border-l-1 gl-border-l-solid gl-border-l-gray-100"> + <h3 class="card-title h5 gl-my-0 gl-display-flex gl-align-items-center gl-flex-grow-1"> + <gl-link + id="user-content-related-issues" + class="anchor position-absolute gl-text-decoration-none" + href="#related-issues" + aria-hidden="true" + /> + <slot name="header-text">{{ headerText }}</slot> + + <div + class="js-related-issues-header-issue-count gl-display-inline-flex gl-mx-3 gl-text-gray-500" + > + <span class="gl-display-inline-flex gl-align-items-center"> + <gl-icon :name="issuableTypeIcon" class="gl-mr-2 gl-text-gray-500" /> + {{ badgeLabel }} + </span> + </div> + </h3> + <slot name="header-actions"></slot> <gl-button - category="tertiary" + v-if="canAdmin" size="small" - :icon="toggleIcon" - :aria-label="toggleLabel" - data-testid="toggle-links" - @click="handleToggle" - /> + data-qa-selector="related_issues_plus_button" + data-testid="related-issues-plus-button" + :aria-label="addIssuableButtonText" + class="gl-ml-3" + @click="addButtonClick" + > + <slot name="add-button-text">{{ __('Add') }}</slot> + </gl-button> + <div class="gl-pl-3 gl-ml-3 gl-border-l-1 gl-border-l-solid gl-border-l-gray-100"> + <gl-button + category="tertiary" + size="small" + :icon="toggleIcon" + :aria-label="toggleLabel" + data-testid="toggle-links" + @click="handleToggle" + /> + </div> </div> - </div> + </template> <div v-if="isOpen" - class="linked-issues-card-body gl-bg-gray-10" - :class="{ - 'gl-p-5': isFormVisible || shouldShowTokenBody, - }" + class="linked-issues-card-body gl-py-3 gl-px-4 gl-bg-gray-10" data-testid="related-issues-body" > <div v-if="isFormVisible" - class="js-add-related-issues-form-area card-body bordered-box bg-white" + class="js-add-related-issues-form-area card-body bg-white gl-mt-2 gl-border-1 gl-border-solid gl-border-gray-100 gl-rounded-base" :class="{ 'gl-mb-5': shouldShowTokenBody, 'gl-show-field-errors': hasError }" > <add-issuable-form @@ -261,6 +268,7 @@ export default { /> </div> <template v-if="shouldShowTokenBody"> + <gl-loading-icon v-if="isFetching" size="sm" class="gl-py-2" /> <related-issues-list v-for="(category, index) in categorisedIssues" :key="category.linkType" @@ -272,13 +280,16 @@ export default { :issuable-type="issuableType" :path-id-separator="pathIdSeparator" :related-issues="category.issues" - :class="{ 'gl-mt-5': index > 0 }" + :class="{ + 'gl-pb-3 gl-mb-5 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100': + index !== categorisedIssues.length - 1, + }" @relatedIssueRemoveRequest="$emit('relatedIssueRemoveRequest', $event)" @saveReorder="$emit('saveReorder', $event)" /> </template> <div v-if="!shouldShowTokenBody && !isFormVisible" data-testid="related-items-empty"> - <p class="gl-my-5 gl-px-5"> + <p class="gl-p-2 gl-mb-0 gl-text-gray-500"> {{ emptyStateMessage }} <gl-link v-if="hasHelpPath" @@ -292,6 +303,6 @@ export default { </p> </div> </div> - </div> + </gl-card> </div> </template> diff --git a/app/assets/javascripts/related_issues/components/related_issues_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue index 7387b9ab87c..4429c1beb00 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_list.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_list.vue @@ -97,11 +97,13 @@ export default { <template> <div :data-link-type="listLinkType"> - <h4 v-if="heading" class="gl-font-base mt-0">{{ heading }}</h4> - <div - class="related-issues-token-body bordered-box bg-white" - :class="{ 'sortable-container': canReorder }" + <h4 + v-if="heading" + class="gl-font-sm gl-font-weight-semibold gl-text-gray-700 gl-mx-2 gl-mt-3 gl-mb-2" > + {{ heading }} + </h4> + <div class="related-issues-token-body" :class="{ 'sortable-container': canReorder }"> <div v-if="isFetching" class="gl-mb-2" data-qa-selector="related_issues_loading_placeholder"> <gl-loading-icon ref="loadingIcon" @@ -121,7 +123,7 @@ export default { }" :data-key="issue.id" :data-ordering-id="issuableOrderingId(issue)" - class="js-related-issues-token-list-item list-item pt-0 pb-0" + class="js-related-issues-token-list-item list-item pt-0 pb-0 gl-border-b-0!" > <related-issuable-item :id-key="issue.id" diff --git a/app/assets/javascripts/related_issues/components/related_issues_root.vue b/app/assets/javascripts/related_issues/components/related_issues_root.vue index ed70e1ce8a8..51f4e4f7d7b 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_root.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_root.vue @@ -23,7 +23,7 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways: and hide the `AddIssuableForm` area. */ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils'; import { TYPE_ISSUE } from '~/issues/constants'; import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status'; diff --git a/app/assets/javascripts/related_issues/constants.js b/app/assets/javascripts/related_issues/constants.js index 2a4ce70511b..25fc875db65 100644 --- a/app/assets/javascripts/related_issues/constants.js +++ b/app/assets/javascripts/related_issues/constants.js @@ -1,12 +1,5 @@ import { __, sprintf } from '~/locale'; -import { TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants'; - -export const issuableTypesMap = { - ISSUE: 'issue', - INCIDENT: 'incident', - EPIC: 'epic', - MERGE_REQUEST: 'merge_request', -}; +import { TYPE_EPIC, TYPE_INCIDENT, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; export const linkedIssueTypesMap = { BLOCKS: 'blocks', @@ -27,7 +20,7 @@ export const autoCompleteTextMap = { { emphasisStart: '<', emphasisEnd: '>' }, false, ), - [issuableTypesMap.INCIDENT]: sprintf( + [TYPE_INCIDENT]: sprintf( __(' or %{emphasisStart}#id%{emphasisEnd}'), { emphasisStart: '<', emphasisEnd: '>' }, false, @@ -37,7 +30,7 @@ export const autoCompleteTextMap = { { emphasisStart: '<', emphasisEnd: '>' }, false, ), - [issuableTypesMap.MERGE_REQUEST]: sprintf( + [TYPE_MERGE_REQUEST]: sprintf( __(' or %{emphasisStart}!merge request id%{emphasisEnd}'), { emphasisStart: '<', emphasisEnd: '>' }, false, @@ -46,21 +39,21 @@ export const autoCompleteTextMap = { false: { [TYPE_ISSUE]: '', [TYPE_EPIC]: '', - [issuableTypesMap.MERGE_REQUEST]: __(' or references'), + [TYPE_MERGE_REQUEST]: __(' or references'), }, }; export const inputPlaceholderTextMap = { [TYPE_ISSUE]: __('Paste issue link'), - [issuableTypesMap.INCIDENT]: __('Paste link'), + [TYPE_INCIDENT]: __('Paste link'), [TYPE_EPIC]: __('Paste epic link'), - [issuableTypesMap.MERGE_REQUEST]: __('Enter merge request URLs'), + [TYPE_MERGE_REQUEST]: __('Enter merge request URLs'), }; export const inputPlaceholderConfidentialTextMap = { [TYPE_ISSUE]: __('Paste confidential issue link'), [TYPE_EPIC]: __('Paste confidential epic link'), - [issuableTypesMap.MERGE_REQUEST]: __('Enter merge request URLs'), + [TYPE_MERGE_REQUEST]: __('Enter merge request URLs'), }; export const relatedIssuesRemoveErrorMap = { @@ -96,7 +89,7 @@ export const addRelatedItemErrorMap = { */ export const issuableIconMap = { [TYPE_ISSUE]: 'issues', - [issuableTypesMap.INCIDENT]: 'issues', + [TYPE_INCIDENT]: 'issues', [TYPE_EPIC]: 'epic', }; @@ -107,13 +100,13 @@ export const PathIdSeparator = { export const issuablesBlockHeaderTextMap = { [TYPE_ISSUE]: __('Linked items'), - [issuableTypesMap.INCIDENT]: __('Linked incidents or issues'), + [TYPE_INCIDENT]: __('Linked incidents or issues'), [TYPE_EPIC]: __('Linked epics'), }; export const issuablesBlockHelpTextMap = { [TYPE_ISSUE]: __('Learn more about linking issues'), - [issuableTypesMap.INCIDENT]: __('Learn more about linking issues and incidents'), + [TYPE_INCIDENT]: __('Learn more about linking issues and incidents'), [TYPE_EPIC]: __('Learn more about linking epics'), }; @@ -124,12 +117,12 @@ export const issuablesBlockAddButtonTextMap = { export const issuablesFormCategoryHeaderTextMap = { [TYPE_ISSUE]: __('The current issue'), - [issuableTypesMap.INCIDENT]: __('The current incident'), + [TYPE_INCIDENT]: __('The current incident'), [TYPE_EPIC]: __('The current epic'), }; export const issuablesFormInputTextMap = { [TYPE_ISSUE]: __('the following issues'), - [issuableTypesMap.INCIDENT]: __('the following incidents or issues'), + [TYPE_INCIDENT]: __('the following incidents or issues'), [TYPE_EPIC]: __('the following epics'), }; diff --git a/app/assets/javascripts/releases/components/app_index.vue b/app/assets/javascripts/releases/components/app_index.vue index 9f200856db3..515d9efaefd 100644 --- a/app/assets/javascripts/releases/components/app_index.vue +++ b/app/assets/javascripts/releases/components/app_index.vue @@ -1,6 +1,6 @@ <script> import { GlButton } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { historyPushState } from '~/lib/utils/common_utils'; import { scrollUp } from '~/lib/utils/scroll_utils'; import { setUrlParams, getParameterByName } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/releases/components/app_show.vue b/app/assets/javascripts/releases/components/app_show.vue index 544f2de5132..111d9e232c5 100644 --- a/app/assets/javascripts/releases/components/app_show.vue +++ b/app/assets/javascripts/releases/components/app_show.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import { popCreateReleaseNotification } from '~/releases/release_notification_service'; import oneReleaseQuery from '../graphql/queries/one_release.query.graphql'; diff --git a/app/assets/javascripts/releases/components/tag_field_new.vue b/app/assets/javascripts/releases/components/tag_field_new.vue index 2ddab5dddea..2ac61988393 100644 --- a/app/assets/javascripts/releases/components/tag_field_new.vue +++ b/app/assets/javascripts/releases/components/tag_field_new.vue @@ -68,10 +68,7 @@ export default { }, }, showTagNameValidationError() { - return ( - this.isInputDirty && - (this.validationErrors.isTagNameEmpty || this.validationErrors.existingRelease) - ); + return this.isInputDirty && !this.validationErrors.tagNameValidation.isValid; }, tagNameInputId() { return uniqueId('tag-name-input-'); @@ -80,9 +77,7 @@ export default { return uniqueId('create-from-selector-'); }, tagFeedback() { - return this.validationErrors.existingRelease - ? __('Selected tag is already in use. Choose another option.') - : __('Tag name is required.'); + return this.validationErrors.tagNameValidation.validationErrors[0]; }, }, methods: { diff --git a/app/assets/javascripts/releases/constants.js b/app/assets/javascripts/releases/constants.js index 4f862741e11..5e9e65a01b3 100644 --- a/app/assets/javascripts/releases/constants.js +++ b/app/assets/javascripts/releases/constants.js @@ -49,3 +49,8 @@ export const SORT_MAP = { }; export const DEFAULT_SORT = RELEASED_AT_DESC; + +export const i18n = { + tagNameIsRequiredMessage: __('Tag name is required.'), + tagIsAlredyInUseMessage: __('Selected tag is already in use. Choose another option.'), +}; diff --git a/app/assets/javascripts/releases/release_notification_service.js b/app/assets/javascripts/releases/release_notification_service.js index a4f926d7561..775c62802d4 100644 --- a/app/assets/javascripts/releases/release_notification_service.js +++ b/app/assets/javascripts/releases/release_notification_service.js @@ -1,5 +1,5 @@ import { s__, sprintf } from '~/locale'; -import { createAlert, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_SUCCESS } from '~/alert'; const createReleaseSessionKey = (projectPath) => `createRelease:${projectPath}`; diff --git a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js index 42ceed81c00..a7d8825ed33 100644 --- a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js +++ b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js @@ -1,5 +1,5 @@ import { getTag } from '~/rest_api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { redirectTo } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; import createReleaseMutation from '~/releases/graphql/mutations/create_release.mutation.graphql'; diff --git a/app/assets/javascripts/releases/stores/modules/edit_new/getters.js b/app/assets/javascripts/releases/stores/modules/edit_new/getters.js index 0d77095d099..8ff479058f2 100644 --- a/app/assets/javascripts/releases/stores/modules/edit_new/getters.js +++ b/app/assets/javascripts/releases/stores/modules/edit_new/getters.js @@ -2,6 +2,8 @@ import { isEmpty } from 'lodash'; import { s__ } from '~/locale'; import { hasContent } from '~/lib/utils/text_utility'; import { getDuplicateItemsFromArray } from '~/lib/utils/array_utility'; +import { validateTag, ValidationResult } from '~/lib/utils/ref_validator'; +import { i18n } from '~/releases/constants'; /** * @param {Object} link The link to test @@ -35,18 +37,21 @@ export const validationErrors = (state) => { assets: { links: {}, }, + tagNameValidation: new ValidationResult(), }; if (!state.release) { return errors; } - if (!state.release.tagName?.trim?.().length) { - errors.isTagNameEmpty = true; + if (!state.release.tagName || typeof state.release.tagName !== 'string') { + errors.tagNameValidation.addValidationError(i18n.tagNameIsRequiredMessage); + } else { + errors.tagNameValidation = validateTag(state.release.tagName); } if (state.existingRelease) { - errors.existingRelease = true; + errors.tagNameValidation.addValidationError(i18n.tagIsAlredyInUseMessage); } // Each key of this object is a URL, and the value is an diff --git a/app/assets/javascripts/repository/commits_service.js b/app/assets/javascripts/repository/commits_service.js index d029f8cf89f..e26036b5620 100644 --- a/app/assets/javascripts/repository/commits_service.js +++ b/app/assets/javascripts/repository/commits_service.js @@ -1,7 +1,7 @@ import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { normalizeData } from 'ee_else_ce/repository/utils/commit'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { COMMIT_BATCH_SIZE, I18N_COMMIT_DATA_FETCH_ERROR } from './constants'; let requestedOffsets = []; diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 101625a4b72..236351005e7 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -4,7 +4,7 @@ import { uniqueId } from 'lodash'; import BlobContent from '~/blob/components/blob_content.vue'; import BlobHeader from '~/blob/components/blob_header.vue'; import { SIMPLE_BLOB_VIEWER, RICH_BLOB_VIEWER } from '~/blob/components/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { isLoggedIn, handleLocationHash } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/repository/components/blob_controls.vue b/app/assets/javascripts/repository/components/blob_controls.vue index 29c2c3762fc..d3e306619bf 100644 --- a/app/assets/javascripts/repository/components/blob_controls.vue +++ b/app/assets/javascripts/repository/components/blob_controls.vue @@ -1,7 +1,7 @@ <script> import { GlButton } from '@gitlab/ui'; import { __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import getRefMixin from '~/repository/mixins/get_ref'; import initSourcegraph from '~/sourcegraph'; import ShortcutsBlob from '~/behaviors/shortcuts/shortcuts_blob'; diff --git a/app/assets/javascripts/repository/components/blob_viewers/notebook_viewer.vue b/app/assets/javascripts/repository/components/blob_viewers/notebook_viewer.vue index 1114a0942ec..53dad19028d 100644 --- a/app/assets/javascripts/repository/components/blob_viewers/notebook_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_viewers/notebook_viewer.vue @@ -1,11 +1,15 @@ <script> -import { GlLoadingIcon } from '@gitlab/ui'; -import notebookLoader from '~/blob/notebook'; import { stripPathTail } from '~/lib/utils/url_utility'; +import NotebookViewer from '~/blob/notebook/notebook_viewer.vue'; export default { - components: { - GlLoadingIcon, + components: { NotebookViewer }, + provide() { + // `relativeRawPath` is injected in app/assets/javascripts/notebook/cells/markdown.vue + // It is needed for images in Markdown cells that reference local files to work. + // See the following MR for more context: + // https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69075 + return { relativeRawPath: stripPathTail(this.url) }; }, props: { blob: { @@ -18,14 +22,9 @@ export default { url: this.blob.rawPath, }; }, - mounted() { - notebookLoader({ el: this.$refs.viewer, relativeRawPath: stripPathTail(this.url) }); - }, }; </script> <template> - <div ref="viewer" :data-endpoint="url" data-testid="notebook"> - <gl-loading-icon class="gl-my-4" size="lg" /> - </div> + <notebook-viewer :endpoint="url" /> </template> diff --git a/app/assets/javascripts/repository/components/delete_blob_modal.vue b/app/assets/javascripts/repository/components/delete_blob_modal.vue index baf8449b188..cbdf6ef9ccd 100644 --- a/app/assets/javascripts/repository/components/delete_blob_modal.vue +++ b/app/assets/javascripts/repository/components/delete_blob_modal.vue @@ -101,23 +101,19 @@ export default { primaryOptions() { return { text: this.$options.i18n.PRIMARY_OPTIONS_TEXT, - attributes: [ - { - variant: 'danger', - loading: this.loading, - disabled: this.loading || !this.form.state, - }, - ], + attributes: { + variant: 'danger', + loading: this.loading, + disabled: this.loading || !this.form.state, + }, }; }, cancelOptions() { return { text: this.$options.i18n.SECONDARY_OPTIONS_TEXT, - attributes: [ - { - disabled: this.loading, - }, - ], + attributes: { + disabled: this.loading, + }, }; }, showCreateNewMrToggle() { diff --git a/app/assets/javascripts/repository/components/fork_info.vue b/app/assets/javascripts/repository/components/fork_info.vue index 9804837b200..1a834ba1d82 100644 --- a/app/assets/javascripts/repository/components/fork_info.vue +++ b/app/assets/javascripts/repository/components/fork_info.vue @@ -1,8 +1,16 @@ <script> -import { GlIcon, GlLink, GlSkeletonLoader, GlSprintf } from '@gitlab/ui'; +import { GlIcon, GlLink, GlSkeletonLoader, GlLoadingIcon, GlSprintf, GlButton } from '@gitlab/ui'; import { s__, sprintf, n__ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import syncForkMutation from '~/repository/mutations/sync_fork.mutation.graphql'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { + POLLING_INTERVAL_DEFAULT, + POLLING_INTERVAL_BACKOFF, + FIVE_MINUTES_IN_MS, +} from '../constants'; import forkDetailsQuery from '../queries/fork_details.query.graphql'; +import ConflictsModal from './fork_sync_conflicts_modal.vue'; export const i18n = { forkedFrom: s__('ForkedFromProjectPath|Forked from'), @@ -12,7 +20,9 @@ export const i18n = { behind: s__('ForksDivergence|%{behindLinkStart}%{behind} %{commit_word} behind%{behindLinkEnd}'), ahead: s__('ForksDivergence|%{aheadLinkStart}%{ahead} %{commit_word} ahead%{aheadLinkEnd} of'), behindAhead: s__('ForksDivergence|%{messages} the upstream repository.'), + limitedVisibility: s__('ForksDivergence|Source project has a limited visibility.'), error: s__('ForksDivergence|Failed to fetch fork details. Try again later.'), + sync: s__('ForksDivergence|Update fork'), }; export default { @@ -20,17 +30,19 @@ export default { components: { GlIcon, GlLink, + GlButton, GlSprintf, GlSkeletonLoader, + ConflictsModal, + GlLoadingIcon, }, + mixins: [glFeatureFlagMixin()], apollo: { project: { query: forkDetailsQuery, + notifyOnNetworkStatusChange: true, variables() { - return { - projectPath: this.projectPath, - ref: this.selectedBranch, - }; + return this.forkDetailsQueryVariables; }, skip() { return !this.sourceName; @@ -42,6 +54,12 @@ export default { error, }); }, + result({ loading }) { + this.handlePolingInterval(loading); + }, + pollInterval() { + return this.pollInterval; + }, }, }, props: { @@ -53,6 +71,11 @@ export default { type: String, required: true, }, + sourceDefaultBranch: { + type: String, + required: false, + default: '', + }, sourceName: { type: String, required: false, @@ -76,18 +99,33 @@ export default { }, data() { return { - project: { - forkDetails: { - ahead: null, - behind: null, - }, - }, + project: {}, + currentPollInterval: null, + isSyncTriggered: false, }; }, computed: { + forkDetailsQueryVariables() { + return { + projectPath: this.projectPath, + ref: this.selectedBranch, + }; + }, + pollInterval() { + return this.isSyncing ? this.currentPollInterval : 0; + }, isLoading() { return this.$apollo.queries.project.loading; }, + forkDetails() { + return this.project?.forkDetails; + }, + hasConflicts() { + return this.forkDetails?.hasConflicts; + }, + isSyncing() { + return this.forkDetails?.isSyncing; + }, ahead() { return this.project?.forkDetails?.ahead; }, @@ -107,7 +145,10 @@ export default { }); }, isUnknownDivergence() { - return (!this.ahead && this.ahead !== 0) || (!this.behind && this.behind !== 0); + return this.sourceName && this.ahead === null && this.behind === null; + }, + isUpToDate() { + return this.ahead === 0 && this.behind === 0; }, behindAheadMessage() { const messages = []; @@ -122,7 +163,16 @@ export default { hasBehindAheadMessage() { return this.behindAheadMessage.length > 0; }, + isSyncButtonAvailable() { + return ( + this.glFeatures.synchronizeFork && + ((this.sourceName && this.forkDetails && this.behind) || this.isUnknownDivergence) + ); + }, forkDivergenceMessage() { + if (!this.forkDetails) { + return this.$options.i18n.limitedVisibility; + } if (this.isUnknownDivergence) { return this.$options.i18n.unknown; } @@ -134,6 +184,73 @@ export default { return this.$options.i18n.upToDate; }, }, + watch: { + hasConflicts(newVal) { + if (newVal && this.isSyncTriggered) { + this.showConflictsModal(); + this.isSyncTriggered = false; + } + }, + }, + methods: { + async syncForkWithPolling() { + await this.$apollo.mutate({ + mutation: syncForkMutation, + variables: { + projectPath: this.projectPath, + targetBranch: this.selectedBranch, + }, + error(error) { + createAlert({ + message: error.message, + captureError: true, + error, + }); + }, + update: (store, { data: { projectSyncFork } }) => { + const { details } = projectSyncFork; + + store.writeQuery({ + query: forkDetailsQuery, + variables: this.forkDetailsQueryVariables, + data: { + project: { + id: this.project.id, + forkDetails: details, + }, + }, + }); + }, + }); + }, + showConflictsModal() { + this.$refs.modal.show(); + }, + startSyncing() { + this.isSyncTriggered = true; + this.syncForkWithPolling(); + }, + checkIfSyncIsPossible() { + if (this.hasConflicts) { + this.showConflictsModal(); + } else { + this.startSyncing(); + } + }, + handlePolingInterval(loading) { + if (!loading && this.isSyncing) { + const backoff = POLLING_INTERVAL_BACKOFF; + const interval = this.currentPollInterval; + const newInterval = Math.min(interval * backoff, FIVE_MINUTES_IN_MS); + this.currentPollInterval = this.currentPollInterval + ? newInterval + : POLLING_INTERVAL_DEFAULT; + } + if (this.currentPollInterval === FIVE_MINUTES_IN_MS) { + this.$apollo.queries.forkDetailsQuery.stopPolling(); + } + }, + }, }; </script> @@ -141,23 +258,45 @@ export default { <div class="info-well gl-sm-display-flex gl-flex-direction-column"> <div class="well-segment gl-p-5 gl-w-full gl-display-flex"> <gl-icon name="fork" :size="16" class="gl-display-block gl-m-4 gl-text-center" /> - <div v-if="sourceName"> - {{ $options.i18n.forkedFrom }} - <gl-link data-qa-selector="forked_from_link" :href="sourcePath">{{ sourceName }}</gl-link> - <gl-skeleton-loader v-if="isLoading" :lines="1" /> - <div v-else class="gl-text-secondary" data-testid="divergence-message"> - <gl-sprintf :message="forkDivergenceMessage"> - <template #aheadLink="{ content }"> - <gl-link :href="aheadComparePath">{{ content }}</gl-link> - </template> - <template #behindLink="{ content }"> - <gl-link :href="behindComparePath">{{ content }}</gl-link> - </template> - </gl-sprintf> + <div + class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-flex-grow-1" + > + <div v-if="sourceName"> + {{ $options.i18n.forkedFrom }} + <gl-link data-qa-selector="forked_from_link" :href="sourcePath">{{ sourceName }}</gl-link> + <gl-skeleton-loader v-if="isLoading" :lines="1" /> + <div v-else class="gl-text-secondary" data-testid="divergence-message"> + <gl-sprintf :message="forkDivergenceMessage"> + <template #aheadLink="{ content }"> + <gl-link :href="aheadComparePath">{{ content }}</gl-link> + </template> + <template #behindLink="{ content }"> + <gl-link :href="behindComparePath">{{ content }}</gl-link> + </template> + </gl-sprintf> + </div> </div> - </div> - <div v-else data-testid="inaccessible-project" class="gl-align-items-center gl-display-flex"> - {{ $options.i18n.inaccessibleProject }} + <div + v-else + data-testid="inaccessible-project" + class="gl-align-items-center gl-display-flex" + > + {{ $options.i18n.inaccessibleProject }} + </div> + <gl-button + v-if="isSyncButtonAvailable" + :disabled="forkDetails.isSyncing" + @click="checkIfSyncIsPossible" + > + <gl-loading-icon v-if="forkDetails.isSyncing" class="gl-display-inline" size="sm" /> + <span>{{ $options.i18n.sync }}</span> + </gl-button> + <conflicts-modal + ref="modal" + :source-name="sourceName" + :source-path="sourcePath" + :source-default-branch="sourceDefaultBranch" + /> </div> </div> </div> diff --git a/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue b/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue new file mode 100644 index 00000000000..0bfb90bb3ec --- /dev/null +++ b/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue @@ -0,0 +1,137 @@ +<script> +/* eslint-disable @gitlab/require-i18n-strings */ +import { GlModal, GlButton } from '@gitlab/ui'; +import { __, s__ } from '~/locale'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; +import SafeHtml from '~/vue_shared/directives/safe_html'; +import { getBaseURL } from '~/lib/utils/url_utility'; + +export const i18n = { + modalTitle: s__('ForksDivergence|Resolve merge conflicts manually'), + modalMessage: s__( + 'ForksDivergence|The upstream changes could not be synchronized to this project due to file conflicts in the default branch. You must resolve the conflicts manually:', + ), + step1: __('Step 1.'), + step2: __('Step 2.'), + step3: __('Step 3.'), + step4: __('Step 4.'), + step1Text: s__( + "ForksDivergence|Fetch the latest changes from the upstream repository's default branch:", + ), + step2Text: s__( + "ForksDivergence|Check out to a new branch, and merge the changes from the upstream project's default branch. You likely need to resolve conflicts during this step.", + ), + step3Text: s__('ForksDivergence|Push the updates to remote:'), + step4Text: s__("ForksDivergence|Create a merge request to your project's default branch."), + copyToClipboard: __('Copy to clipboard'), + close: __('Close'), +}; + +export default { + name: 'ForkSyncConflictsModal', + components: { + GlModal, + GlButton, + ModalCopyButton, + }, + directives: { + SafeHtml, + }, + props: { + sourceDefaultBranch: { + type: String, + required: false, + default: '', + }, + sourceName: { + type: String, + required: false, + default: '', + }, + sourcePath: { + type: String, + required: false, + default: '', + }, + }, + computed: { + instructionsStep1() { + const baseUrl = getBaseURL(); + return `git fetch ${baseUrl}${this.sourcePath} ${this.sourceDefaultBranch}`; + }, + }, + methods: { + show() { + this.$refs.modal.show(); + }, + hide() { + this.$refs.modal.hide(); + }, + }, + i18n, + instructionsStep2: 'git checkout -b <new-branch-name>\ngit merge FETCH_HEAD', + instructionsStep2Clipboard: 'git checkout -b <new-branch-name>\ngit merge FETCH_HEAD', + instructionsStep3: 'git commit\ngit push', +}; +</script> +<template> + <gl-modal + ref="modal" + modal-id="fork-sync-conflicts-modal" + :title="$options.i18n.modalTitle" + size="md" + > + <p>{{ $options.i18n.modalMessage }}</p> + <p> + <b> {{ $options.i18n.step1 }}</b> {{ $options.i18n.modalMessage }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre class="gl-w-full gl-mb-0 gl-mr-3" data-testid="resolve-conflict-instructions">{{ + instructionsStep1 + }}</pre> + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="instructionsStep1" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0" + /> + </div> + <p> + <b> {{ $options.i18n.step2 }}</b> {{ $options.i18n.step2Text }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre + class="gl-w-full gl-mb-0 gl-mr-3" + data-testid="resolve-conflict-instructions" + v-html="$options.instructionsStep2 /* eslint-disable-line vue/no-v-html */" + ></pre> + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="$options.instructionsStep2Clipboard" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0" + /> + </div> + <p> + <b> {{ $options.i18n.step3 }}</b> {{ $options.i18n.step3Text }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre class="gl-w-full gl-mb-0" data-testid="resolve-conflict-instructions" + >{{ $options.instructionsStep3 }} +</pre + > + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="$options.instructionsStep3" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0 gl-ml-3" + /> + </div> + <p> + <b> {{ $options.i18n.step4 }}</b> {{ $options.i18n.step4Text }} + </p> + <template #modal-footer> + <gl-button @click="hide" @keydown.esc="hide">{{ $options.i18n.close }}</gl-button> + </template> + </gl-modal> +</template> diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue index 4d3c1521559..2d2e21dfd92 100644 --- a/app/assets/javascripts/repository/components/last_commit.vue +++ b/app/assets/javascripts/repository/components/last_commit.vue @@ -9,6 +9,7 @@ import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; +import SignatureBadge from '~/commit/components/signature_badge.vue'; import getRefMixin from '../mixins/get_ref'; import projectPathQuery from '../queries/project_path.query.graphql'; @@ -23,6 +24,7 @@ export default { GlLink, GlLoadingIcon, UserAvatarImage, + SignatureBadge, }, directives: { GlTooltip: GlTooltipDirective, @@ -170,10 +172,7 @@ export default { <div class="commit-actions gl-display-flex gl-flex-align gl-align-items-center gl-flex-direction-row" > - <div - v-if="commit.signatureHtml" - v-html="commit.signatureHtml /* eslint-disable-line vue/no-v-html */" - ></div> + <signature-badge v-if="commit.signature" :signature="commit.signature" /> <div v-if="commit.pipeline" class="ci-status-link"> <gl-link v-gl-tooltip.left diff --git a/app/assets/javascripts/repository/components/new_directory_modal.vue b/app/assets/javascripts/repository/components/new_directory_modal.vue index b28ebe7bb1e..f36a700c902 100644 --- a/app/assets/javascripts/repository/components/new_directory_modal.vue +++ b/app/assets/javascripts/repository/components/new_directory_modal.vue @@ -8,7 +8,7 @@ import { GlFormTextarea, GlToggle, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; @@ -93,23 +93,19 @@ export default { primaryOptions() { return { text: this.primaryBtnText, - attributes: [ - { - variant: 'confirm', - loading: this.loading, - disabled: !this.formCompleted || this.loading, - }, - ], + attributes: { + variant: 'confirm', + loading: this.loading, + disabled: !this.formCompleted || this.loading, + }, }; }, cancelOptions() { return { text: SECONDARY_OPTIONS_TEXT, - attributes: [ - { - disabled: this.loading, - }, - ], + attributes: { + disabled: this.loading, + }, }; }, showCreateNewMrToggle() { diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue index f6d6004ba96..0c9b46344c5 100644 --- a/app/assets/javascripts/repository/components/tree_content.vue +++ b/app/assets/javascripts/repository/components/tree_content.vue @@ -1,10 +1,8 @@ <script> import paginatedTreeQuery from 'shared_queries/repository/paginated_tree.query.graphql'; -import { createAlert } from '~/flash'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { createAlert } from '~/alert'; import { TREE_PAGE_SIZE, - TREE_INITIAL_FETCH_COUNT, TREE_PAGE_LIMIT, COMMIT_BATCH_SIZE, GITALY_UNAVAILABLE_CODE, @@ -23,7 +21,7 @@ export default { FileTable, FilePreview, }, - mixins: [getRefMixin, glFeatureFlagMixin()], + mixins: [getRefMixin], apollo: { projectPath: { query: projectPathQuery, @@ -59,13 +57,6 @@ export default { }; }, computed: { - pageSize() { - // we want to exponentially increase the page size to reduce the load on the frontend - const exponentialSize = (TREE_PAGE_SIZE / TREE_INITIAL_FETCH_COUNT) * (this.fetchCounter + 1); - return exponentialSize < TREE_PAGE_SIZE && this.glFeatures.increasePageSizeExponentially - ? exponentialSize - : TREE_PAGE_SIZE; - }, totalEntries() { return Object.values(this.entries).flat().length; }, @@ -110,7 +101,7 @@ export default { ref: this.ref, path: originalPath, nextPageCursor: this.nextPageCursor, - pageSize: this.pageSize, + pageSize: TREE_PAGE_SIZE, }, }) .then(({ data }) => { diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue index 4603ea2710d..4ca625bc0de 100644 --- a/app/assets/javascripts/repository/components/upload_blob_modal.vue +++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue @@ -9,7 +9,7 @@ import { GlButton, GlAlert, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { ContentTypeMultipartFormData } from '~/lib/utils/headers'; import { numberToHumanSize } from '~/lib/utils/number_utils'; @@ -106,23 +106,19 @@ export default { primaryOptions() { return { text: this.primaryBtnText, - attributes: [ - { - variant: 'confirm', - loading: this.loading, - disabled: !this.formCompleted || this.loading, - }, - ], + attributes: { + variant: 'confirm', + loading: this.loading, + disabled: !this.formCompleted || this.loading, + }, }; }, cancelOptions() { return { text: SECONDARY_OPTIONS_TEXT, - attributes: [ - { - disabled: this.loading, - }, - ], + attributes: { + disabled: this.loading, + }, }; }, formattedFileSize() { diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index 5098053c4f7..a6191203b2f 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -3,7 +3,6 @@ import { __ } from '~/locale'; export const GITALY_UNAVAILABLE_CODE = 'unavailable'; export const TREE_PAGE_LIMIT = 1000; // the maximum amount of items per page export const TREE_PAGE_SIZE = 100; // the amount of items to be fetched per (batch) request -export const TREE_INITIAL_FETCH_COUNT = TREE_PAGE_LIMIT / TREE_PAGE_SIZE; // the amount of (batch) requests to make export const COMMIT_BATCH_SIZE = 25; // we request commit data in batches of 25 @@ -106,3 +105,10 @@ export const i18n = { generalError: __('An error occurred while fetching folder content.'), gitalyError: __('Error: Gitaly is unavailable. Contact your administrator.'), }; + +export const FIVE_MINUTES_IN_MS = 1000 * 60 * 5; + +export const POLLING_INTERVAL_DEFAULT = 2500; +export const POLLING_INTERVAL_BACKOFF = 2; + +export const CONFLICTS_MODAL_ID = 'fork-sync-conflicts-modal'; diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js index 494e270a66c..6cedc606a37 100644 --- a/app/assets/javascripts/repository/index.js +++ b/app/assets/javascripts/repository/index.js @@ -69,7 +69,13 @@ export default function setupVueRepositoryList() { if (!forkEl) { return null; } - const { sourceName, sourcePath, aheadComparePath, behindComparePath } = forkEl.dataset; + const { + sourceName, + sourcePath, + sourceDefaultBranch, + aheadComparePath, + behindComparePath, + } = forkEl.dataset; return new Vue({ el: forkEl, apolloProvider, @@ -80,6 +86,7 @@ export default function setupVueRepositoryList() { selectedBranch: ref, sourceName, sourcePath, + sourceDefaultBranch, aheadComparePath, behindComparePath, }, diff --git a/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql b/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql new file mode 100644 index 00000000000..b3426038694 --- /dev/null +++ b/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql @@ -0,0 +1,11 @@ +mutation syncFork($projectPath: ID!, $targetBranch: String!) { + projectSyncFork(input: { projectPath: $projectPath, targetBranch: $targetBranch }) { + details { + ahead + behind + isSyncing + hasConflicts + } + errors + } +} diff --git a/app/assets/javascripts/repository/queries/fork_details.query.graphql b/app/assets/javascripts/repository/queries/fork_details.query.graphql index d1a37d00d55..3d37f69b48d 100644 --- a/app/assets/javascripts/repository/queries/fork_details.query.graphql +++ b/app/assets/javascripts/repository/queries/fork_details.query.graphql @@ -4,6 +4,8 @@ query getForkDetails($projectPath: ID!, $ref: String) { forkDetails(ref: $ref) { ahead behind + isSyncing + hasConflicts } } } diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index 3256e13f4da..297b8ae1fc2 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -70,7 +70,7 @@ Sidebar.prototype.sidebarToggleClicked = function (e, triggered) { const $expandIcon = $('.js-sidebar-expand'); const $toggleContainer = $('.js-sidebar-toggle-container'); const isExpanded = $toggleContainer.data('is-expanded'); - const tooltipLabel = isExpanded ? __('Expand sidebar') : __('Collapse sidebar'); + const tooltipLabel = isExpanded ? __('Collapse sidebar') : __('Expand sidebar'); e.preventDefault(); if (isExpanded) { diff --git a/app/assets/javascripts/saved_replies/components/app.vue b/app/assets/javascripts/saved_replies/components/app.vue index db8476c44f3..e4b481f0908 100644 --- a/app/assets/javascripts/saved_replies/components/app.vue +++ b/app/assets/javascripts/saved_replies/components/app.vue @@ -17,7 +17,7 @@ export default {}; </p> </div> <div class="col-lg-8"> - <router-view /> + <keep-alive><router-view /></keep-alive> </div> </div> </template> diff --git a/app/assets/javascripts/saved_replies/components/form.vue b/app/assets/javascripts/saved_replies/components/form.vue new file mode 100644 index 00000000000..efec9b96764 --- /dev/null +++ b/app/assets/javascripts/saved_replies/components/form.vue @@ -0,0 +1,182 @@ +<script> +import { GlButton, GlForm, GlFormGroup, GlFormInput, GlAlert } from '@gitlab/ui'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; +import { helpPagePath } from '~/helpers/help_page_helper'; +import { logError } from '~/lib/logger'; +import { __ } from '~/locale'; +import createSavedReplyMutation from '../queries/create_saved_reply.mutation.graphql'; +import updateSavedReplyMutation from '../queries/update_saved_reply.mutation.graphql'; + +export default { + components: { + GlButton, + GlForm, + GlFormGroup, + GlFormInput, + GlAlert, + MarkdownField, + }, + props: { + id: { + type: String, + required: false, + default: null, + }, + name: { + type: String, + required: false, + default: '', + }, + content: { + type: String, + required: false, + default: '', + }, + }, + data() { + return { + errors: [], + saving: false, + showValidation: false, + updateSavedReply: { + name: this.name, + content: this.content, + }, + }; + }, + computed: { + isNameValid() { + if (this.showValidation) return Boolean(this.updateSavedReply.name); + + return true; + }, + isContentValid() { + if (this.showValidation) return Boolean(this.updateSavedReply.content); + + return true; + }, + isValid() { + return this.isNameValid && this.isContentValid; + }, + }, + methods: { + onSubmit() { + this.showValidation = true; + + if (!this.isValid) return; + + this.errors = []; + this.saving = true; + + this.$apollo + .mutate({ + mutation: this.id ? updateSavedReplyMutation : createSavedReplyMutation, + variables: { + id: this.id, + name: this.updateSavedReply.name, + content: this.updateSavedReply.content, + }, + update: (store, { data: { savedReplyMutation } }) => { + if (savedReplyMutation.errors.length) { + this.errors = savedReplyMutation.errors.map((e) => e); + } else { + this.$emit('saved'); + this.updateSavedReply = { name: '', content: '' }; + this.showValidation = false; + } + }, + }) + .catch((error) => { + const errors = error.graphQLErrors; + + if (errors?.length) { + this.errors = errors.map((e) => e.message); + } else { + // Let's be sure to log the original error so it isn't just swallowed. + // Also, we don't want to translate console messages. + // eslint-disable-next-line @gitlab/require-i18n-strings + logError('Unexpected error while saving reply', error); + + this.errors = [__('An unexpected error occurred. Please try again.')]; + } + }) + .finally(() => { + this.saving = false; + }); + }, + }, + restrictedToolbarItems: ['full-screen'], + markdownDocsPath: helpPagePath('user/markdown'), +}; +</script> + +<template> + <gl-form + class="new-note common-note-form" + data-testid="saved-reply-form" + @submit.prevent="onSubmit" + > + <gl-alert + v-for="error in errors" + :key="error" + variant="danger" + class="gl-mb-3" + :dismissible="false" + > + {{ error }} + </gl-alert> + <gl-form-group + :label="__('Name')" + :state="isNameValid" + :invalid-feedback="__('Please enter a name for the saved reply.')" + data-testid="saved-reply-name-form-group" + > + <gl-form-input + v-model="updateSavedReply.name" + :placeholder="__('Enter a name for your saved reply')" + data-testid="saved-reply-name-input" + /> + </gl-form-group> + <gl-form-group + :label="__('Content')" + :state="isContentValid" + :invalid-feedback="__('Please enter the saved reply content.')" + data-testid="saved-reply-content-form-group" + > + <markdown-field + :enable-preview="false" + :is-submitting="saving" + :add-spacing-classes="false" + :textarea-value="updateSavedReply.content" + :markdown-docs-path="$options.markdownDocsPath" + :restricted-tool-bar-items="$options.restrictedToolbarItems" + :force-autosize="false" + class="js-no-autosize gl-border-gray-400!" + > + <template #textarea> + <textarea + v-model="updateSavedReply.content" + dir="auto" + class="note-textarea js-gfm-input js-autosize markdown-area" + data-supports-quick-actions="false" + :aria-label="__('Content')" + :placeholder="__('Write saved reply content here…')" + data-testid="saved-reply-content-input" + @keydown.meta.enter="onSubmit" + @keydown.ctrl.enter="onSubmit" + ></textarea> + </template> + </markdown-field> + </gl-form-group> + <gl-button + variant="confirm" + class="gl-mr-3 js-no-auto-disable" + type="submit" + :loading="saving" + data-testid="saved-reply-form-submit-btn" + > + {{ __('Save') }} + </gl-button> + <gl-button v-if="id" :to="{ path: '/' }">{{ __('Cancel') }}</gl-button> + </gl-form> +</template> diff --git a/app/assets/javascripts/saved_replies/components/list.vue b/app/assets/javascripts/saved_replies/components/list.vue index 30089cfa53f..dbe326d429a 100644 --- a/app/assets/javascripts/saved_replies/components/list.vue +++ b/app/assets/javascripts/saved_replies/components/list.vue @@ -1,43 +1,51 @@ <script> import { GlKeysetPagination, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; -import savedRepliesQuery from '../queries/saved_replies.query.graphql'; import ListItem from './list_item.vue'; export default { - apollo: { - savedReplies: { - query: savedRepliesQuery, - update: (r) => r.currentUser?.savedReplies?.nodes, - result({ data }) { - const pageInfo = data.currentUser?.savedReplies?.pageInfo; - - this.count = data.currentUser?.savedReplies?.count; - - if (pageInfo) { - this.pageInfo = pageInfo; - } - }, - }, - }, components: { GlLoadingIcon, GlKeysetPagination, GlSprintf, ListItem, }, - data() { - return { - savedReplies: [], - count: 0, - pageInfo: {}, - }; + props: { + loading: { + type: Boolean, + required: false, + default: false, + }, + savedReplies: { + type: Array, + required: true, + }, + pageInfo: { + type: Object, + required: true, + }, + count: { + type: Number, + required: true, + }, + }, + methods: { + prevPage() { + this.$emit('input', { + before: this.pageInfo.beforeCursor, + }); + }, + nextPage() { + this.$emit('input', { + after: this.pageInfo.endCursor, + }); + }, }, }; </script> <template> <div> - <gl-loading-icon v-if="$apollo.queries.savedReplies.loading" size="lg" /> + <gl-loading-icon v-if="loading" size="lg" /> <template v-else> <h5 class="gl-font-lg" data-testid="title"> <gl-sprintf :message="__('My saved replies (%{count})')"> @@ -51,6 +59,8 @@ export default { v-if="pageInfo.hasPreviousPage || pageInfo.hasNextPage" v-bind="pageInfo" class="gl-mt-4" + @prev="prevPage" + @next="nextPage" /> </template> </div> diff --git a/app/assets/javascripts/saved_replies/components/list_item.vue b/app/assets/javascripts/saved_replies/components/list_item.vue index dfa9a405dee..3ad5642afc7 100644 --- a/app/assets/javascripts/saved_replies/components/list_item.vue +++ b/app/assets/javascripts/saved_replies/components/list_item.vue @@ -1,19 +1,101 @@ <script> +import { uniqueId } from 'lodash'; +import { GlButton, GlModal, GlModalDirective, GlSprintf, GlTooltipDirective } from '@gitlab/ui'; +import { __ } from '~/locale'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import deleteSavedReplyMutation from '../queries/delete_saved_reply.mutation.graphql'; + export default { + components: { + GlButton, + GlModal, + GlSprintf, + }, + directives: { + GlModal: GlModalDirective, + GlTooltip: GlTooltipDirective, + }, props: { reply: { type: Object, required: true, }, }, + data() { + return { + isDeleting: false, + modalId: uniqueId('delete-saved-reply-'), + }; + }, + computed: { + id() { + return getIdFromGraphQLId(this.reply.id); + }, + }, + methods: { + onDelete() { + this.isDeleting = true; + + this.$apollo.mutate({ + mutation: deleteSavedReplyMutation, + variables: { + id: this.reply.id, + }, + update: (cache) => { + const cacheId = cache.identify(this.reply); + cache.evict({ id: cacheId }); + }, + }); + }, + }, + actionPrimary: { text: __('Delete'), attributes: { variant: 'danger' } }, + actionSecondary: { text: __('Cancel'), attributes: { variant: 'default' } }, }; </script> <template> <li class="gl-mb-5"> <div class="gl-display-flex gl-align-items-center"> - <strong>{{ reply.name }}</strong> + <strong data-testid="saved-reply-name">{{ reply.name }}</strong> + <div class="gl-ml-auto"> + <gl-button + v-gl-tooltip + :to="{ name: 'edit', params: { id: id } }" + icon="pencil" + :title="__('Edit')" + :aria-label="__('Edit')" + class="gl-mr-3" + data-testid="saved-reply-edit-btn" + /> + <gl-button + v-gl-modal="modalId" + v-gl-tooltip + icon="remove" + :aria-label="__('Delete')" + :title="__('Delete')" + variant="danger" + category="secondary" + data-testid="saved-reply-delete-btn" + :loading="isDeleting" + /> + </div> </div> <div class="gl-mt-3 gl-font-monospace">{{ reply.content }}</div> + <gl-modal + :title="__('Delete saved reply')" + :action-primary="$options.actionPrimary" + :action-secondary="$options.actionSecondary" + :modal-id="modalId" + size="sm" + @primary="onDelete" + > + <gl-sprintf + :message="__('Are you sure you want to delete %{name}? This action cannot be undone.')" + > + <template #name + ><strong>{{ reply.name }}</strong></template + > + </gl-sprintf> + </gl-modal> </li> </template> diff --git a/app/assets/javascripts/saved_replies/pages/edit.vue b/app/assets/javascripts/saved_replies/pages/edit.vue new file mode 100644 index 00000000000..94215389844 --- /dev/null +++ b/app/assets/javascripts/saved_replies/pages/edit.vue @@ -0,0 +1,68 @@ +<script> +import { GlLoadingIcon } from '@gitlab/ui'; +import { fetchPolicies } from '~/lib/graphql'; +import { createAlert } from '~/alert'; +import { __ } from '~/locale'; +import { convertToGraphQLId } from '~/graphql_shared/utils'; +import { TYPE_USERS_SAVED_REPLY } from '~/graphql_shared/constants'; +import CreateForm from '../components/form.vue'; +import getSavedReply from '../queries/get_saved_reply.query.graphql'; + +export default { + components: { + GlLoadingIcon, + CreateForm, + }, + apollo: { + savedReply: { + fetchPolicy: fetchPolicies.NETWORK_ONLY, + query: getSavedReply, + variables() { + return { + id: convertToGraphQLId(TYPE_USERS_SAVED_REPLY, this.$route.params.id), + }; + }, + update: (r) => r.currentUser.savedReply, + skip() { + return !this.$route.params.id; + }, + result({ + data: { + currentUser: { savedReply }, + }, + }) { + if (!savedReply) { + createAlert({ message: __('Unable to find saved reply') }); + this.redirectToRoot(); + } + }, + }, + }, + data() { + return { + savedReply: null, + }; + }, + methods: { + redirectToRoot() { + this.$router.push({ path: '/' }); + }, + }, +}; +</script> + +<template> + <div> + <h5 class="gl-mt-0 gl-font-lg"> + {{ __('Edit saved reply') }} + </h5> + <gl-loading-icon v-if="$apollo.queries.savedReply.loading" size="lg" /> + <create-form + v-else-if="savedReply" + :id="savedReply.id" + :name="savedReply.name" + :content="savedReply.content" + @saved="redirectToRoot" + /> + </div> +</template> diff --git a/app/assets/javascripts/saved_replies/pages/index.vue b/app/assets/javascripts/saved_replies/pages/index.vue index 38f51dbc365..3e96fc0714e 100644 --- a/app/assets/javascripts/saved_replies/pages/index.vue +++ b/app/assets/javascripts/saved_replies/pages/index.vue @@ -1,15 +1,67 @@ <script> +import { fetchPolicies } from '~/lib/graphql'; +import CreateForm from '../components/form.vue'; +import savedRepliesQuery from '../queries/saved_replies.query.graphql'; import List from '../components/list.vue'; export default { + apollo: { + savedReplies: { + fetchPolicy: fetchPolicies.NETWORK_ONLY, + query: savedRepliesQuery, + update: (r) => r.currentUser?.savedReplies?.nodes, + variables() { + return { + ...this.pagination, + }; + }, + result({ data }) { + const pageInfo = data.currentUser?.savedReplies?.pageInfo; + + this.count = data.currentUser?.savedReplies?.count; + + if (pageInfo) { + this.pageInfo = pageInfo; + } + }, + }, + }, components: { + CreateForm, List, }, + data() { + return { + savedReplies: [], + count: 0, + pageInfo: {}, + pagination: {}, + }; + }, + methods: { + refetchSavedReplies() { + this.pagination = {}; + this.$apollo.queries.savedReplies.refetch(); + }, + changePage(pageInfo) { + this.pagination = pageInfo; + }, + }, }; </script> <template> <div> - <list /> + <h5 class="gl-mt-0 gl-font-lg"> + {{ __('Add new saved reply') }} + </h5> + <create-form @saved="refetchSavedReplies" /> + <list + :loading="$apollo.queries.savedReplies.loading" + :saved-replies="savedReplies" + :page-info="pageInfo" + :count="count" + @input="changePage" + /> </div> </template> diff --git a/app/assets/javascripts/saved_replies/queries/create_saved_reply.mutation.graphql b/app/assets/javascripts/saved_replies/queries/create_saved_reply.mutation.graphql new file mode 100644 index 00000000000..c4e632d0f16 --- /dev/null +++ b/app/assets/javascripts/saved_replies/queries/create_saved_reply.mutation.graphql @@ -0,0 +1,10 @@ +mutation savedReplyCreate($name: String!, $content: String!) { + savedReplyMutation: savedReplyCreate(input: { name: $name, content: $content }) { + errors + savedReply { + id + name + content + } + } +} diff --git a/app/assets/javascripts/saved_replies/queries/delete_saved_reply.mutation.graphql b/app/assets/javascripts/saved_replies/queries/delete_saved_reply.mutation.graphql new file mode 100644 index 00000000000..76571ba628c --- /dev/null +++ b/app/assets/javascripts/saved_replies/queries/delete_saved_reply.mutation.graphql @@ -0,0 +1,5 @@ +mutation deleteSavedReply($id: UsersSavedReplyID!) { + savedReplyDestroy(input: { id: $id }) { + errors + } +} diff --git a/app/assets/javascripts/saved_replies/queries/get_saved_reply.query.graphql b/app/assets/javascripts/saved_replies/queries/get_saved_reply.query.graphql new file mode 100644 index 00000000000..66f5f43af49 --- /dev/null +++ b/app/assets/javascripts/saved_replies/queries/get_saved_reply.query.graphql @@ -0,0 +1,10 @@ +query getSavedReply($id: UsersSavedReplyID!) { + currentUser { + id + savedReply(id: $id) { + id + name + content + } + } +} diff --git a/app/assets/javascripts/saved_replies/queries/saved_replies.query.graphql b/app/assets/javascripts/saved_replies/queries/saved_replies.query.graphql index af1f12f3ceb..d8e76b5e2a8 100644 --- a/app/assets/javascripts/saved_replies/queries/saved_replies.query.graphql +++ b/app/assets/javascripts/saved_replies/queries/saved_replies.query.graphql @@ -1,7 +1,7 @@ -query savedReplies { +query savedReplies($after: String = "", $before: String = "") { currentUser { id - savedReplies { + savedReplies(after: $after, before: $before) { nodes { id name diff --git a/app/assets/javascripts/saved_replies/queries/update_saved_reply.mutation.graphql b/app/assets/javascripts/saved_replies/queries/update_saved_reply.mutation.graphql new file mode 100644 index 00000000000..14a47d7bc9c --- /dev/null +++ b/app/assets/javascripts/saved_replies/queries/update_saved_reply.mutation.graphql @@ -0,0 +1,10 @@ +mutation savedReplyUpdate($id: UsersSavedReplyID!, $name: String!, $content: String!) { + savedReplyMutation: savedReplyUpdate(input: { id: $id, name: $name, content: $content }) { + errors + savedReply { + id + name + content + } + } +} diff --git a/app/assets/javascripts/saved_replies/routes.js b/app/assets/javascripts/saved_replies/routes.js index bd582a5ed86..7687c6f335a 100644 --- a/app/assets/javascripts/saved_replies/routes.js +++ b/app/assets/javascripts/saved_replies/routes.js @@ -1,8 +1,15 @@ import IndexComponent from './pages/index.vue'; +import EditComponent from './pages/edit.vue'; + export default [ { path: '/', component: IndexComponent, }, + { + name: 'edit', + path: '/:id', + component: EditComponent, + }, ]; diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue index 2efc80fef75..60de63c7d7a 100644 --- a/app/assets/javascripts/search/sidebar/components/app.vue +++ b/app/assets/javascripts/search/sidebar/components/app.vue @@ -1,5 +1,5 @@ <script> -import { mapState } from 'vuex'; +import { mapState, mapGetters } from 'vuex'; import ScopeNavigation from '~/search/sidebar/components/scope_navigation.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { SCOPE_ISSUES, SCOPE_MERGE_REQUESTS, SCOPE_BLOB } from '../constants'; @@ -16,18 +16,21 @@ export default { mixins: [glFeatureFlagsMixin()], computed: { ...mapState(['urlQuery']), + ...mapGetters(['currentScope']), showIssueAndMergeFilters() { - return this.urlQuery.scope === SCOPE_ISSUES || this.urlQuery.scope === SCOPE_MERGE_REQUESTS; + return this.currentScope === SCOPE_ISSUES || this.currentScope === SCOPE_MERGE_REQUESTS; }, showBlobFilter() { - return this.urlQuery.scope === SCOPE_BLOB && this.glFeatures.searchBlobsLanguageAggregation; + return this.currentScope === SCOPE_BLOB; }, }, }; </script> <template> - <section class="search-sidebar gl-display-flex gl-flex-direction-column gl-mr-4 gl-mb-6 gl-mt-5"> + <section + class="search-sidebar gl-display-flex gl-flex-direction-column gl-md-mr-5 gl-mb-6 gl-mt-5" + > <scope-navigation /> <results-filters v-if="showIssueAndMergeFilters" /> <language-filter v-if="showBlobFilter" /> diff --git a/app/assets/javascripts/search/sidebar/components/checkbox_filter.vue b/app/assets/javascripts/search/sidebar/components/checkbox_filter.vue index b580d58b21b..f7873a994aa 100644 --- a/app/assets/javascripts/search/sidebar/components/checkbox_filter.vue +++ b/app/assets/javascripts/search/sidebar/components/checkbox_filter.vue @@ -1,6 +1,6 @@ <script> import { GlFormCheckboxGroup, GlFormCheckbox } from '@gitlab/ui'; -import { mapState, mapActions } from 'vuex'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { intersection } from 'lodash'; import { NAV_LINK_COUNT_DEFAULT_CLASSES, LABEL_DEFAULT_CLASSES } from '../constants'; import { formatSearchResultCount } from '../../store/utils'; @@ -12,31 +12,26 @@ export default { GlFormCheckbox, }, props: { - filterData: { + filtersData: { type: Object, required: true, }, }, computed: { ...mapState(['query']), - scope() { - return this.query.scope; - }, - queryFilters() { - return this.query[this.filterData?.filterParam] || []; - }, + ...mapGetters(['queryLanguageFilters']), dataFilters() { - return Object.values(this.filterData?.filters || []); + return Object.values(this.filtersData?.filters || []); }, flatDataFilterValues() { return this.dataFilters.map(({ value }) => value); }, selectedFilter: { get() { - return intersection(this.flatDataFilterValues, this.queryFilters); + return intersection(this.flatDataFilterValues, this.queryLanguageFilters); }, set(value) { - this.setQuery({ key: this.filterData?.filterParam, value }); + this.setQuery({ key: this.filtersData?.filterParam, value }); }, }, labelCountClasses() { @@ -56,7 +51,7 @@ export default { <template> <div class="gl-mx-5"> - <h5 class="gl-mt-0">{{ filterData.header }}</h5> + <h5 class="gl-mt-0">{{ filtersData.header }}</h5> <gl-form-checkbox-group v-model="selectedFilter"> <gl-form-checkbox v-for="f in dataFilters" diff --git a/app/assets/javascripts/search/sidebar/components/language_filter.vue b/app/assets/javascripts/search/sidebar/components/language_filter.vue index 26ce204cb5c..b2f8d3e1f5f 100644 --- a/app/assets/javascripts/search/sidebar/components/language_filter.vue +++ b/app/assets/javascripts/search/sidebar/components/language_filter.vue @@ -27,19 +27,24 @@ export default { apply: __('Apply'), showingMax: sprintf(s__('GlobalSearch|Showing top %{maxItems}'), { maxItems: MAX_ITEM_LENGTH }), loadError: s__('GlobalSearch|Aggregations load error.'), + reset: s__('GlobalSearch|Reset filters'), }, computed: { ...mapState(['aggregations', 'sidebarDirty']), - ...mapGetters(['langugageAggregationBuckets']), + ...mapGetters([ + 'languageAggregationBuckets', + 'currentUrlQueryHasLanguageFilters', + 'queryLanguageFilters', + ]), hasBuckets() { - return this.langugageAggregationBuckets.length > 0; + return this.languageAggregationBuckets.length > 0; }, filtersData() { return convertFiltersData(this.shortenedLanguageFilters); }, shortenedLanguageFilters() { if (!this.hasShowMore) { - return this.langugageAggregationBuckets; + return this.languageAggregationBuckets; } if (this.showAll) { return this.trimBuckets(MAX_ITEM_LENGTH); @@ -47,25 +52,40 @@ export default { return this.trimBuckets(DEFAULT_ITEM_LENGTH); }, hasShowMore() { - return this.langugageAggregationBuckets.length > DEFAULT_ITEM_LENGTH; + return this.languageAggregationBuckets.length > DEFAULT_ITEM_LENGTH; }, hasOverMax() { - return this.langugageAggregationBuckets.length > MAX_ITEM_LENGTH; + return this.languageAggregationBuckets.length > MAX_ITEM_LENGTH; }, dividerClasses() { return [...HR_DEFAULT_CLASSES, ...ONLY_SHOW_MD]; }, + hasQueryFilters() { + return this.queryLanguageFilters.length > 0; + }, }, async created() { await this.fetchLanguageAggregation(); }, methods: { - ...mapActions(['applyQuery', 'fetchLanguageAggregation']), + ...mapActions([ + 'applyQuery', + 'resetLanguageQuery', + 'resetLanguageQueryWithRedirect', + 'fetchLanguageAggregation', + ]), onShowMore() { this.showAll = true; }, trimBuckets(length) { - return this.langugageAggregationBuckets.slice(0, length); + return this.languageAggregationBuckets.slice(0, length); + }, + cleanResetFilters() { + if (this.currentUrlQueryHasLanguageFilters) { + return this.resetLanguageQueryWithRedirect(); + } + this.showAll = false; + return this.resetLanguageQuery(); }, }, HR_DEFAULT_CLASSES, @@ -84,7 +104,7 @@ export default { class="gl-overflow-x-hidden gl-overflow-y-auto" :class="{ 'language-filter-max-height': showAll }" > - <checkbox-filter class="gl-px-5" :filter-data="filtersData" /> + <checkbox-filter :filters-data="filtersData" /> <span v-if="showAll && hasOverMax" data-testid="has-over-max-text">{{ $options.i18n.showingMax }}</span> @@ -106,7 +126,9 @@ export default { </div> <div v-if="!aggregations.error"> <hr :class="$options.HR_DEFAULT_CLASSES" /> - <div class="gl-display-flex gl-align-items-center gl-mt-4 gl-mx-5 gl-px-5"> + <div + class="gl-display-flex gl-align-items-center gl-justify-content-space-between gl-mt-4 gl-mx-5" + > <gl-button category="primary" variant="confirm" @@ -116,6 +138,16 @@ export default { > {{ $options.i18n.apply }} </gl-button> + <gl-button + category="tertiary" + variant="link" + size="small" + :disabled="!hasQueryFilters && !sidebarDirty" + data-testid="reset-button" + @click="cleanResetFilters" + > + {{ $options.i18n.reset }} + </gl-button> </div> </div> </gl-form> diff --git a/app/assets/javascripts/search/sidebar/components/radio_filter.vue b/app/assets/javascripts/search/sidebar/components/radio_filter.vue index aa7c26b8044..0733dc72d2e 100644 --- a/app/assets/javascripts/search/sidebar/components/radio_filter.vue +++ b/app/assets/javascripts/search/sidebar/components/radio_filter.vue @@ -1,6 +1,6 @@ <script> import { GlFormRadioGroup, GlFormRadio } from '@gitlab/ui'; -import { mapState, mapActions } from 'vuex'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { sprintf, __ } from '~/locale'; export default { @@ -17,12 +17,10 @@ export default { }, computed: { ...mapState(['query']), + ...mapGetters(['currentScope']), ANY() { return this.filterData.filters.ANY; }, - scope() { - return this.query.scope; - }, initialFilter() { return this.query[this.filterData.filterParam]; }, @@ -30,7 +28,7 @@ export default { return this.initialFilter || this.ANY.value; }, filtersArray() { - return this.filterData.filterByScope[this.scope]; + return this.filterData.filterByScope[this.currentScope]; }, selectedFilter: { get() { diff --git a/app/assets/javascripts/search/sidebar/components/results_filters.vue b/app/assets/javascripts/search/sidebar/components/results_filters.vue index 4d9cc9d6450..7d995f26684 100644 --- a/app/assets/javascripts/search/sidebar/components/results_filters.vue +++ b/app/assets/javascripts/search/sidebar/components/results_filters.vue @@ -1,6 +1,6 @@ <script> import { GlButton, GlLink } from '@gitlab/ui'; -import { mapActions, mapState } from 'vuex'; +import { mapActions, mapState, mapGetters } from 'vuex'; import { confidentialFilterData } from '../constants/confidential_filter_data'; import { stateFilterData } from '../constants/state_filter_data'; import ConfidentialityFilter from './confidentiality_filter.vue'; @@ -16,14 +16,15 @@ export default { }, computed: { ...mapState(['urlQuery', 'sidebarDirty']), + ...mapGetters(['currentScope']), showReset() { return this.urlQuery.state || this.urlQuery.confidential; }, showConfidentialityFilter() { - return Object.values(confidentialFilterData.scopes).includes(this.urlQuery.scope); + return Object.values(confidentialFilterData.scopes).includes(this.currentScope); }, showStatusFilter() { - return Object.values(stateFilterData.scopes).includes(this.urlQuery.scope); + return Object.values(stateFilterData.scopes).includes(this.currentScope); }, }, methods: { diff --git a/app/assets/javascripts/search/sidebar/components/scope_navigation.vue b/app/assets/javascripts/search/sidebar/components/scope_navigation.vue index 5863381e2ef..02a3870f499 100644 --- a/app/assets/javascripts/search/sidebar/components/scope_navigation.vue +++ b/app/assets/javascripts/search/sidebar/components/scope_navigation.vue @@ -44,9 +44,6 @@ export default { isHighlighted ? 'gl-text-gray-900' : 'gl-text-gray-500', ]; }, - isActive(scope, index) { - return this.urlQuery.scope ? this.urlQuery.scope === scope : index === 0; - }, qaSelectorValue(item) { return `${slugifyWithUnderscore(item.label)}_tab`; }, @@ -60,16 +57,17 @@ export default { <nav data-testid="search-filter"> <gl-nav vertical pills> <gl-nav-item - v-for="(item, scope, index) in navigation" + v-for="(item, scope) in navigation" :key="scope" - :link-classes="linkClasses(isActive(scope, index))" + :link-classes="linkClasses(item.active)" class="gl-mb-1" :href="item.link" - :active="isActive(scope, index)" + :active="item.active" :data-qa-selector="qaSelectorValue(item)" + :data-testid="qaSelectorValue(item)" @click="handleClick(scope)" - ><span>{{ item.label }}</span - ><span v-if="item.count" :class="countClasses(isActive(scope, index))"> + ><span data-testid="label">{{ item.label }}</span + ><span v-if="item.count" data-testid="count" :class="countClasses(item.active)"> {{ showFormatedCount(item.count) }}<gl-icon v-if="isCountOverLimit(item.count)" diff --git a/app/assets/javascripts/search/sidebar/utils.js b/app/assets/javascripts/search/sidebar/utils.js index 5c08ad2f959..4357d6202df 100644 --- a/app/assets/javascripts/search/sidebar/utils.js +++ b/app/assets/javascripts/search/sidebar/utils.js @@ -1,20 +1,17 @@ import { languageFilterData } from '~/search/sidebar/constants/language_filter_data'; -export const convertFiltersData = (rawBuckets) => { - return rawBuckets.reduce( - (acc, bucket) => { - return { - ...acc, - filters: { - ...acc.filters, - [bucket.key.toUpperCase()]: { - label: bucket.key, - value: bucket.key, - count: bucket.count, - }, +export const convertFiltersData = (rawBuckets) => + rawBuckets.reduce( + (acc, bucket) => ({ + ...acc, + filters: { + ...acc.filters, + [bucket.key.toUpperCase()]: { + label: bucket.key, + value: bucket.key, + count: bucket.count, }, - }; - }, + }, + }), { ...languageFilterData, filters: {} }, ); -}; diff --git a/app/assets/javascripts/search/store/actions.js b/app/assets/javascripts/search/store/actions.js index fc0817be882..da2bf4b602e 100644 --- a/app/assets/javascripts/search/store/actions.js +++ b/app/assets/javascripts/search/store/actions.js @@ -1,9 +1,10 @@ import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { visitUrl, setUrlParams } from '~/lib/utils/url_utility'; import { logError } from '~/lib/logger'; import { __ } from '~/locale'; +import { languageFilterData } from '~/search/sidebar/constants/language_filter_data'; import { GROUPS_LOCAL_STORAGE_KEY, PROJECTS_LOCAL_STORAGE_KEY, SIDEBAR_PARAMS } from './constants'; import * as types from './mutation_types'; import { @@ -12,6 +13,7 @@ import { mergeById, isSidebarDirty, getAggregationsUrl, + prepareSearchAggregations, } from './utils'; export const fetchGroups = ({ commit }, search) => { @@ -105,17 +107,27 @@ export const applyQuery = ({ state }) => { }; export const resetQuery = ({ state }) => { - visitUrl(setUrlParams({ ...state.query, page: null, state: null, confidential: null })); + visitUrl( + setUrlParams({ ...state.query, page: null, state: null, confidential: null }, undefined, true), + ); +}; + +export const resetLanguageQueryWithRedirect = ({ state }) => { + visitUrl(setUrlParams({ ...state.query, language: null }, undefined, true)); +}; + +export const resetLanguageQuery = ({ commit }) => { + commit(types.SET_QUERY, { key: languageFilterData?.filterParam, value: [] }); }; export const fetchSidebarCount = ({ commit, state }) => { - const promises = Object.keys(state.navigation).map((scope) => { + const promises = Object.values(state.navigation).map((navItem) => { // active nav item has count already so we skip it - if (scope !== state.urlQuery.scope) { + if (!navItem.active) { return axios - .get(state.navigation[scope].count_link) + .get(navItem.count_link) .then(({ data: { count } }) => { - commit(types.RECEIVE_NAVIGATION_COUNT, { key: scope, count }); + commit(types.RECEIVE_NAVIGATION_COUNT, { key: navItem.scope, count }); }) .catch((e) => logError(e)); } @@ -124,12 +136,13 @@ export const fetchSidebarCount = ({ commit, state }) => { return Promise.all(promises); }; -export const fetchLanguageAggregation = ({ commit }) => { +export const fetchLanguageAggregation = ({ commit, state }) => { commit(types.REQUEST_AGGREGATIONS); return axios .get(getAggregationsUrl()) - .then(({ data }) => { - commit(types.RECEIVE_AGGREGATIONS_SUCCESS, data); + .then((result) => { + const { data } = result; + commit(types.RECEIVE_AGGREGATIONS_SUCCESS, prepareSearchAggregations(state, data)); }) .catch((e) => { logError(e); diff --git a/app/assets/javascripts/search/store/getters.js b/app/assets/javascripts/search/store/getters.js index 0278239c144..36d98233e28 100644 --- a/app/assets/javascripts/search/store/getters.js +++ b/app/assets/javascripts/search/store/getters.js @@ -1,4 +1,6 @@ +import { findKey, has } from 'lodash'; import { languageFilterData } from '~/search/sidebar/constants/language_filter_data'; + import { GROUPS_LOCAL_STORAGE_KEY, PROJECTS_LOCAL_STORAGE_KEY } from './constants'; export const frequentGroups = (state) => { @@ -9,10 +11,18 @@ export const frequentProjects = (state) => { return state.frequentItems[PROJECTS_LOCAL_STORAGE_KEY]; }; -export const langugageAggregationBuckets = (state) => { +export const languageAggregationBuckets = (state) => { return ( state.aggregations.data.find( (aggregation) => aggregation.name === languageFilterData.filterParam, )?.buckets || [] ); }; + +export const currentScope = (state) => findKey(state.navigation, { active: true }); + +export const queryLanguageFilters = (state) => state.query[languageFilterData.filterParam] || []; + +export const currentUrlQueryHasLanguageFilters = (state) => + has(state.urlQuery, languageFilterData.filterParam) && + state.urlQuery[languageFilterData.filterParam]?.length > 0; diff --git a/app/assets/javascripts/search/store/mutations.js b/app/assets/javascripts/search/store/mutations.js index f9fd69d2211..b2f9f5ab225 100644 --- a/app/assets/javascripts/search/store/mutations.js +++ b/app/assets/javascripts/search/store/mutations.js @@ -24,7 +24,7 @@ export default { state.projects = []; }, [types.SET_QUERY](state, { key, value }) { - state.query[key] = value; + state.query = { ...state.query, [key]: value }; }, [types.SET_SIDEBAR_DIRTY](state, value) { state.sidebarDirty = value; diff --git a/app/assets/javascripts/search/store/utils.js b/app/assets/javascripts/search/store/utils.js index acb99c60426..8e484e69646 100644 --- a/app/assets/javascripts/search/store/utils.js +++ b/app/assets/javascripts/search/store/utils.js @@ -1,6 +1,8 @@ +import { isEqual, orderBy } from 'lodash'; import AccessorUtilities from '~/lib/utils/accessor'; import { formatNumber } from '~/locale'; import { joinPaths } from '~/lib/utils/url_utility'; +import { languageFilterData } from '~/search/sidebar/constants/language_filter_data'; import { MAX_FREQUENT_ITEMS, MAX_FREQUENCY, @@ -8,6 +10,8 @@ import { NUMBER_FORMATING_OPTIONS, } from './constants'; +const LANGUAGE_AGGREGATION_NAME = languageFilterData.filterParam; + function extractKeys(object, keyList) { return Object.fromEntries(keyList.map((key) => [key, object[key]])); } @@ -94,6 +98,10 @@ export const isSidebarDirty = (currentQuery, urlQuery) => { const userAddedParam = !urlQuery[param] && currentQuery[param]; const userChangedExistingParam = urlQuery[param] && urlQuery[param] !== currentQuery[param]; + if (Array.isArray(currentQuery[param]) || Array.isArray(urlQuery[param])) { + return !isEqual(currentQuery[param], urlQuery[param]); + } + return userAddedParam || userChangedExistingParam; }); }; @@ -112,3 +120,27 @@ export const getAggregationsUrl = () => { currentUrl.pathname = joinPaths('/search', 'aggregations'); return currentUrl.toString(); }; + +const sortLanguages = (state, entries) => { + const queriedLanguages = state.query?.[LANGUAGE_AGGREGATION_NAME] || []; + + if (!Array.isArray(queriedLanguages) || !queriedLanguages.length) { + return entries; + } + + const queriedLanguagesSet = new Set(queriedLanguages); + + return orderBy(entries, [({ key }) => queriedLanguagesSet.has(key), 'count'], ['desc', 'desc']); +}; + +export const prepareSearchAggregations = (state, aggregationData) => + aggregationData.map((item) => { + if (item?.name === LANGUAGE_AGGREGATION_NAME) { + return { + ...item, + buckets: sortLanguages(state, item.buckets), + }; + } + + return item; + }); diff --git a/app/assets/javascripts/search/topbar/components/app.vue b/app/assets/javascripts/search/topbar/components/app.vue index da6039f4758..16ff8c94885 100644 --- a/app/assets/javascripts/search/topbar/components/app.vue +++ b/app/assets/javascripts/search/topbar/components/app.vue @@ -86,45 +86,50 @@ export default { </script> <template> - <section class="search-page-form gl-lg-display-flex gl-flex-direction-column"> - <div class="gl-lg-display-flex gl-flex-direction-row gl-align-items-flex-end"> - <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2"> - <div - class="gl-sm-display-flex gl-flex-direction-row gl-justify-content-space-between gl-mb-4 gl-md-mb-0" - > - <label>{{ $options.i18n.searchLabel }}</label> - <template v-if="showSyntaxOptions"> - <gl-button - category="tertiary" - variant="link" - size="small" - button-text-classes="gl-font-sm!" - @click="onToggleDrawer" - >{{ $options.i18n.syntaxOptionsLabel }} - </gl-button> - <markdown-drawer - ref="markdownDrawer" - :document-path="$options.SYNTAX_OPTIONS_DOCUMENT" - /> - </template> + <section class="gl-p-5 gl-bg-gray-10 gl-border-b gl-border-t"> + <div class="search-page-form gl-lg-display-flex gl-flex-direction-column"> + <div class="gl-lg-display-flex gl-flex-direction-row gl-align-items-flex-end"> + <div class="gl-flex-grow-1 gl-mb-4 gl-lg-mb-0 gl-lg-mr-2"> + <div + class="gl-display-flex gl-flex-direction-row gl-justify-content-space-between gl-mb-0 gl-md-mb-4" + > + <label class="gl-mb-1 gl-md-pb-2">{{ $options.i18n.searchLabel }}</label> + <template v-if="showSyntaxOptions"> + <gl-button + category="tertiary" + variant="link" + size="small" + button-text-classes="gl-font-sm!" + @click="onToggleDrawer" + >{{ $options.i18n.syntaxOptionsLabel }} + </gl-button> + <markdown-drawer + ref="markdownDrawer" + :document-path="$options.SYNTAX_OPTIONS_DOCUMENT" + /> + </template> + </div> + <gl-search-box-by-click + id="dashboard_search" + v-model="search" + name="search" + :placeholder="$options.i18n.searchPlaceholder" + @submit="applyQuery" + /> + </div> + <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-3"> + <label class="gl-display-block gl-mb-1 gl-md-pb-2">{{ + $options.i18n.groupFieldLabel + }}</label> + <group-filter :initial-data="groupInitialJson" /> + </div> + <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-ml-3"> + <label class="gl-display-block gl-mb-1 gl-md-pb-2">{{ + $options.i18n.projectFieldLabel + }}</label> + <project-filter :initial-data="projectInitialJson" /> </div> - <gl-search-box-by-click - id="dashboard_search" - v-model="search" - name="search" - :placeholder="$options.i18n.searchPlaceholder" - @submit="applyQuery" - /> - </div> - <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-mx-3"> - <label class="gl-display-block">{{ $options.i18n.groupFieldLabel }}</label> - <group-filter :initial-data="groupInitialJson" /> - </div> - <div v-if="showFilters" class="gl-mb-4 gl-lg-mb-0 gl-lg-ml-3"> - <label class="gl-display-block">{{ $options.i18n.projectFieldLabel }}</label> - <project-filter :initial-data="projectInitialJson" /> </div> </div> - <hr class="gl-mt-5 gl-mb-0 gl-border-gray-100" /> </section> </template> diff --git a/app/assets/javascripts/security_configuration/components/app.vue b/app/assets/javascripts/security_configuration/components/app.vue index 3ebd21609a6..ccfaa678201 100644 --- a/app/assets/javascripts/security_configuration/components/app.vue +++ b/app/assets/javascripts/security_configuration/components/app.vue @@ -1,6 +1,7 @@ <script> import { GlTab, GlTabs, GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; import { __, s__ } from '~/locale'; +import { parseErrorMessage } from '~/lib/utils/error_message'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue'; import SectionLayout from '~/vue_shared/security_configuration/components/section_layout.vue'; @@ -26,13 +27,16 @@ export const i18n = { scanner will not be reflected as such until the pipeline has been successfully executed and it has generated valid artifacts.`, ), - securityConfiguration: __('Security Configuration'), + securityConfiguration: __('Security configuration'), vulnerabilityManagement: s__('SecurityConfiguration|Vulnerability Management'), securityTraining: s__('SecurityConfiguration|Security training'), securityTrainingDescription: s__( 'SecurityConfiguration|Enable security training to help your developers learn how to fix vulnerabilities. Developers can view security training from selected educational providers, relevant to the detected vulnerability.', ), securityTrainingDoc: s__('SecurityConfiguration|Learn more about vulnerability training'), + genericErrorText: s__( + `SecurityConfiguration|Something went wrong. Please refresh the page, or try again later.`, + ), }; export default { @@ -124,8 +128,9 @@ export default { dismissedProjects.add(this.projectFullPath); this.autoDevopsEnabledAlertDismissedProjects = Array.from(dismissedProjects); }, - onError(message) { - this.errorMessage = message; + onError(error) { + const { message, userFacing } = parseErrorMessage(error); + this.errorMessage = userFacing ? message : i18n.genericErrorText; }, dismissAlert() { this.errorMessage = ''; diff --git a/app/assets/javascripts/security_configuration/components/constants.js b/app/assets/javascripts/security_configuration/components/constants.js index c87dcef6a93..6beb6cd4d34 100644 --- a/app/assets/javascripts/security_configuration/components/constants.js +++ b/app/assets/javascripts/security_configuration/components/constants.js @@ -35,7 +35,7 @@ export const SAST_CONFIG_HELP_PATH = helpPagePath('user/application_security/sas }); export const SAST_IAC_NAME = __('Infrastructure as Code (IaC) Scanning'); -export const SAST_IAC_SHORT_NAME = s__('ciReport|IaC Scanning'); +export const SAST_IAC_SHORT_NAME = s__('ciReport|SAST IaC'); export const SAST_IAC_DESCRIPTION = __( 'Analyze your infrastructure as code configuration files for known vulnerabilities.', ); @@ -65,7 +65,6 @@ export const DAST_PROFILES_NAME = __('DAST profiles'); export const DAST_PROFILES_DESCRIPTION = s__( 'SecurityConfiguration|Manage profiles for use by DAST scans.', ); -export const DAST_PROFILES_HELP_PATH = helpPagePath('user/application_security/dast/index'); export const DAST_PROFILES_CONFIG_TEXT = s__('SecurityConfiguration|Manage profiles'); export const SECRET_DETECTION_NAME = __('Secret Detection'); diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue index d9e969e2278..e5a11487c90 100644 --- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue +++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue @@ -1,5 +1,5 @@ <script> -import { GlFormGroup, GlButton, GlModal, GlToast, GlToggle, GlLink } from '@gitlab/ui'; +import { GlFormGroup, GlButton, GlModal, GlToast, GlToggle, GlLink, GlAlert } from '@gitlab/ui'; import Vue from 'vue'; import { mapState, mapActions } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; @@ -17,6 +17,7 @@ export default { GlModal, GlToggle, GlLink, + GlAlert, }, directives: { SafeHtml, @@ -27,6 +28,7 @@ export default { data() { return { modalId: 'delete-self-monitor-modal', + showDeprecationNotice: true, }; }, computed: { @@ -49,6 +51,20 @@ export default { selfMonitorProjectFullUrl() { return `${getBaseURL()}/${this.projectPath}`; }, + selfMonitoringDeprecationNotice() { + return sprintf( + s__( + 'SelfMonitoring|Self-monitoring was %{deprecation}deprecated%{link_end} in GitLab 14.9, and is %{removal}scheduled for removal%{link_end} in GitLab 16.0. For information on a possible replacement, %{opstrace}learn more about Opstrace%{link_end}.', + ), + { + deprecation: `<a href="${this.deprecationPath}">`, + removal: `<a href="https://gitlab.com/gitlab-org/gitlab/-/issues/348909">`, + opstrace: `<a href="https://gitlab.com/groups/gitlab-org/-/epics/6976">`, + link_end: `</a>`, + }, + false, + ); + }, selfMonitoringFormText() { if (this.projectCreated) { return sprintf( @@ -70,6 +86,9 @@ export default { helpDocsPath() { return helpPagePath('administration/monitoring/gitlab_self_monitoring_project/index'); }, + deprecationPath() { + return helpPagePath('update/deprecations.md', { anchor: 'gitlab-self-monitoring-project' }); + }, }, watch: { selfMonitorEnabled() { @@ -123,6 +142,9 @@ export default { viewSelfMonitorProject() { visitUrl(this.selfMonitorProjectFullUrl); }, + hideDeprecationNotice() { + this.showDeprecationNotice = false; + }, }, }; </script> @@ -140,6 +162,16 @@ export default { <gl-link :href="helpDocsPath">{{ __('Learn more.') }}</gl-link> </p> </div> + <gl-alert + v-if="showDeprecationNotice" + class="gl-mb-3" + :title="s__('SelfMonitoring|Deprecation notice')" + :dismissible="true" + variant="danger" + @dismiss="hideDeprecationNotice" + > + <div v-safe-html="selfMonitoringDeprecationNotice"></div> + </gl-alert> <div class="settings-content"> <form name="self-monitoring-form"> <p ref="selfMonitoringFormText" v-safe-html="selfMonitoringFormText"></p> diff --git a/app/assets/javascripts/sentry/constants.js b/app/assets/javascripts/sentry/legacy_constants.js index 5531c4f56db..d04011dab2f 100644 --- a/app/assets/javascripts/sentry/constants.js +++ b/app/assets/javascripts/sentry/legacy_constants.js @@ -1,6 +1,6 @@ import { __ } from '~/locale'; -// TODO: Remove in favor of https://gitlab.com/gitlab-org/gitlab/issues/35144 +// https://docs.sentry.io/platforms/javascript/configuration/filtering/#decluttering-sentry export const IGNORE_ERRORS = [ // Random plugins/extensions 'top.GLOBALS', @@ -22,6 +22,8 @@ export const IGNORE_ERRORS = [ 'EBCallBackMessageReceived', // See http://toolbar.conduit.com/Developer/HtmlAndGadget/Methods/JSInjection.aspx 'conduitPage', + // Exclude errors from polling when navigating away from a page + 'TypeError: Failed to fetch', ]; export const DENY_URLS = [ diff --git a/app/assets/javascripts/sentry/legacy_sentry_config.js b/app/assets/javascripts/sentry/legacy_sentry_config.js index 50a943886db..ae9ae327544 100644 --- a/app/assets/javascripts/sentry/legacy_sentry_config.js +++ b/app/assets/javascripts/sentry/legacy_sentry_config.js @@ -1,7 +1,7 @@ import * as Sentry5 from 'sentrybrowser5'; import $ from 'jquery'; import { __ } from '~/locale'; -import { IGNORE_ERRORS, DENY_URLS, SAMPLE_RATE } from './constants'; +import { IGNORE_ERRORS, DENY_URLS, SAMPLE_RATE } from './legacy_constants'; const SentryConfig = { IGNORE_ERRORS, diff --git a/app/assets/javascripts/sentry/sentry_config.js b/app/assets/javascripts/sentry/sentry_config.js index ed8a55b7d44..80f087691f4 100644 --- a/app/assets/javascripts/sentry/sentry_config.js +++ b/app/assets/javascripts/sentry/sentry_config.js @@ -1,5 +1,4 @@ import * as Sentry from 'sentrybrowser7'; -import { IGNORE_ERRORS, DENY_URLS, SAMPLE_RATE } from './constants'; const SentryConfig = { init(options = {}) { @@ -17,9 +16,6 @@ const SentryConfig = { release, allowUrls, environment, - ignoreErrors: IGNORE_ERRORS, - denyUrls: DENY_URLS, - sampleRate: SAMPLE_RATE, }); Sentry.setTags(tags); diff --git a/app/assets/javascripts/service_ping_consent.js b/app/assets/javascripts/service_ping_consent.js index 654263ba27b..7d6e7e81f3b 100644 --- a/app/assets/javascripts/service_ping_consent.js +++ b/app/assets/javascripts/service_ping_consent.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { createAlert } from './flash'; +import { createAlert } from '~/alert'; import axios from './lib/utils/axios_utils'; import { parseBoolean } from './lib/utils/common_utils'; import { __ } from './locale'; diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index e7d028e8d23..270d7f0d182 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -1,7 +1,7 @@ <script> import { GlToast, GlTooltipDirective, GlModal } from '@gitlab/ui'; import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { s__ } from '~/locale'; import { updateUserStatus } from '~/rest_api'; diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue index 323f6f23df6..d65c950b33a 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue @@ -1,6 +1,6 @@ <script> import { GlIcon } from '@gitlab/ui'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; export default { @@ -32,7 +32,7 @@ export default { ); }, isMergeRequest() { - return this.issuableType === IssuableType.MergeRequest; + return this.issuableType === TYPE_MERGE_REQUEST; }, hasMergeIcon() { const canMerge = this.user.mergeRequestInteraction?.canMerge || this.user.can_merge; diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue index 73cd0044c16..2c6eb0e5001 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue @@ -1,6 +1,6 @@ <script> import { GlTooltipDirective, GlLink } from '@gitlab/ui'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { isGid, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; import { isUserBusy } from '~/set_status_modal/utils'; @@ -73,7 +73,7 @@ export default { }, computed: { isMergeRequest() { - return this.issuableType === IssuableType.MergeRequest; + return this.issuableType === TYPE_MERGE_REQUEST; }, cannotMerge() { const canMerge = this.user.mergeRequestInteraction?.canMerge || this.user.can_merge; diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue index 93fcf2cf1c9..319699b88f3 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue @@ -1,6 +1,5 @@ <script> import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { IssuableType } from '~/issues/constants'; import { assigneesQueries } from '../../constants'; export default { @@ -22,9 +21,6 @@ export default { }, }, computed: { - issuableClass() { - return Object.keys(IssuableType).find((key) => IssuableType[key] === this.issuableType); - }, issuableId() { return this.issuable?.id; }, diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue index d2f0ceb19c9..884edc97016 100644 --- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import { isUserBusy } from '~/set_status_modal/utils'; import CollapsedAssignee from './collapsed_assignee.vue'; @@ -47,7 +47,7 @@ export default { }, computed: { isMergeRequest() { - return this.issuableType === 'merge_request'; + return this.issuableType === TYPE_MERGE_REQUEST; }, hasNoUsers() { return !this.users.length; diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue index caf3bb2f798..062f63175a7 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue @@ -1,6 +1,6 @@ <script> import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; import { __ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue index 8893e90b1e5..ae81dcb95de 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue @@ -1,8 +1,8 @@ <script> import { GlDropdownItem } from '@gitlab/ui'; import Vue from 'vue'; -import { createAlert } from '~/flash'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { createAlert } from '~/alert'; +import { TYPE_ALERT, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, n__ } from '~/locale'; import UserSelect from '~/vue_shared/components/user_select/user_select.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -60,7 +60,7 @@ export default { required: false, default: TYPE_ISSUE, validator(value) { - return [TYPE_ISSUE, IssuableType.MergeRequest, IssuableType.Alert].includes(value); + return [TYPE_ISSUE, TYPE_MERGE_REQUEST, TYPE_ALERT].includes(value); }, }, issuableId: { diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_invite_members.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_invite_members.vue index 28bc5afc1a4..b41d126be68 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_invite_members.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_invite_members.vue @@ -4,8 +4,6 @@ import { __ } from '~/locale'; export default { displayText: __('Invite members'), - dataTrackLabel: 'edit_assignee', - dataTrackEvent: 'click_invite_members', components: { InviteMembersTrigger, }, @@ -27,8 +25,6 @@ export default { <invite-members-trigger trigger-element="anchor" :display-text="$options.displayText" - :event="$options.dataTrackEvent" - :label="$options.dataTrackLabel" :trigger-source="triggerSource" classes="gl-display-block gl-pl-0 gl-hover-text-decoration-none gl-hover-text-blue-800!" /> diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue index ddbd8866680..8b40b48b54a 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue @@ -1,6 +1,6 @@ <script> import { GlAvatarLabeled, GlIcon } from '@gitlab/ui'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { s__, sprintf } from '~/locale'; const AVAILABILITY_STATUS = { @@ -39,7 +39,7 @@ export default { ); }, hasCannotMergeIcon() { - return this.issuableType === IssuableType.MergeRequest && !this.user.canMerge; + return this.issuableType === TYPE_MERGE_REQUEST && !this.user.canMerge; }, }, }; diff --git a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue index 71f349bb87e..b424d9074d0 100644 --- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue @@ -1,6 +1,6 @@ <script> import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import AssigneeAvatarLink from './assignee_avatar_link.vue'; import UserNameWithStatus from './user_name_with_status.vue'; @@ -53,7 +53,7 @@ export default { return `@${this.firstUser.username}`; }, isMergeRequest() { - return this.issuableType === IssuableType.MergeRequest; + return this.issuableType === TYPE_MERGE_REQUEST; }, }, methods: { @@ -61,7 +61,7 @@ export default { this.showLess = !this.showLess; }, userAvailability(u) { - if (this.issuableType === IssuableType.MergeRequest) { + if (this.issuableType === TYPE_MERGE_REQUEST) { return u?.availability || ''; } return u?.status?.availability || ''; diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_content.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_content.vue index 1eeb725d5c9..196a86a931a 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_content.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_content.vue @@ -1,7 +1,7 @@ <script> import { GlIcon, GlAlert, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; -import { TYPE_EPIC, WorkspaceType } from '~/issues/constants'; +import { TYPE_EPIC, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { confidentialityInfoText } from '~/vue_shared/constants'; export default { @@ -25,7 +25,7 @@ export default { computed: { confidentialBodyText() { return confidentialityInfoText( - this.issuableType === TYPE_EPIC ? WorkspaceType.group : WorkspaceType.project, + this.issuableType === TYPE_EPIC ? WORKSPACE_GROUP : WORKSPACE_PROJECT, this.issuableType, ); }, diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue index f7526bcff3d..3038cec03eb 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue @@ -1,6 +1,6 @@ <script> import { GlSprintf, GlButton } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import { confidentialityQueries } from '../../constants'; diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue index c2f239b56c7..9177baec246 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue @@ -1,7 +1,7 @@ <script> import produce from 'immer'; import Vue from 'vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, sprintf } from '~/locale'; import { confidentialityQueries, Tracking } from '../../constants'; import SidebarEditableItem from '../sidebar_editable_item.vue'; diff --git a/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue b/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue index c9ecaf4102f..916ff70a5ea 100644 --- a/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue +++ b/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue @@ -1,7 +1,7 @@ <script> import { GlIcon, GlLink, GlPopover, GlTooltipDirective } from '@gitlab/ui'; import { __, n__, sprintf } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { TYPENAME_ISSUE } from '~/graphql_shared/constants'; import getIssueCrmContactsQuery from '../../queries/get_issue_crm_contacts.query.graphql'; diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue index 77be8022ec0..190b8c1de62 100644 --- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue +++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlDatepicker, GlTooltipDirective, GlLink, GlPopover } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility'; import { __, sprintf } from '~/locale'; @@ -54,6 +54,16 @@ export default { type: Boolean, default: false, }, + minDate: { + required: false, + type: Date, + default: null, + }, + maxDate: { + required: false, + type: Date, + default: null, + }, }, data() { return { @@ -292,6 +302,8 @@ export default { v-if="!isLoading" ref="datePicker" class="gl-relative" + :min-date="minDate" + :max-date="maxDate" :default-date="parsedDate" :first-day="firstDay" show-clear-button diff --git a/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue b/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue index f7daad63f45..6db332a82da 100644 --- a/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue +++ b/app/assets/javascripts/sidebar/components/incidents/sidebar_escalation_status.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { logError } from '~/lib/logger'; import EscalationStatus from 'ee_else_ce/sidebar/components/incidents/escalation_status.vue'; import { diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue index b8afa67a947..227d85d952b 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/dropdown_contents_create_view.vue @@ -92,10 +92,14 @@ export default { /> </div> <div class="color-input-container gl-display-flex"> - <span - class="dropdown-label-color-preview position-relative position-relative d-inline-block" - :style="{ backgroundColor: selectedColor }" - ></span> + <gl-form-input + v-model.trim="selectedColor" + class="gl-rounded-top-right-none gl-rounded-bottom-right-none gl-mr-n1 gl-mb-2 gl-w-8" + type="color" + :value="selectedColor" + :placeholder="__('Open color picker')" + data-testid="selected-color" + /> <gl-form-input v-model.trim="selectedColor" class="gl-rounded-top-left-none gl-rounded-bottom-left-none gl-mb-2" diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/actions.js b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/actions.js index 2dab97826b9..06030003f3c 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/actions.js +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/constants.js b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/constants.js index cd671b4d8f5..852ef0c6283 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/constants.js +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/constants.js @@ -6,8 +6,3 @@ export const DropdownVariant = { Standalone: 'standalone', Embedded: 'embedded', }; - -export const LabelType = { - group: 'group', - project: 'project', -}; diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue index aa1184ed314..1174ec3f01e 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_create_view.vue @@ -8,11 +8,11 @@ import { GlLoadingIcon, } from '@gitlab/ui'; import produce from 'immer'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP } from '~/issues/constants'; import { __ } from '~/locale'; import { workspaceLabelsQueries } from '../../../constants'; import createLabelMutation from './graphql/create_label.mutation.graphql'; -import { LabelType } from './constants'; const errorMessage = __('Error creating label.'); @@ -62,7 +62,7 @@ export default { return Object.keys(colorsMap).map((color) => ({ [color]: colorsMap[color] })); }, mutationVariables() { - const attributePath = this.labelCreateType === LabelType.group ? 'groupPath' : 'projectPath'; + const attributePath = this.labelCreateType === WORKSPACE_GROUP ? 'groupPath' : 'projectPath'; return { title: this.labelTitle, @@ -163,11 +163,14 @@ export default { /> </div> <div class="color-input-container gl-display-flex"> - <span - class="dropdown-label-color-preview gl-relative gl-display-inline-block" + <gl-form-input + v-model.trim="selectedColor" + class="gl-rounded-top-right-none gl-rounded-bottom-right-none gl-mr-n1 gl-mb-2 gl-w-8" + type="color" + :value="selectedColor" + :placeholder="__('Select color')" data-testid="selected-color" - :style="{ backgroundColor: selectedColor }" - ></span> + /> <gl-form-input v-model.trim="selectedColor" class="gl-rounded-top-left-none gl-rounded-bottom-left-none gl-mb-2" diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue index c1939dc7785..e664d6b4bd6 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue @@ -1,7 +1,7 @@ <script> import { GlDropdownForm, GlDropdownItem, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; import { workspaceLabelsQueries } from '../../../constants'; diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue index bf916e26a15..3aa4215443e 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue @@ -2,9 +2,9 @@ import { debounce } from 'lodash'; import issuableLabelsSubscription from 'ee_else_ce/sidebar/queries/issuable_labels.subscription.graphql'; import { MutationOperationMode, getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { IssuableType, TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_EPIC, TYPE_ISSUE, TYPE_MERGE_REQUEST, TYPE_TEST_CASE } from '~/issues/constants'; import { __ } from '~/locale'; import { issuableLabelsQueries } from '../../../constants'; @@ -166,7 +166,7 @@ export default { fullPath: this.fullPath, }; - if (this.issuableType === IssuableType.TestCase) { + if (this.issuableType === TYPE_TEST_CASE) { queryVariables.types = ['TEST_CASE']; } @@ -262,9 +262,9 @@ export default { switch (this.issuableType) { case TYPE_ISSUE: - case IssuableType.TestCase: + case TYPE_TEST_CASE: return updateVariables; - case IssuableType.MergeRequest: + case TYPE_MERGE_REQUEST: return { ...updateVariables, operationMode: MutationOperationMode.Replace, @@ -319,12 +319,12 @@ export default { switch (this.issuableType) { case TYPE_ISSUE: - case IssuableType.TestCase: + case TYPE_TEST_CASE: return { ...removeVariables, removeLabelIds: [labelId], }; - case IssuableType.MergeRequest: + case TYPE_MERGE_REQUEST: return { ...removeVariables, labelIds: [labelId], diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue index df03af346c0..606d374158b 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import $ from 'jquery'; import { mapActions } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, sprintf } from '~/locale'; import eventHub from '../../event_hub'; @@ -49,11 +49,11 @@ export default { fullPath: this.fullPath, }) .catch(() => { - const flashMessage = __( + const alertMessage = __( 'Something went wrong trying to change the locked state of this %{issuableDisplayName}', ); createAlert({ - message: sprintf(flashMessage, { issuableDisplayName: this.issuableDisplayName }), + message: sprintf(alertMessage, { issuableDisplayName: this.issuableDisplayName }), }); }) .finally(() => { diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue index 9d8f1304911..1eff4db3970 100644 --- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue +++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue @@ -1,10 +1,10 @@ <script> import { GlIcon, GlTooltipDirective, GlOutsideDirective as Outside } from '@gitlab/ui'; import { mapGetters, mapActions } from 'vuex'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import toast from '~/vue_shared/plugins/global_toast'; import eventHub from '../../event_hub'; import EditForm from './edit_form.vue'; @@ -46,7 +46,9 @@ export default { computed: { ...mapGetters(['getNoteableData']), isMergeRequest() { - return this.getNoteableData.targetType === 'merge_request' && this.glFeatures.movedMrSidebar; + return ( + this.getNoteableData.targetType === TYPE_MERGE_REQUEST && this.glFeatures.movedMrSidebar + ); }, issuableDisplayName() { const isInIssuePage = this.getNoteableData.targetType === TYPE_ISSUE; @@ -92,11 +94,11 @@ export default { } }) .catch(() => { - const flashMessage = __( + const alertMessage = __( 'Something went wrong trying to change the locked state of this %{issuableDisplayName}', ); createAlert({ - message: sprintf(flashMessage, { issuableDisplayName: this.issuableDisplayName }), + message: sprintf(alertMessage, { issuableDisplayName: this.issuableDisplayName }), }); }) .finally(() => { diff --git a/app/assets/javascripts/sidebar/components/milestone/milestone_dropdown.vue b/app/assets/javascripts/sidebar/components/milestone/milestone_dropdown.vue index 8072154cd28..24afb25e403 100644 --- a/app/assets/javascripts/sidebar/components/milestone/milestone_dropdown.vue +++ b/app/assets/javascripts/sidebar/components/milestone/milestone_dropdown.vue @@ -2,7 +2,12 @@ import { GlDropdownItem } from '@gitlab/ui'; import { TYPENAME_MILESTONE } from '~/graphql_shared/constants'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { IssuableType, TYPE_ISSUE, WorkspaceType } from '~/issues/constants'; +import { + TYPE_ISSUE, + TYPE_MERGE_REQUEST, + WORKSPACE_GROUP, + WORKSPACE_PROJECT, +} from '~/issues/constants'; import { __ } from '~/locale'; import { IssuableAttributeType } from '../../constants'; import SidebarDropdown from '../sidebar_dropdown.vue'; @@ -37,7 +42,7 @@ export default { type: String, required: true, validator(value) { - return [TYPE_ISSUE, IssuableType.MergeRequest].includes(value); + return [TYPE_ISSUE, TYPE_MERGE_REQUEST].includes(value); }, }, inputName: { @@ -64,7 +69,7 @@ export default { type: String, required: true, validator(value) { - return [WorkspaceType.group, WorkspaceType.project].includes(value); + return [WORKSPACE_GROUP, WORKSPACE_PROJECT].includes(value); }, }, }, diff --git a/app/assets/javascripts/sidebar/components/move/move_issue_button.vue b/app/assets/javascripts/sidebar/components/move/move_issue_button.vue index e1259fad6a7..76c47305369 100644 --- a/app/assets/javascripts/sidebar/components/move/move_issue_button.vue +++ b/app/assets/javascripts/sidebar/components/move/move_issue_button.vue @@ -1,7 +1,7 @@ <script> import ProjectSelect from '~/sidebar/components/move/issuable_move_dropdown.vue'; import { __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { visitUrl } from '~/lib/utils/url_utility'; import moveIssueMutation from '../../queries/move_issue.mutation.graphql'; diff --git a/app/assets/javascripts/sidebar/components/move/move_issues_button.vue b/app/assets/javascripts/sidebar/components/move/move_issues_button.vue index ab4ac9500ad..68c8b35c009 100644 --- a/app/assets/javascripts/sidebar/components/move/move_issues_button.vue +++ b/app/assets/javascripts/sidebar/components/move/move_issues_button.vue @@ -1,6 +1,6 @@ <script> import { GlAlert } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { logError } from '~/lib/logger'; import { s__ } from '~/locale'; import { diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue index 2f25c2fd4b0..a9d102eb303 100644 --- a/app/assets/javascripts/sidebar/components/participants/participants.vue +++ b/app/assets/javascripts/sidebar/components/participants/participants.vue @@ -99,7 +99,7 @@ export default { > <gl-icon name="users" /> <gl-loading-icon v-if="loading" size="sm" /> - <span v-else data-testid="collapsed-count" class="gl-pt-2 gl-px-3 gl-font-sm"> + <span v-else class="gl-pt-2 gl-px-3 gl-font-sm"> {{ participantCount }} </span> </div> @@ -114,9 +114,12 @@ export default { <div v-for="participant in visibleParticipants" :key="participant.id" - class="participants-author gl-display-inline-block gl-pr-3 gl-pb-3" + class="participants-author gl-display-inline-block gl-mr-3 gl-mb-3" > - <a :href="participant.web_url || participant.webUrl" class="author-link"> + <a + :href="participant.web_url || participant.webUrl" + class="author-link gl-display-inline-block gl-rounded-full" + > <user-avatar-image :lazy="lazy" :img-src="participant.avatar_url || participant.avatarUrl" @@ -133,7 +136,6 @@ export default { <gl-button variant="link" button-text-classes="gl-text-secondary" - data-testid="more-participants" @click="toggleMoreParticipants" >{{ toggleLabel }}</gl-button > diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue index 56ac4c39e84..80c051f86b5 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue @@ -2,7 +2,7 @@ // NOTE! For the first iteration, we are simply copying the implementation of Assignees // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736 import { GlTooltipDirective, GlLink } from '@gitlab/ui'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import ReviewerAvatar from './reviewer_avatar.vue'; @@ -41,7 +41,9 @@ export default { }, computed: { cannotMerge() { - return this.issuableType === 'merge_request' && !this.user.mergeRequestInteraction?.canMerge; + return ( + this.issuableType === TYPE_MERGE_REQUEST && !this.user.mergeRequestInteraction?.canMerge + ); }, tooltipTitle() { if (this.cannotMerge && this.tooltipHasName) { diff --git a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue index 8dd58d33ecf..9c23f239b4c 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue @@ -3,7 +3,7 @@ // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736 import Vue from 'vue'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPE_ISSUE } from '~/issues/constants'; import { __ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; diff --git a/app/assets/javascripts/sidebar/components/severity/sidebar_severity_widget.vue b/app/assets/javascripts/sidebar/components/severity/sidebar_severity_widget.vue index ecb9a2809a0..55de0ceb388 100644 --- a/app/assets/javascripts/sidebar/components/severity/sidebar_severity_widget.vue +++ b/app/assets/javascripts/sidebar/components/severity/sidebar_severity_widget.vue @@ -1,9 +1,10 @@ <script> import { GlDropdown, GlDropdownItem, GlTooltip, GlSprintf } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { TYPE_INCIDENT } from '~/issues/constants'; import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue'; import updateIssuableSeverity from '../../queries/update_issuable_severity.mutation.graphql'; -import { INCIDENT_SEVERITY, ISSUABLE_TYPES, SEVERITY_I18N as I18N } from '../../constants'; +import { INCIDENT_SEVERITY, SEVERITY_I18N as I18N } from '../../constants'; import SeverityToken from './severity.vue'; export default { @@ -34,10 +35,10 @@ export default { issuableType: { type: String, required: false, - default: ISSUABLE_TYPES.INCIDENT, + default: TYPE_INCIDENT, validator: (value) => { // currently severity is supported only for incidents, but this list might be extended - return [ISSUABLE_TYPES.INCIDENT].includes(value); + return [TYPE_INCIDENT].includes(value); }, }, }, @@ -50,7 +51,7 @@ export default { computed: { severitiesList() { switch (this.issuableType) { - case ISSUABLE_TYPES.INCIDENT: + case TYPE_INCIDENT: return Object.values(INCIDENT_SEVERITY); default: return []; diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue index d68e4974ea4..50b4284cde0 100644 --- a/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue +++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown.vue @@ -8,7 +8,13 @@ import { GlSearchBoxByType, } from '@gitlab/ui'; import { kebabCase, snakeCase } from 'lodash'; -import { IssuableType, TYPE_EPIC, TYPE_ISSUE, WorkspaceType } from '~/issues/constants'; +import { + TYPE_EPIC, + TYPE_ISSUE, + TYPE_MERGE_REQUEST, + WORKSPACE_GROUP, + WORKSPACE_PROJECT, +} from '~/issues/constants'; import { __ } from '~/locale'; import { defaultEpicSort, @@ -21,7 +27,7 @@ import { LocalizedIssuableAttributeType, noAttributeId, } from 'ee_else_ce/sidebar/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { PathIdSeparator } from '~/related_issues/constants'; export default { @@ -70,15 +76,15 @@ export default { type: String, required: true, validator(value) { - return [TYPE_ISSUE, IssuableType.MergeRequest].includes(value); + return [TYPE_ISSUE, TYPE_MERGE_REQUEST].includes(value); }, }, workspaceType: { type: String, required: false, - default: WorkspaceType.project, + default: WORKSPACE_PROJECT, validator(value) { - return [WorkspaceType.group, WorkspaceType.project].includes(value); + return [WORKSPACE_GROUP, WORKSPACE_PROJECT].includes(value); }, }, }, diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue index 5df65c4aaaf..19e72da65f2 100644 --- a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue +++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue @@ -1,9 +1,9 @@ <script> import { GlButton, GlIcon, GlLink, GlPopover, GlTooltipDirective } from '@gitlab/ui'; import { kebabCase, snakeCase } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { IssuableType, TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_EPIC, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { timeFor } from '~/lib/utils/datetime_utility'; import { __ } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -71,7 +71,7 @@ export default { type: String, required: true, validator(value) { - return [TYPE_ISSUE, IssuableType.MergeRequest].includes(value); + return [TYPE_ISSUE, TYPE_MERGE_REQUEST].includes(value); }, }, icon: { diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue index cbe839d1112..344fa880131 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue @@ -1,7 +1,12 @@ <script> import { GlDropdownForm, GlIcon, GlLoadingIcon, GlToggle, GlTooltipDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; -import { IssuableType, TYPE_EPIC } from '~/issues/constants'; +import { createAlert } from '~/alert'; +import { + TYPE_EPIC, + TYPE_MERGE_REQUEST, + WORKSPACE_GROUP, + WORKSPACE_PROJECT, +} from '~/issues/constants'; import { isLoggedIn } from '~/lib/utils/common_utils'; import { __, sprintf } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; @@ -87,7 +92,7 @@ export default { }, computed: { isMergeRequest() { - return this.issuableType === IssuableType.MergeRequest && this.glFeatures.movedMrSidebar; + return this.issuableType === TYPE_MERGE_REQUEST && this.glFeatures.movedMrSidebar; }, isLoading() { return this.$apollo.queries?.subscribed?.loading || this.loading; @@ -109,7 +114,7 @@ export default { }, subscribeDisabledDescription() { return sprintf(__('Disabled by %{parent} owner'), { - parent: this.parentIsGroup ? 'group' : 'project', + parent: this.parentIsGroup ? WORKSPACE_GROUP : WORKSPACE_PROJECT, }); }, isLoggedIn() { diff --git a/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue b/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue index 964da3b6138..9b582ba41ed 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue @@ -29,7 +29,11 @@ export default { GlLink, GlSprintf, }, - inject: ['issuableType'], + inject: { + issuableType: { + default: null, + }, + }, props: { issuableId: { type: String, @@ -52,13 +56,11 @@ export default { primaryProps() { return { text: s__('CreateTimelogForm|Save'), - attributes: [ - { - variant: 'confirm', - disabled: this.submitDisabled, - loading: this.isLoading, - }, - ], + attributes: { + variant: 'confirm', + disabled: this.submitDisabled, + loading: this.isLoading, + }, }; }, cancelProps() { diff --git a/app/assets/javascripts/sidebar/components/time_tracking/report.vue b/app/assets/javascripts/sidebar/components/time_tracking/report.vue index cffbb6466f2..109e1af85ec 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/report.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/report.vue @@ -1,6 +1,6 @@ <script> import { GlLoadingIcon, GlTableLite, GlButton, GlTooltipDirective } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_ISSUE, TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; import { TYPE_ISSUE } from '~/issues/constants'; diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index c645b1649d2..f6968558122 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -8,7 +8,7 @@ import { GlLoadingIcon, GlTooltipDirective, } from '@gitlab/ui'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { s__, __ } from '~/locale'; @@ -173,7 +173,7 @@ export default { return Boolean(this.showHelp); }, isTimeReportSupported() { - return [TYPE_ISSUE, IssuableType.MergeRequest].includes(this.issuableType) && this.issuableId; + return [TYPE_ISSUE, TYPE_MERGE_REQUEST].includes(this.issuableType) && this.issuableId; }, timeTrackingIconTitle() { return this.showHelpState ? '' : HOW_TO_TRACK_TIME; diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue index b86ff279fd8..551d306a9c4 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue @@ -1,7 +1,8 @@ <script> import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { produce } from 'immer'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { TYPE_MERGE_REQUEST } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import Tracking from '~/tracking'; @@ -83,7 +84,7 @@ export default { }, computed: { isMergeRequest() { - return this.glFeatures.movedMrSidebar && this.issuableType === 'merge_request'; + return this.glFeatures.movedMrSidebar && this.issuableType === TYPE_MERGE_REQUEST; }, todoIdQuery() { return todoQueries[this.issuableType].query; diff --git a/app/assets/javascripts/sidebar/constants.js b/app/assets/javascripts/sidebar/constants.js index 14491226b15..7bca83c4142 100644 --- a/app/assets/javascripts/sidebar/constants.js +++ b/app/assets/javascripts/sidebar/constants.js @@ -3,7 +3,15 @@ import { s__, __, sprintf } from '~/locale'; import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql'; import userSearchQuery from '~/graphql_shared/queries/users_search.query.graphql'; import userSearchWithMRPermissionsQuery from '~/graphql_shared/queries/users_search_with_mr_permissions.graphql'; -import { IssuableType, TYPE_EPIC, TYPE_ISSUE, WorkspaceType } from '~/issues/constants'; +import { + TYPE_ALERT, + TYPE_EPIC, + TYPE_ISSUE, + TYPE_MERGE_REQUEST, + TYPE_TEST_CASE, + WORKSPACE_GROUP, + WORKSPACE_PROJECT, +} from '~/issues/constants'; import updateAlertAssigneesMutation from '~/vue_shared/alert_details/graphql/mutations/alert_set_assignees.mutation.graphql'; import updateTestCaseLabelsMutation from './components/labels/labels_select_widget/graphql/update_test_case_labels.mutation.graphql'; import epicLabelsQuery from './components/labels/labels_select_widget/graphql/epic_labels.query.graphql'; @@ -69,11 +77,11 @@ export const assigneesQueries = { subscription: issuableAssigneesSubscription, mutation: updateIssueAssigneesMutation, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: getMergeRequestAssignees, mutation: updateMergeRequestAssigneesMutation, }, - [IssuableType.Alert]: { + [TYPE_ALERT]: { query: getAlertAssignees, mutation: updateAlertAssigneesMutation, }, @@ -83,13 +91,13 @@ export const participantsQueries = { [TYPE_ISSUE]: { query: issueParticipantsQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: getMergeRequestParticipants, }, [TYPE_EPIC]: { query: epicParticipantsQuery, }, - [IssuableType.Alert]: { + [TYPE_ALERT]: { query: '', skipQuery: true, }, @@ -99,7 +107,7 @@ export const userSearchQueries = { [TYPE_ISSUE]: { query: userSearchQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: userSearchWithMRPermissionsQuery, }, }; @@ -119,7 +127,7 @@ export const referenceQueries = { [TYPE_ISSUE]: { query: issueReferenceQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: mergeRequestReferenceQuery, }, [TYPE_EPIC]: { @@ -128,10 +136,10 @@ export const referenceQueries = { }; export const workspaceLabelsQueries = { - [WorkspaceType.project]: { + [WORKSPACE_PROJECT]: { query: projectLabelsQuery, }, - [WorkspaceType.group]: { + [WORKSPACE_GROUP]: { query: groupLabelsQuery, }, }; @@ -142,7 +150,7 @@ export const issuableLabelsQueries = { mutation: updateIssueLabelsMutation, mutationName: 'updateIssue', }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { issuableQuery: mergeRequestLabelsQuery, mutation: updateMergeRequestLabelsMutation, mutationName: 'mergeRequestSetLabels', @@ -152,7 +160,7 @@ export const issuableLabelsQueries = { mutation: updateEpicLabelsMutation, mutationName: 'updateEpic', }, - [IssuableType.TestCase]: { + [TYPE_TEST_CASE]: { issuableQuery: issueLabelsQuery, mutation: updateTestCaseLabelsMutation, mutationName: 'updateTestCaseLabels', @@ -186,7 +194,7 @@ export const subscribedQueries = { query: epicSubscribedQuery, mutation: updateEpicSubscriptionMutation, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: mergeRequestSubscribed, mutation: updateMergeRequestSubscriptionMutation, }, @@ -201,7 +209,7 @@ export const timeTrackingQueries = { [TYPE_ISSUE]: { query: issueTimeTrackingQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: mergeRequestTimeTrackingQuery, }, }; @@ -228,7 +236,7 @@ export const timelogQueries = { [TYPE_ISSUE]: { query: getIssueTimelogsQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: getMrTimelogsQuery, }, }; @@ -240,7 +248,7 @@ export const issuableMilestoneQueries = { query: projectIssueMilestoneQuery, mutation: projectIssueMilestoneMutation, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: mergeRequestMilestone, mutation: mergeRequestMilestoneMutation, }, @@ -249,14 +257,14 @@ export const issuableMilestoneQueries = { export const milestonesQueries = { [TYPE_ISSUE]: { query: { - [WorkspaceType.group]: groupMilestonesQuery, - [WorkspaceType.project]: projectMilestonesQuery, + [WORKSPACE_GROUP]: groupMilestonesQuery, + [WORKSPACE_PROJECT]: projectMilestonesQuery, }, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: { - [WorkspaceType.group]: groupMilestonesQuery, - [WorkspaceType.project]: projectMilestonesQuery, + [WORKSPACE_GROUP]: groupMilestonesQuery, + [WORKSPACE_PROJECT]: projectMilestonesQuery, }, }, }; @@ -289,7 +297,7 @@ export const todoQueries = { [TYPE_ISSUE]: { query: issueTodoQuery, }, - [IssuableType.MergeRequest]: { + [TYPE_MERGE_REQUEST]: { query: mergeRequestTodoQuery, }, }; @@ -407,10 +415,6 @@ export const INCIDENT_SEVERITY = { }, }; -export const ISSUABLE_TYPES = { - INCIDENT: 'incident', -}; - export const MILESTONE_STATE = { ACTIVE: 'active', CLOSED: 'closed', diff --git a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js index b908cf0cd9e..b0060e4c28d 100644 --- a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js @@ -1,5 +1,4 @@ import Vue from 'vue'; -import { IssuableType } from '~/issues/constants'; import { parseBoolean } from '~/lib/utils/common_utils'; import TimeTracker from './components/time_tracking/time_tracker.vue'; @@ -25,9 +24,6 @@ export default class SidebarMilestone { components: { TimeTracker, }, - provide: { - issuableType: IssuableType.Milestone, - }, render: (createElement) => createElement('time-tracker', { props: { diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js index fb024d818da..99c3fdf82d4 100644 --- a/app/assets/javascripts/sidebar/mount_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_sidebar.js @@ -4,7 +4,7 @@ import { TYPENAME_ISSUE, TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constan import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST, WORKSPACE_PROJECT } from '~/issues/constants'; import { gqlClient } from '~/issues/list/graphql'; import { isInDesignPage, @@ -25,7 +25,6 @@ import CopyEmailToClipboard from './components/copy/copy_email_to_clipboard.vue' import SidebarDueDateWidget from './components/date/sidebar_date_widget.vue'; import SidebarEscalationStatus from './components/incidents/sidebar_escalation_status.vue'; import { DropdownVariant } from './components/labels/labels_select_vue/constants'; -import { LabelType } from './components/labels/labels_select_widget/constants'; import LabelsSelectWidget from './components/labels/labels_select_widget/labels_select_root.vue'; import IssuableLockForm from './components/lock/issuable_lock_form.vue'; import MilestoneDropdown from './components/milestone/milestone_dropdown.vue'; @@ -81,7 +80,7 @@ function mountSidebarTodoWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, }, }), }); @@ -125,7 +124,7 @@ function mountSidebarAssigneesDeprecated(mediator) { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, issuableId: id, assigneeAvailabilityStatus, }, @@ -142,7 +141,7 @@ function mountSidebarAssigneesWidget() { const { id, iid, fullPath, editable } = getSidebarOptions(); const isIssuablePage = isInIssuePage() || isInIncidentPage() || isInDesignPage(); - const issuableType = isIssuablePage ? TYPE_ISSUE : IssuableType.MergeRequest; + const issuableType = isIssuablePage ? TYPE_ISSUE : TYPE_MERGE_REQUEST; // eslint-disable-next-line no-new new Vue({ el, @@ -204,8 +203,7 @@ function mountSidebarReviewers(mediator) { issuableIid: String(iid), projectPath: fullPath, field: el.dataset.field, - issuableType: - isInIssuePage() || isInDesignPage() ? TYPE_ISSUE : IssuableType.MergeRequest, + issuableType: isInIssuePage() || isInDesignPage() ? TYPE_ISSUE : TYPE_MERGE_REQUEST, }, }), }); @@ -275,8 +273,7 @@ function mountSidebarMilestoneWidget() { attrWorkspacePath: projectPath, workspacePath: projectPath, iid: issueIid, - issuableType: - isInIssuePage() || isInDesignPage() ? TYPE_ISSUE : IssuableType.MergeRequest, + issuableType: isInIssuePage() || isInDesignPage() ? TYPE_ISSUE : TYPE_MERGE_REQUEST, issuableAttribute: IssuableAttributeType.Milestone, icon: 'clock', }, @@ -313,7 +310,7 @@ export function mountMilestoneDropdown() { attrWorkspacePath: fullPath, canAdminMilestone, inputName, - issuableType: isInIssuePage() ? TYPE_ISSUE : IssuableType.MergeRequest, + issuableType: isInIssuePage() ? TYPE_ISSUE : TYPE_MERGE_REQUEST, milestoneId, milestoneTitle, projectMilestonesPath, @@ -358,10 +355,10 @@ export function mountSidebarLabelsWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, - workspaceType: 'project', + : TYPE_MERGE_REQUEST, + workspaceType: WORKSPACE_PROJECT, attrWorkspacePath: el.dataset.projectPath, - labelCreateType: LabelType.project, + labelCreateType: WORKSPACE_PROJECT, }, class: ['block labels js-labels-block'], scopedSlots: { @@ -398,7 +395,7 @@ function mountSidebarConfidentialityWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, }, }), }); @@ -454,7 +451,7 @@ function mountSidebarReferenceWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, }, }), }); @@ -506,7 +503,7 @@ function mountSidebarParticipantsWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, }, }), }); @@ -536,7 +533,7 @@ function mountSidebarSubscriptionsWidget() { issuableType: isInIssuePage() || isInIncidentPage() || isInDesignPage() ? TYPE_ISSUE - : IssuableType.MergeRequest, + : TYPE_MERGE_REQUEST, }, }), }); diff --git a/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql b/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql index 9b0a8b4a8f7..690eb75f8f4 100644 --- a/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql +++ b/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql @@ -4,6 +4,7 @@ mutation updateEpicDueDate($input: UpdateEpicInput!) { id dueDateIsFixed dueDateFixed + dueDate dueDateFromMilestones } errors diff --git a/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql b/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql index 9b4bb9159c3..d2a598a00fa 100644 --- a/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql +++ b/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql @@ -4,6 +4,7 @@ mutation updateEpicStartDate($input: UpdateEpicInput!) { id startDateIsFixed startDateFixed + startDate startDateFromMilestones } errors diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js index c6a66ab2275..7353694a324 100644 --- a/app/assets/javascripts/sidebar/sidebar_mediator.js +++ b/app/assets/javascripts/sidebar/sidebar_mediator.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import toast from '~/vue_shared/plugins/global_toast'; import { visitUrl } from '~/lib/utils/url_utility'; diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index 6e5b2ce4dbe..b613e356a7a 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -1,7 +1,7 @@ /* eslint-disable consistent-return */ import $ from 'jquery'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { loadingIconForLegacyJS } from '~/loading_icon_for_legacy_js'; import { spriteIcon } from '~/lib/utils/common_utils'; import FilesCommentButton from './files_comment_button'; diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue index 4a7528d9c8e..151c38d01dc 100644 --- a/app/assets/javascripts/snippets/components/edit.vue +++ b/app/assets/javascripts/snippets/components/edit.vue @@ -2,7 +2,7 @@ import { GlButton, GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui'; import eventHub from '~/blob/components/eventhub'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { redirectTo, joinPaths } from '~/lib/utils/url_utility'; import { __, sprintf } from '~/locale'; import { @@ -141,7 +141,7 @@ export default { Object.assign(e, { returnValue }); return returnValue; }, - flashAPIFailure(err) { + alertAPIFailure(err) { const defaultErrorMsg = this.newSnippet ? SNIPPET_CREATE_MUTATION_ERROR : SNIPPET_UPDATE_MUTATION_ERROR; @@ -190,7 +190,7 @@ export default { const errors = baseObj?.errors; if (errors?.length) { - this.flashAPIFailure(errors[0]); + this.alertAPIFailure(errors[0]); } else { redirectTo(baseObj.snippet.webUrl); } @@ -199,7 +199,7 @@ export default { // eslint-disable-next-line no-console console.error('[gitlab] unexpected error while updating snippet', e); - this.flashAPIFailure(getErrorMessage(e)); + this.alertAPIFailure(getErrorMessage(e)); }); }, updateActions(actions) { diff --git a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue index 7e80928cbea..021bd23781e 100644 --- a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue +++ b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { getBaseURL, joinPaths } from '~/lib/utils/url_utility'; import { sprintf } from '~/locale'; @@ -60,9 +60,9 @@ export default { .then((res) => { this.notifyAboutUpdates({ content: res.data }); }) - .catch((e) => this.flashAPIFailure(e)); + .catch((e) => this.alertAPIFailure(e)); }, - flashAPIFailure(err) { + alertAPIFailure(err) { createAlert({ message: sprintf(SNIPPET_BLOB_CONTENT_FETCH_ERROR, { err }) }); }, }, diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index 759a3f31a05..881e06113d9 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -19,7 +19,7 @@ import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import { createAlert, VARIANT_DANGER, VARIANT_SUCCESS } from '~/flash'; +import { createAlert, VARIANT_DANGER, VARIANT_SUCCESS } from '~/alert'; import DeleteSnippetMutation from '../mutations/delete_snippet.mutation.graphql'; @@ -78,6 +78,7 @@ export default { isSubmittingSpam: false, errorMessage: '', canCreateSnippet: false, + isDeleteModalVisible: false, }; }, computed: { @@ -164,10 +165,10 @@ export default { : `${gon.relative_url_root}dashboard/snippets`; }, closeDeleteModal() { - this.$refs.deleteModal.hide(); + this.isDeleteModalVisible = false; }, showDeleteModal() { - this.$refs.deleteModal.show(); + this.isDeleteModalVisible = true; }, deleteSnippet() { this.isLoading = true; @@ -291,12 +292,22 @@ export default { </div> </div> - <gl-modal ref="deleteModal" modal-id="delete-modal" title="Example title"> + <gl-modal + ref="deleteModal" + v-model="isDeleteModalVisible" + modal-id="delete-modal" + title="Example title" + > <template #modal-title>{{ __('Delete snippet?') }}</template> - <gl-alert v-if="errorMessage" variant="danger" class="mb-2" @dismiss="errorMessage = ''">{{ - errorMessage - }}</gl-alert> + <gl-alert + v-if="errorMessage" + variant="danger" + class="mb-2" + data-testid="delete-alert" + @dismiss="errorMessage = ''" + >{{ errorMessage }}</gl-alert + > <gl-sprintf :message="__('Are you sure you want to delete %{name}?')"> <template #name> @@ -311,6 +322,7 @@ export default { category="primary" :disabled="isLoading" data-qa-selector="delete_snippet_button" + data-testid="delete-snippet" @click="deleteSnippet" > <gl-loading-icon v-if="isLoading" size="sm" inline /> diff --git a/app/assets/javascripts/streaming/chunk_writer.js b/app/assets/javascripts/streaming/chunk_writer.js new file mode 100644 index 00000000000..4bbd0a5f843 --- /dev/null +++ b/app/assets/javascripts/streaming/chunk_writer.js @@ -0,0 +1,144 @@ +import { throttle } from 'lodash'; +import { RenderBalancer } from '~/streaming/render_balancer'; +import { + BALANCE_RATE, + HIGH_FRAME_TIME, + LOW_FRAME_TIME, + MAX_CHUNK_SIZE, + MIN_CHUNK_SIZE, + TIMEOUT, +} from '~/streaming/constants'; + +const defaultConfig = { + balanceRate: BALANCE_RATE, + minChunkSize: MIN_CHUNK_SIZE, + maxChunkSize: MAX_CHUNK_SIZE, + lowFrameTime: LOW_FRAME_TIME, + highFrameTime: HIGH_FRAME_TIME, + timeout: TIMEOUT, +}; + +function concatUint8Arrays(a, b) { + const array = new Uint8Array(a.length + b.length); + array.set(a, 0); + array.set(b, a.length); + return array; +} + +// This class is used to write chunks with a balanced size +// to avoid blocking main thread for too long. +// +// A chunk can be: +// 1. Too small +// 2. Too large +// 3. Delayed in time +// +// This class resolves all these problems by +// 1. Splitting or concatenating chunks to met the size criteria +// 2. Rendering current chunk buffer immediately if enough time has passed +// +// The size of the chunk is determined by RenderBalancer, +// It measures execution time for each chunk write and adjusts next chunk size. +export class ChunkWriter { + buffer = null; + decoder = new TextDecoder('utf-8'); + timeout = null; + + constructor(htmlStream, config) { + this.htmlStream = htmlStream; + + const { balanceRate, minChunkSize, maxChunkSize, lowFrameTime, highFrameTime, timeout } = { + ...defaultConfig, + ...config, + }; + + // ensure we still render chunks over time if the size criteria is not met + this.scheduleAccumulatorFlush = throttle(this.flushAccumulator.bind(this), timeout); + + const averageSize = Math.round((maxChunkSize + minChunkSize) / 2); + this.size = Math.max(averageSize, minChunkSize); + + this.balancer = new RenderBalancer({ + lowFrameTime, + highFrameTime, + decrease: () => { + this.size = Math.round(Math.max(this.size / balanceRate, minChunkSize)); + }, + increase: () => { + this.size = Math.round(Math.min(this.size * balanceRate, maxChunkSize)); + }, + }); + } + + write(chunk) { + this.scheduleAccumulatorFlush.cancel(); + + if (this.buffer) { + this.buffer = concatUint8Arrays(this.buffer, chunk); + } else { + this.buffer = chunk; + } + + // accumulate chunks until the size is fulfilled + if (this.size > this.buffer.length) { + this.scheduleAccumulatorFlush(); + return Promise.resolve(); + } + + return this.balancedWrite(); + } + + balancedWrite() { + let cursor = 0; + + return this.balancer.render(() => { + const chunkPart = this.buffer.subarray(cursor, cursor + this.size); + // accumulate chunks until the size is fulfilled + // this is a hot path for the last chunkPart of the chunk + if (chunkPart.length < this.size) { + this.buffer = chunkPart; + this.scheduleAccumulatorFlush(); + return false; + } + + this.writeToDom(chunkPart); + + cursor += this.size; + if (cursor >= this.buffer.length) { + this.buffer = null; + return false; + } + // continue render + return true; + }); + } + + writeToDom(chunk, stream = true) { + // stream: true allows us to split chunks with multi-part words + const decoded = this.decoder.decode(chunk, { stream }); + this.htmlStream.write(decoded); + } + + flushAccumulator() { + if (this.buffer) { + this.writeToDom(this.buffer); + this.buffer = null; + } + } + + close() { + this.scheduleAccumulatorFlush.cancel(); + if (this.buffer) { + // last chunk should have stream: false to indicate the end of the stream + this.writeToDom(this.buffer, false); + this.buffer = null; + } + this.htmlStream.close(); + } + + abort() { + this.scheduleAccumulatorFlush.cancel(); + this.buffer = null; + this.htmlStream.abort(); + } +} diff --git a/app/assets/javascripts/streaming/constants.js b/app/assets/javascripts/streaming/constants.js new file mode 100644 index 00000000000..224d93a7ac1 --- /dev/null +++ b/app/assets/javascripts/streaming/constants.js @@ -0,0 +1,9 @@ +// Lower min chunk numbers can make the page loading take incredibly long +export const MIN_CHUNK_SIZE = 128 * 1024; +export const MAX_CHUNK_SIZE = 2048 * 1024; +export const LOW_FRAME_TIME = 32; +// Tasks that take more than 50ms are considered Long +// https://web.dev/optimize-long-tasks/ +export const HIGH_FRAME_TIME = 64; +export const BALANCE_RATE = 1.2; +export const TIMEOUT = 500; diff --git a/app/assets/javascripts/streaming/handle_streamed_anchor_link.js b/app/assets/javascripts/streaming/handle_streamed_anchor_link.js new file mode 100644 index 00000000000..315dc9bb0a0 --- /dev/null +++ b/app/assets/javascripts/streaming/handle_streamed_anchor_link.js @@ -0,0 +1,26 @@ +import { throttle } from 'lodash'; +import { scrollToElement } from '~/lib/utils/common_utils'; +import LineHighlighter from '~/blob/line_highlighter'; + +const noop = () => {}; + +export function handleStreamedAnchorLink(rootElement) { + // "#L100-200" → ['L100', 'L200'] + const [anchorStart, end] = window.location.hash.substring(1).split('-'); + const anchorEnd = end ? `L${end}` : anchorStart; + if (!anchorStart || document.getElementById(anchorEnd)) return noop; + + const handler = throttle((mutationList, instance) => { + if (!document.getElementById(anchorEnd)) return; + scrollToElement(document.getElementById(anchorStart)); + // eslint-disable-next-line no-new + new LineHighlighter(); + instance.disconnect(); + }, 300); + + const observer = new MutationObserver(handler); + + observer.observe(rootElement, { childList: true, subtree: true }); + + return () => observer.disconnect(); +} diff --git a/app/assets/javascripts/streaming/html_stream.js b/app/assets/javascripts/streaming/html_stream.js new file mode 100644 index 00000000000..8182f69a607 --- /dev/null +++ b/app/assets/javascripts/streaming/html_stream.js @@ -0,0 +1,33 @@ +import { ChunkWriter } from '~/streaming/chunk_writer'; + +export class HtmlStream { + constructor(element) { + const streamDocument = document.implementation.createHTMLDocument('stream'); + + streamDocument.open(); + streamDocument.write('<streaming-element>'); + + const virtualStreamingElement = streamDocument.querySelector('streaming-element'); + element.appendChild(document.adoptNode(virtualStreamingElement)); + + this.streamDocument = streamDocument; + } + + withChunkWriter(config) { + return new ChunkWriter(this, config); + } + + write(chunk) { + // eslint-disable-next-line no-unsanitized/method + this.streamDocument.write(chunk); + } + + close() { + this.streamDocument.write('</streaming-element>'); + this.streamDocument.close(); + } + + abort() { + this.streamDocument.close(); + } +} diff --git a/app/assets/javascripts/streaming/polyfills.js b/app/assets/javascripts/streaming/polyfills.js new file mode 100644 index 00000000000..a9a044a3e99 --- /dev/null +++ b/app/assets/javascripts/streaming/polyfills.js @@ -0,0 +1,5 @@ +import { createReadableStreamWrapper } from '@mattiasbuelens/web-streams-adapter'; +import { ReadableStream as PolyfillReadableStream } from 'web-streams-polyfill'; + +// TODO: remove this when our WebStreams API reaches 100% support +export const toPolyfillReadable = createReadableStreamWrapper(PolyfillReadableStream); diff --git a/app/assets/javascripts/streaming/rate_limit_stream_requests.js b/app/assets/javascripts/streaming/rate_limit_stream_requests.js new file mode 100644 index 00000000000..04a592baa16 --- /dev/null +++ b/app/assets/javascripts/streaming/rate_limit_stream_requests.js @@ -0,0 +1,87 @@ +const consumeReadableStream = (stream) => { + return new Promise((resolve, reject) => { + stream.pipeTo( + new WritableStream({ + close: resolve, + abort: reject, + }), + ); + }); +}; + +const wait = (timeout) => + new Promise((resolve) => { + setTimeout(resolve, timeout); + }); + +// this rate-limiting approach is specific to Web Streams +// because streams only resolve when they're fully consumed +// so we need to split each stream into two pieces: +// one for the rate-limiter (wait for all the bytes to be sent) +// another for the original consumer +export const rateLimitStreamRequests = ({ + factory, + total, + maxConcurrentRequests, + immediateCount = maxConcurrentRequests, + timeout = 0, +}) => { + if (total === 0) return []; + + const unsettled = []; + + const pushUnsettled = (promise) => { + let res; + let rej; + const consume = new Promise((resolve, reject) => { + res = resolve; + rej = reject; + }); + unsettled.push(consume); + return promise.then((stream) => { + const [first, second] = stream.tee(); + // eslint-disable-next-line promise/no-nesting + consumeReadableStream(first) + .then(() => { + unsettled.splice(unsettled.indexOf(consume), 1); + res(); + }) + .catch(rej); + return second; + }, rej); + }; + + const immediate = Array.from({ length: Math.min(immediateCount, total) }, (_, i) => + pushUnsettled(factory(i)), + ); + + const queue = []; + const flushQueue = () => { + const promises = + unsettled.length > maxConcurrentRequests ? unsettled : [...unsettled, wait(timeout)]; + // errors are handled by the caller + // eslint-disable-next-line promise/catch-or-return + Promise.race(promises).then(() => { + const cb = queue.shift(); + cb?.(); + if (queue.length !== 0) { + // wait for stream consumer promise to be removed from unsettled + queueMicrotask(flushQueue); + } + }); + }; + + const throttled = Array.from({ length: total - immediateCount }, (_, i) => { + return new Promise((resolve, reject) => { + queue.push(() => { + pushUnsettled(factory(i + immediateCount)) + .then(resolve) + .catch(reject); + }); + }); + }); + + flushQueue(); + + return [...immediate, ...throttled]; +}; diff --git a/app/assets/javascripts/streaming/render_balancer.js b/app/assets/javascripts/streaming/render_balancer.js new file mode 100644 index 00000000000..66929ff3a54 --- /dev/null +++ b/app/assets/javascripts/streaming/render_balancer.js @@ -0,0 +1,36 @@ +export class RenderBalancer { + previousTimestamp = undefined; + + constructor({ increase, decrease, highFrameTime, lowFrameTime }) { + this.increase = increase; + this.decrease = decrease; + this.highFrameTime = highFrameTime; + this.lowFrameTime = lowFrameTime; + } + + render(fn) { + return new Promise((resolve) => { + const callback = (timestamp) => { + this.throttle(timestamp); + if (fn()) requestAnimationFrame(callback); + else resolve(); + }; + requestAnimationFrame(callback); + }); + } + + throttle(timestamp) { + const { previousTimestamp } = this; + this.previousTimestamp = timestamp; + if (previousTimestamp === undefined) return; + + const duration = Math.round(timestamp - previousTimestamp); + if (!duration) return; + + if (duration >= this.highFrameTime) { + this.decrease(); + } else if (duration < this.lowFrameTime) { + this.increase(); + } + } +} diff --git a/app/assets/javascripts/streaming/render_html_streams.js b/app/assets/javascripts/streaming/render_html_streams.js new file mode 100644 index 00000000000..7201e541777 --- /dev/null +++ b/app/assets/javascripts/streaming/render_html_streams.js @@ -0,0 +1,40 @@ +import { HtmlStream } from '~/streaming/html_stream'; + +async function pipeStreams(domWriter, streamPromises) { + try { + for await (const stream of streamPromises.slice(0, -1)) { + await stream.pipeTo(domWriter, { preventClose: true }); + } + const stream = await streamPromises[streamPromises.length - 1]; + await stream.pipeTo(domWriter); + } catch (error) { + domWriter.abort(error); + } +} + +// this function (and the rest of the pipeline) expects polyfilled streams +// do not pass native streams here unless our browser support allows for it +// TODO: remove this notice when our WebStreams API support reaches 100% +export function renderHtmlStreams(streamPromises, element, config) { + if (streamPromises.length === 0) return Promise.resolve(); + + const chunkedHtmlStream = new HtmlStream(element).withChunkWriter(config); + + return new Promise((resolve, reject) => { + const domWriter = new WritableStream({ + write(chunk) { + return chunkedHtmlStream.write(chunk); + }, + close() { + chunkedHtmlStream.close(); + resolve(); + }, + abort(error) { + chunkedHtmlStream.abort(); + reject(error); + }, + }); + + pipeStreams(domWriter, streamPromises); + }); +} diff --git a/app/assets/javascripts/super_sidebar/components/context_switcher.vue b/app/assets/javascripts/super_sidebar/components/context_switcher.vue index f1ddb8290a0..b3d4ecdda47 100644 --- a/app/assets/javascripts/super_sidebar/components/context_switcher.vue +++ b/app/assets/javascripts/super_sidebar/components/context_switcher.vue @@ -1,82 +1,136 @@ <script> -import { GlAvatar, GlSearchBoxByType } from '@gitlab/ui'; +import * as Sentry from '@sentry/browser'; +import { GlSearchBoxByType } from '@gitlab/ui'; import { s__ } from '~/locale'; +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; +import searchUserProjectsAndGroups from '../graphql/queries/search_user_groups_and_projects.query.graphql'; import { contextSwitcherItems } from '../mock_data'; +import { trackContextAccess, formatContextSwitcherItems } from '../utils'; import NavItem from './nav_item.vue'; +import ProjectsList from './projects_list.vue'; +import GroupsList from './groups_list.vue'; export default { + i18n: { + contextNavigation: s__('Navigation|Context navigation'), + switchTo: s__('Navigation|Switch to...'), + searchPlaceholder: s__('Navigation|Search for projects or groups'), + }, + apollo: { + groupsAndProjects: { + query: searchUserProjectsAndGroups, + debounce: DEFAULT_DEBOUNCE_AND_THROTTLE_MS, + manual: true, + variables() { + return { + username: this.username, + search: this.searchString, + }; + }, + result(response) { + try { + const { + data: { + projects: { nodes: projects }, + user: { + groups: { nodes: groups }, + }, + }, + } = response; + + this.projects = formatContextSwitcherItems(projects); + this.groups = formatContextSwitcherItems(groups); + } catch (e) { + Sentry.captureException(e); + } + }, + error(e) { + Sentry.captureException(e); + }, + skip() { + return !this.searchString; + }, + }, + }, components: { - GlAvatar, GlSearchBoxByType, NavItem, + ProjectsList, + GroupsList, }, - i18n: { - contextNavigation: s__('Navigation|Context navigation'), - switchTo: s__('Navigation|Switch to...'), - recentProjects: s__('Navigation|Recent projects'), - recentGroups: s__('Navigation|Recent groups'), + props: { + username: { + type: String, + required: true, + }, + projectsPath: { + type: String, + required: true, + }, + groupsPath: { + type: String, + required: true, + }, + currentContext: { + type: Object, + required: false, + default: () => ({}), + }, }, - contextSwitcherItems, - viewAllProjectsItem: { - title: s__('Navigation|View all projects'), - link: '/projects', - icon: 'project', + data() { + return { + searchString: '', + projects: [], + groups: [], + }; }, - viewAllGroupsItem: { - title: s__('Navigation|View all groups'), - link: '/groups', - icon: 'group', + computed: { + isSearch() { + return Boolean(this.searchString); + }, + }, + contextSwitcherItems, + created() { + if (this.currentContext.namespace) { + trackContextAccess(this.username, this.currentContext); + } }, }; </script> <template> <div> - <gl-search-box-by-type /> + <div class="gl-p-1 gl-border-b gl-border-gray-50 gl-bg-white"> + <gl-search-box-by-type + v-model="searchString" + class="context-switcher-search-box" + :placeholder="$options.i18n.searchPlaceholder" + borderless + /> + </div> <nav :aria-label="$options.i18n.contextNavigation"> <ul class="gl-p-0 gl-list-style-none"> - <li> + <li v-if="!isSearch"> <div aria-hidden="true" class="gl-font-weight-bold gl-px-3 gl-py-3"> {{ $options.i18n.switchTo }} </div> <ul :aria-label="$options.i18n.switchTo" class="gl-p-0"> <nav-item :item="$options.contextSwitcherItems.yourWork" /> + <nav-item :item="$options.contextSwitcherItems.explore" /> </ul> </li> - <li> - <div aria-hidden="true" class="gl-font-weight-bold gl-px-3 gl-py-3"> - {{ $options.i18n.recentProjects }} - </div> - <ul :aria-label="$options.i18n.recentProjects" class="gl-p-0"> - <nav-item - v-for="project in $options.contextSwitcherItems.recentProjects" - :key="project.title" - :item="project" - > - <template #icon> - <gl-avatar shape="rect" :size="32" :src="project.avatar" /> - </template> - </nav-item> - <nav-item :item="$options.viewAllProjectsItem" /> - </ul> - </li> - <li> - <div aria-hidden="true" class="gl-font-weight-bold gl-px-3 gl-py-3"> - {{ $options.i18n.recentGroups }} - </div> - <ul :aria-label="$options.i18n.recentGroups" class="gl-p-0"> - <nav-item - v-for="project in $options.contextSwitcherItems.recentGroups" - :key="project.title" - :item="project" - > - <template #icon> - <gl-avatar shape="rect" :size="32" :src="project.avatar" /> - </template> - </nav-item> - <nav-item :item="$options.viewAllGroupsItem" /> - </ul> - </li> + <projects-list + :username="username" + :view-all-link="projectsPath" + :is-search="isSearch" + :search-results="projects" + /> + <groups-list + :username="username" + :view-all-link="groupsPath" + :is-search="isSearch" + :search-results="groups" + /> </ul> </nav> </div> diff --git a/app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue b/app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue index b6f058f7aee..e0b6870872c 100644 --- a/app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue +++ b/app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue @@ -11,6 +11,9 @@ export default { CollapseToggle: GlCollapseToggleDirective, }, props: { + /* + * Contains metadata about the current view, e.g. `id`, `title` and `avatar` + */ context: { type: Object, required: true, @@ -24,6 +27,9 @@ export default { collapseIcon() { return this.expanded ? 'chevron-up' : 'chevron-down'; }, + avatarShape() { + return this.context.avatar_shape || 'rect'; + }, }, }; </script> @@ -32,13 +38,27 @@ export default { <button v-collapse-toggle.context-switcher type="button" - class="context-switcher-toggle gl-bg-transparent gl-border-0 border-top border-bottom gl-border-gray-a-08 gl-box-shadow-none gl-display-flex gl-align-items-center gl-font-weight-bold gl-w-full gl-pl-3 gl-pr-5 gl-h-8" + class="context-switcher-toggle gl-p-0 gl-bg-transparent gl-hover-bg-t-gray-a-08 gl-border-0 border-top border-bottom gl-border-gray-a-08 gl-box-shadow-none gl-display-flex gl-align-items-center gl-font-weight-bold gl-w-full gl-h-8" > - <gl-avatar :size="32" shape="rect" :src="context.avatar" class="gl-mr-3" /> + <span + v-if="context.icon" + class="gl-avatar avatar-container gl-bg-t-gray-a-08 icon-avatar rect-avatar s24 gl-mr-3 gl-ml-4" + > + <gl-icon :name="context.icon" :size="16" /> + </span> + <gl-avatar + v-else + :size="24" + :shape="avatarShape" + :entity-name="context.title" + :entity-id="context.id" + :src="context.avatar" + class="gl-mr-3 gl-ml-4" + /> <div class="gl-overflow-auto"> <gl-truncate :text="context.title" /> </div> - <span class="gl-flex-grow-1 gl-text-right"> + <span class="gl-flex-grow-1 gl-text-right gl-mr-4"> <gl-icon :name="collapseIcon" /> </span> </button> diff --git a/app/assets/javascripts/super_sidebar/components/counter.vue b/app/assets/javascripts/super_sidebar/components/counter.vue index 62a1e5a6b20..e79b609545e 100644 --- a/app/assets/javascripts/super_sidebar/components/counter.vue +++ b/app/assets/javascripts/super_sidebar/components/counter.vue @@ -40,7 +40,7 @@ export default { :is="component" :aria-label="ariaLabel" :href="href" - class="counter gl-display-block gl-flex-grow-1 gl-text-center gl-py-3 gl-bg-gray-10 gl-rounded-base gl-text-gray-900 gl-border gl-border-gray-a-08 gl-font-sm gl-hover-text-gray-900 gl-hover-text-decoration-none" + class="counter gl-display-block gl-flex-grow-1 gl-text-center gl-py-3 gl-bg-gray-10 gl-rounded-base gl-text-gray-900 gl-border-none gl-inset-border-1-gray-a-08 gl-line-height-1 gl-font-sm gl-hover-text-gray-900 gl-hover-text-decoration-none" > <gl-icon aria-hidden="true" :name="icon" /> <span v-if="count" aria-hidden="true" class="gl-ml-1">{{ count }}</span> diff --git a/app/assets/javascripts/super_sidebar/components/create_menu.vue b/app/assets/javascripts/super_sidebar/components/create_menu.vue index e92a6cbf5f5..d3bb31a69fa 100644 --- a/app/assets/javascripts/super_sidebar/components/create_menu.vue +++ b/app/assets/javascripts/super_sidebar/components/create_menu.vue @@ -30,6 +30,7 @@ export default { text-sr-only :toggle-text="$options.i18n.createNew" :toggle-id="$options.toggleId" + data-qa-selector="new_menu_toggle" /> <gl-tooltip :target="`#${$options.toggleId}`" placement="bottom" container="#super-sidebar"> {{ $options.i18n.createNew }} diff --git a/app/assets/javascripts/super_sidebar/components/frequent_items_list.vue b/app/assets/javascripts/super_sidebar/components/frequent_items_list.vue new file mode 100644 index 00000000000..5269c7f8d5e --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/frequent_items_list.vue @@ -0,0 +1,77 @@ +<script> +import * as Sentry from '@sentry/browser'; +import AccessorUtilities from '~/lib/utils/accessor'; +import { getTopFrequentItems, formatContextSwitcherItems } from '../utils'; +import ItemsList from './items_list.vue'; + +export default { + components: { + ItemsList, + }, + props: { + title: { + type: String, + required: true, + }, + pristineText: { + type: String, + required: true, + }, + storageKey: { + type: String, + required: true, + }, + maxItems: { + type: Number, + required: true, + }, + }, + data() { + return { + cachedFrequentItems: [], + }; + }, + computed: { + isEmpty() { + return !this.cachedFrequentItems.length; + }, + }, + created() { + this.getItemsFromLocalStorage(); + }, + methods: { + getItemsFromLocalStorage() { + if (!AccessorUtilities.canUseLocalStorage()) { + return; + } + try { + const parsedCachedFrequentItems = JSON.parse(localStorage.getItem(this.storageKey)); + const topFrequentItems = getTopFrequentItems(parsedCachedFrequentItems, this.maxItems); + this.cachedFrequentItems = formatContextSwitcherItems(topFrequentItems); + } catch (e) { + Sentry.captureException(e); + } + }, + }, +}; +</script> + +<template> + <li class="gl-border-t gl-border-gray-50 gl-mx-3 gl-py-3"> + <div + data-testid="list-title" + aria-hidden="true" + class="gl-text-transform-uppercase gl-text-secondary gl-font-weight-bold gl-font-xs gl-line-height-12 gl-letter-spacing-06em gl-my-3" + > + {{ title }} + </div> + <div v-if="isEmpty" data-testid="empty-text" class="gl-text-gray-500 gl-font-sm gl-my-3"> + {{ pristineText }} + </div> + <items-list :aria-label="title" :items="cachedFrequentItems"> + <template #view-all-items> + <slot name="view-all-items"></slot> + </template> + </items-list> + </li> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue new file mode 100644 index 00000000000..6798607b954 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue @@ -0,0 +1,320 @@ +<script> +import { + GlSearchBoxByType, + GlOutsideDirective as Outside, + GlIcon, + GlToken, + GlTooltipDirective, + GlResizeObserverDirective, +} from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; +import { debounce } from 'lodash'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { truncate } from '~/lib/utils/text_utility'; +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; +import { sprintf } from '~/locale'; +import Tracking from '~/tracking'; +import DropdownKeyboardNavigation from '~/vue_shared/components/dropdown_keyboard_navigation.vue'; +import { + SEARCH_GITLAB, + SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN, + SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN, + SEARCH_DESCRIBED_BY_DEFAULT, + SEARCH_DESCRIBED_BY_UPDATED, + SEARCH_RESULTS_LOADING, + SEARCH_RESULTS_SCOPE, + KBD_HELP, +} from '~/vue_shared/global_search/constants'; +import { + FIRST_DROPDOWN_INDEX, + SEARCH_BOX_INDEX, + SEARCH_INPUT_DESCRIPTION, + SEARCH_RESULTS_DESCRIPTION, + SEARCH_SHORTCUTS_MIN_CHARACTERS, + SCOPE_TOKEN_MAX_LENGTH, + INPUT_FIELD_PADDING, + IS_SEARCHING, + IS_FOCUSED, + IS_NOT_FOCUSED, +} from '../constants'; +import HeaderSearchAutocompleteItems from './global_search_autocomplete_items.vue'; +import HeaderSearchDefaultItems from './global_search_default_items.vue'; +import HeaderSearchScopedItems from './global_search_scoped_items.vue'; + +export default { + name: 'HeaderSearchApp', + i18n: { + SEARCH_GITLAB, + SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN, + SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN, + SEARCH_DESCRIBED_BY_DEFAULT, + SEARCH_DESCRIBED_BY_UPDATED, + SEARCH_RESULTS_LOADING, + SEARCH_RESULTS_SCOPE, + KBD_HELP, + }, + directives: { Outside, GlTooltip: GlTooltipDirective, GlResizeObserverDirective }, + components: { + GlSearchBoxByType, + HeaderSearchDefaultItems, + HeaderSearchScopedItems, + HeaderSearchAutocompleteItems, + DropdownKeyboardNavigation, + GlIcon, + GlToken, + }, + data() { + return { + showDropdown: false, + isFocused: false, + currentFocusIndex: SEARCH_BOX_INDEX, + }; + }, + computed: { + ...mapState(['search', 'loading', 'searchContext']), + ...mapGetters(['searchQuery', 'searchOptions']), + searchText: { + get() { + return this.search; + }, + set(value) { + this.setSearch(value); + }, + }, + currentFocusedOption() { + return this.searchOptions[this.currentFocusIndex]; + }, + currentFocusedId() { + return this.currentFocusedOption?.html_id; + }, + isLoggedIn() { + return Boolean(gon?.current_username); + }, + showSearchDropdown() { + if (!this.showDropdown || !this.isLoggedIn) { + return false; + } + return this.searchOptions?.length > 0; + }, + showDefaultItems() { + return !this.searchText; + }, + searchTermOverMin() { + return this.searchText?.length > SEARCH_SHORTCUTS_MIN_CHARACTERS; + }, + defaultIndex() { + if (this.showDefaultItems) { + return SEARCH_BOX_INDEX; + } + return FIRST_DROPDOWN_INDEX; + }, + + searchInputDescribeBy() { + if (this.isLoggedIn) { + return this.$options.i18n.SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN; + } + return this.$options.i18n.SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN; + }, + dropdownResultsDescription() { + if (!this.showSearchDropdown) { + return ''; // This allows aria-live to see register an update when the dropdown is shown + } + + if (this.showDefaultItems) { + return sprintf(this.$options.i18n.SEARCH_DESCRIBED_BY_DEFAULT, { + count: this.searchOptions.length, + }); + } + + return this.loading + ? this.$options.i18n.SEARCH_RESULTS_LOADING + : sprintf(this.$options.i18n.SEARCH_DESCRIBED_BY_UPDATED, { + count: this.searchOptions.length, + }); + }, + searchBarClasses() { + return { + [IS_SEARCHING]: this.searchTermOverMin, + [IS_FOCUSED]: this.isFocused, + [IS_NOT_FOCUSED]: !this.isFocused, + }; + }, + showScopeHelp() { + return this.searchTermOverMin && this.isFocused; + }, + searchBarItem() { + return this.searchOptions?.[0]; + }, + infieldHelpContent() { + return this.searchBarItem?.scope || this.searchBarItem?.description; + }, + infieldHelpIcon() { + return this.searchBarItem?.icon; + }, + scopeTokenTitle() { + return sprintf(this.$options.i18n.SEARCH_RESULTS_SCOPE, { + scope: this.infieldHelpContent, + }); + }, + }, + methods: { + ...mapActions(['setSearch', 'fetchAutocompleteOptions', 'clearAutocomplete']), + openDropdown() { + this.showDropdown = true; + + // check isFocused state to avoid firing duplicate events + if (!this.isFocused) { + this.isFocused = true; + this.$emit('expandSearchBar', true); + + Tracking.event(undefined, 'focus_input', { + label: 'global_search', + property: 'navigation_top', + }); + } + }, + closeDropdown() { + this.showDropdown = false; + }, + collapseAndCloseSearchBar() { + // we need a delay on this method + // for the search bar not to remove + // the clear button from dom + // and register clicks on dropdown items + setTimeout(() => { + this.showDropdown = false; + this.isFocused = false; + this.$emit('collapseSearchBar'); + + Tracking.event(undefined, 'blur_input', { + label: 'global_search', + property: 'navigation_top', + }); + }, 200); + }, + submitSearch() { + if (this.search?.length <= SEARCH_SHORTCUTS_MIN_CHARACTERS && this.currentFocusIndex < 0) { + return null; + } + return visitUrl(this.currentFocusedOption?.url || this.searchQuery); + }, + getAutocompleteOptions: debounce(function debouncedSearch(searchTerm) { + this.openDropdown(); + if (!searchTerm) { + this.clearAutocomplete(); + } else { + this.fetchAutocompleteOptions(); + } + }, DEFAULT_DEBOUNCE_AND_THROTTLE_MS), + getTruncatedScope(scope) { + return truncate(scope, SCOPE_TOKEN_MAX_LENGTH); + }, + observeTokenWidth({ contentRect: { width } }) { + const inputField = this.$refs?.searchInputBox?.$el?.querySelector('input'); + if (!inputField) { + return; + } + inputField.style.paddingRight = `${width + INPUT_FIELD_PADDING}px`; + }, + }, + SEARCH_BOX_INDEX, + FIRST_DROPDOWN_INDEX, + SEARCH_INPUT_DESCRIPTION, + SEARCH_RESULTS_DESCRIPTION, +}; +</script> + +<template> + <form + v-outside="closeDropdown" + role="search" + :aria-label="$options.i18n.SEARCH_GITLAB" + class="header-search gl-relative gl-rounded-base gl-w-full" + :class="searchBarClasses" + data-testid="header-search-form" + > + <gl-search-box-by-type + id="search" + ref="searchInputBox" + v-model="searchText" + role="searchbox" + class="gl-z-index-1" + data-qa-selector="search_term_field" + autocomplete="off" + :placeholder="$options.i18n.SEARCH_GITLAB" + :aria-activedescendant="currentFocusedId" + :aria-describedby="$options.SEARCH_INPUT_DESCRIPTION" + @focus="openDropdown" + @click="openDropdown" + @blur="collapseAndCloseSearchBar" + @input="getAutocompleteOptions" + @keydown.enter.stop.prevent="submitSearch" + @keydown.esc.stop.prevent="closeDropdown" + /> + <gl-token + v-if="showScopeHelp" + v-gl-resize-observer-directive="observeTokenWidth" + class="in-search-scope-help" + :view-only="true" + :title="scopeTokenTitle" + ><gl-icon + v-if="infieldHelpIcon" + class="gl-mr-2" + :aria-label="infieldHelpContent" + :name="infieldHelpIcon" + :size="16" + />{{ + getTruncatedScope( + sprintf($options.i18n.SEARCH_RESULTS_SCOPE, { + scope: infieldHelpContent, + }), + ) + }} + </gl-token> + <kbd + v-show="!isFocused" + v-gl-tooltip.bottom.hover.html + class="gl-absolute gl-right-3 gl-top-0 gl-z-index-1 keyboard-shortcut-helper" + :title="$options.i18n.KBD_HELP" + >/</kbd + > + <span :id="$options.SEARCH_INPUT_DESCRIPTION" role="region" class="gl-sr-only">{{ + searchInputDescribeBy + }}</span> + <span + role="region" + :data-testid="$options.SEARCH_RESULTS_DESCRIPTION" + class="gl-sr-only" + aria-live="polite" + aria-atomic="true" + > + {{ dropdownResultsDescription }} + </span> + <div + v-if="showSearchDropdown" + data-testid="header-search-dropdown-menu" + class="header-search-dropdown-menu gl-overflow-y-auto gl-absolute gl-w-full gl-bg-white gl-border-1 gl-rounded-base gl-border-solid gl-border-gray-200 gl-shadow-x0-y2-b4-s0 gl-mt-3" + > + <div class="header-search-dropdown-content gl-py-2"> + <dropdown-keyboard-navigation + v-model="currentFocusIndex" + :max="searchOptions.length - 1" + :min="$options.FIRST_DROPDOWN_INDEX" + :default-index="defaultIndex" + @tab="closeDropdown" + /> + <header-search-default-items + v-if="showDefaultItems" + :current-focused-option="currentFocusedOption" + /> + <template v-else> + <header-search-scoped-items + v-if="searchTermOverMin" + :current-focused-option="currentFocusedOption" + /> + <header-search-autocomplete-items :current-focused-option="currentFocusedOption" /> + </template> + </div> + </div> + </form> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue new file mode 100644 index 00000000000..1838214def6 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue @@ -0,0 +1,167 @@ +<script> +import { + GlDropdownItem, + GlDropdownSectionHeader, + GlDropdownDivider, + GlAvatar, + GlAlert, + GlLoadingIcon, +} from '@gitlab/ui'; +import { mapState, mapGetters } from 'vuex'; +import SafeHtml from '~/vue_shared/directives/safe_html'; +import highlight from '~/lib/utils/highlight'; +import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants'; +import { truncateNamespace } from '~/lib/utils/text_utility'; +import { + GROUPS_CATEGORY, + PROJECTS_CATEGORY, + MERGE_REQUEST_CATEGORY, + ISSUES_CATEGORY, + RECENT_EPICS_CATEGORY, + AUTOCOMPLETE_ERROR_MESSAGE, +} from '~/vue_shared/global_search/constants'; +import { LARGE_AVATAR_PX, SMALL_AVATAR_PX } from '../constants'; + +export default { + name: 'HeaderSearchAutocompleteItems', + i18n: { + AUTOCOMPLETE_ERROR_MESSAGE, + }, + components: { + GlDropdownItem, + GlDropdownSectionHeader, + GlDropdownDivider, + GlAvatar, + GlAlert, + GlLoadingIcon, + }, + directives: { + SafeHtml, + }, + props: { + currentFocusedOption: { + type: Object, + required: false, + default: () => null, + }, + }, + computed: { + ...mapState(['search', 'loading', 'autocompleteError', 'searchContext']), + ...mapGetters(['autocompleteGroupedSearchOptions']), + }, + watch: { + currentFocusedOption() { + const focusedElement = this.$refs[this.currentFocusedOption?.html_id]?.[0]?.$el; + + if (focusedElement) { + focusedElement.scrollIntoView(false); + } + }, + }, + methods: { + truncateNamespace(string) { + if (string.split(' / ').length > 2) { + return truncateNamespace(string); + } + + return string; + }, + highlightedName(val) { + return highlight(val, this.search); + }, + avatarSize(data) { + if (data.category === GROUPS_CATEGORY || data.category === PROJECTS_CATEGORY) { + return LARGE_AVATAR_PX; + } + + return SMALL_AVATAR_PX; + }, + isOptionFocused(data) { + return this.currentFocusedOption?.html_id === data.html_id; + }, + isProjectsCategory(data) { + return data.category === PROJECTS_CATEGORY; + }, + getEntityId(data) { + switch (data.category) { + case GROUPS_CATEGORY: + case RECENT_EPICS_CATEGORY: + return data.group_id || data.id || this.searchContext?.group?.id; + case PROJECTS_CATEGORY: + case ISSUES_CATEGORY: + case MERGE_REQUEST_CATEGORY: + return data.project_id || data.id || this.searchContext?.project?.id; + default: + return data.id; + } + }, + getEntitytName(data) { + switch (data.category) { + case GROUPS_CATEGORY: + case RECENT_EPICS_CATEGORY: + return data.group_name || data.value || data.label || this.searchContext?.group?.name; + case PROJECTS_CATEGORY: + case ISSUES_CATEGORY: + case MERGE_REQUEST_CATEGORY: + return data.project_name || data.value || data.label || this.searchContext?.project?.name; + default: + return data.label; + } + }, + }, + AVATAR_SHAPE_OPTION_RECT, +}; +</script> + +<template> + <div> + <template v-if="!loading"> + <div v-for="(option, index) in autocompleteGroupedSearchOptions" :key="option.category"> + <gl-dropdown-divider v-if="index > 0" /> + <gl-dropdown-section-header>{{ option.category }}</gl-dropdown-section-header> + <gl-dropdown-item + v-for="data in option.data" + :id="data.html_id" + :ref="data.html_id" + :key="data.html_id" + :class="{ 'gl-bg-gray-50': isOptionFocused(data) }" + :aria-selected="isOptionFocused(data)" + :aria-label="data.label" + tabindex="-1" + :href="data.url" + > + <div class="gl-display-flex gl-align-items-center" aria-hidden="true"> + <gl-avatar + v-if="data.avatar_url !== undefined" + :src="data.avatar_url" + :entity-id="getEntityId(data)" + :entity-name="getEntitytName(data)" + :size="avatarSize(data)" + :shape="$options.AVATAR_SHAPE_OPTION_RECT" + /> + <span class="gl-display-flex gl-flex-direction-column"> + <span + v-safe-html="highlightedName(data.value || data.label)" + class="gl-text-gray-900" + ></span> + <span + v-if="data.value" + v-safe-html="truncateNamespace(data.label)" + class="gl-font-sm gl-text-gray-500" + ></span> + </span> + </div> + </gl-dropdown-item> + </div> + </template> + <gl-loading-icon v-else size="lg" class="my-4" /> + <gl-alert + v-if="autocompleteError" + class="gl-text-body gl-mt-2" + :dismissible="false" + variant="danger" + > + {{ $options.i18n.AUTOCOMPLETE_ERROR_MESSAGE }} + </gl-alert> + </div> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_items.vue new file mode 100644 index 00000000000..f0d398297e9 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_items.vue @@ -0,0 +1,58 @@ +<script> +import { GlDropdownItem, GlDropdownSectionHeader } from '@gitlab/ui'; +import { mapState, mapGetters } from 'vuex'; +import { ALL_GITLAB } from '~/vue_shared/global_search/constants'; + +export default { + name: 'HeaderSearchDefaultItems', + i18n: { + ALL_GITLAB, + }, + components: { + GlDropdownSectionHeader, + GlDropdownItem, + }, + props: { + currentFocusedOption: { + type: Object, + required: false, + default: () => null, + }, + }, + computed: { + ...mapState(['searchContext']), + ...mapGetters(['defaultSearchOptions']), + sectionHeader() { + return ( + this.searchContext?.project?.name || + this.searchContext?.group?.name || + this.$options.i18n.ALL_GITLAB + ); + }, + }, + methods: { + isOptionFocused(option) { + return this.currentFocusedOption?.html_id === option.html_id; + }, + }, +}; +</script> + +<template> + <div> + <gl-dropdown-section-header>{{ sectionHeader }}</gl-dropdown-section-header> + <gl-dropdown-item + v-for="option in defaultSearchOptions" + :id="option.html_id" + :ref="option.html_id" + :key="option.html_id" + :class="{ 'gl-bg-gray-50': isOptionFocused(option) }" + :aria-selected="isOptionFocused(option)" + :aria-label="option.title" + tabindex="-1" + :href="option.url" + > + <span aria-hidden="true">{{ option.title }}</span> + </gl-dropdown-item> + </div> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_scoped_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_scoped_items.vue new file mode 100644 index 00000000000..1ef88492b23 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_scoped_items.vue @@ -0,0 +1,87 @@ +<script> +import { GlDropdownItem, GlIcon, GlToken } from '@gitlab/ui'; +import { mapState, mapGetters } from 'vuex'; +import { s__, sprintf } from '~/locale'; +import { truncate } from '~/lib/utils/text_utility'; +import { SCOPED_SEARCH_ITEM_ARIA_LABEL } from '~/vue_shared/global_search/constants'; +import { SCOPE_TOKEN_MAX_LENGTH } from '../constants'; + +export default { + name: 'HeaderSearchScopedItems', + i18n: { + SCOPED_SEARCH_ITEM_ARIA_LABEL, + }, + components: { + GlDropdownItem, + GlIcon, + GlToken, + }, + props: { + currentFocusedOption: { + type: Object, + required: false, + default: () => null, + }, + }, + computed: { + ...mapState(['search']), + ...mapGetters(['scopedSearchOptions', 'autocompleteGroupedSearchOptions']), + }, + methods: { + isOptionFocused(option) { + return this.currentFocusedOption?.html_id === option.html_id; + }, + ariaLabel(option) { + return sprintf(this.$options.i18n.SCOPED_SEARCH_ITEM_ARIA_LABEL, { + search: this.search, + description: option.description || option.icon, + scope: option.scope || '', + }); + }, + titleLabel(option) { + return sprintf(s__('GlobalSearch|in %{scope}'), { + search: this.search, + scope: option.scope || option.description, + }); + }, + getTruncatedScope(scope) { + return truncate(scope, SCOPE_TOKEN_MAX_LENGTH); + }, + }, +}; +</script> + +<template> + <div> + <gl-dropdown-item + v-for="option in scopedSearchOptions" + :id="option.html_id" + :ref="option.html_id" + :key="option.html_id" + class="gl-max-w-full" + :class="{ 'gl-bg-gray-50': isOptionFocused(option) }" + :aria-selected="isOptionFocused(option)" + :aria-label="ariaLabel(option)" + tabindex="-1" + :href="option.url" + :title="titleLabel(option)" + > + <span + ref="token-text-content" + class="gl-display-flex gl-justify-content-start search-text-content gl-line-height-24 gl-align-items-start gl-flex-direction-row gl-w-full" + > + <gl-icon name="search" class="gl-flex-shrink-0 gl-mr-2 gl-relative gl-pt-2" /> + <span class="gl-flex-grow-1 gl-relative"> + <gl-token + class="in-dropdown-scope-help has-icon gl-flex-shrink-0 gl-relative gl-white-space-nowrap gl-float-right gl-mr-n3!" + :view-only="true" + > + <gl-icon v-if="option.icon" :name="option.icon" class="gl-mr-2" /> + <span>{{ getTruncatedScope(titleLabel(option)) }}</span> + </gl-token> + {{ search }} + </span> + </span> + </gl-dropdown-item> + </div> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/global_search/constants.js b/app/assets/javascripts/super_sidebar/components/global_search/constants.js new file mode 100644 index 00000000000..b9bb4e573fd --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/constants.js @@ -0,0 +1,33 @@ +export const ICON_PROJECT = 'project'; + +export const ICON_GROUP = 'group'; + +export const ICON_SUBGROUP = 'subgroup'; + +export const LARGE_AVATAR_PX = 32; + +export const SMALL_AVATAR_PX = 16; + +export const FIRST_DROPDOWN_INDEX = 0; + +export const SEARCH_BOX_INDEX = -1; + +export const SEARCH_SHORTCUTS_MIN_CHARACTERS = 2; + +export const SEARCH_INPUT_DESCRIPTION = 'search-input-description'; + +export const SEARCH_RESULTS_DESCRIPTION = 'search-results-description'; + +export const SCOPE_TOKEN_MAX_LENGTH = 36; + +export const INPUT_FIELD_PADDING = 52; + +export const HEADER_INIT_EVENTS = ['input', 'focus']; + +export const IS_SEARCHING = 'is-searching'; +export const IS_FOCUSED = 'is-focused'; +export const IS_NOT_FOCUSED = 'is-not-focused'; + +export const FETCH_TYPES = ['generic', 'search']; + +export const SEARCH_INPUT_FIELD_MAX_WIDTH = '640px'; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/actions.js b/app/assets/javascripts/super_sidebar/components/global_search/store/actions.js new file mode 100644 index 00000000000..a0f9e594506 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/actions.js @@ -0,0 +1,45 @@ +import { omitBy, isNil } from 'lodash'; +import { objectToQuery } from '~/lib/utils/url_utility'; +import axios from '~/lib/utils/axios_utils'; +import { FETCH_TYPES } from '../constants'; +import * as types from './mutation_types'; + +export const autocompleteQuery = ({ state, fetchType }) => { + const query = omitBy( + { + term: state.search, + project_id: state.searchContext?.project?.id, + project_ref: state.searchContext?.ref, + filter: fetchType, + }, + isNil, + ); + + return `${state.autocompletePath}?${objectToQuery(query)}`; +}; + +const doFetch = ({ commit, state, fetchType }) => { + return axios + .get(autocompleteQuery({ state, fetchType })) + .then(({ data }) => { + commit(types.RECEIVE_AUTOCOMPLETE_SUCCESS, data); + }) + .catch(() => { + commit(types.RECEIVE_AUTOCOMPLETE_ERROR); + }); +}; + +export const fetchAutocompleteOptions = ({ commit, state }) => { + commit(types.REQUEST_AUTOCOMPLETE); + const promises = FETCH_TYPES.map((fetchType) => doFetch({ commit, state, fetchType })); + + return Promise.all(promises); +}; + +export const clearAutocomplete = ({ commit }) => { + commit(types.CLEAR_AUTOCOMPLETE); +}; + +export const setSearch = ({ commit }, value) => { + commit(types.SET_SEARCH, value); +}; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/getters.js b/app/assets/javascripts/super_sidebar/components/global_search/store/getters.js new file mode 100644 index 00000000000..f86463b94d1 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/getters.js @@ -0,0 +1,220 @@ +import { omitBy, isNil } from 'lodash'; +import { objectToQuery } from '~/lib/utils/url_utility'; + +import { + MSG_ISSUES_ASSIGNED_TO_ME, + MSG_ISSUES_IVE_CREATED, + MSG_MR_ASSIGNED_TO_ME, + MSG_MR_IM_REVIEWER, + MSG_MR_IVE_CREATED, + MSG_IN_ALL_GITLAB, + PROJECTS_CATEGORY, + GROUPS_CATEGORY, + DROPDOWN_ORDER, +} from '~/vue_shared/global_search/constants'; +import { + ICON_GROUP, + ICON_SUBGROUP, + ICON_PROJECT, + SEARCH_SHORTCUTS_MIN_CHARACTERS, +} from '../constants'; + +export const searchQuery = (state) => { + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + project_id: state.searchContext?.project?.id, + group_id: state.searchContext?.group?.id, + scope: state.searchContext?.scope, + snippets: state.searchContext?.for_snippets ? true : null, + search_code: state.searchContext?.code_search ? true : null, + repository_ref: state.searchContext?.ref, + }, + isNil, + ); + + return `${state.searchPath}?${objectToQuery(query)}`; +}; + +export const scopedIssuesPath = (state) => { + if (state.searchContext?.project?.id && !state.searchContext?.project_metadata?.issues_path) { + return false; + } + + return ( + state.searchContext?.project_metadata?.issues_path || + state.searchContext?.group_metadata?.issues_path || + state.issuesPath + ); +}; + +export const scopedMRPath = (state) => { + return ( + state.searchContext?.project_metadata?.mr_path || + state.searchContext?.group_metadata?.mr_path || + state.mrPath + ); +}; + +export const defaultSearchOptions = (state, getters) => { + const userName = gon.current_username; + + const issues = [ + { + html_id: 'default-issues-assigned', + title: MSG_ISSUES_ASSIGNED_TO_ME, + url: `${getters.scopedIssuesPath}/?assignee_username=${userName}`, + }, + { + html_id: 'default-issues-created', + title: MSG_ISSUES_IVE_CREATED, + url: `${getters.scopedIssuesPath}/?author_username=${userName}`, + }, + ]; + + const mergeRequests = [ + { + html_id: 'default-mrs-assigned', + title: MSG_MR_ASSIGNED_TO_ME, + url: `${getters.scopedMRPath}/?assignee_username=${userName}`, + }, + { + html_id: 'default-mrs-reviewer', + title: MSG_MR_IM_REVIEWER, + url: `${getters.scopedMRPath}/?reviewer_username=${userName}`, + }, + { + html_id: 'default-mrs-created', + title: MSG_MR_IVE_CREATED, + url: `${getters.scopedMRPath}/?author_username=${userName}`, + }, + ]; + return [...(getters.scopedIssuesPath ? issues : []), ...mergeRequests]; +}; + +export const projectUrl = (state) => { + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + project_id: state.searchContext?.project?.id, + group_id: state.searchContext?.group?.id, + scope: state.searchContext?.scope, + snippets: state.searchContext?.for_snippets ? true : null, + search_code: state.searchContext?.code_search ? true : null, + repository_ref: state.searchContext?.ref, + }, + isNil, + ); + + return `${state.searchPath}?${objectToQuery(query)}`; +}; + +export const groupUrl = (state) => { + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + group_id: state.searchContext?.group?.id, + scope: state.searchContext?.scope, + snippets: state.searchContext?.for_snippets ? true : null, + search_code: state.searchContext?.code_search ? true : null, + repository_ref: state.searchContext?.ref, + }, + isNil, + ); + + return `${state.searchPath}?${objectToQuery(query)}`; +}; + +export const allUrl = (state) => { + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + scope: state.searchContext?.scope, + snippets: state.searchContext?.for_snippets ? true : null, + search_code: state.searchContext?.code_search ? true : null, + repository_ref: state.searchContext?.ref, + }, + isNil, + ); + + return `${state.searchPath}?${objectToQuery(query)}`; +}; + +export const scopedSearchOptions = (state, getters) => { + const options = []; + + if (state.searchContext?.project) { + options.push({ + html_id: 'scoped-in-project', + scope: state.searchContext.project?.name || '', + scopeCategory: PROJECTS_CATEGORY, + icon: ICON_PROJECT, + url: getters.projectUrl, + }); + } + + if (state.searchContext?.group) { + options.push({ + html_id: 'scoped-in-group', + scope: state.searchContext.group?.name || '', + scopeCategory: GROUPS_CATEGORY, + icon: state.searchContext.group?.full_name?.includes('/') ? ICON_SUBGROUP : ICON_GROUP, + url: getters.groupUrl, + }); + } + + options.push({ + html_id: 'scoped-in-all', + description: MSG_IN_ALL_GITLAB, + url: getters.allUrl, + }); + + return options; +}; + +export const autocompleteGroupedSearchOptions = (state) => { + const groupedOptions = {}; + const results = []; + + state.autocompleteOptions.forEach((option) => { + const category = groupedOptions[option.category]; + + if (category) { + category.data.push(option); + } else { + groupedOptions[option.category] = { + category: option.category, + data: [option], + }; + + results.push(groupedOptions[option.category]); + } + }); + + return results.sort( + (a, b) => DROPDOWN_ORDER.indexOf(a.category) - DROPDOWN_ORDER.indexOf(b.category), + ); +}; + +export const searchOptions = (state, getters) => { + if (!state.search) { + return getters.defaultSearchOptions; + } + + const sortedAutocompleteOptions = Object.values(getters.autocompleteGroupedSearchOptions).reduce( + (options, group) => { + return [...options, ...group.data]; + }, + [], + ); + + if (state.search?.length <= SEARCH_SHORTCUTS_MIN_CHARACTERS) { + return sortedAutocompleteOptions; + } + + return getters.scopedSearchOptions.concat(sortedAutocompleteOptions); +}; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/index.js b/app/assets/javascripts/super_sidebar/components/global_search/store/index.js new file mode 100644 index 00000000000..b83433c5b49 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/index.js @@ -0,0 +1,25 @@ +import Vue from 'vue'; +import Vuex from 'vuex'; +import * as actions from './actions'; +import * as getters from './getters'; +import mutations from './mutations'; +import createState from './state'; + +Vue.use(Vuex); + +export const getStoreConfig = ({ + searchPath, + issuesPath, + mrPath, + autocompletePath, + searchContext, + search, +}) => ({ + actions, + getters, + mutations, + state: createState({ searchPath, issuesPath, mrPath, autocompletePath, searchContext, search }), +}); + +const createStore = (config) => new Vuex.Store(getStoreConfig(config)); +export default createStore; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/mutation_types.js b/app/assets/javascripts/super_sidebar/components/global_search/store/mutation_types.js new file mode 100644 index 00000000000..6e65345757f --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/mutation_types.js @@ -0,0 +1,6 @@ +export const REQUEST_AUTOCOMPLETE = 'REQUEST_AUTOCOMPLETE'; +export const RECEIVE_AUTOCOMPLETE_SUCCESS = 'RECEIVE_AUTOCOMPLETE_SUCCESS'; +export const RECEIVE_AUTOCOMPLETE_ERROR = 'RECEIVE_AUTOCOMPLETE_ERROR'; +export const CLEAR_AUTOCOMPLETE = 'CLEAR_AUTOCOMPLETE'; + +export const SET_SEARCH = 'SET_SEARCH'; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/mutations.js b/app/assets/javascripts/super_sidebar/components/global_search/store/mutations.js new file mode 100644 index 00000000000..19b4d4ec330 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/mutations.js @@ -0,0 +1,30 @@ +import * as types from './mutation_types'; + +export default { + [types.REQUEST_AUTOCOMPLETE](state) { + state.loading = true; + state.autocompleteOptions = []; + state.autocompleteError = false; + }, + [types.RECEIVE_AUTOCOMPLETE_SUCCESS](state, data) { + state.loading = false; + state.autocompleteOptions = [...state.autocompleteOptions].concat( + data.map((d, i) => { + return { html_id: `autocomplete-${d.category}-${i}`, ...d }; + }), + ); + state.autocompleteError = false; + }, + [types.RECEIVE_AUTOCOMPLETE_ERROR](state) { + state.loading = false; + state.autocompleteOptions = []; + state.autocompleteError = true; + }, + [types.CLEAR_AUTOCOMPLETE](state) { + state.autocompleteOptions = []; + state.autocompleteError = false; + }, + [types.SET_SEARCH](state, value) { + state.search = value; + }, +}; diff --git a/app/assets/javascripts/super_sidebar/components/global_search/store/state.js b/app/assets/javascripts/super_sidebar/components/global_search/store/state.js new file mode 100644 index 00000000000..bebdbc7b92e --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/global_search/store/state.js @@ -0,0 +1,19 @@ +const createState = ({ + searchPath, + issuesPath, + mrPath, + autocompletePath, + searchContext, + search, +}) => ({ + searchPath, + issuesPath, + mrPath, + autocompletePath, + searchContext, + search, + autocompleteOptions: [], + autocompleteError: false, + loading: false, +}); +export default createState; diff --git a/app/assets/javascripts/super_sidebar/components/groups_list.vue b/app/assets/javascripts/super_sidebar/components/groups_list.vue new file mode 100644 index 00000000000..78b5ed2d31e --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/groups_list.vue @@ -0,0 +1,78 @@ +<script> +import { s__ } from '~/locale'; +import { MAX_FREQUENT_GROUPS_COUNT } from '../constants'; +import FrequentItemsList from './frequent_items_list.vue'; +import SearchResults from './search_results.vue'; +import NavItem from './nav_item.vue'; + +export default { + MAX_FREQUENT_GROUPS_COUNT, + components: { + FrequentItemsList, + SearchResults, + NavItem, + }, + props: { + username: { + type: String, + required: true, + }, + viewAllLink: { + type: String, + required: true, + }, + isSearch: { + type: Boolean, + required: false, + default: false, + }, + searchResults: { + type: Array, + required: false, + default: () => [], + }, + }, + computed: { + storageKey() { + return `${this.username}/frequent-groups`; + }, + viewAllItem() { + return { + link: this.viewAllLink, + title: s__('Navigation|View all groups'), + icon: 'group', + }; + }, + }, + i18n: { + title: s__('Navigation|Frequent groups'), + searchTitle: s__('Navigation|Groups'), + pristineText: s__('Navigation|Groups you visit often will appear here.'), + noResultsText: s__('Navigation|No group matches found'), + }, +}; +</script> + +<template> + <search-results + v-if="isSearch" + :title="$options.i18n.searchTitle" + :no-results-text="$options.i18n.noResultsText" + :search-results="searchResults" + > + <template #view-all-items> + <nav-item :item="viewAllItem" /> + </template> + </search-results> + <frequent-items-list + v-else + :title="$options.i18n.title" + :storage-key="storageKey" + :max-items="$options.MAX_FREQUENT_GROUPS_COUNT" + :pristine-text="$options.i18n.pristineText" + > + <template #view-all-items> + <nav-item :item="viewAllItem" /> + </template> + </frequent-items-list> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/help_center.vue b/app/assets/javascripts/super_sidebar/components/help_center.vue index 8e7c7efa631..fb23a4f2deb 100644 --- a/app/assets/javascripts/super_sidebar/components/help_center.vue +++ b/app/assets/javascripts/super_sidebar/components/help_center.vue @@ -68,6 +68,9 @@ export default { { text: this.$options.i18n.shortcuts, action: this.showKeyboardShortcuts, + extraAttrs: { + class: 'js-shortcuts-modal-trigger', + }, shortcut: '?', }, this.sidebarData.display_whats_new && { @@ -96,15 +99,8 @@ export default { return true; }, - handleAction({ action }) { - if (action) { - action(); - } - }, - showKeyboardShortcuts() { this.$refs.dropdown.close(); - window?.toggleShortcutsHelp(); }, async showWhatsNew() { @@ -130,7 +126,7 @@ export default { <gl-disclosure-dropdown ref="dropdown"> <template #toggle> <gl-button category="tertiary" icon="question-o" class="btn-with-notification"> - <span v-if="showWhatsNewNotification" class="notification"></span> + <span v-if="showWhatsNewNotification" class="notification-dot-info"></span> {{ $options.i18n.help }} </gl-button> </template> @@ -140,11 +136,7 @@ export default { :group="itemGroups.versionCheck" > <template #list-item="{ item }"> - <a - :href="item.href" - tabindex="-1" - class="gl-display-flex gl-flex-direction-column gl-line-height-24 gl-text-gray-900 gl-hover-text-gray-900 gl-hover-text-decoration-none" - > + <span class="gl-display-flex gl-flex-direction-column gl-line-height-24"> <span class="gl-font-sm gl-font-weight-bold"> {{ item.text }} <gl-emoji data-name="rocket" /> @@ -153,7 +145,7 @@ export default { <span class="gl-mr-2">{{ item.version }}</span> <gitlab-version-check-badge v-if="updateSeverity" :status="updateSeverity" size="sm" /> </span> - </a> + </span> </template> </gl-disclosure-dropdown-group> @@ -162,16 +154,15 @@ export default { :bordered="sidebarData.show_version_check" /> - <gl-disclosure-dropdown-group :group="itemGroups.helpActions" bordered @action="handleAction"> + <gl-disclosure-dropdown-group :group="itemGroups.helpActions" bordered> <template #list-item="{ item }"> - <button - tabindex="-1" - class="gl-bg-transparent gl-w-full gl-border-none gl-display-flex gl-justify-content-space-between gl-p-0 gl-text-gray-900" + <span + class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-my-n1" > {{ item.text }} <gl-badge v-if="item.count" pill size="sm" variant="info">{{ item.count }}</gl-badge> <kbd v-else-if="item.shortcut" class="flat">?</kbd> - </button> + </span> </template> </gl-disclosure-dropdown-group> </gl-disclosure-dropdown> diff --git a/app/assets/javascripts/super_sidebar/components/items_list.vue b/app/assets/javascripts/super_sidebar/components/items_list.vue new file mode 100644 index 00000000000..0a72105fcc4 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/items_list.vue @@ -0,0 +1,40 @@ +<script> +import ProjectAvatar from '~/vue_shared/components/project_avatar.vue'; +import NavItem from './nav_item.vue'; + +export default { + components: { + ProjectAvatar, + NavItem, + }, + props: { + items: { + type: Array, + required: false, + default: () => [], + }, + }, +}; +</script> + +<template> + <ul class="gl-p-0 gl-list-style-none"> + <nav-item + v-for="item in items" + :key="item.id" + :item="item" + :link-classes="{ 'gl-py-2!': true }" + > + <template #icon> + <project-avatar + :project-id="item.id" + :project-name="item.title" + :project-avatar-url="item.avatar" + :size="24" + aria-hidden="true" + /> + </template> + </nav-item> + <slot name="view-all-items"></slot> + </ul> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue b/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue index edc13e305cf..94fc6aedcc0 100644 --- a/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue +++ b/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue @@ -12,29 +12,19 @@ export default { required: true, }, }, - methods: { - navigate() { - this.$refs.link.click(); - }, - }, }; </script> <template> - <gl-disclosure-dropdown :items="items" placement="center" @action="navigate"> + <gl-disclosure-dropdown :items="items" placement="center"> <template #toggle> <slot></slot> </template> <template #list-item="{ item }"> - <a - ref="link" - class="gl-display-flex gl-align-items-center gl-justify-content-space-between gl-hover-text-gray-900 gl-hover-text-decoration-none gl-text-gray-900" - :href="item.href" - tabindex="-1" - > + <span class="gl-display-flex gl-align-items-center gl-justify-content-space-between"> {{ item.text }} <gl-badge pill size="sm" variant="neutral">{{ item.count || 0 }}</gl-badge> - </a> + </span> </template> </gl-disclosure-dropdown> </template> diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue index 4fd6918fd6f..cd5363ad7a5 100644 --- a/app/assets/javascripts/super_sidebar/components/nav_item.vue +++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue @@ -1,37 +1,141 @@ <script> -import { GlIcon } from '@gitlab/ui'; +import { kebabCase } from 'lodash'; +import { GlCollapse, GlIcon, GlBadge } from '@gitlab/ui'; export default { name: 'NavItem', components: { + GlCollapse, GlIcon, + GlBadge, }, props: { item: { type: Object, required: true, }, + linkClasses: { + type: Object, + required: false, + default: () => ({}), + }, + }, + data() { + return { + expanded: this.item.is_active, + }; + }, + computed: { + elem() { + return this.isSection ? 'button' : 'a'; + }, + collapseIcon() { + return this.expanded ? 'chevron-up' : 'chevron-down'; + }, + isSection() { + return Boolean(this.item?.items?.length); + }, + itemId() { + return kebabCase(this.item.title); + }, + pillData() { + return this.item.pill_count; + }, + hasPill() { + return ( + Number.isFinite(this.pillData) || + (typeof this.pillData === 'string' && this.pillData !== '') + ); + }, + isActive() { + if (this.isSection) { + return !this.expanded && this.item.is_active; + } + return this.item.is_active; + }, + linkProps() { + if (this.isSection) { + return { + 'aria-controls': this.itemId, + 'aria-expanded': String(this.expanded), + }; + } + return { + ...this.$attrs, + href: this.item.link, + 'aria-current': this.isActive ? 'page' : null, + }; + }, + computedLinkClasses() { + return { + // Reset user agent styles on <button> + 'gl-appearance-none gl-border-0 gl-bg-transparent gl-text-left': this.isSection, + 'gl-w-full gl-focus': this.isSection, + 'gl-bg-t-gray-a-08': this.isActive, + ...this.linkClasses, + }; + }, + }, + methods: { + click(event) { + if (this.isSection) { + event.preventDefault(); + this.expanded = !this.expanded; + } + }, }, }; </script> <template> <li> - <a - :href="item.link" - class="gl-display-flex gl-pl-3 gl-py-3 gl-line-height-normal gl-text-black-normal gl-hover-bg-t-gray-a-08" + <component + :is="elem" + v-bind="linkProps" + class="gl-rounded-base gl-relative gl-display-flex gl-align-items-center gl-py-3 gl-px-0 gl-line-height-normal gl-text-black-normal! gl-hover-bg-t-gray-a-08 gl-text-decoration-none!" + :class="computedLinkClasses" + data-qa-selector="sidebar_menu_link" + data-testid="nav-item-link" + :data-qa-menu-item="item.title" + @click="click" > - <div class="gl-mr-3"> + <div + :class="[isActive ? 'gl-bg-blue-500' : 'gl-bg-transparent']" + class="gl-absolute gl-left-2 gl-top-2 gl-bottom-2 gl-transition-slow" + aria-hidden="true" + style="width: 3px; border-radius: 3px; margin-right: 1px" + ></div> + <div class="gl-flex-shrink-0 gl-w-6 gl-mx-3"> <slot name="icon"> - <gl-icon v-if="item.icon" :name="item.icon" /> + <gl-icon v-if="item.icon" :name="item.icon" class="gl-ml-2" /> </slot> </div> - <div class="gl-pr-3"> + <div class="gl-pr-3 gl-text-gray-900"> {{ item.title }} - <div v-if="item.subtitle" class="gl-font-sm gl-text-gray-500 gl-mt-1"> + <div v-if="item.subtitle" class="gl-font-sm gl-text-gray-500"> {{ item.subtitle }} </div> </div> - </a> + <span v-if="isSection || hasPill" class="gl-flex-grow-1 gl-text-right gl-mr-3"> + <gl-badge v-if="hasPill" size="sm" variant="info"> + {{ pillData }} + </gl-badge> + <gl-icon v-else-if="isSection" :name="collapseIcon" /> + </span> + </component> + <gl-collapse + v-if="isSection" + :id="itemId" + v-model="expanded" + :aria-label="item.title" + class="gl-list-style-none gl-p-0" + tag="ul" + > + <nav-item + v-for="subItem of item.items" + :key="`${item.title}-${subItem.title}`" + :item="subItem" + /> + </gl-collapse> </li> </template> diff --git a/app/assets/javascripts/super_sidebar/components/projects_list.vue b/app/assets/javascripts/super_sidebar/components/projects_list.vue new file mode 100644 index 00000000000..a545de06bd4 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/projects_list.vue @@ -0,0 +1,79 @@ +<script> +import { s__ } from '~/locale'; +import { MAX_FREQUENT_PROJECTS_COUNT } from '../constants'; +import FrequentItemsList from './frequent_items_list.vue'; +import SearchResults from './search_results.vue'; +import NavItem from './nav_item.vue'; + +export default { + MAX_FREQUENT_PROJECTS_COUNT, + components: { + FrequentItemsList, + SearchResults, + NavItem, + }, + props: { + username: { + type: String, + required: true, + }, + viewAllLink: { + type: String, + required: true, + }, + isSearch: { + type: Boolean, + required: false, + default: false, + }, + searchResults: { + type: Array, + required: false, + default: () => [], + }, + }, + computed: { + storageKey() { + return `${this.username}/frequent-projects`; + }, + viewAllItem() { + return { + link: this.viewAllLink, + title: s__('Navigation|View all projects'), + icon: 'project', + }; + }, + }, + i18n: { + title: s__('Navigation|Frequent projects'), + searchTitle: s__('Navigation|Projects'), + pristineText: s__('Navigation|Projects you visit often will appear here.'), + noResultsText: s__('Navigation|No project matches found'), + }, +}; +</script> + +<template> + <search-results + v-if="isSearch" + class="gl-border-t-0" + :title="$options.i18n.searchTitle" + :no-results-text="$options.i18n.noResultsText" + :search-results="searchResults" + > + <template #view-all-items> + <nav-item :item="viewAllItem" /> + </template> + </search-results> + <frequent-items-list + v-else + :title="$options.i18n.title" + :storage-key="storageKey" + :max-items="$options.MAX_FREQUENT_PROJECTS_COUNT" + :pristine-text="$options.i18n.pristineText" + > + <template #view-all-items> + <nav-item :item="viewAllItem" /> + </template> + </frequent-items-list> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/search_results.vue b/app/assets/javascripts/super_sidebar/components/search_results.vue new file mode 100644 index 00000000000..7c172110bad --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/search_results.vue @@ -0,0 +1,49 @@ +<script> +import ItemsList from './items_list.vue'; + +export default { + components: { + ItemsList, + }, + props: { + title: { + type: String, + required: true, + }, + noResultsText: { + type: String, + required: true, + }, + searchResults: { + type: Array, + required: false, + default: () => [], + }, + }, + computed: { + isEmpty() { + return !this.searchResults.length; + }, + }, +}; +</script> + +<template> + <li class="gl-border-t gl-border-gray-50 gl-mx-3 gl-py-3"> + <div + data-testid="list-title" + aria-hidden="true" + class="gl-text-transform-uppercase gl-text-secondary gl-font-weight-bold gl-font-xs gl-line-height-12 gl-letter-spacing-06em gl-my-3" + > + {{ title }} + </div> + <div v-if="isEmpty" data-testid="empty-text" class="gl-text-gray-500 gl-font-sm gl-my-3"> + {{ noResultsText }} + </div> + <items-list :aria-label="title" :items="searchResults"> + <template #view-all-items> + <slot name="view-all-items"></slot> + </template> + </items-list> + </li> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue new file mode 100644 index 00000000000..fc8968c50ea --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue @@ -0,0 +1,24 @@ +<script> +import NavItem from './nav_item.vue'; + +export default { + name: 'SidebarMenu', + components: { + NavItem, + }, + props: { + items: { + type: Array, + required: true, + }, + }, +}; +</script> + +<template> + <nav class="gl-py-2 gl-relative"> + <ul class="gl-px-2 gl-list-style-none"> + <nav-item v-for="item in items" :key="`menu-${item.title}`" :item="item" /> + </ul> + </nav> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_portal.vue b/app/assets/javascripts/super_sidebar/components/sidebar_portal.vue new file mode 100644 index 00000000000..2a805c86a3b --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/sidebar_portal.vue @@ -0,0 +1,30 @@ +<script> +import { MountingPortal } from 'portal-vue'; +import { SIDEBAR_PORTAL_ID, portalState } from '../constants'; + +/** + * Use this component to render content into the sidebar. + * + * Arbitrary content is allowed, but nav items should be added using a Ruby + * Sidebars::Panel subclass instead. + * + * Only one instance of this component on a given page is supported. This is to + * avoid ordering issues and cluttering the sidebar. + */ +export default { + components: { + MountingPortal, + }, + data() { + // This is shared state, by design. Do not mutate this state here. + return portalState; + }, + mountSelector: `#${SIDEBAR_PORTAL_ID}`, +}; +</script> + +<template> + <mounting-portal v-if="ready" :mount-to="$options.mountSelector" append> + <slot></slot> + </mounting-portal> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_portal_target.vue b/app/assets/javascripts/super_sidebar/components/sidebar_portal_target.vue new file mode 100644 index 00000000000..1154a4357e0 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/sidebar_portal_target.vue @@ -0,0 +1,17 @@ +<script> +import { SIDEBAR_PORTAL_ID, portalState } from '../constants'; + +export default { + mounted() { + portalState.ready = true; + }, + beforeDestroy() { + portalState.ready = false; + }, + mountId: SIDEBAR_PORTAL_ID, +}; +</script> + +<template> + <div v-once :id="$options.mountId"></div> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue index c4b769dcf24..e8df534346b 100644 --- a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue +++ b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue @@ -1,19 +1,27 @@ <script> -import { GlCollapse } from '@gitlab/ui'; -import { context } from '../mock_data'; +import { GlButton, GlCollapse } from '@gitlab/ui'; +import { __ } from '~/locale'; +import { isCollapsed, toggleSuperSidebarCollapsed } from '../super_sidebar_collapsed_state_manager'; import UserBar from './user_bar.vue'; +import SidebarPortalTarget from './sidebar_portal_target.vue'; import ContextSwitcherToggle from './context_switcher_toggle.vue'; import ContextSwitcher from './context_switcher.vue'; import HelpCenter from './help_center.vue'; +import SidebarMenu from './sidebar_menu.vue'; export default { - context, components: { + GlButton, GlCollapse, UserBar, ContextSwitcherToggle, ContextSwitcher, HelpCenter, + SidebarMenu, + SidebarPortalTarget, + }, + i18n: { + skipToMainContent: __('Skip to main content'), }, props: { sidebarData: { @@ -24,28 +32,65 @@ export default { data() { return { contextSwitcherOpened: false, + isCollapased: isCollapsed(), }; }, + computed: { + menuItems() { + return this.sidebarData.current_menu_items || []; + }, + }, + methods: { + collapseSidebar() { + toggleSuperSidebarCollapsed(true, false); + }, + }, }; </script> <template> - <aside - id="super-sidebar" - class="super-sidebar gl-fixed gl-bottom-0 gl-left-0 gl-display-flex gl-flex-direction-column gl-bg-gray-10 gl-border-r gl-border-gray-a-08" - data-testid="super-sidebar" - > - <user-bar :sidebar-data="sidebarData" /> - <div class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-overflow-hidden"> - <div class="gl-flex-grow-1 gl-overflow-auto"> - <context-switcher-toggle :context="$options.context" :expanded="contextSwitcherOpened" /> - <gl-collapse id="context-switcher" v-model="contextSwitcherOpened"> - <context-switcher /> - </gl-collapse> - </div> - <div class="gl-p-3"> - <help-center :sidebar-data="sidebarData" /> + <div> + <div class="super-sidebar-overlay" @click="collapseSidebar"></div> + <aside + id="super-sidebar" + :aria-hidden="String(isCollapased)" + class="super-sidebar" + data-testid="super-sidebar" + data-qa-selector="navbar" + :inert="isCollapased" + tabindex="-1" + > + <gl-button + class="super-sidebar-skip-to gl-sr-only-focusable gl-absolute gl-left-3 gl-right-3 gl-top-3" + href="#content-body" + variant="confirm" + > + {{ $options.i18n.skipToMainContent }} + </gl-button> + <user-bar :sidebar-data="sidebarData" /> + <div class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-overflow-hidden"> + <div class="gl-flex-grow-1 gl-overflow-auto"> + <context-switcher-toggle + :context="sidebarData.current_context_header" + :expanded="contextSwitcherOpened" + /> + <gl-collapse id="context-switcher" v-model="contextSwitcherOpened"> + <context-switcher + :username="sidebarData.username" + :projects-path="sidebarData.projects_path" + :groups-path="sidebarData.groups_path" + :current-context="sidebarData.current_context" + /> + </gl-collapse> + <gl-collapse :visible="!contextSwitcherOpened"> + <sidebar-menu :items="menuItems" /> + <sidebar-portal-target /> + </gl-collapse> + </div> + <div class="gl-p-3"> + <help-center :sidebar-data="sidebarData" /> + </div> </div> - </div> - </aside> + </aside> + </div> </template> diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue index ee72e8eafb4..e27acb60372 100644 --- a/app/assets/javascripts/super_sidebar/components/user_bar.vue +++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue @@ -1,60 +1,89 @@ <script> -import { GlAvatar, GlDropdown, GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { GlBadge, GlButton, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import NewNavToggle from '~/nav/components/new_nav_toggle.vue'; import logo from '../../../../views/shared/_logo.svg'; +import { toggleSuperSidebarCollapsed } from '../super_sidebar_collapsed_state_manager'; import CreateMenu from './create_menu.vue'; import Counter from './counter.vue'; import MergeRequestMenu from './merge_request_menu.vue'; +import UserMenu from './user_menu.vue'; export default { + // "GitLab Next" is a proper noun, so don't translate "Next" + /* eslint-disable-next-line @gitlab/require-i18n-strings */ + NEXT_LABEL: 'Next', logo, components: { - GlAvatar, - GlDropdown, - GlIcon, - CreateMenu, - NewNavToggle, Counter, + CreateMenu, + GlBadge, + GlButton, MergeRequestMenu, + UserMenu, }, i18n: { + collapseSidebar: __('Collapse sidebar'), createNew: __('Create new...'), issues: __('Issues'), mergeRequests: __('Merge requests'), + search: __('Search'), todoList: __('To-Do list'), }, directives: { GlTooltip: GlTooltipDirective, SafeHtml, }, - inject: ['rootPath', 'toggleNewNavEndpoint'], + inject: ['rootPath'], props: { sidebarData: { type: Object, required: true, }, }, + methods: { + collapseSidebar() { + toggleSuperSidebarCollapsed(true, true, true); + }, + }, }; </script> <template> <div class="user-bar"> - <div class="gl-display-flex gl-align-items-center gl-px-3 gl-py-2 gl-gap-3"> - <div class="gl-flex-grow-1"> - <a v-safe-html="$options.logo" :href="rootPath"></a> - </div> + <div class="gl-display-flex gl-align-items-center gl-px-3 gl-py-2 gl-gap-2"> + <a :href="rootPath"> + <img + v-if="sidebarData.logo_url" + data-testid="brand-header-custom-logo" + :src="sidebarData.logo_url" + class="gl-h-6" + /> + <span v-else v-safe-html="$options.logo"></span> + </a> + <gl-badge + v-if="sidebarData.gitlab_com_and_canary" + variant="success" + :href="sidebarData.canary_toggle_com_url" + size="sm" + >{{ $options.NEXT_LABEL }}</gl-badge + > + <div class="gl-flex-grow-1"></div> + <gl-button + v-gl-tooltip:super-sidebar.hover.bottom="$options.i18n.collapseSidebar" + :aria-label="$options.i18n.collapseSidebar" + icon="sidebar" + category="tertiary" + @click="collapseSidebar" + /> <create-menu :groups="sidebarData.create_new_menu_groups" /> - <button class="gl-border-none"> - <gl-icon name="search" class="gl-vertical-align-middle" /> - </button> - <gl-dropdown data-testid="user-dropdown" variant="link" no-caret> - <template #button-content> - <gl-avatar :entity-name="sidebarData.name" :src="sidebarData.avatar_url" :size="32" /> - </template> - <new-nav-toggle :endpoint="toggleNewNavEndpoint" enabled /> - </gl-dropdown> + <gl-button + icon="search" + :aria-label="$options.i18n.search" + category="tertiary" + href="/search" + /> + <user-menu :data="sidebarData" /> </div> <div class="gl-display-flex gl-justify-content-space-between gl-px-3 gl-py-2 gl-gap-2"> <counter @@ -72,7 +101,6 @@ export default { <counter v-gl-tooltip:super-sidebar.hover.bottom="$options.i18n.mergeRequests" class="gl-w-full" - tabindex="-1" icon="merge-request-open" :count="sidebarData.total_merge_requests_count" :label="$options.i18n.mergeRequests" @@ -85,6 +113,7 @@ export default { :count="sidebarData.todos_pending_count" href="/dashboard/todos" :label="$options.i18n.todoList" + data-qa-selector="todos_shortcut_button" /> </div> </div> diff --git a/app/assets/javascripts/super_sidebar/components/user_menu.vue b/app/assets/javascripts/super_sidebar/components/user_menu.vue new file mode 100644 index 00000000000..34bbb3ce177 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/user_menu.vue @@ -0,0 +1,291 @@ +<script> +import { + GlAvatar, + GlBadge, + GlDisclosureDropdown, + GlDisclosureDropdownGroup, + GlDisclosureDropdownItem, +} from '@gitlab/ui'; +import SafeHtml from '~/vue_shared/directives/safe_html'; +import { s__, __, sprintf } from '~/locale'; +import NewNavToggle from '~/nav/components/new_nav_toggle.vue'; +import Tracking from '~/tracking'; +import PersistentUserCallout from '~/persistent_user_callout'; +import UserNameGroup from './user_name_group.vue'; + +export default { + feedbackUrl: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391533', + i18n: { + newNavigation: { + badgeLabel: s__('NorthstarNavigation|Alpha'), + sectionTitle: s__('NorthstarNavigation|Navigation redesign'), + }, + setStatus: s__('SetStatusModal|Set status'), + editStatus: s__('SetStatusModal|Edit status'), + editProfile: s__('CurrentUser|Edit profile'), + preferences: s__('CurrentUser|Preferences'), + buyPipelineMinutes: s__('CurrentUser|Buy Pipeline minutes'), + oneOfGroupsRunningOutOfPipelineMinutes: s__('CurrentUser|One of your groups is running out'), + gitlabNext: s__('CurrentUser|Switch to GitLab Next'), + provideFeedback: s__('NorthstarNavigation|Provide feedback'), + startTrial: s__('CurrentUser|Start an Ultimate trial'), + signOut: __('Sign out'), + }, + components: { + GlAvatar, + GlBadge, + GlDisclosureDropdown, + GlDisclosureDropdownGroup, + GlDisclosureDropdownItem, + NewNavToggle, + UserNameGroup, + }, + directives: { + SafeHtml, + }, + mixins: [Tracking.mixin()], + inject: ['toggleNewNavEndpoint'], + props: { + data: { + required: true, + type: Object, + }, + }, + computed: { + toggleText() { + return sprintf(__('%{user} user’s menu'), { user: this.data.name }); + }, + statusItem() { + const { busy, customized } = this.data.status; + + const statusLabel = + busy || customized ? this.$options.i18n.editStatus : this.$options.i18n.setStatus; + + return { + text: statusLabel, + extraAttrs: { + class: 'js-set-status-modal-trigger', + }, + }; + }, + trialItem() { + return { + text: this.$options.i18n.startTrial, + href: this.data.trial.url, + }; + }, + editProfileItem() { + return { + text: this.$options.i18n.editProfile, + href: this.data.settings.profile_path, + extraAttrs: { + 'data-qa-selector': 'edit_profile_link', + }, + }; + }, + preferencesItem() { + return { + text: this.$options.i18n.preferences, + href: this.data.settings.profile_preferences_path, + }; + }, + addBuyPipelineMinutesMenuItem() { + return this.data.pipeline_minutes?.show_buy_pipeline_minutes; + }, + buyPipelineMinutesItem() { + return { + text: this.$options.i18n.buyPipelineMinutes, + warningText: this.$options.i18n.oneOfGroupsRunningOutOfPipelineMinutes, + href: this.data.pipeline_minutes?.buy_pipeline_minutes_path, + extraAttrs: { + class: 'js-follow-link', + }, + }; + }, + gitlabNextItem() { + return { + text: this.$options.i18n.gitlabNext, + href: this.data.canary_toggle_com_url, + }; + }, + feedbackItem() { + return { + text: this.$options.i18n.provideFeedback, + href: this.$options.feedbackUrl, + extraAttrs: { + target: '_blank', + }, + }; + }, + signOutGroup() { + return { + items: [ + { + text: this.$options.i18n.signOut, + href: this.data.sign_out_link, + extraAttrs: { + 'data-method': 'post', + 'data-qa-selector': 'sign_out_link', + class: 'sign-out-link', + }, + }, + ], + }; + }, + statusModalData() { + const defaultData = { + 'data-current-emoji': '', + 'data-current-message': '', + 'data-default-emoji': 'speech_balloon', + }; + + if (!this.data.status.customized) { + return defaultData; + } + return { + ...defaultData, + 'data-current-emoji': this.data.status.emoji, + 'data-current-message': this.data.status.message, + 'data-current-availability': this.data.status.availability, + 'data-current-clear-status-after': this.data.status.clear_after, + }; + }, + buyPipelineMinutesCalloutData() { + return this.showNotificationDot + ? { + 'data-feature-id': this.data.pipeline_minutes.callout_attrs.feature_id, + 'data-dismiss-endpoint': this.data.pipeline_minutes.callout_attrs.dismiss_endpoint, + } + : {}; + }, + showNotificationDot() { + return this.data.pipeline_minutes?.show_notification_dot; + }, + }, + methods: { + onShow() { + this.trackEvents(); + this.initCallout(); + }, + initCallout() { + if (this.showNotificationDot) { + PersistentUserCallout.factory(this.$refs?.buyPipelineMinutesNotificationCallout.$el); + } + }, + trackEvents() { + if (this.addBuyPipelineMinutesMenuItem) { + const { + 'track-action': trackAction, + 'track-label': label, + 'track-property': property, + } = this.data.pipeline_minutes.tracking_attrs; + this.track(trackAction, { label, property }); + } + }, + }, +}; +</script> + +<template> + <div> + <gl-disclosure-dropdown + placement="right" + data-testid="user-dropdown" + data-qa-selector="user_menu" + @shown="onShow" + > + <template #toggle> + <button class="user-bar-item btn-with-notification"> + <span class="gl-sr-only">{{ toggleText }}</span> + <gl-avatar + :size="24" + :entity-name="data.name" + :src="data.avatar_url" + aria-hidden="true" + data-qa-selector="user_avatar_content" + /> + <span + v-if="showNotificationDot" + class="notification-dot-warning" + data-testid="buy-pipeline-minutes-notification-dot" + v-bind="data.pipeline_minutes.notification_dot_attrs" + > + </span> + </button> + </template> + + <user-name-group :user="data" /> + <gl-disclosure-dropdown-group bordered> + <gl-disclosure-dropdown-item + v-if="data.status.can_update" + :item="statusItem" + data-testid="status-item" + /> + + <gl-disclosure-dropdown-item + v-if="data.trial.has_start_trial" + :item="trialItem" + data-testid="start-trial-item" + > + <template #list-item> + {{ trialItem.text }} + <gl-emoji data-name="rocket" /> + </template> + </gl-disclosure-dropdown-item> + + <gl-disclosure-dropdown-item :item="editProfileItem" data-testid="edit-profile-item" /> + + <gl-disclosure-dropdown-item :item="preferencesItem" data-testid="preferences-item" /> + + <gl-disclosure-dropdown-item + v-if="addBuyPipelineMinutesMenuItem" + ref="buyPipelineMinutesNotificationCallout" + :item="buyPipelineMinutesItem" + v-bind="buyPipelineMinutesCalloutData" + data-testid="buy-pipeline-minutes-item" + > + <template #list-item> + <span class="gl-display-flex gl-flex-direction-column"> + <span>{{ buyPipelineMinutesItem.text }} <gl-emoji data-name="clock9" /></span> + <span + v-if="data.pipeline_minutes.show_with_subtext" + class="gl-font-sm small gl-pt-2 gl-text-orange-800" + >{{ buyPipelineMinutesItem.warningText }}</span + > + </span> + </template> + </gl-disclosure-dropdown-item> + + <gl-disclosure-dropdown-item + v-if="data.gitlab_com_but_not_canary" + :item="gitlabNextItem" + data-testid="gitlab-next-item" + /> + </gl-disclosure-dropdown-group> + + <gl-disclosure-dropdown-group bordered> + <template #group-label> + <span class="gl-font-sm">{{ $options.i18n.newNavigation.sectionTitle }}</span> + <gl-badge size="sm" variant="info" + >{{ $options.i18n.newNavigation.badgeLabel }} + </gl-badge> + </template> + <new-nav-toggle :endpoint="toggleNewNavEndpoint" enabled new-navigation /> + <gl-disclosure-dropdown-item :item="feedbackItem" data-testid="feedback-item" /> + </gl-disclosure-dropdown-group> + + <gl-disclosure-dropdown-group + v-if="data.can_sign_out" + bordered + :group="signOutGroup" + data-testid="sign-out-group" + /> + </gl-disclosure-dropdown> + + <div + v-if="data.status.can_update" + class="js-set-status-modal-wrapper" + v-bind="statusModalData" + ></div> + </div> +</template> diff --git a/app/assets/javascripts/super_sidebar/components/user_name_group.vue b/app/assets/javascripts/super_sidebar/components/user_name_group.vue new file mode 100644 index 00000000000..2489f462122 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/components/user_name_group.vue @@ -0,0 +1,77 @@ +<script> +import { GlDisclosureDropdownGroup, GlDisclosureDropdownItem, GlTooltip } from '@gitlab/ui'; +import SafeHtml from '~/vue_shared/directives/safe_html'; + +import { s__ } from '~/locale'; + +export default { + i18n: { + user: { + busy: s__('UserProfile|(Busy)'), + }, + }, + components: { + GlDisclosureDropdownGroup, + GlDisclosureDropdownItem, + GlTooltip, + }, + directives: { + SafeHtml, + }, + props: { + user: { + required: true, + type: Object, + }, + }, + computed: { + menuItem() { + const item = { + text: this.user.name, + }; + if (this.user.has_link_to_profile) { + item.href = this.user.link_to_profile; + } + return item; + }, + }, +}; +</script> + +<template> + <gl-disclosure-dropdown-group> + <gl-disclosure-dropdown-item :item="menuItem"> + <template #list-item> + <span class="gl-display-flex gl-flex-direction-column"> + <span> + <span class="gl-font-weight-bold"> + {{ user.name }} + </span> + <span v-if="user.status.busy" class="gl-text-gray-500">{{ + $options.i18n.user.busy + }}</span> + </span> + + <span class="gl-text-gray-400">@{{ user.username }}</span> + + <span + v-if="user.status.customized" + ref="statusTooltipTarget" + data-testid="user-menu-status" + class="gl-display-flex gl-align-items-center gl-mt-2 gl-font-sm" + > + <gl-emoji :data-name="user.status.emoji" class="gl-mr-1" /> + <span v-safe-html="user.status.message" class="gl-text-truncate"></span> + <gl-tooltip + :target="() => $refs.statusTooltipTarget" + boundary="viewport" + placement="bottom" + > + <span v-safe-html="user.status.message"></span> + </gl-tooltip> + </span> + </span> + </template> + </gl-disclosure-dropdown-item> + </gl-disclosure-dropdown-group> +</template> diff --git a/app/assets/javascripts/super_sidebar/constants.js b/app/assets/javascripts/super_sidebar/constants.js new file mode 100644 index 00000000000..acc03bc48c7 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/constants.js @@ -0,0 +1,14 @@ +// Note: all constants defined here are considered internal implementation +// details for the sidebar. They should not be imported by anything outside of +// the super_sidebar directory. + +import Vue from 'vue'; + +export const SIDEBAR_PORTAL_ID = 'sidebar-portal-mount'; + +export const portalState = Vue.observable({ + ready: false, +}); + +export const MAX_FREQUENT_PROJECTS_COUNT = 5; +export const MAX_FREQUENT_GROUPS_COUNT = 3; diff --git a/app/assets/javascripts/super_sidebar/graphql/queries/search_user_groups_and_projects.query.graphql b/app/assets/javascripts/super_sidebar/graphql/queries/search_user_groups_and_projects.query.graphql new file mode 100644 index 00000000000..4b1e65be3fa --- /dev/null +++ b/app/assets/javascripts/super_sidebar/graphql/queries/search_user_groups_and_projects.query.graphql @@ -0,0 +1,24 @@ +query searchUserProjectsAndGroups($username: String!, $search: String) { + projects(search: $search, sort: "latest_activity_desc", membership: true, first: 20) { + nodes { + id + name + namespace: nameWithNamespace + webUrl + avatarUrl + } + } + + user(username: $username) { + id + groups(search: $search, first: 20) { + nodes { + id + name + namespace: fullPath + webUrl + avatarUrl + } + } + } +} diff --git a/app/assets/javascripts/super_sidebar/mock_data.js b/app/assets/javascripts/super_sidebar/mock_data.js index 0d1ac006df7..5e5ad97eb68 100644 --- a/app/assets/javascripts/super_sidebar/mock_data.js +++ b/app/assets/javascripts/super_sidebar/mock_data.js @@ -1,13 +1,8 @@ import { s__ } from '~/locale'; -export const context = { - title: 'Typeahead.js', - link: '/', - avatar: 'https://gitlab.com/uploads/-/system/project/avatar/278964/project_avatar.png?width=32', -}; - export const contextSwitcherItems = { yourWork: { title: s__('Navigation|Your work'), link: '/', icon: 'work' }, + explore: { title: s__('Navigation|Explore'), link: '/explore', icon: 'compass' }, recentProjects: [ { // eslint-disable-next-line @gitlab/require-i18n-strings diff --git a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js index b9c7073df8c..4395cc2f5f0 100644 --- a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js +++ b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js @@ -1,16 +1,33 @@ import Vue from 'vue'; +import VueApollo from 'vue-apollo'; +import createDefaultClient from '~/lib/graphql'; +import { initStatusTriggers } from '../header'; +import { + bindSuperSidebarCollapsedEvents, + initSuperSidebarCollapsedState, +} from './super_sidebar_collapsed_state_manager'; import SuperSidebar from './components/super_sidebar.vue'; +Vue.use(VueApollo); + +const apolloProvider = new VueApollo({ + defaultClient: createDefaultClient(), +}); + export const initSuperSidebar = () => { const el = document.querySelector('.js-super-sidebar'); if (!el) return false; + bindSuperSidebarCollapsedEvents(); + initSuperSidebarCollapsedState(); + const { rootPath, sidebar, toggleNewNavEndpoint } = el.dataset; return new Vue({ el, name: 'SuperSidebarRoot', + apolloProvider, provide: { rootPath, toggleNewNavEndpoint, @@ -24,3 +41,5 @@ export const initSuperSidebar = () => { }, }); }; + +requestIdleCallback(initStatusTriggers); diff --git a/app/assets/javascripts/super_sidebar/super_sidebar_collapsed_state_manager.js b/app/assets/javascripts/super_sidebar/super_sidebar_collapsed_state_manager.js new file mode 100644 index 00000000000..549c6c17e44 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/super_sidebar_collapsed_state_manager.js @@ -0,0 +1,51 @@ +import { GlBreakpointInstance as bp, breakpoints } from '@gitlab/ui/dist/utils'; +import { debounce } from 'lodash'; +import { setCookie, getCookie } from '~/lib/utils/common_utils'; + +export const SIDEBAR_COLLAPSED_CLASS = 'page-with-super-sidebar-collapsed'; +export const SIDEBAR_COLLAPSED_COOKIE = 'super_sidebar_collapsed'; +export const SIDEBAR_COLLAPSED_COOKIE_EXPIRATION = 365 * 10; + +export const findPage = () => document.querySelector('.page-with-super-sidebar'); +export const findSidebar = () => document.querySelector('.super-sidebar'); +export const findToggles = () => document.querySelectorAll('.js-super-sidebar-toggle'); + +export const isCollapsed = () => findPage().classList.contains(SIDEBAR_COLLAPSED_CLASS); + +// See documentation: https://design.gitlab.com/patterns/navigation#left-sidebar +// NOTE: at 1200px nav sidebar should not overlap the content +// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24555#note_134136110 +export const isDesktopBreakpoint = () => bp.windowWidth() >= breakpoints.xl; + +export const getCollapsedCookie = () => getCookie(SIDEBAR_COLLAPSED_COOKIE) === 'true'; + +export const toggleSuperSidebarCollapsed = (collapsed, saveCookie, isUserAction) => { + const sidebar = findSidebar(); + sidebar.ariaHidden = collapsed; + sidebar.inert = collapsed; + + if (!collapsed && isUserAction) sidebar.focus(); + + findPage().classList.toggle(SIDEBAR_COLLAPSED_CLASS, collapsed); + + if (saveCookie && isDesktopBreakpoint()) { + setCookie(SIDEBAR_COLLAPSED_COOKIE, collapsed, { + expires: SIDEBAR_COLLAPSED_COOKIE_EXPIRATION, + }); + } +}; + +export const initSuperSidebarCollapsedState = () => { + const collapsed = isDesktopBreakpoint() ? getCollapsedCookie() : true; + toggleSuperSidebarCollapsed(collapsed, false); +}; + +export const bindSuperSidebarCollapsedEvents = () => { + findToggles().forEach((elem) => { + elem.addEventListener('click', () => { + toggleSuperSidebarCollapsed(!isCollapsed(), true, true); + }); + }); + + window.addEventListener('resize', debounce(initSuperSidebarCollapsedState, 100)); +}; diff --git a/app/assets/javascripts/super_sidebar/utils.js b/app/assets/javascripts/super_sidebar/utils.js new file mode 100644 index 00000000000..8e4250d0e39 --- /dev/null +++ b/app/assets/javascripts/super_sidebar/utils.js @@ -0,0 +1,83 @@ +import AccessorUtilities from '~/lib/utils/accessor'; +import { FREQUENT_ITEMS, FIFTEEN_MINUTES_IN_MS } from '~/frequent_items/constants'; +import { truncateNamespace } from '~/lib/utils/text_utility'; + +/** + * This takes an array of project or groups that were stored in the local storage, to be shown in + * the context switcher, and sorts them by frequency and last access date. + * In the resulting array, the most popular item (highest frequency and most recent access date) is + * placed at the first index, while the least popular is at the last index. + * + * @param {Array} items The projects or groups stored in the local storage + * @returns The items, sorted by frequency and last access date + */ +const sortItemsByFrequencyAndLastAccess = (items) => + items.sort((itemA, itemB) => { + // Sort all frequent items in decending order of frequency + // and then by lastAccessedOn with recent most first + if (itemA.frequency !== itemB.frequency) { + return itemB.frequency - itemA.frequency; + } else if (itemA.lastAccessedOn !== itemB.lastAccessedOn) { + return itemB.lastAccessedOn - itemA.lastAccessedOn; + } + + return 0; + }); + +// This imitates getTopFrequentItems from app/assets/javascripts/frequent_items/utils.js, but +// adjusts the rules to accommodate for the context switcher's designs. +export const getTopFrequentItems = (items = [], maxCount) => { + const frequentItems = items.filter((item) => item.frequency >= FREQUENT_ITEMS.ELIGIBLE_FREQUENCY); + sortItemsByFrequencyAndLastAccess(frequentItems); + + return frequentItems.slice(0, maxCount); +}; + +const updateItemAccess = (item) => { + const now = Date.now(); + const neverAccessed = !item.lastAccessedOn; + const shouldUpdate = + neverAccessed || Math.abs(now - item.lastAccessedOn) / FIFTEEN_MINUTES_IN_MS > 1; + const currentFrequency = item.frequency ?? 0; + + return { + ...item, + frequency: shouldUpdate ? currentFrequency + 1 : currentFrequency, + lastAccessedOn: shouldUpdate ? now : item.lastAccessedOn, + }; +}; + +export const trackContextAccess = (username, context) => { + if (!AccessorUtilities.canUseLocalStorage()) { + return false; + } + + const storageKey = `${username}/frequent-${context.namespace}`; + const storedRawItems = localStorage.getItem(storageKey); + const storedItems = storedRawItems ? JSON.parse(storedRawItems) : []; + const existingItemIndex = storedItems.findIndex( + (cachedItem) => cachedItem.id === context.item.id, + ); + + if (existingItemIndex > -1) { + storedItems[existingItemIndex] = updateItemAccess(storedItems[existingItemIndex]); + } else { + const newItem = updateItemAccess(context.item); + if (storedItems.length === FREQUENT_ITEMS.MAX_COUNT) { + sortItemsByFrequencyAndLastAccess(storedItems); + storedItems.pop(); + } + storedItems.push(newItem); + } + + return localStorage.setItem(storageKey, JSON.stringify(storedItems)); +}; + +export const formatContextSwitcherItems = (items) => + items.map(({ id, name: title, namespace, avatarUrl: avatar, webUrl: link }) => ({ + id, + title, + subtitle: truncateNamespace(namespace), + avatar, + link, + })); diff --git a/app/assets/javascripts/syntax_highlight.js b/app/assets/javascripts/syntax_highlight.js index cb2bf24abc7..065e1080897 100644 --- a/app/assets/javascripts/syntax_highlight.js +++ b/app/assets/javascripts/syntax_highlight.js @@ -15,6 +15,10 @@ export default function syntaxHighlight($els = null) { const els = $els.get ? $els.get() : $els; const handler = (el) => { + if (el.classList === undefined) { + return el; + } + if (el.classList.contains('js-syntax-highlight')) { // Given the element itself, apply highlighting return el.classList.add(gon.user_color_scheme); diff --git a/app/assets/javascripts/task_list.js b/app/assets/javascripts/task_list.js index a7760ad5d0b..bb344ade344 100644 --- a/app/assets/javascripts/task_list.js +++ b/app/assets/javascripts/task_list.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'deckar01-task_list'; import { __ } from '~/locale'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from './lib/utils/axios_utils'; export default class TaskList { diff --git a/app/assets/javascripts/terraform/components/init_command_modal.vue b/app/assets/javascripts/terraform/components/init_command_modal.vue index 0d8a883972f..ad7f4774bd2 100644 --- a/app/assets/javascripts/terraform/components/init_command_modal.vue +++ b/app/assets/javascripts/terraform/components/init_command_modal.vue @@ -33,7 +33,7 @@ export default { closeModalProps() { return { text: this.$options.i18n.closeText, - attributes: [], + attributes: {}, }; }, }, diff --git a/app/assets/javascripts/terraform/components/states_table_actions.vue b/app/assets/javascripts/terraform/components/states_table_actions.vue index 773ecf1d5d5..586b3e96e44 100644 --- a/app/assets/javascripts/terraform/components/states_table_actions.vue +++ b/app/assets/javascripts/terraform/components/states_table_actions.vue @@ -69,7 +69,7 @@ export default { cancelModalProps() { return { text: this.$options.i18n.modalCancel, - attributes: [], + attributes: {}, }; }, disableModalSubmit() { @@ -81,7 +81,7 @@ export default { primaryModalProps() { return { text: this.$options.i18n.modalRemove, - attributes: [{ disabled: this.disableModalSubmit }, { variant: 'danger' }], + attributes: { disabled: this.disableModalSubmit, variant: 'danger' }, }; }, commandModalId() { diff --git a/app/assets/javascripts/toggles/index.js b/app/assets/javascripts/toggles/index.js index 5848b3a424c..500fe8c1150 100644 --- a/app/assets/javascripts/toggles/index.js +++ b/app/assets/javascripts/toggles/index.js @@ -17,20 +17,12 @@ export const initToggle = (el) => { return new Vue({ el, - props: { - disabled: { - type: Boolean, - required: false, - default: parseBoolean(disabled), - }, - isLoading: { - type: Boolean, - required: false, - default: parseBoolean(isLoading), - }, - }, + name: 'ToggleFromHtml', + data() { return { + disabled: parseBoolean(disabled), + isLoading: parseBoolean(isLoading), value: parseBoolean(isChecked), }; }, diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue index feaf9072ee2..1904846fcbc 100644 --- a/app/assets/javascripts/token_access/components/inbound_token_access.vue +++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue @@ -9,7 +9,7 @@ import { GlSprintf, GlToggle, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; import inboundAddProjectCIJobTokenScopeMutation from '../graphql/mutations/inbound_add_project_ci_job_token_scope.mutation.graphql'; diff --git a/app/assets/javascripts/token_access/components/opt_in_jwt.vue b/app/assets/javascripts/token_access/components/opt_in_jwt.vue index c774f37b1e4..9485e0c3667 100644 --- a/app/assets/javascripts/token_access/components/opt_in_jwt.vue +++ b/app/assets/javascripts/token_access/components/opt_in_jwt.vue @@ -1,7 +1,7 @@ <script> import { GlLink, GlLoadingIcon, GlSprintf, GlToggle } from '@gitlab/ui'; import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__ } from '~/locale'; import updateOptInJwtMutation from '../graphql/mutations/update_opt_in_jwt.mutation.graphql'; import getOptInJwtSettingQuery from '../graphql/queries/get_opt_in_jwt_setting.query.graphql'; diff --git a/app/assets/javascripts/token_access/components/outbound_token_access.vue b/app/assets/javascripts/token_access/components/outbound_token_access.vue index 0deae1a1d82..d9c23c6c7f3 100644 --- a/app/assets/javascripts/token_access/components/outbound_token_access.vue +++ b/app/assets/javascripts/token_access/components/outbound_token_access.vue @@ -9,7 +9,7 @@ import { GlSprintf, GlToggle, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; import addProjectCIJobTokenScopeMutation from '../graphql/mutations/add_project_ci_job_token_scope.mutation.graphql'; diff --git a/app/assets/javascripts/token_access/components/token_access_app.vue b/app/assets/javascripts/token_access/components/token_access_app.vue index 59d59757735..089159ac87b 100644 --- a/app/assets/javascripts/token_access/components/token_access_app.vue +++ b/app/assets/javascripts/token_access/components/token_access_app.vue @@ -1,5 +1,4 @@ <script> -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import OutboundTokenAccess from './outbound_token_access.vue'; import InboundTokenAccess from './inbound_token_access.vue'; import OptInJwt from './opt_in_jwt.vue'; @@ -10,17 +9,11 @@ export default { InboundTokenAccess, OptInJwt, }, - mixins: [glFeatureFlagMixin()], - computed: { - inboundTokenAccessEnabled() { - return this.glFeatures.ciInboundJobTokenScope; - }, - }, }; </script> <template> <div> - <inbound-token-access v-if="inboundTokenAccessEnabled" class="gl-pb-5" /> + <inbound-token-access class="gl-pb-5" /> <outbound-token-access class="gl-py-5" /> <opt-in-jwt /> </div> diff --git a/app/assets/javascripts/token_access/components/token_projects_table.vue b/app/assets/javascripts/token_access/components/token_projects_table.vue index c00dd882895..ee88b4ec339 100644 --- a/app/assets/javascripts/token_access/components/token_projects_table.vue +++ b/app/assets/javascripts/token_access/components/token_projects_table.vue @@ -29,6 +29,9 @@ export default { removeProject(project) { this.$emit('removeProject', project); }, + namespaceFallback(namespace) { + return namespace?.fullPath || ''; + }, }, }; </script> @@ -51,7 +54,9 @@ export default { </template> <template #cell(namespace)="{ item }"> - <span data-testid="token-access-project-namespace">{{ item.namespace.fullPath }}</span> + <span data-testid="token-access-project-namespace"> + {{ namespaceFallback(item.namespace) }} + </span> </template> <template #cell(actions)="{ item }"> diff --git a/app/assets/javascripts/usage_quotas/storage/constants.js b/app/assets/javascripts/usage_quotas/storage/constants.js index fab18cefc60..bd8cd372ecf 100644 --- a/app/assets/javascripts/usage_quotas/storage/constants.js +++ b/app/assets/javascripts/usage_quotas/storage/constants.js @@ -26,7 +26,6 @@ export const uploadsPopoverContent = s__( 'NamespaceStorage|Uploads are not counted in namespace storage quotas.', ); -export const PROJECT_TABLE_LABEL_PROJECT = __('Project'); export const PROJECT_TABLE_LABEL_STORAGE_TYPE = s__('UsageQuota|Storage type'); export const PROJECT_TABLE_LABEL_USAGE = s__('UsageQuota|Usage'); diff --git a/app/assets/javascripts/user_lists/components/add_user_modal.vue b/app/assets/javascripts/user_lists/components/add_user_modal.vue index e982d10f63b..37c9548ad64 100644 --- a/app/assets/javascripts/user_lists/components/add_user_modal.vue +++ b/app/assets/javascripts/user_lists/components/add_user_modal.vue @@ -19,11 +19,11 @@ export default { modalOptions: { actionPrimary: { text: s__('UserLists|Add'), - attributes: [{ 'data-testid': 'confirm-add-user-ids', variant: 'confirm' }], + attributes: { 'data-testid': 'confirm-add-user-ids', variant: 'confirm' }, }, actionCancel: { text: s__('UserLists|Cancel'), - attributes: [{ 'data-testid': 'cancel-add-user-ids' }], + attributes: { 'data-testid': 'cancel-add-user-ids' }, }, modalId: ADD_USER_MODAL_ID, static: true, diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js index 1af47b020f7..a401a9bbf2f 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -6,6 +6,7 @@ import $ from 'jquery'; import { escape, template, uniqBy } from 'lodash'; import { AJAX_USERS_SELECT_PARAMS_MAP } from 'ee_else_ce/users_select/constants'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { TYPE_MERGE_REQUEST } from '~/issues/constants'; import { isUserBusy } from '~/set_status_modal/utils'; import { fixTitle, dispose } from '~/tooltips'; import axios from '~/lib/utils/axios_utils'; @@ -647,7 +648,7 @@ UsersSelect.prototype.users = function (query, options, callback) { ...getAjaxUsersSelectParams(options, AJAX_USERS_SELECT_PARAMS_MAP), }; - const isMergeRequest = options.issuableType === 'merge_request'; + const isMergeRequest = options.issuableType === TYPE_MERGE_REQUEST; const isEditMergeRequest = !options.issuableType && options.iid && options.targetBranch; const isNewMergeRequest = !options.issuableType && !options.iid && options.targetBranch; @@ -684,7 +685,7 @@ UsersSelect.prototype.renderRow = function ( img, elsClassName, ) { - const tooltip = issuableType === 'merge_request' && !user.can_merge ? __('Cannot merge') : ''; + const tooltip = issuableType === TYPE_MERGE_REQUEST && !user.can_merge ? __('Cannot merge') : ''; const tooltipClass = tooltip ? `has-tooltip` : ''; const selectedClass = selected === true ? 'is-active' : ''; const linkClasses = `${selectedClass} ${tooltipClass}`; @@ -725,7 +726,7 @@ UsersSelect.prototype.renderRowAvatar = function (issuableType, user, img) { } const mergeIcon = - issuableType === 'merge_request' && !user.can_merge + issuableType === TYPE_MERGE_REQUEST && !user.can_merge ? spriteIcon('warning-solid', 's12 merge-icon') : ''; diff --git a/app/assets/javascripts/pages/sessions/new/length_validator.js b/app/assets/javascripts/validators/length_validator.js index b2074fb1e39..6ce453fe40b 100644 --- a/app/assets/javascripts/pages/sessions/new/length_validator.js +++ b/app/assets/javascripts/validators/length_validator.js @@ -2,6 +2,16 @@ import InputValidator from '~/validators/input_validator'; const errorMessageClass = 'gl-field-error'; +export const isAboveMaxLength = (str, maxLength) => { + return str.length > parseInt(maxLength, 10); +}; + +export const isBelowMinLength = (value, minLength, allowEmpty) => { + const isValueNotAllowedOrNotEmpty = allowEmpty !== 'true' || value.length !== 0; + const isValueBelowMinLength = value.length < parseInt(minLength, 10); + return isValueBelowMinLength && isValueNotAllowedOrNotEmpty; +}; + export default class LengthValidator extends InputValidator { constructor(opts = {}) { super(); @@ -26,16 +36,17 @@ export default class LengthValidator extends InputValidator { minLengthMessage, maxLengthMessage, maxLength, + allowEmpty, } = this.inputDomElement.dataset; this.invalidInput = false; - if (value.length > parseInt(maxLength, 10)) { + if (isAboveMaxLength(value, maxLength)) { this.invalidInput = true; this.errorMessage = maxLengthMessage; } - if (value.length < parseInt(minLength, 10)) { + if (isBelowMinLength(value, minLength, allowEmpty)) { this.invalidInput = true; this.errorMessage = minLengthMessage; } diff --git a/app/assets/javascripts/vue_merge_request_widget/components/action_buttons.vue b/app/assets/javascripts/vue_merge_request_widget/components/action_buttons.vue index 917ed259dd0..f2ec8f589ce 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/action_buttons.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/action_buttons.vue @@ -142,7 +142,7 @@ export default { :title="setTooltip(btn)" :href="btn.href" :target="btn.target" - :class="[{ 'gl-mr-3': index !== tertiaryButtons.length - 1 }, btn.class]" + :class="[{ 'gl-mr-1': index !== tertiaryButtons.length - 1 }, btn.class]" :data-clipboard-text="btn.dataClipboardText" :data-qa-selector="actionButtonQaSelector(btn)" :data-method="btn.dataMethod" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue index 4b65d6fd9ac..74922dd922c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue @@ -1,10 +1,11 @@ <script> -import { GlButton, GlSprintf, GlLink } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { GlButton, GlSprintf } from '@gitlab/ui'; +import { createAlert } from '~/alert'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { HTTP_STATUS_UNAUTHORIZED } from '~/lib/utils/http_status'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { s__, __ } from '~/locale'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import eventHub from '../../event_hub'; import approvalsMixin from '../../mixins/approvals'; import MrWidgetContainer from '../mr_widget_container.vue'; @@ -12,8 +13,7 @@ import MrWidgetIcon from '../mr_widget_icon.vue'; import { INVALID_RULES_DOCS_PATH } from '../../constants'; import ApprovalsSummary from './approvals_summary.vue'; import ApprovalsSummaryOptional from './approvals_summary_optional.vue'; -import { FETCH_LOADING, FETCH_ERROR, APPROVE_ERROR, UNAPPROVE_ERROR } from './messages'; -import { humanizeInvalidApproversRules } from './humanized_text'; +import { FETCH_LOADING, APPROVE_ERROR, UNAPPROVE_ERROR } from './messages'; export default { name: 'MRWidgetApprovals', @@ -24,7 +24,6 @@ export default { ApprovalsSummaryOptional, GlButton, GlSprintf, - GlLink, }, mixins: [approvalsMixin, glFeatureFlagsMixin()], props: { @@ -59,10 +58,8 @@ export default { }, data() { return { - fetchingApprovals: true, hasApprovalAuthError: false, isApproving: false, - updatedCount: 0, }; }, computed: { @@ -70,7 +67,7 @@ export default { return this.mr.approvalsWidgetType === 'base'; }, isApproved() { - return Boolean(this.approvals.approved); + return Boolean(this.approvals.approved || this.approvedBy.length); }, isOptional() { return this.isOptionalDefault !== null ? this.isOptionalDefault : !this.approvedBy.length; @@ -78,26 +75,25 @@ export default { hasAction() { return Boolean(this.action); }, - approvals() { - return this.mr.approvals || {}; - }, invalidRules() { - return this.approvals.invalid_approvers_rules || []; + return this.approvals.approvalState?.invalidApproversRules || []; }, hasInvalidRules() { - return this.approvals.merge_request_approvers_available && this.invalidRules.length; + return this.mr.mergeRequestApproversAvailable && this.invalidRules.length; }, invalidRulesText() { - return humanizeInvalidApproversRules(this.invalidRules); + return this.invalidRules.length; }, approvedBy() { - return this.approvals.approved_by ? this.approvals.approved_by.map((x) => x.user) : []; + return this.approvals.approvedBy?.nodes || []; }, userHasApproved() { - return Boolean(this.approvals.user_has_approved); + return this.approvedBy.some( + (approver) => getIdFromGraphQLId(approver.id) === gon.current_user_id, + ); }, userCanApprove() { - return Boolean(this.approvals.user_can_approve); + return Boolean(this.approvals.userPermissions.canApprove); }, showApprove() { return !this.userHasApproved && this.userCanApprove && this.mr.isOpen; @@ -135,19 +131,6 @@ export default { : this.$options.i18n.invalidRuleSingular; }, }, - created() { - this.refreshApprovals() - .then(() => { - this.fetchingApprovals = false; - }) - .catch(() => - this.alerts.push( - createAlert({ - message: FETCH_ERROR, - }), - ), - ); - }, methods: { approve() { if (this.requirePasswordToApprove) { @@ -196,16 +179,14 @@ export default { this.isApproving = true; this.clearError(); return serviceFn() - .then((data) => { - this.mr.setApprovals(data); - this.updatedCount += 1; - + .then(() => { if (!window.gon?.features?.realtimeMrStatusChange) { eventHub.$emit('MRWidgetUpdateRequested'); eventHub.$emit('ApprovalUpdated'); } - this.$emit('updated'); + // TODO: Remove this line when we move to Apollo subscriptions + this.$apollo.queries.approvals.refetch(); }) .catch(errFn) .then(() => { @@ -217,10 +198,10 @@ export default { linkToInvalidRules: INVALID_RULES_DOCS_PATH, i18n: { invalidRuleSingular: s__( - 'mrWidget|Approval rule %{rules} is invalid. GitLab has approved this rule automatically to unblock the merge request. %{link}', + 'mrWidget|%{rules} invalid rule has been approved automatically, as no one can approve it.', ), invalidRulesPlural: s__( - 'mrWidget|Approval rules %{rules} are invalid. GitLab has approved these rules automatically to unblock the merge request. %{link}', + 'mrWidget|%{rules} invalid rules have been approved automatically, as no one can approve them.', ), learnMore: __('Learn more.'), }, @@ -230,7 +211,7 @@ export default { <mr-widget-container> <div class="js-mr-approvals d-flex align-items-start align-items-md-center"> <mr-widget-icon name="approval" /> - <div v-if="fetchingApprovals">{{ $options.FETCH_LOADING }}</div> + <div v-if="$apollo.queries.approvals.loading">{{ $options.FETCH_LOADING }}</div> <template v-else> <div class="gl-display-flex gl-flex-direction-column"> <div class="gl-display-flex gl-flex-direction-row gl-align-items-center"> @@ -252,22 +233,13 @@ export default { /> <approvals-summary v-else - :project-path="mr.targetProjectFullPath" - :iid="`${mr.iid}`" - :updated-count="updatedCount" + :approval-state="approvals" :multiple-approval-rules-available="mr.multipleApprovalRulesAvailable" /> </div> <div v-if="hasInvalidRules" class="gl-text-gray-400 gl-mt-2" data-testid="invalid-rules"> <gl-sprintf :message="pluralizedRuleText"> - <template #rules> - {{ invalidRulesText }} - </template> - <template #link> - <gl-link :href="$options.linkToInvalidRules" target="_blank"> - {{ $options.i18n.learnMore }} - </gl-link> - </template> + <template #rules>{{ invalidRulesText }}</template> </gl-sprintf> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue index 697d953874c..2af033bb80f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue @@ -1,5 +1,4 @@ <script> -import { GlSkeletonLoader } from '@gitlab/ui'; import { toNounSeriesText } from '~/lib/utils/grammar'; import { n__, sprintf } from '~/locale'; import { @@ -10,49 +9,21 @@ import { import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { getApprovalRuleNamesLeft } from 'ee_else_ce/vue_merge_request_widget/mappers'; -import approvedByQuery from 'ee_else_ce/vue_merge_request_widget/components/approvals/queries/approved_by.query.graphql'; export default { - apollo: { - approvalState: { - query: approvedByQuery, - variables() { - return { - projectPath: this.projectPath, - iid: this.iid, - }; - }, - update: (data) => data.project.mergeRequest, - }, - }, components: { - GlSkeletonLoader, UserAvatarList, }, props: { - projectPath: { - type: String, - required: true, - }, - iid: { - type: String, - required: true, - }, - updatedCount: { - type: Number, - required: false, - default: 0, - }, multipleApprovalRulesAvailable: { type: Boolean, required: false, default: false, }, - }, - data() { - return { - approvalState: {}, - }; + approvalState: { + type: Object, + required: true, + }, }, computed: { approvers() { @@ -134,37 +105,20 @@ export default { return gon.current_user_id; }, }, - watch: { - updatedCount() { - this.$apollo.queries.approvalState.refetch(); - }, - }, }; </script> <template> <div data-qa-selector="approvals_summary_content"> - <div - v-if="$apollo.queries.approvalState.loading" - class="gl-display-inline-block gl-vertical-align-middle" - style="width: 132px; height: 24px" - > - <gl-skeleton-loader :width="132" :height="24"> - <rect width="100" height="24" x="0" y="0" rx="4" /> - <circle cx="120" cy="12" r="12" /> - </gl-skeleton-loader> - </div> - <template v-else> - <span class="gl-font-weight-bold">{{ approvalLeftMessage }}</span> - <template v-if="hasApprovers"> - <span v-if="approvalLeftMessage">{{ message }}</span> - <span v-else class="gl-font-weight-bold">{{ message }}</span> - <user-avatar-list - class="gl-display-inline-block gl-vertical-align-middle gl-pt-1" - :img-size="24" - :items="approvers" - /> - </template> + <span class="gl-font-weight-bold">{{ approvalLeftMessage }}</span> + <template v-if="hasApprovers"> + <span v-if="approvalLeftMessage">{{ message }}</span> + <span v-else class="gl-font-weight-bold">{{ message }}</span> + <user-avatar-list + class="gl-display-inline-block gl-vertical-align-middle gl-pt-1" + :img-size="24" + :items="approvers" + /> </template> </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/queries/approved_by.query.graphql b/app/assets/javascripts/vue_merge_request_widget/components/approvals/queries/approvals.query.graphql index c8cae6a8885..437ae578cd0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/queries/approved_by.query.graphql +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/queries/approvals.query.graphql @@ -1,3 +1,5 @@ +#import "~/graphql_shared/fragments/user.fragment.graphql" + query approvedBy($projectPath: ID!, $iid: String!) { project(fullPath: $projectPath) { id @@ -5,12 +7,12 @@ query approvedBy($projectPath: ID!, $iid: String!) { id approvedBy { nodes { - id - name - avatarUrl - webUrl + ...User } } + userPermissions { + canApprove + } } } } diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue index d6d1cae4029..306ed664326 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import { visitUrl } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue b/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue index b78293a9815..028f5370028 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue @@ -313,7 +313,7 @@ export default { :status="statusIconName" :is-loading="isLoadingSummary" :class="{ 'gl-cursor-pointer': isCollapsible }" - class="gl-p-5" + class="gl-pl-5 gl-pr-4 gl-py-4" @mousedown="onRowMouseDown" @mouseup="onRowMouseUp" > @@ -381,7 +381,7 @@ export default { v-else-if="hasFullData" :items="fullData" :min-item-size="32" - class="report-block-container gl-px-5 gl-py-0" + class="report-block-container gl-p-0" > <template #default="{ item, index, active }"> <dynamic-scroller-item :item="item" :active="active" :class="{ active }"> @@ -389,7 +389,7 @@ export default { :class="{ 'gl-border-b-solid gl-border-b-1 gl-border-gray-100': index !== fullData.length - 1, }" - class="gl-py-3 gl-pl-7" + class="gl-py-3 gl-pl-9" data-testid="extension-list-item" > <gl-intersection-observer diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue index c762922d890..b192ccfa379 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue @@ -31,7 +31,7 @@ export default { }; </script> <template> - <h4 class="js-mr-widget-author"> + <h4 class="js-mr-widget-author gl-flex-grow-1"> {{ actionText }} <mr-widget-author :author="author" /> <span class="sr-only">{{ dateReadable }} ({{ dateTitle }})</span> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue index f7d6f7b4345..3e79c49994f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue @@ -62,7 +62,7 @@ export default { <slot name="loading"> <div class="gl-display-flex"> <status-icon status="loading" /> - <div class="media-body"> + <div class="media-body gl-display-flex gl-align-items-center"> <slot></slot> </div> </div> @@ -78,7 +78,7 @@ export default { 'gl-display-flex gl-align-items-center': actions.length, 'gl-md-display-flex gl-align-items-center gl-flex-wrap gl-gap-3': !actions.length, }" - class="media-body gl-line-height-24" + class="media-body gl-line-height-normal" > <slot></slot> <div diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue index 38f7d3d2c96..bcae1a12344 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue @@ -2,7 +2,7 @@ import { GlSkeletonLoader, GlSprintf } from '@gitlab/ui'; import autoMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/auto_merge'; import autoMergeEnabledQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/auto_merge_enabled.query.graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; import { AUTO_MERGE_STRATEGIES } from '../../constants'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue index 46392565088..4e2b12799d0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective } from '@gitlab/ui'; import api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__, __ } from '~/locale'; import { OPEN_REVERT_MODAL, OPEN_CHERRY_PICK_MODAL } from '~/projects/commit/constants'; import modalEventHub from '~/projects/commit/event_hub'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index ec6c2cf34c0..fac8d37712a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -1,6 +1,7 @@ <script> -import { GlButton, GlSkeletonLoader } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { GlButton, GlLink, GlModal, GlSkeletonLoader } from '@gitlab/ui'; +import { helpPagePath } from '~/helpers/help_page_helper'; +import { createAlert } from '~/alert'; import { __, s__ } from '~/locale'; import toast from '~/vue_shared/plugins/global_toast'; import simplePoll from '~/lib/utils/simple_poll'; @@ -19,6 +20,28 @@ const i18n = { export default { name: 'MRWidgetRebase', i18n, + modal: { + id: 'rebase-security-risk-modal', + title: s__('mrWidget|Are you sure you want to rebase?'), + actionPrimary: { + text: s__('mrWidget|Rebase'), + attributes: { + variant: 'danger', + }, + }, + actionCancel: { + text: __('Cancel'), + attributes: { + variant: 'default', + }, + }, + }, + runPipelinesInTheParentProjectHelpPath: helpPagePath( + '/ci/pipelines/merge_request_pipelines.html', + { + anchor: 'run-pipelines-in-the-parent-project', + }, + ), apollo: { state: { query: rebaseQuery, @@ -30,11 +53,18 @@ export default { }, components: { BoldText, - GlSkeletonLoader, GlButton, + GlLink, + GlModal, + GlSkeletonLoader, StateContainer, }, mixins: [mergeRequestQueryVariablesMixin], + inject: { + canCreatePipelineInTargetProject: { + default: false, + }, + }, props: { mr: { type: Object, @@ -84,6 +114,21 @@ export default { (this.mr.onlyAllowMergeIfPipelineSucceeds && this.mr.allowMergeOnSkippedPipeline) ); }, + isForkMergeRequest() { + return this.mr.sourceProjectFullPath !== this.mr.targetProjectFullPath; + }, + isLatestPipelineCreatedInTargetProject() { + const latestPipeline = this.state.pipelines.nodes[0]; + + return latestPipeline?.project?.fullPath === this.mr.targetProjectFullPath; + }, + shouldShowSecurityWarning() { + return ( + this.canCreatePipelineInTargetProject && + this.isForkMergeRequest && + !this.isLatestPipelineCreatedInTargetProject + ); + }, }, methods: { rebase({ skipCi = false } = {}) { @@ -110,6 +155,13 @@ export default { rebaseWithoutCi() { return this.rebase({ skipCi: true }); }, + tryRebase() { + if (this.shouldShowSecurityWarning) { + this.$refs.modal.show(); + } else { + this.rebase(); + } + }, checkRebaseStatus(continuePolling, stopPolling) { this.service .poll() @@ -142,71 +194,103 @@ export default { }; </script> <template> - <state-container :mr="mr" :status="status" :is-loading="isLoading"> - <template #loading> - <gl-skeleton-loader :width="334" :height="30"> - <rect x="0" y="3" width="24" height="24" rx="4" /> - <rect x="32" y="5" width="302" height="20" rx="4" /> - </gl-skeleton-loader> - </template> - <template v-if="!isLoading"> - <span - v-if="rebaseInProgress || isMakingRequest" - class="gl-ml-0! gl-text-body!" - data-testid="rebase-message" - >{{ s__('mrWidget|Rebase in progress') }}</span - > - <span - v-if="!rebaseInProgress && !canPushToSourceBranch" - class="gl-text-body! gl-ml-0!" - data-testid="rebase-message" - > - <bold-text :message="$options.i18n.rebaseError" /> - </span> - <div - v-if="!rebaseInProgress && canPushToSourceBranch && !isMakingRequest" - class="accept-merge-holder clearfix js-toggle-container media gl-md-display-flex gl-flex-wrap gl-flex-grow-1" - > + <div> + <state-container :mr="mr" :status="status" :is-loading="isLoading"> + <template #loading> + <gl-skeleton-loader :width="334" :height="30"> + <rect x="0" y="3" width="24" height="24" rx="4" /> + <rect x="32" y="5" width="302" height="20" rx="4" /> + </gl-skeleton-loader> + </template> + <template v-if="!isLoading"> <span - v-if="!rebasingError" - class="gl-w-100 gl-md-w-auto gl-flex-grow-1 gl-ml-0! gl-text-body! gl-md-mr-3" + v-if="rebaseInProgress || isMakingRequest" + class="gl-ml-0! gl-text-body!" data-testid="rebase-message" - data-qa-selector="no_fast_forward_message_content" + >{{ s__('mrWidget|Rebase in progress') }}</span > - <bold-text :message="$options.i18n.rebaseError" /> - </span> <span - v-else - class="gl-font-weight-bold danger gl-w-100 gl-md-w-auto gl-flex-grow-1 gl-md-mr-3" + v-if="!rebaseInProgress && !canPushToSourceBranch" + class="gl-text-body! gl-ml-0!" data-testid="rebase-message" - >{{ rebasingError }}</span > - </div> - </template> - <template v-if="!isLoading" #actions> - <gl-button - :loading="isMakingRequest" - variant="confirm" - size="small" - data-qa-selector="mr_rebase_button" - data-testid="standard-rebase-button" - class="gl-align-self-start" - @click="rebase" - > - {{ s__('mrWidget|Rebase') }} - </gl-button> - <gl-button - v-if="showRebaseWithoutPipeline" - :loading="isMakingRequest" - variant="confirm" - size="small" - category="secondary" - data-testid="rebase-without-ci-button" - class="gl-align-self-start gl-mr-2" - @click="rebaseWithoutCi" - > - {{ s__('mrWidget|Rebase without pipeline') }} - </gl-button> - </template> - </state-container> + <bold-text :message="$options.i18n.rebaseError" /> + </span> + <div + v-if="!rebaseInProgress && canPushToSourceBranch && !isMakingRequest" + class="accept-merge-holder clearfix js-toggle-container media gl-md-display-flex gl-flex-wrap gl-flex-grow-1" + > + <span + v-if="!rebasingError" + class="gl-w-100 gl-md-w-auto gl-flex-grow-1 gl-ml-0! gl-text-body! gl-md-mr-3" + data-testid="rebase-message" + data-qa-selector="no_fast_forward_message_content" + > + <bold-text :message="$options.i18n.rebaseError" /> + </span> + <span + v-else + class="gl-font-weight-bold danger gl-w-100 gl-md-w-auto gl-flex-grow-1 gl-md-mr-3" + data-testid="rebase-message" + >{{ rebasingError }}</span + > + </div> + </template> + <template v-if="!isLoading" #actions> + <gl-button + :loading="isMakingRequest" + variant="confirm" + size="small" + data-qa-selector="mr_rebase_button" + data-testid="standard-rebase-button" + class="gl-align-self-start" + @click="tryRebase" + > + {{ s__('mrWidget|Rebase') }} + </gl-button> + <gl-button + v-if="showRebaseWithoutPipeline" + :loading="isMakingRequest" + variant="confirm" + size="small" + category="secondary" + data-testid="rebase-without-ci-button" + class="gl-align-self-start gl-mr-2" + @click="rebaseWithoutCi" + > + {{ s__('mrWidget|Rebase without pipeline') }} + </gl-button> + </template> + </state-container> + + <gl-modal + ref="modal" + :modal-id="$options.modal.id" + :title="$options.modal.title" + :action-primary="$options.modal.actionPrimary" + :action-cancel="$options.modal.actionCancel" + @primary="rebase" + > + <p> + {{ + s__( + 'Pipelines|Rebasing creates a pipeline that runs code originating from a forked project merge request. Consequently there are potential security implications, such as the exposure of CI variables.', + ) + }} + </p> + <p> + {{ + s__( + "Pipelines|You should review the code thoroughly before running this pipeline with the parent project's CI/CD resources.", + ) + }} + </p> + <p> + {{ s__('Pipelines|If you are unsure, ask a project maintainer to review it for you.') }} + </p> + <gl-link :href="$options.runPipelinesInTheParentProjectHelpPath" target="_blank"> + {{ s__('Pipelines|More Information') }} + </gl-link> + </gl-modal> + </div> </template> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue index 850a4e2fd56..e6a0b5fd8be 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue @@ -1,7 +1,6 @@ <script> import { GlButton, GlSprintf, GlLink } from '@gitlab/ui'; -import SafeHtml from '~/vue_shared/directives/safe_html'; -import emptyStateSVG from 'icons/_mr_widget_empty_state.svg'; +import EMPTY_STATE_SVG_URL from '@gitlab/svgs/dist/illustrations/merge_requests.svg?url'; import api from '~/api'; import { helpPagePath } from '~/helpers/help_page_helper'; @@ -12,25 +11,19 @@ export default { GlSprintf, GlLink, }, - directives: { - SafeHtml, - }, props: { mr: { type: Object, required: true, }, }, - data() { - return { emptyStateSVG }; - }, methods: { onClickNewFile() { api.trackRedisHllUserEvent('i_code_review_widget_nothing_merge_click_new_file'); }, }, ciHelpPage: helpPagePath('ci/quick_start/index.html'), - safeHtmlConfig: { ADD_TAGS: ['use'] }, + EMPTY_STATE_SVG_URL, }; </script> @@ -38,15 +31,18 @@ export default { <div class="mr-widget-body mr-widget-empty-state"> <div class="row"> <div - class="artwork col-md-5 order-md-last col-12 text-center d-flex justify-content-center align-items-center" + class="col-md-5 order-md-last col-12 text-center d-flex justify-content-center align-items-center svg-content svg-250 pb-0" > - <span v-safe-html:[$options.safeHtmlConfig]="emptyStateSVG"></span> + <img + :alt="s__('mrWidgetNothingToMerge|This merge request contains no changes.')" + :src="$options.EMPTY_STATE_SVG_URL" + /> </div> <div class="text col-md-7 order-md-first col-12"> <p class="highlight"> {{ s__('mrWidgetNothingToMerge|This merge request contains no changes.') }} </p> - <p> + <p data-testid="nothing-to-merge-body"> <gl-sprintf :message=" s__( diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index bb8990a48b1..9e67791afc0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -11,10 +11,10 @@ import { GlTooltipDirective, GlSkeletonLoader, } from '@gitlab/ui'; -import { isEmpty } from 'lodash'; +import { isEmpty, isNil } from 'lodash'; import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge'; import readyToMergeQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/ready_to_merge.query.graphql'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants'; import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import simplePoll from '~/lib/utils/simple_poll'; @@ -86,7 +86,7 @@ export default { this.squashCommitMessage = this.state.defaultSquashCommitMessage; } - if (this.state.mergeTrainsCount !== null && this.state.mergeTrainsCount !== undefined) { + if (!isNil(this.state.mergeTrainsCount) && !this.pollingInterval) { this.initPolling(); } }, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index 02d4f2499fe..7163e54985e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -1,7 +1,7 @@ <script> import { GlButton } from '@gitlab/ui'; import { produce } from 'immer'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __, s__ } from '~/locale'; import MergeRequest from '~/merge_request'; import BoldText from '~/vue_merge_request_widget/components/bold_text.vue'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue index 73129a86877..a754d4e80ea 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue @@ -287,7 +287,7 @@ export default { <template> <section class="media-section" data-testid="widget-extension"> - <div class="gl-p-5 gl-align-items-center gl-display-flex"> + <div class="gl-px-5 gl-py-4 gl-align-items-center gl-display-flex"> <status-icon :level="1" :name="widgetName" diff --git a/app/assets/javascripts/vue_merge_request_widget/constants.js b/app/assets/javascripts/vue_merge_request_widget/constants.js index 85ae298fcea..18503720814 100644 --- a/app/assets/javascripts/vue_merge_request_widget/constants.js +++ b/app/assets/javascripts/vue_merge_request_widget/constants.js @@ -2,6 +2,11 @@ import { s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; import { stateToComponentMap as classStateMap, stateKey } from './stores/state_maps'; +export const FOUR_MINUTES_IN_MS = 1000 * 60 * 4; + +export const STATE_QUERY_POLLING_INTERVAL_DEFAULT = 5000; +export const STATE_QUERY_POLLING_INTERVAL_BACKOFF = 2; + export const SUCCESS = 'success'; export const WARNING = 'warning'; export const INFO = 'info'; @@ -163,9 +168,6 @@ export const EXTENSION_ICON_CLASS = { severityUnknown: 'gl-text-gray-400', }; -export const EXTENSION_SUMMARY_FAILED_CLASS = 'gl-text-red-500'; -export const EXTENSION_SUMMARY_NEUTRAL_CLASS = 'gl-text-gray-700'; - export const TELEMETRY_WIDGET_VIEWED = 'WIDGET_VIEWED'; export const TELEMETRY_WIDGET_EXPANDED = 'WIDGET_EXPANDED'; export const TELEMETRY_WIDGET_FULL_REPORT_CLICKED = 'WIDGET_FULL_REPORT_CLICKED'; diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 8d596465970..183f450854a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -13,7 +13,18 @@ Vue.use(Translate); Vue.use(VueApollo); const apolloProvider = new VueApollo({ - defaultClient: createDefaultClient(), + defaultClient: createDefaultClient( + {}, + { + cacheConfig: { + typePolicies: { + MergeRequestApprovalState: { + merge: true, + }, + }, + }, + }, + ), }); export default () => { @@ -29,6 +40,9 @@ export default () => { artifactsEndpointPlaceholder: gl.mrWidgetData.artifacts_endpoint_placeholder, falsePositiveDocUrl: gl.mrWidgetData.false_positive_doc_url, canViewFalsePositive: parseBoolean(gl.mrWidgetData.can_view_false_positive), + canCreatePipelineInTargetProject: parseBoolean( + gl.mrWidgetData.can_create_pipeline_in_target_project, + ), }, ...MrWidgetOptions, apolloProvider, diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js b/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js index 7d0871f696b..ae9111b9504 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js +++ b/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js @@ -1,7 +1,34 @@ +import { createAlert } from '~/alert'; +import approvedByQuery from 'ee_else_ce/vue_merge_request_widget/components/approvals/queries/approvals.query.graphql'; +import { FETCH_ERROR } from '../components/approvals/messages'; + export default { + apollo: { + approvals: { + query: approvedByQuery, + variables() { + return { + projectPath: this.mr.targetProjectFullPath, + iid: `${this.mr.iid}`, + }; + }, + update: (data) => data.project.mergeRequest, + result({ data }) { + const { mergeRequest } = data.project; + + this.mr.setApprovals(mergeRequest); + }, + error() { + createAlert({ + message: FETCH_ERROR, + }); + }, + }, + }, data() { return { alerts: [], + approvals: {}, }; }, methods: { diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index ecbee6544ab..bbad2c13220 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -1,5 +1,5 @@ <script> -import { isEmpty } from 'lodash'; +import { isEmpty, clamp } from 'lodash'; import { registerExtension, registeredExtensions, @@ -9,8 +9,7 @@ import MrWidgetApprovals from 'ee_else_ce/vue_merge_request_widget/components/ap import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service'; import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store'; import { stateToComponentMap as classState } from 'ee_else_ce/vue_merge_request_widget/stores/state_maps'; -import { createAlert } from '~/flash'; -import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; +import { createAlert } from '~/alert'; import notify from '~/lib/utils/notify'; import { sprintf, s__, __ } from '~/locale'; import Project from '~/pages/projects/project'; @@ -44,7 +43,13 @@ import UnresolvedDiscussionsState from './components/states/unresolved_discussio import WorkInProgressState from './components/states/work_in_progress.vue'; import ExtensionsContainer from './components/extensions/container'; import WidgetContainer from './components/widget/app.vue'; -import { STATE_MACHINE, stateToComponentMap } from './constants'; +import { + STATE_MACHINE, + stateToComponentMap, + STATE_QUERY_POLLING_INTERVAL_DEFAULT, + STATE_QUERY_POLLING_INTERVAL_BACKOFF, + FOUR_MINUTES_IN_MS, +} from './constants'; import eventHub from './event_hub'; import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; import getStateQuery from './queries/get_state.query.graphql'; @@ -99,6 +104,7 @@ export default { apollo: { state: { query: getStateQuery, + notifyOnNetworkStatusChange: true, manual: true, skip() { return !this.mr; @@ -106,10 +112,19 @@ export default { variables() { return this.mergeRequestQueryVariables; }, - result({ data: { project } }) { - if (project) { - this.mr.setGraphqlData(project); - this.loading = false; + pollInterval() { + return this.pollInterval; + }, + result(response) { + if (!response.loading) { + this.pollInterval = this.apolloStateQueryPollingInterval; + + if (response.data?.project) { + this.mr.setGraphqlData(response.data.project); + this.loading = false; + } + } else { + this.checkStatus(undefined, undefined, false); } }, subscribeToMore: { @@ -158,9 +173,27 @@ export default { loading: true, recomputeComponentName: 0, issuableId: false, + startingPollInterval: STATE_QUERY_POLLING_INTERVAL_DEFAULT, + pollInterval: STATE_QUERY_POLLING_INTERVAL_DEFAULT, }; }, computed: { + apolloStateQueryMaxPollingInterval() { + return this.startingPollInterval + FOUR_MINUTES_IN_MS; + }, + apolloStateQueryPollingInterval() { + if (this.startingPollInterval < 0) { + return 0; + } + + const unboundedInterval = STATE_QUERY_POLLING_INTERVAL_BACKOFF * this.pollInterval; + + return clamp( + unboundedInterval, + this.startingPollInterval, + this.apolloStateQueryMaxPollingInterval, + ); + }, shouldRenderApprovals() { return this.mr.state !== 'nothingToMerge'; }, @@ -284,7 +317,8 @@ export default { mounted() { MRWidgetService.fetchInitialData() .then(({ data, headers }) => { - this.startingPollInterval = Number(headers['POLL-INTERVAL']); + this.startingPollInterval = + Number(headers['POLL-INTERVAL']) || STATE_QUERY_POLLING_INTERVAL_DEFAULT; this.initWidget(data); }) .catch(() => @@ -295,9 +329,6 @@ export default { }, beforeDestroy() { eventHub.$off('mr.discussion.updated', this.checkStatus); - if (this.pollingInterval) { - this.pollingInterval.destroy(); - } if (this.deploymentsInterval) { this.deploymentsInterval.destroy(); @@ -332,7 +363,6 @@ export default { this.initPostMergeDeploymentsPolling(); } - this.initPolling(); this.bindEventHubListeners(); eventHub.$on('mr.discussion.updated', this.checkStatus); @@ -363,8 +393,10 @@ export default { createService(store) { return new MRWidgetService(this.getServiceEndpoints(store)); }, - checkStatus(cb, isRebased) { - this.$apollo.queries.state.refetch(); + checkStatus(cb, isRebased, refetch = true) { + if (refetch) { + this.$apollo.queries.state.refetch(); + } return this.service .checkStatus() @@ -389,17 +421,6 @@ export default { } return Promise.resolve(); }, - initPolling() { - if (this.startingPollInterval <= 0) return; - - this.pollingInterval = new SmartInterval({ - callback: this.checkStatus, - startingInterval: this.startingPollInterval, - maxInterval: this.startingPollInterval + secondsToMilliseconds(4 * 60), - hiddenInterval: secondsToMilliseconds(6 * 60), - incrementByFactorOf: 2, - }); - }, initDeploymentsPolling() { this.deploymentsInterval = this.deploymentsPoll(this.fetchPreMergeDeployments); }, @@ -476,10 +497,10 @@ export default { notify.notifyMe(title, message, this.mr.gitlabLogo); }, resumePolling() { - this.pollingInterval?.resume(); + this.$apollo.queries.state.startPolling(this.pollInterval); }, stopPolling() { - this.pollingInterval?.stopTimer(); + this.$apollo.queries.state.stopPolling(); }, bindEventHubListeners() { eventHub.$on('MRWidgetUpdateRequested', (cb) => { diff --git a/app/assets/javascripts/vue_merge_request_widget/queries/get_state.subscription.graphql b/app/assets/javascripts/vue_merge_request_widget/queries/get_state.subscription.graphql index c7b53db1221..a6b35f20776 100644 --- a/app/assets/javascripts/vue_merge_request_widget/queries/get_state.subscription.graphql +++ b/app/assets/javascripts/vue_merge_request_widget/queries/get_state.subscription.graphql @@ -1,6 +1,7 @@ subscription getStateSubscription($issuableId: IssuableID!) { mergeRequestMergeStatusUpdated(issuableId: $issuableId) { ... on MergeRequest { + id detailedMergeStatus } } diff --git a/app/assets/javascripts/vue_merge_request_widget/queries/states/rebase.query.graphql b/app/assets/javascripts/vue_merge_request_widget/queries/states/rebase.query.graphql index 283177267d4..79ac87b7c37 100644 --- a/app/assets/javascripts/vue_merge_request_widget/queries/states/rebase.query.graphql +++ b/app/assets/javascripts/vue_merge_request_widget/queries/states/rebase.query.graphql @@ -8,6 +8,15 @@ query rebaseQuery($projectPath: ID!, $iid: String!) { userPermissions { pushToSourceBranch } + pipelines { + nodes { + id + project { + id + fullPath + } + } + } } } } diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js index 81cb20475cc..cead42b12ae 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js @@ -32,5 +32,5 @@ export default function deviseState() { ) { return stateKey.readyToMerge; } - return null; + return stateKey.checking; } diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index f6a7ef58c10..13009651550 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -294,6 +294,9 @@ export default class MergeRequestStore { // Security reports this.sastComparisonPath = data.sast_comparison_path; this.secretDetectionComparisonPath = data.secret_detection_comparison_path; + + this.sastComparisonPathV2 = data.new_sast_comparison_path; + this.secretDetectionComparisonPathV2 = data.new_secret_detection_comparison_path; } get isNothingToMergeState() { @@ -356,12 +359,11 @@ export default class MergeRequestStore { initApprovals() { this.isApproved = this.isApproved || false; - this.approvals = this.approvals || null; } setApprovals(data) { - this.approvals = data; this.isApproved = data.approved || false; + this.approvals = true; this.setState(); } diff --git a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue index 634b7da3def..93581dbbd40 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue @@ -33,7 +33,11 @@ export default { </script> <template> - <li :id="noteAnchorId" class="timeline-entry note system-note note-wrapper gl-p-0!"> + <li + :id="noteAnchorId" + class="timeline-entry note system-note note-wrapper gl-p-0!" + data-qa-selector="alert_system_note_container" + > <div class="gl-display-inline-flex gl-align-items-center gl-relative"> <div class="gl-display-inline gl-bg-white gl-text-gray-200 gl-border-gray-100 gl-border-1 gl-border-solid gl-rounded-full gl-box-sizing-content-box gl-p-3 gl-mt-n2 gl-mr-6" diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue index 52a5d6e1b86..7b5ded9348f 100644 --- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue +++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue @@ -71,7 +71,7 @@ export default { <ci-icon :status="status" /> <template v-if="showText"> - <span class="gl-ml-2">{{ status.text }}</span> + <span class="gl-ml-2 gl-white-space-nowrap">{{ status.text }}</span> </template> </gl-link> </template> diff --git a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue b/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue index fb7105bd416..c89e843b660 100644 --- a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue +++ b/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue @@ -1,13 +1,11 @@ <script> import { GlAreaChart } from '@gitlab/ui/dist/charts'; -import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; import { CHART_CONTAINER_HEIGHT } from './constants'; export default { name: 'CiCdAnalyticsAreaChart', components: { GlAreaChart, - ResizableChartContainer, }, props: { chartData: { @@ -27,24 +25,21 @@ export default { <p> <slot></slot> </p> - <resizable-chart-container> - <template #default="{ width }"> - <gl-area-chart - v-bind="$attrs" - :width="width" - :height="$options.chartContainerHeight" - :data="chartData" - :include-legend-avg-max="false" - :option="areaChartOptions" - > - <template #tooltip-title> - <slot name="tooltip-title"></slot> - </template> - <template #tooltip-content> - <slot name="tooltip-content"></slot> - </template> - </gl-area-chart> + <gl-area-chart + v-bind="$attrs" + responsive + width="auto" + :height="$options.chartContainerHeight" + :data="chartData" + :include-legend-avg-max="false" + :option="areaChartOptions" + > + <template #tooltip-title> + <slot name="tooltip-title"></slot> </template> - </resizable-chart-container> + <template #tooltip-content> + <slot name="tooltip-content"></slot> + </template> + </gl-area-chart> </div> </template> diff --git a/app/assets/javascripts/vue_shared/components/color_select_dropdown/color_select_root.vue b/app/assets/javascripts/vue_shared/components/color_select_dropdown/color_select_root.vue index 75386a3cd01..2f28ae5e0e2 100644 --- a/app/assets/javascripts/vue_shared/components/color_select_dropdown/color_select_root.vue +++ b/app/assets/javascripts/vue_shared/components/color_select_dropdown/color_select_root.vue @@ -1,6 +1,6 @@ <script> import { isString } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue'; import { DEFAULT_COLOR, COLOR_WIDGET_COLOR, DROPDOWN_VARIANT, ISSUABLE_COLORS } from './constants'; diff --git a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue index d0a634d8e54..65a601ed927 100644 --- a/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue +++ b/app/assets/javascripts/vue_shared/components/confirm_danger/confirm_danger_modal.vue @@ -60,13 +60,11 @@ export default { actionPrimary() { return { text: this.confirmButtonText, - attributes: [ - { - variant: 'danger', - disabled: !this.isValid, - 'data-qa-selector': 'confirm_danger_modal_button', - }, - ], + attributes: { + variant: 'danger', + disabled: !this.isValid, + 'data-qa-selector': 'confirm_danger_modal_button', + }, }; }, actionCancel() { diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue index dfeb12d5cf5..721f87ff4d6 100644 --- a/app/assets/javascripts/vue_shared/components/file_row.vue +++ b/app/assets/javascripts/vue_shared/components/file_row.vue @@ -168,7 +168,7 @@ export default { .file-row { display: flex; align-items: center; - height: 32px; + height: var(--file-row-height, 32px); padding: 4px 8px; margin-left: -8px; margin-right: -8px; diff --git a/app/assets/javascripts/vue_shared/components/file_row_header.vue b/app/assets/javascripts/vue_shared/components/file_row_header.vue index 5afb2408c7e..b436872e463 100644 --- a/app/assets/javascripts/vue_shared/components/file_row_header.vue +++ b/app/assets/javascripts/vue_shared/components/file_row_header.vue @@ -15,7 +15,7 @@ export default { </script> <template> - <div class="file-row-header bg-white sticky-top p-2 js-file-row-header" :title="path"> + <div class="file-row-header bg-white sticky-top gl-px-2 js-file-row-header" :title="path"> <gl-truncate :text="path" position="middle" class="bold" /> </div> </template> diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue index 34f64dddc41..fe4f2d407f7 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue @@ -12,7 +12,7 @@ import { import RecentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys'; import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { SORT_DIRECTION } from './constants'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js index 8a6053b7001..f3d46de3437 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js @@ -1,5 +1,5 @@ import Api from '~/api'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue index 741395b3193..fff8a95c193 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/branch_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue index c8aeac75645..63ffded9e8e 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue @@ -1,10 +1,10 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { ITEM_TYPE } from '~/groups/constants'; import { TYPENAME_CRM_CONTACT } from '~/graphql_shared/constants'; import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { isPositiveInteger } from '~/lib/utils/number_utils'; import { __ } from '~/locale'; import searchCrmContactsQuery from '../queries/search_crm_contacts.query.graphql'; @@ -43,7 +43,7 @@ export default { return this.config.defaultContacts || OPTIONS_NONE_ANY; }, namespace() { - return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP; + return this.config.isProject ? WORKSPACE_PROJECT : WORKSPACE_GROUP; }, }, methods: { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue index ff0571031b5..126066fbbbe 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue @@ -1,10 +1,10 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { ITEM_TYPE } from '~/groups/constants'; import { TYPENAME_CRM_ORGANIZATION } from '~/graphql_shared/constants'; import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { isPositiveInteger } from '~/lib/utils/number_utils'; import { __ } from '~/locale'; import searchCrmOrganizationsQuery from '../queries/search_crm_organizations.query.graphql'; @@ -43,7 +43,7 @@ export default { return this.config.defaultOrganizations || OPTIONS_NONE_ANY; }, namespace() { - return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP; + return this.config.isProject ? WORKSPACE_PROJECT : WORKSPACE_GROUP; }, }, methods: { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue index 9c30ec67d5a..c69a2927ec9 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue'; import { OPTIONS_NONE_ANY } from '../constants'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue index 9449e071a0d..6a7dd6131e2 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue @@ -1,7 +1,7 @@ <script> import { GlToken, GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue index b9ee4d51db1..81b8a6c78fc 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { sortMilestonesByDueDate } from '~/milestones/utils'; import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue index 6d681aab3ca..a251035b683 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue'; import { OPTIONS_NONE_ANY } from '../constants'; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue index 28e65c1185f..c294c23abfc 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue @@ -1,7 +1,7 @@ <script> import { GlAvatar, GlFilteredSearchSuggestion } from '@gitlab/ui'; import { compact } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { OPTIONS_NONE_ANY } from '../constants'; diff --git a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue index 26c50345c19..fe221d2fefa 100644 --- a/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue +++ b/app/assets/javascripts/vue_shared/components/form/form_footer_actions.vue @@ -1,5 +1,4 @@ -<!-- eslint-disable-next-line vue/no-deprecated-functional-template --> -<template functional> +<template> <footer class="form-actions d-flex justify-content-between"> <div><slot name="prepend"></slot></div> <div><slot></slot></div> diff --git a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/constants.js b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/constants.js index 9a88ab44f3d..e3eacf4495d 100644 --- a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/constants.js +++ b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/constants.js @@ -1,5 +1,4 @@ -import { issuableTypes } from '~/boards/constants'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants'; import blockingIssuesQuery from './graphql/blocking_issues.query.graphql'; import blockingEpicsQuery from './graphql/blocking_epics.query.graphql'; @@ -7,7 +6,7 @@ export const blockingIssuablesQueries = { [TYPE_ISSUE]: { query: blockingIssuesQuery, }, - [issuableTypes.epic]: { + [TYPE_EPIC]: { query: blockingEpicsQuery, }, }; diff --git a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue index f5b4870d59f..7bea4409c03 100644 --- a/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue +++ b/app/assets/javascripts/vue_shared/components/issuable_blocked_icon/issuable_blocked_icon.vue @@ -1,9 +1,8 @@ <script> import { GlIcon, GlLink, GlPopover, GlLoadingIcon } from '@gitlab/ui'; -import { issuableTypes } from '~/boards/constants'; import { TYPENAME_ISSUE, TYPENAME_EPIC } from '~/graphql_shared/constants'; import { convertToGraphQLId } from '~/graphql_shared/utils'; -import { TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants'; import { truncate } from '~/lib/utils/text_utility'; import { __, n__, s__, sprintf } from '~/locale'; import { blockingIssuablesQueries } from './constants'; @@ -12,12 +11,12 @@ export default { i18n: { issuableType: { [TYPE_ISSUE]: __('issue'), - [issuableTypes.epic]: __('epic'), + [TYPE_EPIC]: __('epic'), }, }, graphQLIdType: { [TYPE_ISSUE]: TYPENAME_ISSUE, - [issuableTypes.epic]: TYPENAME_EPIC, + [TYPE_EPIC]: TYPENAME_EPIC, }, referenceFormatter: { [TYPE_ISSUE]: (r) => r.split('/')[1], @@ -43,7 +42,7 @@ export default { type: String, required: true, validator(value) { - return [TYPE_ISSUE, issuableTypes.epic].includes(value); + return [TYPE_ISSUE, TYPE_EPIC].includes(value); }, }, }, @@ -88,7 +87,7 @@ export default { }, computed: { isEpic() { - return this.issuableType === issuableTypes.epic; + return this.issuableType === TYPE_EPIC; }, displayedIssuables() { const { defaultDisplayLimit, referenceFormatter } = this.$options; diff --git a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue index bc6b5d3176f..0f8ff5291a4 100644 --- a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue +++ b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue @@ -1,5 +1,5 @@ <script> -import { GlFormGroup, GlListbox } from '@gitlab/ui'; +import { GlFormGroup, GlCollapsibleListbox } from '@gitlab/ui'; import { __ } from '~/locale'; const MIN_ITEMS_COUNT_FOR_SEARCHING = 10; @@ -10,9 +10,9 @@ export default { }, components: { GlFormGroup, - GlListbox, + GlCollapsibleListbox, }, - model: GlListbox.model, + model: GlCollapsibleListbox.model, props: { label: { type: String, @@ -39,7 +39,7 @@ export default { default: null, }, items: { - type: GlListbox.props.items.type, + type: GlCollapsibleListbox.props.items.type, required: true, }, disabled: { @@ -116,7 +116,7 @@ export default { <template> <component :is="wrapperComponent" :label="label" :description="description" v-bind="$attrs"> - <gl-listbox + <gl-collapsible-listbox :selected="selected" :toggle-text="toggleText" :items="filteredItems" diff --git a/app/assets/javascripts/vue_shared/components/markdown/drawio_toolbar_button.vue b/app/assets/javascripts/vue_shared/components/markdown/drawio_toolbar_button.vue new file mode 100644 index 00000000000..a66becb5c92 --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/markdown/drawio_toolbar_button.vue @@ -0,0 +1,48 @@ +<script> +import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { launchDrawioEditor } from '~/drawio/drawio_editor'; +import { create } from '~/drawio/markdown_field_editor_facade'; + +export default { + components: { + GlButton, + }, + directives: { + GlTooltip: GlTooltipDirective, + }, + props: { + uploadsPath: { + type: String, + required: true, + }, + markdownPreviewPath: { + type: String, + required: true, + }, + }, + methods: { + getTextArea() { + return document.querySelector('.js-gfm-input'); + }, + launchDrawioEditor() { + launchDrawioEditor({ + editorFacade: create({ + uploadsPath: this.uploadsPath, + textArea: this.getTextArea(), + markdownPreviewPath: this.markdownPreviewPath, + }), + }); + }, + }, +}; +</script> +<template> + <gl-button + v-gl-tooltip + :title="__('Insert or edit diagram')" + :aria-label="__('Insert or edit diagram')" + category="tertiary" + icon="diagram" + @click="launchDrawioEditor" + /> +</template> diff --git a/app/assets/javascripts/vue_shared/components/markdown/editor_mode_dropdown.vue b/app/assets/javascripts/vue_shared/components/markdown/editor_mode_dropdown.vue index 6702a81e747..9ebf782a1d9 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/editor_mode_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/editor_mode_dropdown.vue @@ -23,7 +23,7 @@ export default { return this.value === 'markdown'; }, text() { - return this.markdownEditorSelected ? __('View rich text') : __('View markdown'); + return this.markdownEditorSelected ? __('Viewing markdown') : __('Viewing rich text'); }, }, }; diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index 6f4cddbdfa2..9623c51d51c 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -2,7 +2,7 @@ import { GlIcon } from '@gitlab/ui'; import $ from 'jquery'; import { debounce, unescape } from 'lodash'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import GLForm from '~/gl_form'; import SafeHtml from '~/vue_shared/directives/safe_html'; import axios from '~/lib/utils/axios_utils'; @@ -132,6 +132,11 @@ export default { required: false, default: false, }, + drawioEnabled: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -355,6 +360,10 @@ export default { :enable-preview="enablePreview" :show-suggest-popover="showSuggestPopover" :suggestion-start-index="suggestionsStartIndex" + :uploads-path="uploadsPath" + :markdown-preview-path="markdownPreviewPath" + :drawio-enabled="drawioEnabled" + data-testid="markdownHeader" :restricted-tool-bar-items="restrictedToolBarItems" @preview-markdown="showPreviewTab" @write-markdown="showWriteTab" diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index e83441e59a2..eeeb0fce55d 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -10,11 +10,14 @@ import { INDENT_LINE, OUTDENT_LINE, } from '~/behaviors/shortcuts/keybindings'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { getModifierKey } from '~/constants'; import { getSelectedFragment } from '~/lib/utils/common_utils'; import { s__, __ } from '~/locale'; import { CopyAsGFM } from '~/behaviors/markdown/copy_as_gfm'; import ToolbarButton from './toolbar_button.vue'; +import DrawioToolbarButton from './drawio_toolbar_button.vue'; +import SavedRepliesDropdown from './saved_replies_dropdown.vue'; export default { components: { @@ -23,10 +26,18 @@ export default { GlButton, GlTabs, GlTab, + DrawioToolbarButton, + SavedRepliesDropdown, }, directives: { GlTooltip: GlTooltipDirective, }, + mixins: [glFeatureFlagsMixin()], + inject: { + newSavedRepliesPath: { + default: null, + }, + }, props: { previewMarkdown: { type: Boolean, @@ -62,6 +73,21 @@ export default { required: false, default: () => [], }, + uploadsPath: { + type: String, + required: false, + default: '', + }, + markdownPreviewPath: { + type: String, + required: false, + default: '', + }, + drawioEnabled: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -369,6 +395,15 @@ export default { icon="paperclip" @click="handleAttachFile" /> + <drawio-toolbar-button + v-if="drawioEnabled" + :uploads-path="uploadsPath" + :markdown-preview-path="markdownPreviewPath" + /> + <saved-replies-dropdown + v-if="newSavedRepliesPath && glFeatures.savedReplies" + :new-saved-replies-path="newSavedRepliesPath" + /> <toolbar-button v-if="!restrictedToolBarItems.includes('full-screen')" class="js-zen-enter" diff --git a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue index 7e6b0e4a63b..93583907a11 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue @@ -1,6 +1,8 @@ <script> +import Autosize from 'autosize'; import axios from '~/lib/utils/axios_utils'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; +import { updateDraft, clearDraft, getDraft } from '~/lib/utils/autosave'; import { EDITING_MODE_MARKDOWN_FIELD, EDITING_MODE_CONTENT_EDITOR } from '../../constants'; import MarkdownField from './field.vue'; @@ -22,15 +24,6 @@ export default { type: String, required: true, }, - markdownDocsPath: { - type: String, - required: true, - }, - quickActionsDocsPath: { - type: String, - required: false, - default: '', - }, uploadsPath: { type: String, required: false, @@ -41,21 +34,6 @@ export default { required: false, default: true, }, - enablePreview: { - type: Boolean, - required: false, - default: true, - }, - autocompleteDataSources: { - type: Object, - required: false, - default: () => ({}), - }, - enableAutocomplete: { - type: Boolean, - required: false, - default: true, - }, formFieldProps: { type: Object, required: true, @@ -71,7 +49,22 @@ export default { required: false, default: false, }, - useBottomToolbar: { + autosaveKey: { + type: String, + required: false, + default: null, + }, + quickActionsDocsPath: { + type: String, + required: false, + default: '', + }, + drawioEnabled: { + type: Boolean, + required: false, + default: false, + }, + disabled: { type: Boolean, required: false, default: false, @@ -79,6 +72,7 @@ export default { }, data() { return { + markdown: this.value || (this.autosaveKey ? getDraft(this.autosaveKey) : '') || '', editingMode: EDITING_MODE_MARKDOWN_FIELD, autofocused: false, }; @@ -92,15 +86,32 @@ export default { return this.autofocus && !this.autofocused ? 'end' : false; }, }, + watch: { + value(val) { + this.markdown = val; + + this.saveDraft(); + this.autosizeTextarea(); + }, + }, mounted() { this.autofocusTextarea(); + + this.saveDraft(); }, methods: { updateMarkdownFromContentEditor({ markdown }) { + this.markdown = markdown; this.$emit('input', markdown); + + this.saveDraft(); }, updateMarkdownFromMarkdownField({ target }) { + this.markdown = target.value; this.$emit('input', target.value); + + this.saveDraft(); + this.autosizeTextarea(); }, renderMarkdown(markdown) { return axios.post(this.renderMarkdownPath, { text: markdown }).then(({ data }) => data.body); @@ -126,6 +137,23 @@ export default { setEditorAsAutofocused() { this.autofocused = true; }, + saveDraft() { + if (!this.autosaveKey) return; + if (this.markdown) updateDraft(this.autosaveKey, this.markdown); + else clearDraft(this.autosaveKey); + }, + togglePreview(value) { + if (this.editingMode === EDITING_MODE_MARKDOWN_FIELD) { + this.$refs.markdownField.previewMarkdown = value; + } + }, + autosizeTextarea() { + if (this.editingMode === EDITING_MODE_MARKDOWN_FIELD) { + this.$nextTick(() => { + Autosize.update(this.$refs.textarea); + }); + } + }, }, }; </script> @@ -138,16 +166,16 @@ export default { /> <markdown-field v-if="!isContentEditorActive" + ref="markdownField" + v-bind="$attrs" + data-testid="markdown-field" :markdown-preview-path="renderMarkdownPath" can-attach-file - :enable-autocomplete="enableAutocomplete" - :textarea-value="value" - :markdown-docs-path="markdownDocsPath" - :quick-actions-docs-path="quickActionsDocsPath" - :autocomplete-data-sources="autocompleteDataSources" + :textarea-value="markdown" :uploads-path="uploadsPath" - :enable-preview="enablePreview" - show-content-editor-switcher + :quick-actions-docs-path="quickActionsDocsPath" + :show-content-editor-switcher="enableContentEditor" + :drawio-enabled="drawioEnabled" class="bordered-box" @enableContentEditor="onEditingModeChange('contentEditor')" > @@ -155,11 +183,12 @@ export default { <textarea v-bind="formFieldProps" ref="textarea" - :value="value" - class="note-textarea js-gfm-input js-autosize markdown-area" + :value="markdown" + class="note-textarea js-gfm-input markdown-area" dir="auto" :data-supports-quick-actions="supportsQuickActions" - data-qa-selector="markdown_editor_form_field" + :data-qa-selector="formFieldProps['data-qa-selector'] || 'markdown_editor_form_field'" + :disabled="disabled" @input="updateMarkdownFromMarkdownField" @keydown="$emit('keydown', $event)" > @@ -168,11 +197,15 @@ export default { </markdown-field> <div v-else> <content-editor + ref="contentEditor" :render-markdown="renderMarkdown" :uploads-path="uploadsPath" - :markdown="value" + :markdown="markdown" + :quick-actions-docs-path="quickActionsDocsPath" :autofocus="contentEditorAutofocused" - :use-bottom-toolbar="useBottomToolbar" + :placeholder="formFieldProps.placeholder" + :drawio-enabled="drawioEnabled" + :editable="!disabled" @initialized="setEditorAsAutofocused" @change="updateMarkdownFromContentEditor" @keydown="$emit('keydown', $event)" @@ -180,7 +213,7 @@ export default { /> <input v-bind="formFieldProps" - :value="value" + :value="markdown" data-qa-selector="markdown_editor_form_field" type="hidden" /> diff --git a/app/assets/javascripts/vue_shared/components/markdown/saved_replies.query.graphql b/app/assets/javascripts/vue_shared/components/markdown/saved_replies.query.graphql new file mode 100644 index 00000000000..9b9d4c89254 --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/markdown/saved_replies.query.graphql @@ -0,0 +1,12 @@ +query getSavedReplies { + currentUser { + id + savedReplies { + nodes { + id + name + content + } + } + } +} diff --git a/app/assets/javascripts/vue_shared/components/markdown/saved_replies_dropdown.vue b/app/assets/javascripts/vue_shared/components/markdown/saved_replies_dropdown.vue new file mode 100644 index 00000000000..989b14f8711 --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/markdown/saved_replies_dropdown.vue @@ -0,0 +1,120 @@ +<script> +import { GlCollapsibleListbox, GlIcon, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import fuzzaldrinPlus from 'fuzzaldrin-plus'; +import savedRepliesQuery from './saved_replies.query.graphql'; + +export default { + apollo: { + savedReplies: { + query: savedRepliesQuery, + update: (r) => r.currentUser?.savedReplies?.nodes, + skip() { + return !this.shouldFetchSavedReplies; + }, + }, + }, + components: { + GlCollapsibleListbox, + GlIcon, + GlButton, + }, + directives: { + GlTooltip: GlTooltipDirective, + }, + props: { + newSavedRepliesPath: { + type: String, + required: true, + }, + }, + data() { + return { + shouldFetchSavedReplies: false, + savedReplies: [], + savedRepliesSearch: '', + loadingSavedReplies: false, + }; + }, + computed: { + filteredSavedReplies() { + const savedReplies = this.savedRepliesSearch + ? fuzzaldrinPlus.filter(this.savedReplies, this.savedRepliesSearch, { key: ['name'] }) + : this.savedReplies; + + return savedReplies.map((r) => ({ value: r.id, text: r.name, content: r.content })); + }, + }, + methods: { + fetchSavedReplies() { + this.shouldFetchSavedReplies = true; + }, + setSavedRepliesSearch(search) { + this.savedRepliesSearch = search; + }, + }, +}; +</script> + +<template> + <gl-collapsible-listbox + :header-text="__('Insert saved reply')" + :items="filteredSavedReplies" + placement="right" + searchable + class="saved-replies-dropdown" + :searching="$apollo.queries.savedReplies.loading" + @shown="fetchSavedReplies" + @search="setSavedRepliesSearch" + > + <template #toggle> + <gl-button + v-gl-tooltip + :title="__('Insert saved reply')" + :aria-label="__('Insert saved reply')" + category="tertiary" + class="gl-px-3!" + data-testid="saved-replies-dropdown-toggle" + > + <gl-icon name="symlink" class="gl-mr-0!" /> + <gl-icon name="chevron-down" /> + </gl-button> + </template> + <template #list-item="{ item }"> + <div + class="gl-display-flex js-saved-reply-content" + :data-md-tag="item.content" + data-md-cursor-offset="0" + data-md-prepend="true" + data-testid="saved-reply-dropdown-item" + > + <div class="gl-text-truncate"> + <strong>{{ item.text }}</strong + ><span class="gl-ml-2">{{ item.content }}</span> + </div> + </div> + </template> + <template #footer> + <div + class="gl-border-t-solid gl-border-t-1 gl-border-t-gray-100 gl-display-flex gl-justify-content-center gl-p-3" + > + <gl-button + :href="newSavedRepliesPath" + category="tertiary" + block + class="gl-justify-content-start! gl-mt-0! gl-mb-0! gl-px-3!" + >{{ __('Add a new saved reply') }}</gl-button + > + </div> + </template> + </gl-collapsible-listbox> +</template> + +<style> +.saved-replies-dropdown .gl-new-dropdown-panel { + width: 350px; +} + +.saved-replies-dropdown .gl-new-dropdown-item-check-icon { + display: none; +} +</style> diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index c307601e670..49eb11f8081 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -1,7 +1,7 @@ <script> import Vue from 'vue'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { __ } from '~/locale'; import SuggestionDiff from './suggestion_diff.vue'; diff --git a/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js b/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js index 1c4e8d332a9..6f91463365b 100644 --- a/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js +++ b/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js @@ -1,4 +1,4 @@ -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue b/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue index b079181bd10..e09a6e2e811 100644 --- a/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue @@ -6,7 +6,7 @@ import { GlLoadingIcon, GlSearchBoxByType, } from '@gitlab/ui'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { DASH_SCOPE, joinPaths } from '~/lib/utils/url_utility'; import { __, sprintf } from '~/locale'; import { DEBOUNCE_DELAY } from '~/vue_shared/components/filtered_search_bar/constants'; diff --git a/app/assets/javascripts/vue_shared/components/pagination/constants.js b/app/assets/javascripts/vue_shared/components/pagination/constants.js index 748ad178c70..f8a6d37dea1 100644 --- a/app/assets/javascripts/vue_shared/components/pagination/constants.js +++ b/app/assets/javascripts/vue_shared/components/pagination/constants.js @@ -1,8 +1,5 @@ import { s__ } from '~/locale'; -export const PAGINATION_UI_BUTTON_LIMIT = 4; -export const UI_LIMIT = 6; -export const SPREAD = '...'; export const PREV = s__('Pagination|Prev'); export const NEXT = s__('Pagination|Next'); export const FIRST = s__('Pagination|« First'); diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue index 16bc8070dc1..bdc8ffee90a 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue @@ -52,7 +52,7 @@ export default { <div class="gl-display-flex gl-align-items-center gl-flex-wrap project-namespace-name-container" > - <gl-icon v-if="selected" class="js-selected-icon" name="mobile-issue-close" /> + <gl-icon v-if="selected" data-testid="selected-icon" name="mobile-issue-close" /> <project-avatar :project-id="project.id" :project-avatar-url="projectAvatarUrl" @@ -61,16 +61,18 @@ export default { /> <div v-if="truncatedNamespace" + data-testid="project-namespace" :title="projectNameWithNamespace" - class="text-secondary text-truncate js-project-namespace" + class="text-secondary text-truncate" > {{ truncatedNamespace }} <span v-if="truncatedNamespace" class="text-secondary">/ </span> </div> <div v-safe-html="highlightedProjectName" + data-testid="project-name" :title="project.name" - class="js-project-name text-truncate" + class="text-truncate" ></div> </div> </gl-button> diff --git a/app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue b/app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue deleted file mode 100644 index 02cb7785ef4..00000000000 --- a/app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue +++ /dev/null @@ -1,40 +0,0 @@ -<script> -import $ from 'jquery'; -import { debounceByAnimationFrame } from '~/lib/utils/common_utils'; - -export default { - data() { - return { - width: 0, - height: 0, - }; - }, - beforeDestroy() { - this.contentResizeHandler.off('content.resize', this.debouncedResize); - window.removeEventListener('resize', this.debouncedResize); - }, - created() { - this.debouncedResize = debounceByAnimationFrame(this.onResize); - - // Handle when we explicictly trigger a custom resize event - this.contentResizeHandler = $(document).on('content.resize', this.debouncedResize); - - // Handle window resize - window.addEventListener('resize', this.debouncedResize); - }, - methods: { - onResize() { - // Slot dimensions - const { clientWidth, clientHeight } = this.$refs.chartWrapper; - this.width = clientWidth; - this.height = clientHeight; - }, - }, -}; -</script> - -<template> - <div ref="chartWrapper"> - <slot :width="width" :height="height"> </slot> - </div> -</template> diff --git a/app/assets/javascripts/vue_shared/components/source_editor.vue b/app/assets/javascripts/vue_shared/components/source_editor.vue index 1925c5d4064..7b7d3d48d9e 100644 --- a/app/assets/javascripts/vue_shared/components/source_editor.vue +++ b/app/assets/javascripts/vue_shared/components/source_editor.vue @@ -2,6 +2,7 @@ import { debounce, isEmpty } from 'lodash'; import { CONTENT_UPDATE_DEBOUNCE, EDITOR_READY_EVENT } from '~/editor/constants'; import Editor from '~/editor/source_editor'; +import { markRaw } from '~/lib/utils/vue3compat/mark_raw'; function initSourceEditor({ el, ...args }) { const editor = new Editor({ @@ -10,10 +11,12 @@ function initSourceEditor({ el, ...args }) { }, }); - return editor.createInstance({ - el, - ...args, - }); + return markRaw( + editor.createInstance({ + el, + ...args, + }), + ); } export default { diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/constants.js b/app/assets/javascripts/vue_shared/components/source_viewer/constants.js index 15335ea6edc..514b626ed95 100644 --- a/app/assets/javascripts/vue_shared/components/source_viewer/constants.js +++ b/app/assets/javascripts/vue_shared/components/source_viewer/constants.js @@ -141,8 +141,6 @@ export const BIDI_CHARS_CLASS_LIST = 'unicode-bidi has-tooltip'; export const BIDI_CHAR_TOOLTIP = 'Potentially unwanted character detected: Unicode BiDi Control'; -export const HLJS_ON_AFTER_HIGHLIGHT = 'after:highlight'; - // We fallback to highlighting these languages with Rouge, see the following issue for more detail: // https://gitlab.com/gitlab-org/gitlab/-/issues/384375#note_1212752013 export const LEGACY_FALLBACKS = ['python']; diff --git a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue index 09414e679bb..bda88a48e48 100644 --- a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue +++ b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue @@ -21,6 +21,11 @@ export default { required: false, default: 'top', }, + boundary: { + type: String, + required: false, + default: '', + }, truncateTarget: { type: [String, Function], required: false, @@ -44,6 +49,8 @@ export default { title: this.title, placement: this.placement, disabled: this.tooltipDisabled, + // Only set the tooltip boundary if it's truthy + ...(this.boundary && { boundary: this.boundary }), }; }, }, diff --git a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue index a001b6bdf24..23fbf211d54 100644 --- a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue +++ b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue @@ -149,7 +149,7 @@ export default { > <slot> <button - class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-4 gl-mb-0" + class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-px-5 gl-py-4 gl-mb-0" type="button" @click="openFileUpload" > diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue index 1a81da3eb0d..ab308d11a79 100644 --- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue +++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue @@ -105,7 +105,7 @@ export default { v-gl-tooltip :title="tooltipText" :tooltip-placement="tooltipPlacement" - class="gl-ml-3" + class="gl-ml-1" data-testid="user-avatar-link-username" > {{ username }} diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index d06bc7b8f98..dd9d2ce66cd 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -10,7 +10,7 @@ import { } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { glEmojiTag } from '~/emoji'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { followUser, unfollowUser } from '~/rest_api'; import { isUserBusy } from '~/set_status_modal/utils'; import Tracking from '~/tracking'; diff --git a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue index edcfabe7da3..abd3575d020 100644 --- a/app/assets/javascripts/vue_shared/components/user_select/user_select.vue +++ b/app/assets/javascripts/vue_shared/components/user_select/user_select.vue @@ -11,7 +11,7 @@ import { } from '@gitlab/ui'; import { __ } from '~/locale'; import SidebarParticipant from '~/sidebar/components/assignees/sidebar_participant.vue'; -import { IssuableType, TYPE_ISSUE } from '~/issues/constants'; +import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants'; import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; import { participantsQueries, userSearchQueries } from '~/sidebar/constants'; import { TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants'; @@ -149,7 +149,7 @@ export default { }, computed: { isMergeRequest() { - return this.issuableType === IssuableType.MergeRequest; + return this.issuableType === TYPE_MERGE_REQUEST; }, searchUsersVariables() { const variables = { diff --git a/app/assets/javascripts/vue_shared/constants.js b/app/assets/javascripts/vue_shared/constants.js index fd151751372..29a31503840 100644 --- a/app/assets/javascripts/vue_shared/constants.js +++ b/app/assets/javascripts/vue_shared/constants.js @@ -1,5 +1,5 @@ import { __, n__, sprintf } from '~/locale'; -import { TYPE_ISSUE, WorkspaceType } from '~/issues/constants'; +import { TYPE_ISSUE, WORKSPACE_PROJECT } from '~/issues/constants'; const INTERVALS = { minute: 'minute', @@ -75,8 +75,6 @@ export const timeRanges = [ /* eslint-enable @gitlab/require-i18n-strings */ export const defaultTimeRange = timeRanges.find((tr) => tr.default); -export const getTimeWindow = (timeWindowName) => - timeRanges.find((tr) => tr.name === timeWindowName); export const AVATAR_SHAPE_OPTION_CIRCLE = 'circle'; export const AVATAR_SHAPE_OPTION_RECT = 'rect'; @@ -87,7 +85,7 @@ export const confidentialityInfoText = (workspaceType, issuableType) => 'Only %{workspaceType} members with %{permissions} can view or be notified about this %{issuableType}.', ), { - workspaceType: workspaceType === WorkspaceType.project ? __('project') : __('group'), + workspaceType: workspaceType === WORKSPACE_PROJECT ? __('project') : __('group'), issuableType: issuableType === TYPE_ISSUE ? __('issue') : __('epic'), permissions: issuableType === TYPE_ISSUE diff --git a/app/assets/javascripts/vue_shared/gl_feature_flags_plugin.js b/app/assets/javascripts/vue_shared/gl_feature_flags_plugin.js index c12ffaac40a..79946ebaecd 100644 --- a/app/assets/javascripts/vue_shared/gl_feature_flags_plugin.js +++ b/app/assets/javascripts/vue_shared/gl_feature_flags_plugin.js @@ -1,12 +1,14 @@ export default (Vue) => { Vue.mixin({ - provide: { - glFeatures: - { - ...window.gon?.features, - // TODO: extract into glLicensedFeatures https://gitlab.com/gitlab-org/gitlab/-/issues/322460 - ...window.gon?.licensed_features, - } || {}, + provide() { + return { + glFeatures: + { + ...window.gon?.features, + // TODO: extract into glLicensedFeatures https://gitlab.com/gitlab-org/gitlab/-/issues/322460 + ...window.gon?.licensed_features, + } || {}, + }; }, }); }; diff --git a/app/assets/javascripts/vue_shared/global_search/constants.js b/app/assets/javascripts/vue_shared/global_search/constants.js new file mode 100644 index 00000000000..388e7c92f03 --- /dev/null +++ b/app/assets/javascripts/vue_shared/global_search/constants.js @@ -0,0 +1,73 @@ +import { s__, __, sprintf } from '~/locale'; + +export const AUTOCOMPLETE_ERROR_MESSAGE = s__( + 'GlobalSearch|There was an error fetching search autocomplete suggestions.', +); + +export const ALL_GITLAB = __('All GitLab'); +export const SEARCH_GITLAB = s__('GlobalSearch|Search GitLab'); + +export const SEARCH_DESCRIBED_BY_DEFAULT = s__( + 'GlobalSearch|%{count} default results provided. Use the up and down arrow keys to navigate search results list.', +); +export const SEARCH_DESCRIBED_BY_WITH_RESULTS = s__( + 'GlobalSearch|Type for new suggestions to appear below.', +); +export const SEARCH_INPUT_DESCRIBE_BY_NO_DROPDOWN = s__( + 'GlobalSearch|Type and press the enter key to submit search.', +); +export const SEARCH_INPUT_DESCRIBE_BY_WITH_DROPDOWN = SEARCH_DESCRIBED_BY_WITH_RESULTS; +export const SEARCH_DESCRIBED_BY_UPDATED = s__( + 'GlobalSearch|Results updated. %{count} results available. Use the up and down arrow keys to navigate search results list, or ENTER to submit.', +); +export const SEARCH_RESULTS_LOADING = s__('GlobalSearch|Search results are loading'); +export const SEARCH_RESULTS_SCOPE = s__('GlobalSearch|in %{scope}'); +export const KBD_HELP = sprintf( + s__('GlobalSearch|Use the shortcut key %{kbdOpen}/%{kbdClose} to start a search'), + { kbdOpen: '<kbd>', kbdClose: '</kbd>' }, + false, +); +export const SCOPED_SEARCH_ITEM_ARIA_LABEL = s__('GlobalSearch| %{search} %{description} %{scope}'); + +export const MSG_ISSUES_ASSIGNED_TO_ME = s__('GlobalSearch|Issues assigned to me'); + +export const MSG_ISSUES_IVE_CREATED = s__("GlobalSearch|Issues I've created"); + +export const MSG_MR_ASSIGNED_TO_ME = s__('GlobalSearch|Merge requests assigned to me'); + +export const MSG_MR_IM_REVIEWER = s__("GlobalSearch|Merge requests that I'm a reviewer"); + +export const MSG_MR_IVE_CREATED = s__("GlobalSearch|Merge requests I've created"); + +export const MSG_IN_ALL_GITLAB = s__('GlobalSearch|all GitLab'); + +export const GROUPS_CATEGORY = s__('GlobalSearch|Groups'); + +export const PROJECTS_CATEGORY = s__('GlobalSearch|Projects'); + +export const USERS_CATEGORY = s__('GlobalSearch|Users'); + +export const ISSUES_CATEGORY = s__('GlobalSearch|Recent issues'); + +export const MERGE_REQUEST_CATEGORY = s__('GlobalSearch|Recent merge requests'); + +export const RECENT_EPICS_CATEGORY = s__('GlobalSearch|Recent epics'); + +export const IN_THIS_PROJECT_CATEGORY = s__('GlobalSearch|In this project'); + +export const SETTINGS_CATEGORY = s__('GlobalSearch|Settings'); + +export const HELP_CATEGORY = s__('GlobalSearch|Help'); + +export const SEARCH_RESULTS_ORDER = [ + MERGE_REQUEST_CATEGORY, + ISSUES_CATEGORY, + RECENT_EPICS_CATEGORY, + GROUPS_CATEGORY, + PROJECTS_CATEGORY, + USERS_CATEGORY, + IN_THIS_PROJECT_CATEGORY, + SETTINGS_CATEGORY, + HELP_CATEGORY, +]; +export const DROPDOWN_ORDER = SEARCH_RESULTS_ORDER; diff --git a/app/assets/javascripts/vue_shared/issuable/list/constants.js b/app/assets/javascripts/vue_shared/issuable/list/constants.js index f6b864dfde0..1b71819bdc2 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/constants.js +++ b/app/assets/javascripts/vue_shared/issuable/list/constants.js @@ -1,27 +1,22 @@ +import { STATUS_ALL, STATUS_CLOSED, STATUS_OPEN } from '~/issues/constants'; import { __ } from '~/locale'; -export const IssuableStates = { - Opened: 'opened', - Closed: 'closed', - All: 'all', -}; - export const IssuableListTabs = [ { id: 'state-opened', - name: IssuableStates.Opened, + name: STATUS_OPEN, title: __('Open'), titleTooltip: __('Filter by issues that are currently opened.'), }, { id: 'state-closed', - name: IssuableStates.Closed, + name: STATUS_CLOSED, title: __('Closed'), titleTooltip: __('Filter by issues that are currently closed.'), }, { id: 'state-all', - name: IssuableStates.All, + name: STATUS_ALL, title: __('All'), titleTooltip: __('Show all issues.'), }, diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_body.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_body.vue index d78530239a5..a8d5f72373c 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_body.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_body.vue @@ -3,6 +3,7 @@ import { GlLink } from '@gitlab/ui'; import TaskList from '~/task_list'; +import { TYPE_ISSUE } from '~/issues/constants'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import IssuableDescription from './issuable_description.vue'; @@ -112,7 +113,7 @@ export default { * task lists in Issue, Test Cases and Incidents * as all of those are derived from `issue`. */ - dataType: 'issue', + dataType: TYPE_ISSUE, fieldName: 'description', lockVersion: this.taskListLockVersion, selector: '.js-detail-page-description', @@ -138,7 +139,7 @@ export default { <template> <div class="issue-details issuable-details"> - <div class="detail-page-description js-detail-page-description content-block"> + <div class="detail-page-description js-detail-page-description content-block gl-pt-2"> <issuable-edit-form v-if="editFormVisible" :issuable="issuable" diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue index 1f23fdfaafd..3d4eebb9524 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue @@ -9,11 +9,11 @@ import { } from '@gitlab/ui'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { STATUS_OPEN } from '~/issues/constants'; import { isExternal } from '~/lib/utils/url_utility'; import { n__, sprintf } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue'; -import { IssuableStates } from '~/vue_shared/issuable/list/constants'; export default { components: { @@ -80,7 +80,7 @@ export default { }, computed: { badgeVariant() { - return this.issuableState === IssuableStates.Opened ? 'success' : 'info'; + return this.issuableState === STATUS_OPEN ? 'success' : 'info'; }, authorId() { return getIdFromGraphQLId(`${this.author.id}`); diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue index fd94245b7c9..c33e803c7e1 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue @@ -1,8 +1,8 @@ <script> import { GlIcon, GlBadge, GlButton, GlIntersectionObserver, GlTooltipDirective } from '@gitlab/ui'; import SafeHtml from '~/vue_shared/directives/safe_html'; +import { STATUS_OPEN } from '~/issues/constants'; import { __ } from '~/locale'; -import { IssuableStates } from '~/vue_shared/issuable/list/constants'; export default { i18n: { @@ -39,7 +39,7 @@ export default { }, computed: { badgeVariant() { - return this.issuable.state === IssuableStates.Opened ? 'success' : 'info'; + return this.issuable.state === STATUS_OPEN ? 'success' : 'info'; }, }, methods: { diff --git a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue index 318adec2319..2533b3b5489 100644 --- a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue +++ b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue @@ -29,8 +29,8 @@ export default { type: String, required: true, }, - initialBreadcrumb: { - type: String, + initialBreadcrumbs: { + type: Array, required: true, }, panels: { @@ -60,6 +60,10 @@ export default { return this.panels.find((p) => p.name === this.activePanelName); }, + detailProps() { + return this.activePanel.detailProps || {}; + }, + details() { return this.activePanel.details || this.activePanel.description; }, @@ -69,14 +73,15 @@ export default { }, breadcrumbs() { - if (!this.activePanel) { - return null; - } - - return [ - { text: this.initialBreadcrumb, href: '#' }, - { text: this.activePanel.title, href: `#${this.activePanel.name}` }, - ]; + return this.activePanel + ? [ + ...this.initialBreadcrumbs, + { + text: this.activePanel.title, + href: `#${this.activePanel.name}`, + }, + ] + : this.initialBreadcrumbs; }, shouldVerify() { @@ -125,24 +130,29 @@ export default { <template> <credit-card-verification v-if="shouldVerify" @verified="onVerified" /> - <welcome-page v-else-if="!activePanelName" :panels="panels" :title="title"> - <template #footer> - <slot name="welcome-footer"> </slot> - </template> - </welcome-page> - <div v-else class="row"> - <div class="col-lg-3"> - <div v-safe-html="activePanel.illustration" class="gl-text-white"></div> - <h4>{{ activePanel.title }}</h4> - - <p v-if="hasTextDetails">{{ details }}</p> - <component :is="details" v-else v-bind="activePanel.detailProps || {}" /> + <div v-else-if="!activePanelName"> + <gl-breadcrumb :items="breadcrumbs" /> + <welcome-page :panels="panels" :title="title"> + <template #footer> + <slot name="welcome-footer"> </slot> + </template> + </welcome-page> + </div> + <div v-else> + <gl-breadcrumb :items="breadcrumbs" /> + <div class="gl-display-flex gl-py-5 gl-align-items-center"> + <div v-safe-html="activePanel.illustration" class="gl-text-white col-auto"></div> + <div class="col"> + <h4>{{ activePanel.title }}</h4> + + <p v-if="hasTextDetails">{{ details }}</p> + <component :is="details" v-else v-bind="detailProps" /> + </div> <slot name="extra-description"></slot> </div> - <div class="col-lg-9"> + <div> <new-top-level-group-alert v-if="showNewTopLevelGroupAlert" /> - <gl-breadcrumb v-if="breadcrumbs" :items="breadcrumbs" /> <legacy-container :key="activePanel.name" :selector="activePanel.selector" /> </div> </div> diff --git a/app/assets/javascripts/vue_shared/plugins/global_toast.js b/app/assets/javascripts/vue_shared/plugins/global_toast.js index fb52b31c2c8..bfea2bedd40 100644 --- a/app/assets/javascripts/vue_shared/plugins/global_toast.js +++ b/app/assets/javascripts/vue_shared/plugins/global_toast.js @@ -2,7 +2,7 @@ import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; Vue.use(GlToast); -export const instance = new Vue(); +const instance = new Vue(); export default function showGlobalToast(...args) { return instance.$toast.show(...args); diff --git a/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue b/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue index a4fb30a03a1..4c2b082242b 100644 --- a/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue +++ b/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue @@ -1,6 +1,6 @@ <script> import { reportTypeToSecurityReportTypeEnum } from 'ee_else_ce/vue_shared/security_reports/constants'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue'; import securityReportMergeRequestDownloadPathsQuery from '~/vue_shared/security_reports/graphql/queries/security_report_merge_request_download_paths.query.graphql'; diff --git a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue index b739baad5d7..0cff5edf628 100644 --- a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue +++ b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import ReportSection from '~/ci/reports/components/report_section.vue'; import { ERROR, SLOT_SUCCESS, SLOT_LOADING, SLOT_ERROR } from '~/ci/reports/constants'; diff --git a/app/assets/javascripts/work_items/components/item_state.vue b/app/assets/javascripts/work_items/components/item_state.vue index 8ec8482657d..8bb8b6101d4 100644 --- a/app/assets/javascripts/work_items/components/item_state.vue +++ b/app/assets/javascripts/work_items/components/item_state.vue @@ -63,7 +63,7 @@ export default { :options="$options.states" :disabled="disabled" data-testid="work-item-state-select" - class="gl-w-auto hide-select-decoration gl-pl-3" + class="gl-w-auto hide-select-decoration gl-pl-4 gl-my-1" :class="{ 'gl-bg-transparent! gl-cursor-text!': disabled }" @change="setState" /> diff --git a/app/assets/javascripts/work_items/components/item_title.vue b/app/assets/javascripts/work_items/components/item_title.vue index 1c0fed2dde9..1dc6d341811 100644 --- a/app/assets/javascripts/work_items/components/item_title.vue +++ b/app/assets/javascripts/work_items/components/item_title.vue @@ -48,6 +48,7 @@ export default { id="item-title" ref="titleEl" role="textbox" + data-testid="work-item-title" :aria-label="__('Title')" :data-placeholder="placeholder" :contenteditable="!disabled" diff --git a/app/assets/javascripts/work_items/components/notes/activity_filter.vue b/app/assets/javascripts/work_items/components/notes/activity_filter.vue deleted file mode 100644 index 71784d3a807..00000000000 --- a/app/assets/javascripts/work_items/components/notes/activity_filter.vue +++ /dev/null @@ -1,113 +0,0 @@ -<script> -import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; -import { __ } from '~/locale'; -import Tracking from '~/tracking'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import { ASC, DESC } from '~/notes/constants'; -import { TRACKING_CATEGORY_SHOW, WORK_ITEM_NOTES_SORT_ORDER_KEY } from '~/work_items/constants'; - -const SORT_OPTIONS = [ - { key: DESC, text: __('Newest first'), dataid: 'js-newest-first' }, - { key: ASC, text: __('Oldest first'), dataid: 'js-oldest-first' }, -]; - -export default { - SORT_OPTIONS, - components: { - GlDropdown, - GlDropdownItem, - LocalStorageSync, - }, - mixins: [Tracking.mixin()], - props: { - sortOrder: { - type: String, - default: ASC, - required: false, - }, - loading: { - type: Boolean, - default: false, - required: false, - }, - workItemType: { - type: String, - required: true, - }, - }, - data() { - return { - persistSortOrder: true, - }; - }, - computed: { - tracking() { - return { - category: TRACKING_CATEGORY_SHOW, - label: 'item_track_notes_sorting', - property: `type_${this.workItemType}`, - }; - }, - selectedSortOption() { - const isSortOptionValid = this.sortOrder === ASC || this.sortOrder === DESC; - return isSortOptionValid ? SORT_OPTIONS.find(({ key }) => this.sortOrder === key) : ASC; - }, - getDropdownSelectedText() { - return this.selectedSortOption.text; - }, - }, - methods: { - setDiscussionSortDirection(direction) { - this.$emit('updateSavedSortOrder', direction); - }, - fetchSortedDiscussions(direction) { - if (this.isSortDropdownItemActive(direction)) { - return; - } - this.track('notes_sort_order_changed'); - this.$emit('changeSortOrder', direction); - }, - isSortDropdownItemActive(sortDir) { - return sortDir === this.sortOrder; - }, - }, - WORK_ITEM_NOTES_SORT_ORDER_KEY, -}; -</script> - -<template> - <div - id="discussion-preferences" - data-testid="discussion-preferences" - class="gl-display-inline-block gl-vertical-align-bottom gl-w-full gl-sm-w-auto" - > - <local-storage-sync - :value="sortOrder" - :storage-key="$options.WORK_ITEM_NOTES_SORT_ORDER_KEY" - :persist="persistSortOrder" - as-string - @input="setDiscussionSortDirection" - /> - <gl-dropdown - :id="`discussion-preferences-dropdown-${workItemType}`" - class="gl-xs-w-full" - size="small" - :text="getDropdownSelectedText" - :disabled="loading" - right - > - <div id="discussion-sort"> - <gl-dropdown-item - v-for="{ text, key, dataid } in $options.SORT_OPTIONS" - :key="text" - :data-testid="dataid" - is-check-item - :is-checked="isSortDropdownItemActive(key)" - @click="fetchSortedDiscussions(key)" - > - {{ text }} - </gl-dropdown-item> - </div> - </gl-dropdown> - </div> -</template> diff --git a/app/assets/javascripts/work_items/components/notes/system_note.vue b/app/assets/javascripts/work_items/components/notes/system_note.vue index bca061f5e01..ab4691a4a4e 100644 --- a/app/assets/javascripts/work_items/components/notes/system_note.vue +++ b/app/assets/javascripts/work_items/components/notes/system_note.vue @@ -70,7 +70,7 @@ export default { return []; }, noteAnchorId() { - return `note_${this.note.id}`; + return `note_${this.noteId}`; }, isTargetNote() { return this.targetNoteHash === this.noteAnchorId; diff --git a/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue b/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue new file mode 100644 index 00000000000..1ead16c944b --- /dev/null +++ b/app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue @@ -0,0 +1,116 @@ +<script> +import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import Tracking from '~/tracking'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; +import { TRACKING_CATEGORY_SHOW } from '~/work_items/constants'; + +export default { + components: { + GlDropdown, + GlDropdownItem, + LocalStorageSync, + }, + mixins: [Tracking.mixin()], + props: { + loading: { + type: Boolean, + default: false, + required: false, + }, + workItemType: { + type: String, + required: true, + }, + sortFilterProp: { + type: String, + required: true, + }, + filterOptions: { + type: Array, + required: true, + }, + trackingLabel: { + type: String, + required: true, + }, + trackingAction: { + type: String, + required: true, + }, + filterEvent: { + type: String, + required: true, + }, + defaultSortFilterProp: { + type: String, + required: true, + }, + storageKey: { + type: String, + required: true, + }, + }, + computed: { + tracking() { + return { + category: TRACKING_CATEGORY_SHOW, + label: this.trackingLabel, + property: `type_${this.workItemType}`, + }; + }, + getDropdownSelectedText() { + return this.selectedSortOption.text; + }, + selectedSortOption() { + return ( + this.filterOptions.find(({ key }) => this.sortFilterProp === key) || + this.defaultSortFilterProp + ); + }, + }, + methods: { + setDiscussionFilterOption(filterValue) { + this.$emit(this.filterEvent, filterValue); + }, + fetchFilteredDiscussions(filterValue) { + if (this.isSortDropdownItemActive(filterValue)) { + return; + } + this.track(this.trackingAction); + this.$emit(this.filterEvent, filterValue); + }, + isSortDropdownItemActive(value) { + return value === this.sortFilterProp; + }, + }, +}; +</script> + +<template> + <div class="gl-display-inline-block gl-vertical-align-bottom"> + <local-storage-sync + :value="sortFilterProp" + :storage-key="storageKey" + as-string + @input="setDiscussionFilterOption" + /> + <gl-dropdown + class="gl-xs-w-full" + size="small" + :text="getDropdownSelectedText" + :disabled="loading" + right + > + <gl-dropdown-item + v-for="{ text, key, testid } in filterOptions" + :key="text" + :data-testid="testid" + is-check-item + :is-checked="isSortDropdownItemActive(key)" + @click="fetchFilteredDiscussions(key)" + > + {{ text }} + </gl-dropdown-item> + </gl-dropdown> + </div> +</template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue index b3f17aff2ae..1762344ea9e 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue @@ -5,7 +5,6 @@ import { clearDraft } from '~/lib/utils/autosave'; import Tracking from '~/tracking'; import { ASC } from '~/notes/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { updateCommentState } from '~/work_items/graphql/cache_utils'; import { getWorkItemQuery } from '../../utils'; import createNoteMutation from '../../graphql/notes/create_work_item_note.mutation.graphql'; import { TRACKING_CATEGORY_SHOW, i18n } from '../../constants'; @@ -115,10 +114,35 @@ export default { this.workItemType }`; }, + isLockedOutOrSignedOut() { + return !this.signedIn || !this.canUpdate; + }, + lockedOutUserWarningInReplies() { + return this.addPadding && this.isLockedOutOrSignedOut; + }, timelineEntryClass() { return { - 'timeline-entry gl-mb-3': true, - 'gl-p-4': this.addPadding, + 'timeline-entry gl-mb-3 note note-wrapper note-comment': true, + 'gl-bg-gray-10 gl-rounded-bottom-left-base gl-rounded-bottom-right-base gl-p-5! gl-mx-n3 gl-mb-n2!': this + .lockedOutUserWarningInReplies, + }; + }, + timelineEntryInnerClass() { + return { + 'timeline-entry-inner': true, + 'gl-pb-3': this.addPadding, + }; + }, + timelineContentClass() { + return { + 'timeline-content': true, + 'gl-border-0! gl-pl-0!': !this.addPadding, + }; + }, + parentClass() { + return { + 'gl-relative gl-display-flex gl-align-items-flex-start gl-flex-wrap-nowrap': !this + .isEditing, }; }, isProjectArchived() { @@ -142,7 +166,6 @@ export default { async updateWorkItem(commentText) { this.isSubmitting = true; this.$emit('replying', commentText); - const { queryVariables, fetchByIid } = this; try { this.track('add_work_item_comment'); @@ -160,7 +183,6 @@ export default { if (createNoteData.data?.createNote?.errors?.length) { throw new Error(createNoteData.data?.createNote?.errors[0]); } - updateCommentState(store, createNoteData, fetchByIid, queryVariables); }, }); clearDraft(this.autosaveKey); @@ -189,23 +211,29 @@ export default { :work-item-type="workItemType" :is-project-archived="isProjectArchived" /> - <div v-else class="gl-relative gl-display-flex gl-align-items-flex-start gl-flex-wrap-nowrap"> - <gl-avatar :src="$options.constantOptions.avatarUrl" :size="32" class="gl-mr-3" /> - <work-item-comment-form - v-if="isEditing" - :work-item-type="workItemType" - :aria-label="__('Add a comment')" - :is-submitting="isSubmitting" - :autosave-key="autosaveKey" - @submitForm="updateWorkItem" - @cancelEditing="cancelEditing" - /> - <gl-button - v-else - class="gl-flex-grow-1 gl-justify-content-start! gl-text-secondary!" - @click="isEditing = true" - >{{ __('Add a comment') }}</gl-button - > + <div v-else :class="timelineEntryInnerClass"> + <div class="timeline-avatar gl-float-left"> + <gl-avatar :src="$options.constantOptions.avatarUrl" :size="32" class="gl-mr-3" /> + </div> + <div :class="timelineContentClass"> + <div :class="parentClass"> + <work-item-comment-form + v-if="isEditing" + :work-item-type="workItemType" + :aria-label="__('Add a reply')" + :is-submitting="isSubmitting" + :autosave-key="autosaveKey" + @submitForm="updateWorkItem" + @cancelEditing="cancelEditing" + /> + <gl-button + v-else + class="gl-flex-grow-1 gl-justify-content-start! gl-text-secondary!" + @click="isEditing = true" + >{{ __('Add a reply') }}</gl-button + > + </div> + </div> </div> </li> </template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue index fd407fd9d9f..a3ebd51f76d 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue @@ -96,31 +96,39 @@ export default { </script> <template> - <form class="common-note-form gfm-form js-main-target-form gl-flex-grow-1"> - <markdown-editor - :value="commentText" - :render-markdown-path="markdownPreviewPath" - :markdown-docs-path="$options.constantOptions.markdownDocsPath" - :form-field-props="formFieldProps" - data-testid="work-item-add-comment" - class="gl-mb-3" - autofocus - use-bottom-toolbar - @input="setCommentText" - @keydown.meta.enter="$emit('submitForm', commentText)" - @keydown.ctrl.enter="$emit('submitForm', commentText)" - @keydown.esc.stop="cancelEditing" - /> - <gl-button - category="primary" - variant="confirm" - data-testid="confirm-button" - :loading="isSubmitting" - @click="$emit('submitForm', commentText)" - >{{ commentButtonText }} - </gl-button> - <gl-button data-testid="cancel-button" category="primary" class="gl-ml-3" @click="cancelEditing" - >{{ __('Cancel') }} - </gl-button> - </form> + <div class="timeline-discussion-body"> + <div class="note-body"> + <form class="common-note-form gfm-form js-main-target-form gl-flex-grow-1"> + <markdown-editor + :value="commentText" + :render-markdown-path="markdownPreviewPath" + :markdown-docs-path="$options.constantOptions.markdownDocsPath" + :form-field-props="formFieldProps" + data-testid="work-item-add-comment" + class="gl-mb-3" + autofocus + use-bottom-toolbar + @input="setCommentText" + @keydown.meta.enter="$emit('submitForm', commentText)" + @keydown.ctrl.enter="$emit('submitForm', commentText)" + @keydown.esc.stop="cancelEditing" + /> + <gl-button + category="primary" + variant="confirm" + data-testid="confirm-button" + :loading="isSubmitting" + @click="$emit('submitForm', commentText)" + >{{ commentButtonText }} + </gl-button> + <gl-button + data-testid="cancel-button" + category="primary" + class="gl-ml-3" + @click="cancelEditing" + >{{ __('Cancel') }} + </gl-button> + </form> + </div> + </div> </template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue index f837d025b7f..c1b6903cf17 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue @@ -45,8 +45,10 @@ export default { </script> <template> - <div class="disabled-comment text-center"> - <span class="issuable-note-warning gl-display-inline-block"> + <div class="disabled-comment gl-text-center gl-relative gl-mt-3"> + <span + class="issuable-note-warning gl-display-inline-block gl-w-full gl-px-5 gl-py-4 gl-rounded-base" + > <gl-icon name="lock" class="gl-mr-2" /> <template v-if="isProjectArchived"> {{ $options.constantOptions.projectArchivedWarning }} diff --git a/app/assets/javascripts/work_items/components/notes/work_item_discussion.vue b/app/assets/javascripts/work_items/components/notes/work_item_discussion.vue index bda00f978b9..1e08fecaf3d 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_discussion.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_discussion.vue @@ -1,5 +1,6 @@ <script> -import { GlAvatarLink, GlAvatar } from '@gitlab/ui'; +import { getLocationHash } from '~/lib/utils/url_utility'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { ASC } from '~/notes/constants'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import DiscussionNotesRepliesWrapper from '~/notes/components/discussion_notes_replies_wrapper.vue'; @@ -11,8 +12,6 @@ import WorkItemAddNote from './work_item_add_note.vue'; export default { components: { TimelineEntryItem, - GlAvatarLink, - GlAvatar, WorkItemNote, WorkItemAddNote, ToggleRepliesWidget, @@ -50,13 +49,19 @@ export default { default: ASC, required: false, }, + isModal: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { - isExpanded: false, + isExpanded: true, autofocus: false, isReplying: false, replyingText: '', + showForm: false, }; }, computed: { @@ -66,11 +71,20 @@ export default { author() { return this.note.author; }, + noteId() { + return getIdFromGraphQLId(this.note.id); + }, noteAnchorId() { - return `note_${this.note.id}`; + return `note_${this.noteId}`; + }, + isTarget() { + return this.targetNoteHash === this.noteAnchorId; + }, + targetNoteHash() { + return getLocationHash(); }, hasReplies() { - return this.replies?.length; + return Boolean(this.replies?.length); }, replies() { if (this.discussion?.length > 1) { @@ -81,19 +95,26 @@ export default { discussionId() { return this.discussion[0]?.discussion?.id || ''; }, + shouldShowReplyForm() { + return this.showForm || this.hasReplies; + }, + isOnlyCommentOfAThread() { + return !this.hasReplies && !this.showForm; + }, }, methods: { showReplyForm() { + this.showForm = true; this.isExpanded = true; this.autofocus = true; }, hideReplyForm() { + this.showForm = false; this.isExpanded = this.hasReplies; this.autofocus = false; }, toggleDiscussion() { this.isExpanded = !this.isExpanded; - this.autofocus = this.isExpanded; }, threadKey(note) { /* eslint-disable @gitlab/require-i18n-strings */ @@ -113,76 +134,85 @@ export default { </script> <template> + <work-item-note + v-if="isOnlyCommentOfAThread" + :is-first-note="true" + :note="note" + :discussion-id="discussionId" + :has-replies="hasReplies" + :work-item-type="workItemType" + :is-modal="isModal" + :class="{ 'gl-mb-4': hasReplies }" + @startReplying="showReplyForm" + @deleteNote="$emit('deleteNote', note)" + @error="$emit('error', $event)" + /> <timeline-entry-item - :id="noteAnchorId" + v-else :class="{ 'internal-note': note.internal }" - :data-note-id="note.id" - class="note note-wrapper note-comment gl-px-0" + :data-note-id="noteId" + class="note note-discussion gl-px-0" > - <div class="timeline-avatar gl-float-left"> - <gl-avatar-link :href="author.webUrl"> - <gl-avatar - :src="author.avatarUrl" - :entity-name="author.username" - :alt="author.name" - :size="32" - /> - </gl-avatar-link> - </div> - <div class="timeline-content"> - <div class="discussion-body"> - <div class="discussion-wrapper"> - <div class="discussion-notes"> - <ul class="notes"> - <work-item-note - :is-first-note="true" - :note="note" - :discussion-id="discussionId" - :work-item-type="workItemType" - :class="{ 'gl-mb-5': hasReplies }" - @startReplying="showReplyForm" - @deleteNote="$emit('deleteNote', note)" - @error="$emit('error', $event)" - /> - <discussion-notes-replies-wrapper> - <toggle-replies-widget - v-if="hasReplies" - :collapsed="!isExpanded" - :replies="replies" - @toggle="toggleDiscussion({ discussionId })" + <div class="discussion"> + <div class="discussion-body"> + <div class="discussion-wrapper"> + <div class="discussion-notes"> + <ul class="notes"> + <work-item-note + :is-first-note="true" + :note="note" + :discussion-id="discussionId" + :has-replies="hasReplies" + :work-item-type="workItemType" + :is-modal="isModal" + :class="{ 'gl-mb-4': hasReplies }" + @startReplying="showReplyForm" + @deleteNote="$emit('deleteNote', note)" + @error="$emit('error', $event)" /> - <template v-if="isExpanded"> - <template v-for="reply in replies"> - <work-item-note - :key="threadKey(reply)" + <discussion-notes-replies-wrapper> + <toggle-replies-widget + v-if="hasReplies" + :collapsed="!isExpanded" + :replies="replies" + @toggle="toggleDiscussion({ discussionId })" + /> + <template v-if="isExpanded"> + <template v-for="reply in replies"> + <work-item-note + :key="threadKey(reply)" + :discussion-id="discussionId" + :note="reply" + :work-item-type="workItemType" + :is-modal="isModal" + @startReplying="showReplyForm" + @deleteNote="$emit('deleteNote', reply)" + @error="$emit('error', $event)" + /> + </template> + <work-item-note-replying v-if="isReplying" :body="replyingText" /> + <work-item-add-note + v-if="shouldShowReplyForm" + :notes-form="false" + :autofocus="autofocus" + :query-variables="queryVariables" + :full-path="fullPath" + :work-item-id="workItemId" + :fetch-by-iid="fetchByIid" :discussion-id="discussionId" - :note="reply" :work-item-type="workItemType" - @startReplying="showReplyForm" - @deleteNote="$emit('deleteNote', reply)" + :sort-order="sortOrder" + :add-padding="true" + @cancelEditing="hideReplyForm" + @replied="onReplied" + @replying="onReplying" @error="$emit('error', $event)" /> </template> - <work-item-note-replying v-if="isReplying" :body="replyingText" /> - <work-item-add-note - :autofocus="autofocus" - :query-variables="queryVariables" - :full-path="fullPath" - :work-item-id="workItemId" - :fetch-by-iid="fetchByIid" - :discussion-id="discussionId" - :work-item-type="workItemType" - :sort-order="sortOrder" - :add-padding="true" - @cancelEditing="hideReplyForm" - @replied="onReplied" - @replying="onReplying" - @error="$emit('error', $event)" - /> - </template> - </discussion-notes-replies-wrapper> - </ul> + </discussion-notes-replies-wrapper> + </ul> + </div> </div> </div> </div> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue new file mode 100644 index 00000000000..07e25312f87 --- /dev/null +++ b/app/assets/javascripts/work_items/components/notes/work_item_history_only_filter_note.vue @@ -0,0 +1,61 @@ +<script> +import { GlButton, GlIcon, GlSprintf } from '@gitlab/ui'; +import { s__ } from '~/locale'; + +import { + WORK_ITEM_NOTES_FILTER_ALL_NOTES, + WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS, +} from '~/work_items/constants'; + +export default { + WORK_ITEM_NOTES_FILTER_ALL_NOTES, + WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS, + i18n: { + information: s__( + "WorkItem|You're only seeing %{boldStart}other activity%{boldEnd} in the feed. To add a comment, switch to one of the following options.", + ), + }, + components: { + GlButton, + GlIcon, + GlSprintf, + }, + methods: { + selectFilter(value) { + this.$emit('changeFilter', value); + }, + }, +}; +</script> + +<template> + <li class="timeline-entry note note-wrapper discussion-filter-note"> + <div class="timeline-icon gl-display-none gl-lg-display-flex"> + <gl-icon name="comment" /> + </div> + <div class="timeline-content gl-pl-8"> + <gl-sprintf :message="$options.i18n.information"> + <template #bold="{ content }"> + <b>{{ content }}</b> + </template> + </gl-sprintf> + + <div class="discussion-filter-actions"> + <gl-button + class="gl-mr-2 gl-mt-3" + data-testid="show-all-activity" + @click="selectFilter($options.WORK_ITEM_NOTES_FILTER_ALL_NOTES)" + > + {{ __('Show all activity') }} + </gl-button> + <gl-button + class="gl-mt-3" + data-testid="show-comments-only" + @click="selectFilter($options.WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS)" + > + {{ __('Show comments only') }} + </gl-button> + </div> + </div> + </li> +</template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_note.vue index 5dd21a5f76f..dcb6557600e 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_note.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_note.vue @@ -1,9 +1,12 @@ <script> import { GlAvatarLink, GlAvatar, GlDropdown, GlDropdownItem, GlTooltipDirective } from '@gitlab/ui'; import * as Sentry from '@sentry/browser'; +import toast from '~/vue_shared/plugins/global_toast'; import { __ } from '~/locale'; import { updateDraft, clearDraft } from '~/lib/utils/autosave'; import { renderMarkdown } from '~/notes/utils'; +import { getLocationHash } from '~/lib/utils/url_utility'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import EditedAt from '~/issues/show/components/edited.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import NoteBody from '~/work_items/components/notes/work_item_note_body.vue'; @@ -17,6 +20,7 @@ export default { i18n: { moreActionsText: __('More actions'), deleteNoteText: __('Delete comment'), + copyLinkText: __('Copy link'), }, components: { TimelineEntryItem, @@ -43,10 +47,20 @@ export default { required: false, default: false, }, + hasReplies: { + type: Boolean, + required: false, + default: false, + }, workItemType: { type: String, required: true, }, + isModal: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -60,12 +74,18 @@ export default { entryClass() { return { 'note note-wrapper note-comment': true, - 'gl-p-4': !this.isFirstNote, + target: this.isTarget, + 'inner-target': this.isTarget && !this.isFirstNote, }; }, showReply() { return this.note.userPermissions.createNote && this.isFirstNote; }, + noteHeaderClass() { + return { + 'note-header': true, + }; + }, autosaveKey() { // eslint-disable-next-line @gitlab/require-i18n-strings return `${this.note.id}-comment`; @@ -76,6 +96,21 @@ export default { hasAdminPermission() { return this.note.userPermissions.adminNote; }, + noteAnchorId() { + return `note_${getIdFromGraphQLId(this.note.id)}`; + }, + isTarget() { + return this.targetNoteHash === this.noteAnchorId; + }, + targetNoteHash() { + return getLocationHash(); + }, + noteUrl() { + return this.note.url; + }, + hasAwardEmojiPermission() { + return this.note.userPermissions.awardEmoji; + }, }, methods: { showReplyForm() { @@ -114,13 +149,19 @@ export default { Sentry.captureException(error); } }, + notifyCopyDone() { + if (this.isModal) { + navigator.clipboard.writeText(this.noteUrl); + } + toast(__('Link copied to clipboard.')); + }, }, }; </script> <template> - <timeline-entry-item :class="entryClass"> - <div v-if="!isFirstNote" :key="note.id" class="timeline-avatar gl-float-left"> + <timeline-entry-item :id="noteAnchorId" :class="entryClass"> + <div :key="note.id" class="timeline-avatar gl-float-left"> <gl-avatar-link :href="author.webUrl"> <gl-avatar :src="author.avatarUrl" @@ -130,57 +171,73 @@ export default { /> </gl-avatar-link> </div> - <work-item-comment-form - v-if="isEditing" - :work-item-type="workItemType" - :aria-label="__('Edit comment')" - :autosave-key="autosaveKey" - :initial-value="note.body" - :comment-button-text="__('Save comment')" - :class="{ 'gl-pl-8': !isFirstNote }" - @cancelEditing="isEditing = false" - @submitForm="updateNote" - /> - <div v-else class="timeline-content-inner" data-testid="note-wrapper"> - <div class="note-header"> - <note-header :author="author" :created-at="note.createdAt" :note-id="note.id" /> - <note-actions - :show-reply="showReply" - :show-edit="hasAdminPermission" - @startReplying="showReplyForm" - @startEditing="startEditing" - /> - <!-- v-if condition should be moved to "delete" dropdown item as soon as we implement copying the link --> - <gl-dropdown - v-if="hasAdminPermission" - v-gl-tooltip - icon="ellipsis_v" - text-sr-only - right - :text="$options.i18n.moreActionsText" - :title="$options.i18n.moreActionsText" - category="tertiary" - no-caret - > - <gl-dropdown-item - variant="danger" - data-testid="delete-note-action" - @click="$emit('deleteNote')" + <div class="timeline-content"> + <work-item-comment-form + v-if="isEditing" + :work-item-type="workItemType" + :aria-label="__('Edit comment')" + :autosave-key="autosaveKey" + :initial-value="note.body" + :comment-button-text="__('Save comment')" + @cancelEditing="isEditing = false" + @submitForm="updateNote" + /> + <div v-else data-testid="note-wrapper"> + <div :class="noteHeaderClass"> + <note-header + :author="author" + :created-at="note.createdAt" + :note-id="note.id" + :note-url="note.url" > - {{ $options.i18n.deleteNoteText }} - </gl-dropdown-item> - </gl-dropdown> - </div> - <div class="timeline-discussion-body"> - <note-body ref="noteBody" :note="note" /> + <span v-if="note.createdAt" class="d-none d-sm-inline">·</span> + </note-header> + <div class="gl-display-inline-flex"> + <note-actions + :show-award-emoji="hasAwardEmojiPermission" + :note-url="noteUrl" + :show-reply="showReply" + :show-edit="hasAdminPermission" + :note-id="note.id" + @startReplying="showReplyForm" + @startEditing="startEditing" + @error="($event) => $emit('error', $event)" + /> + <gl-dropdown + v-gl-tooltip + icon="ellipsis_v" + text-sr-only + right + :text="$options.i18n.moreActionsText" + :title="$options.i18n.moreActionsText" + category="tertiary" + no-caret + > + <gl-dropdown-item :data-clipboard-text="noteUrl" @click="notifyCopyDone"> + <span>{{ $options.i18n.copyLinkText }}</span> + </gl-dropdown-item> + <gl-dropdown-item + v-if="hasAdminPermission" + variant="danger" + data-testid="delete-note-action" + @click="$emit('deleteNote')" + > + {{ $options.i18n.deleteNoteText }} + </gl-dropdown-item> + </gl-dropdown> + </div> + </div> + <div class="timeline-discussion-body"> + <note-body ref="noteBody" :note="note" :has-replies="hasReplies" /> + </div> + <edited-at + v-if="note.lastEditedBy" + :updated-at="note.lastEditedAt" + :updated-by-name="lastEditedBy.name" + :updated-by-path="lastEditedBy.webPath" + :class="isFirstNote ? 'gl-pl-3' : 'gl-pl-8'" + /> </div> - <edited-at - v-if="note.lastEditedBy" - :updated-at="note.lastEditedAt" - :updated-by-name="lastEditedBy.name" - :updated-by-path="lastEditedBy.webPath" - :class="isFirstNote ? 'gl-pl-3' : 'gl-pl-8'" - /> </div> </timeline-entry-item> </template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue index c17e855e527..6bea7953698 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue @@ -1,7 +1,10 @@ <script> -import { GlButton, GlTooltipDirective } from '@gitlab/ui'; -import { __ } from '~/locale'; +import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import * as Sentry from '@sentry/browser'; +import { __, s__ } from '~/locale'; import ReplyButton from '~/notes/components/note_actions/reply_button.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import addAwardEmojiMutation from '../../graphql/notes/work_item_note_add_award_emoji.mutation.graphql'; export default { name: 'WorkItemNoteActions', @@ -10,11 +13,14 @@ export default { }, components: { GlButton, + GlIcon, ReplyButton, + EmojiPicker: () => import('~/emoji/components/picker.vue'), }, directives: { GlTooltip: GlTooltipDirective, }, + mixins: [glFeatureFlagsMixin()], props: { showReply: { type: Boolean, @@ -24,12 +30,63 @@ export default { type: Boolean, required: true, }, + noteId: { + type: String, + required: true, + }, + showAwardEmoji: { + type: Boolean, + required: false, + default: false, + }, + }, + methods: { + async setAwardEmoji(name) { + try { + const { + data: { + awardEmojiAdd: { errors = [] }, + }, + } = await this.$apollo.mutate({ + mutation: addAwardEmojiMutation, + variables: { + awardableId: this.noteId, + name, + }, + }); + + if (errors.length > 0) { + throw new Error(errors[0].message); + } + } catch (error) { + this.$emit('error', s__('WorkItem|Failed to award emoji')); + Sentry.captureException(error); + } + }, }, }; </script> <template> <div class="note-actions"> + <emoji-picker + v-if="showAwardEmoji && glFeatures.workItemsMvc2" + toggle-class="note-action-button note-emoji-button btn-icon btn-default-tertiary" + data-testid="note-emoji-button" + @click="setAwardEmoji" + > + <template #button-content> + <gl-icon class="award-control-icon-neutral gl-button-icon gl-icon" name="slight-smile" /> + <gl-icon + class="award-control-icon-positive gl-button-icon gl-icon gl-left-3!" + name="smiley" + /> + <gl-icon + class="award-control-icon-super-positive gl-button-icon gl-icon gl-left-3!" + name="smile" + /> + </template> + </emoji-picker> <reply-button v-if="showReply" ref="replyButton" @startReplying="$emit('startReplying')" /> <gl-button v-if="showEdit" diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_body.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_body.vue index 95397b58925..bec902fd325 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_note_body.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_note_body.vue @@ -12,6 +12,11 @@ export default { type: Object, required: true, }, + hasReplies: { + type: Boolean, + required: false, + default: false, + }, }, watch: { 'note.bodyHtml': { diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_replying.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_replying.vue index 46f61ccd204..f053f6e1d7c 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_note_replying.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_note_replying.vue @@ -41,13 +41,23 @@ export default { </script> <template> - <timeline-entry-item class="note note-wrapper note-comment gl-p-4 being-posted"> + <timeline-entry-item class="note note-wrapper note-comment being-posted"> <div class="timeline-avatar gl-float-left"> - <gl-avatar :src="$options.constantOptions.avatarUrl" :size="32" class="gl-mr-3" /> + <gl-avatar :src="$options.constantOptions.avatarUrl" :size="32" /> </div> - <div class="note-header"> - <note-header :author="author" /> + <div class="timeline-content" data-testid="note-wrapper"> + <div class="note-header"> + <note-header :author="author" /> + </div> + <div ref="note-body" class="timeline-discussion-body"> + <div class="note-body"> + <div + v-safe-html:[$options.safeHtmlConfig]="body" + class="note-text md" + data-testid="work-item-note-body" + ></div> + </div> + </div> </div> - <div ref="note-body" v-safe-html:[$options.safeHtmlConfig]="body" class="note-body"></div> </timeline-entry-item> </template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue b/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue index 3ef4a16bc57..bccbec903b4 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_note_signed_out.vue @@ -27,5 +27,5 @@ export default { </script> <template> - <div v-safe-html="signedOutText" class="disabled-comment gl-text-center"></div> + <div v-safe-html="signedOutText" class="disabled-comment gl-text-center gl-relative"></div> </template> diff --git a/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue b/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue new file mode 100644 index 00000000000..0c1419e983f --- /dev/null +++ b/app/assets/javascripts/work_items/components/notes/work_item_notes_activity_header.vue @@ -0,0 +1,91 @@ +<script> +import WorkItemActivitySortFilter from '~/work_items/components/notes/work_item_activity_sort_filter.vue'; +import { s__ } from '~/locale'; +import { ASC } from '~/notes/constants'; +import { + WORK_ITEM_NOTES_FILTER_ALL_NOTES, + WORK_ITEM_ACTIVITY_FILTER_OPTIONS, + WORK_ITEM_NOTES_FILTER_KEY, + WORK_ITEM_ACTIVITY_SORT_OPTIONS, + WORK_ITEM_NOTES_SORT_ORDER_KEY, +} from '~/work_items/constants'; + +export default { + i18n: { + activityLabel: s__('WorkItem|Activity'), + }, + components: { + WorkItemActivitySortFilter, + }, + props: { + disableActivityFilterSort: { + type: Boolean, + required: true, + }, + sortOrder: { + type: String, + default: ASC, + required: false, + }, + workItemType: { + type: String, + required: true, + }, + discussionFilter: { + type: String, + default: WORK_ITEM_NOTES_FILTER_ALL_NOTES, + required: false, + }, + }, + methods: { + changeNotesSortOrder(direction) { + this.$emit('changeSort', direction); + }, + filterDiscussions(filterValue) { + this.$emit('changeFilter', filterValue); + }, + }, + WORK_ITEM_ACTIVITY_FILTER_OPTIONS, + WORK_ITEM_NOTES_FILTER_KEY, + WORK_ITEM_NOTES_FILTER_ALL_NOTES, + WORK_ITEM_ACTIVITY_SORT_OPTIONS, + WORK_ITEM_NOTES_SORT_ORDER_KEY, + ASC, +}; +</script> + +<template> + <div + class="gl-display-flex gl-justify-content-space-between gl-flex-wrap gl-pb-3 gl-align-items-center" + > + <h3 class="gl-font-base gl-m-0">{{ $options.i18n.activityLabel }}</h3> + <div class="gl-display-flex gl-gap-3"> + <work-item-activity-sort-filter + :work-item-type="workItemType" + :loading="disableActivityFilterSort" + :sort-filter-prop="discussionFilter" + :filter-options="$options.WORK_ITEM_ACTIVITY_FILTER_OPTIONS" + :storage-key="$options.WORK_ITEM_NOTES_FILTER_KEY" + :default-sort-filter-prop="$options.WORK_ITEM_NOTES_FILTER_ALL_NOTES" + tracking-action="work_item_notes_filter_changed" + tracking-label="item_track_notes_filtering" + filter-event="changeFilter" + data-testid="work-item-filter" + @changeFilter="filterDiscussions" + /> + <work-item-activity-sort-filter + :work-item-type="workItemType" + :loading="disableActivityFilterSort" + :sort-filter-prop="sortOrder" + :filter-options="$options.WORK_ITEM_ACTIVITY_SORT_OPTIONS" + :storage-key="$options.WORK_ITEM_NOTES_SORT_ORDER_KEY" + :default-sort-filter-prop="$options.ASC" + tracking-action="work_item_notes_sort_order_changed" + tracking-label="item_track_notes_sorting" + filter-event="changeSort" + data-testid="work-item-sort" + @changeSort="changeNotesSortOrder" + /> + </div> + </div> +</template> diff --git a/app/assets/javascripts/work_items/components/widget_wrapper.vue b/app/assets/javascripts/work_items/components/widget_wrapper.vue index 355f17e970b..db36b4e1bbe 100644 --- a/app/assets/javascripts/work_items/components/widget_wrapper.vue +++ b/app/assets/javascripts/work_items/components/widget_wrapper.vue @@ -44,8 +44,10 @@ export default { <template> <div class="gl-rounded-base gl-border-1 gl-border-solid gl-border-gray-100 gl-bg-gray-10 gl-mt-4"> <div - class="gl-px-5 gl-py-3 gl-display-flex gl-justify-content-space-between" - :class="{ 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100': isOpen }" + class="gl-pl-5 gl-pr-4 gl-py-4 gl-display-flex gl-justify-content-space-between gl-bg-white gl-rounded-base" + :class="{ + 'gl-border-b-1 gl-border-b-solid gl-border-b-gray-100 gl-rounded-bottom-left-none! gl-rounded-bottom-right-none!': isOpen, + }" > <div class="gl-display-flex gl-flex-grow-1"> <h5 class="gl-m-0 gl-line-height-24"> @@ -71,7 +73,7 @@ export default { <div v-if="isOpen" class="gl-bg-gray-10 gl-rounded-bottom-left-base gl-rounded-bottom-right-base" - :class="{ 'gl-p-5 gl-pb-3': !error }" + :class="{ 'gl-p-3': !error }" data-testid="widget-body" > <slot name="body"></slot> diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index 9f9d94ec3c2..3c56b627673 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -115,6 +115,7 @@ export default { v-if="canDelete" v-gl-modal="'work-item-confirm-delete'" data-testid="delete-action" + variant="danger" >{{ i18n.deleteWorkItem }}</gl-dropdown-item > </gl-dropdown> diff --git a/app/assets/javascripts/work_items/components/work_item_assignees.vue b/app/assets/javascripts/work_items/components/work_item_assignees.vue index fc4c05d96b2..95527dda1d4 100644 --- a/app/assets/javascripts/work_items/components/work_item_assignees.vue +++ b/app/assets/javascripts/work_items/components/work_item_assignees.vue @@ -298,7 +298,7 @@ export default { <div class="form-row gl-mb-5 work-item-assignees gl-relative gl-flex-nowrap"> <span :id="assigneesTitleId" - class="gl-font-weight-bold col-lg-2 col-3 gl-pt-2 min-w-fit-content gl-overflow-wrap-break" + class="gl-font-weight-bold gl-mt-2 col-lg-2 col-3 gl-pt-2 min-w-fit-content gl-overflow-wrap-break" data-testid="assignees-title" >{{ assigneeText }}</span > diff --git a/app/assets/javascripts/work_items/components/work_item_description.vue b/app/assets/javascripts/work_items/components/work_item_description.vue index 399c220bc96..ddfaa376028 100644 --- a/app/assets/javascripts/work_items/components/work_item_description.vue +++ b/app/assets/javascripts/work_items/components/work_item_description.vue @@ -255,7 +255,6 @@ export default { enable-autocomplete supports-quick-actions init-on-autofocus - use-bottom-toolbar @input="setDescriptionText" @keydown.meta.enter="updateWorkItem" @keydown.ctrl.enter="updateWorkItem" diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue index 262c093a1d0..ad7a54aaf16 100644 --- a/app/assets/javascripts/work_items/components/work_item_detail.vue +++ b/app/assets/javascripts/work_items/components/work_item_detail.vue @@ -215,6 +215,9 @@ export default { workItemType() { return this.workItem.workItemType?.name; }, + workItemBreadcrumbReference() { + return this.workItemType ? `${this.workItemType} #${this.workItem.iid}` : ''; + }, canUpdate() { return this.workItem?.userPermissions?.updateWorkItem; }, @@ -245,6 +248,9 @@ export default { parentWorkItemConfidentiality() { return this.parentWorkItem?.confidential; }, + parentWorkItemReference() { + return this.parentWorkItem ? `${this.parentWorkItem.title} #${this.parentWorkItem.iid}` : ''; + }, parentUrl() { // Once more types are moved to have Work Items involved // we need to handle this properly. @@ -293,10 +299,7 @@ export default { return this.isWidgetPresent(WIDGET_TYPE_NOTES); }, fetchByIid() { - return ( - (this.glFeatures.useIidInWorkItemsPath && parseBoolean(getParameterByName('iid_path'))) || - false - ); + return parseBoolean(getParameterByName('iid_path')); }, queryVariables() { return this.fetchByIid @@ -314,6 +317,11 @@ export default { ); return widgetHierarchy.children.nodes; }, + workItemBodyClass() { + return { + 'gl-pt-5': !this.updateError && !this.isModal, + }; + }, }, mounted() { if (this.modalWorkItemId || this.modalWorkItemIid) { @@ -445,6 +453,9 @@ export default { Sentry.captureException(error); } }, + updateHasNotes() { + this.$emit('has-notes'); + }, updateUrl(modalWorkItem) { const params = this.fetchByIid ? { work_item_iid: modalWorkItem?.iid } @@ -480,221 +491,217 @@ export default { </script> <template> - <section class="gl-pt-5"> - <gl-alert - v-if="updateError" - class="gl-mb-3" - variant="danger" - @dismiss="updateError = undefined" - > - {{ updateError }} - </gl-alert> - - <div v-if="workItemLoading" class="gl-max-w-26 gl-py-5"> - <gl-skeleton-loader :height="65" :width="240"> - <rect width="240" height="20" x="5" y="0" rx="4" /> - <rect width="100" height="20" x="5" y="45" rx="4" /> - </gl-skeleton-loader> - </div> - <template v-else> - <div class="gl-display-flex gl-align-items-center" data-testid="work-item-body"> - <ul - v-if="parentWorkItem" - class="list-unstyled gl-display-flex gl-mr-auto gl-max-w-26 gl-md-max-w-50p gl-min-w-0 gl-mb-0 gl-z-index-0" - data-testid="work-item-parent" - > - <li class="gl-ml-n4 gl-display-flex gl-align-items-center gl-overflow-hidden"> - <gl-button - v-gl-tooltip.hover - class="gl-text-truncate gl-max-w-full" - :icon="parentWorkItemIconName" - category="tertiary" - :href="parentUrl" - :title="parentWorkItem.title" - @click="openInModal($event, parentWorkItem)" - >{{ parentWorkItem.title }}</gl-button + <section> + <section v-if="updateError" class="flash-container flash-container-page sticky"> + <gl-alert class="gl-mb-3" variant="danger" @dismiss="updateError = undefined"> + {{ updateError }} + </gl-alert> + </section> + <section :class="workItemBodyClass"> + <div v-if="workItemLoading" class="gl-max-w-26 gl-py-5"> + <gl-skeleton-loader :height="65" :width="240"> + <rect width="240" height="20" x="5" y="0" rx="4" /> + <rect width="100" height="20" x="5" y="45" rx="4" /> + </gl-skeleton-loader> + </div> + <template v-else> + <div class="gl-display-flex gl-align-items-center" data-testid="work-item-body"> + <ul + v-if="parentWorkItem" + class="list-unstyled gl-display-flex gl-mr-auto gl-max-w-26 gl-md-max-w-50p gl-min-w-0 gl-mb-0 gl-z-index-0" + data-testid="work-item-parent" + > + <li class="gl-ml-n4 gl-display-flex gl-align-items-center gl-overflow-hidden"> + <gl-button + v-gl-tooltip.hover + class="gl-text-truncate gl-max-w-full" + :icon="parentWorkItemIconName" + category="tertiary" + :href="parentUrl" + :title="parentWorkItemReference" + @click="openInModal($event, parentWorkItem)" + >{{ parentWorkItemReference }}</gl-button + > + <gl-icon name="chevron-right" :size="16" class="gl-flex-shrink-0" /> + </li> + <li + class="gl-px-4 gl-py-3 gl-line-height-0 gl-display-flex gl-align-items-center gl-overflow-hidden gl-flex-shrink-0" > - <gl-icon name="chevron-right" :size="16" class="gl-flex-shrink-0" /> - </li> - <li - class="gl-px-4 gl-py-3 gl-line-height-0 gl-display-flex gl-align-items-center gl-overflow-hidden gl-flex-shrink-0" + <work-item-type-icon + :work-item-icon-name="workItemIconName" + :work-item-type="workItemType && workItemType.toUpperCase()" + /> + {{ workItemBreadcrumbReference }} + </li> + </ul> + <work-item-type-icon + v-else-if="!error" + :work-item-icon-name="workItemIconName" + :work-item-type="workItemType && workItemType.toUpperCase()" + show-text + class="gl-font-weight-bold gl-text-secondary gl-mr-auto" + data-testid="work-item-type" + /> + <gl-loading-icon v-if="updateInProgress" :inline="true" class="gl-mr-3" /> + <gl-badge + v-if="workItem.confidential" + v-gl-tooltip.bottom + :title="confidentialTooltip" + variant="warning" + icon="eye-slash" + class="gl-mr-3 gl-cursor-help" + >{{ __('Confidential') }}</gl-badge > - <work-item-type-icon - :work-item-icon-name="workItemIconName" - :work-item-type="workItemType && workItemType.toUpperCase()" - /> - {{ workItemType }} - </li> - </ul> - <work-item-type-icon - v-else-if="!error" - :work-item-icon-name="workItemIconName" - :work-item-type="workItemType && workItemType.toUpperCase()" - show-text - class="gl-font-weight-bold gl-text-secondary gl-mr-auto" - data-testid="work-item-type" + <work-item-actions + v-if="canUpdate || canDelete" + :work-item-id="workItem.id" + :work-item-type="workItemType" + :can-delete="canDelete" + :can-update="canUpdate" + :is-confidential="workItem.confidential" + :is-parent-confidential="parentWorkItemConfidentiality" + @deleteWorkItem="$emit('deleteWorkItem', { workItemType, workItemId: workItem.id })" + @toggleWorkItemConfidentiality="toggleConfidentiality" + @error="updateError = $event" + /> + <gl-button + v-if="isModal" + category="tertiary" + data-testid="work-item-close" + icon="close" + :aria-label="__('Close')" + @click="$emit('close')" + /> + </div> + <work-item-title + v-if="workItem.title" + :work-item-id="workItem.id" + :work-item-title="workItem.title" + :work-item-type="workItemType" + :work-item-parent-id="workItemParentId" + :can-update="canUpdate" + @error="updateError = $event" + /> + <work-item-created-updated + :work-item-id="workItem.id" + :work-item-iid="workItemIid" + :full-path="fullPath" + :fetch-by-iid="fetchByIid" + /> + <work-item-state + :work-item="workItem" + :work-item-parent-id="workItemParentId" + :can-update="canUpdate" + @error="updateError = $event" /> - <gl-loading-icon v-if="updateInProgress" :inline="true" class="gl-mr-3" /> - <gl-badge - v-if="workItem.confidential" - v-gl-tooltip.bottom - :title="confidentialTooltip" - variant="warning" - icon="eye-slash" - class="gl-mr-3 gl-cursor-help" - >{{ __('Confidential') }}</gl-badge - > - <work-item-actions - v-if="canUpdate || canDelete" + <work-item-assignees + v-if="workItemAssignees" + :can-update="canUpdate" :work-item-id="workItem.id" + :assignees="workItemAssignees.assignees.nodes" + :allows-multiple-assignees="workItemAssignees.allowsMultipleAssignees" :work-item-type="workItemType" - :can-delete="canDelete" + :can-invite-members="workItemAssignees.canInviteMembers" + :full-path="fullPath" + @error="updateError = $event" + /> + <work-item-labels + v-if="workItemLabels" + :work-item-id="workItem.id" :can-update="canUpdate" - :is-confidential="workItem.confidential" - :is-parent-confidential="parentWorkItemConfidentiality" - @deleteWorkItem="$emit('deleteWorkItem', { workItemType, workItemId: workItem.id })" - @toggleWorkItemConfidentiality="toggleConfidentiality" + :full-path="fullPath" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" @error="updateError = $event" /> - <gl-button - v-if="isModal" - category="tertiary" - data-testid="work-item-close" - icon="close" - :aria-label="__('Close')" - @click="$emit('close')" + <work-item-due-date + v-if="workItemDueDate" + :can-update="canUpdate" + :due-date="workItemDueDate.dueDate" + :start-date="workItemDueDate.startDate" + :work-item-id="workItem.id" + :work-item-type="workItemType" + @error="updateError = $event" + /> + <work-item-milestone + v-if="workItemMilestone" + :work-item-id="workItem.id" + :work-item-milestone="workItemMilestone.milestone" + :work-item-type="workItemType" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + :can-update="canUpdate" + :full-path="fullPath" + @error="updateError = $event" + /> + <work-item-weight + v-if="workItemWeight" + class="gl-mb-5" + :can-update="canUpdate" + :weight="workItemWeight.weight" + :work-item-id="workItem.id" + :work-item-type="workItemType" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + @error="updateError = $event" + /> + <work-item-progress + v-if="workItemProgress" + class="gl-mb-5" + :can-update="canUpdate" + :progress="workItemProgress.progress" + :work-item-id="workItem.id" + :work-item-type="workItemType" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + @error="updateError = $event" + /> + <work-item-iteration + v-if="workItemIteration" + class="gl-mb-5" + :iteration="workItemIteration.iteration" + :can-update="canUpdate" + :work-item-id="workItem.id" + :work-item-type="workItemType" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + :full-path="fullPath" + @error="updateError = $event" + /> + <work-item-health-status + v-if="workItemHealthStatus" + class="gl-mb-5" + :health-status="workItemHealthStatus.healthStatus" + :can-update="canUpdate" + :work-item-id="workItem.id" + :work-item-type="workItemType" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + :full-path="fullPath" + @error="updateError = $event" + /> + <work-item-description + v-if="hasDescriptionWidget" + :work-item-id="workItem.id" + :full-path="fullPath" + :fetch-by-iid="fetchByIid" + :query-variables="queryVariables" + class="gl-pt-5" + @error="updateError = $event" + /> + <work-item-tree + v-if="workItemType === $options.WORK_ITEM_TYPE_VALUE_OBJECTIVE" + :work-item-type="workItemType" + :parent-work-item-type="workItem.workItemType.name" + :work-item-id="workItem.id" + :children="children" + :can-update="canUpdate" + :project-path="fullPath" + :confidential="workItem.confidential" + @addWorkItemChild="addChild" + @removeChild="removeChild" + @show-modal="openInModal" /> - </div> - <work-item-title - v-if="workItem.title" - :work-item-id="workItem.id" - :work-item-title="workItem.title" - :work-item-type="workItemType" - :work-item-parent-id="workItemParentId" - :can-update="canUpdate" - @error="updateError = $event" - /> - <work-item-created-updated - :work-item-id="workItem.id" - :work-item-iid="workItemIid" - :full-path="fullPath" - :fetch-by-iid="fetchByIid" - /> - <work-item-state - :work-item="workItem" - :work-item-parent-id="workItemParentId" - :can-update="canUpdate" - @error="updateError = $event" - /> - <work-item-assignees - v-if="workItemAssignees" - :can-update="canUpdate" - :work-item-id="workItem.id" - :assignees="workItemAssignees.assignees.nodes" - :allows-multiple-assignees="workItemAssignees.allowsMultipleAssignees" - :work-item-type="workItemType" - :can-invite-members="workItemAssignees.canInviteMembers" - :full-path="fullPath" - @error="updateError = $event" - /> - <work-item-labels - v-if="workItemLabels" - :work-item-id="workItem.id" - :can-update="canUpdate" - :full-path="fullPath" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - @error="updateError = $event" - /> - <work-item-due-date - v-if="workItemDueDate" - :can-update="canUpdate" - :due-date="workItemDueDate.dueDate" - :start-date="workItemDueDate.startDate" - :work-item-id="workItem.id" - :work-item-type="workItemType" - @error="updateError = $event" - /> - <work-item-milestone - v-if="workItemMilestone" - :work-item-id="workItem.id" - :work-item-milestone="workItemMilestone.milestone" - :work-item-type="workItemType" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - :can-update="canUpdate" - :full-path="fullPath" - @error="updateError = $event" - /> - <work-item-weight - v-if="workItemWeight" - class="gl-mb-5" - :can-update="canUpdate" - :weight="workItemWeight.weight" - :work-item-id="workItem.id" - :work-item-type="workItemType" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - @error="updateError = $event" - /> - <work-item-progress - v-if="workItemProgress" - class="gl-mb-5" - :can-update="canUpdate" - :progress="workItemProgress.progress" - :work-item-id="workItem.id" - :work-item-type="workItemType" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - @error="updateError = $event" - /> - <work-item-iteration - v-if="workItemIteration" - class="gl-mb-5" - :iteration="workItemIteration.iteration" - :can-update="canUpdate" - :work-item-id="workItem.id" - :work-item-type="workItemType" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - :full-path="fullPath" - @error="updateError = $event" - /> - <work-item-health-status - v-if="workItemHealthStatus" - class="gl-mb-5" - :health-status="workItemHealthStatus.healthStatus" - :can-update="canUpdate" - :work-item-id="workItem.id" - :work-item-type="workItemType" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - :full-path="fullPath" - @error="updateError = $event" - /> - <work-item-description - v-if="hasDescriptionWidget" - :work-item-id="workItem.id" - :full-path="fullPath" - :fetch-by-iid="fetchByIid" - :query-variables="queryVariables" - class="gl-pt-5" - @error="updateError = $event" - /> - <work-item-tree - v-if="workItemType === $options.WORK_ITEM_TYPE_VALUE_OBJECTIVE" - :work-item-type="workItemType" - :parent-work-item-type="workItem.workItemType.name" - :work-item-id="workItem.id" - :children="children" - :can-update="canUpdate" - :project-path="fullPath" - :confidential="workItem.confidential" - @addWorkItemChild="addChild" - @removeChild="removeChild" - @show-modal="openInModal" - /> - <template v-if="workItemsMvcEnabled"> <work-item-notes v-if="workItemNotes" :work-item-id="workItem.id" @@ -705,21 +712,21 @@ export default { class="gl-pt-5" @error="updateError = $event" /> + <gl-empty-state + v-if="error" + :title="$options.i18n.fetchErrorTitle" + :description="error" + :svg-path="noAccessSvgPath" + /> </template> - <gl-empty-state - v-if="error" - :title="$options.i18n.fetchErrorTitle" - :description="error" - :svg-path="noAccessSvgPath" + <work-item-detail-modal + v-if="!isModal" + ref="modal" + :work-item-id="modalWorkItemId" + :work-item-iid="modalWorkItemIid" + :show="true" + @close="updateUrl" /> - </template> - <work-item-detail-modal - v-if="!isModal" - ref="modal" - :work-item-id="modalWorkItemId" - :work-item-iid="modalWorkItemIid" - :show="true" - @close="updateUrl" - /> + </section> </section> </template> diff --git a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue index 1b8e97bf717..730bdb4e7c7 100644 --- a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue +++ b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue @@ -1,10 +1,12 @@ <script> import { GlAlert, GlModal } from '@gitlab/ui'; import { s__ } from '~/locale'; +import { scrollToTargetOnResize } from '~/lib/utils/resize_observer'; import deleteWorkItemFromTaskMutation from '../graphql/delete_task_from_work_item.mutation.graphql'; import deleteWorkItemMutation from '../graphql/delete_work_item.mutation.graphql'; export default { + WORK_ITEM_DETAIL_MODAL_ID: 'work-item-detail-modal', i18n: { errorMessage: s__('WorkItem|Something went wrong when deleting the task. Please try again.'), }, @@ -51,6 +53,8 @@ export default { error: undefined, updatedWorkItemId: null, updatedWorkItemIid: null, + isModalShown: false, + hasNotes: false, }; }, computed: { @@ -61,6 +65,13 @@ export default { return this.updatedWorkItemIid || this.workItemIid; }, }, + watch: { + hasNotes(newVal) { + if (newVal && this.isModalShown) { + scrollToTargetOnResize({ containerId: this.$options.WORK_ITEM_DETAIL_MODAL_ID }); + } + }, + }, methods: { deleteWorkItem() { if (this.lockVersion != null && this.lineNumberStart && this.lineNumberEnd) { @@ -128,6 +139,7 @@ export default { this.updatedWorkItemId = null; this.updatedWorkItemIid = null; this.error = ''; + this.isModalShown = false; this.$emit('close'); }, hide() { @@ -144,6 +156,12 @@ export default { this.updatedWorkItemIid = workItem.iid; this.$emit('update-modal', $event, workItem); }, + onModalShow() { + this.isModalShown = true; + }, + updateHasNotes() { + this.hasNotes = true; + }, }, }; </script> @@ -151,13 +169,15 @@ export default { <template> <gl-modal ref="modal" + static hide-footer size="lg" - modal-id="work-item-detail-modal" + :modal-id="$options.WORK_ITEM_DETAIL_MODAL_ID" header-class="gl-p-0 gl-pb-2!" scrollable - data-testid="work-item-detail-modal" + :data-testid="$options.WORK_ITEM_DETAIL_MODAL_ID" @hide="closeModal" + @shown="onModalShow" > <gl-alert v-if="error" variant="danger" @dismiss="error = false"> {{ error }} @@ -172,6 +192,7 @@ export default { @close="hide" @deleteWorkItem="deleteWorkItem" @update-modal="updateModal" + @has-notes="updateHasNotes" /> </gl-modal> </template> diff --git a/app/assets/javascripts/work_items/components/work_item_due_date.vue b/app/assets/javascripts/work_items/components/work_item_due_date.vue index 03c5b7096b2..3e546598dc2 100644 --- a/app/assets/javascripts/work_items/components/work_item_due_date.vue +++ b/app/assets/javascripts/work_items/components/work_item_due_date.vue @@ -223,7 +223,12 @@ export default { @clear="clearStartDatePicker" @close="handleStartDateInput" /> - <gl-button v-if="showStartDateButton" category="tertiary" @click="clickShowStartDate"> + <gl-button + v-if="showStartDateButton" + category="tertiary" + class="gl-text-gray-500!" + @click="clickShowStartDate" + > {{ $options.i18n.addStartDate }} </gl-button> </gl-form-group> @@ -250,7 +255,12 @@ export default { @clear="clearDueDatePicker" @close="updateDates" /> - <gl-button v-if="showDueDateButton" category="tertiary" @click="clickShowDueDate"> + <gl-button + v-if="showDueDateButton" + category="tertiary" + class="gl-text-gray-500!" + @click="clickShowDueDate" + > {{ $options.i18n.addDueDate }} </gl-button> </gl-form-group> diff --git a/app/assets/javascripts/work_items/components/work_item_links/index.js b/app/assets/javascripts/work_items/components/work_item_links/index.js index a7405b6d86c..6b097f6b1ed 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/index.js +++ b/app/assets/javascripts/work_items/components/work_item_links/index.js @@ -15,7 +15,6 @@ export default function initWorkItemLinks() { const { projectPath, wiHasIssueWeightsFeature, - iid, wiHasIterationsFeature, wiHasIssuableHealthStatusFeature, registerPath, @@ -32,7 +31,6 @@ export default function initWorkItemLinks() { }, provide: { projectPath, - iid, fullPath: projectPath, hasIssueWeightsFeature: wiHasIssueWeightsFeature, hasIterationsFeature: wiHasIterationsFeature, diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue index 3a3a846bce5..d119cdc2785 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue @@ -2,8 +2,7 @@ import { GlButton, GlLink, GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { __, s__ } from '~/locale'; -import { createAlert } from '~/flash'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { createAlert } from '~/alert'; import RichTimestampTooltip from '~/vue_shared/components/rich_timestamp_tooltip.vue'; import WorkItemLinkChildMetadata from 'ee_else_ce/work_items/components/work_item_links/work_item_link_child_metadata.vue'; @@ -110,7 +109,9 @@ export default { return this.isItemOpen ? __('Created') : __('Closed'); }, childPath() { - return `/${this.projectPath}/-/work_items/${getIdFromGraphQLId(this.childItem.id)}`; + return `${gon?.relative_url_root || ''}/${this.projectPath}/-/work_items/${ + this.childItem.iid + }?iid_path=true`; }, hasChildren() { return this.getWidgetByType(this.childItem, WIDGET_TYPE_HIERARCHY)?.hasChildren; @@ -172,7 +173,7 @@ export default { <template> <div> <div - class="gl-display-flex gl-align-items-flex-start gl-mb-3" + class="gl-display-flex gl-align-items-flex-start" :class="{ 'gl-ml-6': canHaveChildren && !hasChildren && hasIndirectChildren }" > <gl-button @@ -182,18 +183,20 @@ export default { :aria-label="chevronTooltip" :icon="chevronType" category="tertiary" + size="small" :loading="isLoadingChildren" class="gl-px-0! gl-py-3! gl-mr-3" data-testid="expand-child" @click="toggleItem" /> <div - class="gl-relative gl-display-flex gl-flex-grow-1 gl-overflow-break-word gl-min-w-0 gl-bg-white gl-py-3 gl-px-4 gl-border gl-border-gray-100 gl-rounded-base gl-line-height-32" + class="work-item-link-child gl-relative gl-display-flex gl-flex-grow-1 gl-overflow-break-word gl-min-w-0 gl-pl-3 gl-pr-2 gl-rounded-base" + :class="[hasMetadata ? 'gl-py-3' : 'gl-py-0']" data-testid="links-child" > <span :id="`stateIcon-${childItem.id}`" - class="gl-mr-3" + class="gl-cursor-help gl-mr-3 gl-line-height-32" :class="{ 'gl-display-flex': hasMetadata }" data-testid="item-status-icon" > @@ -240,7 +243,7 @@ export default { <work-item-link-child-metadata v-if="hasMetadata" :metadata-widgets="metadataWidgets" - class="gl-mt-3" + class="gl-mt-1" /> </div> <div diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child_metadata.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child_metadata.vue index 6974804523a..80802cb3858 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child_metadata.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child_metadata.vue @@ -70,7 +70,7 @@ export default { <item-milestone v-if="milestone" :milestone="milestone" - class="gl-display-flex gl-align-items-center gl-mr-5 gl-max-w-15 gl-text-secondary! gl-cursor-help! gl-text-decoration-none!" + class="gl-display-flex gl-align-items-center gl-mr-5 gl-max-w-15 gl-line-height-normal gl-text-secondary! gl-cursor-help! gl-text-decoration-none!" /> <gl-avatars-inline v-if="assignees.length" @@ -97,7 +97,7 @@ export default { :background-color="label.color" :description="label.description" :scoped="showScopedLabel(label)" - class="gl-mt-3 gl-sm-mt-0 gl-mr-2 gl-mb-auto gl-label-sm" + class="gl-my-2 gl-mr-2 gl-mb-auto gl-label-sm" tooltip-placement="top" /> </div> diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue index e8578a6d49a..8f0e429234f 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue @@ -4,7 +4,7 @@ import { isEmpty } from 'lodash'; import { s__ } from '~/locale'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; -import { TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; +import { TYPENAME_ISSUE, TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import getIssueDetailsQuery from 'ee_else_ce/work_items/graphql/get_issue_details.query.graphql'; import { isMetaKey, parseBoolean } from '~/lib/utils/common_utils'; @@ -42,7 +42,7 @@ export default { GlTooltip: GlTooltipDirective, }, mixins: [glFeatureFlagMixin()], - inject: ['projectPath', 'iid'], + inject: ['projectPath'], props: { workItemId: { type: String, @@ -63,6 +63,9 @@ export default { id: this.issuableGid, }; }, + context: { + isSingleRequest: true, + }, skip() { return !this.issuableId; }, @@ -86,13 +89,10 @@ export default { query: getIssueDetailsQuery, variables() { return { - fullPath: this.projectPath, - iid: String(this.iid), + id: convertToGraphQLId(TYPENAME_ISSUE, this.issuableId), }; }, - update(data) { - return data.workspace?.issuable; - }, + update: (data) => data.issue, }, }, data() { @@ -143,7 +143,7 @@ export default { return this.isLoading && this.children.length === 0 ? '...' : this.children.length; }, fetchByIid() { - return this.glFeatures.useIidInWorkItemsPath && parseBoolean(getParameterByName('iid_path')); + return parseBoolean(getParameterByName('iid_path')); }, childUrlParams() { const params = {}; @@ -304,10 +304,10 @@ export default { <template #header>{{ $options.i18n.title }}</template> <template #header-suffix> <span - class="gl-display-inline-flex gl-align-items-center gl-line-height-24 gl-ml-3" + class="gl-display-inline-flex gl-align-items-center gl-line-height-24 gl-ml-3 gl-font-weight-bold gl-text-gray-500" data-testid="children-count" > - <gl-icon :name="$options.WIDGET_TYPE_TASK_ICON" class="gl-mr-2 gl-text-secondary" /> + <gl-icon :name="$options.WIDGET_TYPE_TASK_ICON" class="gl-mr-2" /> {{ childrenCountLabel }} </span> </template> @@ -334,11 +334,11 @@ export default { </gl-dropdown> </template> <template #body> - <gl-loading-icon v-if="isLoading" color="dark" class="gl-my-3" /> + <gl-loading-icon v-if="isLoading" color="dark" class="gl-my-2" /> <template v-else> <div v-if="isChildrenEmpty && !isShownAddForm && !error" data-testid="links-empty"> - <p class="gl-mb-3"> + <p class="gl-px-3 gl-py-2 gl-mb-0 gl-text-gray-500"> {{ $options.i18n.emptyStateMessage }} </p> </div> diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue index 5169a77dd33..af475496075 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue @@ -340,7 +340,7 @@ export default { <template> <gl-form - class="gl-bg-white gl-mb-3 gl-p-4 gl-border gl-border-gray-100 gl-rounded-base" + class="gl-bg-white gl-mt-1 gl-mb-3 gl-p-4 gl-border gl-border-gray-100 gl-rounded-base" @submit.prevent="addOrCreateMethod" > <gl-alert v-if="error" variant="danger" class="gl-mb-3" @dismiss="unsetError"> diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_menu.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_menu.vue index 1aa4a433a58..fb3ed7af736 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_menu.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_menu.vue @@ -11,8 +11,8 @@ export default { </script> <template> - <span class="gl-ml-2"> - <gl-dropdown category="tertiary" toggle-class="btn-icon" :right="true"> + <span class="gl-ml-5"> + <gl-dropdown category="tertiary" toggle-class="btn-icon btn-sm" :right="true"> <template #button-content> <gl-icon name="ellipsis_v" :size="14" /> </template> diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue index aa12df424f1..97eaf2c0422 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue @@ -78,7 +78,7 @@ export default { }, computed: { fetchByIid() { - return this.glFeatures.useIidInWorkItemsPath && parseBoolean(getParameterByName('iid_path')); + return parseBoolean(getParameterByName('iid_path')); }, childrenIds() { return this.children.map((c) => c.id); diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree_children.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree_children.vue index 71de6867680..e233a2219fa 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree_children.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree_children.vue @@ -1,5 +1,5 @@ <script> -import { createAlert } from '~/flash'; +import { createAlert } from '~/alert'; import { s__ } from '~/locale'; import updateWorkItemMutation from '../../graphql/update_work_item.mutation.graphql'; diff --git a/app/assets/javascripts/work_items/components/work_item_milestone.vue b/app/assets/javascripts/work_items/components/work_item_milestone.vue index 6ed230b8ad4..e75a429ebec 100644 --- a/app/assets/javascripts/work_items/components/work_item_milestone.vue +++ b/app/assets/javascripts/work_items/components/work_item_milestone.vue @@ -234,6 +234,7 @@ export default { <gl-dropdown v-else id="milestone-value" + data-testid="work-item-milestone-dropdown" class="gl-pl-0 gl-max-w-full" :toggle-class="dropdownClasses" :text="dropdownText" diff --git a/app/assets/javascripts/work_items/components/work_item_notes.vue b/app/assets/javascripts/work_items/components/work_item_notes.vue index 02b94c5331c..4ca8054fa5f 100644 --- a/app/assets/javascripts/work_items/components/work_item_notes.vue +++ b/app/assets/javascripts/work_items/components/work_item_notes.vue @@ -1,21 +1,34 @@ <script> import { GlSkeletonLoader, GlModal } from '@gitlab/ui'; import * as Sentry from '@sentry/browser'; -import { s__, __ } from '~/locale'; +import { __ } from '~/locale'; +import { scrollToTargetOnResize } from '~/lib/utils/resize_observer'; import { TYPENAME_DISCUSSION, TYPENAME_NOTE } from '~/graphql_shared/constants'; import SystemNote from '~/work_items/components/notes/system_note.vue'; -import ActivityFilter from '~/work_items/components/notes/activity_filter.vue'; -import { i18n, DEFAULT_PAGE_SIZE_NOTES } from '~/work_items/constants'; +import WorkItemNotesActivityHeader from '~/work_items/components/notes/work_item_notes_activity_header.vue'; +import { + i18n, + DEFAULT_PAGE_SIZE_NOTES, + WORK_ITEM_NOTES_FILTER_ALL_NOTES, + WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS, + WORK_ITEM_NOTES_FILTER_ONLY_HISTORY, +} from '~/work_items/constants'; import { ASC, DESC } from '~/notes/constants'; import { getWorkItemNotesQuery } from '~/work_items/utils'; +import { + updateCacheAfterCreatingNote, + updateCacheAfterDeletingNote, +} from '~/work_items/graphql/cache_utils'; +import { getLocationHash } from '~/lib/utils/url_utility'; import WorkItemDiscussion from '~/work_items/components/notes/work_item_discussion.vue'; +import WorkItemHistoryOnlyFilterNote from '~/work_items/components/notes/work_item_history_only_filter_note.vue'; +import workItemNoteCreatedSubscription from '~/work_items/graphql/notes/work_item_note_created.subscription.graphql'; +import workItemNoteUpdatedSubscription from '~/work_items/graphql/notes/work_item_note_updated.subscription.graphql'; +import workItemNoteDeletedSubscription from '~/work_items/graphql/notes/work_item_note_deleted.subscription.graphql'; import deleteNoteMutation from '../graphql/notes/delete_work_item_notes.mutation.graphql'; import WorkItemAddNote from './notes/work_item_add_note.vue'; export default { - i18n: { - ACTIVITY_LABEL: s__('WorkItem|Activity'), - }, loader: { repeat: 10, width: 1000, @@ -24,10 +37,11 @@ export default { components: { GlSkeletonLoader, GlModal, - ActivityFilter, SystemNote, WorkItemAddNote, WorkItemDiscussion, + WorkItemNotesActivityHeader, + WorkItemHistoryOnlyFilterNote, }, props: { workItemId: { @@ -51,6 +65,11 @@ export default { required: false, default: false, }, + isModal: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -58,6 +77,7 @@ export default { perPage: DEFAULT_PAGE_SIZE_NOTES, sortOrder: ASC, noteToDelete: null, + discussionFilter: WORK_ITEM_NOTES_FILTER_ALL_NOTES, }; }, computed: { @@ -76,7 +96,7 @@ export default { showLoadingMoreSkeleton() { return this.isLoadingMore && !this.changeNotesSortOrderAfterLoading; }, - disableActivityFilter() { + disableActivityFilterSort() { return this.initialLoading || this.isLoadingMore; }, formAtTop() { @@ -95,10 +115,30 @@ export default { notesArray() { const notes = this.workItemNotes?.nodes || []; + const visibleNotes = notes.filter((note) => { + const isSystemNote = this.isSystemNote(note); + + if (this.discussionFilter === WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS && isSystemNote) { + return false; + } + + if (this.discussionFilter === WORK_ITEM_NOTES_FILTER_ONLY_HISTORY && !isSystemNote) { + return false; + } + + return true; + }); + if (this.sortOrder === DESC) { - return [...notes].reverse(); + return [...visibleNotes].reverse(); } - return notes; + return visibleNotes; + }, + commentsDisabled() { + return this.discussionFilter === WORK_ITEM_NOTES_FILTER_ONLY_HISTORY; + }, + targetNoteHash() { + return getLocationHash(); }, }, apollo: { @@ -135,8 +175,55 @@ export default { if (this.hasNextPage) { this.fetchMoreNotes(); + } else if (this.targetNoteHash) { + if (this.isModal) { + this.$emit('has-notes'); + } else { + scrollToTargetOnResize(); + } } }, + subscribeToMore: [ + { + document: workItemNoteCreatedSubscription, + updateQuery(previousResult, { subscriptionData }) { + return updateCacheAfterCreatingNote(previousResult, subscriptionData, this.fetchByIid); + }, + variables() { + return { + noteableId: this.workItemId, + }; + }, + skip() { + return !this.workItemId || this.hasNextPage; + }, + }, + { + document: workItemNoteDeletedSubscription, + updateQuery(previousResult, { subscriptionData }) { + return updateCacheAfterDeletingNote(previousResult, subscriptionData, this.fetchByIid); + }, + variables() { + return { + noteableId: this.workItemId, + }; + }, + skip() { + return !this.workItemId || this.hasNextPage; + }, + }, + { + document: workItemNoteUpdatedSubscription, + variables() { + return { + noteableId: this.workItemId, + }; + }, + skip() { + return !this.workItemId; + }, + }, + ], }, }, methods: { @@ -162,6 +249,9 @@ export default { changeNotesSortOrder(direction) { this.sortOrder = direction; }, + filterDiscussions(filterValue) { + this.discussionFilter = filterValue; + }, async fetchMoreNotes() { this.isLoadingMore = true; // copied from discussions batch logic - every fetchMore call has a higher @@ -223,17 +313,14 @@ export default { <template> <div class="gl-border-t gl-mt-5 work-item-notes"> - <div class="gl-display-flex gl-justify-content-space-between gl-flex-wrap"> - <label class="gl-mb-0">{{ $options.i18n.ACTIVITY_LABEL }}</label> - <activity-filter - class="gl-min-h-5 gl-pb-3" - :loading="disableActivityFilter" - :sort-order="sortOrder" - :work-item-type="workItemType" - @changeSortOrder="changeNotesSortOrder" - @updateSavedSortOrder="changeNotesSortOrder" - /> - </div> + <work-item-notes-activity-header + :sort-order="sortOrder" + :disable-activity-filter-sort="disableActivityFilterSort" + :work-item-type="workItemType" + :discussion-filter="discussionFilter" + @changeSort="changeNotesSortOrder" + @changeFilter="filterDiscussions" + /> <div v-if="initialLoading" class="gl-mt-5"> <gl-skeleton-loader v-for="index in $options.loader.repeat" @@ -250,11 +337,10 @@ export default { <template v-if="!initialLoading"> <ul class="notes main-notes-list timeline gl-clearfix!"> <work-item-add-note - v-if="formAtTop" + v-if="formAtTop && !commentsDisabled" v-bind="workItemCommentFormProps" @error="$emit('error', $event)" /> - <template v-for="discussion in notesArray"> <system-note v-if="isSystemNote(discussion)" @@ -270,6 +356,7 @@ export default { :work-item-id="workItemId" :fetch-by-iid="fetchByIid" :work-item-type="workItemType" + :is-modal="isModal" @deleteNote="showDeleteNoteModal($event, discussion)" @error="$emit('error', $event)" /> @@ -277,10 +364,15 @@ export default { </template> <work-item-add-note - v-if="!formAtTop" + v-if="!formAtTop && !commentsDisabled" v-bind="workItemCommentFormProps" @error="$emit('error', $event)" /> + + <work-item-history-only-filter-note + v-if="commentsDisabled" + @changeFilter="filterDiscussions" + /> </ul> </template> diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js index 81f9bf04bc8..bbcf78e23aa 100644 --- a/app/assets/javascripts/work_items/constants.js +++ b/app/assets/javascripts/work_items/constants.js @@ -1,5 +1,6 @@ -import { s__, sprintf } from '~/locale'; +import { __, s__, sprintf } from '~/locale'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { ASC, DESC } from '~/notes/constants'; export const STATE_OPEN = 'OPEN'; export const STATE_CLOSED = 'CLOSED'; @@ -176,3 +177,31 @@ export const DEFAULT_PAGE_SIZE_ASSIGNEES = 10; export const DEFAULT_PAGE_SIZE_NOTES = 30; export const WORK_ITEM_NOTES_SORT_ORDER_KEY = 'sort_direction_work_item'; + +export const WORK_ITEM_NOTES_FILTER_ALL_NOTES = 'ALL_NOTES'; +export const WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS = 'ONLY_COMMENTS'; +export const WORK_ITEM_NOTES_FILTER_ONLY_HISTORY = 'ONLY_HISTORY'; + +export const WORK_ITEM_NOTES_FILTER_KEY = 'filter_key_work_item'; + +export const WORK_ITEM_ACTIVITY_FILTER_OPTIONS = [ + { + key: WORK_ITEM_NOTES_FILTER_ALL_NOTES, + text: s__('WorkItem|All activity'), + }, + { + key: WORK_ITEM_NOTES_FILTER_ONLY_COMMENTS, + text: s__('WorkItem|Comments only'), + testid: 'comments-activity', + }, + { + key: WORK_ITEM_NOTES_FILTER_ONLY_HISTORY, + text: s__('WorkItem|History only'), + testid: 'history-activity', + }, +]; + +export const WORK_ITEM_ACTIVITY_SORT_OPTIONS = [ + { key: DESC, text: __('Newest first'), testid: 'newest-first' }, + { key: ASC, text: __('Oldest first') }, +]; diff --git a/app/assets/javascripts/work_items/graphql/cache_utils.js b/app/assets/javascripts/work_items/graphql/cache_utils.js index 16b892b3476..95d68b69745 100644 --- a/app/assets/javascripts/work_items/graphql/cache_utils.js +++ b/app/assets/javascripts/work_items/graphql/cache_utils.js @@ -1,62 +1,100 @@ import { produce } from 'immer'; import { WIDGET_TYPE_NOTES } from '~/work_items/constants'; -import { getWorkItemNotesQuery } from '~/work_items/utils'; + +const isNotesWidget = (widget) => widget.type === WIDGET_TYPE_NOTES; + +const getNotesWidgetFromSourceData = (draftData, fetchByIid) => { + return fetchByIid + ? draftData.workspace.workItems.nodes[0].widgets.find(isNotesWidget) + : draftData.workItem.widgets.find(isNotesWidget); +}; + +const updateNotesWidgetDataInDraftData = (draftData, notesWidget, fetchByIid) => { + const noteWidgetIndex = fetchByIid + ? draftData.workspace.workItems.nodes[0].widgets.findIndex(isNotesWidget) + : draftData.workItem.widgets.findIndex(isNotesWidget); + + if (fetchByIid) { + draftData.workspace.workItems.nodes[0].widgets[noteWidgetIndex] = notesWidget; + } else { + draftData.workItem.widgets[noteWidgetIndex] = notesWidget; + } +}; /** - * Updates the cache manually when adding a main comment + * Work Item note create subscription update query callback * - * @param store - * @param createNoteData + * @param currentNotes + * @param subscriptionData * @param fetchByIid - * @param queryVariables - * @param sortOrder */ -export const updateCommentState = (store, { data: { createNote } }, fetchByIid, queryVariables) => { - const notesQuery = getWorkItemNotesQuery(fetchByIid); - const variables = { - ...queryVariables, - pageSize: 100, - }; - const sourceData = store.readQuery({ - query: notesQuery, - variables, + +export const updateCacheAfterCreatingNote = (currentNotes, subscriptionData, fetchByIid) => { + if (!subscriptionData.data?.workItemNoteCreated) { + return currentNotes; + } + const newNote = subscriptionData.data.workItemNoteCreated; + + return produce(currentNotes, (draftData) => { + const notesWidget = getNotesWidgetFromSourceData(draftData, fetchByIid); + + if (!notesWidget.discussions) { + return; + } + + const discussion = notesWidget.discussions.nodes.find((d) => d.id === newNote.discussion.id); + + // handle the case where discussion already exists - we don't need to do anything, update will happen automatically + if (discussion) { + return; + } + + notesWidget.discussions.nodes.push(newNote.discussion); + updateNotesWidgetDataInDraftData(draftData, notesWidget, fetchByIid); }); +}; + +/** + * Work Item note delete subscription update query callback + * + * @param currentNotes + * @param subscriptionData + * @param fetchByIid + */ - const finalData = produce(sourceData, (draftData) => { - const notesWidget = fetchByIid - ? draftData.workspace.workItems.nodes[0].widgets.find( - (widget) => widget.type === WIDGET_TYPE_NOTES, - ) - : draftData.workItem.widgets.find((widget) => widget.type === WIDGET_TYPE_NOTES); - - // as notes are currently sorted/reversed on the frontend rather than in the query - // we only ever push. - // const arrayPushMethod = sortOrder === ASC ? 'push' : 'unshift'; - const arrayPushMethod = 'push'; - - // manual update of cache with a completely new discussion - if (createNote.note.discussion.notes.nodes.length === 1) { - notesWidget.discussions.nodes[arrayPushMethod]({ - id: createNote.note.discussion.id, - notes: { - nodes: createNote.note.discussion.notes.nodes, - __typename: 'NoteConnection', - }, - // eslint-disable-next-line @gitlab/require-i18n-strings - __typename: 'Discussion', - }); +export const updateCacheAfterDeletingNote = (currentNotes, subscriptionData, fetchByIid) => { + if (!subscriptionData.data?.workItemNoteDeleted) { + return currentNotes; + } + const deletedNote = subscriptionData.data.workItemNoteDeleted; + const { id, discussionId, lastDiscussionNote } = deletedNote; + + return produce(currentNotes, (draftData) => { + const notesWidget = getNotesWidgetFromSourceData(draftData, fetchByIid); + + if (!notesWidget.discussions) { + return; + } + + const discussionIndex = notesWidget.discussions.nodes.findIndex( + (discussion) => discussion.id === discussionId, + ); + + if (discussionIndex === -1) { + return; } - if (fetchByIid) { - draftData.workspace.workItems.nodes[0].widgets[6] = notesWidget; + if (lastDiscussionNote) { + notesWidget.discussions.nodes.splice(discussionIndex, 1); } else { - draftData.workItem.widgets[6] = notesWidget; + const deletedThreadDiscussion = notesWidget.discussions.nodes[discussionIndex]; + const deletedThreadIndex = deletedThreadDiscussion.notes.nodes.findIndex( + (note) => note.id === id, + ); + deletedThreadDiscussion.notes.nodes.splice(deletedThreadIndex, 1); + notesWidget.discussions.nodes[discussionIndex] = deletedThreadDiscussion; } - }); - store.writeQuery({ - query: notesQuery, - variables, - data: finalData, + updateNotesWidgetDataInDraftData(draftData, notesWidget, fetchByIid); }); }; diff --git a/app/assets/javascripts/work_items/graphql/get_issue_details.query.graphql b/app/assets/javascripts/work_items/graphql/get_issue_details.query.graphql index daeb58c0947..43dbe8fc2dd 100644 --- a/app/assets/javascripts/work_items/graphql/get_issue_details.query.graphql +++ b/app/assets/javascripts/work_items/graphql/get_issue_details.query.graphql @@ -1,12 +1,9 @@ -query issuableDetails($fullPath: ID!, $iid: String) { - workspace: project(fullPath: $fullPath) { +query issuableDetails($id: IssueID!) { + issue(id: $id) { id - issuable: issue(iid: $iid) { + confidential + milestone { id - confidential - milestone { - id - } } } } diff --git a/app/assets/javascripts/work_items/graphql/notes/work_item_note.fragment.graphql b/app/assets/javascripts/work_items/graphql/notes/work_item_note.fragment.graphql index 52a7a1f8e23..93616c39e55 100644 --- a/app/assets/javascripts/work_items/graphql/notes/work_item_note.fragment.graphql +++ b/app/assets/javascripts/work_items/graphql/notes/work_item_note.fragment.graphql @@ -9,6 +9,7 @@ fragment WorkItemNote on Note { systemNoteIconName createdAt lastEditedAt + url lastEditedBy { ...User webPath diff --git a/app/assets/javascripts/work_items/graphql/notes/work_item_note_add_award_emoji.mutation.graphql b/app/assets/javascripts/work_items/graphql/notes/work_item_note_add_award_emoji.mutation.graphql new file mode 100644 index 00000000000..dc51c53428b --- /dev/null +++ b/app/assets/javascripts/work_items/graphql/notes/work_item_note_add_award_emoji.mutation.graphql @@ -0,0 +1,17 @@ +#import "~/graphql_shared/fragments/user.fragment.graphql" + +mutation workItemNoteAddAwardEmoji($awardableId: AwardableID!, $name: String!) { + awardEmojiAdd(input: { awardableId: $awardableId, name: $name }) { + awardEmoji { + name + description + unicode + emoji + unicodeVersion + user { + ...User + } + } + errors + } +} diff --git a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql index 7d7bb9c7fc5..b9d4bb29bbf 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql @@ -1,40 +1,7 @@ +#import "./work_item.fragment.graphql" + query workItemLinksQuery($id: WorkItemID!) { workItem(id: $id) { - id - workItemType { - id - name - } - title - userPermissions { - deleteWorkItem - updateWorkItem - } - confidential - widgets { - type - ... on WorkItemWidgetHierarchy { - type - parent { - id - } - children { - nodes { - id - iid - confidential - workItemType { - id - name - iconName - } - title - state - createdAt - closedAt - } - } - } - } + ...WorkItem } } diff --git a/app/assets/javascripts/work_items/index.js b/app/assets/javascripts/work_items/index.js index 6aa63aae172..95709b36594 100644 --- a/app/assets/javascripts/work_items/index.js +++ b/app/assets/javascripts/work_items/index.js @@ -18,6 +18,7 @@ export const initWorkItemsRoot = () => { hasIterationsFeature, hasOkrsFeature, hasIssuableHealthStatusFeature, + savedRepliesNewPath, } = el.dataset; return new Vue({ @@ -35,6 +36,7 @@ export const initWorkItemsRoot = () => { signInPath, hasIterationsFeature: parseBoolean(hasIterationsFeature), hasIssuableHealthStatusFeature: parseBoolean(hasIssuableHealthStatusFeature), + newSavedRepliesPath: savedRepliesNewPath, }, render(createElement) { return createElement(App); diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue index 2245f984174..ed0163ced3c 100644 --- a/app/assets/javascripts/work_items/pages/create_work_item.vue +++ b/app/assets/javascripts/work_items/pages/create_work_item.vue @@ -74,7 +74,7 @@ export default { return sprintfWorkItem(I18N_WORK_ITEM_ERROR_CREATING, workItemType); }, fetchByIid() { - return this.glFeatures.useIidInWorkItemsPath; + return true; }, }, methods: { diff --git a/app/assets/javascripts/work_items/router/index.js b/app/assets/javascripts/work_items/router/index.js index 777badeb5be..8d67bcaf84f 100644 --- a/app/assets/javascripts/work_items/router/index.js +++ b/app/assets/javascripts/work_items/router/index.js @@ -11,6 +11,6 @@ export function createRouter(fullPath) { return new VueRouter({ routes: routes(), mode: 'history', - base: joinPaths(fullPath, '-', 'work_items'), + base: joinPaths(gon?.relative_url_root, fullPath, '-', 'work_items'), }); } diff --git a/app/assets/javascripts/zen_mode.js b/app/assets/javascripts/zen_mode.js index 134c2858849..1aa3baca165 100644 --- a/app/assets/javascripts/zen_mode.js +++ b/app/assets/javascripts/zen_mode.js @@ -5,6 +5,7 @@ /*= provides zen_mode:enter */ /*= provides zen_mode:leave */ +import autosize from 'autosize'; import Dropzone from 'dropzone'; import $ from 'jquery'; import Mousetrap from 'mousetrap'; @@ -39,6 +40,7 @@ export default class ZenMode { constructor() { this.active_backdrop = null; this.active_textarea = null; + this.storedStyle = null; $(document).on('click', '.js-zen-enter', (e) => { e.preventDefault(); return $(e.currentTarget).trigger('zen_mode:enter'); @@ -68,6 +70,7 @@ export default class ZenMode { this.active_backdrop.addClass('fullscreen'); this.active_textarea = this.active_backdrop.find('textarea'); // Prevent a user-resized textarea from persisting to fullscreen + this.storedStyle = this.active_textarea.attr('style'); this.active_textarea.removeAttr('style'); this.active_textarea.focus(); } @@ -77,6 +80,11 @@ export default class ZenMode { Mousetrap.unpause(); this.active_textarea.closest('.zen-backdrop').removeClass('fullscreen'); scrollToElement(this.active_textarea, { duration: 0, offset: -100 }); + this.active_textarea.attr('style', this.storedStyle); + + autosize(this.active_textarea); + autosize.update(this.active_textarea); + this.active_textarea = null; this.active_backdrop = null; diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index fa5d2bf7972..1a998f89c68 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -7,7 +7,6 @@ @import './pages/issues'; @import './pages/labels'; @import './pages/login'; -@import './pages/ml_experiment_tracking'; @import './pages/merge_requests'; @import './pages/note_form'; @import './pages/notes'; diff --git a/app/assets/stylesheets/components/content_editor.scss b/app/assets/stylesheets/components/content_editor.scss index 44b06c0ff12..3381de52120 100644 --- a/app/assets/stylesheets/components/content_editor.scss +++ b/app/assets/stylesheets/components/content_editor.scss @@ -1,4 +1,5 @@ .ProseMirror { + min-height: 128px; max-height: 55vh; overflow-y: auto; diff --git a/app/assets/stylesheets/components/related_items_list.scss b/app/assets/stylesheets/components/related_items_list.scss index 293caf6fc87..0b30b4c3ef0 100644 --- a/app/assets/stylesheets/components/related_items_list.scss +++ b/app/assets/stylesheets/components/related_items_list.scss @@ -6,6 +6,8 @@ $item-remove-button-space: 42px; .related-items-list { padding: $gl-padding-4; padding-right: $gl-padding-6; + border-bottom-left-radius: $gl-border-size-3; + border-bottom-right-radius: $gl-border-size-3; &, .list-item:last-child { @@ -33,6 +35,14 @@ $item-remove-button-space: 42px; .item-body { position: relative; line-height: $gl-line-height; + border: 1px solid transparent; + border-radius: $gl-border-radius-base; + + &:hover, + &:focus-within { + background-color: $white; + border-color: $gray-50; + } .merge-request-status.closed { color: $red-500; @@ -61,6 +71,7 @@ $item-remove-button-space: 42px; .sortable-link { color: $gray-900; + font-weight: 500; } } @@ -87,16 +98,6 @@ $item-remove-button-space: 42px; } } - .item-attributes-area { - > * { - margin-left: 8px; - } - - @include media-breakpoint-down(sm) { - margin-left: -8px; - } - } - .item-milestone, .item-weight { cursor: help; @@ -147,7 +148,7 @@ $item-remove-button-space: 42px; } .item-path-id { - font-size: $gl-font-size-xs; + font-size: $gl-font-size-small; white-space: nowrap; .path-id-text { @@ -156,34 +157,15 @@ $item-remove-button-space: 42px; } } -.btn-item-remove { - position: absolute; - top: $gl-padding-4 / 2; - right: 0; - padding: $gl-padding-4; - margin-right: $gl-padding-4 / 2; +.mr-ci-status { line-height: 0; - border-color: transparent; - background-color: transparent; - color: $gl-text-color-secondary; - - .related-items-tree & { - position: relative; - top: initial; - padding: $btn-sm-side-margin; - margin-right: initial; - } - &:hover { - color: $gl-text-color; - border-color: $border-color; + a:focus { + @include gl-rounded-full; + @include gl-focus; } } -.mr-ci-status { - line-height: 0; -} - @include media-breakpoint-down(xs) { .btn-sm.dropdown-toggle-split { max-width: 40px; @@ -191,10 +173,6 @@ $item-remove-button-space: 42px; } @include media-breakpoint-up(sm) { - .item-info-area { - flex-basis: 100%; - } - .sortable-link { max-width: 90%; } @@ -265,18 +243,7 @@ $item-remove-button-space: 42px; } } - .btn-item-remove { - position: relative; - top: initial; - padding: $btn-sm-side-margin; - margin-right: $gl-padding-4 / 2; - } - .sortable-link { line-height: 1.3; } - - .item-info-area { - flex-basis: auto; - } } diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 5fa1923af7c..8059164782f 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -261,7 +261,6 @@ .btn-block { width: 100%; margin: 0; - @include gl-mb-5; &.btn { padding: 6px 0; diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index 4eb26d533c2..cd0ea84cff4 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -944,6 +944,19 @@ table.code { } } +// Remove border from collapsed replies widget only on diffs +.diff-grid-comments { + .replies-widget-collapsed { + border-bottom: 0; + } + // Rounded border radius only on diff comments with no replies + .discussion-collapsible { + .discussion-reply-holder:first-of-type { + border-radius: $gl-border-radius-base; + } + } +} + .discussion-body .image .frame { position: relative; } @@ -999,7 +1012,7 @@ table.code { } // Note: Prevents tall files from appearing above sticky tabs -.diffs .vue-recycle-scroller__item-view > div:not(.active) { +.diff-files-holder .vue-recycle-scroller__item-view > div:not(.active) { position: absolute; bottom: 100vh; } diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index ebb9466eb15..5fa7fbdef99 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -96,7 +96,7 @@ color: $gl-text-color; font-size: 14px; text-align: left; - border: 1px solid $border-color; + border: 1px solid $gray-200; border-radius: $border-radius-base; white-space: nowrap; @@ -143,11 +143,24 @@ .dropdown-menu-toggle.dropdown-menu-toggle { justify-content: flex-start; overflow: hidden; + padding-top: #{$gl-padding-8 - 1}; + padding-bottom: #{$gl-padding-8 - 1}; padding-right: 25px; position: relative; text-overflow: ellipsis; + line-height: $gl-line-height; width: 160px; + &:hover { + @include gl-inset-border-1-gray-400; + } + + &:hover, + &:focus { + background-color: $gray-50; + border-color: $gray-400; + } + .gl-spinner { position: absolute; top: 9px; @@ -157,7 +170,7 @@ .dropdown-menu-toggle-icon { position: absolute; right: $gl-padding-8; - color: $gray-darkest; + color: $gray-500; } } @@ -984,17 +997,6 @@ .label-item { padding: 8px 20px; } - - .color-input-container { - .dropdown-label-color-preview { - border: 1px solid $gray-100; - border-right: 0; - - &[style] { - border-color: transparent; - } - } - } } .bulk-update { diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 9ea5a66b3bc..b292adf9eac 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -580,3 +580,31 @@ span.idiff { padding: 0; border-radius: 0 0 $border-radius-default $border-radius-default; } + +.blame-stream-container { + border-top: 1px solid $border-color; +} + +.blame-stream-loading { + $gradient-size: 16px; + position: sticky; + bottom: 0; + display: flex; + justify-content: center; + align-items: center; + margin-top: -$gradient-size; + height: $gl-spacing-scale-10; + border-top: $gradient-size solid transparent; + background-color: $white; + box-sizing: content-box; + background-clip: content-box; + + .gradient { + position: absolute; + left: 0; + right: 0; + top: -$gradient-size; + height: $gradient-size; + background: linear-gradient(to top, $white, transparentize($white, 1)); + } +} diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index b35175f4ef6..16c0a67f137 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -197,7 +197,7 @@ min-width: 0; border: 1px solid $border-color; background-color: $white; - border-radius: $border-radius-default 0 0 $border-radius-default; + border-radius: $border-radius-default; @include media-breakpoint-down(sm) { flex: 1 1 auto; @@ -227,7 +227,7 @@ min-width: 200px; padding-right: 25px; padding-left: 0; - height: $input-height - 2; + height: $input-height; line-height: inherit; &, @@ -263,6 +263,7 @@ min-width: 0; height: 2rem; background-color: $input-bg; + border-radius: $border-radius-default; } .filtered-search-input-dropdown-menu { diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index c0fe8ca6f76..3e1dff18f2a 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -148,7 +148,10 @@ label { width: $input-short-md-width; } } +} +.form-control, +[contenteditable=true] { &:focus { border-color: $gray-400; @include gl-focus; @@ -156,6 +159,7 @@ label { } .select-control { + line-height: 1.3; padding-left: 10px; padding-right: 10px; appearance: none; @@ -208,7 +212,7 @@ label { .gl-show-field-errors { .form-control:not(textarea) { - height: 34px; + height: $input-height; } .gl-field-success-outline { @@ -246,7 +250,7 @@ label { .show-password-complexity-errors { .form-control:not(textarea) { - height: 34px; + height: $input-height; } .password-complexity-error-outline { @@ -286,3 +290,22 @@ label { .input-group-text { max-height: $input-height; } + +.add-issuable-form-input-wrapper { + &.focus { + border-color: var(--gray-700, $gray-700); + + input { + @include gl-shadow-none; + } + } + + .gl-show-field-errors &.form-control:not(textarea) { + height: auto; + } +} + +.add-issuable-form-input-wrapper.focus, +.issue-token-remove-button:focus { + @include gl-focus; +} diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 7baf84198e4..d1231da83d4 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -321,11 +321,9 @@ $search-input-field-x-min-width: 200px; .breadcrumbs-container { display: flex; width: 100%; - position: relative; padding-top: $gl-padding / 2; padding-bottom: $gl-padding / 2; align-items: center; - border-bottom: 1px solid $border-color; } .breadcrumbs-links { @@ -375,14 +373,11 @@ $search-input-field-x-min-width: 200px; display: flex; align-items: center; position: relative; + min-width: 0; padding: 2px 0; &:not(:last-child) { padding-right: 20px; - - &:not(.dropdown) { - overflow: hidden; - } } &:last-child { @@ -558,25 +553,16 @@ $search-input-field-x-min-width: 200px; } .toggle-mobile-nav { - display: none; - background-color: transparent; - border: 0; - padding: 6px 16px; - margin: 0 0 0 -15px; - height: 46px; - color: $gl-text-color; + @include gl-display-none; @include media-breakpoint-down(sm) { - display: flex; - align-items: center; - - i { - font-size: 18px; - } + @include gl-display-block; + .breadcrumbs-links { - padding-left: $gl-padding; - border-left: 1px solid $gl-text-color-quaternary; + @include gl-pl-4; + @include gl-border-l-1; + @include gl-border-l-solid; + @include gl-border-gray-100; } } } diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index c5e50299e6d..b20ec1dc50a 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -223,6 +223,18 @@ } /* +* Mixin that handles the position of sticky alerts at the top. It accounts for the performance bar +*/ +// stylelint-disable-next-line length-zero-no-unit +@mixin sticky-top-positioning($extra: 0px) { + top: calc(#{$header-height} + #{$extra}); + + .with-performance-bar & { + top: calc(#{$header-height} + #{$performance-bar-height} + #{$extra}); + } +} + +/* * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs) */ @mixin build-log($background: $black) { diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index c9b17f5d5c4..f76a9cf0373 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -45,7 +45,7 @@ margin: #{2 * $grid-size} #{-2 * $grid-size} #{-2 * $grid-size}; } - .text-danger { + .text-danger:not(.dropdown-item) { font-weight: $gl-font-weight-bold; } } diff --git a/app/assets/stylesheets/framework/page_title.scss b/app/assets/stylesheets/framework/page_title.scss index 5ed5b1e1445..f11864f14af 100644 --- a/app/assets/stylesheets/framework/page_title.scss +++ b/app/assets/stylesheets/framework/page_title.scss @@ -1,6 +1,4 @@ .page-title-holder { - border-bottom: 1px solid $border-color; - .page-title { margin: $gl-padding 0; color: $gl-text-color; diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index a07a57f40f7..7c3e346f4e6 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -140,6 +140,11 @@ .issuable-sidebar { padding: 0 3px; } + + .block { + border-bottom: 0; + padding-top: 0; + } } .issuable-sidebar .labels { @@ -786,7 +791,7 @@ .participants-author { &:nth-of-type(8n) { - padding-right: 0; + margin-right: 0; } .avatar.avatar-inline { diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss index 4b55b39d6f3..6b339f857cb 100644 --- a/app/assets/stylesheets/framework/super_sidebar.scss +++ b/app/assets/stylesheets/framework/super_sidebar.scss @@ -1,7 +1,56 @@ +@mixin active-toggle { + background-color: $gray-50 !important; + mix-blend-mode: multiply; + + .gl-dark & { + mix-blend-mode: screen; + } + + .notification { + border-color: $gray-50; + } +} + +@mixin notification-dot($color, $size, $top, $left) { + background-color: $color; + border: 2px solid $gray-10; // Same as the sidebar's background color. + position: absolute; + height: $size; + width: $size; + top: $top; + left: $left; + border-radius: 50%; + transition: background-color 100ms linear, border-color 100ms linear; +} + .super-sidebar { + display: flex; + flex-direction: column; + position: fixed; top: 0; - width: $contextual-sidebar-width; - z-index: 600; + bottom: 0; + left: 0; + background-color: var(--gray-10, $gray-10); + border-right: 1px solid $t-gray-a-08; + transform: translate3d(0, 0, 0); + width: $super-sidebar-width; + z-index: $super-sidebar-z-index; + + &:focus { + @include gl-focus; + } + + &.super-sidebar-loading { + transform: translate3d(-100%, 0, 0); + + @include media-breakpoint-up(xl) { + transform: translate3d(0, 0, 0); + } + } + + &:not(.super-sidebar-loading) { + transition: transform $gl-transition-duration-medium; + } .user-bar { background-color: $t-gray-a-04; @@ -9,6 +58,24 @@ .tanuki-logo { @include gl-vertical-align-middle; } + + .user-bar-item { + @include gl-rounded-base; + @include gl-p-2; + @include gl-bg-transparent; + @include gl-border-none; + + &:hover, + &:focus, + &:active { + @include active-toggle; + } + + &:focus, + &:active { + @include gl-focus; + } + } } .counter .gl-icon { @@ -17,18 +84,25 @@ .counter:hover, .counter:focus, - .gl-dropdown-custom-toggle:hover .counter, - .gl-dropdown-custom-toggle:focus .counter, - .gl-dropdown-custom-toggle[aria-expanded='true'] .counter { + .counter[aria-expanded='true'] { background-color: $gray-50; border-color: transparent; + box-shadow: none; mix-blend-mode: multiply; + .gl-dark & { + mix-blend-mode: screen; + } + .gl-icon { color: var(--gray-700, $gray-700); } } + .context-switcher-search-box input { + @include gl-font-sm; + } + .context-switcher-toggle { &[aria-expanded='true'] { background-color: $t-gray-a-08; @@ -36,19 +110,14 @@ } .btn-with-notification { - mix-blend-mode: unset !important; // Our tertiary buttons otherwise use another mix-blend mode, making border-color semi-transparent. position: relative; - .notification { - background-color: $blue-500; - border: 2px solid $gray-10; // Same as the sidebar's background color. - position: absolute; - height: 9px; - width: 9px; - top: 5px; - left: 22px; - border-radius: 50%; - transition: background-color 100ms linear, border-color 100ms linear; + .notification-dot-info { + @include notification-dot($blue-500, 9px, 5px, 22px); + } + + .notification-dot-warning { + @include notification-dot($orange-300, 12px, 1px, 19px); } &:hover, @@ -58,8 +127,93 @@ } } } + + .gl-new-dropdown-toggle[aria-expanded='true'] { + @include active-toggle; + } + + .gl-new-dropdown-custom-toggle { + .btn-with-notification { + mix-blend-mode: unset; // Our tertiary buttons otherwise use another mix-blend mode, making border-color semi-transparent. + } + + [aria-expanded='true'] { + @include active-toggle; + } + } +} + +.super-sidebar-skip-to { + z-index: $super-sidebar-z-index; +} + +.super-sidebar-overlay { + display: none; +} + +.page-with-super-sidebar { + padding-left: 0; + transition: padding-left $gl-transition-duration-medium; + + &:not(.page-with-super-sidebar-collapsed) { + .super-sidebar-overlay { + display: block; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + background-color: $black-transparent; + z-index: $super-sidebar-z-index - 1; + + @include media-breakpoint-up(md) { + display: none; + } + } + } + + @include media-breakpoint-up(xl) { + padding-left: $super-sidebar-width; + + .super-sidebar-toggle { + display: none; + } + } +} + +.page-with-super-sidebar-collapsed { + .super-sidebar { + transform: translate3d(-100%, 0, 0); + } + + @include media-breakpoint-up(xl) { + padding-left: 0; + + .super-sidebar-toggle { + display: block; + } + } +} + +.container-limited .super-sidebar-toggle { + @media (min-width: $super-sidebar-toggle-position-breakpoint) { + position: absolute; + left: $gl-spacing-scale-3; + top: $gl-spacing-scale-3; + margin: 0; + } } .with-performance-bar .super-sidebar { top: $performance-bar-height; } + +.gl-dark { + .super-sidebar { + .gl-new-dropdown-custom-toggle { + .btn-with-notification.btn-with-notification { + mix-blend-mode: unset; + } + } + } +} diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss index 89585fd96ae..590a66ff28e 100644 --- a/app/assets/stylesheets/framework/system_messages.scss +++ b/app/assets/stylesheets/framework/system_messages.scss @@ -48,6 +48,7 @@ // left sidebar eg: project page // right sidebar eg: MR page .nav-sidebar, + .super-sidebar, .right-sidebar { top: calc(#{$system-header-height} + #{$header-height}); } @@ -72,6 +73,7 @@ // left sidebar eg: project page // right sidebar eg: MR page .nav-sidebar, + .super-sidebar, .right-sidebar { top: calc(#{$header-height} + #{$performance-bar-height} + #{$system-header-height}); } @@ -83,6 +85,7 @@ // left sidebar eg: project page // right sidebar eg: mr page .nav-sidebar, + .super-sidebar, .right-sidebar, // navless pages' footer eg: login page // navless pages' footer border eg: login page diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index 8b2a494527b..a288701595e 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -41,7 +41,7 @@ table { } th { - @include gl-bg-gray-50; + @include gl-bg-gray-10; border-bottom: 0; &.wide { diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 32e9bba8712..699693bd354 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -31,6 +31,7 @@ &:not(.note-form).internal-note .timeline-content, &:not(.note-form).draft-note .timeline-content { background-color: $orange-50 !important; + border-radius: 3px; } .timeline-entry-inner { diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 9b5897b7df9..8edf5fc834a 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -494,6 +494,7 @@ outline: none; &::after { + @include gl-dark-invert-keep-hue; content: image-url('icon_anchor.svg'); visibility: hidden; } @@ -631,7 +632,7 @@ body { } .page-title { - margin: #{2 * $grid-size} 0; + margin: 0 0 #{2 * $grid-size}; line-height: 1.3; &.with-button { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index c616915073e..0bc2e0583bb 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -10,6 +10,10 @@ $default-transition-duration: 0.15s; $contextual-sidebar-width: 256px; $contextual-sidebar-collapsed-width: 56px; $toggle-sidebar-height: 48px; +$super-sidebar-width: 256px; +$super-sidebar-toggle-position-breakpoint: 1360px; +$super-sidebar-z-index: 600; +$super-sidebar-overlay-z-index: 599; /** 🚨 Do not use this spacing scale — it is deprecated and being removed. 🚨 @@ -741,7 +745,7 @@ $logs-p-color: #333; /* * Forms */ -$input-height: 34px; +$input-height: 32px; $input-danger-bg: #f2dede; $input-group-addon-bg: $gray-10; $gl-field-focus-shadow: rgba(0, 0, 0, 0.075); @@ -906,6 +910,11 @@ Compare Branches */ $compare-branches-sticky-header-height: 68px; +/* +Board Swimlanes +*/ +$board-swimlanes-headers-height: 64px; + /** Bootstrap 4.2.0 introduced new icons for validating forms. Our design system does not use those, so we are disabling them for now: diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index cb9c623c8fc..1434c16b68f 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -1,7 +1,7 @@ .info-well { - background: $gray-light; + background: $gray-10; color: $gl-text-color; - border: 1px solid $border-color; + border: 1px solid $gray-100; border-radius: $border-radius-default; .card.card-body-segment { diff --git a/app/assets/stylesheets/highlight/diff_custom_colors_addition.scss b/app/assets/stylesheets/highlight/diff_custom_colors_addition.scss index 30895a55711..5f195bc47bf 100644 --- a/app/assets/stylesheets/highlight/diff_custom_colors_addition.scss +++ b/app/assets/stylesheets/highlight/diff_custom_colors_addition.scss @@ -25,7 +25,7 @@ } } - .gd { + .gi { background-color: var(--diff-addition-color); } } diff --git a/app/assets/stylesheets/page_bundles/admin/geo_nodes.scss b/app/assets/stylesheets/page_bundles/admin/geo_sites.scss index b0aaa48569a..37bc2394d58 100644 --- a/app/assets/stylesheets/page_bundles/admin/geo_nodes.scss +++ b/app/assets/stylesheets/page_bundles/admin/geo_sites.scss @@ -1,6 +1,6 @@ @import '../mixins_and_variables_and_functions'; -.geo-node-header-grid-columns { +.geo-site-header-grid-columns { grid-template-columns: 1fr auto; grid-gap: $gl-spacing-scale-5; @@ -9,7 +9,7 @@ } } -.geo-node-details-grid-columns { +.geo-site-details-grid-columns { grid-gap: $gl-spacing-scale-5; @include media-breakpoint-up(lg) { @@ -17,12 +17,12 @@ } } -.geo-node-core-details-grid-columns { +.geo-site-core-details-grid-columns { grid-template-columns: 1fr 1fr; grid-gap: $gl-spacing-scale-5; } -.geo-node-replication-details-grid-columns { +.geo-site-replication-details-grid-columns { grid-template-columns: 1fr 1fr; grid-gap: 1rem; @@ -31,7 +31,7 @@ } } -.geo-node-filter-grid-columns { +.geo-site-filter-grid-columns { grid-template-columns: 1fr; @include media-breakpoint-up(md) { @@ -39,7 +39,7 @@ } } -.geo-node-replication-counts-grid { +.geo-site-replication-counts-grid { grid-template-columns: 2fr 1fr 1fr; grid-gap: 1rem; } diff --git a/app/assets/stylesheets/page_bundles/incidents.scss b/app/assets/stylesheets/page_bundles/incidents.scss index 493add1ea0f..fde35ab3d39 100644 --- a/app/assets/stylesheets/page_bundles/incidents.scss +++ b/app/assets/stylesheets/page_bundles/incidents.scss @@ -57,8 +57,6 @@ } .timeline-entry:not(:last-child) { - @include gl-pb-0; - .timeline-event-border { @include gl-pb-3; @include gl-border-gray-50; diff --git a/app/assets/stylesheets/page_bundles/issuable.scss b/app/assets/stylesheets/page_bundles/issuable.scss index f364170c99f..79595fa3a98 100644 --- a/app/assets/stylesheets/page_bundles/issuable.scss +++ b/app/assets/stylesheets/page_bundles/issuable.scss @@ -81,8 +81,6 @@ } .detail-page-description { - padding: 16px 0; - small { color: var(--gray-500, $gray-500); } @@ -92,10 +90,11 @@ color: var(--gray-500, $gray-500); display: block; margin: 16px 0 0; - font-size: 85%; + font-size: $gl-font-size-small; .author-link { - color: var(--gray-500, $gray-500); + color: var(--gray-700, $gray-700); + font-size: $gl-font-size-small; } } @@ -138,21 +137,6 @@ } } -.add-issuable-form-input-wrapper { - &.focus { - border-color: var(--gray-700, $gray-700); - @include gl-focus; - - input { - @include gl-shadow-none; - } - } - - .gl-show-field-errors &.form-control:not(textarea) { - height: auto; - } -} - /* * Following overrides are done to prevent * legacy dropdown styles from influencing diff --git a/app/assets/stylesheets/page_bundles/jira_connect.scss b/app/assets/stylesheets/page_bundles/jira_connect.scss index 0a2b3175aa9..2c54c819543 100644 --- a/app/assets/stylesheets/page_bundles/jira_connect.scss +++ b/app/assets/stylesheets/page_bundles/jira_connect.scss @@ -16,12 +16,12 @@ @import '@gitlab/ui/src/components/base/pagination/pagination'; @import '@gitlab/ui/src/components/base/table/table'; @import '@gitlab/ui/src/components/base/tooltip/tooltip'; -@import '@gitlab/ui/src/components/base/search_box_by_type/search_box_by_type'; @import '@gitlab/ui/src/components/base/form/form_input/form_input'; @import '@gitlab/ui/src/components/base/form/form_radio/form_radio'; @import '@gitlab/ui/src/components/base/form/form_radio_group/form_radio_group'; @import '@gitlab/ui/src/components/base/form/form_checkbox/form_checkbox'; @import '@gitlab/ui/src/components/base/form/form_group/form_group'; +@import '@gitlab/ui/src/components/base/search_box_by_type/search_box_by_type'; $header-height: 40px; diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index fe64e4f2fe8..396c590d912 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -270,7 +270,8 @@ $tabs-holder-z-index: 250; position: -webkit-sticky; position: sticky; top: calc(var(--top-pos) + var(--performance-bar-height, 0px)); - max-height: calc(100vh - var(--top-pos) - var(--system-header-height, 0px) - var(--performance-bar-height, 0px) - var(--review-bar-height, 0px)); + min-height: 300px; + height: calc(100vh - var(--top-pos) - var(--system-header-height, 0px) - var(--performance-bar-height, 0px) - var(--review-bar-height, 0px)); .drag-handle { bottom: 16px; @@ -282,6 +283,7 @@ $tabs-holder-z-index: 250; } .tree-list-holder { + --file-row-height: 32px; height: 100%; .file-row { @@ -297,6 +299,10 @@ $tabs-holder-z-index: 250; overflow-x: auto; } +.tree-list-gutter { + height: $grid-size; +} + .tree-list-search { flex: 0 0 34px; @@ -322,6 +328,12 @@ $tabs-holder-z-index: 250; line-height: 0; } +.file-row-header { + display: flex; + align-items: center; + height: var(--file-row-height); +} + @media (max-width: map-get($grid-breakpoints, lg)-1) { .diffs .files { .diff-tree-list { @@ -807,7 +819,7 @@ $tabs-holder-z-index: 250; .mr-widget-body, .mr-widget-content { - padding: $gl-padding; + padding: $gl-padding-12 $gl-padding; } .mr-widget-body-ready-merge { @@ -828,6 +840,11 @@ $tabs-holder-z-index: 250; } } +.mr-widget-grouped-section .report-block-container { + border-bottom-left-radius: $border-radius-default; + border-bottom-right-radius: $border-radius-default; +} + .mr-widget-extension { border-top: 1px solid var(--border-color, $border-color); background-color: var(--gray-10, $gray-10); @@ -901,10 +918,10 @@ $tabs-holder-z-index: 250; &:not(:last-child)::before { content: ''; - border-left: 2px solid var(--gray-10, $gray-10); + border-left: 2px solid var(--border-color, $border-color); position: absolute; bottom: -17px; - left: calc(1rem - 1px); + left: 26px; height: 16px; } } @@ -994,7 +1011,7 @@ $tabs-holder-z-index: 250; .submit-review-dropdown { &.show .dropdown-menu { width: calc(100vw - 20px); - max-width: 650px; + max-width: 680px; max-height: calc(100vh - 50px); .gl-dropdown-inner { @@ -1004,7 +1021,8 @@ $tabs-holder-z-index: 250; .md-header { .gl-tab-nav-item { color: var(--gl-text-color, $gl-text-color); - @include gl-pb-5; + @include gl-py-4; + @include gl-px-3; &:hover { @include gl-bg-none; @@ -1070,6 +1088,9 @@ $tabs-holder-z-index: 250; .merge-request-sticky-header { z-index: 204; box-shadow: 0 1px 2px $issue-boards-card-shadow; +} + +.page-with-contextual-sidebar .merge-request-sticky-header { --width: calc(100% - #{$contextual-sidebar-width}); @include media-breakpoint-down(lg) { @@ -1081,6 +1102,18 @@ $tabs-holder-z-index: 250; --width: calc(100% - #{$contextual-sidebar-collapsed-width}); } +.page-with-super-sidebar .merge-request-sticky-header { + @include media-breakpoint-up(xl) { + --width: calc(100% - #{$super-sidebar-width}); + } +} + +.page-with-super-sidebar-collapsed .merge-request-sticky-header { + @include media-breakpoint-up(xl) { + --width: 100%; + } +} + .merge-request-notification-toggle { .gl-toggle { @include gl-ml-auto; diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss index 9ee6d17cb50..708d1a2895e 100644 --- a/app/assets/stylesheets/page_bundles/milestone.scss +++ b/app/assets/stylesheets/page_bundles/milestone.scss @@ -120,10 +120,6 @@ } } -.milestone-detail { - border-bottom: 1px solid var(--border-color, $border-color); -} - @include media-breakpoint-down(md) { .milestone-actions { @include clearfix(); diff --git a/app/assets/stylesheets/pages/ml_experiment_tracking.scss b/app/assets/stylesheets/page_bundles/ml_experiment_tracking.scss index 3c025b5d23f..d6f71b12cd9 100644 --- a/app/assets/stylesheets/pages/ml_experiment_tracking.scss +++ b/app/assets/stylesheets/page_bundles/ml_experiment_tracking.scss @@ -1,26 +1,10 @@ @import '../page_bundles/mixins_and_variables_and_functions'; -.ml-experiment-row { - .title { - margin-bottom: $gl-spacing-scale-1; - font-weight: $gl-font-weight-bold; - } - - .ml-experiment-info { - color: $gl-text-color-secondary; - } - - a { - color: $gl-text-color; - } -} - table.ml-candidate-table { - table-layout: fixed; - tr td, tr th { padding: $gl-padding-8; + min-width: 100px; > * { @include gl-display-block; diff --git a/app/assets/stylesheets/page_bundles/profile.scss b/app/assets/stylesheets/page_bundles/profile.scss index fc745433f1b..dfc86a73635 100644 --- a/app/assets/stylesheets/page_bundles/profile.scss +++ b/app/assets/stylesheets/page_bundles/profile.scss @@ -135,10 +135,9 @@ } } +// Limits the width of the user bio for readability. .profile-user-bio { - // Limits the width of the user bio for readability. max-width: 600px; - margin: 10px auto; } .user-calendar { @@ -172,7 +171,6 @@ } .avatar-holder { - width: 90px; margin: 0 auto 10px; } } diff --git a/app/assets/stylesheets/page_bundles/settings.scss b/app/assets/stylesheets/page_bundles/settings.scss index 8978b8d798b..9a0d7880734 100644 --- a/app/assets/stylesheets/page_bundles/settings.scss +++ b/app/assets/stylesheets/page_bundles/settings.scss @@ -138,42 +138,32 @@ border-radius: $gl-border-radius-base; } -.prometheus-metrics-monitoring { - .card { - .card-toggle { - width: 14px; - } +.prometheus-metrics-monitoring { + .gl-card { .badge.badge-pill { font-size: 12px; line-height: 12px; } - .card-header .label-count { + .gl-card-header .label-count { color: var(--white, $white); background: var(--gray-800, $gray-800); } - .card-body { - padding: 0; - } - .flash-container { margin-bottom: 0; cursor: default; - .flash-notice { + .flash-notice, + .flash-warning { + margin-top: 0; border-radius: 0; } } } .custom-monitored-metrics { - .card-header { - display: flex; - align-items: center; - } - .custom-metric { display: flex; align-items: center; diff --git a/app/assets/stylesheets/page_bundles/tree.scss b/app/assets/stylesheets/page_bundles/tree.scss index 50d9684c7d2..a13b8704095 100644 --- a/app/assets/stylesheets/page_bundles/tree.scss +++ b/app/assets/stylesheets/page_bundles/tree.scss @@ -6,7 +6,7 @@ .tree-holder { .nav-block { - margin: 16px 0; + margin: $gl-spacing-scale-2 0 $gl-spacing-scale-5; .tree-ref-holder { margin-right: 15px; @@ -103,7 +103,6 @@ tr { border-bottom: 1px solid var(--gray-50, $gray-50); - border-top: 1px solid var(--gray-50, $gray-50); &:last-of-type { border-bottom-color: transparent; diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index 9bbea48d2c0..d7d454bde45 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -106,6 +106,23 @@ color: var(--black, $black); } + .active > .wiki-list { + a, + .wiki-list-expand-button, + .wiki-list-collapse-button { + color: var(--black, $black); + } + } + + .wiki-list-expand-button, + .wiki-list-collapse-button { + color: var(--gray-400, $gray-400); + + &:hover { + color: var(--black, $black); + } + } + ul.wiki-pages, ul.wiki-pages li { list-style: none; @@ -118,7 +135,7 @@ } ul.wiki-pages ul { - padding-left: 15px; + padding-left: 20px; } .wiki-sidebar-header { @@ -153,3 +170,45 @@ ul.wiki-pages-list.content-list { .wiki-form .markdown-area { max-height: 55vh; } + +.wiki-list { + .wiki-list-expand-button, + .wiki-list-collapse-button { + left: -$gl-spacing-scale-5; + } + + .wiki-list-expand-button { + display: none; + } + + &.collapsed { + .wiki-list-collapse-button { + display: none; + } + + .wiki-list-expand-button { + display: block; + } + } + + &.collapsed + ul { + display: none; + } +} + +.drawio-editor { + position: fixed; + top: calc(var(--header-height, 48px)); + left: 0; + bottom: 0; + width: 100%; + height: calc(100% - var(--header-height, 48px)); + border: 0; + z-index: 1100; + visibility: hidden; +} + +.with-performance-bar .drawio-editor { + top: calc(var(--header-height, 48px) + 35px); + height: calc(100% - var(--header-height, 48px) - 35px); +} diff --git a/app/assets/stylesheets/page_bundles/work_items.scss b/app/assets/stylesheets/page_bundles/work_items.scss index 07a0cf3f367..00c86c46ac8 100644 --- a/app/assets/stylesheets/page_bundles/work_items.scss +++ b/app/assets/stylesheets/page_bundles/work_items.scss @@ -87,9 +87,22 @@ } } -.work-item-notes { - .discussion-notes ul.notes li.toggle-replies-widget { - // offset for .timeline-content padding + an extra 1px for border width - margin: -5px -9px; +.work-item-link-child { + @include gl-border-1; + @include gl-border-solid; + @include gl-border-transparent; + @include gl-rounded-base; + + &:hover, + &:focus-within { + @include gl-bg-white; + @include gl-border-gray-50; + } +} + +// sticky error placement for errors in modals , by default it is 83px for full view +#work-item-detail-modal { + .flash-container.flash-container-page.sticky { + top: -8px; } } diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 7d465dbcc04..225c32c1989 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -270,6 +270,10 @@ &:hover { @include gl-text-decoration-none; } + + .header-main-content & { + @include gl-mr-2; + } } .gpg-popover-certificate-details { diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 909de9d57f2..7736f1012a5 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -1,6 +1,4 @@ .detail-page-header { - padding: $gl-padding-top 0; - border-bottom: 1px solid $border-color; color: $gl-text-color; line-height: 34px; display: flex; @@ -55,6 +53,10 @@ } } +.detail-page-header-meta { + @include gl-flex-basis-full; +} + .detail-page-description { .title { margin: 0 0 16px; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 75c81b74ba7..0151446321a 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -236,6 +236,7 @@ ul.related-merge-requests > li gl-emoji { outline: none; &::after { + @include gl-dark-invert-keep-hue; content: image-url('icon_anchor.svg'); visibility: hidden; } @@ -272,20 +273,30 @@ ul.related-merge-requests > li gl-emoji { @include media-breakpoint-up(md) { // collapsed left sidebar + collapsed right sidebar - .issue-sticky-header { + .page-with-contextual-sidebar .issue-sticky-header { left: $contextual-sidebar-collapsed-width; --width: calc(100% - #{$contextual-sidebar-collapsed-width} - #{$gutter-collapsed-width}); } // collapsed left sidebar + expanded right sidebar - .right-sidebar-expanded .issue-sticky-header { + .page-with-contextual-sidebar.right-sidebar-expanded .issue-sticky-header { --width: calc(100% - #{$contextual-sidebar-collapsed-width} - #{$gutter-width}); } + + // collapsed super sidebar + collapsed right sidebar + .page-with-super-sidebar .issue-sticky-header { + --width: calc(100% - #{$gutter-collapsed-width}); + } + + // collapsed super sidebar + expanded right sidebar + .page-with-super-sidebar.right-sidebar-expanded .issue-sticky-header { + --width: calc(100% - #{$gutter-width}); + } } @include media-breakpoint-up(xl) { // expanded left sidebar + collapsed right sidebar - .issue-sticky-header { + .page-with-contextual-sidebar .issue-sticky-header { left: $contextual-sidebar-width; --width: calc(100% - #{$contextual-sidebar-width} - #{$gutter-collapsed-width}); } @@ -297,14 +308,38 @@ ul.related-merge-requests > li gl-emoji { } // expanded left sidebar + expanded right sidebar - .right-sidebar-expanded .issue-sticky-header { + .page-with-contextual-sidebar.right-sidebar-expanded .issue-sticky-header { --width: calc(100% - #{$contextual-sidebar-width} - #{$gutter-width}); } // collapsed left sidebar + expanded right sidebar - .right-sidebar-expanded.page-with-icon-sidebar .issue-sticky-header { + .page-with-contextual-sidebar.right-sidebar-expanded.page-with-icon-sidebar .issue-sticky-header { --width: calc(100% - #{$contextual-sidebar-collapsed-width} - #{$gutter-width}); } + + // expanded super sidebar + collapsed right sidebar + .page-with-super-sidebar .issue-sticky-header { + left: $super-sidebar-width; + --width: calc(100% - #{$super-sidebar-width} - #{$gutter-collapsed-width}); + } + + // collapsed super sidebar + collapsed right sidebar + .page-with-super-sidebar-collapsed .issue-sticky-header { + left: 0; + --width: calc(100% - #{$gutter-collapsed-width}); + } + + // expanded super sidebar + expanded right sidebar + .page-with-super-sidebar.right-sidebar-expanded .issue-sticky-header { + left: $super-sidebar-width; + --width: calc(100% - #{$super-sidebar-width} - #{$gutter-width}); + } + + // collapsed super sidebar + expanded right sidebar + .page-with-super-sidebar-collapsed.right-sidebar-expanded .issue-sticky-header { + left: 0; + --width: calc(100% - #{$gutter-width}); + } } .issuable-header-slide-enter-active, diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index bd66319d78f..7c5054a6964 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -1,5 +1,5 @@ .suggest-colors { - margin-top: 5px; + padding-top: 3px; a { border-radius: 4px; @@ -9,23 +9,50 @@ margin-right: 10px; margin-bottom: 10px; text-decoration: none; + + &:focus, + &:focus:active { + position: relative; + z-index: 1; + @include gl-focus; + } } &.suggest-colors-dropdown { margin-top: 10px; margin-bottom: 10px; - border-radius: $border-radius-base; - overflow: hidden; a { border-radius: 0; width: (100% / 7); margin-right: 0; margin-bottom: -5px; + + &:first-of-type { + border-top-left-radius: $border-radius-base; + } + + &:nth-of-type(7) { + border-top-right-radius: $border-radius-base; + } + + &:nth-last-child(7) { + border-bottom-left-radius: $border-radius-base; + } + + &:last-of-type { + border-bottom-right-radius: $border-radius-base; + } } } } +.labels-select-contents-create { + .dropdown-input { + margin-bottom: 4px; + } +} + .dropdown-menu-labels { .dropdown-content { max-height: 135px; @@ -44,21 +71,7 @@ .dropdown-label-color-input { position: relative; - margin-bottom: 10px; - - &.is-active { - padding-left: 32px; - } -} - -.dropdown-label-color-preview { - position: absolute; - left: 0; - top: 0; - width: 32px; - height: 32px; - border-top-left-radius: $border-radius-base; - border-bottom-left-radius: $border-radius-base; + margin-bottom: 8px; } .color-label { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 5d03281a30a..68a5176ad4b 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -1,5 +1,14 @@ -$system-note-icon-size: 2rem; +$avatar-icon-size: 2rem; +$avatar-m-top: 0.5rem; +$avatar-m-ratio: 2; +$avatar-m-left: $avatar-m-top * $avatar-m-ratio; + +$system-note-icon-size: 1.5rem; $system-note-svg-size: 1rem; +$icon-size-diff: $avatar-icon-size - $system-note-icon-size; + +$system-note-icon-m-top: $avatar-m-top + $icon-size-diff - 0.1rem; +$system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; @mixin vertical-line($left) { &::before { @@ -36,6 +45,15 @@ $system-note-svg-size: 1rem; &.timeline > .timeline-entry { margin: $gl-padding 0; + &.system-note { + margin-top: $gl-spacing-scale-1; + margin-bottom: 0; + + .note-header-info { + padding-left: $gl-spacing-scale-4; + } + } + &.system-note, &.note-form { border: 0; @@ -113,7 +131,7 @@ $system-note-svg-size: 1rem; background-color: $white; .timeline-content:not(.flash-container) { - padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 18px; } .timeline-discussion-body-footer { @@ -270,7 +288,7 @@ $system-note-svg-size: 1rem; } &.is-editing { - .note-header, + .note-actions, .note-text, .edited-text { display: none; @@ -447,7 +465,7 @@ $system-note-svg-size: 1rem; height: $system-note-icon-size; border: 1px solid $gray-50; border-radius: $system-note-icon-size; - margin: -6px 0 0; + margin: -$gl-spacing-scale-1 0 0 $gl-spacing-scale-2; svg { width: $system-note-svg-size; @@ -591,8 +609,8 @@ $system-note-svg-size: 1rem; } .timeline-entry-inner .timeline-icon { - margin-top: $grid-size; - margin-left: 14px; + margin-top: $system-note-icon-m-top; + margin-left: $system-note-icon-m-left; } } } @@ -672,7 +690,7 @@ $system-note-svg-size: 1rem; .discussion-reply-holder { border-top: 0; - border-radius: 0 0 $border-radius-default $border-radius-default; + border-radius: 0 0 $gl-border-radius-base $gl-border-radius-base; position: relative; .discussion-form { @@ -1134,7 +1152,7 @@ $system-note-svg-size: 1rem; } .timeline-avatar { - margin: $gl-padding-8 0 0 $gl-padding; + margin: $avatar-m-top 0 0 $avatar-m-left; } } diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 8e4dd39e498..41b022437bb 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -64,13 +64,6 @@ } } -table.u2f-registrations { - th:not(:last-child), - td:not(:last-child) { - border-right: solid 1px transparent; - } -} - .codes { padding-top: 14px; } diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index ab86a2f69dd..265f27f21fa 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -25,6 +25,7 @@ nav, nav.navbar-collapse, nav.navbar-collapse.collapse, .nav-sidebar, +.super-sidebar, .profiler-results, .tree-ref-holder, .tree-holder .breadcrumb, diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index 3b28025053b..b4e896325d6 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -119,7 +119,7 @@ kbd kbd { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; @@ -132,10 +132,6 @@ kbd kbd { } @media (prefers-reduced-motion: reduce) { } -.form-control:-moz-focusring { - color: transparent; - text-shadow: 0 0 0 #ececef; -} .form-control::placeholder { color: #a4a3a8; opacity: 1; @@ -655,7 +651,7 @@ html { color: #ececef; font-size: 14px; text-align: left; - border: 1px solid #434248; + border: 1px solid #535158; border-radius: 0.25rem; white-space: nowrap; } @@ -665,9 +661,12 @@ html { .dropdown-menu-toggle.dropdown-menu-toggle { justify-content: flex-start; overflow: hidden; + padding-top: 7px; + padding-bottom: 7px; padding-right: 25px; position: relative; text-overflow: ellipsis; + line-height: 16px; width: 160px; } .dropdown-menu { @@ -1493,6 +1492,43 @@ kbd { display: none; } } +.super-sidebar { + display: flex; + flex-direction: column; + position: fixed; + top: 0; + bottom: 0; + left: 0; + background-color: var(--gray-10, #1f1e24); + border-right: 1px solid rgba(251, 250, 253, 0.08); + transform: translate3d(0, 0, 0); + width: 256px; + z-index: 600; +} +.super-sidebar.super-sidebar-loading { + transform: translate3d(-100%, 0, 0); +} +@media (min-width: 1200px) { + .super-sidebar.super-sidebar-loading { + transform: translate3d(0, 0, 0); + } +} +.page-with-super-sidebar { + padding-left: 0; +} +@media (min-width: 1200px) { + .page-with-super-sidebar { + padding-left: 256px; + } +} +.page-with-super-sidebar-collapsed .super-sidebar { + transform: translate3d(-100%, 0, 0); +} +@media (min-width: 1200px) { + .page-with-super-sidebar-collapsed { + padding-left: 0; + } +} input::-moz-placeholder { color: #737278; opacity: 1; diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index adafe719892..0a0fa83ff67 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -119,7 +119,7 @@ kbd kbd { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; @@ -132,10 +132,6 @@ kbd kbd { } @media (prefers-reduced-motion: reduce) { } -.form-control:-moz-focusring { - color: transparent; - text-shadow: 0 0 0 #333238; -} .form-control::placeholder { color: #626168; opacity: 1; @@ -655,7 +651,7 @@ html { color: #333238; font-size: 14px; text-align: left; - border: 1px solid #dcdcde; + border: 1px solid #bfbfc3; border-radius: 0.25rem; white-space: nowrap; } @@ -665,9 +661,12 @@ html { .dropdown-menu-toggle.dropdown-menu-toggle { justify-content: flex-start; overflow: hidden; + padding-top: 7px; + padding-bottom: 7px; padding-right: 25px; position: relative; text-overflow: ellipsis; + line-height: 16px; width: 160px; } .dropdown-menu { @@ -1493,6 +1492,43 @@ kbd { display: none; } } +.super-sidebar { + display: flex; + flex-direction: column; + position: fixed; + top: 0; + bottom: 0; + left: 0; + background-color: var(--gray-10, #fbfafd); + border-right: 1px solid rgba(31, 30, 36, 0.08); + transform: translate3d(0, 0, 0); + width: 256px; + z-index: 600; +} +.super-sidebar.super-sidebar-loading { + transform: translate3d(-100%, 0, 0); +} +@media (min-width: 1200px) { + .super-sidebar.super-sidebar-loading { + transform: translate3d(0, 0, 0); + } +} +.page-with-super-sidebar { + padding-left: 0; +} +@media (min-width: 1200px) { + .page-with-super-sidebar { + padding-left: 256px; + } +} +.page-with-super-sidebar-collapsed .super-sidebar { + transform: translate3d(-100%, 0, 0); +} +@media (min-width: 1200px) { + .page-with-super-sidebar-collapsed { + padding-left: 0; + } +} input::-moz-placeholder { color: #89888d; opacity: 1; diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss index 3aace601c45..57f61508178 100644 --- a/app/assets/stylesheets/startup/startup-signin.scss +++ b/app/assets/stylesheets/startup/startup-signin.scss @@ -192,7 +192,7 @@ hr { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; @@ -205,10 +205,6 @@ hr { } @media (prefers-reduced-motion: reduce) { } -.form-control:-moz-focusring { - color: transparent; - text-shadow: 0 0 0 #333238; -} .form-control::placeholder { color: #626168; opacity: 1; @@ -262,7 +258,7 @@ input.btn-block[type="button"] { display: block; min-height: 1.5rem; padding-left: 1.5rem; - color-adjust: exact; + print-color-adjust: exact; } .custom-control-input { position: absolute; @@ -303,7 +299,7 @@ input.btn-block[type="button"] { pointer-events: none; content: ""; background-color: #fff; - border: #737278 solid 1px; + border: 1px solid #737278; } .custom-control-label::after { position: absolute; @@ -313,7 +309,7 @@ input.btn-block[type="button"] { width: 1rem; height: 1rem; content: ""; - background: no-repeat 50% / 50% 50%; + background: 50% / 50% 50% no-repeat; } .custom-checkbox .custom-control-label::before { border-radius: 0.25rem; @@ -663,7 +659,6 @@ body.navless { .btn-block { width: 100%; margin: 0; - margin-bottom: 1rem; } .btn-block.btn { padding: 6px 0; @@ -726,7 +721,7 @@ label.label-bold { color: #89888d; } .gl-show-field-errors .form-control:not(textarea) { - height: 34px; + height: 32px; } .navbar-empty { justify-content: center; diff --git a/app/assets/stylesheets/themes/dark_mode_overrides.scss b/app/assets/stylesheets/themes/dark_mode_overrides.scss index bb97261a1ca..89a49b2cf86 100644 --- a/app/assets/stylesheets/themes/dark_mode_overrides.scss +++ b/app/assets/stylesheets/themes/dark_mode_overrides.scss @@ -143,6 +143,17 @@ body.gl-dark { background-color: $gray-200; } } + + .gl-new-dropdown-item { + &:active, + &:hover, + &:focus, + &:focus:active { + .gl-new-dropdown-item-content { + @include gl-bg-gray-10; + } + } + } } // Some hacks and overrides for things that don't properly support dark mode diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index af98d59251f..11f73b592fc 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -252,31 +252,60 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709 } } +.gl-font-xs { + font-size: px-to-rem(10px); +} + +.gl-line-height-12 { + line-height: px-to-rem(12px); +} + +.gl-letter-spacing-06em { + letter-spacing: 0.06em; +} + +.gl-flex-flow-row-wrap { + flex-flow: row wrap; +} + +.gl-isolate { + isolation: isolate; +} + +.gl-text-transform-uppercase { + text-transform: uppercase; +} +/* + * The below style will be moved to @gitlab/ui by + * https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2177 + */ .gl-gap-2 { gap: $gl-spacing-scale-2; } +.gl-bg-t-gray-a-08 { + background-color: $t-gray-a-08; +} + .gl-hover-bg-t-gray-a-08:hover { background-color: $t-gray-a-08; } -/* End gitlab-ui#1709 */ +.gl-inset-border-1-gray-a-08 { + box-shadow: inset 0 0 0 $gl-border-size-1 $t-gray-a-08; +} -/* - * The below style will be moved to @gitlab/ui by - * https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1751 - */ -.gl-filter-blur-1 { - backdrop-filter: blur(2px); - /* stylelint-disable property-no-vendor-prefix */ - -webkit-backdrop-filter: blur(2px); // still required by Safari +.gl-line-height-1 { + line-height: 1; } -.gl-flex-flow-row-wrap { - flex-flow: row wrap; +.gl-focus:focus { + @include gl-focus; } -.gl-isolate { - isolation: isolate; +.gl-md-justify-content-space-between { + @include gl-media-breakpoint-up(md) { + justify-content: space-between; + } } diff --git a/app/controllers/admin/abuse_reports_controller.rb b/app/controllers/admin/abuse_reports_controller.rb index 5357558434e..49079461698 100644 --- a/app/controllers/admin/abuse_reports_controller.rb +++ b/app/controllers/admin/abuse_reports_controller.rb @@ -3,6 +3,8 @@ class Admin::AbuseReportsController < Admin::ApplicationController feature_category :insider_threat + before_action :set_status_param, only: :index, if: -> { Feature.enabled?(:abuse_reports_list) } + def index @abuse_reports = AbuseReportsFinder.new(params).execute end @@ -15,4 +17,10 @@ class Admin::AbuseReportsController < Admin::ApplicationController head :ok end + + private + + def set_status_param + params[:status] ||= 'open' + end end diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index ade58ca0970..0bbfeae6656 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -13,6 +13,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController before_action :disable_query_limiting, only: [:usage_data] + before_action do + push_frontend_feature_flag(:ci_variables_pages, current_user) + end + feature_category :not_owned, [ # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned :general, :reporting, :metrics_and_profiling, :network, :preferences, :update, :reset_health_check_token @@ -101,8 +105,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def reset_error_tracking_access_token @application_setting.reset_error_tracking_access_token! - redirect_to general_admin_application_settings_path, - notice: _('New error tracking access token has been generated!') + redirect_to general_admin_application_settings_path, notice: _('New error tracking access token has been generated!') end def clear_repository_check_states diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index d66b3cb4366..76564981c9b 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -3,19 +3,17 @@ class Admin::ApplicationsController < Admin::ApplicationController include OauthApplications - before_action :set_application, only: [:show, :edit, :update, :destroy] + before_action :set_application, only: [:show, :edit, :update, :renew, :destroy] before_action :load_scopes, only: [:new, :create, :edit, :update] - feature_category :authentication_and_authorization + feature_category :system_access def index applications = ApplicationsFinder.new.execute @applications = Kaminari.paginate_array(applications).page(params[:page]) end - def show - @created = get_created_session if Feature.disabled?('hash_oauth_secrets') - end + def show; end def new @application = Doorkeeper::Application.new @@ -30,14 +28,8 @@ class Admin::ApplicationsController < Admin::ApplicationController if @application.persisted? flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create]) - if Feature.enabled?('hash_oauth_secrets') - @created = true - render :show - else - set_created_session - - redirect_to admin_application_url(@application) - end + @created = true + render :show else render :new end @@ -51,6 +43,17 @@ class Admin::ApplicationsController < Admin::ApplicationController end end + def renew + @application.renew_secret + + if @application.save + flash.now[:notice] = s_('AuthorizedApplication|Application secret was successfully updated.') + render :show + else + redirect_to admin_application_url(@application) + end + end + def destroy @application.destroy redirect_to admin_applications_url, status: :found, notice: _('Application was successfully destroyed.') diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index d641a26c9fb..654b8309937 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -72,7 +72,7 @@ module Admin def preview @broadcast_message = BroadcastMessage.new(broadcast_message_params) - render partial: 'admin/broadcast_messages/preview' + render plain: render_broadcast_message(@broadcast_message), status: :ok end protected diff --git a/app/controllers/admin/ci/variables_controller.rb b/app/controllers/admin/ci/variables_controller.rb index ef50d7362c4..c811de12914 100644 --- a/app/controllers/admin/ci/variables_controller.rb +++ b/app/controllers/admin/ci/variables_controller.rb @@ -3,7 +3,7 @@ module Admin module Ci class VariablesController < ApplicationController - feature_category :pipeline_authoring + feature_category :pipeline_composition def show respond_to do |format| @@ -32,10 +32,7 @@ module Admin end def render_instance_variables - render status: :ok, - json: { - variables: ::Ci::InstanceVariableSerializer.new.represent(variables) - } + render status: :ok, json: { variables: ::Ci::InstanceVariableSerializer.new.represent(variables) } end def render_error(errors) diff --git a/app/controllers/admin/cohorts_controller.rb b/app/controllers/admin/cohorts_controller.rb index ce3d769f35e..3948d3635fe 100644 --- a/app/controllers/admin/cohorts_controller.rb +++ b/app/controllers/admin/cohorts_controller.rb @@ -7,7 +7,7 @@ class Admin::CohortsController < Admin::ApplicationController urgency :low - track_custom_event :index, + track_event :index, name: 'i_analytics_cohorts', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', diff --git a/app/controllers/admin/dev_ops_report_controller.rb b/app/controllers/admin/dev_ops_report_controller.rb index 71ee19ddf39..2e47dfcb0db 100644 --- a/app/controllers/admin/dev_ops_report_controller.rb +++ b/app/controllers/admin/dev_ops_report_controller.rb @@ -5,7 +5,7 @@ class Admin::DevOpsReportController < Admin::ApplicationController helper_method :show_adoption? - track_custom_event :show, + track_event :show, name: 'i_analytics_dev_ops_score', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index e3a33bafb62..ef45eaac437 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -65,8 +65,8 @@ class Admin::GroupsController < Admin::ApplicationController Groups::DestroyService.new(@group, current_user).async_execute redirect_to admin_groups_path, - status: :found, - alert: format(_('Group %{group_name} was scheduled for deletion.'), group_name: @group.name) + status: :found, + alert: format(_('Group %{group_name} was scheduled for deletion.'), group_name: @group.name) end private diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index dcec50e882d..0745ba328c6 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -4,7 +4,7 @@ class Admin::IdentitiesController < Admin::ApplicationController before_action :user before_action :identity, except: [:index, :new, :create] - feature_category :authentication_and_authorization + feature_category :system_access def new @identity = Identity.new diff --git a/app/controllers/admin/impersonation_tokens_controller.rb b/app/controllers/admin/impersonation_tokens_controller.rb index ddc555add5c..dae3337d19b 100644 --- a/app/controllers/admin/impersonation_tokens_controller.rb +++ b/app/controllers/admin/impersonation_tokens_controller.rb @@ -4,7 +4,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController before_action :user before_action :verify_impersonation_enabled! - feature_category :authentication_and_authorization + feature_category :user_management def index set_index_vars diff --git a/app/controllers/admin/impersonations_controller.rb b/app/controllers/admin/impersonations_controller.rb index 6c45b03455e..c1a6cb350ec 100644 --- a/app/controllers/admin/impersonations_controller.rb +++ b/app/controllers/admin/impersonations_controller.rb @@ -4,7 +4,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController skip_before_action :authenticate_admin! before_action :authenticate_impersonator! - feature_category :authentication_and_authorization + feature_category :user_management def destroy original_user = stop_impersonation diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb index 03383604e30..e4a756ec12d 100644 --- a/app/controllers/admin/keys_controller.rb +++ b/app/controllers/admin/keys_controller.rb @@ -3,7 +3,7 @@ class Admin::KeysController < Admin::ApplicationController before_action :user, only: [:show, :destroy] - feature_category :authentication_and_authorization + feature_category :user_management def show @key = user.keys.find(params[:id]) diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 5d37bd27302..70c2d262b72 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -3,10 +3,10 @@ class Admin::ProjectsController < Admin::ApplicationController include MembersPresentation - before_action :project, only: [:show, :transfer, :repository_check, :destroy] + before_action :project, only: [:show, :transfer, :repository_check, :destroy, :edit, :update] before_action :group, only: [:show, :transfer] - feature_category :projects, [:index, :show, :transfer, :destroy] + feature_category :projects, [:index, :show, :transfer, :destroy, :edit, :update] feature_category :source_code_management, [:repository_check] def index @@ -62,6 +62,18 @@ class Admin::ProjectsController < Admin::ApplicationController end # rubocop: enable CodeReuse/ActiveRecord + def edit; end + + def update + result = ::Projects::UpdateService.new(@project, current_user, project_params).execute + + if result[:status] == :success + redirect_to [:admin, @project], notice: format(_("Project '%{project_name}' was successfully updated."), project_name: @project.name) + else + render "edit" + end + end + def repository_check RepositoryCheck::SingleRepositoryWorker.perform_async(@project.id) # rubocop:disable CodeReuse/Worker @@ -83,6 +95,17 @@ class Admin::ProjectsController < Admin::ApplicationController def group @group ||= @project.group end + + def project_params + params.require(:project).permit(allowed_project_params) + end + + def allowed_project_params + [ + :description, + :name + ] + end end Admin::ProjectsController.prepend_mod_with('Admin::ProjectsController') diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb index 21a3a0aea0b..f63616a2bea 100644 --- a/app/controllers/admin/runners_controller.rb +++ b/app/controllers/admin/runners_controller.rb @@ -6,7 +6,7 @@ class Admin::RunnersController < Admin::ApplicationController before_action :runner, except: [:index, :new, :tag_list, :runner_setup_scripts] before_action only: [:index] do - push_frontend_feature_flag(:create_runner_workflow, current_user) + push_frontend_feature_flag(:create_runner_workflow_for_admin, current_user) end feature_category :runner @@ -23,7 +23,12 @@ class Admin::RunnersController < Admin::ApplicationController end def new - render_404 unless Feature.enabled?(:create_runner_workflow, current_user) + render_404 unless Feature.enabled?(:create_runner_workflow_for_admin, current_user) + end + + def register + render_404 unless Feature.enabled?(:create_runner_workflow_for_admin, current_user) && + runner.registration_available? end def update diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb index 63579421573..bb275532170 100644 --- a/app/controllers/admin/sessions_controller.rb +++ b/app/controllers/admin/sessions_controller.rb @@ -7,7 +7,7 @@ class Admin::SessionsController < ApplicationController before_action :user_is_admin! - feature_category :authentication_and_authorization + feature_category :system_access def new if current_user_mode.admin_mode? diff --git a/app/controllers/admin/spam_logs_controller.rb b/app/controllers/admin/spam_logs_controller.rb index 984ae736697..b27185a6add 100644 --- a/app/controllers/admin/spam_logs_controller.rb +++ b/app/controllers/admin/spam_logs_controller.rb @@ -5,7 +5,7 @@ class Admin::SpamLogsController < Admin::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def index - @spam_logs = SpamLog.includes(:user).order(id: :desc).page(params[:page]) + @spam_logs = SpamLog.includes(:user).order(id: :desc).page(params[:page]).without_count end # rubocop: enable CodeReuse/ActiveRecord @@ -15,8 +15,8 @@ class Admin::SpamLogsController < Admin::ApplicationController if params[:remove_user] spam_log.remove_user(deleted_by: current_user) redirect_to admin_spam_logs_path, - status: :found, - notice: format(_('User %{username} was successfully removed.'), username: spam_log.user.username) + status: :found, + notice: format(_('User %{username} was successfully removed.'), username: spam_log.user.username) else spam_log.destroy head :ok diff --git a/app/controllers/admin/topics_controller.rb b/app/controllers/admin/topics_controller.rb index 345a778772d..94d084932ad 100644 --- a/app/controllers/admin/topics_controller.rb +++ b/app/controllers/admin/topics_controller.rb @@ -41,8 +41,8 @@ class Admin::TopicsController < Admin::ApplicationController @topic.destroy! redirect_to admin_topics_path, - status: :found, - notice: format(_('Topic %{topic_name} was successfully removed.'), topic_name: @topic.title_or_name) + status: :found, + notice: format(_('Topic %{topic_name} was successfully removed.'), topic_name: @topic.title_or_name) end def merge diff --git a/app/controllers/admin/usage_trends_controller.rb b/app/controllers/admin/usage_trends_controller.rb index 082b38ac3a8..f88028535c1 100644 --- a/app/controllers/admin/usage_trends_controller.rb +++ b/app/controllers/admin/usage_trends_controller.rb @@ -3,7 +3,7 @@ class Admin::UsageTrendsController < Admin::ApplicationController include ProductAnalyticsTracking - track_custom_event :index, + track_event :index, name: 'i_analytics_instance_statistics', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 353f9098b95..ff888cf9d72 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -33,7 +33,6 @@ class ApplicationController < ActionController::Base before_action :check_password_expiration, if: :html_request? before_action :ldap_security_check before_action :default_headers - before_action :default_cache_headers before_action :add_gon_variables, if: :html_request? before_action :configure_permitted_parameters, if: :devise_controller? before_action :require_email, unless: :devise_controller? @@ -260,10 +259,7 @@ class ApplicationController < ActionController::Base respond_to do |format| format.html do - render template, - layout: "errors", - status: status, - locals: { message: message } + render template, layout: "errors", status: status, locals: { message: message } end format.any { head status } end @@ -319,10 +315,6 @@ class ApplicationController < ActionController::Base headers['X-Content-Type-Options'] = 'nosniff' end - def default_cache_headers - headers['Pragma'] = 'no-cache' # HTTP 1.0 compatibility - end - def stream_csv_headers(csv_filename) no_cache_headers stream_headers diff --git a/app/controllers/chaos_controller.rb b/app/controllers/chaos_controller.rb index 6139168d29f..7328b793b09 100644 --- a/app/controllers/chaos_controller.rb +++ b/app/controllers/chaos_controller.rb @@ -52,13 +52,14 @@ class ChaosController < ActionController::Base def validate_chaos_secret unless chaos_secret_configured render plain: "chaos misconfigured: please configure GITLAB_CHAOS_SECRET", - status: :internal_server_error + status: :internal_server_error + return end unless Devise.secure_compare(chaos_secret_configured, chaos_secret_request) render plain: "To experience chaos, please set a valid `X-Chaos-Secret` header or `token` param", - status: :unauthorized + status: :unauthorized end end diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index b4a36b7db22..691b4f4e21f 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -25,13 +25,7 @@ module AuthenticatesWithTwoFactor session[:user_password_hash] = Digest::SHA256.hexdigest(user.encrypted_password) add_gon_variables - push_frontend_feature_flag(:webauthn) - - if Feature.enabled?(:webauthn) - setup_webauthn_authentication(user) - else - setup_u2f_authentication(user) - end + setup_webauthn_authentication(user) render 'devise/sessions/two_factor' end @@ -54,11 +48,7 @@ module AuthenticatesWithTwoFactor if user_params[:otp_attempt].present? && session[:otp_user_id] authenticate_with_two_factor_via_otp(user) elsif user_params[:device_response].present? && session[:otp_user_id] - if user.two_factor_webauthn_enabled? - authenticate_with_two_factor_via_webauthn(user) - else - authenticate_with_two_factor_via_u2f(user) - end + authenticate_with_two_factor_via_webauthn(user) elsif user && user.valid_password?(user_params[:password]) prompt_for_two_factor(user) end @@ -96,15 +86,6 @@ module AuthenticatesWithTwoFactor end end - # Authenticate using the response from a U2F (universal 2nd factor) device - def authenticate_with_two_factor_via_u2f(user) - if U2fRegistration.authenticate(user, u2f_app_id, user_params[:device_response], session[:challenge]) - handle_two_factor_success(user) - else - handle_two_factor_failure(user, 'U2F', _('Authentication via U2F device failed.')) - end - end - def authenticate_with_two_factor_via_webauthn(user) if Webauthn::AuthenticateService.new(user, user_params[:device_response], session[:challenge]).execute handle_two_factor_success(user) @@ -133,11 +114,11 @@ module AuthenticatesWithTwoFactor webauthn_registration_ids = user.webauthn_registrations.pluck(:credential_xid) - get_options = WebAuthn::Credential.options_for_get(allow: webauthn_registration_ids, - user_verification: 'discouraged', - extensions: { appid: WebAuthn.configuration.origin }) - - session[:credentialRequestOptions] = get_options + get_options = WebAuthn::Credential.options_for_get( + allow: webauthn_registration_ids, + user_verification: 'discouraged', + extensions: { appid: WebAuthn.configuration.origin } + ) session[:challenge] = get_options.challenge gon.push(webauthn: { options: Gitlab::Json.dump(get_options) }) end diff --git a/app/controllers/concerns/authenticates_with_two_factor_for_admin_mode.rb b/app/controllers/concerns/authenticates_with_two_factor_for_admin_mode.rb index 574fc6c0f37..045ccf1e5b8 100644 --- a/app/controllers/concerns/authenticates_with_two_factor_for_admin_mode.rb +++ b/app/controllers/concerns/authenticates_with_two_factor_for_admin_mode.rb @@ -11,13 +11,7 @@ module AuthenticatesWithTwoFactorForAdminMode return handle_locked_user(user) unless user.can?(:log_in) session[:otp_user_id] = user.id - push_frontend_feature_flag(:webauthn) - - if user.two_factor_webauthn_enabled? - setup_webauthn_authentication(user) - else - setup_u2f_authentication(user) - end + setup_webauthn_authentication(user) render 'admin/sessions/two_factor', layout: 'application' end @@ -30,11 +24,7 @@ module AuthenticatesWithTwoFactorForAdminMode if user_params[:otp_attempt].present? && session[:otp_user_id] admin_mode_authenticate_with_two_factor_via_otp(user) elsif user_params[:device_response].present? && session[:otp_user_id] - if user.two_factor_webauthn_enabled? - admin_mode_authenticate_with_two_factor_via_webauthn(user) - else - admin_mode_authenticate_with_two_factor_via_u2f(user) - end + admin_mode_authenticate_with_two_factor_via_webauthn(user) elsif user && user.valid_password?(user_params[:password]) admin_mode_prompt_for_two_factor(user) else @@ -56,14 +46,6 @@ module AuthenticatesWithTwoFactorForAdminMode end end - def admin_mode_authenticate_with_two_factor_via_u2f(user) - if U2fRegistration.authenticate(user, u2f_app_id, user_params[:device_response], session[:challenge]) - admin_handle_two_factor_success - else - admin_handle_two_factor_failure(user, 'U2F', _('Authentication via U2F device failed.')) - end - end - def admin_mode_authenticate_with_two_factor_via_webauthn(user) if Webauthn::AuthenticateService.new(user, user_params[:device_response], session[:challenge]).execute admin_handle_two_factor_success diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb index ec5140bf223..8b7371cbc17 100644 --- a/app/controllers/concerns/confirm_email_warning.rb +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -10,7 +10,7 @@ module ConfirmEmailWarning protected def show_confirm_warning? - html_request? && request.get? && Feature.enabled?(:soft_email_confirmation) + html_request? && request.get? && Gitlab::CurrentSettings.email_confirmation_setting_soft? end def set_confirm_warning diff --git a/app/controllers/concerns/cycle_analytics_params.rb b/app/controllers/concerns/cycle_analytics_params.rb index 5199d879595..8aac3874499 100644 --- a/app/controllers/concerns/cycle_analytics_params.rb +++ b/app/controllers/concerns/cycle_analytics_params.rb @@ -19,7 +19,6 @@ module CycleAnalyticsParams @options ||= {}.tap do |opts| opts[:current_user] = current_user opts[:projects] = params[:project_ids] if params[:project_ids] - opts[:group] = params[:group_id] if params[:group_id] opts[:from] = params[:from] || start_date(params) opts[:to] = params[:to] if params[:to] opts[:end_event_filter] = params[:end_event_filter] if params[:end_event_filter] @@ -78,5 +77,3 @@ module CycleAnalyticsParams end end end - -CycleAnalyticsParams.prepend_mod_with('CycleAnalyticsParams') diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb index cdef1a45a27..8068913eea2 100644 --- a/app/controllers/concerns/enforces_two_factor_authentication.rb +++ b/app/controllers/concerns/enforces_two_factor_authentication.rb @@ -27,7 +27,8 @@ module EnforcesTwoFactorAuthentication render_error( format( _("Authentication error: enable 2FA in your profile settings to continue using GitLab: %{mfa_help_page}"), - mfa_help_page: mfa_help_page_url), + mfa_help_page: mfa_help_page_url + ), status: :unauthorized ) else diff --git a/app/controllers/concerns/integrations/params.rb b/app/controllers/concerns/integrations/params.rb index 4d181ded071..7e1ba49d442 100644 --- a/app/controllers/concerns/integrations/params.rb +++ b/app/controllers/concerns/integrations/params.rb @@ -8,6 +8,7 @@ module Integrations :app_store_issuer_id, :app_store_key_id, :app_store_private_key, + :app_store_private_key_file_name, :active, :alert_events, :api_key, @@ -72,6 +73,8 @@ module Integrations :server, :server_host, :server_port, + :service_account_key, + :service_account_key_file_name, :sound, :subdomain, :teamcity_url, diff --git a/app/controllers/concerns/invisible_captcha_on_signup.rb b/app/controllers/concerns/invisible_captcha_on_signup.rb index b78869e02d0..a704ff251b3 100644 --- a/app/controllers/concerns/invisible_captcha_on_signup.rb +++ b/app/controllers/concerns/invisible_captcha_on_signup.rb @@ -26,15 +26,17 @@ module InvisibleCaptchaOnSignup end def invisible_captcha_honeypot_counter - @invisible_captcha_honeypot_counter ||= - Gitlab::Metrics.counter(:bot_blocked_by_invisible_captcha_honeypot, - 'Counter of blocked sign up attempts with filled honeypot') + @invisible_captcha_honeypot_counter ||= Gitlab::Metrics.counter( + :bot_blocked_by_invisible_captcha_honeypot, + 'Counter of blocked sign up attempts with filled honeypot' + ) end def invisible_captcha_timestamp_counter - @invisible_captcha_timestamp_counter ||= - Gitlab::Metrics.counter(:bot_blocked_by_invisible_captcha_timestamp, - 'Counter of blocked sign up attempts with invalid timestamp') + @invisible_captcha_timestamp_counter ||= Gitlab::Metrics.counter( + :bot_blocked_by_invisible_captcha_timestamp, + 'Counter of blocked sign up attempts with invalid timestamp' + ) end def log_request(message) diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index e1381b4173f..d364daf93c3 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -151,9 +151,7 @@ module IssuableActions end case issuable - when MergeRequest - render_mr_discussions(discussion_notes, discussion_serializer, discussion_cache_context) - when Issue + when MergeRequest, Issue if stale?(etag: [discussion_cache_context, discussion_notes]) render json: discussion_serializer.represent(discussion_notes, context: self) end @@ -164,23 +162,6 @@ module IssuableActions private - def render_mr_discussions(discussions, serializer, cache_context) - return unless stale?(etag: [cache_context, discussions]) - - if Feature.enabled?(:disabled_mr_discussions_redis_cache, project) - render json: serializer.represent(discussions, context: self) - else - render_cached_discussions(discussions, serializer, cache_context) - end - end - - def render_cached_discussions(discussions, serializer, cache_context) - render_cached(discussions, - with: serializer, - cache_context: ->(_) { cache_context }, - context: self) - end - def notes_filter strong_memoize(:notes_filter) do notes_filter_param = params[:notes_filter]&.to_i diff --git a/app/controllers/concerns/kas_cookie.rb b/app/controllers/concerns/kas_cookie.rb new file mode 100644 index 00000000000..ef58ab1972b --- /dev/null +++ b/app/controllers/concerns/kas_cookie.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module KasCookie + extend ActiveSupport::Concern + + def set_kas_cookie + return unless ::Gitlab::Kas::UserAccess.enabled? + + public_session_id = Gitlab::Session.current&.id&.public_id + return unless public_session_id + + cookie_data = ::Gitlab::Kas::UserAccess.cookie_data(public_session_id) + + cookies[::Gitlab::Kas::COOKIE_KEY] = cookie_data + end +end diff --git a/app/controllers/concerns/known_sign_in.rb b/app/controllers/concerns/known_sign_in.rb index cacc7e4628f..997f26fa959 100644 --- a/app/controllers/concerns/known_sign_in.rb +++ b/app/controllers/concerns/known_sign_in.rb @@ -26,8 +26,13 @@ module KnownSignIn end def update_cookie - set_secure_cookie(KNOWN_SIGN_IN_COOKIE, current_user.id, - type: COOKIE_TYPE_ENCRYPTED, httponly: true, expires: KNOWN_SIGN_IN_COOKIE_EXPIRY) + set_secure_cookie( + KNOWN_SIGN_IN_COOKIE, + current_user.id, + type: COOKIE_TYPE_ENCRYPTED, + httponly: true, + expires: KNOWN_SIGN_IN_COOKIE_EXPIRY + ) end def sessions diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index 773e4c15d6e..da2ed9d62e7 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/app/controllers/concerns/membership_actions.rb @@ -63,10 +63,10 @@ module MembershipActions if access_requester.persisted? redirect_to polymorphic_path(membershipable), - notice: _('Your request for access has been queued for review.') + notice: _('Your request for access has been queued for review.') else redirect_to polymorphic_path(membershipable), - alert: format(_("Your request for access could not be processed: %{error_message}"), error_message: access_requester.errors.full_messages.to_sentence) + alert: format(_("Your request for access could not be processed: %{error_message}"), error_message: access_requester.errors.full_messages.to_sentence) end end diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 512dbf0de5d..06b9c901e4a 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -45,7 +45,8 @@ module NotesActions respond_to do |format| format.json do json = { - commands_changes: @note.commands_changes&.slice(:emoji_award, :time_estimate, :spend_time) + commands_changes: @note.commands_changes&.slice(:emoji_award, :time_estimate, :spend_time), + command_names: @note.command_names } if @note.persisted? && return_discussion? diff --git a/app/controllers/concerns/observability/content_security_policy.rb b/app/controllers/concerns/observability/content_security_policy.rb index 3865e3b606d..1e25dc492a0 100644 --- a/app/controllers/concerns/observability/content_security_policy.rb +++ b/app/controllers/concerns/observability/content_security_policy.rb @@ -12,17 +12,17 @@ module Observability defined?(project) ? project&.group : nil end - next if p.directives.blank? || !Gitlab::Observability.observability_enabled?(current_user, current_group) + next if p.directives.blank? || !Feature.enabled?(:observability_group_tab, current_group) default_frame_src = p.directives['frame-src'] || p.directives['default-src'] # When ObservabilityUI is not authenticated, it needs to be able # to redirect to the GL sign-in page, hence '/users/sign_in' and '/oauth/authorize' - frame_src_values = Array.wrap(default_frame_src) | [Gitlab::Observability.observability_url, - Gitlab::Utils.append_path(Gitlab.config.gitlab.url, -'/users/sign_in'), - Gitlab::Utils.append_path(Gitlab.config.gitlab.url, -'/oauth/authorize')] + frame_src_values = Array.wrap(default_frame_src) | [ + Gitlab::Observability.observability_url, + Gitlab::Utils.append_path(Gitlab.config.gitlab.url, '/users/sign_in'), + Gitlab::Utils.append_path(Gitlab.config.gitlab.url, '/oauth/authorize') + ] p.frame_src(*frame_src_values) end diff --git a/app/controllers/concerns/product_analytics_tracking.rb b/app/controllers/concerns/product_analytics_tracking.rb index 5696e441ad0..5ed2b2a82eb 100644 --- a/app/controllers/concerns/product_analytics_tracking.rb +++ b/app/controllers/concerns/product_analytics_tracking.rb @@ -5,48 +5,48 @@ module ProductAnalyticsTracking include RedisTracking extend ActiveSupport::Concern - MIGRATED_EVENTS = ['g_analytics_valuestream'].freeze + MIGRATED_EVENTS = %w[ + g_analytics_valuestream + i_search_paid + i_search_total + i_search_advanced + i_ecosystem_jira_service_list_issues + users_viewing_analytics_group_devops_adoption + i_analytics_dev_ops_adoption + i_analytics_dev_ops_score + p_analytics_merge_request + i_analytics_instance_statistics + g_analytics_contribution + p_analytics_pipelines + p_analytics_code_reviews + p_analytics_valuestream + p_analytics_insights + p_analytics_issues + p_analytics_repo + g_analytics_insights + g_analytics_issues + g_analytics_productivity + i_analytics_cohorts + ].freeze class_methods do - # TODO: Remove once all the events are migrated to #track_custom_event - # during https://gitlab.com/groups/gitlab-org/-/epics/8641 - def track_event(*controller_actions, name:, conditions: nil, destinations: [:redis_hll], &block) + def track_event(*controller_actions, name:, action: nil, label: nil, conditions: nil, destinations: [:redis_hll], &block) custom_conditions = [:trackable_html_request?, *conditions] after_action only: controller_actions, if: custom_conditions do - route_events_to(destinations, name, &block) - end - end - - def track_custom_event(*controller_actions, name:, action:, label:, conditions: nil, destinations: [:redis_hll], &block) - custom_conditions = [:trackable_html_request?, *conditions] - - after_action only: controller_actions, if: custom_conditions do - route_custom_events_to(destinations, name, action, label, &block) + route_events_to(destinations, name, action, label, &block) end end end private - def route_events_to(destinations, name, &block) - track_unique_redis_hll_event(name, &block) if destinations.include?(:redis_hll) - - return unless destinations.include?(:snowplow) && event_enabled?(name) - - Gitlab::Tracking.event( - self.class.to_s, - name, - namespace: tracking_namespace_source, - user: current_user, - context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: name).to_context] - ) - end - - def route_custom_events_to(destinations, name, action, label, &block) + def route_events_to(destinations, name, action, label, &block) track_unique_redis_hll_event(name, &block) if destinations.include?(:redis_hll) return unless destinations.include?(:snowplow) && event_enabled?(name) + raise "action is required when destination is snowplow" unless action + raise "label is required when destination is snowplow" unless label optional_arguments = { namespace: tracking_namespace_source, @@ -68,28 +68,11 @@ module ProductAnalyticsTracking return true if MIGRATED_EVENTS.include?(event) events_to_ff = { - i_search_paid: :_phase2, - i_search_total: :_phase2, - i_search_advanced: :_phase2, - i_ecosystem_jira_service_list_issues: :_phase2, - users_viewing_analytics_group_devops_adoption: :_phase2, - i_analytics_dev_ops_adoption: :_phase2, - i_analytics_dev_ops_score: :_phase2, - p_analytics_merge_request: :_phase2, - i_analytics_instance_statistics: :_phase2, - g_analytics_contribution: :_phase2, - p_analytics_pipelines: :_phase2, - p_analytics_code_reviews: :_phase2, - p_analytics_valuestream: :_phase2, - p_analytics_insights: :_phase2, - p_analytics_issues: :_phase2, - p_analytics_repo: :_phase2, - g_analytics_insights: :_phase2, - g_analytics_issues: :_phase2, - g_analytics_productivity: :_phase2, - i_analytics_cohorts: :_phase2, - - g_compliance_dashboard: :_phase4 + g_edit_by_sfe: :_phase4, + g_compliance_dashboard: :_phase4, + g_compliance_audit_events: :_phase4, + i_compliance_audit_events: :_phase4, + i_compliance_credential_inventory: :_phase4 } Feature.enabled?("route_hll_to_snowplow#{events_to_ff[event.to_sym]}", tracking_namespace_source) diff --git a/app/controllers/concerns/registrations_tracking.rb b/app/controllers/concerns/registrations_tracking.rb index 14743349c1a..6c83c57d9dd 100644 --- a/app/controllers/concerns/registrations_tracking.rb +++ b/app/controllers/concerns/registrations_tracking.rb @@ -13,3 +13,5 @@ module RegistrationsTracking params.permit(:glm_source, :glm_content) end end + +RegistrationsTracking.prepend_mod diff --git a/app/controllers/concerns/renders_notes.rb b/app/controllers/concerns/renders_notes.rb index f8e3717acee..889d3f0a9d2 100644 --- a/app/controllers/concerns/renders_notes.rb +++ b/app/controllers/concerns/renders_notes.rb @@ -24,13 +24,13 @@ module RendersNotes # rubocop: disable CodeReuse/ActiveRecord def preload_noteable_for_regular_notes(notes) - ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable) + ActiveRecord::Associations::Preloader.new(records: notes.reject(&:for_commit?), associations: :noteable).call end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord def preload_author_status(notes) - ActiveRecord::Associations::Preloader.new.preload(notes, { author: :status }) + ActiveRecord::Associations::Preloader.new(records: notes, associations: { author: :status }).call end # rubocop: enable CodeReuse/ActiveRecord end diff --git a/app/controllers/concerns/renders_projects_list.rb b/app/controllers/concerns/renders_projects_list.rb index 05bd9972ee7..739b2be3fe9 100644 --- a/app/controllers/concerns/renders_projects_list.rb +++ b/app/controllers/concerns/renders_projects_list.rb @@ -8,6 +8,7 @@ module RendersProjectsList # once when the entities are rendered projects.each(&:forks_count) projects.each(&:open_issues_count) + projects.each(&:open_merge_requests_count) projects end diff --git a/app/controllers/concerns/sorting_preference.rb b/app/controllers/concerns/sorting_preference.rb index 300c1d6d779..3dc1780d6fe 100644 --- a/app/controllers/concerns/sorting_preference.rb +++ b/app/controllers/concerns/sorting_preference.rb @@ -90,6 +90,10 @@ module SortingPreference return false unless sort_order return can_sort_by_issue_weight?(action_name == 'issues') if sort_order.include?('weight') + if sort_order.include?('merged_at') + return can_sort_by_merged_date?(controller_name == 'merge_requests' || action_name == 'merge_requests') + end + true end end diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 308da018a42..e53d0bc65a0 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -9,7 +9,6 @@ module UploadsActions included do prepend_before_action :set_request_format_from_path_extension - skip_before_action :default_cache_headers, only: :show rescue_from FileUploader::InvalidSecret, with: :render_404 end diff --git a/app/controllers/concerns/wiki_actions.rb b/app/controllers/concerns/wiki_actions.rb index 2b781c528ad..ebcce635945 100644 --- a/app/controllers/concerns/wiki_actions.rb +++ b/app/controllers/concerns/wiki_actions.rb @@ -11,6 +11,15 @@ module WikiActions RESCUE_GIT_TIMEOUTS_IN = %w[show edit history diff pages].freeze included do + content_security_policy do |p| + next if p.directives.blank? + + default_frame_src = p.directives['frame-src'] || p.directives['default-src'] + frame_src_values = Array.wrap(default_frame_src) | ['https://embed.diagrams.net'].compact + + p.frame_src(*frame_src_values) + end + before_action { respond_to :html } before_action :authorize_read_wiki! @@ -37,9 +46,7 @@ module WikiActions end end - # NOTE: We want to include wiki page views in the same counter as the other - # Event-based wiki actions tracked through TrackUniqueEvents, so we use the same event name. - track_redis_hll_event :show, name: Gitlab::UsageDataCounters::TrackUniqueEvents::WIKI_ACTION.to_s + track_redis_hll_event :show, name: 'wiki_action' helper_method :view_file_button, :diff_file_html_data @@ -142,8 +149,7 @@ module WikiActions # rubocop:disable Gitlab/ModuleWithInstanceVariables def history if page - @commits = Kaminari.paginate_array(page.versions(page: params[:page].to_i), - total_count: page.count_versions) + @commits = Kaminari.paginate_array(page.versions(page: params[:page].to_i), total_count: page.count_versions) .page(params[:page]) render 'shared/wikis/history' @@ -178,8 +184,7 @@ module WikiActions if response.success? flash[:toast] = _("Wiki page was successfully deleted.") - redirect_to wiki_path(wiki), - status: :found + redirect_to wiki_path(wiki), status: :found else @error = response.message render 'shared/wikis/edit' diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 6dd4d72bbc7..e94138c4d9b 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -10,7 +10,7 @@ class ConfirmationsController < Devise::ConfirmationsController prepend_before_action :check_recaptcha, only: :create before_action :load_recaptcha, only: :new - feature_category :authentication_and_authorization + feature_category :user_management def almost_there flash[:notice] = nil @@ -20,12 +20,12 @@ class ConfirmationsController < Devise::ConfirmationsController protected def after_resending_confirmation_instructions_path_for(resource) - return users_almost_there_path unless Feature.enabled?(:soft_email_confirmation) + return users_almost_there_path unless Gitlab::CurrentSettings.email_confirmation_setting_soft? stored_location_for(resource) || dashboard_projects_path end - def after_confirmation_path_for(resource_name, resource) + def after_confirmation_path_for(_resource_name, resource) accept_pending_invitations # incoming resource can either be a :user or an :email @@ -34,10 +34,14 @@ class ConfirmationsController < Devise::ConfirmationsController else Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}") flash[:notice] = flash[:notice] + _(" Please sign in.") - new_session_path(:user, anchor: 'login-pane', invite_email: resource.email) + sign_in_path(resource) end end + def sign_in_path(user) + new_session_path(:user, anchor: 'login-pane', invite_email: resource.email) + end + def check_recaptcha return unless resource_params[:email].present? diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 89d362c88a4..645b3eb9eb5 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -66,8 +66,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController end def load_projects(finder_params) - @total_user_projects_count = ProjectsFinder.new(params: { non_public: true, not_aimed_for_deletion: true }, current_user: current_user).execute - @total_starred_projects_count = ProjectsFinder.new(params: { starred: true, not_aimed_for_deletion: true }, current_user: current_user).execute + @total_user_projects_count = ProjectsFinder.new(params: { non_public: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute + @total_starred_projects_count = ProjectsFinder.new(params: { starred: true, archived: false, not_aimed_for_deletion: true }, current_user: current_user).execute finder_params[:use_cte] = true if use_cte_for_finder? diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index 3005d19f8ed..a1b8dbcd304 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -29,9 +29,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController respond_to do |format| format.html do - redirect_to dashboard_todos_path, - status: :found, - notice: _('To-do item successfully marked as done.') + redirect_to dashboard_todos_path, status: :found, notice: _('To-do item successfully marked as done.') end format.js { head :ok } format.json { render json: todos_counts } diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb index ac355b861b3..96a7b5b144d 100644 --- a/app/controllers/explore/groups_controller.rb +++ b/app/controllers/explore/groups_controller.rb @@ -7,7 +7,12 @@ class Explore::GroupsController < Explore::ApplicationController urgency :low def index - user = Feature.enabled?(:generic_explore_groups, current_user, type: :experiment) ? nil : current_user + # For gitlab.com, including internal visibility groups here causes + # a major performance issue: https://gitlab.com/gitlab-org/gitlab/-/issues/358944 + # + # For self-hosted users, not including internal groups here causes + # a lack of visibility: https://gitlab.com/gitlab-org/gitlab/-/issues/389041 + user = Gitlab.com? ? nil : current_user render_group_tree GroupsFinder.new(user).execute end diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb index 2f01bdecd23..bf59a0a2400 100644 --- a/app/controllers/graphql_controller.rb +++ b/app/controllers/graphql_controller.rb @@ -102,6 +102,10 @@ class GraphqlController < ApplicationController private + def permitted_params + params.permit(_json: [:query, :operationName, { variables: {} }]) + end + def disallow_mutations_for_get return unless request.get? || request.head? return unless any_mutating_query? @@ -111,7 +115,7 @@ class GraphqlController < ApplicationController def limit_query_size total_size = if multiplex? - params[:_json].sum { _1[:query].size } + multiplex_param.sum { _1[:query].size } else query.size end @@ -178,8 +182,12 @@ class GraphqlController < ApplicationController params.fetch(:query, '') end + def multiplex_param + permitted_params[:_json] + end + def multiplex_queries - params[:_json].map do |single_query_info| + multiplex_param.map do |single_query_info| { query: single_query_info[:query], variables: build_variables(single_query_info[:variables]), @@ -207,7 +215,7 @@ class GraphqlController < ApplicationController end def multiplex? - params[:_json].present? + multiplex_param.present? end def authorize_access_api! diff --git a/app/controllers/groups/children_controller.rb b/app/controllers/groups/children_controller.rb index d10c52f0301..ca3be1542aa 100644 --- a/app/controllers/groups/children_controller.rb +++ b/app/controllers/groups/children_controller.rb @@ -5,6 +5,8 @@ module Groups extend ::Gitlab::Utils::Override before_action :group + before_action :validate_per_page + skip_cross_project_access_check :index feature_category :subgroups @@ -41,10 +43,11 @@ module Groups protected def setup_children(parent) - @children = GroupDescendantsFinder.new(current_user: current_user, - parent_group: parent, - params: params.to_unsafe_h).execute - @children = @children.page(params[:page]) + @children = GroupDescendantsFinder.new( + current_user: current_user, + parent_group: parent, + params: group_descendants_params + ).execute.page(params[:page]) end private @@ -53,5 +56,25 @@ module Groups def has_project_list? true end + + def group_descendants_params + @group_descendants_params ||= params.to_unsafe_h.compact + end + + def validate_per_page + return unless group_descendants_params.key?(:per_page) + + per_page = begin + Integer(group_descendants_params[:per_page]) + rescue ArgumentError, TypeError + 0 + end + + respond_to do |format| + format.json do + render status: :bad_request, json: { message: 'per_page does not have a valid value' } if per_page < 1 + end + end + end end end diff --git a/app/controllers/groups/dependency_proxy_for_containers_controller.rb b/app/controllers/groups/dependency_proxy_for_containers_controller.rb index 427df9a7129..1b1aed0ec2e 100644 --- a/app/controllers/groups/dependency_proxy_for_containers_controller.rb +++ b/app/controllers/groups/dependency_proxy_for_containers_controller.rb @@ -172,6 +172,6 @@ class Groups::DependencyProxyForContainersController < ::Groups::DependencyProxy end def manifest_header - token_header.merge(Accept: ::ContainerRegistry::Client::ACCEPTED_TYPES) + token_header.merge(Accept: ::DependencyProxy::Manifest::ACCEPTED_TYPES) end end diff --git a/app/controllers/groups/group_links_controller.rb b/app/controllers/groups/group_links_controller.rb index cc2ca728592..c74c48a960d 100644 --- a/app/controllers/groups/group_links_controller.rb +++ b/app/controllers/groups/group_links_controller.rb @@ -7,7 +7,7 @@ class Groups::GroupLinksController < Groups::ApplicationController feature_category :subgroups def update - Groups::GroupLinks::UpdateService.new(@group_link).execute(group_link_params) + Groups::GroupLinks::UpdateService.new(@group_link, current_user).execute(group_link_params) if @group_link.expires? render json: { diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index f0b857ca4c9..685c8292787 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -18,8 +18,7 @@ class Groups::GroupMembersController < Groups::ApplicationController skip_before_action :check_two_factor_requirement, only: :leave skip_cross_project_access_check :index, :update, :destroy, :request_access, - :approve_access_request, :leave, :resend_invite, - :override + :approve_access_request, :leave, :resend_invite, :override feature_category :subgroups urgency :low @@ -73,7 +72,7 @@ class Groups::GroupMembersController < Groups::ApplicationController end def filter_params - params.permit(:two_factor, :search).merge(sort: @sort) + params.permit(:two_factor, :search, :user_type).merge(sort: @sort) end def membershipable_members diff --git a/app/controllers/groups/observability_controller.rb b/app/controllers/groups/observability_controller.rb index 726af00a10e..525407f5849 100644 --- a/app/controllers/groups/observability_controller.rb +++ b/app/controllers/groups/observability_controller.rb @@ -30,7 +30,7 @@ module Groups end def check_observability_allowed - render_404 unless Gitlab::Observability.observability_enabled?(current_user, group) + render_404 unless Gitlab::Observability.allowed_for_action?(current_user, group, params[:action]) end end end diff --git a/app/controllers/groups/settings/access_tokens_controller.rb b/app/controllers/groups/settings/access_tokens_controller.rb index d86ddcfe2d0..ff07e881bfa 100644 --- a/app/controllers/groups/settings/access_tokens_controller.rb +++ b/app/controllers/groups/settings/access_tokens_controller.rb @@ -7,7 +7,7 @@ module Groups include AccessTokensActions layout 'group_settings' - feature_category :authentication_and_authorization + feature_category :system_access alias_method :resource, :group diff --git a/app/controllers/groups/settings/applications_controller.rb b/app/controllers/groups/settings/applications_controller.rb index 3557d485422..2bf5c95937b 100644 --- a/app/controllers/groups/settings/applications_controller.rb +++ b/app/controllers/groups/settings/applications_controller.rb @@ -6,18 +6,16 @@ module Groups include OauthApplications prepend_before_action :authorize_admin_group! - before_action :set_application, only: [:show, :edit, :update, :destroy] + before_action :set_application, only: [:show, :edit, :update, :renew, :destroy] before_action :load_scopes, only: [:index, :create, :edit, :update] - feature_category :authentication_and_authorization + feature_category :system_access def index set_index_vars end - def show - @created = get_created_session if Feature.disabled?('hash_oauth_secrets') - end + def show; end def edit end @@ -28,15 +26,8 @@ module Groups if @application.persisted? flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create]) - if Feature.enabled?('hash_oauth_secrets') - - @created = true - render :show - else - set_created_session - - redirect_to group_settings_application_url(@group, @application) - end + @created = true + render :show else set_index_vars render :index @@ -51,6 +42,17 @@ module Groups end end + def renew + @application.renew_secret + + if @application.save + flash.now[:notice] = s_('AuthorizedApplication|Application secret was successfully updated.') + render :show + else + redirect_to group_settings_application_url(@group, @application) + end + end + def destroy @application.destroy redirect_to group_settings_applications_url(@group), status: :found, notice: _('Application was successfully destroyed.') diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb index 78e3ffa4af9..4bbaf92b126 100644 --- a/app/controllers/groups/settings/ci_cd_controller.rb +++ b/app/controllers/groups/settings/ci_cd_controller.rb @@ -12,6 +12,11 @@ module Groups before_action :assign_variables_to_gon, only: [:show] feature_category :continuous_integration + + before_action do + push_frontend_feature_flag(:ci_variables_pages, current_user) + end + urgency :low def show diff --git a/app/controllers/groups/variables_controller.rb b/app/controllers/groups/variables_controller.rb index 9ddf6c80c70..7aea5e1a5c9 100644 --- a/app/controllers/groups/variables_controller.rb +++ b/app/controllers/groups/variables_controller.rb @@ -6,7 +6,7 @@ module Groups skip_cross_project_access_check :show, :update - feature_category :pipeline_authoring + feature_category :pipeline_composition urgency :low, [:show] diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 8f7a2c177b7..a0c82998108 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -46,8 +46,7 @@ class GroupsController < Groups::ApplicationController helper_method :captcha_required? - skip_cross_project_access_check :index, :new, :create, :edit, :update, - :destroy, :projects + skip_cross_project_access_check :index, :new, :create, :edit, :update, :destroy, :projects # When loading show as an atom feed, we render events that could leak cross # project information skip_cross_project_access_check :show, if: -> { request.format.html? } @@ -76,6 +75,7 @@ class GroupsController < Groups::ApplicationController end def new + @parent_group = Group.find_by_id(params[:parent_id]) @group = Group.new(params.permit(:parent_id)) @group.build_namespace_settings end @@ -201,7 +201,7 @@ class GroupsController < Groups::ApplicationController send_upload(@group.export_file, attachment: @group.export_file.filename) else redirect_to edit_group_path(@group), - alert: _('The file containing the export is not available yet; it may still be transferring. Please try again later.') + alert: _('The file containing the export is not available yet; it may still be transferring. Please try again later.') end else redirect_to edit_group_path(@group), diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb index d0e14000d8e..18c6f0bb9d3 100644 --- a/app/controllers/ide_controller.rb +++ b/app/controllers/ide_controller.rb @@ -10,7 +10,6 @@ class IdeController < ApplicationController before_action do push_frontend_feature_flag(:build_service_proxy) push_frontend_feature_flag(:reject_unsigned_commits_by_gitlab) - define_index_vars end feature_category :web_ide @@ -20,9 +19,9 @@ class IdeController < ApplicationController def index Gitlab::UsageDataCounters::WebIdeCounter.increment_views_count - if project && Feature.enabled?(:route_hll_to_snowplow_phase2, project&.namespace) - Gitlab::Tracking.event(self.class.to_s, 'web_ide_views', - namespace: project&.namespace, user: current_user) + if project + Gitlab::Tracking.event(self.class.to_s, 'web_ide_views', namespace: project.namespace, user: current_user) + @fork_info = fork_info(project, params[:branch]) end render layout: 'fullscreen', locals: { minimal: helpers.use_new_web_ide? } @@ -34,15 +33,6 @@ class IdeController < ApplicationController render_404 unless can?(current_user, :read_project, project) end - def define_index_vars - return unless project - - @branch = params[:branch] - @path = params[:path] - @merge_request = params[:merge_request_id] - @fork_info = fork_info(project, @branch) - end - def fork_info(project, branch) return if can?(current_user, :push_code, project) diff --git a/app/controllers/import/bulk_imports_controller.rb b/app/controllers/import/bulk_imports_controller.rb index f4eea3abd32..d7d7ad84bc8 100644 --- a/app/controllers/import/bulk_imports_controller.rb +++ b/app/controllers/import/bulk_imports_controller.rb @@ -5,9 +5,6 @@ class Import::BulkImportsController < ApplicationController before_action :ensure_bulk_import_enabled before_action :verify_blocked_uri, only: :status - before_action only: :status do - push_frontend_feature_flag(:bulk_import_projects) - end feature_category :importers urgency :low diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb index 77043e174b4..9ee8e59053f 100644 --- a/app/controllers/import/fogbugz_controller.rb +++ b/app/controllers/import/fogbugz_controller.rb @@ -19,7 +19,7 @@ class Import::FogbugzController < Import::BaseController # If the URI is invalid various errors can occur return redirect_to new_import_fogbugz_path(namespace_id: params[:namespace_id]), alert: _('Could not connect to FogBugz, check your URL') end - session[:fogbugz_token] = res.get_token + session[:fogbugz_token] = res.get_token.to_s session[:fogbugz_uri] = params[:uri] redirect_to new_user_map_import_fogbugz_path(namespace_id: params[:namespace_id]) diff --git a/app/controllers/import/gitea_controller.rb b/app/controllers/import/gitea_controller.rb index 61e32650db3..047c273969c 100644 --- a/app/controllers/import/gitea_controller.rb +++ b/app/controllers/import/gitea_controller.rb @@ -71,6 +71,11 @@ class Import::GiteaController < Import::GithubController end end + override :serialized_imported_projects + def serialized_imported_projects(projects = already_added_projects) + ProjectSerializer.new.represent(projects, serializer: :import, provider_url: provider_url) + end + override :client_repos def client_repos @client_repos ||= filtered(client.repos) diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 0bee1faccf5..f0a80593926 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -53,7 +53,8 @@ class Import::GithubController < Import::BaseController render json: { imported_projects: serialized_imported_projects, provider_repos: serialized_provider_repos, incompatible_repos: serialized_incompatible_repos, - page_info: client_repos_response[:page_info] } + page_info: client_repos_response[:page_info], + provider_repo_count: client_repos_response[:count] } end format.html do @@ -110,6 +111,14 @@ class Import::GithubController < Import::BaseController render json: canceled end + def counts + render json: { + owned: client_proxy.count_repos_by('owned', current_user.id), + collaborated: client_proxy.count_repos_by('collaborated', current_user.id), + organization: client_proxy.count_repos_by('organization', current_user.id) + } + end + protected override :importable_repos @@ -145,7 +154,10 @@ class Import::GithubController < Import::BaseController end def serialized_imported_projects(projects = already_added_projects) - ProjectSerializer.new.represent(projects, serializer: :import, provider_url: provider_url) + ProjectSerializer.new.represent( + projects, + serializer: :import, provider_url: provider_url, client: client_proxy + ) end def expire_etag_cache @@ -245,11 +257,7 @@ class Import::GithubController < Import::BaseController { before: params[:before].presence, after: params[:after].presence, - first: PAGE_LENGTH, - # TODO: remove after rollout FF github_client_fetch_repos_via_graphql - # https://gitlab.com/gitlab-org/gitlab/-/issues/385649 - page: [1, params[:page].to_i].max, - per_page: PAGE_LENGTH + first: PAGE_LENGTH } end diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 2a7f2d42e2a..0a2c98af8ec 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -13,7 +13,7 @@ class InvitesController < ApplicationController respond_to :html - feature_category :authentication_and_authorization + feature_category :system_access def show accept if skip_invitation_prompt? diff --git a/app/controllers/jira_connect/public_keys_controller.rb b/app/controllers/jira_connect/public_keys_controller.rb index 4505ab16926..8cb932c087f 100644 --- a/app/controllers/jira_connect/public_keys_controller.rb +++ b/app/controllers/jira_connect/public_keys_controller.rb @@ -22,8 +22,6 @@ module JiraConnect end def public_key_storage_enabled? - return true if Gitlab.config.jira_connect.enable_public_keys_storage - Gitlab::CurrentSettings.jira_connect_public_key_storage_enabled? end end diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb index 7211eebdb4b..d299613f498 100644 --- a/app/controllers/jwt_controller.rb +++ b/app/controllers/jwt_controller.rb @@ -8,7 +8,7 @@ class JwtController < ApplicationController # Add this before other actions, since we want to have the user or project prepend_before_action :auth_user, :authenticate_project_or_user - feature_category :authentication_and_authorization + feature_category :system_access # https://gitlab.com/gitlab-org/gitlab/-/issues/357037 urgency :low diff --git a/app/controllers/metrics_controller.rb b/app/controllers/metrics_controller.rb index bfd6181a940..3dfa8d7b11e 100644 --- a/app/controllers/metrics_controller.rb +++ b/app/controllers/metrics_controller.rb @@ -10,9 +10,10 @@ class MetricsController < ActionController::Base response = if Gitlab::Metrics.prometheus_metrics_enabled? metrics_service.metrics_text else - help_page = help_page_url('administration/monitoring/prometheus/gitlab_metrics', - anchor: 'gitlab-prometheus-metrics' - ) + help_page = help_page_url( + 'administration/monitoring/prometheus/gitlab_metrics', + anchor: 'gitlab-prometheus-metrics' + ) "# Metrics are disabled, see: #{help_page}\n" end diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 3b78b997da1..7a31738188a 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -23,9 +23,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController set_index_vars end - def show - @created = get_created_session if Feature.disabled?('hash_oauth_secrets') - end + def show; end def create @application = Applications::CreateService.new(current_user, application_params).execute(request) @@ -33,20 +31,27 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController if @application.persisted? flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create]) - if Feature.enabled?('hash_oauth_secrets') - @created = true - render :show - else - set_created_session - - redirect_to oauth_application_url(@application) - end + @created = true + render :show else set_index_vars render :index end end + def renew + set_application + + @application.renew_secret + + if @application.save + flash.now[:notice] = s_('AuthorizedApplication|Application secret was successfully updated.') + render :show + else + redirect_to oauth_application_url(@application) + end + end + private def verify_user_oauth_applications_enabled diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 43bf895ea76..96a3fab7e1a 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -108,8 +108,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController end def dangerous_scopes? - doorkeeper_application&.includes_scope?(*::Gitlab::Auth::API_SCOPE, *::Gitlab::Auth::READ_API_SCOPE, - *::Gitlab::Auth::ADMIN_SCOPES, *::Gitlab::Auth::REPOSITORY_SCOPES, - *::Gitlab::Auth::REGISTRY_SCOPES) && !doorkeeper_application&.trusted? + doorkeeper_application&.includes_scope?( + *::Gitlab::Auth::API_SCOPE, *::Gitlab::Auth::READ_API_SCOPE, + *::Gitlab::Auth::ADMIN_SCOPES, *::Gitlab::Auth::REPOSITORY_SCOPES, + *::Gitlab::Auth::REGISTRY_SCOPES + ) && !doorkeeper_application&.trusted? end end diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb index 3f476c0d717..6fc2eb6bc45 100644 --- a/app/controllers/oauth/authorized_applications_controller.rb +++ b/app/controllers/oauth/authorized_applications_controller.rb @@ -20,7 +20,7 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio end redirect_to applications_profile_url, - status: :found, - notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy]) + status: :found, + notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy]) end end diff --git a/app/controllers/oauth/jira_dvcs/authorizations_controller.rb b/app/controllers/oauth/jira_dvcs/authorizations_controller.rb index 03921761f45..82a6784d2d1 100644 --- a/app/controllers/oauth/jira_dvcs/authorizations_controller.rb +++ b/app/controllers/oauth/jira_dvcs/authorizations_controller.rb @@ -16,10 +16,12 @@ class Oauth::JiraDvcs::AuthorizationsController < ApplicationController def new session[:redirect_uri] = params['redirect_uri'] - redirect_to oauth_authorization_path(client_id: params['client_id'], - response_type: 'code', - scope: normalize_scope(params['scope']), - redirect_uri: oauth_jira_dvcs_callback_url) + redirect_to oauth_authorization_path( + client_id: params['client_id'], + response_type: 'code', + scope: normalize_scope(params['scope']), + redirect_uri: oauth_jira_dvcs_callback_url + ) end # 2. Handle the callback call as we were a Github Enterprise instance client. diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 4046433f8ea..daed4023d02 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -12,7 +12,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController protect_from_forgery except: [:cas3, :failure] + AuthHelper.saml_providers, with: :exception, prepend: true - feature_category :authentication_and_authorization + feature_category :system_access def handle_omniauth omniauth_flow(Gitlab::Auth::OAuth) @@ -22,6 +22,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController alias_method provider, :handle_omniauth end + # overridden in EE + def openid_connect + handle_omniauth + end + # Extend the standard implementation to also increment # the number of failed sign in attempts def failure diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb index 38cdb16c350..38839497fb6 100644 --- a/app/controllers/passwords_controller.rb +++ b/app/controllers/passwords_controller.rb @@ -12,7 +12,7 @@ class PasswordsController < Devise::PasswordsController before_action :check_password_authentication_available, only: [:create] before_action :throttle_reset, only: [:create] - feature_category :authentication_and_authorization + feature_category :system_access # rubocop: disable CodeReuse/ActiveRecord def edit diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index cb8b2783000..eb64016379d 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -3,7 +3,7 @@ class Profiles::AccountsController < Profiles::ApplicationController include AuthHelper - feature_category :authentication_and_authorization + feature_category :system_access urgency :low, [:show] def show diff --git a/app/controllers/profiles/active_sessions_controller.rb b/app/controllers/profiles/active_sessions_controller.rb index 2607ba7d404..5a86179b89f 100644 --- a/app/controllers/profiles/active_sessions_controller.rb +++ b/app/controllers/profiles/active_sessions_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Profiles::ActiveSessionsController < Profiles::ApplicationController - feature_category :authentication_and_authorization + feature_category :system_access def index @sessions = ActiveSession.list(current_user).reject(&:is_impersonated) diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb index c88616b6d6c..28a57ef19f6 100644 --- a/app/controllers/profiles/emails_controller.rb +++ b/app/controllers/profiles/emails_controller.rb @@ -3,9 +3,9 @@ class Profiles::EmailsController < Profiles::ApplicationController before_action :find_email, only: [:destroy, :resend_confirmation_instructions] before_action -> { check_rate_limit!(:profile_add_new_email, scope: current_user, redirect_back: true) }, - only: [:create] + only: [:create] before_action -> { check_rate_limit!(:profile_resend_email_confirmation, scope: current_user, redirect_back: true) }, - only: [:resend_confirmation_instructions] + only: [:resend_confirmation_instructions] feature_category :user_profile urgency :low, [:index] diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb index 9323d266cd5..b663a75f04a 100644 --- a/app/controllers/profiles/notifications_controller.rb +++ b/app/controllers/profiles/notifications_controller.rb @@ -43,7 +43,10 @@ class Profiles::NotificationsController < Profiles::ApplicationController .preload_source_route projects = project_notifications.map(&:source) - ActiveRecord::Associations::Preloader.new.preload(projects, { namespace: [:route, :owner], group: [] }) + ActiveRecord::Associations::Preloader.new( + records: projects, + associations: { namespace: [:route, :owner], group: [] } + ).call Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects, current_user).execute project_notifications.select { |notification| current_user.can?(:read_project, notification.source) } diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb index 738c41207d5..7a0dfbbba0d 100644 --- a/app/controllers/profiles/passwords_controller.rb +++ b/app/controllers/profiles/passwords_controller.rb @@ -11,7 +11,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController layout :determine_layout - feature_category :authentication_and_authorization + feature_category :system_access def new end diff --git a/app/controllers/profiles/personal_access_tokens_controller.rb b/app/controllers/profiles/personal_access_tokens_controller.rb index 1663aa61f62..4b6e2f768fa 100644 --- a/app/controllers/profiles/personal_access_tokens_controller.rb +++ b/app/controllers/profiles/personal_access_tokens_controller.rb @@ -3,7 +3,7 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController include RenderAccessTokens - feature_category :authentication_and_authorization + feature_category :system_access before_action :check_personal_access_tokens_enabled @@ -25,7 +25,10 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController def create result = ::PersonalAccessTokens::CreateService.new( - current_user: current_user, target_user: current_user, params: personal_access_token_params + current_user: current_user, + target_user: current_user, + params: personal_access_token_params, + concatenate_errors: false ).execute @personal_access_token = result.payload[:personal_access_token] diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb index aded295bfab..8f482cf6e2f 100644 --- a/app/controllers/profiles/two_factor_auths_controller.rb +++ b/app/controllers/profiles/two_factor_auths_controller.rb @@ -8,11 +8,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController helper_method :current_password_required? - before_action do - push_frontend_feature_flag(:webauthn) - end - - feature_category :authentication_and_authorization + feature_category :system_access def show setup_show_page @@ -41,32 +37,12 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController @error = { message: _('Invalid pin code.') } @qr_code = build_qr_code @account_string = account_string - - if Feature.enabled?(:webauthn) - setup_webauthn_registration - else - setup_u2f_registration - end + setup_webauthn_registration render 'show' end end - # A U2F (universal 2nd factor) device's information is stored after successful - # registration, which is then used while 2FA authentication is taking place. - def create_u2f - @u2f_registration = U2fRegistration.register(current_user, u2f_app_id, device_registration_params, session[:challenges]) - - if @u2f_registration.persisted? - session.delete(:challenges) - redirect_to profile_two_factor_auth_path, notice: s_("Your U2F device was registered!") - else - @qr_code = build_qr_code - setup_u2f_registration - render :show - end - end - def create_webauthn @webauthn_registration = Webauthn::RegisterService.new(current_user, device_registration_params, session[:challenge]).execute @@ -175,22 +151,6 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController Gitlab.config.gitlab.host end - # Setup in preparation of communication with a U2F (universal 2nd factor) device - # Actual communication is performed using a Javascript API - def setup_u2f_registration - @u2f_registration ||= U2fRegistration.new - @registrations = u2f_registrations - u2f = U2F::U2F.new(u2f_app_id) - - registration_requests = u2f.registration_requests - sign_requests = u2f.authentication_requests(current_user.u2f_registrations.map(&:key_handle)) - session[:challenges] = registration_requests.map(&:challenge) - - gon.push(u2f: { challenges: session[:challenges], app_id: u2f_app_id, - register_requests: registration_requests, - sign_requests: sign_requests }) - end - def device_registration_params params.require(:device_registration).permit(:device_response, :name) end diff --git a/app/controllers/profiles/u2f_registrations_controller.rb b/app/controllers/profiles/u2f_registrations_controller.rb deleted file mode 100644 index 32ca303e722..00000000000 --- a/app/controllers/profiles/u2f_registrations_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class Profiles::U2fRegistrationsController < Profiles::ApplicationController - feature_category :authentication_and_authorization - - def destroy - u2f_registration = current_user.u2f_registrations.find(params[:id]) - u2f_registration.destroy - redirect_to profile_two_factor_auth_path, status: :found, notice: _("Successfully deleted U2F device.") - end -end diff --git a/app/controllers/profiles/webauthn_registrations_controller.rb b/app/controllers/profiles/webauthn_registrations_controller.rb index a4a6d84f1ae..345d7bdbca8 100644 --- a/app/controllers/profiles/webauthn_registrations_controller.rb +++ b/app/controllers/profiles/webauthn_registrations_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Profiles::WebauthnRegistrationsController < Profiles::ApplicationController - feature_category :authentication_and_authorization + feature_category :system_access def destroy webauthn_registration = current_user.webauthn_registrations.find(params[:id]) diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 45b274fc920..70487915707 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -17,7 +17,7 @@ class ProfilesController < Profiles::ApplicationController feature_category :user_profile, [:show, :update, :reset_incoming_email_token, :reset_feed_token, :reset_static_object_token, :update_username] - feature_category :authentication_and_authorization, [:audit_log] + feature_category :system_access, [:audit_log] urgency :low, [:show, :update] def show diff --git a/app/controllers/projects/airflow/dags_controller.rb b/app/controllers/projects/airflow/dags_controller.rb deleted file mode 100644 index 9d1f0b0d63b..00000000000 --- a/app/controllers/projects/airflow/dags_controller.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -module Projects - module Airflow - class DagsController < ::Projects::ApplicationController - before_action :check_feature_flag - before_action :authorize_read_airflow_dags! - - feature_category :dataops - - MAX_DAGS_PER_PAGE = 15 - def index - page = params[:page].to_i - page = 1 if page <= 0 - - @dags = ::Airflow::Dags.by_project_id(@project.id) - - return unless @dags.any? - - @dags = @dags.page(page).per(MAX_DAGS_PER_PAGE) - return redirect_to(url_for(page: @dags.total_pages)) if @dags.out_of_range? - - @pagination = { - page: page, - is_last_page: @dags.last_page?, - per_page: MAX_DAGS_PER_PAGE, - total_items: @dags.total_count - } - end - - private - - def check_feature_flag - render_404 unless Feature.enabled?(:airflow_dags, @project) - end - end - end -end diff --git a/app/controllers/projects/analytics/cycle_analytics/stages_controller.rb b/app/controllers/projects/analytics/cycle_analytics/stages_controller.rb index a61b774f9c8..e9477ee3221 100644 --- a/app/controllers/projects/analytics/cycle_analytics/stages_controller.rb +++ b/app/controllers/projects/analytics/cycle_analytics/stages_controller.rb @@ -20,6 +20,11 @@ class Projects::Analytics::CycleAnalytics::StagesController < Projects::Applicat @project.project_namespace end + override :all_cycle_analytics_params + def all_cycle_analytics_params + super.merge({ namespace: @project.project_namespace }) + end + override :cycle_analytics_configuration def cycle_analytics_configuration(stages) super(stages.select { |stage| permitted_stage?(stage) }) diff --git a/app/controllers/projects/analytics/cycle_analytics/summary_controller.rb b/app/controllers/projects/analytics/cycle_analytics/summary_controller.rb index 69327feeb02..96d7ad79e88 100644 --- a/app/controllers/projects/analytics/cycle_analytics/summary_controller.rb +++ b/app/controllers/projects/analytics/cycle_analytics/summary_controller.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class Projects::Analytics::CycleAnalytics::SummaryController < Projects::ApplicationController + extend ::Gitlab::Utils::Override include CycleAnalyticsParams respond_to :json @@ -17,6 +18,11 @@ class Projects::Analytics::CycleAnalytics::SummaryController < Projects::Applica private + override :all_cycle_analytics_params + def all_cycle_analytics_params + super.merge({ namespace: @project.project_namespace }) + end + def project_level @project_level ||= Analytics::CycleAnalytics::ProjectLevel.new(project: @project, options: options(allowed_params)) end diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index 5f8060ad756..65576bcade6 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -19,6 +19,10 @@ class Projects::ArtifactsController < Projects::ApplicationController before_action :validate_artifacts!, except: [:index, :download, :raw, :destroy] before_action :entry, only: [:external_file, :file] + before_action only: :index do + push_frontend_feature_flag(:ci_job_artifact_bulk_destroy, @project) + end + MAX_PER_PAGE = 20 feature_category :build_artifacts diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index 70d9b524e4d..5db7609e07a 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -3,8 +3,6 @@ class Projects::AvatarsController < Projects::ApplicationController include SendsBlob - skip_before_action :default_cache_headers, only: :show - before_action :authorize_admin_project!, only: [:destroy] feature_category :projects diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb index dbbffc4c283..372da64cdfa 100644 --- a/app/controllers/projects/badges_controller.rb +++ b/app/controllers/projects/badges_controller.rb @@ -40,6 +40,7 @@ class Projects::BadgesController < Projects::ApplicationController .new(project, current_user, opts: { key_text: params[:key_text], key_width: params[:key_width], + value_width: params[:value_width], order_by: params[:order_by] }) diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb index cfff281604e..d41b347dc5a 100644 --- a/app/controllers/projects/blame_controller.rb +++ b/app/controllers/projects/blame_controller.rb @@ -23,13 +23,47 @@ class Projects::BlameController < Projects::ApplicationController environment_params[:find_latest] = true @environment = ::Environments::EnvironmentsByDeploymentsFinder.new(@project, current_user, environment_params).execute.last - blame_service = Projects::BlameService.new(@blob, @commit, params.permit(:page, :no_pagination)) + permitted_params = params.permit(:page, :no_pagination, :streaming) + blame_service = Projects::BlameService.new(@blob, @commit, permitted_params) @blame = Gitlab::View::Presenter::Factory.new(blame_service.blame, project: @project, path: @path, page: blame_service.page).fabricate! - @blame_pagination = blame_service.pagination + @entire_blame_path = full_blame_path(no_pagination: true) + @blame_pages_url = blame_pages_url(permitted_params) + if blame_service.streaming_possible + @entire_blame_path = full_blame_path(streaming: true) + end + + @streaming_enabled = blame_service.streaming_enabled + @blame_pagination = blame_service.pagination unless @streaming_enabled @blame_per_page = blame_service.per_page + + render locals: { total_extra_pages: blame_service.total_extra_pages } + end + + def page + @blob = @repository.blob_at(@commit.id, @path) + + environment_params = @repository.branch_exists?(@ref) ? { ref: @ref } : { commit: @commit } + environment_params[:find_latest] = true + @environment = ::Environments::EnvironmentsByDeploymentsFinder.new(@project, current_user, environment_params).execute.last + + blame_service = Projects::BlameService.new(@blob, @commit, params.permit(:page, :streaming)) + + @blame = Gitlab::View::Presenter::Factory.new(blame_service.blame, project: @project, path: @path, page: blame_service.page).fabricate! + + render partial: 'page' + end + + private + + def full_blame_path(params) + namespace_project_blame_path(namespace_id: @project.namespace, project_id: @project, id: @id, **params) + end + + def blame_pages_url(params) + namespace_project_blame_page_url(namespace_id: @project.namespace, project_id: @project, id: @id, **params) end end diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 59cea00e26b..3413aeb6f8a 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -10,7 +10,7 @@ class Projects::BlobController < Projects::ApplicationController include RedirectsForMissingPathOnTree include SourcegraphDecorator include DiffHelper - include RedisTracking + include ProductAnalyticsTracking extend ::Gitlab::Utils::Override prepend_before_action :authenticate_user!, only: [:edit] @@ -37,7 +37,11 @@ class Projects::BlobController < Projects::ApplicationController before_action :validate_diff_params, only: :diff before_action :set_last_commit_sha, only: [:edit, :update] - track_redis_hll_event :create, :update, name: 'g_edit_by_sfe' + track_event :create, :update, + name: 'g_edit_by_sfe', + action: 'perform_sfe_action', + label: 'usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit', + destinations: [:redis_hll, :snowplow] feature_category :source_code_management urgency :low, [:create, :show, :edit, :update, :diff] @@ -53,10 +57,13 @@ class Projects::BlobController < Projects::ApplicationController end def create - create_commit(Files::CreateService, success_notice: _("The file has been successfully created."), - success_path: -> { project_blob_path(@project, File.join(@branch_name, @file_path)) }, - failure_view: :new, - failure_path: project_new_blob_path(@project, @ref)) + create_commit( + Files::CreateService, + success_notice: _("The file has been successfully created."), + success_path: -> { project_blob_path(@project, File.join(@branch_name, @file_path)) }, + failure_view: :new, + failure_path: project_new_blob_path(@project, @ref) + ) end def show @@ -86,9 +93,11 @@ class Projects::BlobController < Projects::ApplicationController def update @path = params[:file_path] if params[:file_path].present? - create_commit(Files::UpdateService, success_path: -> { after_edit_path }, - failure_view: :edit, - failure_path: project_blob_path(@project, @id)) + create_commit( + Files::UpdateService, success_path: -> { after_edit_path }, + failure_view: :edit, + failure_path: project_blob_path(@project, @id) + ) rescue Files::UpdateService::FileChangedError @conflict = true render :edit @@ -106,9 +115,12 @@ class Projects::BlobController < Projects::ApplicationController end def destroy - create_commit(Files::DeleteService, success_notice: _("The file has been successfully deleted."), - success_path: -> { after_delete_path }, - failure_path: project_blob_path(@project, @id)) + create_commit( + Files::DeleteService, + success_notice: _("The file has been successfully deleted."), + success_path: -> { after_delete_path }, + failure_path: project_blob_path(@project, @id) + ) end def diff @@ -308,6 +320,12 @@ class Projects::BlobController < Projects::ApplicationController file = file.cdn_enabled_url(request.remote_ip) if file.respond_to?(:cdn_enabled_url) file.url end + + alias_method :tracking_project_source, :project + + def tracking_namespace_source + project&.namespace + end end Projects::BlobController.prepend_mod diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index f19f143816f..1e17dd586c7 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -98,7 +98,7 @@ class Projects::BranchesController < Projects::ApplicationController if success render json: { name: branch_name, url: project_tree_url(@project, branch_name) } else - render json: result[:messsage], status: :unprocessable_entity + render json: result[:message], status: :unprocessable_entity end end end diff --git a/app/controllers/projects/ci/lints_controller.rb b/app/controllers/projects/ci/lints_controller.rb index 7ef5016ac00..6762f1c7110 100644 --- a/app/controllers/projects/ci/lints_controller.rb +++ b/app/controllers/projects/ci/lints_controller.rb @@ -3,7 +3,7 @@ class Projects::Ci::LintsController < Projects::ApplicationController before_action :authorize_create_pipeline! - feature_category :pipeline_authoring + feature_category :pipeline_composition respond_to :json, only: [:create] urgency :low, [:create] diff --git a/app/controllers/projects/ci/pipeline_editor_controller.rb b/app/controllers/projects/ci/pipeline_editor_controller.rb index 3a2bc445737..45584f3048a 100644 --- a/app/controllers/projects/ci/pipeline_editor_controller.rb +++ b/app/controllers/projects/ci/pipeline_editor_controller.rb @@ -6,7 +6,7 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController push_frontend_feature_flag(:ci_job_assistant_drawer, @project) end - feature_category :pipeline_authoring + feature_category :pipeline_composition urgency :low, [:show] diff --git a/app/controllers/projects/ci/prometheus_metrics/histograms_controller.rb b/app/controllers/projects/ci/prometheus_metrics/histograms_controller.rb index 003441d4b91..72a07269d79 100644 --- a/app/controllers/projects/ci/prometheus_metrics/histograms_controller.rb +++ b/app/controllers/projects/ci/prometheus_metrics/histograms_controller.rb @@ -4,7 +4,7 @@ module Projects module Ci module PrometheusMetrics class HistogramsController < Projects::ApplicationController - feature_category :pipeline_authoring + feature_category :pipeline_composition respond_to :json, only: [:create] diff --git a/app/controllers/projects/cluster_agents_controller.rb b/app/controllers/projects/cluster_agents_controller.rb index 3f759e5c18c..e0c9763abb6 100644 --- a/app/controllers/projects/cluster_agents_controller.rb +++ b/app/controllers/projects/cluster_agents_controller.rb @@ -1,7 +1,10 @@ # frozen_string_literal: true class Projects::ClusterAgentsController < Projects::ApplicationController + include KasCookie + before_action :authorize_can_read_cluster_agent! + before_action :set_kas_cookie, only: [:show], if: -> { current_user } feature_category :kubernetes_management urgency :low diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 252b203b38a..a86a0fb3bd2 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -115,8 +115,12 @@ class Projects::CommitController < Projects::ApplicationController @branch_name = create_new_branch? ? @commit.revert_branch_name : @start_branch - create_commit(Commits::RevertService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully reverted.", - success_path: -> { successful_change_path(@project) }, failure_path: failed_change_path) + create_commit( + Commits::RevertService, + success_notice: "The #{@commit.change_type_title(current_user)} has been successfully reverted.", + success_path: -> { successful_change_path(@project) }, + failure_path: failed_change_path + ) end def cherry_pick @@ -131,10 +135,13 @@ class Projects::CommitController < Projects::ApplicationController @branch_name = create_new_branch? ? @commit.cherry_pick_branch_name : @start_branch - create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked into #{@branch_name}.", - success_path: -> { successful_change_path(target_project) }, - failure_path: failed_change_path, - target_project: target_project) + create_commit( + Commits::CherryPickService, + success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked into #{@branch_name}.", + success_path: -> { successful_change_path(target_project) }, + failure_path: failed_change_path, + target_project: target_project + ) end private diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index 3acc71d5dd3..c2f1d1ed362 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -7,7 +7,6 @@ class Projects::CommitsController < Projects::ApplicationController include RendersCommits COMMITS_DEFAULT_LIMIT = 40 - prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) } around_action :allow_gitaly_ref_name_caching before_action :require_non_empty_project @@ -77,15 +76,22 @@ class Projects::CommitsController < Projects::ApplicationController # fully_qualified_ref is available in some situations from ExtractsRef ref = @fully_qualified_ref || @ref + @commits = if search.present? @repository.find_commits_by_message(search, ref, @path, @limit, @offset) - elsif author.present? - @repository.commits(ref, author: author, path: @path, limit: @limit, offset: @offset) else - @repository.commits(ref, path: @path, limit: @limit, offset: @offset) + options = { + path: @path, + limit: @limit, + offset: @offset + } + options[:author] = author if author.present? + + @repository.commits(ref, **options) end + @commits.load_tags if Feature.enabled?(:show_tags_on_commits_view, @project) @commits.each(&:lazy_author) # preload authors @commits = @commits.with_markdown_cache.with_latest_pipeline(ref) diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb index 9fe44659250..dbed5adf2e8 100644 --- a/app/controllers/projects/cycle_analytics_controller.rb +++ b/app/controllers/projects/cycle_analytics_controller.rb @@ -11,7 +11,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController before_action :authorize_read_cycle_analytics! before_action :load_value_stream, only: :show - track_custom_event :show, + track_event :show, name: 'p_analytics_valuestream', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', @@ -22,6 +22,8 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController before_action do push_licensed_feature(:cycle_analytics_for_groups) if project.licensed_feature_available?(:cycle_analytics_for_groups) + push_licensed_feature(:group_level_analytics_dashboard) if project.licensed_feature_available?(:group_level_analytics_dashboard) + push_frontend_feature_flag(:group_analytics_dashboards_page, @project.namespace) end def show @@ -44,7 +46,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController override :all_cycle_analytics_params def all_cycle_analytics_params - super.merge({ project: @project, value_stream: @value_stream }) + super.merge({ namespace: @project.project_namespace, value_stream: @value_stream }) end def load_value_stream diff --git a/app/controllers/projects/design_management/designs/raw_images_controller.rb b/app/controllers/projects/design_management/designs/raw_images_controller.rb index beb7e9d294b..ea406d2f2ef 100644 --- a/app/controllers/projects/design_management/designs/raw_images_controller.rb +++ b/app/controllers/projects/design_management/designs/raw_images_controller.rb @@ -7,8 +7,6 @@ module Projects class RawImagesController < Projects::DesignManagement::DesignsController include SendsBlob - skip_before_action :default_cache_headers, only: :show - def show blob = design_repository.blob_at(ref, design.full_path) diff --git a/app/controllers/projects/design_management/designs/resized_image_controller.rb b/app/controllers/projects/design_management/designs/resized_image_controller.rb index 6bf304419e1..a09d8a73892 100644 --- a/app/controllers/projects/design_management/designs/resized_image_controller.rb +++ b/app/controllers/projects/design_management/designs/resized_image_controller.rb @@ -10,8 +10,6 @@ module Projects before_action :validate_size! before_action :validate_sha! - skip_before_action :default_cache_headers, only: :show - def show relation = design.actions relation = relation.up_to_version(version) if version diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 9a88a8160b6..ad498a4ac86 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -20,6 +20,10 @@ class Projects::EnvironmentsController < Projects::ApplicationController push_frontend_feature_flag(:environment_details_vue, @project) end + before_action only: [:index] do + push_frontend_feature_flag(:kas_user_access_project, @project) + end + before_action :authorize_read_environment!, except: [:metrics, :additional_metrics, :metrics_dashboard, :metrics_redirect] before_action :authorize_create_environment!, only: [:new, :create] before_action :authorize_stop_environment!, only: [:stop] @@ -30,17 +34,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action :expire_etag_cache, only: [:index], unless: -> { request.format.json? } after_action :expire_etag_cache, only: [:cancel_auto_stop] - track_event :index, - :folder, - :show, - :new, - :edit, - :create, - :update, - :stop, - :cancel_auto_stop, - :terminal, - name: 'users_visiting_environments_pages' + track_event :index, :folder, :show, :new, :edit, :create, :update, :stop, :cancel_auto_stop, :terminal, + name: 'users_visiting_environments_pages' feature_category :continuous_delivery urgency :low @@ -255,11 +250,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController def search_environments(type: nil) search = params[:search] if params[:search] && params[:search].length >= MIN_SEARCH_LENGTH - @search_environments ||= - Environments::EnvironmentsFinder.new(project, - current_user, - type: type, - search: search).execute + @search_environments ||= Environments::EnvironmentsFinder.new(project, current_user, type: type, search: search).execute end def metrics_params @@ -301,16 +292,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController def authorize_update_environment! access_denied! unless can?(current_user, :update_environment, environment) end - - def append_info_to_payload(payload) - super - - return unless Feature.enabled?(:environments_search_logging) && params[:search].present? - - # Merging to :metadata will ensure these are logged as top level keys - payload[:metadata] ||= {} - payload[:metadata]['meta.environment.search'] = params[:search] - end end Projects::EnvironmentsController.prepend_mod_with('Projects::EnvironmentsController') diff --git a/app/controllers/projects/error_tracking_controller.rb b/app/controllers/projects/error_tracking_controller.rb index d2e36ef5496..d70ee0fabea 100644 --- a/app/controllers/projects/error_tracking_controller.rb +++ b/app/controllers/projects/error_tracking_controller.rb @@ -74,8 +74,7 @@ class Projects::ErrorTrackingController < Projects::ErrorTracking::BaseControlle def render_errors(result) unless result[:status] == :success - render json: { message: result[:message] }, - status: result[:http_status] || :bad_request + render json: { message: result[:message] }, status: result[:http_status] || :bad_request end end diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb index 16392775c09..83923965a45 100644 --- a/app/controllers/projects/feature_flags_controller.rb +++ b/app/controllers/projects/feature_flags_controller.rb @@ -97,23 +97,45 @@ class Projects::FeatureFlagsController < Projects::ApplicationController end def create_params - params.require(:operations_feature_flag) - .permit(:name, :description, :active, :version, - scopes_attributes: [:environment_scope, :active, - strategies: [:name, parameters: [:groupId, :percentage, :userIds]]], - strategies_attributes: [:name, :user_list_id, - parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness], - scopes_attributes: [:environment_scope]]) + params.require(:operations_feature_flag).permit( + :name, + :description, + :active, + :version, + scopes_attributes: [ + :environment_scope, :active, + strategies: [:name, parameters: [:groupId, :percentage, :userIds]] + ], + strategies_attributes: [ + :name, + :user_list_id, + parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness], + scopes_attributes: [:environment_scope] + ] + ) end def update_params - params.require(:operations_feature_flag) - .permit(:name, :description, :active, - scopes_attributes: [:id, :environment_scope, :active, :_destroy, - strategies: [:name, parameters: [:groupId, :percentage, :userIds]]], - strategies_attributes: [:id, :name, :user_list_id, :_destroy, - parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness], - scopes_attributes: [:id, :environment_scope, :_destroy]]) + params.require(:operations_feature_flag).permit( + :name, + :description, + :active, + scopes_attributes: [ + :id, + :environment_scope, + :active, + :_destroy, + strategies: [:name, parameters: [:groupId, :percentage, :userIds]] + ], + strategies_attributes: [ + :id, + :name, + :user_list_id, + :_destroy, + parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness], + scopes_attributes: [:id, :environment_scope, :_destroy] + ] + ) end def feature_flag_json(feature_flag) @@ -144,7 +166,6 @@ class Projects::FeatureFlagsController < Projects::ApplicationController end def render_error_json(messages, status = :bad_request) - render json: { message: messages }, - status: status + render json: { message: messages }, status: status end end diff --git a/app/controllers/projects/google_cloud/base_controller.rb b/app/controllers/projects/google_cloud/base_controller.rb index dfb73821b0f..7eccc0c1c77 100644 --- a/app/controllers/projects/google_cloud/base_controller.rb +++ b/app/controllers/projects/google_cloud/base_controller.rb @@ -45,8 +45,8 @@ class Projects::GoogleCloud::BaseController < Projects::ApplicationController return_url = project_google_cloud_configuration_path(project) state = generate_session_key_redirect(request.url, return_url) @authorize_url = GoogleApi::CloudPlatform::Client.new(nil, - callback_google_api_auth_url, - state: state).authorize_url + callback_google_api_auth_url, + state: state).authorize_url redirect_to @authorize_url end diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb index d072381933a..e73e2a38149 100644 --- a/app/controllers/projects/graphs_controller.rb +++ b/app/controllers/projects/graphs_controller.rb @@ -9,7 +9,7 @@ class Projects::GraphsController < Projects::ApplicationController before_action :assign_ref_vars before_action :authorize_read_repository_graphs! - track_custom_event :charts, + track_event :charts, name: 'p_analytics_repo', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 22b6bf6faf0..4dcc9a3a43f 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -4,7 +4,8 @@ class Projects::HooksController < Projects::ApplicationController include ::WebHooks::HookActions # Authorize - before_action :authorize_admin_project! + before_action :authorize_admin_project!, except: :destroy + before_action :authorize_destroy_project_hook!, only: :destroy before_action :hook_logs, only: :edit before_action -> { check_rate_limit!(:project_testing_hook, scope: [@project, current_user]) }, only: :test @@ -41,4 +42,8 @@ class Projects::HooksController < Projects::ApplicationController def trigger_values ProjectHook.triggers.values end + + def authorize_destroy_project_hook! + render_404 unless can?(current_user, :destroy_web_hook, hook) + end end diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 21227d62023..6e38de8b0ea 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -21,6 +21,7 @@ class Projects::IssuesController < Projects::ApplicationController before_action :check_issues_available! before_action :issue, unless: ->(c) { ISSUES_EXCEPT_ACTIONS.include?(c.action_name.to_sym) } before_action :redirect_if_work_item, unless: ->(c) { ISSUES_EXCEPT_ACTIONS.include?(c.action_name.to_sym) } + before_action :require_incident_for_incident_routes, only: :show after_action :log_issue_show, only: :show @@ -47,6 +48,7 @@ class Projects::IssuesController < Projects::ApplicationController push_frontend_feature_flag(:preserve_unchanged_markdown, project) push_frontend_feature_flag(:content_editor_on_issues, project) push_frontend_feature_flag(:service_desk_new_note_email_native_attachments, project) + push_frontend_feature_flag(:saved_replies, current_user) end before_action only: [:index, :show] do @@ -64,7 +66,6 @@ class Projects::IssuesController < Projects::ApplicationController push_force_frontend_feature_flag(:work_items_mvc, project&.work_items_mvc_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?) push_frontend_feature_flag(:epic_widget_edit_confirmation, project) - push_frontend_feature_flag(:use_iid_in_work_items_path, project&.group) push_frontend_feature_flag(:incident_event_tags, project) end @@ -443,11 +444,16 @@ class Projects::IssuesController < Projects::ApplicationController def redirect_if_work_item return unless use_work_items_path?(issue) - if Feature.enabled?(:use_iid_in_work_items_path, project.group) - redirect_to project_work_items_path(project, issue.iid, params: request.query_parameters.merge(iid_path: true)) - else - redirect_to project_work_items_path(project, issue.id, params: request.query_parameters) - end + redirect_to project_work_items_path(project, issue.iid, params: request.query_parameters.merge(iid_path: true)) + end + + def require_incident_for_incident_routes + return unless params[:incident_tab].present? + return if issue.incident? + + # Redirect instead of 404 to gracefully handle + # issue type changes + redirect_to project_issue_path(project, issue) end end diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 3fea5c694f7..36fa1fab68f 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -128,8 +128,7 @@ class Projects::JobsController < Projects::ApplicationController service_response = Ci::BuildEraseService.new(@build, current_user).execute if service_response.success? - redirect_to project_job_path(project, @build), - notice: _("Job has been successfully erased!") + redirect_to project_job_path(project, @build), notice: _("Job has been successfully erased!") else head service_response.http_status end @@ -138,9 +137,7 @@ class Projects::JobsController < Projects::ApplicationController def raw if @build.trace.archived? workhorse_set_content_type! - send_upload(@build.job_artifacts_trace.file, - send_params: raw_send_params, - redirect_params: raw_redirect_params) + send_upload(@build.job_artifacts_trace.file, send_params: raw_send_params, redirect_params: raw_redirect_params) else @build.trace.read do |stream| if stream.file? @@ -234,10 +231,12 @@ class Projects::JobsController < Projects::ApplicationController end def build_service_specification - @build.service_specification(service: params['service'], - port: params['port'], - path: params['path'], - subprotocols: proxy_subprotocol) + @build.service_specification( + service: params['service'], + port: params['port'], + path: params['path'], + subprotocols: proxy_subprotocol + ) end def proxy_subprotocol diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 14f2e372bc5..649bead0b6d 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -82,9 +82,7 @@ class Projects::LabelsController < Projects::ApplicationController @label.destroy @labels = find_labels - redirect_to project_labels_path(@project), - status: :found, - notice: 'Label was removed' + redirect_to project_labels_path(@project), status: :found, notice: 'Label was removed' end def remove_priority @@ -138,8 +136,9 @@ class Projects::LabelsController < Projects::ApplicationController respond_to do |format| format.html do - redirect_to(project_labels_path(@project), - notice: _('Failed to promote label due to internal error. Please contact administrators.')) + redirect_to( + project_labels_path(@project), + notice: _('Failed to promote label due to internal error. Please contact administrators.')) end format.js end @@ -165,13 +164,14 @@ class Projects::LabelsController < Projects::ApplicationController end def find_labels - @available_labels ||= - LabelsFinder.new(current_user, - project_id: @project.id, - include_ancestor_groups: true, - search: params[:search], - subscribed: params[:subscribed], - sort: sort).execute + @available_labels ||= LabelsFinder.new( + current_user, + project_id: @project.id, + include_ancestor_groups: true, + search: params[:search], + subscribed: params[:subscribed], + sort: sort + ).execute end def sort diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 3b399e3294e..3a03831ab88 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -114,11 +114,10 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap @target_project = @merge_request.target_project @source_project = @merge_request.source_project - @commits = - set_commits_for_rendering( - @merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch), - commits_count: @merge_request.commits_count - ) + @commits = set_commits_for_rendering( + @merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch), + commits_count: @merge_request.commits_count + ) @commit = @merge_request.diff_head_commit diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index d92ef3de6d9..a204023e34d 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -33,6 +33,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action :check_user_can_push_to_source_branch!, only: [:rebase] before_action only: [:show, :diffs] do + push_frontend_feature_flag(:content_editor_on_issues, project) push_frontend_feature_flag(:core_security_mr_widget_counts, project) push_frontend_feature_flag(:issue_assignees_widget, @project) push_frontend_feature_flag(:refactor_security_extension, @project) @@ -40,10 +41,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:moved_mr_sidebar, project) push_frontend_feature_flag(:mr_experience_survey, project) push_frontend_feature_flag(:realtime_mr_status_change, project) - end - - before_action do - push_frontend_feature_flag(:permit_all_shared_groups_for_approval, @project) + push_frontend_feature_flag(:saved_replies, current_user) end around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :diffs, :discussions] @@ -383,10 +381,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo @merge_request.merge_request_reviewers.map(&:cache_key) ] - render_cached(@merge_request, - with: serializer, - cache_context: ->(_) { [Digest::SHA256.hexdigest(cache_context.to_s)] }, - serializer: params[:serializer]) + render_cached( + @merge_request, + with: serializer, + cache_context: ->(_) { [Digest::SHA256.hexdigest(cache_context.to_s)] }, + serializer: params[:serializer] + ) else render json: serializer.represent(@merge_request, serializer: params[:serializer]) end @@ -485,8 +485,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo AutoMergeService.new(project, current_user, merge_params).update(merge_request) else AutoMergeService.new(project, current_user, merge_params) - .execute(merge_request, - params[:auto_merge_strategy] || AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS) + .execute(merge_request, params[:auto_merge_strategy] || AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS) end else @merge_request.merge_async(current_user.id, merge_params) diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index db0762a6cff..13c2a3ab750 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -43,9 +43,7 @@ class Projects::PagesController < Projects::ApplicationController respond_to do |format| format.html do - redirect_to project_pages_path(@project), - status: :found, - notice: 'Pages were scheduled for removal' + redirect_to project_pages_path(@project), status: :found, notice: 'Pages were scheduled for removal' end end end @@ -77,7 +75,15 @@ class Projects::PagesController < Projects::ApplicationController end def project_params_attributes - %i[pages_https_only] + attributes = %i[pages_https_only] + + return attributes unless Feature.enabled?(:pages_unique_domain) + + attributes + [ + project_setting_attributes: [ + :pages_unique_domain_enabled + ] + ] end end diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb index 43952a2efe4..5cb69e8bf99 100644 --- a/app/controllers/projects/pages_domains_controller.rb +++ b/app/controllers/projects/pages_domains_controller.rb @@ -69,9 +69,7 @@ class Projects::PagesDomainsController < Projects::ApplicationController respond_to do |format| format.html do - redirect_to project_pages_path(@project), - status: :found, - notice: 'Domain was removed' + redirect_to project_pages_path(@project), status: :found, notice: 'Domain was removed' end format.js end diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index 19d031bd59b..fb332fec3b5 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -8,8 +8,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController before_action :authorize_read_pipeline_schedule! before_action :authorize_create_pipeline_schedule!, only: [:new, :create] before_action :authorize_update_pipeline_schedule!, only: [:edit, :update] - before_action :authorize_take_ownership_pipeline_schedule!, only: [:take_ownership] - before_action :authorize_admin_pipeline_schedule!, only: [:destroy] + before_action :authorize_admin_pipeline_schedule!, only: [:take_ownership, :destroy] before_action :push_schedule_feature_flag, only: [:index, :new, :edit] feature_category :continuous_integration @@ -78,9 +77,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController if schedule.destroy redirect_to pipeline_schedules_path(@project), status: :found else - redirect_to pipeline_schedules_path(@project), - status: :forbidden, - alert: _("Failed to remove the pipeline schedule") + redirect_to pipeline_schedules_path(@project), status: :forbidden, alert: _("Failed to remove the pipeline schedule") end end @@ -113,10 +110,6 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController return access_denied! unless can?(current_user, :update_pipeline_schedule, schedule) end - def authorize_take_ownership_pipeline_schedule! - return access_denied! unless can?(current_user, :take_ownership_pipeline_schedule, schedule) - end - def authorize_admin_pipeline_schedule! return access_denied! unless can?(current_user, :admin_pipeline_schedule, schedule) end diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 10f58a9f479..6fdd4906613 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -22,13 +22,14 @@ class Projects::PipelinesController < Projects::ApplicationController before_action :authorize_update_pipeline!, only: [:retry, :cancel] before_action :ensure_pipeline, only: [:show, :downloadable_artifacts] before_action :reject_if_build_artifacts_size_refreshing!, only: [:destroy] + before_action :push_frontend_feature_flags, only: [:show] # Will be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/225596 before_action :redirect_for_legacy_scope_filter, only: [:index], if: -> { request.format.html? } around_action :allow_gitaly_ref_name_caching, only: [:index, :show] - track_custom_event :charts, + track_event :charts, name: 'p_analytics_pipelines', action: 'perform_analytics_usage_action', label: 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly', @@ -98,15 +99,15 @@ class Projects::PipelinesController < Projects::ApplicationController end format.json do if service_response.success? - render json: PipelineSerializer - .new(project: project, current_user: current_user) - .represent(@pipeline), - status: :created + render json: PipelineSerializer.new(project: project, current_user: current_user).represent(@pipeline), + status: :created else - render json: { errors: @pipeline.error_messages.map(&:content), - warnings: @pipeline.warning_messages(limit: ::Gitlab::Ci::Warnings::MAX_LIMIT).map(&:content), - total_warnings: @pipeline.warning_messages.length }, - status: :bad_request + bad_request_json = { + errors: @pipeline.error_messages.map(&:content), + warnings: @pipeline.warning_messages(limit: ::Gitlab::Ci::Warnings::MAX_LIMIT).map(&:content), + total_warnings: @pipeline.warning_messages.length + } + render json: bad_request_json, status: :bad_request end end end @@ -241,7 +242,12 @@ class Projects::PipelinesController < Projects::ApplicationController PipelineSerializer .new(project: @project, current_user: @current_user) .with_pagination(request, response) - .represent(@pipelines, disable_coverage: true, preload: true) + .represent( + @pipelines, + disable_coverage: true, + preload: true, + disable_manual_and_scheduled_actions: Feature.enabled?(:lazy_load_pipeline_dropdown_actions, @project) + ) end def render_show @@ -364,6 +370,10 @@ class Projects::PipelinesController < Projects::ApplicationController def tracking_project_source project end + + def push_frontend_feature_flags + push_frontend_feature_flag(:refactor_ci_minutes_consumption, @project) + end end Projects::PipelinesController.prepend_mod_with('Projects::PipelinesController') diff --git a/app/controllers/projects/prometheus/metrics_controller.rb b/app/controllers/projects/prometheus/metrics_controller.rb index db5471ea322..c20c80ba334 100644 --- a/app/controllers/projects/prometheus/metrics_controller.rb +++ b/app/controllers/projects/prometheus/metrics_controller.rb @@ -68,7 +68,7 @@ module Projects if @metric.persisted? redirect_to edit_project_settings_integration_path(project, ::Integrations::Prometheus), - notice: _('Metric was successfully added.') + notice: _('Metric was successfully added.') else render 'new' end @@ -79,7 +79,7 @@ module Projects if @metric.update(metrics_params) redirect_to edit_project_settings_integration_path(project, ::Integrations::Prometheus), - notice: _('Metric was successfully updated.') + notice: _('Metric was successfully updated.') else render 'edit' end diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index 895a9a00624..79b5990abba 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -6,8 +6,6 @@ class Projects::RawController < Projects::ApplicationController include SendsBlob include StaticObjectExternalStorage - skip_before_action :default_cache_headers, only: :show - prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:blob) } before_action :assign_ref_vars diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index 1cd4c5b6137..80bc92c0b69 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -8,8 +8,6 @@ class Projects::RepositoriesController < Projects::ApplicationController prepend_before_action(only: [:archive]) { authenticate_sessionless_user!(:archive) } - skip_before_action :default_cache_headers, only: :archive - # Authorize before_action :check_archive_rate_limiting!, only: :archive before_action :require_non_empty_project, except: :create @@ -49,9 +47,14 @@ class Projects::RepositoriesController < Projects::ApplicationController def set_cache_headers commit_id = archive_metadata['CommitId'] - expires_in(cache_max_age(commit_id), - public: Guest.can?(:download_code, project), must_revalidate: true, stale_if_error: 5.minutes, - stale_while_revalidate: 1.minute, 's-maxage': 1.minute) + expires_in( + cache_max_age(commit_id), + public: Guest.can?(:download_code, project), + must_revalidate: true, + stale_if_error: 5.minutes, + stale_while_revalidate: 1.minute, + 's-maxage': 1.minute + ) fresh_when(strong_etag: [commit_id, archive_metadata['ArchivePath']]) end diff --git a/app/controllers/projects/security/configuration_controller.rb b/app/controllers/projects/security/configuration_controller.rb index 00a2a5d1193..ee2e60b5a1a 100644 --- a/app/controllers/projects/security/configuration_controller.rb +++ b/app/controllers/projects/security/configuration_controller.rb @@ -32,9 +32,7 @@ module Projects end def configuration_presenter - ::Projects::Security::ConfigurationPresenter.new(project, - **presenter_attributes, - current_user: current_user) + ::Projects::Security::ConfigurationPresenter.new(project, **presenter_attributes, current_user: current_user) end def presenter_attributes diff --git a/app/controllers/projects/settings/access_tokens_controller.rb b/app/controllers/projects/settings/access_tokens_controller.rb index 0884816ef62..af1527ba6a3 100644 --- a/app/controllers/projects/settings/access_tokens_controller.rb +++ b/app/controllers/projects/settings/access_tokens_controller.rb @@ -7,7 +7,7 @@ module Projects include AccessTokensActions layout 'project_settings' - feature_category :authentication_and_authorization + feature_category :system_access alias_method :resource, :project diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 4ca665679c0..f5588a35ad5 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -13,7 +13,7 @@ module Projects before_action :define_variables before_action do - push_frontend_feature_flag(:ci_inbound_job_token_scope, @project) + push_frontend_feature_flag(:ci_variables_pages, current_user) end helper_method :highlight_badge diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index 737a6290431..ba18a2e0dce 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -40,9 +40,12 @@ class Projects::TreeController < Projects::ApplicationController def create_dir return render_404 unless @commit_params.values.all? - create_commit(Files::CreateDirService, success_notice: _("The directory has been successfully created."), - success_path: project_tree_path(@project, File.join(@branch_name, @dir_name)), - failure_path: project_tree_path(@project, @ref)) + create_commit( + Files::CreateDirService, + success_notice: _("The directory has been successfully created."), + success_path: project_tree_path(@project, File.join(@branch_name, @dir_name)), + failure_path: project_tree_path(@project, @ref) + ) end private diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb index a83ccccbeae..e50ddf75183 100644 --- a/app/controllers/projects/variables_controller.rb +++ b/app/controllers/projects/variables_controller.rb @@ -3,7 +3,7 @@ class Projects::VariablesController < Projects::ApplicationController before_action :authorize_admin_build! - feature_category :pipeline_authoring + feature_category :pipeline_composition urgency :low, [:show, :update] diff --git a/app/controllers/projects/web_ide_terminals_controller.rb b/app/controllers/projects/web_ide_terminals_controller.rb index cfccc949244..be7423e3919 100644 --- a/app/controllers/projects/web_ide_terminals_controller.rb +++ b/app/controllers/projects/web_ide_terminals_controller.rb @@ -29,10 +29,7 @@ class Projects::WebIdeTerminalsController < Projects::ApplicationController end def create - result = ::Ci::CreateWebIdeTerminalService.new(project, - current_user, - ref: params[:branch]) - .execute + result = ::Ci::CreateWebIdeTerminalService.new(project, current_user, ref: params[:branch]).execute if result[:status] == :error render status: :bad_request, json: result[:message] diff --git a/app/controllers/projects/work_items_controller.rb b/app/controllers/projects/work_items_controller.rb index db9dca14aab..34a71dbbb91 100644 --- a/app/controllers/projects/work_items_controller.rb +++ b/app/controllers/projects/work_items_controller.rb @@ -5,7 +5,7 @@ class Projects::WorkItemsController < Projects::ApplicationController push_force_frontend_feature_flag(:work_items, project&.work_items_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc, project&.work_items_mvc_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?) - push_frontend_feature_flag(:use_iid_in_work_items_path, project&.group) + push_force_frontend_feature_flag(:saved_replies, current_user) end feature_category :team_planning diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 71ad747b6b1..f18055f80b7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -39,7 +39,7 @@ class ProjectsController < Projects::ApplicationController before_action do push_frontend_feature_flag(:highlight_js, @project) push_frontend_feature_flag(:file_line_blame, @project) - push_frontend_feature_flag(:increase_page_size_exponentially, @project) + push_frontend_feature_flag(:synchronize_fork, @project) push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks) push_licensed_feature(:security_orchestration_policies) if @project.present? && @project.licensed_feature_available?(:security_orchestration_policies) push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?) @@ -78,6 +78,8 @@ class ProjectsController < Projects::ApplicationController @namespace = Namespace.find_by(id: params[:namespace_id]) if params[:namespace_id] return access_denied! if @namespace && !can?(current_user, :create_projects, @namespace) + @parent_group = Group.find_by(id: params[:namespace_id]) + @current_user_group = if current_user.manageable_groups(include_groups_with_developer_maintainer_access: true).count == 1 current_user.manageable_groups(include_groups_with_developer_maintainer_access: true).first diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb index cfb4e939b35..87fcb499d21 100644 --- a/app/controllers/registrations/welcome_controller.rb +++ b/app/controllers/registrations/welcome_controller.rb @@ -10,7 +10,7 @@ module Registrations skip_before_action :authenticate_user!, :required_signup_info, :check_two_factor_requirement, only: [:show, :update] before_action :require_current_user - feature_category :authentication_and_authorization + feature_category :user_management def show return redirect_to path_for_signed_in_user(current_user) if completed_welcome_step? @@ -50,7 +50,7 @@ module Registrations def requires_confirmation?(user) return false if user.confirmed? - return false if Feature.enabled?(:soft_email_confirmation) + return false unless Gitlab::CurrentSettings.email_confirmation_setting_hard? true end diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index ed0e019d02b..b4eee3549a0 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -25,10 +25,11 @@ class RegistrationsController < Devise::RegistrationsController before_action only: [:new] do push_frontend_feature_flag(:gitlab_gtm_datalayer, type: :ops) - push_frontend_feature_flag(:trial_email_validation, type: :development) end - feature_category :authentication_and_authorization + feature_category :user_management + + helper_method :arkose_labs_enabled? def new @resource = build_resource @@ -128,13 +129,16 @@ class RegistrationsController < Devise::RegistrationsController def after_inactive_sign_up_path_for(resource) Gitlab::AppLogger.info(user_created_message) return new_user_session_path(anchor: 'login-pane') if resource.blocked_pending_approval? - return dashboard_projects_path if Feature.enabled?(:soft_email_confirmation) + return dashboard_projects_path if Gitlab::CurrentSettings.email_confirmation_setting_soft? - # when email confirmation is enabled, path to redirect is saved + # when email_confirmation_setting is set to `hard`, path to redirect is saved # after user confirms and comes back, he will be redirected store_location_for(:redirect, after_sign_up_path) - return identity_verification_redirect_path if custom_confirmation_enabled? + if custom_confirmation_enabled? + session[:verification_user_id] = resource.id # This is needed to find the user on the identity verification page + return identity_verification_redirect_path + end Gitlab::Tracking.event(self.class.name, 'render', user: resource) users_almost_there_path(email: resource.email) @@ -221,7 +225,7 @@ class RegistrationsController < Devise::RegistrationsController def resource @resource ||= Users::RegistrationsBuildService - .new(current_user, sign_up_params.merge({ skip_confirmation: registered_with_invite_email?, + .new(current_user, sign_up_params.merge({ skip_confirmation: skip_confirmation?, preferred_language: preferred_language })) .execute end @@ -230,6 +234,10 @@ class RegistrationsController < Devise::RegistrationsController @devise_mapping ||= Devise.mappings[:user] end + def skip_confirmation? + registered_with_invite_email? + end + def registered_with_invite_email? invite_email = session.delete(:invite_email) @@ -293,6 +301,10 @@ class RegistrationsController < Devise::RegistrationsController def send_custom_confirmation_instructions # overridden by EE module end + + def arkose_labs_enabled? + false + end end RegistrationsController.prepend_mod_with('RegistrationsController') diff --git a/app/controllers/repositories/git_http_controller.rb b/app/controllers/repositories/git_http_controller.rb index bd3461d8331..4f228ced542 100644 --- a/app/controllers/repositories/git_http_controller.rb +++ b/app/controllers/repositories/git_http_controller.rb @@ -8,6 +8,7 @@ module Repositories prepend_before_action :deny_head_requests, only: [:info_refs] rescue_from Gitlab::GitAccess::ForbiddenError, with: :render_403_with_exception + rescue_from JWT::DecodeError, with: :render_403_with_exception rescue_from Gitlab::GitAccess::NotFoundError, with: :render_404_with_exception rescue_from Gitlab::GitAccessProject::CreationError, with: :render_422_with_exception rescue_from Gitlab::GitAccess::TimeoutError, with: :render_503_with_exception @@ -19,6 +20,7 @@ module Repositories # GET /foo/bar.git/info/refs?service=git-receive-pack (git push) def info_refs log_user_activity if upload_pack? + log_user_activity if receive_pack? && Feature.enabled?(:log_user_git_push_activity) render_ok end @@ -49,6 +51,10 @@ module Repositories git_command == 'git-upload-pack' end + def receive_pack? + git_command == 'git-receive-pack' + end + def git_command if action_name == 'info_refs' params[:service] diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb index 83973d07a17..d52ae723eee 100644 --- a/app/controllers/repositories/lfs_api_controller.rb +++ b/app/controllers/repositories/lfs_api_controller.rb @@ -172,13 +172,15 @@ module Repositories LfsObjectsProject.link_to_project!(lfs_object, project) - Gitlab::AppJsonLogger.info(message: "LFS object auto-linked to forked project", - lfs_object_oid: lfs_object.oid, - lfs_object_size: lfs_object.size, - source_project_id: project.fork_source.id, - source_project_path: project.fork_source.full_path, - target_project_id: project.project_id, - target_project_path: project.full_path) + Gitlab::AppJsonLogger.info( + message: "LFS object auto-linked to forked project", + lfs_object_oid: lfs_object.oid, + lfs_object_size: lfs_object.size, + source_project_id: project.fork_source.id, + source_project_path: project.fork_source.full_path, + target_project_id: project.project_id, + target_project_path: project.full_path + ) end end end diff --git a/app/controllers/repositories/lfs_locks_api_controller.rb b/app/controllers/repositories/lfs_locks_api_controller.rb index ea858d63236..52ae9068c75 100644 --- a/app/controllers/repositories/lfs_locks_api_controller.rb +++ b/app/controllers/repositories/lfs_locks_api_controller.rb @@ -37,9 +37,7 @@ module Repositories private def render_json(data, process = true) - render json: build_payload(data, process), - content_type: LfsRequest::CONTENT_TYPE, - status: @result[:http_status] + render json: build_payload(data, process), content_type: LfsRequest::CONTENT_TYPE, status: @result[:http_status] end def build_payload(data, process) diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 1ca34dee3d6..688c56e56e0 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -10,11 +10,11 @@ class SearchController < ApplicationController RESCUE_FROM_TIMEOUT_ACTIONS = [:count, :show, :autocomplete, :aggregations].freeze CODE_SEARCH_LITERALS = %w[blob: extension: path: filename:].freeze - track_custom_event :show, - name: 'i_search_total', - label: 'redis_hll_counters.search.search_total_unique_counts_monthly', - action: 'executed', - destinations: [:redis_hll, :snowplow] + track_event :show, + name: 'i_search_total', + label: 'redis_hll_counters.search.search_total_unique_counts_monthly', + action: 'executed', + destinations: [:redis_hll, :snowplow] def self.search_rate_limited_endpoints %i[show count autocomplete] @@ -24,7 +24,6 @@ class SearchController < ApplicationController before_action :block_anonymous_global_searches, :check_scope_global_search_enabled, except: :opensearch skip_before_action :authenticate_user! - skip_before_action :default_cache_headers, only: :count requires_cross_project_access if: -> do search_term_present = params[:search].present? || params[:term].present? @@ -33,9 +32,6 @@ class SearchController < ApplicationController before_action :check_search_rate_limit!, only: search_rate_limited_endpoints before_action only: :show do - push_frontend_feature_flag(:search_blobs_language_aggregation, current_user) - end - before_action only: :show do update_scope_for_code_search end rescue_from ActiveRecord::QueryCanceled, with: :render_timeout @@ -116,6 +112,9 @@ class SearchController < ApplicationController @ref = params[:project_ref] if params[:project_ref].present? @filter = params[:filter] + # Cache the response on the frontend + expires_in 1.minute + render json: Gitlab::Json.dump(search_autocomplete_opts(term, filter: @filter)) end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b6aba04c877..8a79353f490 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -36,9 +36,6 @@ class SessionsController < Devise::SessionsController before_action :save_failed_login, if: :action_new_and_failed_login? before_action :load_recaptcha before_action :set_invite_params, only: [:new] - before_action do - push_frontend_feature_flag(:webauthn) - end after_action :log_failed_login, if: :action_new_and_failed_login? after_action :verify_known_sign_in, only: [:create] @@ -56,7 +53,7 @@ class SessionsController < Devise::SessionsController # token mismatch. protect_from_forgery with: :exception, prepend: true, except: :destroy - feature_category :authentication_and_authorization + feature_category :system_access urgency :low CAPTCHA_HEADER = 'X-GitLab-Show-Login-Captcha' @@ -72,8 +69,7 @@ class SessionsController < Devise::SessionsController super do |resource| # User has successfully signed in, so clear any unused reset token if resource.reset_password_token.present? - resource.update(reset_password_token: nil, - reset_password_sent_at: nil) + resource.update(reset_password_token: nil, reset_password_sent_at: nil) end if resource.deactivated? @@ -311,10 +307,8 @@ class SessionsController < Devise::SessionsController def authentication_method if user_params[:otp_attempt] AuthenticationEvent::TWO_FACTOR - elsif user_params[:device_response] && Feature.enabled?(:webauthn) + elsif user_params[:device_response] AuthenticationEvent::TWO_FACTOR_WEBAUTHN - elsif user_params[:device_response] && !Feature.enabled?(:webauthn) - AuthenticationEvent::TWO_FACTOR_U2F else AuthenticationEvent::STANDARD end diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index e81868faa6e..3f20e1c0e86 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -14,7 +14,7 @@ class SnippetsController < Snippets::ApplicationController skip_before_action :authenticate_user!, only: [:index, :show, :raw] - layout 'snippets' + layout :determine_layout def index if params[:username].present? @@ -48,4 +48,12 @@ class SnippetsController < Snippets::ApplicationController def spammable_path snippet_path(@snippet) end + + def determine_layout + if action_name == 'show' && @snippet.author != current_user + 'explore' + else + 'snippets' + end + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9546f71cd37..e4354eaa452 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,20 +9,21 @@ class UsersController < ApplicationController include Gitlab::NoteableMetadata requires_cross_project_access show: false, - groups: false, - projects: false, - contributed: false, - snippets: true, - calendar: false, - followers: false, - following: false, - calendar_activities: true + groups: false, + projects: false, + contributed: false, + snippets: true, + calendar: false, + followers: false, + following: false, + calendar_activities: true skip_before_action :authenticate_user! prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) } before_action :user, except: [:exists] - before_action :authorize_read_user_profile!, - only: [:calendar, :calendar_activities, :groups, :projects, :contributed, :starred, :snippets, :followers, :following] + before_action :authorize_read_user_profile!, only: [ + :calendar, :calendar_activities, :groups, :projects, :contributed, :starred, :snippets, :followers, :following + ] before_action only: [:exists] do check_rate_limit!(:username_exists, scope: request.ip) end @@ -71,7 +72,19 @@ class UsersController < ApplicationController format.json do load_events - pager_json("events/_events", @events.count, events: @events) + + if Feature.enabled?(:profile_tabs_vue, current_user) + @events = if user.include_private_contributions? + @events + else + @events.select { |event| event.visible_to_user?(current_user) } + end + + render json: ::Profile::EventSerializer.new(current_user: current_user, target_user: user) + .represent(@events) + else + pager_json("events/_events", @events.count, events: @events) + end end end end diff --git a/app/finders/abuse_reports_finder.rb b/app/finders/abuse_reports_finder.rb index 04043f36426..c3159198261 100644 --- a/app/finders/abuse_reports_finder.rb +++ b/app/finders/abuse_reports_finder.rb @@ -1,18 +1,88 @@ # frozen_string_literal: true class AbuseReportsFinder - attr_reader :params + attr_reader :params, :reports + + DEFAULT_SORT = 'created_at_desc' + ALLOWED_SORT = [DEFAULT_SORT, *%w[created_at_asc updated_at_desc updated_at_asc]].freeze def initialize(params = {}) @params = params + @reports = AbuseReport.all end def execute - reports = AbuseReport.all - reports = reports.by_user(params[:user_id]) if params[:user_id].present? + filter_reports + sort_reports + + reports.with_users.page(params[:page]) + end + + private + + def filter_reports + filter_by_user_id + + filter_by_user + filter_by_reporter + filter_by_status + filter_by_category + end + + def filter_by_status + return unless params[:status].present? + + case params[:status] + when 'open' + @reports = @reports.open + when 'closed' + @reports = @reports.closed + end + end + + def filter_by_category + return unless params[:category].present? + + @reports = @reports.by_category(params[:category]) + end + + def filter_by_user + return unless params[:user].present? + + user_id = find_user_id(params[:user]) + return unless user_id + + @reports = @reports.by_user_id(user_id) + end + + def filter_by_reporter + return unless params[:reporter].present? + + user_id = find_user_id(params[:reporter]) + return unless user_id + + @reports = @reports.by_reporter_id(user_id) + end + + def filter_by_user_id + return unless params[:user_id].present? + + @reports = @reports.by_user_id(params[:user_id]) + end + + def sort_reports + if Feature.disabled?(:abuse_reports_list) + @reports = @reports.with_order_id_desc + return + end + + sort_by = params[:sort] + sort_by = DEFAULT_SORT unless sort_by.in?(ALLOWED_SORT) + + @reports = @reports.order_by(sort_by) + end - reports.with_order_id_desc - .with_users - .page(params[:page]) + def find_user_id(username) + User.by_username(username).pick(:id) end end diff --git a/app/finders/autocomplete/users_finder.rb b/app/finders/autocomplete/users_finder.rb index bb91f84de99..99e68991836 100644 --- a/app/finders/autocomplete/users_finder.rb +++ b/app/finders/autocomplete/users_finder.rb @@ -98,7 +98,7 @@ module Autocomplete # rubocop: disable CodeReuse/ActiveRecord def preload_associations(items) - ActiveRecord::Associations::Preloader.new.preload(items, :status) + ActiveRecord::Associations::Preloader.new(records: items, associations: :status).call end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/finders/ci/pipelines_finder.rb b/app/finders/ci/pipelines_finder.rb index a2d1805286d..e52fc510628 100644 --- a/app/finders/ci/pipelines_finder.rb +++ b/app/finders/ci/pipelines_finder.rb @@ -2,6 +2,8 @@ module Ci class PipelinesFinder + include UpdatedAtFilter + attr_reader :project, :pipelines, :params, :current_user ALLOWED_INDEXED_COLUMNS = %w[id status ref updated_at user_id].freeze @@ -146,13 +148,6 @@ module Ci end # rubocop: enable CodeReuse/ActiveRecord - def by_updated_at(items) - items = items.updated_before(params[:updated_before]) if params[:updated_before].present? - items = items.updated_after(params[:updated_after]) if params[:updated_after].present? - - items - end - def by_name(items) return items unless Feature.enabled?(:pipeline_name_search, project) && diff --git a/app/finders/concerns/updated_at_filter.rb b/app/finders/concerns/updated_at_filter.rb new file mode 100644 index 00000000000..2d6bd7bf9f3 --- /dev/null +++ b/app/finders/concerns/updated_at_filter.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +module UpdatedAtFilter + def by_updated_at(items) + items = items.updated_before(params[:updated_before]) if params[:updated_before].present? + items = items.updated_after(params[:updated_after]) if params[:updated_after].present? + + items + end +end diff --git a/app/finders/deployments_finder.rb b/app/finders/deployments_finder.rb index 21869f6f31d..c5f8510ca16 100644 --- a/app/finders/deployments_finder.rb +++ b/app/finders/deployments_finder.rb @@ -14,6 +14,8 @@ # order_by: String (see ALLOWED_SORT_VALUES constant) # sort: String (asc | desc) class DeploymentsFinder + include UpdatedAtFilter + attr_reader :params # Warning: @@ -109,13 +111,6 @@ class DeploymentsFinder items.order(sort_params) # rubocop: disable CodeReuse/ActiveRecord end - def by_updated_at(items) - items = items.updated_before(params[:updated_before]) if params[:updated_before].present? - items = items.updated_after(params[:updated_after]) if params[:updated_after].present? - - items - end - def by_finished_at(items) items = items.finished_before(params[:finished_before]) if params[:finished_before].present? items = items.finished_after(params[:finished_after]) if params[:finished_after].present? diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index 47ed623b252..05645dacab9 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -64,6 +64,7 @@ class GroupMembersFinder < UnionFinder members = members.by_access_level(params[:access_levels]) end + members = filter_by_user_type(members) members = apply_additional_filters(members) by_created_at(members) @@ -91,6 +92,12 @@ class GroupMembersFinder < UnionFinder end end + def filter_by_user_type(members) + return members unless params[:user_type] && can_manage_members + + members.filter_by_user_type(params[:user_type]) + end + def apply_additional_filters(members) # overridden in EE to include additional filtering conditions. members diff --git a/app/finders/groups/accepting_project_shares_finder.rb b/app/finders/groups/accepting_project_shares_finder.rb index c4963fcc352..253961b8e52 100644 --- a/app/finders/groups/accepting_project_shares_finder.rb +++ b/app/finders/groups/accepting_project_shares_finder.rb @@ -25,7 +25,7 @@ module Groups groups_with_guest_access_plus end - groups = groups.search(params[:search]) if params[:search].present? + groups = by_search(groups) sort(groups).with_route end diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 159836062cb..478a2ba622c 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -43,6 +43,7 @@ class IssuableFinder include FinderMethods include CreatedAtFilter include Gitlab::Utils::StrongMemoize + include UpdatedAtFilter requires_cross_project_access unless: -> { params.project? } @@ -289,13 +290,6 @@ class IssuableFinder end # rubocop: enable CodeReuse/ActiveRecord - def by_updated_at(items) - items = items.updated_after(params[:updated_after]) if params[:updated_after].present? - items = items.updated_before(params[:updated_before]) if params[:updated_before].present? - - items - end - def by_closed_at(items) items = items.closed_after(params[:closed_after]) if params[:closed_after].present? items = items.closed_before(params[:closed_before]) if params[:closed_before].present? diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb index ffa912afd1e..0ce2d52f168 100644 --- a/app/finders/merge_requests_finder.rb +++ b/app/finders/merge_requests_finder.rb @@ -36,6 +36,7 @@ class MergeRequestsFinder < IssuableFinder def self.scalar_params @scalar_params ||= super + [ + :approved, :approved_by_ids, :deployed_after, :deployed_before, @@ -71,8 +72,9 @@ class MergeRequestsFinder < IssuableFinder items = by_approvals(items) items = by_deployments(items) items = by_reviewer(items) + items = by_source_project_id(items) - by_source_project_id(items) + by_approved(items) end def filter_negated_items(items) @@ -183,6 +185,17 @@ class MergeRequestsFinder < IssuableFinder end # rubocop: enable CodeReuse/Finder + def by_approved(items) + approved_param = Gitlab::Utils.to_boolean(params.fetch(:approved, nil)) + return items if approved_param.nil? + + if approved_param + items.with_approvals + else + items.without_approvals + end + end + def by_deployments(items) env = params[:environment] before = parse_datetime(params[:deployed_before]) diff --git a/app/finders/milestones_finder.rb b/app/finders/milestones_finder.rb index 5fe55e88086..9ffd623338f 100644 --- a/app/finders/milestones_finder.rb +++ b/app/finders/milestones_finder.rb @@ -15,6 +15,7 @@ class MilestonesFinder include FinderMethods include TimeFrameFilter + include UpdatedAtFilter attr_reader :params @@ -30,9 +31,12 @@ class MilestonesFinder items = by_groups_and_projects(items) items = by_title(items) items = by_search_title(items) + items = by_search(items) items = by_state(items) items = by_timeframe(items) items = containing_date(items) + items = by_updated_at(items) + items = by_iids(items) order(items) end @@ -67,6 +71,12 @@ class MilestonesFinder end end + def by_search(items) + return items if params[:search].blank? + + items.search(params[:search]) + end + def by_state(items) Milestone.filter_by_state(items, params[:state]) end @@ -84,4 +94,10 @@ class MilestonesFinder def sort_by_expired_last?(sort_by) EXPIRED_LAST_SORTS.include?(sort_by) end + + def by_iids(items) + return items unless params[:iids].present? && !params[:include_parent_milestones] + + items.by_iid(params[:iids]) + end end diff --git a/app/finders/serverless_domain_finder.rb b/app/finders/serverless_domain_finder.rb deleted file mode 100644 index 661cd0ca363..00000000000 --- a/app/finders/serverless_domain_finder.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -class ServerlessDomainFinder - attr_reader :match, :serverless_domain_cluster, :environment - - def initialize(uri) - @match = ::Serverless::Domain::REGEXP.match(uri) - end - - def execute - return unless serverless? - - @serverless_domain_cluster = ::Serverless::DomainCluster.for_uuid(serverless_domain_cluster_uuid) - return unless serverless_domain_cluster&.knative&.external_ip - - @environment = ::Environment.for_id_and_slug(match[:environment_id].to_i(16), match[:environment_slug]) - return unless environment - - ::Serverless::Domain.new( - function_name: match[:function_name], - serverless_domain_cluster: serverless_domain_cluster, - environment: environment - ) - end - - def serverless_domain_cluster_uuid - return unless serverless? - - match[:cluster_left] + match[:cluster_middle] + match[:cluster_right] - end - - def serverless? - !!match - end -end diff --git a/app/graphql/mutations/achievements/award.rb b/app/graphql/mutations/achievements/award.rb new file mode 100644 index 00000000000..b486049594d --- /dev/null +++ b/app/graphql/mutations/achievements/award.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +module Mutations + module Achievements + class Award < BaseMutation + graphql_name 'AchievementsAward' + + include Gitlab::Graphql::Authorize::AuthorizeResource + + field :user_achievement, + ::Types::Achievements::UserAchievementType, + null: true, + description: 'Achievement award.' + + argument :achievement_id, ::Types::GlobalIDType[::Achievements::Achievement], + required: true, + description: 'Global ID of the achievement being awarded.' + + argument :user_id, ::Types::GlobalIDType[::User], + required: true, + description: 'Global ID of the user being awarded the achievement.' + + authorize :award_achievement + + def resolve(args) + achievement = authorized_find!(id: args[:achievement_id]) + + recipient_id = args[:user_id].model_id + result = ::Achievements::AwardService.new(current_user, achievement.id, recipient_id).execute + { user_achievement: result.payload, errors: result.errors } + end + + def find_object(id:) + GitlabSchema.object_from_id(id, expected_type: ::Achievements::Achievement) + end + end + end +end diff --git a/app/graphql/mutations/achievements/revoke.rb b/app/graphql/mutations/achievements/revoke.rb new file mode 100644 index 00000000000..9d21b1c3741 --- /dev/null +++ b/app/graphql/mutations/achievements/revoke.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module Mutations + module Achievements + class Revoke < BaseMutation + graphql_name 'AchievementsRevoke' + + include Gitlab::Graphql::Authorize::AuthorizeResource + + field :user_achievement, + ::Types::Achievements::UserAchievementType, + null: true, + description: 'Achievement award.' + + argument :user_achievement_id, ::Types::GlobalIDType[::Achievements::UserAchievement], + required: true, + description: 'Global ID of the user achievement being revoked.' + + authorize :award_achievement + + def resolve(args) + user_achievement = authorized_find!(id: args[:user_achievement_id]) + + result = ::Achievements::RevokeService.new(current_user, user_achievement).execute + { user_achievement: result.payload, errors: result.errors } + end + + def find_object(id:) + GitlabSchema.object_from_id(id, expected_type: ::Achievements::UserAchievement) + end + end + end +end diff --git a/app/graphql/mutations/alert_management/base.rb b/app/graphql/mutations/alert_management/base.rb index 2eef6bb9db7..771ace5510f 100644 --- a/app/graphql/mutations/alert_management/base.rb +++ b/app/graphql/mutations/alert_management/base.rb @@ -45,8 +45,6 @@ module Mutations namespace = project.namespace track_usage_event(event, current_user.id) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2, namespace) - Gitlab::Tracking.event( self.class.to_s, event, diff --git a/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb b/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb new file mode 100644 index 00000000000..53036496de4 --- /dev/null +++ b/app/graphql/mutations/ci/job_artifact/bulk_destroy.rb @@ -0,0 +1,69 @@ +# frozen_string_literal: true + +module Mutations + module Ci + module JobArtifact + class BulkDestroy < BaseMutation + graphql_name 'BulkDestroyJobArtifacts' + + authorize :destroy_artifacts + + ArtifactId = ::Types::GlobalIDType[::Ci::JobArtifact] + ProjectId = ::Types::GlobalIDType[::Project] + + argument :ids, [ArtifactId], + required: true, + description: 'Global IDs of the job artifacts to destroy.', + prepare: ->(global_ids, _ctx) { GitlabSchema.parse_gids(global_ids, expected_type: ::Ci::JobArtifact) } + + argument :project_id, ProjectId, + required: true, + description: 'Global Project ID of the job artifacts to destroy. Incompatible with projectPath.' + + field :destroyed_count, ::GraphQL::Types::Int, + null: true, + description: 'Number of job artifacts deleted.' + + field :destroyed_ids, [ArtifactId], + null: true, + description: 'IDs of job artifacts that were deleted.' + + def find_object(id:) + GlobalID::Locator.locate(id) + end + + def resolve(**args) + ids = args[:ids] + project_id = args[:project_id] + + project = authorized_find!(id: project_id) + + if Feature.disabled?(:ci_job_artifact_bulk_destroy, project) + raise Gitlab::Graphql::Errors::ResourceNotAvailable, + '`ci_job_artifact_bulk_destroy` feature flag is disabled.' + end + + raise Gitlab::Graphql::Errors::ArgumentError, 'IDs array of job artifacts can not be empty' if ids.empty? + + result = ::Ci::JobArtifacts::BulkDeleteByProjectService.new( + job_artifact_ids: model_ids_of(ids), + current_user: current_user, + project: project + ).execute + + if result.success? + result.payload.slice(:destroyed_count, :destroyed_ids).merge(errors: []) + else + { errors: result.errors } + end + end + + private + + def model_ids_of(global_ids) + global_ids.filter_map { |gid| gid.model_id.to_i } + end + end + end + end +end diff --git a/app/graphql/mutations/ci/pipeline_schedule/take_ownership.rb b/app/graphql/mutations/ci/pipeline_schedule/take_ownership.rb index 2e4312f0045..d71ef738cab 100644 --- a/app/graphql/mutations/ci/pipeline_schedule/take_ownership.rb +++ b/app/graphql/mutations/ci/pipeline_schedule/take_ownership.rb @@ -6,7 +6,7 @@ module Mutations class TakeOwnership < Base graphql_name 'PipelineScheduleTakeOwnership' - authorize :take_ownership_pipeline_schedule + authorize :admin_pipeline_schedule field :pipeline_schedule, Types::Ci::PipelineScheduleType, diff --git a/app/graphql/mutations/ci/project_ci_cd_settings_update.rb b/app/graphql/mutations/ci/project_ci_cd_settings_update.rb index d214aa46cfc..fcba729d460 100644 --- a/app/graphql/mutations/ci/project_ci_cd_settings_update.rb +++ b/app/graphql/mutations/ci/project_ci_cd_settings_update.rb @@ -39,8 +39,6 @@ module Mutations def resolve(full_path:, **args) project = authorized_find!(full_path) - args.delete(:inbound_job_token_scope_enabled) unless Feature.enabled?(:ci_inbound_job_token_scope, project) - settings = project.ci_cd_settings settings.update(args) diff --git a/app/graphql/mutations/ci/runner/common_mutation_arguments.rb b/app/graphql/mutations/ci/runner/common_mutation_arguments.rb new file mode 100644 index 00000000000..bfeed4881c6 --- /dev/null +++ b/app/graphql/mutations/ci/runner/common_mutation_arguments.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +module Mutations + module Ci + module Runner + module CommonMutationArguments + extend ActiveSupport::Concern + + included do + argument :description, GraphQL::Types::String, + required: false, + description: 'Description of the runner.' + + argument :maintenance_note, GraphQL::Types::String, + required: false, + description: 'Runner\'s maintenance notes.' + + argument :maximum_timeout, GraphQL::Types::Int, + required: false, + description: 'Maximum timeout (in seconds) for jobs processed by the runner.' + + argument :access_level, ::Types::Ci::RunnerAccessLevelEnum, + required: false, + description: 'Access level of the runner.' + + argument :paused, GraphQL::Types::Boolean, + required: false, + description: 'Indicates the runner is not allowed to receive jobs.' + + argument :locked, GraphQL::Types::Boolean, + required: false, + description: 'Indicates the runner is locked.' + + argument :run_untagged, GraphQL::Types::Boolean, + required: false, + description: 'Indicates the runner is able to run untagged jobs.' + + argument :tag_list, [GraphQL::Types::String], + required: false, + description: 'Tags associated with the runner.' + + argument :associated_projects, [::Types::GlobalIDType[::Project]], + required: false, + description: 'Projects associated with the runner. Available only for project runners.', + prepare: ->(global_ids, _ctx) { global_ids&.filter_map { |gid| gid.model_id.to_i } } + end + end + end + end +end diff --git a/app/graphql/mutations/ci/runner/create.rb b/app/graphql/mutations/ci/runner/create.rb new file mode 100644 index 00000000000..98300ee4c38 --- /dev/null +++ b/app/graphql/mutations/ci/runner/create.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +module Mutations + module Ci + module Runner + class Create < BaseMutation + graphql_name 'RunnerCreate' + + authorize :create_runner + + include Mutations::Ci::Runner::CommonMutationArguments + + field :runner, + Types::Ci::RunnerType, + null: true, + description: 'Runner after mutation.' + + def resolve(**args) + if Feature.disabled?(:create_runner_workflow_for_admin, current_user) + raise Gitlab::Graphql::Errors::ResourceNotAvailable, + '`create_runner_workflow_for_admin` feature flag is disabled.' + end + + create_runner(args) + end + + private + + def create_runner(params) + response = { runner: nil, errors: [] } + result = ::Ci::Runners::CreateRunnerService.new(user: current_user, type: nil, params: params).execute + + if result.success? + response[:runner] = result.payload[:runner] + else + response[:errors] = result.errors + end + + response + end + end + end + end +end diff --git a/app/graphql/mutations/ci/runner/update.rb b/app/graphql/mutations/ci/runner/update.rb index 4f0bf19f09c..70f08e03553 100644 --- a/app/graphql/mutations/ci/runner/update.rb +++ b/app/graphql/mutations/ci/runner/update.rb @@ -8,54 +8,19 @@ module Mutations authorize :update_runner + include Mutations::Ci::Runner::CommonMutationArguments + RunnerID = ::Types::GlobalIDType[::Ci::Runner] argument :id, RunnerID, required: true, description: 'ID of the runner to update.' - argument :description, GraphQL::Types::String, - required: false, - description: 'Description of the runner.' - - argument :maintenance_note, GraphQL::Types::String, - required: false, - description: 'Runner\'s maintenance notes.' - - argument :maximum_timeout, GraphQL::Types::Int, - required: false, - description: 'Maximum timeout (in seconds) for jobs processed by the runner.' - - argument :access_level, ::Types::Ci::RunnerAccessLevelEnum, - required: false, - description: 'Access level of the runner.' - argument :active, GraphQL::Types::Boolean, required: false, description: 'Indicates the runner is allowed to receive jobs.', deprecated: { reason: :renamed, replacement: 'paused', milestone: '14.8' } - argument :paused, GraphQL::Types::Boolean, - required: false, - description: 'Indicates the runner is not allowed to receive jobs.' - - argument :locked, GraphQL::Types::Boolean, - required: false, - description: 'Indicates the runner is locked.' - - argument :run_untagged, GraphQL::Types::Boolean, - required: false, - description: 'Indicates the runner is able to run untagged jobs.' - - argument :tag_list, [GraphQL::Types::String], - required: false, - description: 'Tags associated with the runner.' - - argument :associated_projects, [::Types::GlobalIDType[::Project]], - required: false, - description: 'Projects associated with the runner. Available only for project runners.', - prepare: ->(global_ids, ctx) { global_ids&.filter_map { |gid| gid.model_id.to_i } } - field :runner, Types::Ci::RunnerType, null: true, diff --git a/app/graphql/mutations/clusters/agent_tokens/create.rb b/app/graphql/mutations/clusters/agent_tokens/create.rb index c10e1633350..1b104652bd2 100644 --- a/app/graphql/mutations/clusters/agent_tokens/create.rb +++ b/app/graphql/mutations/clusters/agent_tokens/create.rb @@ -40,9 +40,9 @@ module Mutations result = ::Clusters::AgentTokens::CreateService .new( - container: cluster_agent.project, + agent: cluster_agent, current_user: current_user, - params: args.merge(agent_id: cluster_agent.id) + params: args ) .execute diff --git a/app/graphql/mutations/clusters/agent_tokens/revoke.rb b/app/graphql/mutations/clusters/agent_tokens/revoke.rb index 974db976f1d..6e988799921 100644 --- a/app/graphql/mutations/clusters/agent_tokens/revoke.rb +++ b/app/graphql/mutations/clusters/agent_tokens/revoke.rb @@ -16,7 +16,8 @@ module Mutations def resolve(id:) token = authorized_find!(id: id) - token.update(status: token.class.statuses[:revoked]) + + ::Clusters::AgentTokens::RevokeService.new(token: token, current_user: current_user).execute { errors: errors_on_object(token) } end diff --git a/app/graphql/mutations/concerns/mutations/work_items/update_arguments.rb b/app/graphql/mutations/concerns/mutations/work_items/update_arguments.rb index 6738f268e92..72daaf3ee44 100644 --- a/app/graphql/mutations/concerns/mutations/work_items/update_arguments.rb +++ b/app/graphql/mutations/concerns/mutations/work_items/update_arguments.rb @@ -36,6 +36,10 @@ module Mutations argument :milestone_widget, ::Types::WorkItems::Widgets::MilestoneInputType, required: false, description: 'Input for milestone widget.' + argument :notifications_widget, + ::Types::WorkItems::Widgets::NotificationsUpdateInputType, + required: false, + description: 'Input for notifications widget.' end end end diff --git a/app/graphql/mutations/design_management/update.rb b/app/graphql/mutations/design_management/update.rb new file mode 100644 index 00000000000..5dc20730a90 --- /dev/null +++ b/app/graphql/mutations/design_management/update.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +module Mutations + module DesignManagement + class Update < ::Mutations::BaseMutation + graphql_name "DesignManagementUpdate" + + authorize :update_design + + argument :id, ::Types::GlobalIDType[::DesignManagement::Design], + required: true, + description: "ID of the design to update." + + argument :description, GraphQL::Types::String, + required: false, + description: copy_field_description(Types::DesignManagement::DesignType, :description) + + field :design, Types::DesignManagement::DesignType, + null: false, + description: "Updated design." + + def resolve(id:, description:) + design = authorized_find!(id: id) + design.update(description: description) + + { + design: design.reset, + errors: errors_on_object(design) + } + end + + private + + def find_object(id:) + GitlabSchema.find_by_gid(id) + end + end + end +end diff --git a/app/graphql/mutations/issues/bulk_update.rb b/app/graphql/mutations/issues/bulk_update.rb index 3d80f119079..9c9dd3cf2fc 100644 --- a/app/graphql/mutations/issues/bulk_update.rb +++ b/app/graphql/mutations/issues/bulk_update.rb @@ -14,7 +14,8 @@ module Mutations argument :parent_id, ::Types::GlobalIDType[::IssueParent], required: true, - description: 'Global ID of the parent that the bulk update will be scoped to . ' \ + description: 'Global ID of the parent to which the bulk update will be scoped. ' \ + 'The parent can be a project **(FREE)** or a group **(PREMIUM)**. ' \ 'Example `IssueParentID` are `"gid://gitlab/Project/1"` and `"gid://gitlab/Group/1"`.' argument :ids, [::Types::GlobalIDType[::Issue]], @@ -31,6 +32,22 @@ module Mutations required: false, description: 'Global ID of the milestone that will be assigned to the issues.' + argument :state_event, Types::IssueStateEventEnum, + description: 'Close or reopen an issue.', + required: false + + argument :add_label_ids, [::Types::GlobalIDType[::Label]], + description: 'Global ID array of the labels that will be added to the issues. ', + required: false + + argument :remove_label_ids, [::Types::GlobalIDType[::Label]], + description: 'Global ID array of the labels that will be removed from the issues. ', + required: false + + argument :subscription_event, Types::IssuableSubscriptionEventEnum, + description: 'Subscribe to or unsubscribe from issue notifications.', + required: false + field :updated_issue_count, GraphQL::Types::Int, null: true, description: 'Number of issues that were successfully updated.' @@ -74,7 +91,7 @@ module Mutations end def prepared_params(attributes, ids) - prepared = { issuable_ids: model_ids_from(ids).uniq } + prepared = attributes.except(*global_id_arguments).merge(issuable_ids: model_ids_from(ids).uniq) global_id_arguments.each do |argument| next unless attributes.key?(argument) @@ -92,7 +109,7 @@ module Mutations end def global_id_arguments - %i[assignee_ids milestone_id] + %i[assignee_ids milestone_id add_label_ids remove_label_ids] end def model_ids_from(attributes) diff --git a/app/graphql/mutations/members/bulk_update_base.rb b/app/graphql/mutations/members/bulk_update_base.rb new file mode 100644 index 00000000000..1e0208e864d --- /dev/null +++ b/app/graphql/mutations/members/bulk_update_base.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true + +module Mutations + module Members + class BulkUpdateBase < BaseMutation + include ::API::Helpers::MembersHelpers + + argument :user_ids, + [::Types::GlobalIDType[::User]], + required: true, + description: 'Global IDs of the members.' + + argument :access_level, + ::Types::MemberAccessLevelEnum, + required: true, + description: 'Access level to update the members to.' + + argument :expires_at, + Types::TimeType, + required: false, + description: 'Date and time the membership expires.' + + MAX_MEMBERS_UPDATE_LIMIT = 50 + MAX_MEMBERS_UPDATE_ERROR = "Count of members to be updated should be less than #{MAX_MEMBERS_UPDATE_LIMIT}." + .freeze + INVALID_MEMBERS_ERROR = 'Only access level of direct members can be updated.' + + def resolve(**args) + result = ::Members::UpdateService + .new(current_user, args.except(:user_ids, source_id_param_name)) + .execute(@updatable_members) + + { + source_members_key => result[:members], + errors: Array.wrap(result[:message]) + } + rescue Gitlab::Access::AccessDeniedError + { + errors: ["Unable to update members, please check user permissions."] + } + end + + private + + def ready?(**args) + source = authorized_find!(source_id: args[source_id_param_name]) + user_ids = args.fetch(:user_ids, {}).map(&:model_id) + @updatable_members = only_direct_members(source, user_ids) + + if @updatable_members.size > MAX_MEMBERS_UPDATE_LIMIT + raise Gitlab::Graphql::Errors::InvalidMemberCountError, MAX_MEMBERS_UPDATE_ERROR + end + + if @updatable_members.size != user_ids.size + raise Gitlab::Graphql::Errors::InvalidMembersError, INVALID_MEMBERS_ERROR + end + + super + end + + def find_object(source_id:) + GitlabSchema.object_from_id(source_id, expected_type: source_type) + end + + def only_direct_members(source, user_ids) + source_members(source) + .with_user(user_ids) + .to_a + end + + def source_id_param_name + "#{source_name}_id".to_sym + end + + def source_members_key + "#{source_name}_members".to_sym + end + + def source_name + source_type.name.downcase + end + + def source_type + raise NotImplementedError + end + end + end +end diff --git a/app/graphql/mutations/members/groups/bulk_update.rb b/app/graphql/mutations/members/groups/bulk_update.rb index d0b19bd9634..fe3c7521c20 100644 --- a/app/graphql/mutations/members/groups/bulk_update.rb +++ b/app/graphql/mutations/members/groups/bulk_update.rb @@ -3,81 +3,22 @@ module Mutations module Members module Groups - class BulkUpdate < ::Mutations::BaseMutation + class BulkUpdate < BulkUpdateBase graphql_name 'GroupMemberBulkUpdate' - - include Gitlab::Utils::StrongMemoize - authorize :admin_group_member field :group_members, - [Types::GroupMemberType], - null: true, - description: 'Group members after mutation.' + [Types::GroupMemberType], + null: true, + description: 'Group members after mutation.' argument :group_id, - ::Types::GlobalIDType[::Group], - required: true, - description: 'Global ID of the group.' - - argument :user_ids, - [::Types::GlobalIDType[::User]], - required: true, - description: 'Global IDs of the group members.' - - argument :access_level, - ::Types::MemberAccessLevelEnum, - required: true, - description: 'Access level to update the members to.' - - argument :expires_at, - Types::TimeType, - required: false, - description: 'Date and time the membership expires.' - - MAX_MEMBERS_UPDATE_LIMIT = 50 - MAX_MEMBERS_UPDATE_ERROR = "Count of members to be updated should be less than #{MAX_MEMBERS_UPDATE_LIMIT}." - INVALID_MEMBERS_ERROR = 'Only access level of direct members can be updated.' - - def resolve(group_id:, **args) - result = ::Members::UpdateService.new(current_user, args.except(:user_ids)).execute(@updatable_group_members) - - { - group_members: result[:members], - errors: Array.wrap(result[:message]) - } - rescue Gitlab::Access::AccessDeniedError - { - errors: ["Unable to update members, please check user permissions."] - } - end - - private - - def ready?(**args) - group = authorized_find!(group_id: args[:group_id]) - user_ids = args.fetch(:user_ids, {}).map(&:model_id) - @updatable_group_members = only_direct_group_members(group, user_ids) - - if @updatable_group_members.size > MAX_MEMBERS_UPDATE_LIMIT - raise Gitlab::Graphql::Errors::InvalidMemberCountError, MAX_MEMBERS_UPDATE_ERROR - end - - if @updatable_group_members.size != user_ids.size - raise Gitlab::Graphql::Errors::InvalidMembersError, INVALID_MEMBERS_ERROR - end - - super - end - - def find_object(group_id:) - GitlabSchema.object_from_id(group_id, expected_type: ::Group) - end + ::Types::GlobalIDType[::Group], + required: true, + description: 'Global ID of the group.' - def only_direct_group_members(group, user_ids) - group - .members - .with_user(user_ids).to_a + def source_type + ::Group end end end diff --git a/app/graphql/mutations/members/projects/bulk_update.rb b/app/graphql/mutations/members/projects/bulk_update.rb new file mode 100644 index 00000000000..cfb88e60c44 --- /dev/null +++ b/app/graphql/mutations/members/projects/bulk_update.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module Mutations + module Members + module Projects + class BulkUpdate < BulkUpdateBase + graphql_name 'ProjectMemberBulkUpdate' + authorize :admin_project_member + + field :project_members, + [Types::ProjectMemberType], + null: true, + description: 'Project members after mutation.' + + argument :project_id, + ::Types::GlobalIDType[::Project], + required: true, + description: 'Global ID of the project.' + + def source_type + ::Project + end + end + end + end +end diff --git a/app/graphql/mutations/metrics/dashboard/annotations/create.rb b/app/graphql/mutations/metrics/dashboard/annotations/create.rb index 2e7c0c5a2f9..d458bdcf82b 100644 --- a/app/graphql/mutations/metrics/dashboard/annotations/create.rb +++ b/app/graphql/mutations/metrics/dashboard/annotations/create.rb @@ -10,7 +10,7 @@ module Mutations ANNOTATION_SOURCE_ARGUMENT_ERROR = 'Either a cluster or environment global id is required' INVALID_ANNOTATION_SOURCE_ERROR = 'Invalid cluster or environment id' - authorize :create_metrics_dashboard_annotation + authorize :admin_metrics_dashboard_annotation field :annotation, Types::Metrics::Dashboards::AnnotationType, diff --git a/app/graphql/mutations/metrics/dashboard/annotations/delete.rb b/app/graphql/mutations/metrics/dashboard/annotations/delete.rb index e0fadff13d4..0ee2791f78b 100644 --- a/app/graphql/mutations/metrics/dashboard/annotations/delete.rb +++ b/app/graphql/mutations/metrics/dashboard/annotations/delete.rb @@ -7,7 +7,7 @@ module Mutations class Delete < Base graphql_name 'DeleteAnnotation' - authorize :delete_metrics_dashboard_annotation + authorize :admin_metrics_dashboard_annotation argument :id, ::Types::GlobalIDType[::Metrics::Dashboard::Annotation], required: true, diff --git a/app/graphql/mutations/projects/sync_fork.rb b/app/graphql/mutations/projects/sync_fork.rb new file mode 100644 index 00000000000..121c16df87b --- /dev/null +++ b/app/graphql/mutations/projects/sync_fork.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +module Mutations + module Projects + class SyncFork < BaseMutation + graphql_name 'ProjectSyncFork' + + include FindsProject + + authorize :push_code + + argument :project_path, GraphQL::Types::ID, + required: true, + description: 'Full path of the project to initialize.' + + argument :target_branch, GraphQL::Types::String, + required: true, + description: 'Ref of the fork to fetch into.' + + field :details, Types::Projects::ForkDetailsType, + null: true, + description: 'Updated fork details.' + + def resolve(project_path:, target_branch:) + project = authorized_find!(project_path) + + return respond(nil, ['Feature flag is disabled']) unless Feature.enabled?(:synchronize_fork, project) + + details_resolver = Resolvers::Projects::ForkDetailsResolver.new(object: project, context: context, field: nil) + details = details_resolver.resolve(ref: target_branch) + + return respond(nil, ['This branch of this project cannot be updated from the upstream']) unless details + + enqueue_sync_fork(project, target_branch, details) + end + + def enqueue_sync_fork(project, target_branch, details) + return respond(details, []) if details.counts[:behind] == 0 + + if details.has_conflicts? + return respond(details, ['The synchronization cannot happen due to the merge conflict']) + end + + return respond(details, ['This service has been called too many times.']) if rate_limit_throttled?(project) + return respond(details, ['Another fork sync is already in progress']) unless details.exclusive_lease.try_obtain + + ::Projects::Forks::SyncWorker.perform_async(project.id, current_user.id, target_branch) # rubocop:disable CodeReuse/Worker + + respond(details, []) + end + + def rate_limit_throttled?(project) + Gitlab::ApplicationRateLimiter.throttled?(:project_fork_sync, scope: [project, current_user]) + end + + def respond(details, errors) + { details: details, errors: errors } + end + end + end +end diff --git a/app/graphql/mutations/release_asset_links/create.rb b/app/graphql/mutations/release_asset_links/create.rb index f6445514ce9..bda998764b9 100644 --- a/app/graphql/mutations/release_asset_links/create.rb +++ b/app/graphql/mutations/release_asset_links/create.rb @@ -36,13 +36,15 @@ module Mutations raise_resource_not_available_error! end - new_link = release.links.create(link_attrs) - - unless new_link.persisted? - return { link: nil, errors: new_link.errors.full_messages } + result = ::Releases::Links::CreateService + .new(release, current_user, link_attrs) + .execute + + if result.success? + { link: result.payload[:link], errors: [] } + else + { link: nil, errors: result.message } end - - { link: new_link, errors: [] } end end end diff --git a/app/graphql/mutations/release_asset_links/delete.rb b/app/graphql/mutations/release_asset_links/delete.rb index 91fa74859f6..9a75b472411 100644 --- a/app/graphql/mutations/release_asset_links/delete.rb +++ b/app/graphql/mutations/release_asset_links/delete.rb @@ -21,11 +21,15 @@ module Mutations def resolve(id:) link = authorized_find!(id) - unless link.destroy - return { link: nil, errors: link.errors.full_messages } + result = ::Releases::Links::DestroyService + .new(link.release, current_user) + .execute(link) + + if result.success? + { link: result.payload[:link], errors: [] } + else + { link: nil, errors: result.message } end - - { link: link, errors: [] } end def find_object(id) diff --git a/app/graphql/mutations/release_asset_links/update.rb b/app/graphql/mutations/release_asset_links/update.rb index f9368927371..2e9054c290d 100644 --- a/app/graphql/mutations/release_asset_links/update.rb +++ b/app/graphql/mutations/release_asset_links/update.rb @@ -46,11 +46,15 @@ module Mutations def resolve(id:, **link_attrs) link = authorized_find!(id) - unless link.update(link_attrs) - return { link: nil, errors: link.errors.full_messages } - end + result = ::Releases::Links::UpdateService + .new(link.release, current_user, link_attrs) + .execute(link) - { link: link, errors: [] } + if result.success? + { link: result.payload[:link], errors: [] } + else + { link: nil, errors: result.message } + end end def find_object(id) diff --git a/app/graphql/mutations/work_items/export.rb b/app/graphql/mutations/work_items/export.rb new file mode 100644 index 00000000000..5ba50aa6cb2 --- /dev/null +++ b/app/graphql/mutations/work_items/export.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +module Mutations + module WorkItems + class Export < BaseMutation + graphql_name 'WorkItemExport' + + include FindsProject + include ::WorkItems::SharedFilterArguments + include ::SearchArguments + + authorize :export_work_items + + argument :project_path, + GraphQL::Types::ID, + required: true, + description: 'Full project path.' + + argument :selected_fields, + [::Types::WorkItems::AvailableExportFieldsEnum], + required: false, + description: 'List of selected fields to be exported. Omit to export all available fields.' + + def resolve(args) + project_path = args.delete(:project_path) + project = authorized_find!(project_path) + + check_export_available_for!(project) + + # rubocop:disable CodeReuse/Worker + IssuableExportCsvWorker.perform_async(:work_item, current_user.id, project.id, args) + # rubocop:enable CodeReuse/Worker + + { + errors: [] + } + end + + def check_export_available_for!(project) + return if Feature.enabled?(:import_export_work_items_csv, project) + + error = '`import_export_work_items_csv` feature flag is disabled.' + + raise Gitlab::Graphql::Errors::ResourceNotAvailable, error + end + end + end +end diff --git a/app/graphql/mutations/work_items/update.rb b/app/graphql/mutations/work_items/update.rb index db6af38d82e..60b5536df56 100644 --- a/app/graphql/mutations/work_items/update.rb +++ b/app/graphql/mutations/work_items/update.rb @@ -60,21 +60,10 @@ module Mutations description_param[:description] = description if description && description != original_description - # Widgets have a set of quick action params that they must process. - # Map them to widget_params so they can be picked up by widget services. - work_item.work_item_type.widgets - .filter { |widget| widget.respond_to?(:quick_action_params) } - .each do |widget| - widget.quick_action_params - .filter { |param_name| command_params.key?(param_name) } - .each do |param_name| - widget_params[widget.api_symbol] ||= {} - widget_params[widget.api_symbol][param_name] = command_params.delete(param_name) - end - end - - # The command_params not processed by widgets (e.g. title) should be placed in 'attributes'. - attributes.merge!(command_params || {}) + parsed_params = work_item.transform_quick_action_params(command_params) + + widget_params.merge!(parsed_params[:widgets]) + attributes.merge!(parsed_params[:common]) end end end diff --git a/app/graphql/queries/repository/path_last_commit.query.graphql b/app/graphql/queries/repository/path_last_commit.query.graphql index 914be3a72c1..facbf1555fc 100644 --- a/app/graphql/queries/repository/path_last_commit.query.graphql +++ b/app/graphql/queries/repository/path_last_commit.query.graphql @@ -27,7 +27,30 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) { avatarUrl webPath } - signatureHtml + signature { + __typename + ... on GpgSignature { + gpgKeyPrimaryKeyid + verificationStatus + } + ... on X509Signature { + verificationStatus + x509Certificate { + id + subject + subjectKeyIdentifier + x509Issuer { + id + subject + subjectKeyIdentifier + } + } + } + ... on SshSignature { + verificationStatus + keyFingerprintSha256 + } + } pipelines(ref: $ref, first: 1) { __typename edges { diff --git a/app/graphql/resolvers/achievements/achievements_resolver.rb b/app/graphql/resolvers/achievements/achievements_resolver.rb new file mode 100644 index 00000000000..1d71fa1d9c1 --- /dev/null +++ b/app/graphql/resolvers/achievements/achievements_resolver.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Resolvers + module Achievements + class AchievementsResolver < BaseResolver + include LooksAhead + + type ::Types::Achievements::AchievementType.connection_type, null: true + + alias_method :namespace, :object + + def resolve_with_lookahead + return ::Achievements::Achievement.none if Feature.disabled?(:achievements, namespace) + + apply_lookahead(namespace.achievements) + end + + private + + def preloads + { + user_achievements: [{ user_achievements: [:user, :awarded_by_user, :revoked_by_user] }] + } + end + end + end +end diff --git a/app/graphql/resolvers/achievements/user_achievements_resolver.rb b/app/graphql/resolvers/achievements/user_achievements_resolver.rb new file mode 100644 index 00000000000..bf09d80afc1 --- /dev/null +++ b/app/graphql/resolvers/achievements/user_achievements_resolver.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module Resolvers + module Achievements + class UserAchievementsResolver < BaseResolver + include LooksAhead + + type ::Types::Achievements::UserAchievementType.connection_type, null: true + + def resolve_with_lookahead + user_achievements = object.user_achievements.not_revoked + + apply_lookahead(user_achievements) + end + + private + + def unconditional_includes + [ + { achievement: [:namespace] } + ] + end + + def preloads + { + user: [:user], + awarded_by_user: [:awarded_by_user], + revoked_by_user: [:revoked_by_user] + } + end + end + end +end diff --git a/app/graphql/resolvers/analytics/cycle_analytics/base_issue_resolver.rb b/app/graphql/resolvers/analytics/cycle_analytics/base_issue_resolver.rb new file mode 100644 index 00000000000..f08de3c5d7e --- /dev/null +++ b/app/graphql/resolvers/analytics/cycle_analytics/base_issue_resolver.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +module Resolvers + module Analytics + module CycleAnalytics + class BaseIssueResolver < BaseResolver + type Types::Analytics::CycleAnalytics::MetricType, null: true + + argument :assignee_usernames, [GraphQL::Types::String], + required: false, + description: 'Usernames of users assigned to the issue.' + + argument :author_username, GraphQL::Types::String, + required: false, + description: 'Username of the author of the issue.' + + argument :milestone_title, GraphQL::Types::String, + required: false, + description: 'Milestone applied to the issue.' + + argument :label_names, [GraphQL::Types::String], + required: false, + description: 'Labels applied to the issue.' + + argument :from, Types::TimeType, + required: true, + description: 'Issues created after the date.' + + argument :to, Types::TimeType, + required: true, + description: 'Issues created before the date.' + + def finder_params + { project_id: object.project.id } + end + + # :project level: no customization, returning the original resolver + # :group level: add the project_ids argument + def self.[](context = :project) + case context + when :project + self + when :group + Class.new(self) do + argument :project_ids, [GraphQL::Types::ID], + required: false, + description: 'Project IDs within the group hierarchy.' + + define_method :finder_params do + { group_id: object.id, include_subgroups: true } + end + end + end + end + end + end + end +end diff --git a/app/graphql/resolvers/analytics/cycle_analytics/deployment_count_resolver.rb b/app/graphql/resolvers/analytics/cycle_analytics/deployment_count_resolver.rb new file mode 100644 index 00000000000..be17601e7a2 --- /dev/null +++ b/app/graphql/resolvers/analytics/cycle_analytics/deployment_count_resolver.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +module Resolvers + module Analytics + module CycleAnalytics + class DeploymentCountResolver < BaseResolver + type Types::Analytics::CycleAnalytics::MetricType, null: true + + argument :from, Types::TimeType, + required: true, + description: 'Deployments finished after the date.' + + argument :to, Types::TimeType, + required: true, + description: 'Deployments finished before the date.' + + def resolve(**args) + value = count(args) + { + value: value, + title: n_('Deploy', 'Deploys', value.to_i), + identifier: 'deploys', + links: [] + } + end + + private + + def count(args) + finder = DeploymentsFinder.new({ + finished_after: args[:from], + finished_before: args[:to], + project: object.project, + status: :success, + order_by: :finished_at + }) + + finder.execute.count + end + + # :project level: no customization, returning the original resolver + # :group level: add the project_ids argument + def self.[](context = :project) + case context + when :project + self + when :group + Class.new(self) do + argument :project_ids, [GraphQL::Types::ID], + required: false, + description: 'Project IDs within the group hierarchy.' + end + + end + end + end + end + end +end + +mod = Resolvers::Analytics::CycleAnalytics::DeploymentCountResolver +mod.prepend_mod_with('Resolvers::Analytics::CycleAnalytics::DeploymentCountResolver') diff --git a/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb b/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb new file mode 100644 index 00000000000..fd20800ee16 --- /dev/null +++ b/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +# rubocop:disable Graphql/ResolverType (inherited from Resolvers::Analytics::CycleAnalytics::BaseIssueResolver) +module Resolvers + module Analytics + module CycleAnalytics + class IssueCountResolver < BaseIssueResolver + def resolve(**args) + value = IssuesFinder + .new(current_user, process_params(args)) + .execute + .count + + { + value: value, + title: n_('New Issue', 'New Issues', value), + identifier: 'issues', + links: [] + } + end + + private + + def process_params(params) + params[:assignee_username] = params.delete(:assignee_usernames) if params[:assignee_usernames] + params[:label_name] = params.delete(:label_names) if params[:label_names] + params[:created_after] = params.delete(:from) + params[:created_before] = params.delete(:to) + params[:projects] = params[:project_ids] if params[:project_ids] + + params.merge(finder_params) + end + end + end + end +end +# rubocop:enable Graphql/ResolverType diff --git a/app/graphql/resolvers/ci/pipeline_job_artifacts_resolver.rb b/app/graphql/resolvers/ci/pipeline_job_artifacts_resolver.rb index 35d30827561..561c61e3b27 100644 --- a/app/graphql/resolvers/ci/pipeline_job_artifacts_resolver.rb +++ b/app/graphql/resolvers/ci/pipeline_job_artifacts_resolver.rb @@ -15,7 +15,7 @@ module Resolvers def find_job_artifacts BatchLoader::GraphQL.for(pipeline).batch do |pipelines, loader| - ActiveRecord::Associations::Preloader.new.preload(pipelines, :job_artifacts) # rubocop: disable CodeReuse/ActiveRecord + ActiveRecord::Associations::Preloader.new(records: pipelines, associations: :job_artifacts).call # rubocop: disable CodeReuse/ActiveRecord pipelines.each { |pl| loader.call(pl, pl.job_artifacts) } end diff --git a/app/graphql/resolvers/ci/runner_projects_resolver.rb b/app/graphql/resolvers/ci/runner_projects_resolver.rb index 2a2d63f85de..13a493c42a5 100644 --- a/app/graphql/resolvers/ci/runner_projects_resolver.rb +++ b/app/graphql/resolvers/ci/runner_projects_resolver.rb @@ -68,9 +68,9 @@ module Resolvers def preloads super.merge({ - full_path: [:route, { namespace: [:route] }], - web_url: [:route, { namespace: [:route] }] - }) + full_path: [:route, { namespace: [:route] }], + web_url: [:route, { namespace: [:route] }] + }) end end end diff --git a/app/graphql/resolvers/ci/runner_resolver.rb b/app/graphql/resolvers/ci/runner_resolver.rb index ca94e28b2e9..4250b069d20 100644 --- a/app/graphql/resolvers/ci/runner_resolver.rb +++ b/app/graphql/resolvers/ci/runner_resolver.rb @@ -22,11 +22,15 @@ module Resolvers def find_runner(id:) runner_id = GitlabSchema.parse_gid(id, expected_type: ::Ci::Runner).model_id.to_i - preload_tag_list = lookahead.selects?(:tag_list) + key = { + preload_tag_list: lookahead.selects?(:tag_list), + preload_creator: lookahead.selects?(:created_by) + } - BatchLoader::GraphQL.for(runner_id).batch(key: { preload_tag_list: preload_tag_list }) do |ids, loader, batch| + BatchLoader::GraphQL.for(runner_id).batch(key: key) do |ids, loader, batch| results = ::Ci::Runner.id_in(ids) results = results.with_tags if batch[:key][:preload_tag_list] + results = results.with_creator if batch[:key][:preload_creator] results.each { |record| loader.call(record.id, record) } end diff --git a/app/graphql/resolvers/ci/runners_resolver.rb b/app/graphql/resolvers/ci/runners_resolver.rb index b52a4cc0ab4..735e38c1a5c 100644 --- a/app/graphql/resolvers/ci/runners_resolver.rb +++ b/app/graphql/resolvers/ci/runners_resolver.rb @@ -61,9 +61,7 @@ module Resolvers upgrade_status: params[:upgrade_status], search: params[:search], sort: params[:sort]&.to_s, - preload: { - tag_name: node_selection&.selects?(:tag_list) - } + preload: false # we'll handle preloading ourselves }.compact .merge(parent_param) end @@ -79,6 +77,31 @@ module Resolvers def parent object.respond_to?(:sync) ? object.sync : object end + + def preloads + super.merge({ + created_by: [:creator], + tag_list: [:tags] + }) + end + + def nested_preloads + { + created_by: { + creator: { + full_path: [:route], + web_path: [:route], + web_url: [:route] + } + }, + owner_project: { + owner_project: { + full_path: [:route, { namespace: [:route] }], + web_url: [:route, { namespace: [:route] }] + } + } + } + end end end end diff --git a/app/graphql/resolvers/concerns/work_items/shared_filter_arguments.rb b/app/graphql/resolvers/concerns/work_items/shared_filter_arguments.rb new file mode 100644 index 00000000000..ecb105a64d0 --- /dev/null +++ b/app/graphql/resolvers/concerns/work_items/shared_filter_arguments.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module WorkItems + module SharedFilterArguments + extend ActiveSupport::Concern + + included do + argument :author_username, + GraphQL::Types::String, + required: false, + description: 'Filter work items by author username.', + alpha: { milestone: '15.9' } + argument :iids, + [GraphQL::Types::String], + required: false, + description: 'List of IIDs of work items. For example, `["1", "2"]`.' + argument :state, + Types::IssuableStateEnum, + required: false, + description: 'Current state of the work item.' + argument :types, + [Types::IssueTypeEnum], + as: :issue_types, + description: 'Filter work items by the given work item types.', + required: false + end + end +end diff --git a/app/graphql/resolvers/project_merge_requests_resolver.rb b/app/graphql/resolvers/project_merge_requests_resolver.rb index 66c020a0c14..6a240541341 100644 --- a/app/graphql/resolvers/project_merge_requests_resolver.rb +++ b/app/graphql/resolvers/project_merge_requests_resolver.rb @@ -22,7 +22,13 @@ module Resolvers def only_count_is_selected_with_merged_at_filter?(args) return unless lookahead - argument_names = args.compact.except(:lookahead, :sort, :merged_before, :merged_after).keys + # Filter out all elements with blank values. If any of the values are not + # scalars, e.g. hashes or array, filter blank values from them and remove + # them if the resulting collection is empty. + argument_names = args.except(:lookahead, :sort, :merged_before, :merged_after).filter_map do |key, value| + value = value.to_hash.compact if value.respond_to?(:to_hash) + key if value.present? + end # no extra filtering arguments are provided return unless argument_names.empty? diff --git a/app/graphql/resolvers/projects/fork_details_resolver.rb b/app/graphql/resolvers/projects/fork_details_resolver.rb index fcc13a1bc1e..a3c60f55e14 100644 --- a/app/graphql/resolvers/projects/fork_details_resolver.rb +++ b/app/graphql/resolvers/projects/fork_details_resolver.rb @@ -13,8 +13,17 @@ module Resolvers def resolve(**args) return unless project.forked? + return unless authorized_fork_source? + return unless project.repository.branch_exists?(args[:ref]) + return unless Feature.enabled?(:fork_divergence_counts, project) - ::Projects::Forks::DivergenceCounts.new(project, args[:ref]).counts + ::Projects::Forks::Details.new(project, args[:ref]) + end + + private + + def authorized_fork_source? + Ability.allowed?(current_user, :read_code, project.fork_source) end end end diff --git a/app/graphql/resolvers/work_items_resolver.rb b/app/graphql/resolvers/work_items_resolver.rb index 0c9aac80274..7115b028481 100644 --- a/app/graphql/resolvers/work_items_resolver.rb +++ b/app/graphql/resolvers/work_items_resolver.rb @@ -4,30 +4,19 @@ module Resolvers class WorkItemsResolver < BaseResolver include SearchArguments include LooksAhead + include ::WorkItems::SharedFilterArguments - type Types::WorkItemType.connection_type, null: true + argument :iid, + GraphQL::Types::String, + required: false, + description: 'IID of the work item. For example, "1".' + argument :sort, + Types::WorkItemSortEnum, + description: 'Sort work items by criteria.', + required: false, + default_value: :created_desc - argument :author_username, GraphQL::Types::String, - required: false, - description: 'Filter work items by author username.', - alpha: { milestone: '15.9' } - argument :iid, GraphQL::Types::String, - required: false, - description: 'IID of the issue. For example, "1".' - argument :iids, [GraphQL::Types::String], - required: false, - description: 'List of IIDs of work items. For example, `["1", "2"]`.' - argument :sort, Types::WorkItemSortEnum, - description: 'Sort work items by this criteria.', - required: false, - default_value: :created_desc - argument :state, Types::IssuableStateEnum, - required: false, - description: 'Current state of this work item.' - argument :types, [Types::IssueTypeEnum], - as: :issue_types, - description: 'Filter work items by the given work item types.', - required: false + type Types::WorkItemType.connection_type, null: true def resolve_with_lookahead(**args) return WorkItem.none if resource_parent.nil? @@ -66,7 +55,8 @@ module Resolvers parent: :work_item_parent, children: { work_item_children_by_relative_position: [:author, { project: :project_feature }] }, labels: :labels, - milestone: { milestone: [:project, :group] } + milestone: { milestone: [:project, :group] }, + subscribed: [:assignees, :award_emoji, { notes: [:author, :award_emoji] }] } end diff --git a/app/graphql/types/achievements/achievement_type.rb b/app/graphql/types/achievements/achievement_type.rb index 67cc9778797..71f51b9b741 100644 --- a/app/graphql/types/achievements/achievement_type.rb +++ b/app/graphql/types/achievements/achievement_type.rb @@ -42,6 +42,12 @@ module Types null: false, description: 'Timestamp the achievement was last updated.' + field :user_achievements, + Types::Achievements::UserAchievementType.connection_type, + null: true, + alpha: { milestone: '15.10' }, + description: "Recipients for the achievement." + def avatar_url object.avatar_url(only_path: false) end diff --git a/app/graphql/types/achievements/user_achievement_type.rb b/app/graphql/types/achievements/user_achievement_type.rb new file mode 100644 index 00000000000..d2146807445 --- /dev/null +++ b/app/graphql/types/achievements/user_achievement_type.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +module Types + module Achievements + class UserAchievementType < BaseObject + graphql_name 'UserAchievement' + + authorize :read_achievement + + field :id, + ::Types::GlobalIDType[::Achievements::UserAchievement], + null: false, + description: 'ID of the user achievement.' + + field :achievement, + ::Types::Achievements::AchievementType, + null: false, + description: 'Achievement awarded.' + + field :user, + ::Types::UserType, + null: false, + description: 'Achievement recipient.' + + field :awarded_by_user, + ::Types::UserType, + null: false, + description: 'Awarded by.' + + field :revoked_by_user, + ::Types::UserType, + null: true, + description: 'Revoked by.' + + field :created_at, + Types::TimeType, + null: false, + description: 'Timestamp the achievement was created.' + + field :updated_at, + Types::TimeType, + null: false, + description: 'Timestamp the achievement was last updated.' + + field :revoked_at, + Types::TimeType, + null: true, + description: 'Timestamp the achievement was revoked.' + end + end +end diff --git a/app/graphql/types/analytics/cycle_analytics/flow_metrics.rb b/app/graphql/types/analytics/cycle_analytics/flow_metrics.rb new file mode 100644 index 00000000000..c9a28767e11 --- /dev/null +++ b/app/graphql/types/analytics/cycle_analytics/flow_metrics.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +module Types + module Analytics + module CycleAnalytics + module FlowMetrics + def self.[](context = :project) + Class.new(BaseObject) do + graphql_name "#{context.capitalize}ValueStreamAnalyticsFlowMetrics" + description 'Exposes aggregated value stream flow metrics' + + field :issue_count, + Types::Analytics::CycleAnalytics::MetricType, + null: true, + description: 'Number of issues opened in the given period.', + resolver: Resolvers::Analytics::CycleAnalytics::IssueCountResolver[context] + field :deployment_count, + Types::Analytics::CycleAnalytics::MetricType, + null: true, + description: 'Number of production deployments in the given period.', + resolver: Resolvers::Analytics::CycleAnalytics::DeploymentCountResolver[context] + end + end + end + end + end +end + +mod = Types::Analytics::CycleAnalytics::FlowMetrics +mod.prepend_mod_with('Types::Analytics::CycleAnalytics::FlowMetrics') diff --git a/app/graphql/types/analytics/cycle_analytics/link_type.rb b/app/graphql/types/analytics/cycle_analytics/link_type.rb new file mode 100644 index 00000000000..3db6b58ac55 --- /dev/null +++ b/app/graphql/types/analytics/cycle_analytics/link_type.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module Types + module Analytics + module CycleAnalytics + # rubocop: disable Graphql/AuthorizeTypes + class LinkType < BaseObject + graphql_name 'ValueStreamMetricLinkType' + + field :name, + GraphQL::Types::String, + null: false, + description: 'Name of the link group.' + + field :label, + GraphQL::Types::String, + null: false, + description: 'Label for the link.' + + field :url, + GraphQL::Types::String, + null: false, + description: 'Drill-down URL.' + + field :docs_link, + GraphQL::Types::Boolean, + null: true, + description: 'Link to the metric documentation.' + end + end + # rubocop: enable Graphql/AuthorizeTypes + end +end diff --git a/app/graphql/types/analytics/cycle_analytics/metric_type.rb b/app/graphql/types/analytics/cycle_analytics/metric_type.rb new file mode 100644 index 00000000000..3f1a239019f --- /dev/null +++ b/app/graphql/types/analytics/cycle_analytics/metric_type.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +module Types + module Analytics + module CycleAnalytics + # rubocop: disable Graphql/AuthorizeTypes + class MetricType < BaseObject + graphql_name 'ValueStreamAnalyticsMetric' + description '' + + field :value, + GraphQL::Types::Float, + null: true, + description: 'Value for the metric.' + + field :identifier, + GraphQL::Types::String, + null: false, + description: 'Identifier for the metric.' + + field :unit, + GraphQL::Types::String, + null: true, + description: 'Unit of measurement.' + + field :title, + GraphQL::Types::String, + null: false, + description: 'Title for the metric.' + + field :links, + [LinkType], + null: false, + description: 'Optional links for drilling down.' + end + end + # rubocop: enable Graphql/AuthorizeTypes + end +end diff --git a/app/graphql/types/board_list_type.rb b/app/graphql/types/board_list_type.rb index 2352a21bd87..20661da8d94 100644 --- a/app/graphql/types/board_list_type.rb +++ b/app/graphql/types/board_list_type.rb @@ -55,7 +55,7 @@ module Types # board lists have a data dependency on label - so we batch load them here def title BatchLoader::GraphQL.for(object).batch do |lists, callback| - ActiveRecord::Associations::Preloader.new.preload(lists, :label) # rubocop: disable CodeReuse/ActiveRecord + ActiveRecord::Associations::Preloader.new(records: lists, associations: :label).call # rubocop: disable CodeReuse/ActiveRecord # all list titles are preloaded at this point lists.each { |list| callback.call(list, list.title) } diff --git a/app/graphql/types/ci/job_type.rb b/app/graphql/types/ci/job_type.rb index a97e9cee4b1..60c1c2e601d 100644 --- a/app/graphql/types/ci/job_type.rb +++ b/app/graphql/types/ci/job_type.rb @@ -25,6 +25,9 @@ module Types description: 'References to builds that must complete before the jobs run.' field :pipeline, Types::Ci::PipelineType, null: true, description: 'Pipeline the job belongs to.' + field :runner_machine, ::Types::Ci::RunnerMachineType, null: true, + description: 'Runner machine assigned to the job.', + alpha: { milestone: '15.11' } field :stage, Types::Ci::StageType, null: true, description: 'Stage of the job.' field :status, @@ -76,6 +79,8 @@ module Types description: 'Whether the job has a manual action.' field :manual_variables, ManualVariableType.connection_type, null: true, description: 'Variables added to a manual job when the job is triggered.' + field :play_path, GraphQL::Types::String, null: true, + description: 'Play path of the job.' field :playable, GraphQL::Types::Boolean, null: false, method: :playable?, description: 'Indicates the job can be played.' field :previous_stage_jobs_or_needs, Types::Ci::JobNeedUnion.connection_type, null: true, @@ -88,6 +93,8 @@ module Types description: 'Indicates that the job has been retried.' field :retryable, GraphQL::Types::Boolean, null: false, method: :retryable?, description: 'Indicates the job can be retried.' + field :scheduled, GraphQL::Types::Boolean, null: false, method: :scheduled?, + description: 'Indicates the job is scheduled.' field :scheduling_type, GraphQL::Types::String, null: true, description: 'Type of job scheduling. Value is `dag` if the job uses the `needs` keyword, and `stage` otherwise.' field :short_sha, type: GraphQL::Types::String, null: false, @@ -101,6 +108,14 @@ module Types field :project, Types::ProjectType, null: true, description: 'Project that the job belongs to.' + field :can_play_job, GraphQL::Types::Boolean, + null: false, resolver_method: :can_play_job?, + description: 'Indicates whether the current user can play the job.' + + def can_play_job? + object.playable? && Ability.allowed?(current_user, :play_job, object) + end + def kind return ::Ci::Build unless [::Ci::Build, ::Ci::Bridge].include?(object.class) @@ -157,6 +172,21 @@ module Types ::Gitlab::Graphql::Loaders::BatchModelLoader.new(::Ci::Stage, object.stage_id).find end + def runner_machine + BatchLoader::GraphQL.for(object.id).batch(key: :runner_machines) do |build_ids, loader| + plucked_build_to_machine_ids = ::Ci::RunnerMachineBuild.for_build(build_ids).pluck_build_id_and_runner_machine_id + runner_machines = ::Ci::RunnerMachine.id_in(plucked_build_to_machine_ids.values.uniq) + Preloaders::RunnerMachinePolicyPreloader.new(runner_machines, current_user).execute + runner_machines_by_id = runner_machines.index_by(&:id) + + build_ids.each do |build_id| + runner_machine_id = plucked_build_to_machine_ids[build_id] + + loader.call(build_id, runner_machines_by_id[runner_machine_id]) + end + end + end + # This class is a secret union! # TODO: turn this into an actual union, so that fields can be referenced safely! def id @@ -183,6 +213,10 @@ module Types ::Gitlab::Routing.url_helpers.project_job_path(object.project, object) end + def play_path + ::Gitlab::Routing.url_helpers.play_project_job_path(object.project, object) + end + def browse_artifacts_path ::Gitlab::Routing.url_helpers.browse_project_job_artifacts_path(object.project, object) end diff --git a/app/graphql/types/ci/runner_machine_type.rb b/app/graphql/types/ci/runner_machine_type.rb new file mode 100644 index 00000000000..8e6656288d9 --- /dev/null +++ b/app/graphql/types/ci/runner_machine_type.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +module Types + module Ci + class RunnerMachineType < BaseObject + graphql_name 'CiRunnerMachine' + + connection_type_class(::Types::CountableConnectionType) + + authorize :read_runner_machine + + alias_method :runner_machine, :object + + field :architecture_name, GraphQL::Types::String, null: true, + description: 'Architecture provided by the runner machine.', + method: :architecture + field :contacted_at, Types::TimeType, null: true, + description: 'Timestamp of last contact from the runner machine.', + method: :contacted_at + field :created_at, Types::TimeType, null: true, + description: 'Timestamp of creation of the runner machine.' + field :executor_name, GraphQL::Types::String, null: true, + description: 'Executor last advertised by the runner.', + method: :executor_name + field :id, ::Types::GlobalIDType[::Ci::RunnerMachine], null: false, + description: 'ID of the runner machine.' + field :ip_address, GraphQL::Types::String, null: true, + description: 'IP address of the runner machine.' + field :platform_name, GraphQL::Types::String, null: true, + description: 'Platform provided by the runner machine.', + method: :platform + field :revision, GraphQL::Types::String, null: true, description: 'Revision of the runner.' + field :runner, RunnerType, null: true, description: 'Runner configuration for the runner machine.' + field :status, + Types::Ci::RunnerStatusEnum, + null: false, + description: 'Status of the runner machine.' + field :system_id, GraphQL::Types::String, + null: false, + description: 'System ID associated with the runner machine.', + method: :system_xid + field :version, GraphQL::Types::String, null: true, description: 'Version of the runner.' + + def executor_name + ::Ci::Runner::EXECUTOR_TYPE_TO_NAMES[runner_machine.executor_type&.to_sym] + end + end + end +end + +Types::Ci::RunnerType.prepend_mod_with('Types::Ci::RunnerType') diff --git a/app/graphql/types/ci/runner_type.rb b/app/graphql/types/ci/runner_type.rb index 10d18f9ad2a..60ea78752ca 100644 --- a/app/graphql/types/ci/runner_type.rb +++ b/app/graphql/types/ci/runner_type.rb @@ -14,9 +14,6 @@ module Types JOB_COUNT_LIMIT = 1000 - # Only allow ephemeral_authentication_token to be visible for a short while - RUNNER_EPHEMERAL_TOKEN_AVAILABILITY_TIME = 3.hours - alias_method :runner, :object field :access_level, ::Types::Ci::RunnerAccessLevelEnum, null: false, @@ -34,12 +31,15 @@ module Types method: :contacted_at field :created_at, Types::TimeType, null: true, description: 'Timestamp of creation of this runner.' + field :created_by, Types::UserType, null: true, + description: 'User that created this runner.', + method: :creator field :description, GraphQL::Types::String, null: true, description: 'Description of the runner.' field :edit_admin_url, GraphQL::Types::String, null: true, description: 'Admin form URL of the runner. Only available for administrators.' field :ephemeral_authentication_token, GraphQL::Types::String, null: true, - description: 'Ephemeral authentication token used for runner machine registration.', + description: 'Ephemeral authentication token used for runner machine registration. Only available for the creator of the runner for a limited time during registration.', authorize: :read_ephemeral_token, alpha: { milestone: '15.9' } field :executor_name, GraphQL::Types::String, null: true, @@ -58,13 +58,17 @@ module Types Types::Ci::RunnerJobExecutionStatusEnum, null: true, description: 'Job execution status of the runner.', - deprecated: { milestone: '15.7', reason: :alpha } + alpha: { milestone: '15.7' } field :jobs, ::Types::Ci::JobType.connection_type, null: true, description: 'Jobs assigned to the runner. This field can only be resolved for one runner in any single request.', authorize: :read_builds, resolver: ::Resolvers::Ci::RunnerJobsResolver field :locked, GraphQL::Types::Boolean, null: true, description: 'Indicates the runner is locked.' + field :machines, ::Types::Ci::RunnerMachineType.connection_type, null: true, + description: 'Machines associated with the runner configuration.', + method: :runner_machines, + alpha: { milestone: '15.10' } field :maintenance_note, GraphQL::Types::String, null: true, description: 'Runner\'s maintenance notes.' field :maximum_timeout, GraphQL::Types::Int, null: true, @@ -84,6 +88,8 @@ module Types null: true, resolver: ::Resolvers::Ci::RunnerProjectsResolver, description: 'Find projects the runner is associated with. For project runners only.' + field :register_admin_url, GraphQL::Types::String, null: true, + description: 'URL of the temporary registration page of the runner. Only available before the runner is registered. Only available for administrators.' field :revision, GraphQL::Types::String, null: true, description: 'Revision of the runner.' field :run_untagged, GraphQL::Types::Boolean, null: false, @@ -141,12 +147,14 @@ module Types Gitlab::Routing.url_helpers.edit_admin_runner_url(runner) if can_admin_runners? end - def ephemeral_authentication_token - return unless runner.authenticated_user_registration_type? - return unless runner.created_at > RUNNER_EPHEMERAL_TOKEN_AVAILABILITY_TIME.ago - return if runner.runner_machines.any? + def register_admin_url + return unless can_admin_runners? && runner.registration_available? - runner.token + Gitlab::Routing.url_helpers.register_admin_runner_url(runner) + end + + def ephemeral_authentication_token + runner.token if runner.registration_available? end def project_count diff --git a/app/graphql/types/commit_signatures/ssh_signature_type.rb b/app/graphql/types/commit_signatures/ssh_signature_type.rb index 92eb4f7949a..d5db98c39a0 100644 --- a/app/graphql/types/commit_signatures/ssh_signature_type.rb +++ b/app/graphql/types/commit_signatures/ssh_signature_type.rb @@ -10,14 +10,19 @@ module Types authorize :download_code - field :user, Types::UserType, null: true, - method: :signed_by_user, - calls_gitaly: true, - description: 'User associated with the key.' + field :user, Types::UserType, + null: true, + method: :signed_by_user, + calls_gitaly: true, + description: 'User associated with the key.' field :key, Types::KeyType, - null: true, - description: 'SSH key used for the signature.' + null: true, + description: 'SSH key used for the signature.' + + field :key_fingerprint_sha256, String, + null: true, + description: 'Fingerprint of the key.' end end end diff --git a/app/graphql/types/design_management/design_type.rb b/app/graphql/types/design_management/design_type.rb index cc4c0e19ec7..be5edd17643 100644 --- a/app/graphql/types/design_management/design_type.rb +++ b/app/graphql/types/design_management/design_type.rb @@ -15,6 +15,11 @@ module Types implements(Types::CurrentUserTodos) implements(Types::TodoableInterface) + field :description, + GraphQL::Types::String, + null: true, + description: 'Description of the design.' + field :web_url, GraphQL::Types::String, null: false, @@ -25,6 +30,8 @@ module Types resolver: Resolvers::DesignManagement::VersionsResolver, description: "All versions related to this design ordered newest first." + markdown_field :description_html, null: true + # Returns a `DesignManagement::Version` for this query based on the # `atVersion` argument passed to a parent node if present, or otherwise # the most recent `Version` for the issue. diff --git a/app/graphql/types/issuable_subscription_event_enum.rb b/app/graphql/types/issuable_subscription_event_enum.rb new file mode 100644 index 00000000000..0f56fab8b46 --- /dev/null +++ b/app/graphql/types/issuable_subscription_event_enum.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Types + class IssuableSubscriptionEventEnum < BaseEnum + graphql_name 'IssuableSubscriptionEvent' + description 'Values for subscribing and unsubscribing from issuables' + + value 'SUBSCRIBE', 'Subscribe to an issuable.', value: 'subscribe' + value 'UNSUBSCRIBE', 'Unsubscribe from an issuable.', value: 'unsubscribe' + end +end diff --git a/app/graphql/types/mutation_type.rb b/app/graphql/types/mutation_type.rb index e48e9deae96..9bdbdad4386 100644 --- a/app/graphql/types/mutation_type.rb +++ b/app/graphql/types/mutation_type.rb @@ -6,7 +6,9 @@ module Types include Gitlab::Graphql::MountMutation - mount_mutation Mutations::Achievements::Create + mount_mutation Mutations::Achievements::Award, alpha: { milestone: '15.10' } + mount_mutation Mutations::Achievements::Create, alpha: { milestone: '15.8' } + mount_mutation Mutations::Achievements::Revoke, alpha: { milestone: '15.10' } mount_mutation Mutations::Admin::SidekiqQueues::DeleteJobs mount_mutation Mutations::AlertManagement::CreateAlertIssue mount_mutation Mutations::AlertManagement::UpdateAlertStatus @@ -69,6 +71,7 @@ module Types mount_mutation Mutations::Issues::BulkUpdate, alpha: { milestone: '15.9' } mount_mutation Mutations::Labels::Create mount_mutation Mutations::Members::Groups::BulkUpdate + mount_mutation Mutations::Members::Projects::BulkUpdate mount_mutation Mutations::MergeRequests::Accept mount_mutation Mutations::MergeRequests::Create mount_mutation Mutations::MergeRequests::Update @@ -89,6 +92,7 @@ module Types mount_mutation Mutations::Notes::Update::ImageDiffNote mount_mutation Mutations::Notes::RepositionImageDiffNote mount_mutation Mutations::Notes::Destroy + mount_mutation Mutations::Projects::SyncFork, calls_gitaly: true, alpha: { milestone: '15.9' } mount_mutation Mutations::Releases::Create mount_mutation Mutations::Releases::Update mount_mutation Mutations::Releases::Delete @@ -114,6 +118,7 @@ module Types mount_mutation Mutations::DesignManagement::Upload, calls_gitaly: true mount_mutation Mutations::DesignManagement::Delete, calls_gitaly: true mount_mutation Mutations::DesignManagement::Move + mount_mutation Mutations::DesignManagement::Update mount_mutation Mutations::ContainerExpirationPolicies::Update mount_mutation Mutations::ContainerRepositories::Destroy mount_mutation Mutations::ContainerRepositories::DestroyTags @@ -137,8 +142,10 @@ module Types mount_mutation Mutations::Ci::Job::Cancel mount_mutation Mutations::Ci::Job::Unschedule mount_mutation Mutations::Ci::JobArtifact::Destroy + mount_mutation Mutations::Ci::JobArtifact::BulkDestroy, alpha: { milestone: '15.10' } mount_mutation Mutations::Ci::JobTokenScope::AddProject mount_mutation Mutations::Ci::JobTokenScope::RemoveProject + mount_mutation Mutations::Ci::Runner::Create, alpha: { milestone: '15.10' } mount_mutation Mutations::Ci::Runner::Update mount_mutation Mutations::Ci::Runner::Delete mount_mutation Mutations::Ci::Runner::BulkDelete, alpha: { milestone: '15.3' } @@ -160,6 +167,7 @@ module Types mount_mutation Mutations::WorkItems::DeleteTask, alpha: { milestone: '15.1' } mount_mutation Mutations::WorkItems::Update, alpha: { milestone: '15.1' } mount_mutation Mutations::WorkItems::UpdateTask, alpha: { milestone: '15.1' } + mount_mutation Mutations::WorkItems::Export, alpha: { milestone: '15.10' } mount_mutation Mutations::SavedReplies::Create mount_mutation Mutations::SavedReplies::Update mount_mutation Mutations::Pages::MarkOnboardingComplete diff --git a/app/graphql/types/namespace_type.rb b/app/graphql/types/namespace_type.rb index fc55ff512b6..3420f16213f 100644 --- a/app/graphql/types/namespace_type.rb +++ b/app/graphql/types/namespace_type.rb @@ -68,7 +68,9 @@ module Types null: true, alpha: { milestone: '15.8' }, description: "Achievements for the namespace. " \ - "Returns `null` if the `achievements` feature flag is disabled." + "Returns `null` if the `achievements` feature flag is disabled.", + extras: [:lookahead], + resolver: ::Resolvers::Achievements::AchievementsResolver markdown_field :description_html, null: true @@ -83,10 +85,6 @@ module Types def root_storage_statistics Gitlab::Graphql::Loaders::BatchRootStorageStatisticsLoader.new(object.id).find end - - def achievements - object.achievements if Feature.enabled?(:achievements, object) - end end end diff --git a/app/graphql/types/packages/package_details_type.rb b/app/graphql/types/packages/package_details_type.rb index f63b41b3c92..e00d6eac72f 100644 --- a/app/graphql/types/packages/package_details_type.rb +++ b/app/graphql/types/packages/package_details_type.rb @@ -63,11 +63,11 @@ module Types end def pypi_url - pypi_registry_url(object.project.id) + pypi_registry_url(object.project) end def public_package - object.project.public? || object.project.project_feature.package_registry_access_level == ProjectFeature::PUBLIC + object.project.project_feature.public_packages? end end end diff --git a/app/graphql/types/permission_types/ci/pipeline_schedules.rb b/app/graphql/types/permission_types/ci/pipeline_schedules.rb index 268ac6096d0..dd9d94aa578 100644 --- a/app/graphql/types/permission_types/ci/pipeline_schedules.rb +++ b/app/graphql/types/permission_types/ci/pipeline_schedules.rb @@ -6,11 +6,16 @@ module Types class PipelineSchedules < BasePermissionType graphql_name 'PipelineSchedulePermissions' - abilities :take_ownership_pipeline_schedule, - :update_pipeline_schedule, + abilities :update_pipeline_schedule, :admin_pipeline_schedule ability_field :play_pipeline_schedule, calls_gitaly: true + ability_field :take_ownership_pipeline_schedule, + deprecated: { + reason: 'Use admin_pipeline_schedule permission to determine if the user can take ownership ' \ + 'of a pipeline schedule', + milestone: '15.9' + } end end end diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb index c105ab9814c..4ca2bc8b1b5 100644 --- a/app/graphql/types/project_type.rb +++ b/app/graphql/types/project_type.rb @@ -581,6 +581,14 @@ module Types description: 'Minimum access level.' end + field :flow_metrics, + ::Types::Analytics::CycleAnalytics::FlowMetrics[:project], + null: true, + description: 'Flow metrics for value stream analytics.', + method: :project_namespace, + authorize: :read_cycle_analytics, + alpha: { milestone: '15.10' } + def timelog_categories object.project_namespace.timelog_categories if Feature.enabled?(:timelog_categories) end @@ -657,7 +665,7 @@ module Types if project.repository.empty? raise Gitlab::Graphql::Errors::MutationError, - _(format('You must %s before using Security features.', add_file_docs_link.html_safe)).html_safe + Gitlab::Utils::ErrorMessage.to_user_facing(_(format('You must %s before using Security features.', add_file_docs_link.html_safe)).html_safe) end ::Security::CiConfiguration::SastParserService.new(object).configuration diff --git a/app/graphql/types/projects/fork_details_type.rb b/app/graphql/types/projects/fork_details_type.rb index 88c17d89620..6157dc47255 100644 --- a/app/graphql/types/projects/fork_details_type.rb +++ b/app/graphql/types/projects/fork_details_type.rb @@ -9,11 +9,37 @@ module Types field :ahead, GraphQL::Types::Int, null: true, + calls_gitaly: true, + method: :ahead, description: 'Number of commits ahead of upstream.' field :behind, GraphQL::Types::Int, null: true, + calls_gitaly: true, + method: :behind, description: 'Number of commits behind upstream.' + + field :is_syncing, GraphQL::Types::Boolean, + null: true, + method: :syncing?, + description: 'Indicates if there is a synchronization in progress.' + + field :has_conflicts, GraphQL::Types::Boolean, + null: true, + method: :has_conflicts?, + description: 'Indicates if the fork conflicts with its upstream project.' + + def ahead + counts[:ahead] + end + + def behind + counts[:behind] + end + + def counts + @counts ||= object.counts + end end # rubocop: enable Graphql/AuthorizeTypes end diff --git a/app/graphql/types/projects/namespace_project_sort_enum.rb b/app/graphql/types/projects/namespace_project_sort_enum.rb index 7c7b54226d3..14a315781ef 100644 --- a/app/graphql/types/projects/namespace_project_sort_enum.rb +++ b/app/graphql/types/projects/namespace_project_sort_enum.rb @@ -7,8 +7,9 @@ module Types description 'Values for sorting projects' value 'SIMILARITY', 'Most similar to the search query.', value: :similarity - value 'STORAGE', 'Sort by storage size.', value: :storage - value 'ACTIVITY_DESC', 'Sort by latest activity, in descending order.', value: :latest_activity_desc + value 'ACTIVITY_DESC', 'Sort by latest activity, descending order.', value: :latest_activity_desc end end end + +Types::Projects::NamespaceProjectSortEnum.prepend_mod diff --git a/app/graphql/types/root_storage_statistics_type.rb b/app/graphql/types/root_storage_statistics_type.rb index 64aaf3e73a0..67ee0589882 100644 --- a/app/graphql/types/root_storage_statistics_type.rb +++ b/app/graphql/types/root_storage_statistics_type.rb @@ -12,6 +12,7 @@ module Types field :lfs_objects_size, GraphQL::Types::Float, null: false, description: 'LFS objects size in bytes.' field :packages_size, GraphQL::Types::Float, null: false, description: 'Packages size in bytes.' field :pipeline_artifacts_size, GraphQL::Types::Float, null: false, description: 'CI pipeline artifacts size in bytes.' + field :registry_size_estimated, GraphQL::Types::Boolean, null: false, description: 'Indicates whether the deduplicated Container Registry size for the namespace is an estimated value or not.' field :repository_size, GraphQL::Types::Float, null: false, description: 'Git repository size in bytes.' field :snippets_size, GraphQL::Types::Float, null: false, description: 'Snippets size in bytes.' field :storage_size, GraphQL::Types::Float, null: false, description: 'Total storage in bytes.' diff --git a/app/graphql/types/user_interface.rb b/app/graphql/types/user_interface.rb index 9115b5a4760..83d2f3f830a 100644 --- a/app/graphql/types/user_interface.rb +++ b/app/graphql/types/user_interface.rb @@ -153,6 +153,15 @@ module Types field :profile_enable_gitpod_path, GraphQL::Types::String, null: true, description: 'Web path to enable Gitpod for the user.' + field :user_achievements, + Types::Achievements::UserAchievementType.connection_type, + null: true, + alpha: { milestone: '15.10' }, + description: "Achievements for the user. " \ + "Only returns for namespaces where the `achievements` feature flag is enabled.", + extras: [:lookahead], + resolver: ::Resolvers::Achievements::UserAchievementsResolver + definition_methods do def resolve_type(object, context) # in the absense of other information, we cannot tell - just default to diff --git a/app/graphql/types/work_items/available_export_fields_enum.rb b/app/graphql/types/work_items/available_export_fields_enum.rb new file mode 100644 index 00000000000..59dd7ba89b1 --- /dev/null +++ b/app/graphql/types/work_items/available_export_fields_enum.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Types + module WorkItems + class AvailableExportFieldsEnum < BaseEnum + graphql_name 'AvailableExportFields' + description 'Available fields to be exported as CSV' + + value 'ID', value: 'id', description: 'Unique identifier.' + value 'TITLE', value: 'title', description: 'Title.' + value 'TYPE', value: 'type', description: 'Type of the work item.' + value 'AUTHOR', value: 'author', description: 'Author name.' + value 'AUTHOR_USERNAME', value: 'author username', description: 'Author username.' + value 'CREATED_AT', value: 'created_at', description: 'Date of creation.' + end + end +end diff --git a/app/graphql/types/work_items/widget_interface.rb b/app/graphql/types/work_items/widget_interface.rb index 672a78f12e1..50f8e4f7d8a 100644 --- a/app/graphql/types/work_items/widget_interface.rb +++ b/app/graphql/types/work_items/widget_interface.rb @@ -18,7 +18,8 @@ module Types ::Types::WorkItems::Widgets::AssigneesType, ::Types::WorkItems::Widgets::StartAndDueDateType, ::Types::WorkItems::Widgets::MilestoneType, - ::Types::WorkItems::Widgets::NotesType + ::Types::WorkItems::Widgets::NotesType, + ::Types::WorkItems::Widgets::NotificationsType ].freeze def self.ce_orphan_types @@ -44,6 +45,8 @@ module Types ::Types::WorkItems::Widgets::MilestoneType when ::WorkItems::Widgets::Notes ::Types::WorkItems::Widgets::NotesType + when ::WorkItems::Widgets::Notifications + ::Types::WorkItems::Widgets::NotificationsType else raise "Unknown GraphQL type for widget #{object}" end diff --git a/app/graphql/types/work_items/widgets/notifications_type.rb b/app/graphql/types/work_items/widgets/notifications_type.rb new file mode 100644 index 00000000000..85928817d07 --- /dev/null +++ b/app/graphql/types/work_items/widgets/notifications_type.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module Types + module WorkItems + module Widgets + # Disabling widget level authorization as it might be too granular + # and we already authorize the parent work item + # rubocop:disable Graphql/AuthorizeTypes + class NotificationsType < BaseObject + graphql_name 'WorkItemWidgetNotifications' + description 'Represents the notifications widget' + + implements Types::WorkItems::WidgetInterface + + field :subscribed, GraphQL::Types::Boolean, + null: false, + description: 'Whether the current user is subscribed to notifications on the work item.' + + def subscribed + object.work_item.subscribed?(current_user, object.work_item.project) + end + end + # rubocop:enable Graphql/AuthorizeTypes + end + end +end diff --git a/app/graphql/types/work_items/widgets/notifications_update_input_type.rb b/app/graphql/types/work_items/widgets/notifications_update_input_type.rb new file mode 100644 index 00000000000..2f3b46c3f45 --- /dev/null +++ b/app/graphql/types/work_items/widgets/notifications_update_input_type.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Types + module WorkItems + module Widgets + class NotificationsUpdateInputType < BaseInputObject + graphql_name 'WorkItemWidgetNotificationsUpdateInput' + + argument :subscribed, + GraphQL::Types::Boolean, + required: true, + description: 'Desired state of the subscription.' + end + end + end +end diff --git a/app/helpers/admin/abuse_reports_helper.rb b/app/helpers/admin/abuse_reports_helper.rb new file mode 100644 index 00000000000..3218ecfd1db --- /dev/null +++ b/app/helpers/admin/abuse_reports_helper.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Admin + module AbuseReportsHelper + def abuse_reports_list_data(reports) + { + abuse_reports_data: { + categories: AbuseReport.categories.keys, + reports: Admin::AbuseReportSerializer.new.represent(reports), + pagination: { + current_page: reports.current_page, + per_page: reports.limit_value, + total_items: reports.total_count + } + }.to_json + } + end + end +end diff --git a/app/helpers/analytics/cycle_analytics_helper.rb b/app/helpers/analytics/cycle_analytics_helper.rb deleted file mode 100644 index 35a5d4f469d..00000000000 --- a/app/helpers/analytics/cycle_analytics_helper.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -module Analytics - module CycleAnalyticsHelper - def cycle_analytics_default_stage_config - Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |stage_params| - Analytics::CycleAnalytics::StagePresenter.new(stage_params) - end - end - - def cycle_analytics_initial_data(project, group = nil) - base_data = { project_id: project.id, group_path: project.group&.path, request_path: project_cycle_analytics_path(project), full_path: project.full_path } - svgs = { empty_state_svg_path: image_path("illustrations/analytics/cycle-analytics-empty-chart.svg"), no_data_svg_path: image_path("illustrations/analytics/cycle-analytics-empty-chart.svg"), no_access_svg_path: image_path("illustrations/analytics/no-access.svg") } - api_paths = group.present? ? cycle_analytics_group_api_paths(group) : cycle_analytics_project_api_paths(project) - - base_data.merge(svgs, api_paths) - end - - private - - def cycle_analytics_group_api_paths(group) - { milestones_path: group_milestones_path(group, format: :json), labels_path: group_labels_path(group, format: :json), group_path: group_path(group), group_id: group&.id } - end - - def cycle_analytics_project_api_paths(project) - { milestones_path: project_milestones_path(project, format: :json), labels_path: project_labels_path(project, format: :json), group_path: project.parent&.path, group_id: project.parent&.id } - end - end -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 93b7c8c0b94..d0602952f9a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -181,14 +181,14 @@ module ApplicationHelper css_classes << html_class unless html_class.blank? content_tag :time, l(time, format: "%b %d, %Y"), - class: css_classes.join(' '), - title: l(time.to_time.in_time_zone, format: :timeago_tooltip), - datetime: time.to_time.getutc.iso8601, - data: { - toggle: 'tooltip', - placement: placement, - container: 'body' - } + class: css_classes.join(' '), + title: l(time.to_time.in_time_zone, format: :timeago_tooltip), + datetime: time.to_time.getutc.iso8601, + data: { + toggle: 'tooltip', + placement: placement, + container: 'body' + } end def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', exclude_author: false) @@ -200,7 +200,7 @@ module ApplicationHelper if !exclude_author && object.last_edited_by output << content_tag(:span, ' by ') - output << link_to_member(object.project, object.last_edited_by, avatar: false, author_class: nil) + output << link_to_member(object.project, object.last_edited_by, avatar: false, extra_class: 'gl-hover-text-decoration-underline', author_class: nil) end output @@ -374,6 +374,10 @@ module ApplicationHelper cookies["sidebar_collapsed"] == "true" end + def collapsed_super_sidebar? + cookies["super_sidebar_collapsed"] == "true" + end + def locale_path asset_path("locale/#{Gitlab::I18n.locale}/app.js") end diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 3abaae98c29..fd684ee5ecb 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -4,11 +4,11 @@ module ApplicationSettingsHelper extend self delegate :allow_signup?, - :gravatar_enabled?, - :password_authentication_enabled_for_web?, - :akismet_enabled?, - :spam_check_endpoint_enabled?, - to: :'Gitlab::CurrentSettings.current_application_settings' + :gravatar_enabled?, + :password_authentication_enabled_for_web?, + :akismet_enabled?, + :spam_check_endpoint_enabled?, + to: :'Gitlab::CurrentSettings.current_application_settings' def user_oauth_applications? Gitlab::CurrentSettings.user_oauth_applications @@ -248,7 +248,9 @@ module ApplicationSettingsHelper :default_project_visibility, :default_projects_limit, :default_snippet_visibility, + :default_syntax_highlighting_theme, :delete_inactive_projects, + :deny_all_requests_except_allowed, :disable_admin_oauth_scopes, :disable_feed_token, :disabled_oauth_sign_in_sources, @@ -401,6 +403,7 @@ module ApplicationSettingsHelper :protected_paths_raw, :time_tracking_limit_to_hours, :two_factor_grace_period, + :update_runner_versions_enabled, :unique_ips_limit_enabled, :unique_ips_limit_per_user, :unique_ips_limit_time_window, @@ -478,7 +481,9 @@ module ApplicationSettingsHelper :bulk_import_enabled, :allow_runner_registration_token, :user_defaults_to_private_profile, - :deactivation_email_additional_text + :deactivation_email_additional_text, + :projects_api_rate_limit_unauthenticated, + :gitlab_dedicated_instance ].tap do |settings| next if Gitlab.com? diff --git a/app/helpers/artifacts_helper.rb b/app/helpers/artifacts_helper.rb index df0432105d5..f90d59409ed 100644 --- a/app/helpers/artifacts_helper.rb +++ b/app/helpers/artifacts_helper.rb @@ -4,6 +4,7 @@ module ArtifactsHelper def artifacts_app_data(project) { project_path: project.full_path, + project_id: project.id, can_destroy_artifacts: can?(current_user, :destroy_artifacts, project).to_s, artifacts_management_feedback_image_path: image_path('illustrations/chat-bubble-sm.svg') } diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 281d5c923d0..bb6fd6c3dad 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -2,9 +2,7 @@ module BlobHelper def edit_blob_path(project = @project, ref = @ref, path = @path, options = {}) - project_edit_blob_path(project, - tree_join(ref, path), - options[:link_opts]) + project_edit_blob_path(project, tree_join(ref, path), options[:link_opts]) end def ide_edit_path(project = @project, ref = @ref, path = @path) @@ -52,9 +50,11 @@ module BlobHelper def fork_path_for_current_user(project, path, with_notice: true) return unless current_user - project_forks_path(project, - namespace_key: current_user.namespace&.id, - continue: edit_blob_fork_params(path, with_notice: with_notice)) + project_forks_path( + project, + namespace_key: current_user.namespace&.id, + continue: edit_blob_fork_params(path, with_notice: with_notice) + ) end def encode_ide_path(path) @@ -66,12 +66,14 @@ module BlobHelper common_classes = "btn gl-button btn-confirm js-edit-blob gl-ml-3 #{options[:extra_class]}" - edit_button_tag(blob, - common_classes, - _('Edit'), - edit_blob_path(project, ref, path, options), - project, - ref) + edit_button_tag( + blob, + common_classes, + _('Edit'), + edit_blob_path(project, ref, path, options), + project, + ref + ) end def can_modify_blob?(blob, project = @project, ref = @ref) @@ -282,8 +284,8 @@ module BlobHelper fork_path = project_forks_path(project, namespace_key: current_user.namespace.id, continue: params) button_tag label, - class: "#{common_classes} js-edit-blob-link-fork-toggler", - data: { action: action, fork_path: fork_path } + class: "#{common_classes} js-edit-blob-link-fork-toggler", + data: { action: action, fork_path: fork_path } end def edit_disabled_button_tag(button_text, common_classes) diff --git a/app/helpers/ci/catalog/resources_helper.rb b/app/helpers/ci/catalog/resources_helper.rb new file mode 100644 index 00000000000..46d78cd6b24 --- /dev/null +++ b/app/helpers/ci/catalog/resources_helper.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Ci + module Catalog + module ResourcesHelper + def can_view_private_catalog?(_project) + false + end + + def js_ci_catalog_data + {} + end + end + end +end diff --git a/app/helpers/ci/pipeline_editor_helper.rb b/app/helpers/ci/pipeline_editor_helper.rb index 99a92ba9b59..4d1bdf5fa7f 100644 --- a/app/helpers/ci/pipeline_editor_helper.rb +++ b/app/helpers/ci/pipeline_editor_helper.rb @@ -18,12 +18,12 @@ module Ci "ci-examples-help-page-path" => help_page_path('ci/examples/index'), "ci-help-page-path" => help_page_path('ci/index'), "ci-lint-path" => project_ci_lint_path(project), + "ci-troubleshooting-path" => help_page_path('ci/troubleshooting', anchor: 'common-cicd-issues'), "default-branch" => project.default_branch_or_main, "empty-state-illustration-path" => image_path('illustrations/empty-state/empty-dag-md.svg'), "initial-branch-name" => initial_branch, "includes-help-page-path" => help_page_path('ci/yaml/includes'), "lint-help-page-path" => help_page_path('ci/lint', anchor: 'check-cicd-syntax'), - "lint-unavailable-help-page-path" => help_page_path('ci/pipeline_editor/index', anchor: 'configuration-validation-currently-not-available-message'), "needs-help-page-path" => help_page_path('ci/yaml/index', anchor: 'needs'), "new-merge-request-path" => namespace_project_new_merge_request_path, "pipeline_etag" => latest_commit ? graphql_etag_pipeline_sha_path(latest_commit.sha) : '', diff --git a/app/helpers/ci/status_helper.rb b/app/helpers/ci/status_helper.rb index bca49324a19..ea5b613cb78 100644 --- a/app/helpers/ci/status_helper.rb +++ b/app/helpers/ci/status_helper.rb @@ -131,10 +131,10 @@ module Ci if path link_to ci_icon_for_status(status, size: icon_size), path, - class: klass, title: title, data: data + class: klass, title: title, data: data else content_tag :span, ci_icon_for_status(status, size: icon_size), - class: klass, title: title, data: data + class: klass, title: title, data: data end end diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index f75d3657986..519508f1c02 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -27,12 +27,11 @@ module CommitsHelper end def commit_to_html(commit, ref, project) - render partial: 'projects/commits/commit', formats: :html, - locals: { - commit: commit, - ref: ref, - project: project - } + render partial: 'projects/commits/commit', formats: :html, locals: { + commit: commit, + ref: ref, + project: project + } end # Breadcrumb links for a Project and, if applicable, a tree path @@ -161,17 +160,23 @@ module CommitsHelper # This includes a keyed hash for values that can be nil, to prevent invalid cache entries # being served if the order should change in future. def commit_partial_cache_key(commit, ref:, merge_request:, request:) + keyed_hash = { + merge_request: merge_request&.cache_key, + pipeline_status: commit.detailed_status_for(ref)&.cache_key, + xhr: request.xhr?, + controller: controller.controller_path, + path: @path # referred to in #link_to_browse_code + } + + if Feature.enabled?(:show_tags_on_commits_view, commit.project) + keyed_hash[:referenced_by] = tag_checksum(commit.referenced_by) + end + [ commit, commit.author, ref, - { - merge_request: merge_request&.cache_key, - pipeline_status: commit.detailed_status_for(ref)&.cache_key, - xhr: request.xhr?, - controller: controller.controller_path, - path: @path # referred to in #link_to_browse_code - } + keyed_hash ] end @@ -188,16 +193,22 @@ module CommitsHelper entity = mode == 'raw' ? 'rawButton' : 'renderedButton' title = "Display #{mode} diff" - link_to("##{mode}-diff-#{file_hash}", - class: "btn gl-button btn-default btn-file-option has-tooltip btn-show-#{mode}-diff", - title: title, - data: { file_hash: file_hash, diff_toggle_entity: entity }) do + link_to( + "##{mode}-diff-#{file_hash}", + class: "btn gl-button btn-default btn-file-option has-tooltip btn-show-#{mode}-diff", + title: title, + data: { file_hash: file_hash, diff_toggle_entity: entity } + ) do sprite_icon(icon) end end protected + def tag_checksum(tags_array) + ::Zlib.crc32(tags_array.sort.join) + end + # Private: Returns a link to a person. If the person has a matching user and # is a member of the current @project it will link to the team member page. # Otherwise it will link to the person email as specified in the commit. diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index f0e1f252917..0352f5a1dfc 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -40,9 +40,14 @@ module DashboardHelper end) if doc_href.present? - link_to_doc = link_to(sprite_icon('question'), doc_href, - class: 'gl-ml-2', title: _('Documentation'), - target: '_blank', rel: 'noopener noreferrer') + link_to_doc = link_to( + sprite_icon('question'), + doc_href, + class: 'gl-ml-2', + title: _('Documentation'), + target: '_blank', + rel: 'noopener noreferrer' + ) concat(link_to_doc) end @@ -52,7 +57,7 @@ module DashboardHelper private def get_dashboard_nav_links - links = [:projects, :groups, :snippets] + links = [:projects, :groups, :snippets, :your_work, :explore] if can?(current_user, :read_cross_project) links += [:activity, :milestones] diff --git a/app/helpers/device_registration_helper.rb b/app/helpers/device_registration_helper.rb new file mode 100644 index 00000000000..bbdcab76bf5 --- /dev/null +++ b/app/helpers/device_registration_helper.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module DeviceRegistrationHelper + def device_registration_data(current_password_required:, target_path:, webauthn_error:) + { + initial_error: webauthn_error && webauthn_error[:message], + target_path: target_path, + password_required: current_password_required.to_s + } + end +end diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index e0a1697cfa9..c5df53ec606 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -34,6 +34,12 @@ module DiffHelper options[:expanded] = true options[:paths] = params.values_at(:old_path, :new_path) options[:use_extra_viewer_as_main] = false + + if Feature.enabled?(:large_ipynb_diffs, @project) && params[:file_identifier]&.include?('.ipynb') + options[:max_patch_bytes_for_file_extension] = { + '.ipynb' => 1.megabyte + } + end end options diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb index 427cbe18fbf..475ba3dcba8 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -54,7 +54,7 @@ module DropdownsHelper default_label = data_attr[:default_label] content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}") - output << sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3") + output << sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon") output.html_safe end end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index bef2da495b0..795d35ec81f 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -29,10 +29,11 @@ module EventsHelper opened: s_('Event|opened'), updated: s_('Event|updated'), 'removed due to membership expiration from': s_('Event|removed due to membership expiration from') - }.merge(localized_push_action_name_map, - localized_created_project_action_name_map, - localized_design_action_names - ).freeze + }.merge( + localized_push_action_name_map, + localized_created_project_action_name_map, + localized_design_action_names + ).freeze end def localized_push_action_name_map @@ -183,13 +184,11 @@ module EventsHelper def event_feed_url(event) if event.issue? - project_issue_url(event.project, - event.issue) + project_issue_url(event.project, event.issue) elsif event.merge_request? project_merge_request_url(event.project, event.merge_request) elsif event.commit_note? - project_commit_url(event.project, - event.note_target) + project_commit_url(event.project, event.note_target) elsif event.note? if event.note_target event_note_target_url(event) @@ -204,16 +203,12 @@ module EventsHelper def push_event_feed_url(event) if event.push_with_commits? && event.md_ref? if event.commits_count > 1 - project_compare_url(event.project, - from: event.commit_from, to: - event.commit_to) + project_compare_url(event.project, from: event.commit_from, to: event.commit_to) else - project_commit_url(event.project, - id: event.commit_to) + project_commit_url(event.project, id: event.commit_to) end elsif event.ref_name - project_commits_url(event.project, - event.ref_name) + project_commits_url(event.project, event.ref_name) end end @@ -241,26 +236,31 @@ module EventsHelper elsif event.design_note? design_url(event.note_target, anchor: dom_id(event.note)) else - polymorphic_url([event.project, event.note_target], - anchor: dom_id(event.target)) + polymorphic_url([event.project, event.note_target], anchor: dom_id(event.target)) end end def event_wiki_title_html(event) capture do concat content_tag(:span, _('wiki page'), class: "event-target-type gl-mr-2") - concat link_to(event.target_title, event_wiki_page_target_url(event), - title: event.target_title, - class: 'has-tooltip event-target-link gl-mr-2') + concat link_to( + event.target_title, + event_wiki_page_target_url(event), + title: event.target_title, + class: 'has-tooltip event-target-link gl-mr-2' + ) end end def event_design_title_html(event) capture do concat content_tag(:span, _('design'), class: "event-target-type gl-mr-2") - concat link_to(event.design.reference_link_text, design_url(event.design), - title: event.target_title, - class: 'has-tooltip event-design event-target-link gl-mr-2') + concat link_to( + event.design.reference_link_text, + design_url(event.design), + title: event.target_title, + class: 'has-tooltip event-design event-target-link gl-mr-2' + ) end end diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index 2967501f628..ed24f2509e8 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -57,7 +57,7 @@ module ExploreHelper private def get_explore_nav_links - [:projects, :groups, :snippets] + [:projects, :groups, :topics, :snippets] end def request_path_with_options(options = {}) diff --git a/app/helpers/feature_flags_helper.rb b/app/helpers/feature_flags_helper.rb index 3dde29dce91..fe8d8e6b5d9 100644 --- a/app/helpers/feature_flags_helper.rb +++ b/app/helpers/feature_flags_helper.rb @@ -18,8 +18,10 @@ module FeatureFlagsHelper feature_flags_path: project_feature_flags_path(@project), environments_endpoint: search_project_environments_path(@project, format: :json), strategy_type_docs_page_path: help_page_path('operations/feature_flags', anchor: 'feature-flag-strategies'), - environments_scope_docs_path: help_page_path('ci/environments/index.md', - anchor: 'limit-the-environment-scope-of-a-cicd-variable') + environments_scope_docs_path: help_page_path( + 'ci/environments/index.md', + anchor: 'limit-the-environment-scope-of-a-cicd-variable' + ) } end end diff --git a/app/helpers/groups/observability_helper.rb b/app/helpers/groups/observability_helper.rb index 6cd6566cee1..7661817da7b 100644 --- a/app/helpers/groups/observability_helper.rb +++ b/app/helpers/groups/observability_helper.rb @@ -22,19 +22,8 @@ module Groups }.freeze def observability_iframe_src(group) - # Format: https://observe.gitlab.com/GROUP_ID - - # When running Observability UI in standalone mode (i.e. not backed by Observability Backend) - # the group-id is not required. This is mostly used for local dev - base_url = ENV['STANDALONE_OBSERVABILITY_UI'] == 'true' ? observability_url : "#{observability_url}/-/#{group.id}" - - sanitized_path = if params[:observability_path] && sanitize(params[:observability_path]) != '' - CGI.unescapeHTML(sanitize(params[:observability_path])) - else - observability_config_for(params).fetch(:path) - end - - "#{base_url}#{sanitized_path}" + Gitlab::Observability.build_full_url(group, params[:observability_path], + observability_config_for(params).fetch(:path)) end def observability_page_title @@ -43,10 +32,6 @@ module Groups private - def observability_url - Gitlab::Observability.observability_url - end - def observability_config_for(params) ACTION_TO_PATH.fetch(params[:action], ACTION_TO_PATH['dashboards']) end diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 129871ca3fd..ce64ac1f21f 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -126,6 +126,7 @@ module GroupsHelper def subgroup_creation_data(group) { + parent_group_url: group.parent && group_url(group.parent), parent_group_name: group.parent&.name, import_existing_group_path: new_group_path(parent_id: group.parent_id, anchor: 'import-group-pane') } diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index c5be044a27b..063eef41f77 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -1,20 +1,26 @@ # frozen_string_literal: true module IdeHelper - def ide_data(project:, branch:, path:, merge_request:, fork_info:) - { + # Overridden in EE + def ide_data(project:, fork_info:, params:) + base_data = { 'can-use-new-web-ide' => can_use_new_web_ide?.to_s, 'use-new-web-ide' => use_new_web_ide?.to_s, 'new-web-ide-help-page-path' => help_page_path('user/project/web_ide/index.md', anchor: 'vscode-reimplementation'), 'user-preferences-path' => profile_preferences_path, - 'branch-name' => branch, - 'file-path' => path, - 'fork-info' => fork_info&.to_json, 'editor-font-src-url' => font_url('jetbrains-mono/JetBrainsMono.woff2'), 'editor-font-family' => 'JetBrains Mono', - 'editor-font-format' => 'woff2', - 'merge-request' => merge_request + 'editor-font-format' => 'woff2' }.merge(use_new_web_ide? ? new_ide_data(project: project) : legacy_ide_data(project: project)) + + return base_data unless project + + base_data.merge( + 'fork-info' => fork_info&.to_json, + 'branch-name' => params[:branch], + 'file-path' => params[:path], + 'merge-request' => params[:merge_request_id] + ) end def can_use_new_web_ide? @@ -76,3 +82,5 @@ module IdeHelper current_user.dismissed_callout?(feature_name: 'web_ide_ci_environments_guidance') end end + +IdeHelper.prepend_mod_with('IdeHelper') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 46d2d2c42d9..9c68f54f42e 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -156,7 +156,7 @@ module IssuablesHelper end output << content_tag(:strong) do - author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline") + author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline-block") author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-inline d-sm-none") author_output << issuable_meta_author_slot(issuable.author, css_class: 'ml-1') @@ -281,7 +281,9 @@ module IssuablesHelper { hasLinkedAlerts: issue.alert_management_alerts.any?, - canUpdateTimelineEvent: can?(current_user, :admin_incident_management_timeline_event, issue) + canUpdateTimelineEvent: can?(current_user, :admin_incident_management_timeline_event, issue), + currentPath: url_for(safe_params), + currentTab: safe_params[:incident_tab] } end @@ -378,8 +380,10 @@ module IssuablesHelper end def hidden_issuable_icon(issuable) - title = format(_('This %{issuable} is hidden because its author has been banned'), - issuable: issuable.is_a?(Issue) ? _('issue') : _('merge request')) + title = format( + _('This %{issuable} is hidden because its author has been banned'), + issuable: issuable.is_a?(Issue) ? _('issue') : _('merge request') + ) content_tag(:span, class: 'has-tooltip', title: title) do sprite_icon('spam', css_class: 'gl-vertical-align-text-bottom') end diff --git a/app/helpers/jira_connect_helper.rb b/app/helpers/jira_connect_helper.rb index 50e3c3cc5fe..28b30ae051c 100644 --- a/app/helpers/jira_connect_helper.rb +++ b/app/helpers/jira_connect_helper.rb @@ -12,7 +12,7 @@ module JiraConnectHelper users_path: current_user ? nil : jira_connect_users_path, # users_path is used to determine if user is signed in gitlab_user_path: current_user ? user_path(current_user) : nil, oauth_metadata: Feature.enabled?(:jira_connect_oauth, current_user) ? jira_connect_oauth_data(installation).to_json : nil, - public_key_storage_enabled: Gitlab.config.jira_connect.enable_public_keys_storage || Gitlab::CurrentSettings.jira_connect_public_key_storage_enabled? + public_key_storage_enabled: Gitlab::CurrentSettings.jira_connect_public_key_storage_enabled? } end diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 4a5720e757d..bec6cccb977 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -80,9 +80,7 @@ module MarkupHelper ) ) - # since <img> tags are stripped, this can leave empty <a> tags hanging around - # (as our markdown wraps images in links) - strip_empty_link_tags(text).html_safe + render_links(text) end def markdown(text, context = {}) @@ -171,9 +169,22 @@ module MarkupHelper { project: wiki.container } end - def strip_empty_link_tags(text) + # Sanitize and style user references links + # + # @param String text the string to be sanitized + # + # 1. Remove empty <a> tags which are caused by the <img> tags being stripped + # (as our markdown wraps images in links) + # 2. Strip all link tags, except user references, leaving just the link text + # 3. Add a highlight class for current user's references + # + # @return sanitized HTML string + def render_links(text) scrubber = Loofah::Scrubber.new do |node| - node.remove if node.name == 'a' && node.children.empty? + next unless node.name == 'a' + next node.remove if node.children.empty? + next node.replace(node.children) if node['data-reference-type'] != 'user' + next node.append_class('current-user') if current_user && node['data-user'] == current_user.id.to_s end sanitize text, scrubber: scrubber diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index ec395baef9e..7d9be2f93fd 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -2,6 +2,7 @@ module MergeRequestsHelper include Gitlab::Utils::StrongMemoize + include CompareHelper def create_mr_button_from_event?(event) create_mr_button?(from: event.branch_name, source_project: event.project) @@ -185,6 +186,7 @@ module MergeRequestsHelper endpoint_metadata: @endpoint_metadata_url, endpoint_batch: diffs_batch_project_json_merge_request_path(project, merge_request, 'json', params), endpoint_coverage: @coverage_path, + endpoint_diff_for_path: diff_for_path_namespace_project_merge_request_path(format: 'json', id: merge_request.iid, namespace_id: project.namespace.path, project_id: project.path), help_page_path: help_page_path('user/project/merge_requests/reviews/suggestions.md'), current_user_data: @current_user_data, update_current_user_path: @update_current_user_path, @@ -198,7 +200,8 @@ module MergeRequestsHelper default_suggestion_commit_message: default_suggestion_commit_message, source_project_default_url: @merge_request.source_project && default_url_to_repo(@merge_request.source_project), source_project_full_path: @merge_request.source_project&.full_path, - is_forked: @project.forked?.to_s + is_forked: @project.forked?.to_s, + saved_replies_new_path: profile_saved_replies_path } end diff --git a/app/helpers/mirror_helper.rb b/app/helpers/mirror_helper.rb index 3dfd30f07db..06deaeb5e9e 100644 --- a/app/helpers/mirror_helper.rb +++ b/app/helpers/mirror_helper.rb @@ -13,7 +13,7 @@ module MirrorHelper docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url } html_escape(_('Git LFS objects will be synced if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. Push mirrors will %{strong_open}not%{strong_close} sync LFS objects over SSH.')) % - { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } + { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } end end diff --git a/app/helpers/nav/new_dropdown_helper.rb b/app/helpers/nav/new_dropdown_helper.rb index ddd6469a9e4..201007863b2 100644 --- a/app/helpers/nav/new_dropdown_helper.rb +++ b/app/helpers/nav/new_dropdown_helper.rb @@ -6,19 +6,19 @@ module Nav return unless current_user menu_sections = [] + data = { title: _('Create new...') } - if group&.persisted? - menu_sections.push(group_menu_section(group)) - elsif project&.persisted? + if project&.persisted? menu_sections.push(project_menu_section(project)) + elsif group&.persisted? + menu_sections.push(group_menu_section(group)) end menu_sections.push(general_menu_section) - { - title: _("Create new..."), - menu_sections: menu_sections.select { |x| x.fetch(:menu_items).any? } - } + data[:menu_sections] = menu_sections.select { |x| x.fetch(:menu_items).any? } + + data end private @@ -51,11 +51,7 @@ module Nav menu_items.push(create_epic_menu_item(group)) if can?(current_user, :admin_group_member, group) - menu_items.push( - invite_members_menu_item( - href: group_group_members_path(group) - ) - ) + menu_items.push(invite_members_menu_item(partial: 'groups/invite_members_top_nav_link')) end { @@ -102,11 +98,7 @@ module Nav end if can_admin_project_member?(project) - menu_items.push( - invite_members_menu_item( - href: project_project_members_path(project) - ) - ) + menu_items.push(invite_members_menu_item(partial: 'projects/invite_members_top_nav_link')) end { @@ -157,16 +149,16 @@ module Nav } end - def invite_members_menu_item(href:) + def invite_members_menu_item(partial:) ::Gitlab::Nav::TopNavMenuItem.build( id: 'invite', title: s_('InviteMember|Invite members'), - emoji: 'shaking_hands', - href: href, + icon: 'shaking_hands', + partial: partial, + component: 'invite_members', data: { - track_action: 'click_link_invite_members', - track_label: 'plus_menu_dropdown', - track_property: 'navigation_top' + trigger_source: 'top-nav', + trigger_element: 'text-emoji' } ) end diff --git a/app/helpers/nav/top_nav_helper.rb b/app/helpers/nav/top_nav_helper.rb index fb11c183aeb..756baabd249 100644 --- a/app/helpers/nav/top_nav_helper.rb +++ b/app/helpers/nav/top_nav_helper.rb @@ -64,7 +64,6 @@ module Nav end def build_anonymous_view_model(builder:) - # These come from `app/views/layouts/nav/_explore.html.ham` if explore_nav_link?(:projects) builder.add_primary_menu_item_with_shortcut( header: top_nav_localized_headers[:explore], @@ -83,6 +82,15 @@ module Nav ) end + if explore_nav_link?(:topics) + builder.add_primary_menu_item_with_shortcut( + header: top_nav_localized_headers[:explore], + active: active_nav_link?(page: topics_explore_projects_path, path: 'projects#topic'), + href: topics_explore_projects_path, + **topics_menu_item_attrs + ) + end + if explore_nav_link?(:snippets) builder.add_primary_menu_item_with_shortcut( header: top_nav_localized_headers[:explore], @@ -123,39 +131,54 @@ module Nav builder.add_view(GROUPS_VIEW, container_view_props(namespace: 'groups', current_item: current_item, submenu: groups_submenu)) end + if dashboard_nav_link?(:your_work) + builder.add_primary_menu_item( + id: 'your-work', + header: top_nav_localized_headers[:switch_to], + title: _('Your work'), + href: dashboard_projects_path, + active: active_nav_link?(controller: []), + icon: 'work', + data: { **menu_data_tracking_attrs('your-work') } + ) + end + + if dashboard_nav_link?(:explore) + builder.add_primary_menu_item( + id: 'explore', + header: top_nav_localized_headers[:switch_to], + title: _('Explore'), + href: explore_projects_path, + active: active_nav_link?(controller: ["explore/groups", "explore/snippets"], page: ["/explore/projects", "/explore", "/explore/projects/topics"], path: ["projects#topic"]), + icon: 'compass', + data: { **menu_data_tracking_attrs('explore') } + ) + end + if dashboard_nav_link?(:milestones) - builder.add_primary_menu_item_with_shortcut( - id: 'milestones', - header: top_nav_localized_headers[:explore], + builder.add_shortcut( + id: 'milestones-shortcut', title: _('Milestones'), href: dashboard_milestones_path, - active: active_nav_link?(controller: 'dashboard/milestones'), - icon: 'clock', - data: { **menu_data_tracking_attrs('milestones') }, - shortcut_class: 'dashboard-shortcuts-milestones' + css_class: 'dashboard-shortcuts-milestones' ) end if dashboard_nav_link?(:snippets) - builder.add_primary_menu_item_with_shortcut( - header: top_nav_localized_headers[:explore], - active: active_nav_link?(controller: 'dashboard/snippets'), - data: { qa_selector: 'snippets_link', **menu_data_tracking_attrs('snippets') }, + builder.add_shortcut( + id: 'snippets-shortcut', + title: _('Snippets'), href: dashboard_snippets_path, - **snippets_menu_item_attrs + css_class: 'dashboard-shortcuts-snippets' ) end if dashboard_nav_link?(:activity) - builder.add_primary_menu_item_with_shortcut( - id: 'activity', - header: top_nav_localized_headers[:explore], + builder.add_shortcut( + id: 'activity-shortcut', title: _('Activity'), href: activity_dashboard_path, - active: active_nav_link?(path: 'dashboard#activity'), - icon: 'history', - data: { **menu_data_tracking_attrs('activity') }, - shortcut_class: 'dashboard-shortcuts-activity' + css_class: 'dashboard-shortcuts-activity' ) end @@ -220,6 +243,15 @@ module Nav } end + def topics_menu_item_attrs + { + id: 'topics', + title: _('Topics'), + icon: 'labels', + shortcut_class: 'dashboard-shortcuts-topics' + } + end + def snippets_menu_item_attrs { id: 'snippets', diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index d0421cd5184..59ffe6a183e 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -9,10 +9,29 @@ module NavHelper header_links.include?(link) end + def page_has_sidebar? + defined?(@left_sidebar) && @left_sidebar + end + + def page_has_collapsed_sidebar? + page_has_sidebar? && collapsed_sidebar? + end + + def page_has_collapsed_super_sidebar? + page_has_sidebar? && collapsed_super_sidebar? + end + def page_with_sidebar_class class_name = page_gutter_class - class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar - class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar + + if show_super_sidebar? + class_name << 'page-with-super-sidebar' if page_has_sidebar? + class_name << 'page-with-super-sidebar-collapsed' if page_has_collapsed_super_sidebar? + else + class_name << 'page-with-contextual-sidebar' if page_has_sidebar? + class_name << 'page-with-icon-sidebar' if page_has_collapsed_sidebar? + end + class_name -= ['right-sidebar-expanded'] if defined?(@right_sidebar) && !@right_sidebar class_name @@ -66,11 +85,21 @@ module NavHelper end def show_super_sidebar? - Feature.enabled?(:super_sidebar_nav, current_user) && current_user&.use_new_navigation + Feature.enabled?(:super_sidebar_nav, current_user) && current_user&.use_new_navigation && super_sidebar_supported? end private + # This is a temporary measure until we support all other existing sidebars: + # https://gitlab.com/gitlab-org/gitlab/-/issues/391500 + # https://gitlab.com/gitlab-org/gitlab/-/issues/391501 + # https://gitlab.com/gitlab-org/gitlab/-/issues/391502 + def super_sidebar_supported? + return true if @nav.nil? + + %w(your_work explore project group profile user_profile).include?(@nav) + end + def get_header_links links = if current_user [:user_dropdown] diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index b47f4633348..3e8872dc199 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -77,8 +77,10 @@ module NotesHelper line_type: line_type } - button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', - data: data, title: 'Add a reply' + button_tag 'Reply...', + class: 'btn btn-text-field js-discussion-reply-button', + data: data, + title: 'Add a reply' end def note_max_access_for_user(note) @@ -151,7 +153,6 @@ module NotesHelper def initial_notes_data(autocomplete) { notesUrl: notes_url, - notesIds: @noteable.notes.pluck(:id), # rubocop: disable CodeReuse/ActiveRecord now: Time.now.to_i, diffView: diff_view, enableGFM: { diff --git a/app/helpers/operations_helper.rb b/app/helpers/operations_helper.rb index baeb9a477c3..8528f5f04f7 100644 --- a/app/helpers/operations_helper.rb +++ b/app/helpers/operations_helper.rb @@ -12,7 +12,7 @@ module OperationsHelper def alerts_settings_data(disabled: false) setting = project_incident_management_setting - templates = setting.available_issue_templates.map { |t| { key: t.key, name: t.name } } + templates = setting.available_issue_templates.map { |t| { value: t.key, text: t.name } } { 'prometheus_activated' => prometheus_integration.manual_configuration?.to_s, diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb index f9ec20bdd01..dec1943db54 100644 --- a/app/helpers/packages_helper.rb +++ b/app/helpers/packages_helper.rb @@ -27,9 +27,14 @@ module PackagesHelper presenter.detail_view.to_json end - def pypi_registry_url(project_id) - full_url = expose_url(api_v4_projects_packages_pypi_simple_package_name_path({ id: project_id, package_name: '' }, true)) - full_url.sub!('://', '://__token__:<your_personal_token>@') + def pypi_registry_url(project) + full_url = expose_url(api_v4_projects_packages_pypi_simple_package_name_path({ id: project.id, package_name: '' }, true)) + + if project.project_feature.public_packages? + full_url + else + full_url.sub!('://', '://__token__:<your_personal_token>@') + end end def composer_registry_url(group_id) diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 4a218984af1..9bcabd7d9c6 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -175,7 +175,7 @@ module PageLayoutHelper current_emoji: user.status.emoji.to_s, current_message: user.status.message.to_s, current_availability: user.status.availability.to_s, - current_clear_status_after: user.status.clear_status_at&.to_s(:iso8601) + current_clear_status_after: user_clear_status_at(user) }) end diff --git a/app/helpers/plan_limits_helper.rb b/app/helpers/plan_limits_helper.rb new file mode 100644 index 00000000000..71869b3ba30 --- /dev/null +++ b/app/helpers/plan_limits_helper.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module PlanLimitsHelper + def plan_limit_setting_description(limit_name) + case limit_name + when :ci_pipeline_size + s_('AdminSettings|Maximum number of jobs in a single pipeline') + when :ci_active_jobs + s_('AdminSettings|Total number of jobs in currently active pipelines') + when :ci_active_pipelines + s_('AdminSettings|Maximum number of active pipelines per project') + when :ci_project_subscriptions + s_('AdminSettings|Maximum number of pipeline subscriptions to and from a project') + when :ci_pipeline_schedules + s_('AdminSettings|Maximum number of pipeline schedules') + when :ci_needs_size_limit + s_('AdminSettings|Maximum number of DAG dependencies that a job can have') + when :ci_registered_group_runners + s_('AdminSettings|Maximum number of runners registered per group') + when :ci_registered_project_runners + s_('AdminSettings|Maximum number of runners registered per project') + when :pipeline_hierarchy_size + s_("AdminSettings|Maximum number of downstream pipelines in a pipeline's hierarchy tree") + else + raise ArgumentError, "No description available for plan limit #{limit_name}" + end + end +end diff --git a/app/helpers/projects/error_tracking_helper.rb b/app/helpers/projects/error_tracking_helper.rb index 471565d162c..fc4ad10db21 100644 --- a/app/helpers/projects/error_tracking_helper.rb +++ b/app/helpers/projects/error_tracking_helper.rb @@ -5,8 +5,7 @@ module Projects::ErrorTrackingHelper error_tracking_enabled = !!project.error_tracking_setting&.enabled? { - 'index-path' => project_error_tracking_index_path(project, - format: :json), + 'index-path' => project_error_tracking_index_path(project, format: :json), 'user-can-enable-error-tracking' => can?(current_user, :admin_operations, project).to_s, 'enable-error-tracking-link' => project_settings_operations_path(project), 'error-tracking-enabled' => error_tracking_enabled.to_s, diff --git a/app/helpers/projects/settings/branch_rules_helper.rb b/app/helpers/projects/settings/branch_rules_helper.rb new file mode 100644 index 00000000000..e53275d8183 --- /dev/null +++ b/app/helpers/projects/settings/branch_rules_helper.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +module Projects + module Settings + module BranchRulesHelper + def branch_rules_data(project) + { + project_path: project.full_path, + protected_branches_path: project_settings_repository_path(project, anchor: 'js-protected-branches-settings'), + approval_rules_path: project_settings_merge_requests_path(project, + anchor: 'js-merge-request-approval-settings'), + status_checks_path: project_settings_merge_requests_path(project, anchor: 'js-merge-request-settings'), + branches_path: project_branches_path(project), + show_status_checks: 'false', + show_approvers: 'false', + show_code_owners: 'false' + } + end + end + end +end + +Projects::Settings::BranchRulesHelper.prepend_mod diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 04190bc442b..a854b9990d2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -133,6 +133,7 @@ module ProjectsHelper { source_name: source_project.full_name, source_path: project_path(source_project), + source_default_branch: source_default_branch, ahead_compare_path: project_compare_path( project, from: source_default_branch, to: ref, from_project_id: source_project.id ), @@ -474,7 +475,7 @@ module ProjectsHelper def clusters_deprecation_alert_message if has_active_license? - s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd} or reach out to GitLab support.') + s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}. Contact GitLab Support if you have any additional questions.') else s_('ClusterIntegration|The certificate-based Kubernetes integration has been deprecated and will be turned off at the end of February 2023. Please %{linkStart}migrate to the GitLab agent for Kubernetes%{linkEnd}.') end @@ -498,6 +499,18 @@ module ProjectsHelper format_cached_count(1000, number) end + def remote_mirror_setting_enabled? + false + end + + def http_clone_url_to_repo(project) + project.http_url_to_repo + end + + def ssh_clone_url_to_repo(project) + project.ssh_url_to_repo + end + private def localized_access_names @@ -753,7 +766,7 @@ module ProjectsHelper end def show_visibility_confirm_modal?(project) - project.unlink_forks_upon_visibility_decrease_enabled? && project.visibility_level > Gitlab::VisibilityLevel::PRIVATE && project.forks_count > 0 + project.visibility_level > Gitlab::VisibilityLevel::PRIVATE && project.forks_count > 0 end def confirm_reduce_visibility_message(project) diff --git a/app/helpers/registrations_helper.rb b/app/helpers/registrations_helper.rb index 1724e11a6f1..fcd560dbe8c 100644 --- a/app/helpers/registrations_helper.rb +++ b/app/helpers/registrations_helper.rb @@ -11,8 +11,8 @@ module RegistrationsHelper } end - def arkose_labs_challenge_enabled? - false + def signup_box_template + 'devise/shared/signup_box' end end diff --git a/app/helpers/routing/projects_helper.rb b/app/helpers/routing/projects_helper.rb index f4732e398f0..a0073f9c5ba 100644 --- a/app/helpers/routing/projects_helper.rb +++ b/app/helpers/routing/projects_helper.rb @@ -43,9 +43,10 @@ module Routing end def work_item_url(entity, *args) - unless Feature.enabled?(:use_iid_in_work_items_path, entity.project.group) - return project_work_items_url(entity.project, entity.id, *args) - end + # TODO: we do not have a route to access group level work items yet. + # That is to be done as part of view group level work item issue: + # see https://gitlab.com/gitlab-org/gitlab/-/work_items/393987?iid_path=true + return unless entity.project.present? options = args.first || {} options[:iid_path] = true diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index ca5436ff019..d62dc038388 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -204,7 +204,9 @@ module SearchHelper if search_has_project? hash[:project] = { id: @project.id, name: @project.name } - hash[:project_metadata] = { issues_path: project_issues_path(@project), mr_path: project_merge_requests_path(@project) } + hash[:project_metadata] = { mr_path: project_merge_requests_path(@project) } + hash[:project_metadata][:issues_path] = project_issues_path(@project) if @project.feature_available?(:issues, current_user) + hash[:code_search] = search_scope.nil? hash[:ref] = @ref if @ref && can?(current_user, :read_code, @project) end diff --git a/app/helpers/sidebars_helper.rb b/app/helpers/sidebars_helper.rb index 27020738515..6c9688b0f9d 100644 --- a/app/helpers/sidebars_helper.rb +++ b/app/helpers/sidebars_helper.rb @@ -23,38 +23,100 @@ module SidebarsHelper end end - def project_sidebar_context(project, user, current_ref, ref_type: nil) + def project_sidebar_context(project, user, current_ref, ref_type: nil, **args) context_data = project_sidebar_context_data(project, user, current_ref, ref_type: ref_type) - Sidebars::Projects::Context.new(**context_data) + Sidebars::Projects::Context.new(**context_data, **args) end - def group_sidebar_context(group, user) + def group_sidebar_context(group, user, **args) context_data = group_sidebar_context_data(group, user) - Sidebars::Groups::Context.new(**context_data) + Sidebars::Groups::Context.new(**context_data, **args) end - def super_sidebar_context(user, group:, project:) + def your_work_sidebar_context(user, **args) + context_data = your_work_context_data(user) + + Sidebars::Context.new(**context_data, **args) + end + + def super_sidebar_context(user, group:, project:, panel:) { + current_menu_items: panel.super_sidebar_menu_items, + current_context_header: panel.super_sidebar_context_header, name: user.name, username: user.username, avatar_url: user.avatar_url, + has_link_to_profile: current_user_menu?(:profile), + link_to_profile: user_url(user), + logo_url: current_appearance&.header_logo_path, + status: { + can_update: can?(current_user, :update_user_status, current_user), + busy: user.status&.busy?, + customized: user.status&.customized?, + availability: user.status&.availability.to_s, + emoji: user.status&.emoji, + message: user.status&.message_html&.html_safe, + clear_after: user_clear_status_at(user) + }, + trial: { + has_start_trial: current_user_menu?(:start_trial), + url: trials_link_url + }, + settings: { + has_settings: current_user_menu?(:settings), + profile_path: profile_path, + profile_preferences_path: profile_preferences_path + }, + can_sign_out: current_user_menu?(:sign_out), + sign_out_link: destroy_user_session_path, assigned_open_issues_count: user.assigned_open_issues_count, todos_pending_count: user.todos_pending_count, issues_dashboard_path: issues_dashboard_path(assignee_username: user.username), total_merge_requests_count: user_merge_requests_counts[:total], create_new_menu_groups: create_new_menu_groups(group: group, project: project), merge_request_menu: create_merge_request_menu(user), + projects_path: projects_path, + groups_path: groups_path, support_path: support_url, display_whats_new: display_whats_new?, whats_new_most_recent_release_items_count: whats_new_most_recent_release_items_count, whats_new_version_digest: whats_new_version_digest, show_version_check: show_version_check?, gitlab_version: Gitlab.version_info, - gitlab_version_check: gitlab_version_check + gitlab_version_check: gitlab_version_check, + gitlab_com_but_not_canary: Gitlab.com_but_not_canary?, + gitlab_com_and_canary: Gitlab.com_and_canary?, + canary_toggle_com_url: Gitlab::Saas.canary_toggle_com_url, + current_context: super_sidebar_current_context(project: project, group: group) } end + def super_sidebar_nav_panel( + nav: nil, project: nil, user: nil, group: nil, current_ref: nil, ref_type: nil, + viewed_user: nil) + context_adds = { route_is_active: method(:active_nav_link?), is_super_sidebar: true } + case nav + when 'project' + context = project_sidebar_context(project, user, current_ref, ref_type: ref_type, **context_adds) + Sidebars::Projects::SuperSidebarPanel.new(context) + when 'group' + context = group_sidebar_context(group, user, **context_adds) + Sidebars::Groups::SuperSidebarPanel.new(context) + when 'profile' + context = Sidebars::Context.new(current_user: user, container: user, **context_adds) + Sidebars::UserSettings::Panel.new(context) + when 'user_profile' + context = Sidebars::Context.new(current_user: user, container: viewed_user, **context_adds) + Sidebars::UserProfile::Panel.new(context) + when 'explore' + Sidebars::Explore::Panel.new(Sidebars::Context.new(current_user: user, container: nil, **context_adds)) + else + context = your_work_sidebar_context(user, **context_adds) + Sidebars::YourWork::Panel.new(context) + end + end + private def create_new_menu_groups(group:, project:) @@ -160,6 +222,44 @@ module SidebarsHelper container: group } end + + def your_work_context_data(user) + { + current_user: user, + container: user, + show_security_dashboard: false + } + end + + def super_sidebar_current_context(project: nil, group: nil) + if project&.persisted? + return { + namespace: 'projects', + item: { + id: project.id, + name: project.name, + namespace: project.full_name, + webUrl: project_path(project), + avatarUrl: project.avatar_url + } + } + end + + if group&.persisted? + return { + namespace: 'groups', + item: { + id: group.id, + name: group.name, + namespace: group.full_name, + webUrl: group_path(group), + avatarUrl: group.avatar_url + } + } + end + + {} + end end SidebarsHelper.prepend_mod_with('SidebarsHelper') diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index 8558c664977..2f9117a74be 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -45,30 +45,35 @@ module SnippetsHelper def embedded_raw_snippet_button(snippet, blob) return if blob.empty? || blob.binary? || blob.stored_externally? - link_to(external_snippet_icon('doc-code'), - gitlab_raw_snippet_blob_url(snippet, blob.path), - class: 'gl-button btn btn-default', - target: '_blank', - rel: 'noopener noreferrer', - title: 'Open raw') + link_to( + external_snippet_icon('doc-code'), + gitlab_raw_snippet_blob_url(snippet, blob.path), + class: 'gl-button btn btn-default', + target: '_blank', + rel: 'noopener noreferrer', + title: 'Open raw' + ) end def embedded_snippet_download_button(snippet, blob) - link_to(external_snippet_icon('download'), - gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false), - class: 'gl-button btn btn-default', - target: '_blank', - title: 'Download', - rel: 'noopener noreferrer') + link_to( + external_snippet_icon('download'), + gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false), + class: 'gl-button btn btn-default', + target: '_blank', + title: 'Download', + rel: 'noopener noreferrer' + ) end def embedded_copy_snippet_button(blob) return unless blob.rendered_as_text?(ignore_errors: false) - content_tag(:button, - class: 'gl-button btn btn-default copy-to-clipboard-btn', - title: 'Copy snippet contents', - onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')" + content_tag( + :button, + class: 'gl-button btn btn-default copy-to-clipboard-btn', + title: 'Copy snippet contents', + onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')" ) do external_snippet_icon('copy-to-clipboard') end diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index 4a9596a1347..9038d972f65 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -227,7 +227,7 @@ module SortingHelper options.concat([due_date_option]) if viewing_issues options.concat([popularity_option, label_priority_option]) - options.concat([merged_option]) if viewing_merge_requests + options.concat([merged_option]) if can_sort_by_merged_date?(viewing_merge_requests) options.concat([relative_position_option]) if viewing_issues options.concat([title_option]) @@ -237,6 +237,10 @@ module SortingHelper false end + def can_sort_by_merged_date?(viewing_merge_requests) + viewing_merge_requests && %w[all merged].include?(params[:state]) + end + def due_date_option { value: sort_value_due_date, text: sort_title_due_date, href: page_filter_path(sort: sort_value_due_date) } end diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 3e5f63796b2..a1b6e896475 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -42,8 +42,6 @@ module SystemNoteHelper 'severity' => 'information-o', 'cloned' => 'documents', 'issue_type' => 'pencil', - 'attention_requested' => 'user', - 'attention_request_removed' => 'user', 'contact' => 'users', 'timeline_event' => 'clock', 'relate_to_child' => 'link', diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 4a9dd30a5a2..9b0810f3d17 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -232,13 +232,15 @@ module TodosHelper '' end + due_date = + if is_due_today + _("today") + else + l(todo.target.due_date, format: Date::DATE_FORMATS[:medium]) + end + content = content_tag(:span, class: css_class) do - format(s_("Todos|Due %{due_date}"), due_date: if is_due_today - _("today") - else - l(todo.target.due_date, - format: Date::DATE_FORMATS[:medium]) - end) + format(s_("Todos|Due %{due_date}"), due_date: due_date) end "#{content} ·".html_safe diff --git a/app/helpers/users/callouts_helper.rb b/app/helpers/users/callouts_helper.rb index 2b8368dd29f..af3ac495164 100644 --- a/app/helpers/users/callouts_helper.rb +++ b/app/helpers/users/callouts_helper.rb @@ -11,9 +11,11 @@ module Users UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout' SECURITY_NEWSLETTER_CALLOUT = 'security_newsletter_callout' MERGE_REQUEST_SETTINGS_MOVED_CALLOUT = 'merge_request_settings_moved_callout' + PAGES_MOVED_CALLOUT = 'pages_moved_callout' REGISTRATION_ENABLED_CALLOUT_ALLOWED_CONTROLLER_PATHS = [/^root/, /^dashboard\S*/, /^admin\S*/].freeze WEB_HOOK_DISABLED = 'web_hook_disabled' ULTIMATE_FEATURE_REMOVAL_BANNER = 'ultimate_feature_removal_banner' + BRANCH_RULES_INFO_CALLOUT = 'branch_rules_info_callout' def show_gke_cluster_integration_callout?(project) active_nav_link?(controller: sidebar_operations_paths) && @@ -59,42 +61,47 @@ module Users !user_dismissed?(SECURITY_NEWSLETTER_CALLOUT) end - def web_hook_disabled_dismissed?(project) - return false unless project - - last_failure = Gitlab::Redis::SharedState.with do |redis| - key = "web_hooks:last_failure:project-#{project.id}" - redis.get(key) - end + def web_hook_disabled_dismissed?(object) + return false unless object.is_a?(::WebHooks::HasWebHooks) - last_failure = DateTime.parse(last_failure) if last_failure - - user_dismissed?(WEB_HOOK_DISABLED, last_failure, project: project) + user_dismissed?(WEB_HOOK_DISABLED, object.last_webhook_failure, object: object) end def show_merge_request_settings_callout?(project) !user_dismissed?(MERGE_REQUEST_SETTINGS_MOVED_CALLOUT) && project.merge_requests_enabled? end + def show_pages_menu_callout? + !user_dismissed?(PAGES_MOVED_CALLOUT) + end + + def show_branch_rules_info? + !user_dismissed?(BRANCH_RULES_INFO_CALLOUT) + end + def ultimate_feature_removal_banner_dismissed?(project) return false unless project - user_dismissed?(ULTIMATE_FEATURE_REMOVAL_BANNER, project: project) + user_dismissed?(ULTIMATE_FEATURE_REMOVAL_BANNER, object: project) end private - def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil, project: nil) + def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil, object: nil) return false unless current_user query = { feature_name: feature_name, ignore_dismissal_earlier_than: ignore_dismissal_earlier_than } - if project - current_user.dismissed_callout_for_project?(project: project, **query) + if object + dismissed_callout?(object, query) else current_user.dismissed_callout?(**query) end end + + def dismissed_callout?(object, query) + current_user.dismissed_callout_for_project?(project: object, **query) + end end end diff --git a/app/helpers/users/group_callouts_helper.rb b/app/helpers/users/group_callouts_helper.rb index 0aa4eb89499..92cf41400e7 100644 --- a/app/helpers/users/group_callouts_helper.rb +++ b/app/helpers/users/group_callouts_helper.rb @@ -17,9 +17,11 @@ module Users def user_dismissed_for_group(feature_name, group, ignore_dismissal_earlier_than = nil) return false unless current_user - current_user.dismissed_callout_for_group?(feature_name: feature_name, - group: group, - ignore_dismissal_earlier_than: ignore_dismissal_earlier_than) + current_user.dismissed_callout_for_group?( + feature_name: feature_name, + group: group, + ignore_dismissal_earlier_than: ignore_dismissal_earlier_than + ) end def just_created? diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 62b9eb2b506..e0cf7aa61ee 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -8,10 +8,15 @@ module UsersHelper } end + def user_clear_status_at(user) + # The user.status can be nil when the user has no status, so we need to protect against that case. + # iso8601 is the official RFC supported format for frontend parsing of date: + # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date + user.status&.clear_status_at&.to_s(:iso8601) + end + def user_link(user) - link_to(user.name, user_path(user), - title: user.email, - class: 'has-tooltip commit-committer-link') + link_to(user.name, user_path(user), title: user.email, class: 'has-tooltip commit-committer-link') end def user_email_help_text(user) @@ -79,9 +84,9 @@ module UsersHelper return unless user.status content_tag :span, - class: 'user-status-emoji has-tooltip', - title: user.status.message_html, - data: { html: true, placement: 'top' } do + class: 'user-status-emoji has-tooltip', + title: user.status.message_html, + data: { html: true, placement: 'top' } do emoji_icon user.status.emoji end end @@ -168,6 +173,19 @@ module UsersHelper user.public_email.present? end + def trials_link_url + 'https://about.gitlab.com/free-trial/' + end + + def user_profile_tabs_app_data(user) + { + followees: user.followees.count, + followers: user.followers.count, + user_calendar_path: user_calendar_path(user, :json), + utc_offset: local_timezone_instance(user.timezone).now.utc_offset + } + end + private def admin_users_paths @@ -211,10 +229,6 @@ module UsersHelper tabs end - def trials_link_url - 'https://about.gitlab.com/free-trial/' - end - def trials_allowed?(user) false end diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb index 5ed341ee5e5..c577e2da1bb 100644 --- a/app/helpers/visibility_level_helper.rb +++ b/app/helpers/visibility_level_helper.rb @@ -44,9 +44,8 @@ module VisibilityLevelHelper Gitlab::CurrentSettings.restricted_visibility_levels || [] end - delegate :default_project_visibility, - :default_group_visibility, - to: :'Gitlab::CurrentSettings.current_application_settings' + delegate :default_project_visibility, :default_group_visibility, + to: :'Gitlab::CurrentSettings.current_application_settings' def disallowed_visibility_level?(form_model, level) return false unless form_model.respond_to?(:visibility_level_allowed?) diff --git a/app/helpers/web_hooks/web_hooks_helper.rb b/app/helpers/web_hooks/web_hooks_helper.rb index 514db6ba8a2..ad792f761f8 100644 --- a/app/helpers/web_hooks/web_hooks_helper.rb +++ b/app/helpers/web_hooks/web_hooks_helper.rb @@ -4,19 +4,31 @@ module WebHooks module WebHooksHelper def show_project_hook_failed_callout?(project:) return false if project_hook_page? + + show_hook_failed_callout?(project) + end + + private + + def show_hook_failed_callout?(object) return false unless current_user - return false unless Ability.allowed?(current_user, :read_web_hooks, project) + + return false unless can_access_web_hooks?(object) # Assumes include of Users::CalloutsHelper - return false if web_hook_disabled_dismissed?(project) + return false if web_hook_disabled_dismissed?(object) - project.fetch_web_hook_failure + object.fetch_web_hook_failure end - private - def project_hook_page? current_controller?('projects/hooks') || current_controller?('projects/hook_logs') end + + def can_access_web_hooks?(object) + Ability.allowed?(current_user, :admin_project, object) + end end end + +WebHooks::WebHooksHelper.prepend_mod diff --git a/app/helpers/work_items_helper.rb b/app/helpers/work_items_helper.rb index efa9a2bd463..bc270380fca 100644 --- a/app/helpers/work_items_helper.rb +++ b/app/helpers/work_items_helper.rb @@ -6,7 +6,8 @@ module WorkItemsHelper full_path: project.full_path, issues_list_path: project_issues_path(project), register_path: new_user_registration_path(redirect_to_referer: 'yes'), - sign_in_path: new_session_path(:user, redirect_to_referer: 'yes') + sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'), + saved_replies_new_path: profile_saved_replies_path } end end diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index 58843435fa0..e053fc0453c 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -100,18 +100,7 @@ module Emails end def issues_csv_email(user, project, csv_data, export_status) - @project = project - @count = export_status.fetch(:rows_expected) - @written_count = export_status.fetch(:rows_written) - @truncated = export_status.fetch(:truncated) - @size_limit = ActiveSupport::NumberHelper - .number_to_human_size(ExportCsv::BaseService::TARGET_FILESIZE) - - filename = "#{project.full_path.parameterize}_issues_#{Date.today.iso8601}.csv" - attachments[filename] = { content: csv_data, mime_type: 'text/csv' } - email_with_layout( - to: user.notification_email_for(@project.group), - subject: subject("Exported issues")) + csv_email(user, project, csv_data, export_status, 'issues') end private diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb index 5b1750400d8..a191bd4a8f6 100644 --- a/app/mailers/emails/profile.rb +++ b/app/mailers/emails/profile.rb @@ -153,7 +153,7 @@ module Emails Gitlab::I18n.with_locale(@user.preferred_language) do email_with_layout( to: @user.notification_email_or_default, - subject: subject(_("Attempted sign in to %{host} using a wrong two-factor authentication code") % { host: Gitlab.config.gitlab.host })) + subject: subject(_("Attempted sign in to %{host} using an incorrect verification code") % { host: Gitlab.config.gitlab.host })) end end diff --git a/app/mailers/emails/shared.rb b/app/mailers/emails/shared.rb new file mode 100644 index 00000000000..09876c0960a --- /dev/null +++ b/app/mailers/emails/shared.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module Emails + module Shared + def csv_email(user, project, csv_data, export_status, type) + @project = project + @count = export_status.fetch(:rows_expected) + @written_count = export_status.fetch(:rows_written) + @truncated = export_status.fetch(:truncated) + @size_limit = ActiveSupport::NumberHelper + .number_to_human_size(ExportCsv::BaseService::TARGET_FILESIZE) + + filename = "#{project.full_path.parameterize}_#{type}_#{Date.today.iso8601}.csv" + attachments[filename] = { content: csv_data, mime_type: 'text/csv' } + email_with_layout( + to: user.notification_email_for(@project.group), + subject: subject("Exported #{type.humanize.downcase}")) + end + end +end diff --git a/app/mailers/emails/work_items.rb b/app/mailers/emails/work_items.rb new file mode 100644 index 00000000000..b14111c94eb --- /dev/null +++ b/app/mailers/emails/work_items.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Emails + module WorkItems + def import_work_items_csv_email(user_id, project_id, results) + @user = User.find(user_id) + @project = Project.find(project_id) + @results = results + + email_with_layout( + to: @user.notification_email_for(@project.group), + subject: subject('Imported work items')) + end + + def export_work_items_csv_email(user, project, csv_data, export_status) + csv_email(user, project, csv_data, export_status, 'work_items') + end + end +end diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 28ef6d8d6c6..2d6b2a3099c 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -7,6 +7,7 @@ class Notify < ApplicationMailer include ReminderEmailsHelper include IssuablesHelper + include Emails::Shared include Emails::Issues include Emails::MergeRequests include Emails::Notes @@ -25,6 +26,7 @@ class Notify < ApplicationMailer include Emails::AdminNotification include Emails::IdentityVerification include Emails::Imports + include Emails::WorkItems helper TimeboxesHelper helper MergeRequestsHelper diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index 7ed594bf571..17b225c5e9b 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -60,6 +60,14 @@ class NotifyPreview < ActionMailer::Preview end end + def access_token_created_email + Notify.access_token_created_email(user, 'token_name').message + end + + def access_token_revoked_email + Notify.access_token_revoked_email(user, 'token_name').message + end + def new_mention_in_merge_request_email Notify.new_mention_in_merge_request_email(user.id, merge_request.id, user.id).message end @@ -84,6 +92,10 @@ class NotifyPreview < ActionMailer::Preview Notify.import_issues_csv_email(user.id, project.id, { success: 3, errors: [5, 6, 7], valid_file: true }) end + def import_work_items_csv_email + Notify.import_work_items_csv_email(user.id, project.id, { success: 4, error_lines: [2, 3, 4], parse_error: false }) + end + def issues_csv_email Notify.issues_csv_email(user, project, '1997,Ford,E350', { truncated: false, rows_expected: 3, rows_written: 3 }).message end diff --git a/app/models/ability.rb b/app/models/ability.rb index eb645bcd653..4da4d113a7f 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -77,6 +77,8 @@ class Ability policy = policy_for(user, subject) + before_check(policy, ability.to_sym, user, subject, opts) + case opts[:scope] when :user DeclarativePolicy.user_scope { policy.allowed?(ability) } @@ -92,6 +94,11 @@ class Ability forget_runner_result(policy.runner(ability)) if policy && ability_forgetting? end + # Hook call right before ability check. + def before_check(policy, ability, user, subject, opts) + # See Support::AbilityCheck and Support::PermissionsCheck. + end + def policy_for(user, subject = :global) DeclarativePolicy.policy_for(user, subject, cache: ::Gitlab::SafeRequestStore.storage) end diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb index dbcdfa5e946..5ae5367ca5a 100644 --- a/app/models/abuse_report.rb +++ b/app/models/abuse_report.rb @@ -42,7 +42,9 @@ class AbuseReport < ApplicationRecord before_validation :filter_empty_strings_from_links_to_spam validate :links_to_spam_contains_valid_urls - scope :by_user, ->(user) { where(user_id: user) } + scope :by_user_id, ->(id) { where(user_id: id) } + scope :by_reporter_id, ->(id) { where(reporter_id: id) } + scope :by_category, ->(category) { where(category: category) } scope :with_users, -> { includes(:reporter, :user) } enum category: { @@ -56,6 +58,11 @@ class AbuseReport < ApplicationRecord other: 8 } + enum status: { + open: 1, + closed: 2 + } + # For CacheMarkdownField alias_method :author, :reporter diff --git a/app/models/achievements/user_achievement.rb b/app/models/achievements/user_achievement.rb index 885ec660cc9..bc5d10923d7 100644 --- a/app/models/achievements/user_achievement.rb +++ b/app/models/achievements/user_achievement.rb @@ -8,10 +8,16 @@ module Achievements belongs_to :awarded_by_user, class_name: 'User', inverse_of: :awarded_user_achievements, - optional: true + optional: false belongs_to :revoked_by_user, class_name: 'User', inverse_of: :revoked_user_achievements, optional: true + + scope :not_revoked, -> { where(revoked_by_user_id: nil) } + + def revoked? + revoked_by_user_id.present? + end end end diff --git a/app/models/airflow/dags.rb b/app/models/airflow/dags.rb deleted file mode 100644 index d17d4a4f3db..00000000000 --- a/app/models/airflow/dags.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Airflow - class Dags < ApplicationRecord - belongs_to :project - - validates :project, presence: true - validates :dag_name, length: { maximum: 255 }, presence: true - validates :schedule, length: { maximum: 255 } - validates :fileloc, length: { maximum: 255 } - - scope :by_project_id, ->(project_id) { where(project_id: project_id).order(id: :asc) } - end -end diff --git a/app/models/alert_management/alert.rb b/app/models/alert_management/alert.rb index a5a539eae75..74edcf12ac2 100644 --- a/app/models/alert_management/alert.rb +++ b/app/models/alert_management/alert.rb @@ -25,8 +25,9 @@ module AlertManagement has_many :assignees, through: :alert_assignees has_many :notes, as: :noteable, inverse_of: :noteable, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent - has_many :ordered_notes, -> { fresh }, as: :noteable, class_name: 'Note' - has_many :user_mentions, class_name: 'AlertManagement::AlertUserMention', foreign_key: :alert_management_alert_id + has_many :ordered_notes, -> { fresh }, as: :noteable, class_name: 'Note', inverse_of: :noteable + has_many :user_mentions, class_name: 'AlertManagement::AlertUserMention', foreign_key: :alert_management_alert_id, + inverse_of: :alert has_many :metric_images, class_name: '::AlertManagement::MetricImage' has_internal_id :iid, scope: :project @@ -139,7 +140,7 @@ module AlertManagement end def self.link_reference_pattern - @link_reference_pattern ||= super("alert_management", %r{(?<alert>\d+)/details(\#)?}) + @link_reference_pattern ||= compose_link_reference_pattern('alert_management', %r{(?<alert>\d+)/details(\#)?}) end def self.reference_valid?(reference) diff --git a/app/models/alert_management/alert_assignee.rb b/app/models/alert_management/alert_assignee.rb index c74b2699182..27e720c3262 100644 --- a/app/models/alert_management/alert_assignee.rb +++ b/app/models/alert_management/alert_assignee.rb @@ -3,7 +3,7 @@ module AlertManagement class AlertAssignee < ApplicationRecord belongs_to :alert, inverse_of: :alert_assignees - belongs_to :assignee, class_name: 'User', foreign_key: :user_id + belongs_to :assignee, class_name: 'User', foreign_key: :user_id, inverse_of: :alert_assignees validates :alert, presence: true validates :assignee, presence: true, uniqueness: { scope: :alert_id } diff --git a/app/models/alert_management/alert_user_mention.rb b/app/models/alert_management/alert_user_mention.rb index d36aa80ee05..1ab71127677 100644 --- a/app/models/alert_management/alert_user_mention.rb +++ b/app/models/alert_management/alert_user_mention.rb @@ -2,7 +2,10 @@ module AlertManagement class AlertUserMention < UserMention - belongs_to :alert_management_alert, class_name: '::AlertManagement::Alert' + belongs_to :alert, class_name: '::AlertManagement::Alert', + foreign_key: :alert_management_alert_id, + inverse_of: :user_mentions + belongs_to :note end end diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 98adbd3ab06..71434931d8c 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -22,6 +22,10 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord KROKI_URL_ERROR_MESSAGE = 'Please check your Kroki URL setting in ' \ 'Admin Area > Settings > General > Kroki' + # Validate URIs in this model according to the current value of the `deny_all_requests_except_allowed` property, + # rather than the persisted value. + ADDRESSABLE_URL_VALIDATION_OPTIONS = { deny_all_requests_except_allowed: ->(settings) { settings.deny_all_requests_except_allowed } }.freeze + enum whats_new_variant: { all_tiers: 0, current_tier: 1, disabled: 2 }, _prefix: true enum email_confirmation_setting: { off: 0, soft: 1, hard: 2 }, _prefix: true @@ -30,11 +34,13 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord add_authentication_token_field :static_objects_external_storage_auth_token, encrypted: :required add_authentication_token_field :error_tracking_access_token, encrypted: :required - belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id' + belongs_to :self_monitoring_project, class_name: "Project", foreign_key: :instance_administration_project_id, + inverse_of: :application_setting belongs_to :push_rule alias_attribute :self_monitoring_project_id, :instance_administration_project_id - belongs_to :instance_group, class_name: "Group", foreign_key: 'instance_administrators_group_id' + belongs_to :instance_group, class_name: "Group", foreign_key: :instance_administrators_group_id, + inverse_of: :application_setting alias_attribute :instance_group_id, :instance_administrators_group_id alias_attribute :instance_administrators_group, :instance_group alias_attribute :housekeeping_optimize_repository_period, :housekeeping_incremental_repack_period @@ -90,9 +96,9 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord chronic_duration_attr :project_runner_token_expiration_interval_human_readable, :project_runner_token_expiration_interval validates :grafana_url, - system_hook_url: { + system_hook_url: ADDRESSABLE_URL_VALIDATION_OPTIONS.merge({ blocked_message: "is blocked: %{exception_message}. #{GRAFANA_URL_ERROR_MESSAGE}" - }, + }), if: :grafana_url_absolute? validate :validate_grafana_url @@ -116,22 +122,22 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :home_page_url, allow_blank: true, - addressable_url: true, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, if: :home_page_url_column_exists? validates :help_page_support_url, allow_blank: true, - addressable_url: true, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, if: :help_page_support_url_column_exists? validates :help_page_documentation_base_url, length: { maximum: 255, message: N_("is too long (maximum is %{count} characters)") }, allow_blank: true, - addressable_url: true + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS validates :after_sign_out_path, allow_blank: true, - addressable_url: true + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS validates :abuse_notification_email, devise_email: true, @@ -188,7 +194,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :gitpod_url, presence: true, - addressable_url: { enforce_sanitization: true }, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS.merge({ enforce_sanitization: true }), if: :gitpod_enabled validates :mailgun_signing_key, @@ -348,7 +354,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord if: :asset_proxy_enabled? validates :static_objects_external_storage_url, - addressable_url: true, allow_blank: true + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, allow_blank: true validates :static_objects_external_storage_auth_token, presence: true, @@ -421,6 +427,10 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord allow_nil: false, inclusion: { in: [true, false], message: N_('must be a boolean value') } + validates :deny_all_requests_except_allowed, + allow_nil: false, + inclusion: { in: [true, false], message: N_('must be a boolean value') } + Gitlab::SSHPublicKey.supported_types.each do |type| validates :"#{type}_key_restriction", presence: true, key_restriction: { type: type } end @@ -452,7 +462,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord if: :external_authorization_service_enabled validates :external_authorization_service_url, - addressable_url: true, allow_blank: true, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, allow_blank: true, if: :external_authorization_service_enabled validates :external_authorization_service_timeout, @@ -460,7 +470,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord if: :external_authorization_service_enabled validates :spam_check_endpoint_url, - addressable_url: { schemes: %w(tls grpc) }, allow_blank: true + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS.merge({ schemes: %w(tls grpc) }), allow_blank: true validates :spam_check_endpoint_url, presence: true, @@ -534,7 +544,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :jira_connect_proxy_url, length: { maximum: 255, message: N_('is too long (maximum is %{count} characters)') }, allow_blank: true, - public_url: true + public_url: ADDRESSABLE_URL_VALIDATION_OPTIONS with_options(presence: true, numericality: { only_integer: true, greater_than: 0 }) do validates :throttle_unauthenticated_api_requests_per_period @@ -563,14 +573,12 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :throttle_protected_paths_period_in_seconds end - validates :notes_create_limit, - numericality: { only_integer: true, greater_than_or_equal_to: 0 } - - validates :search_rate_limit, - numericality: { only_integer: true, greater_than_or_equal_to: 0 } - - validates :search_rate_limit_unauthenticated, - numericality: { only_integer: true, greater_than_or_equal_to: 0 } + with_options(numericality: { only_integer: true, greater_than_or_equal_to: 0 }) do + validates :notes_create_limit + validates :search_rate_limit + validates :search_rate_limit_unauthenticated + validates :projects_api_rate_limit_unauthenticated + end validates :notes_create_limit_allowlist, length: { maximum: 100, message: N_('is too long (maximum is 100 entries)') }, @@ -580,7 +588,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord inclusion: { in: [true, false], message: N_('must be a boolean value') } validates :external_pipeline_validation_service_url, - addressable_url: true, allow_blank: true + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, allow_blank: true validates :external_pipeline_validation_service_timeout, allow_nil: true, @@ -607,10 +615,10 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord validates :sentry_enabled, inclusion: { in: [true, false], message: N_('must be a boolean value') } validates :sentry_dsn, - addressable_url: true, presence: true, length: { maximum: 255 }, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, presence: true, length: { maximum: 255 }, if: :sentry_enabled? validates :sentry_clientside_dsn, - addressable_url: true, allow_blank: true, length: { maximum: 255 }, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, allow_blank: true, length: { maximum: 255 }, if: :sentry_enabled? validates :sentry_environment, presence: true, length: { maximum: 255 }, @@ -620,7 +628,7 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord inclusion: { in: [true, false], message: N_('must be a boolean value') } validates :error_tracking_api_url, presence: true, - addressable_url: true, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, length: { maximum: 255 }, if: :error_tracking_enabled? @@ -630,7 +638,12 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord length: { maximum: 100, message: N_('is too long (maximum is 100 entries)') }, allow_nil: false - validates :public_runner_releases_url, addressable_url: true, presence: true + validates :update_runner_versions_enabled, + inclusion: { in: [true, false], message: N_('must be a boolean value') } + validates :public_runner_releases_url, + addressable_url: ADDRESSABLE_URL_VALIDATION_OPTIONS, + presence: true, + if: :update_runner_versions_enabled? validates :inactive_projects_min_size_mb, numericality: { only_integer: true, greater_than_or_equal_to: 0 } @@ -698,6 +711,15 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord allow_nil: false, inclusion: { in: [true, false], message: N_('must be a boolean value') } + validates :default_syntax_highlighting_theme, + allow_nil: false, + numericality: { only_integer: true, greater_than: 0 }, + inclusion: { in: Gitlab::ColorSchemes.valid_ids, message: N_('must be a valid syntax highlighting theme ID') } + + validates :gitlab_dedicated_instance, + allow_nil: false, + inclusion: { in: [true, false], message: N_('must be a boolean value') } + before_validation :ensure_uuid! before_validation :coerce_repository_storages_weighted, if: :repository_storages_weighted_changed? before_validation :normalize_default_branch_name @@ -822,6 +844,33 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord false end + # Overriding the enum check for `email_confirmation_setting` as the feature flag is being removed and is taking a + # release M, M.N+1 strategy as noted in: + # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107302#note_1286005956 + def email_confirmation_setting_off? + if Feature.enabled?(:soft_email_confirmation) + false + else + super + end + end + + def email_confirmation_setting_soft? + if Feature.enabled?(:soft_email_confirmation) + true + else + super + end + end + + def email_confirmation_setting_hard? + if Feature.enabled?(:soft_email_confirmation) + false + else + super + end + end + private def parsed_grafana_url diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index a5f262f2e1e..b8d6434d9c9 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -60,6 +60,7 @@ module ApplicationSettingImplementation default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'], default_projects_limit: Settings.gitlab['default_projects_limit'], default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'], + deny_all_requests_except_allowed: false, diff_max_patch_bytes: Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES, diff_max_files: Commit::DEFAULT_MAX_DIFF_FILES_SETTING, diff_max_lines: Commit::DEFAULT_MAX_DIFF_LINES_SETTING, @@ -249,7 +250,9 @@ module ApplicationSettingImplementation can_create_group: true, bulk_import_enabled: false, allow_runner_registration_token: true, - user_defaults_to_private_profile: false + user_defaults_to_private_profile: false, + projects_api_rate_limit_unauthenticated: 400, + gitlab_dedicated_instance: false }.tap do |hsh| hsh.merge!(non_production_defaults) unless Rails.env.production? end diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb index 3312216932b..163e741d990 100644 --- a/app/models/audit_event.rb +++ b/app/models/audit_event.rb @@ -21,7 +21,7 @@ class AuditEvent < ApplicationRecord serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize - belongs_to :user, foreign_key: :author_id + belongs_to :user, foreign_key: :author_id, inverse_of: :audit_events validates :author_id, presence: true validates :entity_id, presence: true diff --git a/app/models/badge.rb b/app/models/badge.rb index 0676de10d02..23e6f305c32 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -42,7 +42,7 @@ class Badge < ApplicationRecord private def build_rendered_url(url, project = nil) - return url unless valid? && project + return url unless project Gitlab::StringPlaceholderReplacer.replace_string_placeholders(url, PLACEHOLDERS_REGEX) do |arg| replace_placeholder_action(PLACEHOLDERS[arg], project) diff --git a/app/models/board.rb b/app/models/board.rb index 2181b2f0545..702ae0cc9f5 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -6,8 +6,8 @@ class Board < ApplicationRecord belongs_to :group belongs_to :project - has_many :lists, -> { ordered }, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent - has_many :destroyable_lists, -> { destroyable.ordered }, class_name: "List" + has_many :lists, -> { ordered }, dependent: :delete_all, inverse_of: :board # rubocop:disable Cop/ActiveRecordDependent + has_many :destroyable_lists, -> { destroyable.ordered }, class_name: "List", inverse_of: :board validates :name, presence: true validates :project, presence: true, if: :project_needed? diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb index 2565ad5f2b8..c2d7529f468 100644 --- a/app/models/bulk_import.rb +++ b/app/models/bulk_import.rb @@ -42,6 +42,12 @@ class BulkImport < ApplicationRecord event :fail_op do transition any => :failed end + + # rubocop:disable Style/SymbolProc + after_transition any => [:finished, :failed, :timeout] do |bulk_import| + bulk_import.update_has_failures + end + # rubocop:enable Style/SymbolProc end def source_version_info @@ -55,4 +61,11 @@ class BulkImport < ApplicationRecord def self.all_human_statuses state_machine.states.map(&:human_name) end + + def update_has_failures + return if has_failures + return unless entities.any?(&:has_failures) + + update!(has_failures: true) + end end diff --git a/app/models/bulk_imports/batch_tracker.rb b/app/models/bulk_imports/batch_tracker.rb new file mode 100644 index 00000000000..df1fab89ee6 --- /dev/null +++ b/app/models/bulk_imports/batch_tracker.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +module BulkImports + class BatchTracker < ApplicationRecord + self.table_name = 'bulk_import_batch_trackers' + + belongs_to :tracker, class_name: 'BulkImports::Tracker' + + validates :batch_number, presence: true, uniqueness: { scope: :tracker_id } + + state_machine :status, initial: :created do + state :created, value: 0 + state :started, value: 1 + state :finished, value: 2 + state :timeout, value: 3 + state :failed, value: -1 + state :skipped, value: -2 + + event :start do + transition created: :started + end + + event :retry do + transition started: :created + end + + event :finish do + transition started: :finished + transition failed: :failed + transition skipped: :skipped + end + + event :skip do + transition any => :skipped + end + + event :fail_op do + transition any => :failed + end + + event :cleanup_stale do + transition [:created, :started] => :timeout + end + end + end +end diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb index 6fc24c77f1d..ae2d3758110 100644 --- a/app/models/bulk_imports/entity.rb +++ b/app/models/bulk_imports/entity.rb @@ -26,10 +26,11 @@ class BulkImports::Entity < ApplicationRecord belongs_to :parent, class_name: 'BulkImports::Entity', optional: true belongs_to :project, optional: true - belongs_to :group, foreign_key: :namespace_id, optional: true + belongs_to :group, foreign_key: :namespace_id, optional: true, inverse_of: :bulk_import_entities has_many :trackers, class_name: 'BulkImports::Tracker', + inverse_of: :entity, foreign_key: :bulk_import_entity_id has_many :failures, @@ -104,6 +105,12 @@ class BulkImports::Entity < ApplicationRecord transition created: :timeout transition started: :timeout end + + # rubocop:disable Style/SymbolProc + after_transition any => [:finished, :failed, :timeout] do |entity| + entity.update_has_failures + end + # rubocop:enable Style/SymbolProc end def self.all_human_statuses @@ -185,6 +192,13 @@ class BulkImports::Entity < ApplicationRecord default_project_visibility end + def update_has_failures + return if has_failures + return unless failures.any? + + update!(has_failures: true) + end + private def validate_parent_is_a_group @@ -194,13 +208,6 @@ class BulkImports::Entity < ApplicationRecord end def validate_imported_entity_type - if project_entity? && !BulkImports::Features.project_migration_enabled?(destination_namespace) - errors.add( - :base, - s_('BulkImport|invalid entity source type') - ) - end - if group.present? && project_entity? errors.add( :group, diff --git a/app/models/bulk_imports/export.rb b/app/models/bulk_imports/export.rb index 8d4d31ee92d..1ea317a100a 100644 --- a/app/models/bulk_imports/export.rb +++ b/app/models/bulk_imports/export.rb @@ -14,6 +14,7 @@ module BulkImports belongs_to :group, optional: true has_one :upload, class_name: 'BulkImports::ExportUpload' + has_many :batches, class_name: 'BulkImports::ExportBatch' validates :project, presence: true, unless: :group validates :group, presence: true, unless: :project diff --git a/app/models/bulk_imports/export_batch.rb b/app/models/bulk_imports/export_batch.rb new file mode 100644 index 00000000000..9d34dae12d0 --- /dev/null +++ b/app/models/bulk_imports/export_batch.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module BulkImports + class ExportBatch < ApplicationRecord + self.table_name = 'bulk_import_export_batches' + + BATCH_SIZE = 1000 + + belongs_to :export, class_name: 'BulkImports::Export' + has_one :upload, class_name: 'BulkImports::ExportUpload', foreign_key: :batch_id, inverse_of: :batch + + validates :batch_number, presence: true, uniqueness: { scope: :export_id } + + state_machine :status, initial: :started do + state :started, value: 0 + state :finished, value: 1 + state :failed, value: -1 + + event :start do + transition any => :started + end + + event :finish do + transition started: :finished + transition failed: :failed + end + + event :fail_op do + transition any => :failed + end + end + end +end diff --git a/app/models/bulk_imports/export_upload.rb b/app/models/bulk_imports/export_upload.rb index 4304032b28c..00f8e8f1304 100644 --- a/app/models/bulk_imports/export_upload.rb +++ b/app/models/bulk_imports/export_upload.rb @@ -7,6 +7,7 @@ module BulkImports self.table_name = 'bulk_import_export_uploads' belongs_to :export, class_name: 'BulkImports::Export' + belongs_to :batch, class_name: 'BulkImports::ExportBatch', optional: true mount_uploader :export_file, ExportUploader diff --git a/app/models/bulk_imports/file_transfer.rb b/app/models/bulk_imports/file_transfer.rb index 5be954b98da..c6af4e0c833 100644 --- a/app/models/bulk_imports/file_transfer.rb +++ b/app/models/bulk_imports/file_transfer.rb @@ -9,9 +9,9 @@ module BulkImports def config_for(portable) case portable when ::Project - FileTransfer::ProjectConfig.new(portable) + ::BulkImports::FileTransfer::ProjectConfig.new(portable) when ::Group - FileTransfer::GroupConfig.new(portable) + ::BulkImports::FileTransfer::GroupConfig.new(portable) else raise(UnsupportedObjectType, "Unsupported object type: #{portable.class}") end diff --git a/app/models/bulk_imports/file_transfer/base_config.rb b/app/models/bulk_imports/file_transfer/base_config.rb index 036d511bc59..67c4e7400b3 100644 --- a/app/models/bulk_imports/file_transfer/base_config.rb +++ b/app/models/bulk_imports/file_transfer/base_config.rb @@ -51,7 +51,8 @@ module BulkImports end def portable_relations_tree - @portable_relations_tree ||= attributes_finder.find_relations_tree(portable_class_sym).deep_stringify_keys + @portable_relations_tree ||= attributes_finder + .find_relations_tree(portable_class_sym, include_import_only_tree: true).deep_stringify_keys end private diff --git a/app/models/bulk_imports/tracker.rb b/app/models/bulk_imports/tracker.rb index b04ef1cb7ae..55502721a76 100644 --- a/app/models/bulk_imports/tracker.rb +++ b/app/models/bulk_imports/tracker.rb @@ -7,9 +7,12 @@ class BulkImports::Tracker < ApplicationRecord belongs_to :entity, class_name: 'BulkImports::Entity', + inverse_of: :trackers, foreign_key: :bulk_import_entity_id, optional: false + has_many :batches, class_name: 'BulkImports::BatchTracker', inverse_of: :tracker + validates :relation, presence: true, uniqueness: { scope: :bulk_import_entity_id } diff --git a/app/models/chat_name.rb b/app/models/chat_name.rb index 9bd618c1008..cda19273f52 100644 --- a/app/models/chat_name.rb +++ b/app/models/chat_name.rb @@ -3,7 +3,9 @@ class ChatName < ApplicationRecord LAST_USED_AT_INTERVAL = 1.hour - belongs_to :integration + include IgnorableColumns + ignore_column :integration_id, remove_with: '16.0', remove_after: '2023-04-22' + belongs_to :user validates :user, presence: true diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 1e70dd171ed..627604ec26c 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -18,7 +18,7 @@ module Ci belongs_to :runner belongs_to :trigger_request belongs_to :erased_by, class_name: 'User' - belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id + belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id, inverse_of: :builds RUNNER_FEATURES = { upload_multiple_artifacts: -> (build) { build.publishes_artifacts_reports? }, @@ -35,8 +35,8 @@ module Ci has_one :deployment, as: :deployable, class_name: 'Deployment', inverse_of: :deployable has_one :pending_state, class_name: 'Ci::BuildPendingState', foreign_key: :build_id, inverse_of: :build - has_one :queuing_entry, class_name: 'Ci::PendingBuild', foreign_key: :build_id - has_one :runtime_metadata, class_name: 'Ci::RunningBuild', foreign_key: :build_id + has_one :queuing_entry, class_name: 'Ci::PendingBuild', foreign_key: :build_id, inverse_of: :build + has_one :runtime_metadata, class_name: 'Ci::RunningBuild', foreign_key: :build_id, inverse_of: :build has_many :trace_chunks, class_name: 'Ci::BuildTraceChunk', foreign_key: :build_id, inverse_of: :build has_many :report_results, class_name: 'Ci::BuildReportResult', foreign_key: :build_id, inverse_of: :build has_one :namespace, through: :project @@ -47,7 +47,7 @@ module Ci # Details: https://gitlab.com/gitlab-org/gitlab/-/issues/24644#note_689472685 has_many :job_artifacts, class_name: 'Ci::JobArtifact', foreign_key: :job_id, dependent: :destroy, inverse_of: :job # rubocop:disable Cop/ActiveRecordDependent has_many :job_variables, class_name: 'Ci::JobVariable', foreign_key: :job_id, inverse_of: :job - has_many :sourced_pipelines, class_name: 'Ci::Sources::Pipeline', foreign_key: :source_job_id + has_many :sourced_pipelines, class_name: 'Ci::Sources::Pipeline', foreign_key: :source_job_id, inverse_of: :build has_many :pages_deployments, foreign_key: :ci_build_id, inverse_of: :ci_build @@ -55,7 +55,9 @@ module Ci has_one :"job_artifacts_#{key}", -> { where(file_type: value) }, class_name: 'Ci::JobArtifact', foreign_key: :job_id, inverse_of: :job end - has_one :runner_machine, through: :metadata, class_name: 'Ci::RunnerMachine' + has_one :runner_machine_build, class_name: 'Ci::RunnerMachineBuild', foreign_key: :build_id, inverse_of: :build, + autosave: true + has_one :runner_machine, through: :runner_machine_build, class_name: 'Ci::RunnerMachine' has_one :runner_session, class_name: 'Ci::BuildRunnerSession', validate: true, foreign_key: :build_id, inverse_of: :build has_one :trace_metadata, class_name: 'Ci::BuildTraceMetadata', foreign_key: :build_id, inverse_of: :build @@ -71,6 +73,7 @@ module Ci delegate :gitlab_deploy_token, to: :project delegate :harbor_integration, to: :project delegate :apple_app_store_integration, to: :project + delegate :google_play_integration, to: :project delegate :trigger_short_token, to: :trigger_request, allow_nil: true delegate :ensure_persistent_ref, to: :pipeline delegate :enable_debug_trace!, to: :metadata @@ -132,7 +135,7 @@ module Ci scope :eager_load_job_artifacts, -> { includes(:job_artifacts) } scope :eager_load_tags, -> { includes(:tags) } - scope :eager_load_for_archiving_trace, -> { includes(:project, :pending_state) } + scope :eager_load_for_archiving_trace, -> { preload(:project, :pending_state) } scope :eager_load_everything, -> do includes( @@ -180,7 +183,9 @@ module Ci acts_as_taggable - add_authentication_token_field :token, encrypted: :required + add_authentication_token_field :token, + encrypted: :required, + format_with_prefix: :partition_id_prefix_in_16_bit_encode after_save :stick_build_if_status_changed @@ -600,6 +605,7 @@ module Ci .concat(deploy_token_variables) .concat(harbor_variables) .concat(apple_app_store_variables) + .concat(google_play_variables) end end @@ -650,6 +656,13 @@ module Ci Gitlab::Ci::Variables::Collection.new(apple_app_store_integration.ci_variables) end + def google_play_variables + return [] unless google_play_integration.try(:activated?) + return [] unless pipeline.protected_ref? + + Gitlab::Ci::Variables::Collection.new(google_play_integration.ci_variables) + end + def features { trace_sections: true, @@ -757,9 +770,7 @@ module Ci end def remove_token! - if Feature.enabled?(:remove_job_token_on_completion, project) - update!(token_encrypted: nil) - end + update!(token_encrypted: nil) end # acts_as_taggable uses this method create/remove tags with contexts @@ -802,7 +813,7 @@ module Ci return unless project return if user&.blocked? - ActiveRecord::Associations::Preloader.new.preload([self], { runner: :tags }) + ActiveRecord::Associations::Preloader.new(records: [self], associations: { runner: :tags }).call project.execute_hooks(build_data.dup, :job_hooks) if project.has_active_hooks?(:job_hooks) project.execute_integrations(build_data.dup, :job_hooks) if project.has_active_integrations?(:job_hooks) @@ -1091,10 +1102,6 @@ module Ci ::Ci::PendingBuild.upsert_from_build!(self) end - def create_runtime_metadata! - ::Ci::RunningBuild.upsert_shared_runner_build!(self) - end - ## # We can have only one queuing entry or running build tracking entry, # because there is a unique index on `build_id` in each table, but we need @@ -1161,11 +1168,6 @@ module Ci end end - override :format_token - def format_token(token) - "#{partition_id.to_s(16)}_#{token}" - end - protected def run_status_commit_hooks! @@ -1308,6 +1310,10 @@ module Ci ).to_context] ) end + + def partition_id_prefix_in_16_bit_encode + "#{partition_id.to_s(16)}_" + end end end diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb index b294afd405d..4b2be446fe3 100644 --- a/app/models/ci/build_metadata.rb +++ b/app/models/ci/build_metadata.rb @@ -10,15 +10,17 @@ module Ci include Presentable include ChronicDurationAttribute include Gitlab::Utils::StrongMemoize + include IgnorableColumns self.table_name = 'p_ci_builds_metadata' self.primary_key = 'id' partitionable scope: :build + ignore_column :runner_machine_id, remove_with: '16.0', remove_after: '2023-04-22' + belongs_to :build, class_name: 'CommitStatus' belongs_to :project - belongs_to :runner_machine, class_name: 'Ci::RunnerMachine' before_create :set_build_project diff --git a/app/models/ci/build_pending_state.rb b/app/models/ci/build_pending_state.rb index 3684dac06c7..966884ae158 100644 --- a/app/models/ci/build_pending_state.rb +++ b/app/models/ci/build_pending_state.rb @@ -3,7 +3,7 @@ class Ci::BuildPendingState < Ci::ApplicationRecord include Ci::Partitionable - belongs_to :build, class_name: 'Ci::Build', foreign_key: :build_id + belongs_to :build, class_name: 'Ci::Build', foreign_key: :build_id, inverse_of: :pending_state partitionable scope: :build diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb index 541a8b5bffa..03b59b19ef1 100644 --- a/app/models/ci/build_trace_chunk.rb +++ b/app/models/ci/build_trace_chunk.rb @@ -9,7 +9,7 @@ module Ci include ::Gitlab::ExclusiveLeaseHelpers include ::Gitlab::OptimisticLocking - belongs_to :build, class_name: "Ci::Build", foreign_key: :build_id + belongs_to :build, class_name: "Ci::Build", foreign_key: :build_id, inverse_of: :trace_chunks partitionable scope: :build diff --git a/app/models/ci/catalog/listing.rb b/app/models/ci/catalog/listing.rb new file mode 100644 index 00000000000..92464cb645f --- /dev/null +++ b/app/models/ci/catalog/listing.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Ci + module Catalog + class Listing + # This class is the SSoT to displaying the list of resources in the + # CI/CD Catalog given a namespace as a scope. + # This model is not directly backed by a table and joins catalog resources + # with projects to return relevant data. + def initialize(namespace, current_user) + raise ArgumentError, 'Namespace is not a root namespace' unless namespace.root? + + @namespace = namespace + @current_user = current_user + end + + def resources + Ci::Catalog::Resource + .joins(:project).includes(:project) + .merge(projects_in_namespace_visible_to_user) + end + + private + + attr_reader :namespace, :current_user + + def projects_in_namespace_visible_to_user + Project + .in_namespace(namespace.self_and_descendant_ids) + .public_or_visible_to_user(current_user) + end + end + end +end diff --git a/app/models/ci/catalog/resource.rb b/app/models/ci/catalog/resource.rb new file mode 100644 index 00000000000..1b3dec5f54d --- /dev/null +++ b/app/models/ci/catalog/resource.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Ci + module Catalog + # This class represents a CI/CD Catalog resource. + # A Catalog resource is normally associated to a project. + # This model connects to the `main` database because of its + # dependency on the Project model and its need to join with that table + # in order to generate the CI/CD catalog. + class Resource < ::ApplicationRecord + self.table_name = 'catalog_resources' + + belongs_to :project + end + end +end diff --git a/app/models/ci/daily_build_group_report_result.rb b/app/models/ci/daily_build_group_report_result.rb index 598d1456a48..5ec54ee2983 100644 --- a/app/models/ci/daily_build_group_report_result.rb +++ b/app/models/ci/daily_build_group_report_result.rb @@ -4,9 +4,10 @@ module Ci class DailyBuildGroupReportResult < Ci::ApplicationRecord PARAM_TYPES = %w[coverage].freeze - belongs_to :last_pipeline, class_name: 'Ci::Pipeline', foreign_key: :last_pipeline_id + belongs_to :last_pipeline, class_name: 'Ci::Pipeline', foreign_key: :last_pipeline_id, + inverse_of: :daily_build_group_report_results belongs_to :project - belongs_to :group + belongs_to :group, class_name: '::Group' validates :data, json_schema: { filename: "daily_build_group_report_result_data" } diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 89a3d269a43..5a7860174ff 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -132,7 +132,7 @@ module Ci PLAN_LIMIT_PREFIX = 'ci_max_artifact_size_' belongs_to :project - belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id + belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id, inverse_of: :job_artifacts mount_file_store_uploader JobArtifactUploader, skip_store_file: true @@ -177,6 +177,8 @@ module Ci where(file_type: self.erasable_file_types) end + scope :non_trace, -> { where.not(file_type: [:trace]) } + scope :downloadable, -> { where(file_type: DOWNLOADABLE_TYPES) } scope :unlocked, -> { joins(job: :pipeline).merge(::Ci::Pipeline.unlocked) } scope :order_expired_asc, -> { order(expire_at: :asc) } diff --git a/app/models/ci/job_token/scope.rb b/app/models/ci/job_token/scope.rb index 20775077bd8..f389c642fd8 100644 --- a/app/models/ci/job_token/scope.rb +++ b/app/models/ci/job_token/scope.rb @@ -58,8 +58,7 @@ module Ci end def inbound_accessible?(accessed_project) - # if the flag or setting is disabled any project is considered to be in scope. - return true unless Feature.enabled?(:ci_inbound_job_token_scope, accessed_project) + # if the setting is disabled any project is considered to be in scope. return true unless accessed_project.ci_inbound_job_token_scope_enabled? inbound_linked_as_accessible?(accessed_project) diff --git a/app/models/ci/job_variable.rb b/app/models/ci/job_variable.rb index 998f0647ad5..573999995bc 100644 --- a/app/models/ci/job_variable.rb +++ b/app/models/ci/job_variable.rb @@ -7,7 +7,7 @@ module Ci include Ci::RawVariable include BulkInsertSafe - belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id + belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id, inverse_of: :job_variables partitionable scope: :job diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index bd426e02b9c..2b0c79aab87 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -11,7 +11,6 @@ module Ci include Gitlab::OptimisticLocking include Gitlab::Utils::StrongMemoize include AtomicInternalId - include EnumWithNil include Ci::HasRef include ShaAttribute include FromUnion @@ -46,7 +45,7 @@ module Ci belongs_to :project, inverse_of: :all_pipelines belongs_to :user - belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline' + belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline', inverse_of: :auto_canceled_pipelines belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule' belongs_to :merge_request, class_name: 'MergeRequest' belongs_to :external_pull_request @@ -67,14 +66,15 @@ module Ci has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline has_many :latest_statuses_ordered_by_stage, -> { latest.order(:stage_idx, :stage) }, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline has_many :latest_statuses, -> { latest }, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline - has_many :statuses_order_id_desc, -> { order_id_desc }, class_name: 'CommitStatus', foreign_key: :commit_id + has_many :statuses_order_id_desc, -> { order_id_desc }, class_name: 'CommitStatus', foreign_key: :commit_id, + inverse_of: :pipeline has_many :processables, class_name: 'Ci::Processable', foreign_key: :commit_id, inverse_of: :pipeline has_many :bridges, class_name: 'Ci::Bridge', foreign_key: :commit_id, inverse_of: :pipeline has_many :builds, foreign_key: :commit_id, inverse_of: :pipeline has_many :generic_commit_statuses, foreign_key: :commit_id, inverse_of: :pipeline, class_name: 'GenericCommitStatus' has_many :job_artifacts, through: :builds has_many :build_trace_chunks, class_name: 'Ci::BuildTraceChunk', through: :builds, source: :trace_chunks - has_many :trigger_requests, dependent: :destroy, foreign_key: :commit_id # rubocop:disable Cop/ActiveRecordDependent + has_many :trigger_requests, dependent: :destroy, foreign_key: :commit_id, inverse_of: :pipeline # rubocop:disable Cop/ActiveRecordDependent has_many :variables, class_name: 'Ci::PipelineVariable' has_many :latest_builds, -> { latest.with_project_and_metadata }, foreign_key: :commit_id, inverse_of: :pipeline, class_name: 'Ci::Build' has_many :downloadable_artifacts, -> do @@ -86,17 +86,24 @@ module Ci # Merge requests for which the current pipeline is running against # the merge request's latest commit. - has_many :merge_requests_as_head_pipeline, foreign_key: "head_pipeline_id", class_name: 'MergeRequest' + has_many :merge_requests_as_head_pipeline, foreign_key: :head_pipeline_id, class_name: 'MergeRequest', + inverse_of: :head_pipeline + has_many :pending_builds, -> { pending }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline - has_many :failed_builds, -> { latest.failed }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline + has_many :failed_builds, -> { latest.failed }, foreign_key: :commit_id, class_name: 'Ci::Build', + inverse_of: :pipeline has_many :retryable_builds, -> { latest.failed_or_canceled.includes(:project) }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline - has_many :cancelable_statuses, -> { cancelable }, foreign_key: :commit_id, class_name: 'CommitStatus' + has_many :cancelable_statuses, -> { cancelable }, foreign_key: :commit_id, class_name: 'CommitStatus', + inverse_of: :pipeline has_many :manual_actions, -> { latest.manual_actions.includes(:project) }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline has_many :scheduled_actions, -> { latest.scheduled_actions.includes(:project) }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline - has_many :auto_canceled_pipelines, class_name: 'Ci::Pipeline', foreign_key: 'auto_canceled_by_id' - has_many :auto_canceled_jobs, class_name: 'CommitStatus', foreign_key: 'auto_canceled_by_id' - has_many :sourced_pipelines, class_name: 'Ci::Sources::Pipeline', foreign_key: :source_pipeline_id + has_many :auto_canceled_pipelines, class_name: 'Ci::Pipeline', foreign_key: :auto_canceled_by_id, + inverse_of: :auto_canceled_by + has_many :auto_canceled_jobs, class_name: 'CommitStatus', foreign_key: :auto_canceled_by_id, + inverse_of: :auto_canceled_by + has_many :sourced_pipelines, class_name: 'Ci::Sources::Pipeline', foreign_key: :source_pipeline_id, + inverse_of: :source_pipeline has_one :source_pipeline, class_name: 'Ci::Sources::Pipeline', inverse_of: :pipeline @@ -114,7 +121,9 @@ module Ci has_one :pipeline_metadata, class_name: 'Ci::PipelineMetadata', inverse_of: :pipeline - has_many :daily_build_group_report_results, class_name: 'Ci::DailyBuildGroupReportResult', foreign_key: :last_pipeline_id + has_many :daily_build_group_report_results, class_name: 'Ci::DailyBuildGroupReportResult', + foreign_key: :last_pipeline_id, inverse_of: :last_pipeline + has_many :latest_builds_report_results, through: :latest_builds, source: :report_results has_many :pipeline_artifacts, class_name: 'Ci::PipelineArtifact', inverse_of: :pipeline, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -143,9 +152,9 @@ module Ci # We use `Enums::Ci::Pipeline.sources` here so that EE can more easily extend # this `Hash` with new values. - enum_with_nil source: Enums::Ci::Pipeline.sources + enum source: Enums::Ci::Pipeline.sources - enum_with_nil config_source: Enums::Ci::Pipeline.config_sources + enum config_source: Enums::Ci::Pipeline.config_sources # We use `Enums::Ci::Pipeline.failure_reasons` here so that EE can more easily # extend this `Hash` with new values. @@ -336,6 +345,22 @@ module Ci AutoDevops::DisableWorker.perform_async(pipeline.id) if pipeline.auto_devops_source? end end + + after_transition any => [:running, *::Ci::Pipeline.completed_statuses] do |pipeline| + project = pipeline&.project + + next unless project + next unless Feature.enabled?(:pipeline_trigger_merge_status, project) + + pipeline.run_after_commit do + next if pipeline.child? + next unless project.only_allow_merge_if_pipeline_succeeds?(inherit_group_setting: true) + + pipeline.all_merge_requests.opened.each do |merge_request| + GraphqlTriggers.merge_request_merge_status_updated(merge_request) + end + end + end end scope :internal, -> { where(source: internal_sources) } @@ -1282,7 +1307,7 @@ module Ci types_to_collect = report_types.empty? ? ::Ci::JobArtifact::SECURITY_REPORT_FILE_TYPES : report_types ::Gitlab::Ci::Reports::Security::Reports.new(self).tap do |security_reports| - latest_report_builds(reports_scope).each do |build| + latest_report_builds_in_self_and_project_descendants(reports_scope).includes(pipeline: { project: :route }).each do |build| # rubocop:disable Rails/FindEach build.collect_security_reports!(security_reports, report_types: types_to_collect) end end diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb index 20ff07e88ba..83e6fa2f862 100644 --- a/app/models/ci/pipeline_schedule.rb +++ b/app/models/ci/pipeline_schedule.rb @@ -8,14 +8,15 @@ module Ci include CronSchedulable include Limitable include EachBatch + include BatchNullifyDependentAssociations self.limit_name = 'ci_pipeline_schedules' self.limit_scope = :project belongs_to :project belongs_to :owner, class_name: 'User' - has_one :last_pipeline, -> { order(id: :desc) }, class_name: 'Ci::Pipeline' - has_many :pipelines + has_one :last_pipeline, -> { order(id: :desc) }, class_name: 'Ci::Pipeline', inverse_of: :pipeline_schedule + has_many :pipelines, dependent: :nullify # rubocop:disable Cop/ActiveRecordDependent has_many :variables, class_name: 'Ci::PipelineScheduleVariable' validates :cron, unless: :importing?, cron: true, presence: { unless: :importing? } @@ -81,6 +82,12 @@ module Ci def worker_cron_expression Settings.cron_jobs['pipeline_schedule_worker']['cron'] end + + def destroy + nullify_dependent_associations_in_batches + + super + end end end diff --git a/app/models/ci/resource_group.rb b/app/models/ci/resource_group.rb index b788e4f58c1..a220aa7bb18 100644 --- a/app/models/ci/resource_group.rb +++ b/app/models/ci/resource_group.rb @@ -29,13 +29,19 @@ module Ci partition_id: processable.partition_id } - resources.free.limit(1).update_all(attrs) > 0 + success = resources.free.limit(1).update_all(attrs) > 0 + log_event(success: success, processable: processable, action: "assign resource to processable") + + success end def release_resource_from(processable) attrs = { build_id: nil, partition_id: nil } - resources.retained_by(processable).update_all(attrs) > 0 + success = resources.retained_by(processable).update_all(attrs) > 0 + log_event(success: success, processable: processable, action: "release resource from processable") + + success end def upcoming_processables @@ -72,5 +78,14 @@ module Ci # belong to the same resource group are executed once at time. self.resources.build if self.resources.empty? end + + def log_event(success:, processable:, action:) + Gitlab::Ci::ResourceGroups::Logger.build.info({ + resource_group_id: self.id, + processable_id: processable.id, + message: "attempted to #{action}", + success: success + }) + end end end diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 09ac0fa69e7..6fefe95769b 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -17,7 +17,10 @@ module Ci extend ::Gitlab::Utils::Override - add_authentication_token_field :token, encrypted: :optional, expires_at: :compute_token_expiration + add_authentication_token_field :token, + encrypted: :optional, + expires_at: :compute_token_expiration, + format_with_prefix: :prefix_for_new_and_legacy_runner enum access_level: { not_protected: 0, @@ -54,6 +57,9 @@ module Ci # The `STALE_TIMEOUT` constant defines the how far past the last contact or creation date a runner will be considered stale STALE_TIMEOUT = 3.months + # Only allow authentication token to be visible for a short while + REGISTRATION_AVAILABILITY_TIME = 1.hour + AVAILABLE_TYPES_LEGACY = %w[specific shared].freeze AVAILABLE_TYPES = runner_types.keys.freeze AVAILABLE_STATUSES = %w[active paused online offline never_contacted stale].freeze # TODO: Remove in %16.0: active, paused. Relevant issue: https://gitlab.com/gitlab-org/gitlab/-/issues/344648 @@ -81,8 +87,13 @@ module Ci scope :active, -> (value = true) { where(active: value) } scope :paused, -> { active(false) } scope :online, -> { where('contacted_at > ?', online_contact_time_deadline) } - scope :recent, -> { where('ci_runners.created_at >= :date OR ci_runners.contacted_at >= :date', date: stale_deadline) } - scope :stale, -> { where('ci_runners.created_at < :date AND (ci_runners.contacted_at IS NULL OR ci_runners.contacted_at < :date)', date: stale_deadline) } + scope :recent, -> do + where('ci_runners.created_at >= :datetime OR ci_runners.contacted_at >= :datetime', datetime: stale_deadline) + end + scope :stale, -> do + where('ci_runners.created_at <= :datetime AND ' \ + '(ci_runners.contacted_at IS NULL OR ci_runners.contacted_at <= :datetime)', datetime: stale_deadline) + end scope :offline, -> { where(arel_table[:contacted_at].lteq(online_contact_time_deadline)) } scope :never_contacted, -> { where(contacted_at: nil) } scope :ordered, -> { order(id: :desc) } @@ -185,6 +196,7 @@ module Ci scope :order_token_expires_at_asc, -> { order(token_expires_at: :asc) } scope :order_token_expires_at_desc, -> { order(token_expires_at: :desc) } scope :with_tags, -> { preload(:tags) } + scope :with_creator, -> { preload(:creator) } validate :tag_constraints validates :access_level, presence: true @@ -332,7 +344,7 @@ module Ci def stale? return false unless created_at - [created_at, contacted_at].compact.max < self.class.stale_deadline + [created_at, contacted_at].compact.max <= self.class.stale_deadline end def status(legacy_mode = nil) @@ -434,7 +446,7 @@ module Ci ensure_runner_queue_value == value if value.present? end - def heartbeat(values) + def heartbeat(values, update_contacted_at: true) ## # We can safely ignore writes performed by a runner heartbeat. We do # not want to upgrade database connection proxy to use the primary @@ -442,20 +454,18 @@ module Ci # ::Gitlab::Database::LoadBalancing::Session.without_sticky_writes do values = values&.slice(:version, :revision, :platform, :architecture, :ip_address, :config, :executor) || {} - values[:contacted_at] = Time.current + values[:contacted_at] = Time.current if update_contacted_at if values.include?(:executor) values[:executor_type] = EXECUTOR_NAME_TO_TYPES.fetch(values.delete(:executor), :unknown) end - cache_attributes(values) + new_version = values[:version] + schedule_runner_version_update(new_version) if new_version && values[:version] != version - # We save data without validation, it will always change due to `contacted_at` - if persist_cached_data? - version_updated = values.include?(:version) && values[:version] != version + merge_cache_attributes(values) - update_columns(values) - schedule_runner_version_update if version_updated - end + # We save data without validation, it will always change due to `contacted_at` + update_columns(values) if persist_cached_data? end end @@ -488,17 +498,16 @@ module Ci end end - override :format_token - def format_token(token) - return token if registration_token_registration_type? - - "#{CREATED_RUNNER_TOKEN_PREFIX}#{token}" - end - def ensure_machine(system_xid, &blk) RunnerMachine.safe_find_or_create_by!(runner_id: id, system_xid: system_xid.to_s, &blk) # rubocop: disable Performance/ActiveRecordSubtransactionMethods end + def registration_available? + authenticated_user_registration_type? && + created_at > REGISTRATION_AVAILABILITY_TIME.ago && + !runner_machines.any? + end + private scope :with_upgrade_status, ->(upgrade_status) do @@ -594,10 +603,16 @@ module Ci # TODO Remove in 16.0 when runners are known to send a system_id # For now, heartbeats with version updates might result in two Sidekiq jobs being queued if a runner has a system_id # This is not a problem since the jobs are deduplicated on the version - def schedule_runner_version_update - return unless version + def schedule_runner_version_update(new_version) + return unless new_version && Gitlab::Ci::RunnerReleases.instance.enabled? + + Ci::Runners::ProcessRunnerVersionUpdateWorker.perform_async(new_version) + end + + def prefix_for_new_and_legacy_runner + return if registration_token_registration_type? - Ci::Runners::ProcessRunnerVersionUpdateWorker.perform_async(version) + CREATED_RUNNER_TOKEN_PREFIX end end end diff --git a/app/models/ci/runner_machine.rb b/app/models/ci/runner_machine.rb index e52659a011f..8cf395aadb4 100644 --- a/app/models/ci/runner_machine.rb +++ b/app/models/ci/runner_machine.rb @@ -5,17 +5,14 @@ module Ci include FromUnion include RedisCacheable include Ci::HasRunnerExecutor - include IgnorableColumns - - ignore_column :machine_xid, remove_with: '15.11', remove_after: '2022-03-22' # The `UPDATE_CONTACT_COLUMN_EVERY` defines how often the Runner Machine DB entry can be updated - UPDATE_CONTACT_COLUMN_EVERY = 40.minutes..55.minutes + UPDATE_CONTACT_COLUMN_EVERY = (40.minutes)..(55.minutes) belongs_to :runner - has_many :build_metadata, class_name: 'Ci::BuildMetadata' - has_many :builds, through: :build_metadata, class_name: 'Ci::Build' + has_many :runner_machine_builds, inverse_of: :runner_machine, class_name: 'Ci::RunnerMachineBuild' + has_many :builds, through: :runner_machine_builds, class_name: 'Ci::Build' belongs_to :runner_version, inverse_of: :runner_machines, primary_key: :version, foreign_key: :version, class_name: 'Ci::RunnerVersion' @@ -44,7 +41,15 @@ module Ci remove_duplicates: false).where(created_some_time_ago) end - def heartbeat(values) + def self.online_contact_time_deadline + Ci::Runner.online_contact_time_deadline + end + + def self.stale_deadline + STALE_TIMEOUT.ago + end + + def heartbeat(values, update_contacted_at: true) ## # We can safely ignore writes performed by a runner heartbeat. We do # not want to upgrade database connection proxy to use the primary @@ -52,24 +57,40 @@ module Ci # ::Gitlab::Database::LoadBalancing::Session.without_sticky_writes do values = values&.slice(:version, :revision, :platform, :architecture, :ip_address, :config, :executor) || {} - values[:contacted_at] = Time.current + values[:contacted_at] = Time.current if update_contacted_at if values.include?(:executor) values[:executor_type] = Ci::Runner::EXECUTOR_NAME_TO_TYPES.fetch(values.delete(:executor), :unknown) end - version_changed = values.include?(:version) && values[:version] != version - - cache_attributes(values) + new_version = values[:version] + schedule_runner_version_update(new_version) if new_version && values[:version] != version - schedule_runner_version_update if version_changed + merge_cache_attributes(values) # We save data without validation, it will always change due to `contacted_at` update_columns(values) if persist_cached_data? end end + def status + return :stale if stale? + return :never_contacted unless contacted_at + + online? ? :online : :offline + end + private + def online? + contacted_at && contacted_at > self.class.online_contact_time_deadline + end + + def stale? + return false unless created_at + + [created_at, contacted_at].compact.max <= self.class.stale_deadline + end + def persist_cached_data? # Use a random threshold to prevent beating DB updates. contacted_at_max_age = Random.rand(UPDATE_CONTACT_COLUMN_EVERY) @@ -79,10 +100,10 @@ module Ci (Time.current - real_contacted_at) >= contacted_at_max_age end - def schedule_runner_version_update - return unless version + def schedule_runner_version_update(new_version) + return unless new_version && Gitlab::Ci::RunnerReleases.instance.enabled? - Ci::Runners::ProcessRunnerVersionUpdateWorker.perform_async(version) + Ci::Runners::ProcessRunnerVersionUpdateWorker.perform_async(new_version) end end end diff --git a/app/models/ci/runner_machine_build.rb b/app/models/ci/runner_machine_build.rb new file mode 100644 index 00000000000..d4f2c403337 --- /dev/null +++ b/app/models/ci/runner_machine_build.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module Ci + class RunnerMachineBuild < Ci::ApplicationRecord + include Ci::Partitionable + + self.table_name = :p_ci_runner_machine_builds + self.primary_key = :build_id + + partitionable scope: :build, partitioned: true + + belongs_to :build, inverse_of: :runner_machine_build, class_name: 'Ci::Build' + belongs_to :runner_machine, inverse_of: :runner_machine_builds, class_name: 'Ci::RunnerMachine' + + validates :build, presence: true + validates :runner_machine, presence: true + + scope :for_build, ->(build_id) { where(build_id: build_id) } + + def self.pluck_build_id_and_runner_machine_id + select(:build_id, :runner_machine_id) + .pluck(:build_id, :runner_machine_id) + .to_h + end + end +end diff --git a/app/models/ci/runner_version.rb b/app/models/ci/runner_version.rb index ec42f46b165..41e7a2b8e8a 100644 --- a/app/models/ci/runner_version.rb +++ b/app/models/ci/runner_version.rb @@ -3,9 +3,8 @@ module Ci class RunnerVersion < Ci::ApplicationRecord include EachBatch - include EnumWithNil - enum_with_nil status: { + enum status: { not_processed: nil, invalid_version: -1, unavailable: 1, diff --git a/app/models/ci/sources/pipeline.rb b/app/models/ci/sources/pipeline.rb index 855e68d1db1..719d19f4169 100644 --- a/app/models/ci/sources/pipeline.rb +++ b/app/models/ci/sources/pipeline.rb @@ -10,6 +10,7 @@ module Ci belongs_to :project, class_name: "::Project" belongs_to :pipeline, class_name: "Ci::Pipeline", inverse_of: :source_pipeline + belongs_to :build, class_name: "Ci::Build", foreign_key: :source_job_id, inverse_of: :sourced_pipelines belongs_to :source_project, class_name: "::Project", foreign_key: :source_project_id belongs_to :source_job, class_name: "CommitStatus", foreign_key: :source_job_id diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index 46a9e3f6494..02093bdf153 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -27,6 +27,7 @@ module Ci has_many :processables, class_name: 'Ci::Processable', foreign_key: :stage_id, inverse_of: :ci_stage has_many :builds, foreign_key: :stage_id, inverse_of: :ci_stage has_many :bridges, foreign_key: :stage_id, inverse_of: :ci_stage + has_many :generic_commit_statuses, foreign_key: :stage_id, inverse_of: :ci_stage scope :ordered, -> { order(position: :asc) } scope :in_pipelines, ->(pipelines) { where(pipeline: pipelines) } @@ -117,6 +118,7 @@ module Ci end end + # This will be removed with ci_remove_ensure_stage_service def update_legacy_status set_status(latest_stage_status.to_s) end @@ -150,6 +152,7 @@ module Ci blocked? || skipped? end + # This will be removed with ci_remove_ensure_stage_service def latest_stage_status statuses.latest.composite_status || 'skipped' end diff --git a/app/models/clusters/applications/crossplane.rb b/app/models/clusters/applications/crossplane.rb deleted file mode 100644 index a7b4fb57149..00000000000 --- a/app/models/clusters/applications/crossplane.rb +++ /dev/null @@ -1,58 +0,0 @@ -# frozen_string_literal: true - -module Clusters - module Applications - # DEPRECATED for removal in %14.0 - # See https://gitlab.com/groups/gitlab-org/-/epics/4280 - class Crossplane < ApplicationRecord - VERSION = '0.4.1' - - self.table_name = 'clusters_applications_crossplane' - - include ::Clusters::Concerns::ApplicationCore - include ::Clusters::Concerns::ApplicationStatus - include ::Clusters::Concerns::ApplicationVersion - include ::Clusters::Concerns::ApplicationData - - attribute :version, default: VERSION - attribute :stack, default: "" - - validates :stack, presence: true - - def chart - 'crossplane/crossplane' - end - - def repository - 'https://charts.crossplane.io/alpha' - end - - def install_command - helm_command_module::InstallCommand.new( - name: 'crossplane', - repository: repository, - version: VERSION, - rbac: cluster.platform_kubernetes_rbac?, - chart: chart, - files: files - ) - end - - def values - crossplane_values.to_yaml - end - - private - - def crossplane_values - { - "clusterStacks" => { - self.stack => { - "deploy" => true - } - } - } - end - end - end -end diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb index 64366594583..c8c043f3312 100644 --- a/app/models/clusters/applications/knative.rb +++ b/app/models/clusters/applications/knative.rb @@ -13,8 +13,6 @@ module Clusters self.table_name = 'clusters_applications_knative' - has_one :serverless_domain_cluster, class_name: '::Serverless::DomainCluster', foreign_key: 'clusters_applications_knative_id', inverse_of: :knative - include ::Clusters::Concerns::ApplicationCore include ::Clusters::Concerns::ApplicationStatus include ::Clusters::Concerns::ApplicationVersion @@ -49,8 +47,6 @@ module Clusters scope :for_cluster, -> (cluster) { where(cluster: cluster) } - has_one :pages_domain, through: :serverless_domain_cluster - def chart 'knative/knative' end @@ -140,16 +136,14 @@ module Clusters @api_groups ||= YAML.safe_load(File.read(Rails.root.join(API_GROUPS_PATH))) end + # Relied on application_prometheus which is now removed def install_knative_metrics - return [] unless cluster.application_prometheus&.available? - - [Gitlab::Kubernetes::KubectlCmd.apply_file(METRICS_CONFIG)] + [] end + # Relied on application_prometheus which is now removed def delete_knative_istio_metrics - return [] unless cluster.application_prometheus&.available? - - [Gitlab::Kubernetes::KubectlCmd.delete("--ignore-not-found", "-f", METRICS_CONFIG)] + [] end end end diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb deleted file mode 100644 index a076c871824..00000000000 --- a/app/models/clusters/applications/prometheus.rb +++ /dev/null @@ -1,126 +0,0 @@ -# frozen_string_literal: true - -module Clusters - module Applications - class Prometheus < ApplicationRecord - include ::Clusters::Concerns::PrometheusClient - - VERSION = '10.4.1' - - self.table_name = 'clusters_applications_prometheus' - - include ::Clusters::Concerns::ApplicationCore - include ::Clusters::Concerns::ApplicationStatus - include ::Clusters::Concerns::ApplicationVersion - include ::Clusters::Concerns::ApplicationData - include AfterCommitQueue - - attribute :version, default: VERSION - - scope :preload_cluster_platform, -> { preload(cluster: [:platform_kubernetes]) } - - attr_encrypted :alert_manager_token, - mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_32, - algorithm: 'aes-256-gcm' - - after_initialize :set_alert_manager_token, if: :new_record? - - after_destroy do - cluster.find_or_build_integration_prometheus.destroy - end - - state_machine :status do - after_transition any => [:installed, :externally_installed] do |application| - application.cluster.find_or_build_integration_prometheus.update(enabled: true, alert_manager_token: application.alert_manager_token) - end - - after_transition any => :updating do |application| - application.update(last_update_started_at: Time.current) - end - end - - def managed_prometheus? - !externally_installed? && !uninstalled? - end - - def updated_since?(timestamp) - last_update_started_at && - last_update_started_at > timestamp && - !update_errored? - end - - def chart - "#{name}/prometheus" - end - - def repository - 'https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive' - end - - def install_command - helm_command_module::InstallCommand.new( - name: name, - repository: repository, - version: VERSION, - rbac: cluster.platform_kubernetes_rbac?, - chart: chart, - files: files, - postinstall: install_knative_metrics - ) - end - - # Deprecated, to be removed in %14.0 as part of https://gitlab.com/groups/gitlab-org/-/epics/4280 - def patch_command(values) - helm_command_module::PatchCommand.new( - name: name, - repository: repository, - version: version, - rbac: cluster.platform_kubernetes_rbac?, - chart: chart, - files: files_with_replaced_values(values) - ) - end - - def uninstall_command - helm_command_module::DeleteCommand.new( - name: name, - rbac: cluster.platform_kubernetes_rbac?, - files: files, - predelete: delete_knative_istio_metrics - ) - end - - # Returns a copy of files where the values of 'values.yaml' - # are replaced by the argument. - # - # See #values for the data format required - def files_with_replaced_values(replaced_values) - files.merge('values.yaml': replaced_values) - end - - private - - def set_alert_manager_token - self.alert_manager_token = SecureRandom.hex - end - - def install_knative_metrics - return [] unless cluster.application_knative_available? - - [Gitlab::Kubernetes::KubectlCmd.apply_file(Clusters::Applications::Knative::METRICS_CONFIG)] - end - - def delete_knative_istio_metrics - return [] unless cluster.application_knative_available? - - [ - Gitlab::Kubernetes::KubectlCmd.delete( - "-f", Clusters::Applications::Knative::METRICS_CONFIG, - "--ignore-not-found" - ) - ] - end - end - end -end diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index a35ea6ddb46..5cd11265808 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -14,8 +14,6 @@ module Clusters APPLICATIONS = { Clusters::Applications::Helm.application_name => Clusters::Applications::Helm, Clusters::Applications::Ingress.application_name => Clusters::Applications::Ingress, - Clusters::Applications::Crossplane.application_name => Clusters::Applications::Crossplane, - Clusters::Applications::Prometheus.application_name => Clusters::Applications::Prometheus, Clusters::Applications::Runner.application_name => Clusters::Applications::Runner, Clusters::Applications::Jupyter.application_name => Clusters::Applications::Jupyter, Clusters::Applications::Knative.application_name => Clusters::Applications::Knative @@ -56,8 +54,6 @@ module Clusters has_one_cluster_application :helm has_one_cluster_application :ingress - has_one_cluster_application :crossplane - has_one_cluster_application :prometheus has_one_cluster_application :runner has_one_cluster_application :jupyter has_one_cluster_application :knative @@ -365,12 +361,6 @@ module Clusters end end - def serverless_domain - strong_memoize(:serverless_domain) do - self.application_knative&.serverless_domain_cluster - end - end - def prometheus_adapter integration_prometheus end diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 165285b34b2..123ad0ebfaf 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -4,7 +4,6 @@ module Clusters module Platforms class Kubernetes < ApplicationRecord include Gitlab::Kubernetes - include EnumWithNil include AfterCommitQueue include ReactiveCaching include NullifyIfBlank @@ -63,7 +62,7 @@ module Clusters alias_attribute :ca_pem, :ca_cert - enum_with_nil authorization_type: { + enum authorization_type: { unknown_authorization: nil, rbac: 1, abac: 2 diff --git a/app/models/commit.rb b/app/models/commit.rb index 4517b3ef216..ea90b4e4dda 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -206,7 +206,8 @@ class Commit def self.link_reference_pattern @link_reference_pattern ||= - super("commit", /(?<commit>#{COMMIT_SHA_PATTERN})?(\.(?<extension>#{LINK_EXTENSION_PATTERN}))?/o) + compose_link_reference_pattern('commit', + /(?<commit>#{COMMIT_SHA_PATTERN})?(\.(?<extension>#{LINK_EXTENSION_PATTERN}))?/o) end def to_reference(from = nil, full: false) diff --git a/app/models/commit_collection.rb b/app/models/commit_collection.rb index 47ecdfa8574..eb7db0fc9b4 100644 --- a/app/models/commit_collection.rb +++ b/app/models/commit_collection.rb @@ -118,4 +118,21 @@ class CommitCollection def next_page @pagination.next_page end + + def load_tags + oids = commits.map(&:id) + references = repository.list_refs([Gitlab::Git::TAG_REF_PREFIX], pointing_at_oids: oids, peel_tags: true) + oid_to_references = references.group_by { |reference| reference.peeled_target.presence || reference.target } + + return self if oid_to_references.empty? + + commits.each do |commit| + grouped_references = oid_to_references[commit.id] + next unless grouped_references + + commit.referenced_by = grouped_references.map(&:name) + end + + self + end end diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb index 87029cb2033..90cdd267cbd 100644 --- a/app/models/commit_range.rb +++ b/app/models/commit_range.rb @@ -50,7 +50,7 @@ class CommitRange end def self.link_reference_pattern - @link_reference_pattern ||= super("compare", /(?<commit_range>#{PATTERN})/o) + @link_reference_pattern ||= compose_link_reference_pattern('compare', /(?<commit_range>#{PATTERN})/o) end # Initialize a CommitRange diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 333a176b8f3..716be080851 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -6,17 +6,17 @@ class CommitStatus < Ci::ApplicationRecord include Importable include AfterCommitQueue include Presentable - include EnumWithNil include BulkInsertableAssociations include TaggableQueries self.table_name = 'ci_builds' + self.primary_key = :id partitionable scope: :pipeline belongs_to :user belongs_to :project - belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id - belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline' + belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id, inverse_of: :statuses + belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline', inverse_of: :auto_canceled_jobs belongs_to :ci_stage, class_name: 'Ci::Stage', foreign_key: :stage_id has_many :needs, class_name: 'Ci::BuildNeed', foreign_key: :build_id, inverse_of: :build @@ -26,7 +26,7 @@ class CommitStatus < Ci::ApplicationRecord enum scheduling_type: { stage: 0, dag: 1 }, _prefix: true # We use `Enums::Ci::CommitStatus.failure_reasons` here so that EE can more easily # extend this `Hash` with new values. - enum_with_nil failure_reason: Enums::Ci::CommitStatus.failure_reasons + enum failure_reason: Enums::Ci::CommitStatus.failure_reasons delegate :commit, to: :pipeline delegate :sha, :short_sha, :before_sha, to: :pipeline @@ -43,14 +43,6 @@ class CommitStatus < Ci::ApplicationRecord scope :order_id_desc, -> { order(id: :desc) } - scope :exclude_ignored, -> do - # We want to ignore failed but allowed to fail jobs. - # - # TODO, we also skip ignored optional manual actions. - where("allow_failure = ? OR status IN (?)", - false, all_state_names - [:failed, :canceled, :manual]) - end - scope :latest, -> { where(retried: [false, nil]) } scope :retried, -> { where(retried: true) } scope :ordered, -> { order(:name) } @@ -239,10 +231,6 @@ class CommitStatus < Ci::ApplicationRecord name.to_s.sub(regex, '').strip end - def failed_but_allowed? - allow_failure? && (failed? || canceled?) - end - # Time spent running. def duration calculate_duration(started_at, finished_at) diff --git a/app/models/concerns/analytics/cycle_analytics/stageable.rb b/app/models/concerns/analytics/cycle_analytics/stageable.rb index caac4f31e1a..d1dd46883e3 100644 --- a/app/models/concerns/analytics/cycle_analytics/stageable.rb +++ b/app/models/concerns/analytics/cycle_analytics/stageable.rb @@ -7,8 +7,8 @@ module Analytics include Gitlab::Utils::StrongMemoize included do - belongs_to :start_event_label, class_name: 'GroupLabel', optional: true - belongs_to :end_event_label, class_name: 'GroupLabel', optional: true + belongs_to :start_event_label, class_name: 'Label', optional: true + belongs_to :end_event_label, class_name: 'Label', optional: true belongs_to :stage_event_hash, class_name: 'Analytics::CycleAnalytics::StageEventHash', optional: true validates :name, presence: true @@ -119,10 +119,11 @@ module Analytics end def label_available_for_namespace?(label_id) - subject = is_a?(::Analytics::CycleAnalytics::Stage) ? namespace : project.group + subject = namespace.is_a?(Namespaces::ProjectNamespace) ? namespace.project.group : namespace return unless subject - LabelsFinder.new(nil, { group_id: subject.id, include_ancestor_groups: true, only_group_labels: true }) + LabelsFinder.new(nil, + { group_id: subject.id, include_ancestor_groups: true, only_group_labels: namespace.is_a?(Group) }) .execute(skip_authorization: true) .id_in(label_id) .exists? diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb index 14be924f9da..ec4ee7985fe 100644 --- a/app/models/concerns/atomic_internal_id.rb +++ b/app/models/concerns/atomic_internal_id.rb @@ -61,6 +61,8 @@ module AtomicInternalId AtomicInternalId.project_init(self) when :group AtomicInternalId.group_init(self) + when :namespace + AtomicInternalId.namespace_init(self) else # We require init here to retain the ability to recalculate in the absence of a # InternalId record (we may delete records in `internal_ids` for example). @@ -241,6 +243,16 @@ module AtomicInternalId end end + def self.namespace_init(klass, column_name = :iid) + ->(instance, scope) do + if instance + klass.where(namespace_id: instance.namespace_id).maximum(column_name) + elsif scope.present? + klass.where(**scope).maximum(column_name) + end + end + end + def internal_id_read_scope(scope) association(scope).reader end diff --git a/app/models/concerns/cached_commit.rb b/app/models/concerns/cached_commit.rb index 0fb72552dd5..8a53fec0612 100644 --- a/app/models/concerns/cached_commit.rb +++ b/app/models/concerns/cached_commit.rb @@ -14,4 +14,9 @@ module CachedCommit def parent_ids [] end + + # These are not saved + def referenced_by + [] + end end diff --git a/app/models/concerns/cascading_namespace_setting_attribute.rb b/app/models/concerns/cascading_namespace_setting_attribute.rb index 731729a1ed5..d0ee4f33ce6 100644 --- a/app/models/concerns/cascading_namespace_setting_attribute.rb +++ b/app/models/concerns/cascading_namespace_setting_attribute.rb @@ -57,11 +57,13 @@ module CascadingNamespaceSettingAttribute # private methods define_validator_methods(attribute) + define_attr_before_save(attribute) define_after_update(attribute) validate :"#{attribute}_changeable?" validate :"lock_#{attribute}_changeable?" + before_save :"before_save_#{attribute}", if: -> { will_save_change_to_attribute?(attribute) } after_update :"clear_descendant_#{attribute}_locks", if: -> { saved_change_to_attribute?("lock_#{attribute}", to: true) } end end @@ -92,13 +94,26 @@ module CascadingNamespaceSettingAttribute def define_attr_writer(attribute) define_method("#{attribute}=") do |value| - return value if value == cascaded_ancestor_value(attribute) + return value if read_attribute(attribute).nil? && to_bool(value) == cascaded_ancestor_value(attribute) clear_memoization(attribute) super(value) end end + def define_attr_before_save(attribute) + # rubocop:disable GitlabSecurity/PublicSend + define_method("before_save_#{attribute}") do + new_value = public_send(attribute) + if public_send("#{attribute}_was").nil? && new_value == cascaded_ancestor_value(attribute) + write_attribute(attribute, nil) + end + end + # rubocop:enable GitlabSecurity/PublicSend + + private :"before_save_#{attribute}" + end + def define_lock_attr_writer(attribute) define_method("lock_#{attribute}=") do |value| attr_value = public_send(attribute) # rubocop:disable GitlabSecurity/PublicSend @@ -239,4 +254,8 @@ module CascadingNamespaceSettingAttribute namespace.descendants.pluck(:id) end end + + def to_bool(value) + ActiveModel::Type::Boolean.new.cast(value) + end end diff --git a/app/models/concerns/ci/has_status.rb b/app/models/concerns/ci/has_status.rb index 9a04776f1c6..2971ecb04b8 100644 --- a/app/models/concerns/ci/has_status.rb +++ b/app/models/concerns/ci/has_status.rb @@ -13,7 +13,7 @@ module Ci STOPPED_STATUSES = COMPLETED_STATUSES + BLOCKED_STATUS ORDERED_STATUSES = %w[failed preparing pending running waiting_for_resource manual scheduled canceled success skipped created].freeze PASSED_WITH_WARNINGS_STATUSES = %w[failed canceled].to_set.freeze - EXCLUDE_IGNORED_STATUSES = %w[manual failed canceled].to_set.freeze + IGNORED_STATUSES = %w[manual].to_set.freeze ALIVE_STATUSES = (ACTIVE_STATUSES + ['created']).freeze CANCELABLE_STATUSES = (ALIVE_STATUSES + ['scheduled']).freeze STATUSES_ENUM = { created: 0, pending: 1, running: 2, success: 3, @@ -23,6 +23,7 @@ module Ci UnknownStatusError = Class.new(StandardError) class_methods do + # This will be removed with ci_remove_ensure_stage_service def composite_status Gitlab::Ci::Status::Composite .new(all, with_allow_failure: columns_hash.key?('allow_failure')) diff --git a/app/models/concerns/ci/partitionable.rb b/app/models/concerns/ci/partitionable.rb index d6ba0f4488f..28cc17432bc 100644 --- a/app/models/concerns/ci/partitionable.rb +++ b/app/models/concerns/ci/partitionable.rb @@ -36,6 +36,7 @@ module Ci Ci::Pipeline Ci::PendingBuild Ci::RunningBuild + Ci::RunnerMachineBuild Ci::PipelineVariable Ci::Sources::Pipeline Ci::Stage @@ -70,8 +71,8 @@ module Ci class_methods do def partitionable(scope:, through: nil, partitioned: false) handle_partitionable_through(through) - handle_partitionable_dml(partitioned) handle_partitionable_scope(scope) + handle_partitionable_ddl(partitioned) end private @@ -85,13 +86,6 @@ module Ci include Partitionable::Switch end - def handle_partitionable_dml(partitioned) - define_singleton_method(:partitioned?) { partitioned } - return unless partitioned - - include Partitionable::PartitionedFilter - end - def handle_partitionable_scope(scope) define_method(:partition_scope_value) do strong_memoize(:partition_scope_value) do @@ -102,6 +96,17 @@ module Ci end end end + + def handle_partitionable_ddl(partitioned) + return unless partitioned + + include ::PartitionedTable + + partitioned_by :partition_id, + strategy: :ci_sliding_list, + next_partition_if: proc { false }, + detach_partition_if: proc { false } + end end end end diff --git a/app/models/concerns/ci/partitionable/partitioned_filter.rb b/app/models/concerns/ci/partitionable/partitioned_filter.rb deleted file mode 100644 index 4adae3be26a..00000000000 --- a/app/models/concerns/ci/partitionable/partitioned_filter.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -module Ci - module Partitionable - # Used to patch the save, update, delete, destroy methods to use the - # partition_id attributes for their SQL queries. - module PartitionedFilter - extend ActiveSupport::Concern - - if Rails::VERSION::MAJOR >= 7 - # These methods are updated in Rails 7 to use `_primary_key_constraints_hash` - # by default, so this patch will no longer be required. - # - # rubocop:disable Gitlab/NoCodeCoverageComment - # :nocov: - raise "`#{__FILE__}` should be double checked" if Rails.env.test? - - warn "Update `#{__FILE__}`. Patches Rails internals for partitioning" - # :nocov: - # rubocop:enable Gitlab/NoCodeCoverageComment - else - def _update_row(attribute_names, attempted_action = "update") - self.class._update_record( - attributes_with_values(attribute_names), - _primary_key_constraints_hash - ) - end - - def _delete_row - self.class._delete_record(_primary_key_constraints_hash) - end - end - - # Introduced in Rails 7, but updated to include `partition_id` filter. - # https://github.com/rails/rails/blob/a4dbb153fd390ac31bb9808809e7ac4d3a2c5116/activerecord/lib/active_record/persistence.rb#L1031-L1033 - def _primary_key_constraints_hash - { @primary_key => id_in_database, partition_id: partition_id } # rubocop:disable Gitlab/ModuleWithInstanceVariables - end - end - end -end diff --git a/app/models/concerns/counter_attribute.rb b/app/models/concerns/counter_attribute.rb index 58ea57962c5..d7ee533b53c 100644 --- a/app/models/concerns/counter_attribute.rb +++ b/app/models/concerns/counter_attribute.rb @@ -5,7 +5,7 @@ # after a period of time (10 minutes). # When an attribute is incremented by a value, the increment is added # to a Redis key. Then, FlushCounterIncrementsWorker will execute -# `flush_increments_to_database!` which removes increments from Redis for a +# `commit_increment!` which removes increments from Redis for a # given model attribute and updates the values in the database. # # @example: @@ -29,8 +29,24 @@ # counter_attribute :conditional_one, if: -> { |object| object.use_counter_attribute? } # end # +# The `counter_attribute` by default will return last persisted value. +# It's possible to always return accurate (real) value instead by using `returns_current: true`. +# While doing this the `counter_attribute` will overwrite attribute accessor to fetch +# the buffered information added to the last persisted value. This will incur cost a Redis call per attribute fetched. +# +# @example: +# +# class ProjectStatistics +# include CounterAttribute +# +# counter_attribute :commit_count, returns_current: true +# end +# +# in that case +# model.commit_count => persisted value + buffered amount to be added +# # To increment the counter we can use the method: -# increment_counter(:commit_count, 3) +# increment_amount(:commit_count, 3) # # This method would determine whether it would increment the counter using Redis, # or fallback to legacy increment on ActiveRecord counters. @@ -50,11 +66,22 @@ module CounterAttribute include Gitlab::Utils::StrongMemoize class_methods do - def counter_attribute(attribute, if: nil) + def counter_attribute(attribute, if: nil, returns_current: false) counter_attributes << { attribute: attribute, - if_proc: binding.local_variable_get(:if) # can't read `if` directly + if_proc: binding.local_variable_get(:if), # can't read `if` directly + returns_current: returns_current } + + if returns_current + define_method(attribute) do + current_counter(attribute) + end + end + + define_method("increment_#{attribute}") do |amount| + increment_amount(attribute, amount) + end end def counter_attributes @@ -87,6 +114,15 @@ module CounterAttribute end end + def increment_amount(attribute, amount) + counter = Gitlab::Counters::Increment.new(amount: amount) + increment_counter(attribute, counter) + end + + def current_counter(attribute) + read_attribute(attribute) + counter(attribute).get + end + def increment_counter(attribute, increment) return if increment.amount == 0 @@ -172,7 +208,8 @@ module CounterAttribute Gitlab::AppLogger.info( message: 'Acquiring lease for project statistics update', - project_statistics_id: id, + model: self.class.name, + model_id: id, project_id: project.id, **log_fields, **Gitlab::ApplicationContext.current @@ -184,7 +221,8 @@ module CounterAttribute rescue Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError Gitlab::AppLogger.warn( message: 'Concurrent project statistics update detected', - project_statistics_id: id, + model: self.class.name, + model_id: id, project_id: project.id, **log_fields, **Gitlab::ApplicationContext.current diff --git a/app/models/concerns/each_batch.rb b/app/models/concerns/each_batch.rb index dbc0887dc97..79fb81e7820 100644 --- a/app/models/concerns/each_batch.rb +++ b/app/models/concerns/each_batch.rb @@ -161,5 +161,81 @@ module EachBatch break unless stop end end + + # Iterates over the relation and counts the rows. The counting + # logic is combined with the iteration query which saves one query + # compared to a standard each_batch approach. + # + # Basic usage: + # count, _last_value = Project.each_batch_count + # + # The counting can be stopped by passing a block and making the last statement true. + # Example: + # + # query_count = 0 + # count, last_value = Project.each_batch_count do + # query_count += 1 + # query_count == 5 # stop counting after 5 loops + # end + # + # Resume where the previous counting has stopped: + # + # count, last_value = Project.each_batch_count(last_count: count, last_value: last_value) + # + # Another example, counting issues in project: + # + # project = Project.find(1) + # count, _ = project.issues.each_batch_count(column: :iid) + def each_batch_count(of: 1000, column: :id, last_count: 0, last_value: nil) + arel_table = self.arel_table + window = Arel::Nodes::Window.new.order(arel_table[column]) + last_value_column = Arel::Nodes::NamedFunction + .new('LAST_VALUE', [arel_table[column]]) + .over(window) + .as(column.to_s) + + loop do + count_column = Arel::Nodes::Addition + .new(Arel::Nodes::NamedFunction.new('ROW_NUMBER', []).over(window), last_count) + .as('count') + + projections = [count_column, last_value_column] + scope = limit(1).offset(of - 1) + scope = scope.where(arel_table[column].gt(last_value)) if last_value + new_count, last_value = scope.pick(*projections) + + # When reaching the last batch the offset query might return no data, to address this + # problem, we invoke a specialized query that takes the last row out of the resultset. + # We could do this for each batch, however it would add unnecessary overhead to all + # queries. + if new_count.nil? + inner_query = scope + .select(*projections) + .limit(nil) + .offset(nil) + .arel + .as(quoted_table_name) + + new_count, last_value = + unscoped + .from(inner_query) + .order(count: :desc) + .limit(1) + .pick(:count, column) + + last_count = new_count if new_count + last_value = nil + break + end + + last_count = new_count + + if block_given? + should_break = yield(last_count, last_value) + break if should_break + end + end + [last_count, last_value] + end end end diff --git a/app/models/concerns/enum_with_nil.rb b/app/models/concerns/enum_with_nil.rb deleted file mode 100644 index c66942025d7..00000000000 --- a/app/models/concerns/enum_with_nil.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module EnumWithNil - extend ActiveSupport::Concern - - included do - def self.enum_with_nil(definitions) - # use original `enum` to auto-define all methods - enum(definitions) - - # override auto-defined methods only for the - # key which uses nil value - definitions.each do |name, values| - # E.g. for enum_with_nil failure_reason: { unknown_failure: nil } - # this overrides auto-generated method `failure_reason` - define_method(name) do - orig = super() - - return orig unless orig.nil? - - self.class.public_send(name.to_s.pluralize).key(nil) # rubocop:disable GitlabSecurity/PublicSend - end - end - end - end -end diff --git a/app/models/concerns/has_unique_internal_users.rb b/app/models/concerns/has_unique_internal_users.rb index 4d60cfa03b0..25b56f6d70f 100644 --- a/app/models/concerns/has_unique_internal_users.rb +++ b/app/models/concerns/has_unique_internal_users.rb @@ -28,7 +28,7 @@ module HasUniqueInternalUsers existing_user = uncached { scope.first } return existing_user if existing_user.present? - uniquify = Uniquify.new + uniquify = Gitlab::Utils::Uniquify.new username = uniquify.string(username) { |s| User.find_by_username(s) } diff --git a/app/models/concerns/has_user_type.rb b/app/models/concerns/has_user_type.rb index b02c95c9662..0b1c6780db8 100644 --- a/app/models/concerns/has_user_type.rb +++ b/app/models/concerns/has_user_type.rb @@ -14,8 +14,10 @@ module HasUserType migration_bot: 7, security_bot: 8, automation_bot: 9, + security_policy_bot: 10, # Currently not in use. See https://gitlab.com/gitlab-org/gitlab/-/issues/384174 admin_bot: 11, - suggested_reviewers_bot: 12 + suggested_reviewers_bot: 12, + service_account: 13 }.with_indifferent_access.freeze BOT_USER_TYPES = %w[ @@ -26,11 +28,15 @@ module HasUserType migration_bot security_bot automation_bot + security_policy_bot admin_bot suggested_reviewers_bot + service_account ].freeze - NON_INTERNAL_USER_TYPES = %w[human project_bot service_user].freeze + # `service_account` allows instance/namespaces to configure a user for external integrations/automations + # `service_user` is an internal, `gitlab-com`-specific user type for integrations like suggested reviewers + NON_INTERNAL_USER_TYPES = %w[human project_bot service_user service_account].freeze INTERNAL_USER_TYPES = (USER_TYPES.keys - NON_INTERNAL_USER_TYPES).freeze included do @@ -53,10 +59,8 @@ module HasUserType BOT_USER_TYPES.include?(user_type) end - # The explicit check for project_bot will be removed with Bot Categorization - # Ref: https://gitlab.com/gitlab-org/gitlab/-/issues/213945 def internal? - ghost? || (bot? && !project_bot?) + INTERNAL_USER_TYPES.include?(user_type) end def redacted_name(viewing_user) diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 50696c7b5e1..c1c1691e424 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -640,10 +640,6 @@ module Issuable false end - def ensure_metrics - self.metrics || create_metrics - end - ## # Overridden in MergeRequest # @@ -658,6 +654,10 @@ module Issuable { name: name, subject: self } end + + def supports_health_status? + false + end end Issuable.prepend_mod_with('Issuable') diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 7addcf9e2ec..0333cfc5f9e 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -169,6 +169,7 @@ module Noteable def expire_note_etag_cache return unless discussions_rendered_on_frontend? return unless etag_caching_enabled? + return unless project.present? Gitlab::EtagCaching::Store.new.touch(note_etag_key) end diff --git a/app/models/concerns/packages/debian/component_file.rb b/app/models/concerns/packages/debian/component_file.rb index 77409549e85..5905670227c 100644 --- a/app/models/concerns/packages/debian/component_file.rb +++ b/app/models/concerns/packages/debian/component_file.rb @@ -88,6 +88,10 @@ module Packages end end + def empty? + size == 0 + end + private def extension diff --git a/app/models/concerns/partitioned_table.rb b/app/models/concerns/partitioned_table.rb index f95f9dd8ad7..c322a736e79 100644 --- a/app/models/concerns/partitioned_table.rb +++ b/app/models/concerns/partitioned_table.rb @@ -8,7 +8,8 @@ module PartitionedTable PARTITIONING_STRATEGIES = { monthly: Gitlab::Database::Partitioning::MonthlyStrategy, - sliding_list: Gitlab::Database::Partitioning::SlidingListStrategy + sliding_list: Gitlab::Database::Partitioning::SlidingListStrategy, + ci_sliding_list: Gitlab::Database::Partitioning::CiSlidingListStrategy }.freeze def partitioned_by(partitioning_key, strategy:, **kwargs) diff --git a/app/models/concerns/redis_cacheable.rb b/app/models/concerns/redis_cacheable.rb index f1d29ad5a90..460cb529715 100644 --- a/app/models/concerns/redis_cacheable.rb +++ b/app/models/concerns/redis_cacheable.rb @@ -33,6 +33,14 @@ module RedisCacheable clear_memoization(:cached_attributes) end + def merge_cache_attributes(values) + existing_attributes = Hash(cached_attributes) + merged_attributes = existing_attributes.merge(values.symbolize_keys) + return if merged_attributes == existing_attributes + + cache_attributes(merged_attributes) + end + private def cache_attribute_key diff --git a/app/models/concerns/referable.rb b/app/models/concerns/referable.rb index 9a17131c91c..5303d110078 100644 --- a/app/models/concerns/referable.rb +++ b/app/models/concerns/referable.rb @@ -76,7 +76,11 @@ module Referable true end - def link_reference_pattern(route, pattern) + def link_reference_pattern + raise NotImplementedError, "#{self} does not implement #{__method__}" + end + + def compose_link_reference_pattern(route, pattern) %r{ (?<url> #{Regexp.escape(Gitlab.config.gitlab.url)} diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb index 262839a3fa6..d70aad4e9ae 100644 --- a/app/models/concerns/routable.rb +++ b/app/models/concerns/routable.rb @@ -99,39 +99,11 @@ module Routable end def full_name - # We have to test for persistence as the cache key uses #updated_at - return (route&.name || build_full_name) unless persisted? && Feature.enabled?(:cached_route_lookups, self, type: :ops) - - # Return the name as-is if the parent is missing - return name if route.nil? && parent.nil? && name.present? - - # If the route is already preloaded, return directly, preventing an extra load - return route.name if route_loaded? && route.present? - - # Similarly, we can allow the build if the parent is loaded - return build_full_name if parent_loaded? - - Gitlab::Cache.fetch_once([cache_key, :full_name]) do - route&.name || build_full_name - end + full_attribute(:name) end def full_path - # We have to test for persistence as the cache key uses #updated_at - return (route&.path || build_full_path) unless persisted? && Feature.enabled?(:cached_route_lookups, self, type: :ops) - - # Return the path as-is if the parent is missing - return path if route.nil? && parent.nil? && path.present? - - # If the route is already preloaded, return directly, preventing an extra load - return route.path if route_loaded? && route.present? - - # Similarly, we can allow the build if the parent is loaded - return build_full_path if parent_loaded? - - Gitlab::Cache.fetch_once([cache_key, :full_path]) do - route&.path || build_full_path - end + full_attribute(:path) end # Overriden in the Project model @@ -163,6 +135,31 @@ module Routable private + # rubocop: disable GitlabSecurity/PublicSend + def full_attribute(attribute) + attribute_from_route_or_self = ->(attribute) do + route&.public_send(attribute) || send("build_full_#{attribute}") + end + + unless persisted? && Feature.enabled?(:cached_route_lookups, self, type: :ops) + return attribute_from_route_or_self.call(attribute) + end + + # Return the attribute as-is if the parent is missing + return public_send(attribute) if route.nil? && parent.nil? && public_send(attribute).present? + + # If the route is already preloaded, return directly, preventing an extra load + return route.public_send(attribute) if route_loaded? && route.present? && route.public_send(attribute) + + # Similarly, we can allow the build if the parent is loaded + return send("build_full_#{attribute}") if parent_loaded? + + Gitlab::Cache.fetch_once([cache_key, :"full_#{attribute}"]) do + attribute_from_route_or_self.call(attribute) + end + end + # rubocop: enable GitlabSecurity/PublicSend + def set_path_errors route_path_errors = self.errors.delete(:"route.path") route_path_errors&.each do |msg| diff --git a/app/models/concerns/subscribable.rb b/app/models/concerns/subscribable.rb index 5a10ea7a248..fe47393c554 100644 --- a/app/models/concerns/subscribable.rb +++ b/app/models/concerns/subscribable.rb @@ -27,8 +27,6 @@ module Subscribable def lazy_subscription(user, project = nil) return unless user - # handle project and group labels as well as issuable subscriptions - subscribable_type = self.class.ancestors.include?(Label) ? 'Label' : self.class.name BatchLoader.for(id: id, subscribable_type: subscribable_type, project_id: project&.id).batch do |items, loader| values = items.each_with_object({ ids: Set.new, subscribable_types: Set.new, project_ids: Set.new }) do |item, result| result[:ids] << item[:id] @@ -121,4 +119,15 @@ module Subscribable subscriptions .where(t[:project_id].eq(nil).or(t[:project_id].eq(project.try(:id)))) end + + def subscribable_type + # handle project and group labels as well as issuable subscriptions + if self.class.ancestors.include?(Label) + 'Label' + elsif self.class.ancestors.include?(Issue) + 'Issue' + else + self.class.name + end + end end diff --git a/app/models/concerns/token_authenticatable_strategies/base.rb b/app/models/concerns/token_authenticatable_strategies/base.rb index 2b677f37c89..d0085b60d98 100644 --- a/app/models/concerns/token_authenticatable_strategies/base.rb +++ b/app/models/concerns/token_authenticatable_strategies/base.rb @@ -31,9 +31,13 @@ module TokenAuthenticatableStrategies result end - # Default implementation returns the token as-is + # If a `format_with_prefix` option is provided, it applies and returns the formatted token. + # Otherwise, default implementation returns the token as-is def format_token(instance, token) - instance.send("format_#{@token_field}", token) # rubocop:disable GitlabSecurity/PublicSend + prefix = prefix_for(instance) + prefixed_token = prefix ? "#{prefix}#{token}" : token + + instance.send("format_#{@token_field}", prefixed_token) # rubocop:disable GitlabSecurity/PublicSend end def ensure_token(instance) @@ -88,6 +92,17 @@ module TokenAuthenticatableStrategies protected + def prefix_for(instance) + case prefix_option = options[:format_with_prefix] + when nil + nil + when Symbol + instance.send(prefix_option) # rubocop:disable GitlabSecurity/PublicSend + else + raise NotImplementedError + end + end + def write_new_token(instance) new_token = generate_available_token formatted_token = format_token(instance, new_token) diff --git a/app/models/concerns/token_authenticatable_strategies/encrypted.rb b/app/models/concerns/token_authenticatable_strategies/encrypted.rb index 1db88c27181..4b3b80437db 100644 --- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb +++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb @@ -106,11 +106,7 @@ module TokenAuthenticatableStrategies end def matches_prefix?(instance, token) - prefix = options[:prefix] - prefix = prefix.call(instance) if prefix.is_a?(Proc) - prefix = '' unless prefix.is_a?(String) - - token.start_with?(prefix) + !options[:require_prefix_for_validation] || token.start_with?(prefix_for(instance)) end def token_set?(instance) diff --git a/app/models/concerns/token_authenticatable_strategies/encryption_helper.rb b/app/models/concerns/token_authenticatable_strategies/encryption_helper.rb index 447521ad8c1..5e77dfde397 100644 --- a/app/models/concerns/token_authenticatable_strategies/encryption_helper.rb +++ b/app/models/concerns/token_authenticatable_strategies/encryption_helper.rb @@ -20,8 +20,6 @@ module TokenAuthenticatableStrategies end def self.encrypt_token(plaintext_token) - return Gitlab::CryptoHelper.aes256_gcm_encrypt(plaintext_token) unless Feature.enabled?(:dynamic_nonce, type: :ops) - iv = ::Digest::SHA256.hexdigest(plaintext_token).bytes.take(NONCE_SIZE).pack('c*') token = Gitlab::CryptoHelper.aes256_gcm_encrypt(plaintext_token, nonce: iv) "#{DYNAMIC_NONCE_IDENTIFIER}#{token}#{iv}" diff --git a/app/models/concerns/uniquify.rb b/app/models/concerns/uniquify.rb deleted file mode 100644 index 382e826ec58..00000000000 --- a/app/models/concerns/uniquify.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -# Uniquify -# -# Return a version of the given 'base' string that is unique -# by appending a counter to it. Uniqueness is determined by -# repeated calls to the passed block. -# -# You can pass an initial value for the counter, if not given -# counting starts from 1. -# -# If `base` is a function/proc, we expect that calling it with a -# candidate counter returns a string to test/return. -class Uniquify - def initialize(counter = nil) - @counter = counter - end - - def string(base) - @base = base - - increment_counter! while yield(base_string) - base_string - end - - private - - def base_string - if @base.respond_to?(:call) - @base.call(@counter) - else - "#{@base}#{@counter}" - end - end - - def increment_counter! - @counter ||= 0 - @counter += 1 - end -end diff --git a/app/models/concerns/web_hooks/auto_disabling.rb b/app/models/concerns/web_hooks/auto_disabling.rb index 2cc17a6f185..05aaca32f35 100644 --- a/app/models/concerns/web_hooks/auto_disabling.rb +++ b/app/models/concerns/web_hooks/auto_disabling.rb @@ -4,7 +4,32 @@ module WebHooks module AutoDisabling extend ActiveSupport::Concern + ENABLED_HOOK_TYPES = %w[ProjectHook].freeze + MAX_FAILURES = 100 + FAILURE_THRESHOLD = 3 + EXCEEDED_FAILURE_THRESHOLD = FAILURE_THRESHOLD + 1 + INITIAL_BACKOFF = 1.minute.freeze + MAX_BACKOFF = 1.day.freeze + BACKOFF_GROWTH_FACTOR = 2.0 + + class_methods do + def auto_disabling_enabled? + enabled_hook_types.include?(name) && + Gitlab::SafeRequestStore.fetch(:auto_disabling_web_hooks) do + Feature.enabled?(:auto_disabling_web_hooks, type: :ops) + end + end + + private + + def enabled_hook_types + ENABLED_HOOK_TYPES + end + end + included do + delegate :auto_disabling_enabled?, to: :class, private: true + # A hook is disabled if: # # - we are no longer in the grace-perod (recent_failures > ?) @@ -12,8 +37,10 @@ module WebHooks # - disabled_until is nil (i.e. this was set by WebHook#fail!) # - or disabled_until is in the future (i.e. this was set by WebHook#backoff!) scope :disabled, -> do + return none unless auto_disabling_enabled? + where('recent_failures > ? AND (disabled_until IS NULL OR disabled_until >= ?)', - WebHook::FAILURE_THRESHOLD, Time.current) + FAILURE_THRESHOLD, Time.current) end # A hook is executable if: @@ -23,40 +50,81 @@ module WebHooks # - disabled_until is nil (i.e. this was set by WebHook#fail!) # - disabled_until is in the future (i.e. this was set by WebHook#backoff!) scope :executable, -> do + return all unless auto_disabling_enabled? + where('recent_failures <= ? OR (recent_failures > ? AND (disabled_until IS NOT NULL) AND (disabled_until < ?))', - WebHook::FAILURE_THRESHOLD, WebHook::FAILURE_THRESHOLD, Time.current) + FAILURE_THRESHOLD, FAILURE_THRESHOLD, Time.current) end end def executable? + return true unless auto_disabling_enabled? + !temporarily_disabled? && !permanently_disabled? end def temporarily_disabled? - return false if recent_failures <= WebHook::FAILURE_THRESHOLD + return false unless auto_disabling_enabled? - disabled_until.present? && disabled_until >= Time.current + disabled_until.present? && disabled_until >= Time.current && recent_failures > FAILURE_THRESHOLD end def permanently_disabled? - return false if disabled_until.present? + return false unless auto_disabling_enabled? - recent_failures > WebHook::FAILURE_THRESHOLD + recent_failures > FAILURE_THRESHOLD && disabled_until.blank? end def disable! - return if permanently_disabled? + return if !auto_disabling_enabled? || permanently_disabled? - super + update_attribute(:recent_failures, EXCEEDED_FAILURE_THRESHOLD) end + def enable! + return unless auto_disabling_enabled? + return if recent_failures == 0 && disabled_until.nil? && backoff_count == 0 + + assign_attributes(recent_failures: 0, disabled_until: nil, backoff_count: 0) + save(validate: false) + end + + # Don't actually back-off until FAILURE_THRESHOLD failures have been seen + # we mark the grace-period using the recent_failures counter def backoff! - return if permanently_disabled? || (backoff_count >= WebHook::MAX_FAILURES && temporarily_disabled?) + return unless auto_disabling_enabled? + return if permanently_disabled? || (backoff_count >= MAX_FAILURES && temporarily_disabled?) + + attrs = { recent_failures: next_failure_count } - super + if recent_failures >= FAILURE_THRESHOLD + attrs[:backoff_count] = next_backoff_count + attrs[:disabled_until] = next_backoff.from_now + end + + assign_attributes(attrs) + save(validate: false) if changed? + end + + def failed! + return unless auto_disabling_enabled? + return unless recent_failures < MAX_FAILURES + + assign_attributes(disabled_until: nil, backoff_count: 0, recent_failures: next_failure_count) + save(validate: false) + end + + def next_backoff + return MAX_BACKOFF if backoff_count >= 8 # optimization to prevent expensive exponentiation and possible overflows + + (INITIAL_BACKOFF * (BACKOFF_GROWTH_FACTOR**backoff_count)) + .clamp(INITIAL_BACKOFF, MAX_BACKOFF) + .seconds end def alert_status + return :executable unless auto_disabling_enabled? + if temporarily_disabled? :temporarily_disabled elsif permanently_disabled? @@ -65,5 +133,18 @@ module WebHooks :executable end end + + private + + def next_failure_count + recent_failures.succ.clamp(1, MAX_FAILURES) + end + + def next_backoff_count + backoff_count.succ.clamp(1, MAX_FAILURES) + end end end + +WebHooks::AutoDisabling.prepend_mod +WebHooks::AutoDisabling::ClassMethods.prepend_mod diff --git a/app/models/concerns/web_hooks/has_web_hooks.rb b/app/models/concerns/web_hooks/has_web_hooks.rb index 161ce106b9b..2183cc3c44b 100644 --- a/app/models/concerns/web_hooks/has_web_hooks.rb +++ b/app/models/concerns/web_hooks/has_web_hooks.rb @@ -2,8 +2,6 @@ module WebHooks module HasWebHooks - extend ActiveSupport::Concern - WEB_HOOK_CACHE_EXPIRY = 1.hour def any_hook_failed? @@ -15,7 +13,7 @@ module WebHooks end def last_failure_redis_key - "web_hooks:last_failure:project-#{id}" + "web_hooks:last_failure:#{self.class.name.underscore}-#{id}" end def get_web_hook_failure @@ -42,5 +40,13 @@ module WebHooks state end end + + def last_webhook_failure + last_failure = Gitlab::Redis::SharedState.with do |redis| + redis.get(last_failure_redis_key) + end + + DateTime.parse(last_failure) if last_failure + end end end diff --git a/app/models/concerns/web_hooks/unstoppable.rb b/app/models/concerns/web_hooks/unstoppable.rb deleted file mode 100644 index 26284fe3c36..00000000000 --- a/app/models/concerns/web_hooks/unstoppable.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -module WebHooks - module Unstoppable - extend ActiveSupport::Concern - - included do - scope :executable, -> { all } - - scope :disabled, -> { none } - end - - def executable? - true - end - - def temporarily_disabled? - false - end - - def permanently_disabled? - false - end - - def alert_status - :executable - end - end -end diff --git a/app/models/container_registry/data_repair_detail.rb b/app/models/container_registry/data_repair_detail.rb new file mode 100644 index 00000000000..09e617e69f5 --- /dev/null +++ b/app/models/container_registry/data_repair_detail.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +module ContainerRegistry + class DataRepairDetail < ApplicationRecord + self.table_name = 'container_registry_data_repair_details' + self.primary_key = :project_id + + belongs_to :project, optional: false + end +end diff --git a/app/models/container_registry/event.rb b/app/models/container_registry/event.rb index c4d06be8841..dd2675e17d8 100644 --- a/app/models/container_registry/event.rb +++ b/app/models/container_registry/event.rb @@ -8,7 +8,7 @@ module ContainerRegistry PUSH_ACTION = 'push' DELETE_ACTION = 'delete' EVENT_TRACKING_CATEGORY = 'container_registry:notification' - EVENT_PREFIX = "i_container_registry" + EVENT_PREFIX = 'i_container_registry' ALLOWED_ACTOR_TYPES = %w( personal_access_token @@ -48,8 +48,12 @@ module ContainerRegistry ::Gitlab::Tracking.event(EVENT_TRACKING_CATEGORY, tracking_action) - event = usage_data_event_for(tracking_action) - ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event, values: originator.id) if event + if manifest_delete_event? + ::Gitlab::UsageDataCounters::ContainerRegistryEventCounter.count("#{EVENT_PREFIX}_delete_manifest") + else + event = usage_data_event_for(tracking_action) + ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event, values: originator.id) if event + end end private @@ -122,9 +126,13 @@ module ContainerRegistry end end + def manifest_delete_event? + action_delete? && target_digest? + end + def update_project_statistics return unless supported? - return unless target_tag? || (action_delete? && target_digest?) + return unless target_tag? || manifest_delete_event? return unless project Rails.cache.delete(project.root_ancestor.container_repositories_size_cache_key) diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 98ce981ad8e..b3cbe498551 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -69,7 +69,7 @@ class ContainerRepository < ApplicationRecord scope :with_migration_import_started_at_nil_or_before, ->(timestamp) { where("COALESCE(migration_import_started_at, '01-01-1970') < ?", timestamp) } scope :with_migration_pre_import_started_at_nil_or_before, ->(timestamp) { where("COALESCE(migration_pre_import_started_at, '01-01-1970') < ?", timestamp) } scope :with_migration_pre_import_done_at_nil_or_before, ->(timestamp) { where("COALESCE(migration_pre_import_done_at, '01-01-1970') < ?", timestamp) } - scope :with_stale_ongoing_cleanup, ->(threshold) { cleanup_ongoing.where('expiration_policy_started_at < ?', threshold) } + scope :with_stale_ongoing_cleanup, ->(threshold) { cleanup_ongoing.expiration_policy_started_at_nil_or_before(threshold) } scope :with_stale_delete_at, ->(threshold) { where('delete_started_at < ?', threshold) } scope :import_in_process, -> { where(migration_state: %w[pre_importing pre_import_done importing]) } @@ -395,7 +395,7 @@ class ContainerRepository < ApplicationRecord end def migrated? - (self.created_at && MIGRATION_PHASE_1_ENDED_AT < self.created_at) || import_done? + Gitlab.com? end def last_import_step_done_at @@ -509,7 +509,11 @@ class ContainerRepository < ApplicationRecord end def start_expiration_policy! - update!(expiration_policy_started_at: Time.zone.now, last_cleanup_deleted_tags_count: nil) + update!( + expiration_policy_started_at: Time.zone.now, + last_cleanup_deleted_tags_count: nil, + expiration_policy_cleanup_status: :cleanup_ongoing + ) end def size diff --git a/app/models/dependency_proxy/manifest.rb b/app/models/dependency_proxy/manifest.rb index 5ad746e4cd1..11fe0503f50 100644 --- a/app/models/dependency_proxy/manifest.rb +++ b/app/models/dependency_proxy/manifest.rb @@ -12,6 +12,11 @@ class DependencyProxy::Manifest < ApplicationRecord MAX_FILE_SIZE = 10.megabytes.freeze DIGEST_HEADER = 'Docker-Content-Digest' + ACCEPTED_TYPES = [ + ContainerRegistry::BaseClient::DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE, + ContainerRegistry::BaseClient::OCI_MANIFEST_V1_TYPE, + ContainerRegistry::BaseClient::OCI_DISTRIBUTION_INDEX_TYPE + ].freeze validates :group, presence: true validates :file, presence: true diff --git a/app/models/dependency_proxy/registry.rb b/app/models/dependency_proxy/registry.rb index 6492acf325a..3073dd59c7b 100644 --- a/app/models/dependency_proxy/registry.rb +++ b/app/models/dependency_proxy/registry.rb @@ -33,3 +33,5 @@ class DependencyProxy::Registry end end end + +::DependencyProxy::Registry.prepend_mod diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb index 317399e780a..cb6d4e72c80 100644 --- a/app/models/design_management/design.rb +++ b/app/models/design_management/design.rb @@ -13,6 +13,9 @@ module DesignManagement include RelativePositioning include Todoable include Participable + include CacheMarkdownField + + cache_markdown_field :description belongs_to :project, inverse_of: :designs belongs_to :issue @@ -34,6 +37,7 @@ module DesignManagement validates :project, :filename, presence: true validates :issue, presence: true, unless: :importing? validates :filename, uniqueness: { scope: :issue_id }, length: { maximum: 255 } + validates :description, length: { maximum: Gitlab::Database::MAX_TEXT_SIZE_LIMIT } validate :validate_file_is_image alias_attribute :title, :filename @@ -43,7 +47,7 @@ module DesignManagement # Pre-fetching scope to include the data necessary to construct a # reference using `to_reference`. - scope :for_reference, -> { includes(issue: [{ project: [:route, :namespace] }]) } + scope :for_reference, -> { includes(issue: [{ namespace: :project }, { project: [:route, :namespace] }]) } # A design can be uniquely identified by issue_id and filename # Takes one or more sets of composite IDs of the form: @@ -174,7 +178,7 @@ module DesignManagement (?<url_filename> #{valid_char}+ \. #{ext}) }x - super(path_segment, filename_pattern) + compose_link_reference_pattern(path_segment, filename_pattern) end end @@ -182,10 +186,6 @@ module DesignManagement File.join(DesignManagement.designs_directory, "issue-#{issue.iid}", design.filename) end - def description - '' - end - def new_design? strong_memoize(:new_design) { actions.none? } end diff --git a/app/models/draft_note.rb b/app/models/draft_note.rb index 9f7977fce68..ffc04f9bf90 100644 --- a/app/models/draft_note.rb +++ b/app/models/draft_note.rb @@ -108,7 +108,7 @@ class DraftNote < ApplicationRecord end def self.preload_author(draft_notes) - ActiveRecord::Associations::Preloader.new.preload(draft_notes, { author: :status }) + ActiveRecord::Associations::Preloader.new(records: draft_notes, associations: { author: :status }).call end def diff_file diff --git a/app/models/error_tracking/project_error_tracking_setting.rb b/app/models/error_tracking/project_error_tracking_setting.rb index 1c7a8d93e6e..c52f8a58c00 100644 --- a/app/models/error_tracking/project_error_tracking_setting.rb +++ b/app/models/error_tracking/project_error_tracking_setting.rb @@ -145,7 +145,7 @@ module ErrorTracking ensure_issue_belongs_to_project!(issue_to_be_updated.project_id) handle_exceptions do - { updated: sentry_client.update_issue(opts) } + { updated: sentry_client.update_issue(**opts) } end end diff --git a/app/models/group.rb b/app/models/group.rb index 7e09280dfff..01e2c220dbe 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -7,7 +7,6 @@ class Group < Namespace include AfterCommitQueue include AccessRequestable include Avatarable - include Referable include SelectForProjectAuthorization include LoadedInGroupList include GroupDescendant @@ -21,7 +20,6 @@ class Group < Namespace include ChronicDurationAttribute include RunnerTokenExpirationInterval include Todoable - include IssueParent extend ::Gitlab::Utils::Override @@ -110,7 +108,10 @@ class Group < Namespace has_one :import_state, class_name: 'GroupImportState', inverse_of: :group + has_many :application_setting, foreign_key: :instance_administrators_group_id, inverse_of: :instance_group + has_many :bulk_import_exports, class_name: 'BulkImports::Export', inverse_of: :group + has_many :bulk_import_entities, class_name: 'BulkImports::Entity', foreign_key: :namespace_id, inverse_of: :group has_many :group_deploy_keys_groups, inverse_of: :group has_many :group_deploy_keys, through: :group_deploy_keys_groups @@ -162,7 +163,8 @@ class Group < Namespace add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:groups_tokens_optional_encryption) ? :optional : :required }, - prefix: RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX + format_with_prefix: :runners_token_prefix, + require_prefix_for_validation: true after_create :post_create_hook after_create -> { create_or_load_association(:group_feature) } @@ -240,14 +242,6 @@ class Group < Namespace end end - def reference_prefix - User.reference_prefix - end - - def reference_pattern - User.reference_pattern - end - # WARNING: This method should never be used on its own # please do make sure the number of rows you are filtering is small # enough for this query @@ -364,10 +358,6 @@ class Group < Namespace notification_settings.find { |n| n.notification_email.present? }&.notification_email end - def to_reference(_from = nil, target_project: nil, full: nil) - "#{self.class.reference_prefix}#{full_path}" - end - def web_url(only_path: nil) Gitlab::UrlBuilder.build(self, only_path: only_path) end @@ -762,11 +752,6 @@ class Group < Namespace ensure_runners_token! end - override :format_runners_token - def format_runners_token(token) - "#{RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX}#{token}" - end - def project_creation_level super || ::Gitlab::CurrentSettings.default_project_creation end @@ -814,8 +799,10 @@ class Group < Namespace end def preload_shared_group_links - preloader = ActiveRecord::Associations::Preloader.new - preloader.preload(self, shared_with_group_links: [shared_with_group: :route]) + ActiveRecord::Associations::Preloader.new( + records: [self], + associations: { shared_with_group_links: [shared_with_group: :route] } + ).call end def update_shared_runners_setting!(state) @@ -1095,6 +1082,10 @@ class Group < Namespace def enable_shared_runners! update!(shared_runners_enabled: true) end + + def runners_token_prefix + RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX + end end Group.prepend_mod_with('Group') diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index 8e9a74a68d0..695041f0247 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -2,7 +2,6 @@ class ProjectHook < WebHook include TriggerableHooks - include WebHooks::AutoDisabling include Presentable include Limitable extend ::Gitlab::Utils::Override diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb index 6af70c249a0..453b986ca4d 100644 --- a/app/models/hooks/service_hook.rb +++ b/app/models/hooks/service_hook.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true class ServiceHook < WebHook - include WebHooks::Unstoppable include Presentable extend ::Gitlab::Utils::Override diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index eaffe83cab3..3c7f0ef9ffc 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -2,7 +2,6 @@ class SystemHook < WebHook include TriggerableHooks - include WebHooks::Unstoppable triggerable_hooks [ :repository_update_hooks, diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 819152a38c8..7e55ffe2e5e 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -2,15 +2,10 @@ class WebHook < ApplicationRecord include Sortable + include WebHooks::AutoDisabling InterpolationError = Class.new(StandardError) - MAX_FAILURES = 100 - FAILURE_THRESHOLD = 3 # three strikes - EXCEEDED_FAILURE_THRESHOLD = FAILURE_THRESHOLD + 1 - INITIAL_BACKOFF = 1.minute - MAX_BACKOFF = 1.day - BACKOFF_GROWTH_FACTOR = 2.0 SECRET_MASK = '************' attr_encrypted :token, @@ -78,46 +73,6 @@ class WebHook < ApplicationRecord 'user/project/integrations/webhooks' end - def next_backoff - return MAX_BACKOFF if backoff_count >= 8 # optimization to prevent expensive exponentiation and possible overflows - - (INITIAL_BACKOFF * (BACKOFF_GROWTH_FACTOR**backoff_count)) - .clamp(INITIAL_BACKOFF, MAX_BACKOFF) - .seconds - end - - def disable! - update_attribute(:recent_failures, EXCEEDED_FAILURE_THRESHOLD) - end - - def enable! - return if recent_failures == 0 && disabled_until.nil? && backoff_count == 0 - - assign_attributes(recent_failures: 0, disabled_until: nil, backoff_count: 0) - save(validate: false) - end - - # Don't actually back-off until FAILURE_THRESHOLD failures have been seen - # we mark the grace-period using the recent_failures counter - def backoff! - attrs = { recent_failures: next_failure_count } - - if recent_failures >= FAILURE_THRESHOLD - attrs[:backoff_count] = next_backoff_count - attrs[:disabled_until] = next_backoff.from_now - end - - assign_attributes(attrs) - save(validate: false) if changed? - end - - def failed! - return unless recent_failures < MAX_FAILURES - - assign_attributes(disabled_until: nil, backoff_count: 0, recent_failures: next_failure_count) - save(validate: false) - end - # @return [Boolean] Whether or not the WebHook is currently throttled. def rate_limited? rate_limiter.rate_limited? @@ -179,14 +134,6 @@ class WebHook < ApplicationRecord self.url_variables = {} if url_changed? && !encrypted_url_variables_changed? end - def next_failure_count - recent_failures.succ.clamp(1, MAX_FAILURES) - end - - def next_backoff_count - backoff_count.succ.clamp(1, MAX_FAILURES) - end - def initialize_url_variables self.url_variables = {} if encrypted_url_variables.nil? end diff --git a/app/models/import_failure.rb b/app/models/import_failure.rb index 109c0c82487..0ca99faeb71 100644 --- a/app/models/import_failure.rb +++ b/app/models/import_failure.rb @@ -6,6 +6,7 @@ class ImportFailure < ApplicationRecord validates :project, presence: true, unless: :group validates :group, presence: true, unless: :project + validates :external_identifiers, json_schema: { filename: "import_failure_external_identifiers" } # Returns any `import_failures` for relations that were unrecoverable errors or failed after # several retries. An import can be successful even if some relations failed to import correctly. @@ -13,4 +14,8 @@ class ImportFailure < ApplicationRecord scope :hard_failures_by_correlation_id, ->(correlation_id) { where(correlation_id_value: correlation_id, retry_count: 0).order(created_at: :desc) } + + scope :failures_by_correlation_id, ->(correlation_id) { + where(correlation_id_value: correlation_id).order(created_at: :desc) + } end diff --git a/app/models/integration.rb b/app/models/integration.rb index d3006f00ba1..860739fe5aa 100644 --- a/app/models/integration.rb +++ b/app/models/integration.rb @@ -21,13 +21,14 @@ class Integration < ApplicationRecord asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord drone_ci emails_on_push ewm external_wiki hangouts_chat harbor irker jira mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email - pivotaltracker prometheus pumble pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack zentao + pivotaltracker prometheus pumble pushover redmine slack slack_slash_commands squash_tm teamcity + unify_circuit webex_teams youtrack zentao ].freeze # TODO Shimo is temporary disabled on group and instance-levels. # See: https://gitlab.com/gitlab-org/gitlab/-/issues/345677 PROJECT_SPECIFIC_INTEGRATION_NAMES = %w[ - apple_app_store jenkins shimo + apple_app_store google_play jenkins shimo ].freeze # Fake integrations to help with local development. diff --git a/app/models/integrations/apple_app_store.rb b/app/models/integrations/apple_app_store.rb index 84185542939..34da4c0f4b8 100644 --- a/app/models/integrations/apple_app_store.rb +++ b/app/models/integrations/apple_app_store.rb @@ -7,10 +7,13 @@ module Integrations ISSUER_ID_REGEX = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/.freeze KEY_ID_REGEX = /\A(?=.*[A-Z])(?=.*[0-9])[A-Z0-9]+\z/.freeze + SECTION_TYPE_APPLE_APP_STORE = 'apple_app_store' + with_options if: :activated? do validates :app_store_issuer_id, presence: true, format: { with: ISSUER_ID_REGEX } validates :app_store_key_id, presence: true, format: { with: KEY_ID_REGEX } validates :app_store_private_key, presence: true, certificate_key: true + validates :app_store_private_key_file_name, presence: true end field :app_store_issuer_id, @@ -24,13 +27,12 @@ module Integrations title: -> { s_('AppleAppStore|The Apple App Store Connect Key ID.') }, is_secret: false - field :app_store_private_key, + field :app_store_private_key_file_name, section: SECTION_TYPE_CONNECTION, - required: true, - type: 'textarea', - title: -> { s_('AppleAppStore|The Apple App Store Connect Private Key.') }, is_secret: false + field :app_store_private_key, api_only: true, is_secret: false + def title 'Apple App Store Connect' end @@ -69,7 +71,7 @@ module Integrations def sections [ { - type: SECTION_TYPE_CONNECTION, + type: SECTION_TYPE_APPLE_APP_STORE, title: s_('Integrations|Integration details'), description: help } @@ -99,13 +101,11 @@ module Integrations private def client - config = { + AppStoreConnect::Client.new( issuer_id: app_store_issuer_id, key_id: app_store_key_id, private_key: app_store_private_key - } - - AppStoreConnect::Client.new(config) + ) end end end diff --git a/app/models/integrations/base_slack_notification.rb b/app/models/integrations/base_slack_notification.rb index 7a2a91aa0d2..c83a559e0da 100644 --- a/app/models/integrations/base_slack_notification.rb +++ b/app/models/integrations/base_slack_notification.rb @@ -44,8 +44,6 @@ module Integrations Gitlab::UsageDataCounters::HLLRedisCounter.track_event(key, values: user_id) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2) - optional_arguments = { project: project, namespace: group || project&.namespace diff --git a/app/models/integrations/base_slash_commands.rb b/app/models/integrations/base_slash_commands.rb index 619579a543a..7662da933ba 100644 --- a/app/models/integrations/base_slash_commands.rb +++ b/app/models/integrations/base_slash_commands.rb @@ -6,10 +6,6 @@ module Integrations class BaseSlashCommands < Integration attribute :category, default: 'chat' - prop_accessor :token - - has_many :chat_names, foreign_key: :integration_id, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - def valid_token?(token) self.respond_to?(:token) && self.token.present? && @@ -24,18 +20,6 @@ module Integrations false end - def fields - [ - { - type: 'password', - name: 'token', - non_empty_password_title: s_('ProjectService|Enter new token'), - non_empty_password_help: s_('ProjectService|Leave blank to use your current token.'), - placeholder: 'XXxxXXxxXXxxXXxxXXxxXXxx' - } - ] - end - def trigger(params) return unless valid_token?(params[:token]) diff --git a/app/models/integrations/campfire.rb b/app/models/integrations/campfire.rb index 3f7fa1c51b2..9b837faf79b 100644 --- a/app/models/integrations/campfire.rb +++ b/app/models/integrations/campfire.rb @@ -68,7 +68,7 @@ module Integrations def execute(data) return unless supported_events.include?(data[:object_kind]) - message = build_message(data) + message = create_message(data) speak(self.room, message, auth) end @@ -116,7 +116,7 @@ module Integrations res.code == 200 ? res["rooms"] : [] end - def build_message(push) + def create_message(push) ref = Gitlab::Git.ref_name(push[:ref]) before = push[:before] after = push[:after] diff --git a/app/models/integrations/google_play.rb b/app/models/integrations/google_play.rb new file mode 100644 index 00000000000..8f1d2e7e1ec --- /dev/null +++ b/app/models/integrations/google_play.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true + +module Integrations + class GooglePlay < Integration + SECTION_TYPE_GOOGLE_PLAY = 'google_play' + + with_options if: :activated? do + validates :service_account_key, presence: true, json_schema: { + filename: "google_service_account_key", parse_json: true + } + validates :service_account_key_file_name, presence: true + end + + field :service_account_key_file_name, + section: SECTION_TYPE_CONNECTION, + required: true, + is_secret: false + + field :service_account_key, api_only: true, is_secret: false + + def title + s_('GooglePlay|Google Play') + end + + def description + s_('GooglePlay|Use GitLab to build and release an app in Google Play.') + end + + def help + variable_list = [ + '<code>SUPPLY_JSON_KEY_DATA</code>' + ] + + # rubocop:disable Layout/LineLength + texts = [ + s_("Use the Google Play integration to connect to Google Play with fastlane in CI/CD pipelines."), + s_("After you enable the integration, the following protected variable is created for CI/CD use:"), + variable_list.join('<br>'), + s_(format("To generate a Google Play service account key and use this integration, see the <a href='%{url}' target='_blank'>integration documentation</a>.", url: "#")).html_safe + ] + # rubocop:enable Layout/LineLength + + texts.join('<br><br>'.html_safe) + end + + def self.to_param + 'google_play' + end + + def self.supported_events + [] + end + + def sections + [ + { + type: SECTION_TYPE_GOOGLE_PLAY, + title: s_('Integrations|Integration details'), + description: help + } + ] + end + + def test(*_args) + client.fetch_access_token! + { success: true } + rescue Signet::AuthorizationError => error + { success: false, message: error } + end + + def ci_variables + return [] unless activated? + + [ + { key: 'SUPPLY_JSON_KEY_DATA', value: service_account_key, masked: true, public: false } + ] + end + + private + + def client + Google::Auth::ServiceAccountCredentials.make_creds( + json_key_io: StringIO.new(service_account_key), + scope: ['https://www.googleapis.com/auth/androidpublisher'] + ) + end + end +end diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb index d96a848c72e..a1cdd55ceae 100644 --- a/app/models/integrations/jira.rb +++ b/app/models/integrations/jira.rb @@ -391,8 +391,6 @@ module Integrations Gitlab::UsageDataCounters::HLLRedisCounter.track_event(key, values: user.id) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2) - optional_arguments = { project: project, namespace: group || project&.namespace diff --git a/app/models/integrations/mattermost_slash_commands.rb b/app/models/integrations/mattermost_slash_commands.rb index 30a8ba973c1..f5079b9b907 100644 --- a/app/models/integrations/mattermost_slash_commands.rb +++ b/app/models/integrations/mattermost_slash_commands.rb @@ -4,7 +4,11 @@ module Integrations class MattermostSlashCommands < BaseSlashCommands include Ci::TriggersHelper - prop_accessor :token + field :token, + type: 'password', + non_empty_password_title: -> { s_('ProjectService|Enter new token') }, + non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, + placeholder: '' def testable? false @@ -37,10 +41,6 @@ module Integrations [[], e.message] end - def chat_responder - ::Gitlab::Chat::Responder::Mattermost - end - private def command(params) diff --git a/app/models/integrations/slack_slash_commands.rb b/app/models/integrations/slack_slash_commands.rb index 72e3c4a8cbc..343c8d68166 100644 --- a/app/models/integrations/slack_slash_commands.rb +++ b/app/models/integrations/slack_slash_commands.rb @@ -4,6 +4,12 @@ module Integrations class SlackSlashCommands < BaseSlashCommands include Ci::TriggersHelper + field :token, + type: 'password', + non_empty_password_title: -> { s_('ProjectService|Enter new token') }, + non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, + placeholder: '' + def title 'Slack slash commands' end @@ -23,10 +29,6 @@ module Integrations end end - def chat_responder - ::Gitlab::Chat::Responder::Slack - end - private def format(text) diff --git a/app/models/integrations/squash_tm.rb b/app/models/integrations/squash_tm.rb new file mode 100644 index 00000000000..e0a63b5ae6a --- /dev/null +++ b/app/models/integrations/squash_tm.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +module Integrations + class SquashTm < Integration + include HasWebHook + + field :url, + placeholder: 'https://your-instance.squashcloud.io/squash/plugin/xsquash4gitlab/webhook/issue', + title: -> { s_('SquashTmIntegration|Squash TM webhook URL') }, + exposes_secrets: true, + required: true + + field :token, + type: 'password', + title: -> { s_('SquashTmIntegration|Secret token (optional)') }, + non_empty_password_title: -> { s_('ProjectService|Enter new token') }, + non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, + required: false + + with_options if: :activated? do + validates :url, presence: true, public_url: true + validates :token, length: { maximum: 255 }, allow_blank: true + end + + def title + 'Squash TM' + end + + def description + s_("SquashTmIntegration|Update Squash TM requirements when GitLab issues are modified.") + end + + def help + docs_link = ActionController::Base.helpers.link_to( + _('Learn more.'), + Rails.application.routes.url_helpers.help_page_url('user/project/integrations/squash_tm'), + target: '_blank', + rel: 'noopener noreferrer' + ) + + Kernel.format( + s_('SquashTmIntegration|Update Squash TM requirements when GitLab issues are modified. %{docs_link}'), + { docs_link: docs_link.html_safe } + ).html_safe + end + + def self.supported_events + %w[issue confidential_issue] + end + + def self.to_param + 'squash_tm' + end + + def self.default_test_event + 'issue' + end + + def execute(data) + return unless supported_events.include?(data[:object_kind]) + + execute_web_hook!(data, "#{data[:object_kind]} Hook") + end + + def test(data) + result = execute_web_hook!(data, "Test Configuration Hook") + + { success: result.payload[:http_status] == 200, result: result.message } + rescue StandardError => error + { success: false, result: error.message } + end + + override :hook_url + def hook_url + format("#{url}%s", ('?token={token}' unless token.blank?)) + end + + def url_variables + { 'token' => token }.compact + end + end +end diff --git a/app/models/issue.rb b/app/models/issue.rb index bea86168c8d..a19b5809ff8 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -63,7 +63,24 @@ class Issue < ApplicationRecord belongs_to :moved_to, class_name: 'Issue' has_one :moved_from, class_name: 'Issue', foreign_key: :moved_to_id - has_internal_id :iid, scope: :project, track_if: -> { !importing? } + has_internal_id :iid, scope: :namespace, track_if: -> { !importing? }, init: ->(issue, scope) do + # we need this init for the case where the IID allocation in internal_ids#last_value + # is higher than the actual issues.max(iid) value for a given project. For instance + # in case of an import where a batch of IIDs may be prealocated + # + # TODO: remove this once the UpdateIssuesInternalIdScope migration completes + if issue + [ + InternalId.where(project: issue.project, usage: :issues).pick(:last_value).to_i, + issue.namespace&.issues&.maximum(:iid).to_i + ].max + else + [ + InternalId.where(**scope, usage: :issues).pick(:last_value).to_i, + where(**scope).maximum(:iid).to_i + ].max + end + end has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent @@ -104,10 +121,11 @@ class Issue < ApplicationRecord accepts_nested_attributes_for :sentry_issue accepts_nested_attributes_for :incident_management_issuable_escalation_status, update_only: true - validates :project, presence: true + validates :project, presence: true, if: -> { !namespace || namespace.is_a?(Namespaces::ProjectNamespace) } validates :issue_type, presence: true validates :namespace, presence: true validates :work_item_type, presence: true + validates :confidential, inclusion: { in: [true, false], message: 'must be a boolean' } validate :allowed_work_item_type_change, on: :update, if: :work_item_type_id_changed? validate :due_date_after_start_date @@ -136,7 +154,7 @@ class Issue < ApplicationRecord scope :order_due_date_asc, -> { reorder(arel_table[:due_date].asc.nulls_last) } scope :order_due_date_desc, -> { reorder(arel_table[:due_date].desc.nulls_last) } - scope :order_closest_future_date, -> { reorder(Arel.sql('CASE WHEN issues.due_date >= CURRENT_DATE THEN 0 ELSE 1 END ASC, ABS(CURRENT_DATE - issues.due_date) ASC')) } + scope :order_closest_future_date, -> { reorder(Arel.sql("CASE WHEN issues.due_date >= CURRENT_DATE THEN 0 ELSE 1 END ASC, ABS(CURRENT_DATE - issues.due_date) ASC")) } scope :order_created_at_desc, -> { reorder(created_at: :desc) } scope :order_severity_asc, -> do build_keyset_order_on_joined_column( @@ -162,15 +180,15 @@ class Issue < ApplicationRecord scope :order_closed_at_desc, -> { reorder(arel_table[:closed_at].desc.nulls_last) } scope :preload_associated_models, -> { preload(:assignees, :labels, project: :namespace) } - scope :with_web_entity_associations, -> { preload(:author, project: [:project_feature, :route, namespace: :route]) } + scope :with_web_entity_associations, -> { preload(:author, :namespace, project: [:project_feature, :route, namespace: :route]) } scope :preload_awardable, -> { preload(:award_emoji) } scope :with_alert_management_alerts, -> { joins(:alert_management_alert) } scope :with_prometheus_alert_events, -> { joins(:issues_prometheus_alert_events) } scope :with_self_managed_prometheus_alert_events, -> { joins(:issues_self_managed_prometheus_alert_events) } scope :with_api_entity_associations, -> { - preload(:timelogs, :closed_by, :assignees, :author, :labels, :issuable_severity, + preload(:timelogs, :closed_by, :assignees, :author, :labels, :issuable_severity, namespace: [{ parent: :route }, :route], milestone: { project: [:route, { namespace: :route }] }, - project: [:project_feature, :route, { namespace: :route }], + project: [:project_namespace, :project_feature, :route, { group: :route }, { namespace: :route }], duplicated_to: { project: [:project_feature] }) } scope :with_issue_type, ->(types) { where(issue_type: types) } @@ -214,7 +232,7 @@ class Issue < ApplicationRecord before_validation :ensure_namespace_id, :ensure_work_item_type - after_save :ensure_metrics, unless: :importing? + after_save :ensure_metrics!, unless: :importing? after_commit :expire_etag_cache, unless: :importing? after_create_commit :record_create_action, unless: :importing? @@ -345,7 +363,7 @@ class Issue < ApplicationRecord end def self.link_reference_pattern - @link_reference_pattern ||= super(%r{issues(?:\/incident)?}, Gitlab::Regex.issue) + @link_reference_pattern ||= compose_link_reference_pattern(%r{issues(?:\/incident)?}, Gitlab::Regex.issue) end def self.reference_valid?(reference) @@ -450,7 +468,7 @@ class Issue < ApplicationRecord def to_reference(from = nil, full: false) reference = "#{self.class.reference_prefix}#{iid}" - "#{project.to_reference_base(from, full: full)}#{reference}" + "#{namespace.to_reference_base(from, full: full)}#{reference}" end def suggested_branch_name @@ -463,7 +481,7 @@ class Issue < ApplicationRecord "#{to_branch_name}-#{suffix}" end - Uniquify.new(start_counting_from).string(branch_name_generator) do |suggested_branch_name| + Gitlab::Utils::Uniquify.new(start_counting_from).string(branch_name_generator) do |suggested_branch_name| project.repository.branch_exists?(suggested_branch_name) end end @@ -722,8 +740,7 @@ class Issue < ApplicationRecord confidential_changed?(from: true, to: false) end - override :ensure_metrics - def ensure_metrics + def ensure_metrics! Issue::Metrics.record!(self) end diff --git a/app/models/member.rb b/app/models/member.rb index e97c9e929ac..4329b61fc3d 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -320,6 +320,12 @@ class Member < ApplicationRecord end end + def filter_by_user_type(value) + return unless ::User.user_types.key?(value) + + left_join_users.merge(::User.where(user_type: value)) + end + def sort_by_attribute(method) case method.to_s when 'access_level_asc' then reorder(access_level: :asc) diff --git a/app/models/members/member_role.rb b/app/models/members/member_role.rb deleted file mode 100644 index 42ce228c318..00000000000 --- a/app/models/members/member_role.rb +++ /dev/null @@ -1,49 +0,0 @@ -# frozen_string_literal: true - -class MemberRole < ApplicationRecord # rubocop:disable Gitlab/NamespacedClass - include IgnorableColumns - ignore_column :download_code, remove_with: '15.9', remove_after: '2023-01-22' - - has_many :members - belongs_to :namespace - - validates :namespace, presence: true - validates :base_access_level, presence: true - validate :belongs_to_top_level_namespace - validate :validate_namespace_locked, on: :update - validate :attributes_locked_after_member_associated, on: :update - - validates_associated :members - - before_destroy :prevent_delete_after_member_associated - - private - - def belongs_to_top_level_namespace - return if !namespace || namespace.root? - - errors.add(:namespace, s_("MemberRole|must be top-level namespace")) - end - - def validate_namespace_locked - return unless namespace_id_changed? - - errors.add(:namespace, s_("MemberRole|can't be changed")) - end - - def attributes_locked_after_member_associated - return unless members.present? - - errors.add(:base, s_("MemberRole|cannot be changed because it is already assigned to a user. "\ - "Please create a new Member Role instead")) - end - - def prevent_delete_after_member_associated - return unless members.present? - - errors.add(:base, s_("MemberRole|cannot be deleted because it is already assigned to a user. "\ - "Please disassociate the member role from all users before deletion.")) - - throw :abort # rubocop:disable Cop/BanCatchThrow - end -end diff --git a/app/models/members_preloader.rb b/app/models/members_preloader.rb index ba7e4b39989..f6617fa0888 100644 --- a/app/models/members_preloader.rb +++ b/app/models/members_preloader.rb @@ -8,12 +8,17 @@ class MembersPreloader end def preload_all - ActiveRecord::Associations::Preloader.new.preload(members, :user) - ActiveRecord::Associations::Preloader.new.preload(members, :source) - ActiveRecord::Associations::Preloader.new.preload(members, :created_by) - ActiveRecord::Associations::Preloader.new.preload(members, user: :status) - ActiveRecord::Associations::Preloader.new.preload(members, user: :u2f_registrations) - ActiveRecord::Associations::Preloader.new.preload(members, user: :webauthn_registrations) if Feature.enabled?(:webauthn) + user_associations = [:status] + user_associations << :webauthn_registrations if Feature.enabled?(:webauthn) + + ActiveRecord::Associations::Preloader.new( + records: members, + associations: [ + :source, + :created_by, + { user: user_associations } + ] + ).call end end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 485ca3a3850..85e95a556a8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -92,7 +92,7 @@ class MergeRequest < ApplicationRecord fallback || super || MergeRequestDiff.new(merge_request_id: id) end - belongs_to :head_pipeline, foreign_key: "head_pipeline_id", class_name: "Ci::Pipeline" + belongs_to :head_pipeline, class_name: "Ci::Pipeline", inverse_of: :merge_requests_as_head_pipeline has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent @@ -141,7 +141,7 @@ class MergeRequest < ApplicationRecord after_update :clear_memoized_shas after_update :reload_diff_if_branch_changed after_save :keep_around_commit, unless: :importing? - after_commit :ensure_metrics, on: [:create, :update], unless: :importing? + after_commit :ensure_metrics!, on: [:create, :update], unless: :importing? after_commit :expire_etag_cache, unless: :importing? # When this attribute is true some MR validation is ignored @@ -156,6 +156,9 @@ class MergeRequest < ApplicationRecord # when creating new merge request attr_accessor :can_be_created, :compare_commits, :diff_options, :compare + # Flag to skip triggering mergeRequestMergeStatusUpdated GraphQL subscription. + attr_accessor :skip_merge_status_trigger + participant :reviewers # Keep states definition to be evaluated before the state_machine block to avoid spec failures. @@ -252,6 +255,8 @@ class MergeRequest < ApplicationRecord end after_transition any => [:unchecked, :cannot_be_merged_recheck, :checking, :cannot_be_merged_rechecking, :can_be_merged, :cannot_be_merged] do |merge_request, transition| + next if merge_request.skip_merge_status_trigger + merge_request.run_after_commit do GraphqlTriggers.merge_request_merge_status_updated(merge_request) end @@ -451,7 +456,12 @@ class MergeRequest < ApplicationRecord def self.total_time_to_merge join_metrics - .merge(MergeRequest::Metrics.with_valid_time_to_merge) + .where( + # Replicating the scope MergeRequest::Metrics.with_valid_time_to_merge + MergeRequest::Metrics.arel_table[:merged_at].gt( + MergeRequest::Metrics.arel_table[:created_at] + ) + ) .pick(MergeRequest::Metrics.time_to_merge_expression) end @@ -558,7 +568,7 @@ class MergeRequest < ApplicationRecord end def self.link_reference_pattern - @link_reference_pattern ||= super("merge_requests", Gitlab::Regex.merge_request) + @link_reference_pattern ||= compose_link_reference_pattern('merge_requests', Gitlab::Regex.merge_request) end def self.reference_valid?(reference) @@ -1943,8 +1953,7 @@ class MergeRequest < ApplicationRecord super.merge(label_url_method: :project_merge_requests_url) end - override :ensure_metrics - def ensure_metrics + def ensure_metrics! MergeRequest::Metrics.record!(self) end diff --git a/app/models/merge_request_diff_commit.rb b/app/models/merge_request_diff_commit.rb index 7e2efa2049b..fc08dd4d9c8 100644 --- a/app/models/merge_request_diff_commit.rb +++ b/app/models/merge_request_diff_commit.rb @@ -80,7 +80,7 @@ class MergeRequestDiffCommit < ApplicationRecord def self.prepare_commits_for_bulk_insert(commits) user_tuples = Set.new hashes = commits.map do |commit| - hash = commit.to_hash.except(:parent_ids) + hash = commit.to_hash.except(:parent_ids, :referenced_by) TRIM_USER_KEYS.each do |key| hash[key] = MergeRequest::DiffCommitUser.prepare(hash[key]) diff --git a/app/models/milestone.rb b/app/models/milestone.rb index b0676c25f8e..10d70eaa24e 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -8,6 +8,7 @@ class Milestone < ApplicationRecord include FromUnion include Importable include IidRoutes + include UpdatedAtFilterable prepend_mod_with('Milestone') # rubocop: disable Cop/InjectEnterpriseEditionModule @@ -26,6 +27,7 @@ class Milestone < ApplicationRecord has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent + scope :by_iid, ->(iid) { where(iid: iid) } scope :active, -> { with_state(:active) } scope :started, -> { active.where('milestones.start_date <= CURRENT_DATE') } scope :not_started, -> { active.where('milestones.start_date > CURRENT_DATE') } @@ -112,7 +114,7 @@ class Milestone < ApplicationRecord end def self.link_reference_pattern - @link_reference_pattern ||= super("milestones", /(?<milestone>\d+)/) + @link_reference_pattern ||= compose_link_reference_pattern('milestones', /(?<milestone>\d+)/) end def self.upcoming_ids(projects, groups) diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 9d9b09e3562..b972d6688af 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -16,6 +16,7 @@ class Namespace < ApplicationRecord include EachBatch include BlocksUnsafeSerialization include Ci::NamespaceSettings + include Referable # Tells ActiveRecord not to store the full class name, in order to save some space # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69794 @@ -51,7 +52,8 @@ class Namespace < ApplicationRecord has_one :namespace_statistics has_one :namespace_route, foreign_key: :namespace_id, autosave: false, inverse_of: :namespace, class_name: 'Route' has_many :namespace_members, foreign_key: :member_namespace_id, inverse_of: :member_namespace, class_name: 'Member' - has_many :member_roles + + has_one :namespace_ldap_settings, inverse_of: :namespace, class_name: 'Namespaces::LdapSetting', autosave: true has_many :runner_namespaces, inverse_of: :namespace, class_name: 'Ci::RunnerNamespace' has_many :runners, through: :runner_namespaces, source: :runner, class_name: 'Ci::Runner' @@ -97,6 +99,7 @@ class Namespace < ApplicationRecord validates :path, presence: true, length: { maximum: URL_MAX_LENGTH } + validate :container_registry_namespace_path_validation validates :path, namespace_path: true, if: ->(n) { !n.project_namespace? } # Project path validator is used for project namespaces for now to assure @@ -244,27 +247,42 @@ class Namespace < ApplicationRecord def clean_path(path, limited_to: Namespace.all) slug = Gitlab::Slug::Path.new(path).generate path = Namespaces::RandomizedSuffixPath.new(slug) - Uniquify.new.string(path) { |s| limited_to.find_by_path_or_name(s) } + Gitlab::Utils::Uniquify.new.string(path) { |s| limited_to.find_by_path_or_name(s) } end def clean_name(value) value.scan(Gitlab::Regex.group_name_regex_chars).join(' ') end - def find_by_pages_host(host) - gitlab_host = "." + Settings.pages.host.downcase - host = host.downcase - return unless host.ends_with?(gitlab_host) + def top_most + by_parent(nil) + end - name = host.delete_suffix(gitlab_host) - Namespace.top_most.by_path(name) + def reference_prefix + User.reference_prefix end - def top_most - by_parent(nil) + def reference_pattern + User.reference_pattern end end + def to_reference_base(from = nil, full: false) + return full_path if full || cross_namespace_reference?(from) + return path if cross_project_reference?(from) + end + + def to_reference(*) + "#{self.class.reference_prefix}#{full_path}" + end + + def container_registry_namespace_path_validation + return if Feature.disabled?(:restrict_special_characters_in_namespace_path, self) + return if !path_changed? || path.match?(Gitlab::Regex.oci_repository_path_regex) + + errors.add(:path, Gitlab::Regex.oci_repository_path_regex_message) + end + def package_settings package_setting_relation || build_package_setting_relation end @@ -286,11 +304,15 @@ class Namespace < ApplicationRecord end def any_project_has_container_registry_tags? - all_projects.includes(:container_repositories).any?(&:has_container_registry_tags?) + first_project_with_container_registry_tags.present? end def first_project_with_container_registry_tags - all_projects.find(&:has_container_registry_tags?) + if ContainerRegistry::GitlabApiClient.supports_gitlab_api? && Feature.enabled?(:use_sub_repositories_api) + ContainerRegistry::GitlabApiClient.one_project_with_container_registry_tag(full_path) + else + all_projects.includes(:container_repositories).find(&:has_container_registry_tags?) + end end def send_update_instructions @@ -473,18 +495,6 @@ class Namespace < ApplicationRecord ContainerRepository.for_project_id(all_projects) end - def pages_virtual_domain - cache = if Feature.enabled?(:cache_pages_domain_api, root_ancestor) - ::Gitlab::Pages::CacheControl.for_namespace(root_ancestor.id) - end - - Pages::VirtualDomain.new( - projects: all_projects_with_pages.includes(:route, :project_feature, pages_metadatum: :pages_deployment), - trim_prefix: full_path, - cache: cache - ) - end - def any_project_with_pages_deployed? all_projects.with_pages_deployed.any? end @@ -599,8 +609,44 @@ class Namespace < ApplicationRecord namespace_settings&.all_ancestors_have_runner_registration_enabled? end + def all_projects_with_pages + all_projects.with_pages_deployed.includes( + :route, + :project_setting, + :project_feature, + pages_metadatum: :pages_deployment + ) + end + private + def cross_namespace_reference?(from) + return false if from == self + + comparable_namespace_id = project_namespace? ? parent_id : id + + case from + when Project + from.namespace_id != comparable_namespace_id + when Namespaces::ProjectNamespace + from.parent_id != comparable_namespace_id + when Namespace + parent != from + when User + true + end + end + + # Check if a reference is being done cross-project + def cross_project_reference?(from) + case from + when Project + from.project_namespace_id != id + else + from && self != from + end + end + def update_new_emails_created_column return if namespace_settings.nil? return if namespace_settings.emails_enabled == !emails_disabled @@ -630,10 +676,6 @@ class Namespace < ApplicationRecord end end - def all_projects_with_pages - all_projects.with_pages_deployed - end - def parent_changed? parent_id_changed? end diff --git a/app/models/namespaces/ldap_setting.rb b/app/models/namespaces/ldap_setting.rb new file mode 100644 index 00000000000..73125d347cc --- /dev/null +++ b/app/models/namespaces/ldap_setting.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Namespaces + class LdapSetting < ApplicationRecord + belongs_to :namespace, inverse_of: :namespace_ldap_settings + validates :namespace, presence: true + + self.primary_key = :namespace_id + self.table_name = 'namespace_ldap_settings' + end +end diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb index 0e9760832af..0fae66b18ca 100644 --- a/app/models/namespaces/traversal/linear.rb +++ b/app/models/namespaces/traversal/linear.rb @@ -127,9 +127,13 @@ module Namespaces return super unless use_traversal_ids_for_root_ancestor? strong_memoize(:root_ancestor) do - if parent_id.nil? + if association(:parent).loaded? && parent.present? + # This case is possible when parent has not been persisted or we're inside a transaction. + parent.root_ancestor + elsif parent_id.nil? + # There is no parent, so we are the root ancestor. self - else + elsif traversal_ids.present? Namespace.find_by(id: traversal_ids.first) end end @@ -215,6 +219,16 @@ module Namespaces hierarchy_order == :desc ? traversal_ids : traversal_ids.reverse end + def parent=(obj) + super(obj) + set_traversal_ids + end + + def parent_id=(id) + super(id) + set_traversal_ids + end + private attr_accessor :transient_traversal_ids @@ -232,11 +246,11 @@ module Namespaces end def set_traversal_ids + return if id.blank? + # This is a temporary guard and will be removed. return if is_a?(Namespaces::ProjectNamespace) - return unless Feature.enabled?(:set_traversal_ids_on_save, root_ancestor) - self.transient_traversal_ids = if parent_id parent.traversal_ids + [id] else @@ -244,7 +258,7 @@ module Namespaces end # Clear root_ancestor memo if changed. - if read_attribute(traversal_ids)&.first != transient_traversal_ids.first + if read_attribute(:traversal_ids)&.first != transient_traversal_ids.first clear_memoization(:root_ancestor) end diff --git a/app/models/note.rb b/app/models/note.rb index a64f7311725..b9b884b88c5 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -60,6 +60,9 @@ class Note < ApplicationRecord # Attribute used to store the attributes that have been changed by quick actions. attr_writer :commands_changes + # Attribute used to store the quick action command names. + attr_accessor :command_names + # Attribute used to determine whether keep_around_commits will be skipped for diff notes. attr_accessor :skip_keep_around_commits @@ -169,7 +172,6 @@ class Note < ApplicationRecord project: [:project_members, :namespace, { group: [:group_members] }]) end scope :with_metadata, -> { includes(:system_note_metadata) } - scope :with_web_entity_associations, -> { preload(:project, :author, :noteable) } scope :for_note_or_capitalized_note, ->(text) { where(note: [text, text.capitalize]) } scope :like_note_or_capitalized_note, ->(text) { where('(note LIKE ? OR note LIKE ?)', text, text.capitalize) } @@ -288,6 +290,10 @@ class Note < ApplicationRecord def cherry_picked_merge_requests(shas) where(noteable_type: 'MergeRequest', commit_id: shas).select(:noteable_id) end + + def with_web_entity_associations + preload(:project, :author, :noteable) + end end # rubocop: disable CodeReuse/ServiceClass @@ -330,6 +336,10 @@ class Note < ApplicationRecord noteable_type == "Issue" end + def for_work_item? + noteable.is_a?(WorkItem) + end + def for_merge_request? noteable_type == "MergeRequest" end diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb index 8e79a750793..601381f1c65 100644 --- a/app/models/oauth_access_token.rb +++ b/app/models/oauth_access_token.rb @@ -4,6 +4,8 @@ class OauthAccessToken < Doorkeeper::AccessToken belongs_to :resource_owner, class_name: 'User' belongs_to :application, class_name: 'Doorkeeper::Application' + validates :expires_in, presence: true + alias_attribute :user, :resource_owner scope :latest_per_application, -> { select('distinct on(application_id) *').order(application_id: :desc, created_at: :desc) } diff --git a/app/models/onboarding/completion.rb b/app/models/onboarding/completion.rb index 269283df826..0966a9f2912 100644 --- a/app/models/onboarding/completion.rb +++ b/app/models/onboarding/completion.rb @@ -5,52 +5,65 @@ module Onboarding include Gitlab::Utils::StrongMemoize include Gitlab::Experiment::Dsl - ACTION_ISSUE_IDS = { - trial_started: 2, - required_mr_approvals_enabled: 11, - code_owners_enabled: 10 - }.freeze - ACTION_PATHS = [ :pipeline_created, + :trial_started, + :required_mr_approvals_enabled, + :code_owners_enabled, :issue_created, :git_write, :merge_request_created, :user_added ].freeze - def initialize(namespace, current_user = nil) - @namespace = namespace + def initialize(project, current_user = nil) + @project = project + @namespace = project.namespace @current_user = current_user end def percentage return 0 unless onboarding_progress - attributes = onboarding_progress.attributes.symbolize_keys - total_actions = action_columns.count - completed_actions = action_columns.count { |column| attributes[column].present? } + completed_actions = action_columns.count { |column| completed?(column) } (completed_actions.to_f / total_actions * 100).round end + def completed?(column) + if column == :code_added + repository.commit_count > 1 || repository.branch_count > 1 + else + attributes[column].present? + end + end + private + def repository + project.repository + end + strong_memoize_attr :repository + + def attributes + onboarding_progress.attributes.symbolize_keys + end + strong_memoize_attr :attributes + def onboarding_progress - strong_memoize(:onboarding_progress) do - ::Onboarding::Progress.find_by(namespace: namespace) - end + ::Onboarding::Progress.find_by(namespace: namespace) end + strong_memoize_attr :onboarding_progress def action_columns - strong_memoize(:action_columns) do + [:code_added] + tracked_actions.map { |action_key| ::Onboarding::Progress.column_name(action_key) } - end end + strong_memoize_attr :action_columns def tracked_actions - ACTION_ISSUE_IDS.keys + ACTION_PATHS + deploy_section_tracked_actions + ACTION_PATHS + deploy_section_tracked_actions end def deploy_section_tracked_actions @@ -65,6 +78,6 @@ module Onboarding end.run end - attr_reader :namespace, :current_user + attr_reader :project, :namespace, :current_user end end diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb index 0df8c87f73f..6876af09c2c 100644 --- a/app/models/operations/feature_flag.rb +++ b/app/models/operations/feature_flag.rb @@ -72,7 +72,7 @@ module Operations end def link_reference_pattern - @link_reference_pattern ||= super("feature_flags", %r{(?<feature_flag>\d+)/edit}) + @link_reference_pattern ||= compose_link_reference_pattern('feature_flags', %r{(?<feature_flag>\d+)/edit}) end def reference_postfix diff --git a/app/models/packages/debian.rb b/app/models/packages/debian.rb index 9c615c20250..887a5695530 100644 --- a/app/models/packages/debian.rb +++ b/app/models/packages/debian.rb @@ -10,6 +10,8 @@ module Packages LETTER_REGEX = %r{(lib)?[a-z0-9]}.freeze + EMPTY_FILE_SHA256 = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'.freeze + def self.table_name_prefix 'packages_debian_' end diff --git a/app/models/packages/debian/file_metadatum.rb b/app/models/packages/debian/file_metadatum.rb index eb1b03a8e9d..77ce8e265ff 100644 --- a/app/models/packages/debian/file_metadatum.rb +++ b/app/models/packages/debian/file_metadatum.rb @@ -9,14 +9,14 @@ class Packages::Debian::FileMetadatum < ApplicationRecord validate :valid_debian_package_type enum file_type: { - unknown: 1, source: 2, dsc: 3, deb: 4, udeb: 5, buildinfo: 6, changes: 7 + unknown: 1, source: 2, dsc: 3, deb: 4, udeb: 5, buildinfo: 6, changes: 7, ddeb: 8 } validates :file_type, presence: true validates :file_type, inclusion: { in: %w[unknown] }, if: -> { package_file&.package&.debian_incoming? || package_file&.package&.processing? } validates :file_type, - inclusion: { in: %w[source dsc deb udeb buildinfo changes] }, + inclusion: { in: %w[source dsc deb udeb buildinfo changes ddeb] }, if: -> { package_file&.package&.debian_package? && !package_file&.package&.processing? } validates :component, @@ -46,7 +46,7 @@ class Packages::Debian::FileMetadatum < ApplicationRecord end def requires_architecture? - deb? || udeb? + deb? || udeb? || ddeb? end def requires_component? diff --git a/app/models/packages/rpm/repository_file.rb b/app/models/packages/rpm/repository_file.rb index 614ec9b3e56..bbd435691d2 100644 --- a/app/models/packages/rpm/repository_file.rb +++ b/app/models/packages/rpm/repository_file.rb @@ -13,7 +13,7 @@ module Packages enum status: { default: 0, pending_destruction: 1, processing: 2, error: 3 } - belongs_to :project, inverse_of: :repository_files + belongs_to :project, inverse_of: :rpm_repository_files validates :project, presence: true validates :file, presence: true diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb index a1ba48f3ab0..222cde19da7 100644 --- a/app/models/pages/lookup_path.rb +++ b/app/models/pages/lookup_path.rb @@ -49,19 +49,25 @@ module Pages if project.pages_namespace_url == project.pages_url '/' else - project.full_path.delete_prefix(trim_prefix) + '/' + "#{project.full_path.delete_prefix(trim_prefix)}/" end end strong_memoize_attr :prefix + def unique_domain + return unless project.project_setting.pages_unique_domain_enabled? + + project.project_setting.pages_unique_domain + end + strong_memoize_attr :unique_domain + private attr_reader :project, :trim_prefix, :domain def deployment - strong_memoize(:deployment) do - project.pages_metadatum.pages_deployment - end + project.pages_metadatum.pages_deployment end + strong_memoize_attr :deployment end end diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 909658214fd..446c4a6187c 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -15,7 +15,6 @@ class PagesDomain < ApplicationRecord belongs_to :project has_many :acme_orders, class_name: "PagesDomainAcmeOrder" - has_many :serverless_domain_clusters, class_name: 'Serverless::DomainCluster', inverse_of: :pages_domain after_initialize :set_verification_code before_validation :clear_auto_ssl_failure, unless: :auto_ssl_enabled @@ -209,20 +208,6 @@ class PagesDomain < ApplicationRecord self.certificate_source = 'gitlab_provided' if attribute_changed?(:key) end - def pages_virtual_domain - return unless pages_deployed? - - cache = if Feature.enabled?(:cache_pages_domain_api, project.root_namespace) - ::Gitlab::Pages::CacheControl.for_domain(id) - end - - Pages::VirtualDomain.new( - projects: [project], - domain: self, - cache: cache - ) - end - def clear_auto_ssl_failure self.auto_ssl_failed = false end @@ -237,14 +222,14 @@ class PagesDomain < ApplicationRecord end end - private - def pages_deployed? return false unless project project.pages_metadatum&.deployed? end + private + def set_verification_code return if self.verification_code.present? diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb index f99c4c6c39d..2e613768873 100644 --- a/app/models/personal_access_token.rb +++ b/app/models/personal_access_token.rb @@ -9,7 +9,9 @@ class PersonalAccessToken < ApplicationRecord include Gitlab::SQL::Pattern extend ::Gitlab::Utils::Override - add_authentication_token_field :token, digest: true + add_authentication_token_field :token, + digest: true, + format_with_prefix: :prefix_from_application_current_settings # PATs are 20 characters + optional configurable settings prefix (0..20) TOKEN_LENGTH_RANGE = (20..40).freeze @@ -72,11 +74,6 @@ class PersonalAccessToken < ApplicationRecord fuzzy_search(query, [:name]) end - override :format_token - def format_token(token) - "#{self.class.token_prefix}#{token}" - end - def project_access_token? user&.project_bot? end @@ -107,6 +104,10 @@ class PersonalAccessToken < ApplicationRecord def add_admin_mode_scope self.scopes += [Gitlab::Auth::ADMIN_MODE_SCOPE.to_s] end + + def prefix_from_application_current_settings + self.class.token_prefix + end end PersonalAccessToken.prepend_mod_with('PersonalAccessToken') diff --git a/app/models/preloaders/commit_status_preloader.rb b/app/models/preloaders/commit_status_preloader.rb index 535dd24ba6b..79c2549e371 100644 --- a/app/models/preloaders/commit_status_preloader.rb +++ b/app/models/preloaders/commit_status_preloader.rb @@ -9,10 +9,11 @@ module Preloaders end def execute(relations) - preloader = ActiveRecord::Associations::Preloader.new - CLASSES.each do |klass| - preloader.preload(objects(klass), associations(klass, relations)) + ActiveRecord::Associations::Preloader.new( + records: objects(klass), + associations: associations(klass, relations) + ).call end end diff --git a/app/models/preloaders/labels_preloader.rb b/app/models/preloaders/labels_preloader.rb index b6e73c1cd02..2a3175be420 100644 --- a/app/models/preloaders/labels_preloader.rb +++ b/app/models/preloaders/labels_preloader.rb @@ -19,11 +19,20 @@ module Preloaders end def preload_all - preloader = ActiveRecord::Associations::Preloader.new + ActiveRecord::Associations::Preloader.new( + records: labels, + associations: { parent_container: :route } + ).call - preloader.preload(labels, parent_container: :route) - preloader.preload(labels.select { |l| l.is_a? ProjectLabel }, { project: [:project_feature, namespace: :route] }) - preloader.preload(labels.select { |l| l.is_a? GroupLabel }, { group: :route }) + ActiveRecord::Associations::Preloader.new( + records: labels.select { |l| l.is_a? ProjectLabel }, + associations: { project: [:project_feature, namespace: :route] } + ).call + + ActiveRecord::Associations::Preloader.new( + records: labels.select { |l| l.is_a? GroupLabel }, + associations: { group: :route } + ).call labels.each do |label| label.lazy_subscription(user) diff --git a/app/models/preloaders/project_policy_preloader.rb b/app/models/preloaders/project_policy_preloader.rb index fe9db3464c7..e16eabf40a1 100644 --- a/app/models/preloaders/project_policy_preloader.rb +++ b/app/models/preloaders/project_policy_preloader.rb @@ -10,7 +10,10 @@ module Preloaders def execute return if projects.is_a?(ActiveRecord::NullRelation) - ActiveRecord::Associations::Preloader.new.preload(projects, { group: :route, namespace: :owner }) + ActiveRecord::Associations::Preloader.new( + records: projects, + associations: { group: :route, namespace: :owner } + ).call ::Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects, current_user).execute end diff --git a/app/models/preloaders/project_root_ancestor_preloader.rb b/app/models/preloaders/project_root_ancestor_preloader.rb index 6192f79ce2c..ccb9d2eab98 100644 --- a/app/models/preloaders/project_root_ancestor_preloader.rb +++ b/app/models/preloaders/project_root_ancestor_preloader.rb @@ -19,7 +19,7 @@ module Preloaders root_ancestors_by_id = root_query.group_by(&:source_id) - ActiveRecord::Associations::Preloader.new.preload(@projects, :namespace) + ActiveRecord::Associations::Preloader.new(records: @projects, associations: :namespace).call @projects.each do |project| root_ancestor = root_ancestors_by_id[project.id]&.first project.namespace.root_ancestor = root_ancestor if root_ancestor.present? diff --git a/app/models/preloaders/runner_machine_policy_preloader.rb b/app/models/preloaders/runner_machine_policy_preloader.rb new file mode 100644 index 00000000000..52864eeba8d --- /dev/null +++ b/app/models/preloaders/runner_machine_policy_preloader.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +module Preloaders + class RunnerMachinePolicyPreloader + def initialize(runner_machines, current_user) + @runner_machines = runner_machines + @current_user = current_user + end + + def execute + return if runner_machines.is_a?(ActiveRecord::NullRelation) + + ActiveRecord::Associations::Preloader.new( + records: runner_machines, + associations: [:runner] + ).call + end + + private + + attr_reader :runner_machines, :current_user + end +end diff --git a/app/models/preloaders/user_max_access_level_in_groups_preloader.rb b/app/models/preloaders/user_max_access_level_in_groups_preloader.rb index 0c747ad9c84..16d46facb96 100644 --- a/app/models/preloaders/user_max_access_level_in_groups_preloader.rb +++ b/app/models/preloaders/user_max_access_level_in_groups_preloader.rb @@ -46,14 +46,10 @@ module Preloaders end def all_memberships - if Feature.enabled?(:include_memberships_from_group_shares_in_preloader) - [ - direct_memberships.select(*GroupMember.cached_column_list), - memberships_from_group_shares - ] - else - [direct_memberships] - end + [ + direct_memberships.select(*GroupMember.cached_column_list), + memberships_from_group_shares + ] end def direct_memberships diff --git a/app/models/project.rb b/app/models/project.rb index 43ec26be786..cb218c0a49f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -19,6 +19,7 @@ class Project < ApplicationRecord include Presentable include HasRepository include HasWiki + include WebHooks::HasWebHooks include CanMoveRepositoryStorage include Routable include GroupDescendant @@ -41,7 +42,6 @@ class Project < ApplicationRecord include BlocksUnsafeSerialization include Subquery include IssueParent - include WebHooks::HasWebHooks extend Gitlab::Cache::RequestCache extend Gitlab::Utils::Override @@ -89,6 +89,14 @@ class Project < ApplicationRecord DEFAULT_SQUASH_COMMIT_TEMPLATE = '%{title}' + PROJECT_FEATURES_DEFAULTS = { + issues: gitlab_config_features.issues, + merge_requests: gitlab_config_features.merge_requests, + builds: gitlab_config_features.builds, + wiki: gitlab_config_features.wiki, + snippets: gitlab_config_features.snippets + }.freeze + cache_markdown_field :description, pipeline: :description attribute :packages_enabled, default: true @@ -101,18 +109,14 @@ class Project < ApplicationRecord attribute :autoclose_referenced_issues, default: true attribute :ci_config_path, default: -> { Gitlab::CurrentSettings.default_ci_config_path } - default_value_for :issues_enabled, gitlab_config_features.issues - default_value_for :merge_requests_enabled, gitlab_config_features.merge_requests - default_value_for :builds_enabled, gitlab_config_features.builds - default_value_for :wiki_enabled, gitlab_config_features.wiki - default_value_for :snippets_enabled, gitlab_config_features.snippets - add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:projects_tokens_optional_encryption) ? :optional : :required }, - prefix: RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX + format_with_prefix: :runners_token_prefix, + require_prefix_for_validation: true # Storage specific hooks after_initialize :use_hashed_storage + after_initialize :set_project_feature_defaults, if: :new_record? before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? } before_validation :ensure_project_namespace_in_sync @@ -128,7 +132,6 @@ class Project < ApplicationRecord after_create -> { create_or_load_association(:pages_metadatum) } after_create :set_timestamps_for_create after_create :check_repository_absence! - after_update :update_forks_visibility_level before_destroy :remove_private_deploy_keys after_destroy :remove_exports after_save :update_project_statistics, if: :saved_change_to_namespace_id? @@ -168,6 +171,8 @@ class Project < ApplicationRecord has_one :last_event, -> { order 'events.created_at DESC' }, class_name: 'Event' has_many :boards + has_many :application_setting, inverse_of: :self_monitoring_project + def self.integration_association_name(name) "#{name}_integration" end @@ -188,6 +193,7 @@ class Project < ApplicationRecord has_one :emails_on_push_integration, class_name: 'Integrations::EmailsOnPush' has_one :ewm_integration, class_name: 'Integrations::Ewm' has_one :external_wiki_integration, class_name: 'Integrations::ExternalWiki' + has_one :google_play_integration, class_name: 'Integrations::GooglePlay' has_one :hangouts_chat_integration, class_name: 'Integrations::HangoutsChat' has_one :harbor_integration, class_name: 'Integrations::Harbor' has_one :irker_integration, class_name: 'Integrations::Irker' @@ -208,6 +214,7 @@ class Project < ApplicationRecord has_one :shimo_integration, class_name: 'Integrations::Shimo' has_one :slack_integration, class_name: 'Integrations::Slack' has_one :slack_slash_commands_integration, class_name: 'Integrations::SlackSlashCommands' + has_one :squash_tm_integration, class_name: 'Integrations::SquashTm' has_one :teamcity_integration, class_name: 'Integrations::Teamcity' has_one :unify_circuit_integration, class_name: 'Integrations::UnifyCircuit' has_one :webex_teams_integration, class_name: 'Integrations::WebexTeams' @@ -238,14 +245,22 @@ class Project < ApplicationRecord has_many :fork_network_projects, through: :fork_network, source: :projects # Packages - has_many :packages, class_name: 'Packages::Package' - has_many :package_files, through: :packages, class_name: 'Packages::PackageFile' + has_many :packages, + class_name: 'Packages::Package' + has_many :package_files, + through: :packages, class_name: 'Packages::PackageFile' # repository_files must be destroyed by ruby code in order to properly remove carrierwave uploads - has_many :repository_files, inverse_of: :project, class_name: 'Packages::Rpm::RepositoryFile', - dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_many :rpm_repository_files, + inverse_of: :project, + class_name: 'Packages::Rpm::RepositoryFile', + dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent # debian_distributions and associated component_files must be destroyed by ruby code in order to properly remove carrierwave uploads - has_many :debian_distributions, class_name: 'Packages::Debian::ProjectDistribution', dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - has_one :packages_cleanup_policy, class_name: 'Packages::Cleanup::Policy', inverse_of: :project + has_many :debian_distributions, + class_name: 'Packages::Debian::ProjectDistribution', + dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_one :packages_cleanup_policy, + class_name: 'Packages::Cleanup::Policy', + inverse_of: :project has_one :import_state, autosave: true, class_name: 'ProjectImportState', inverse_of: :project has_one :import_export_upload, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -259,6 +274,7 @@ class Project < ApplicationRecord has_one :project_setting, inverse_of: :project, autosave: true has_one :alerting_setting, inverse_of: :project, class_name: 'Alerting::ProjectAlertingSetting' has_one :service_desk_setting, class_name: 'ServiceDeskSetting' + has_one :service_desk_custom_email_verification, class_name: 'ServiceDesk::CustomEmailVerification' # Merge requests for target project should be removed with it has_many :merge_requests, foreign_key: 'target_project_id', inverse_of: :target_project, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -371,7 +387,6 @@ class Project < ApplicationRecord inverse_of: :project has_many :stages, class_name: 'Ci::Stage', inverse_of: :project has_many :ci_refs, class_name: 'Ci::Ref', inverse_of: :project - has_many :pipeline_metadata, class_name: 'Ci::PipelineMetadata', inverse_of: :project has_many :pending_builds, class_name: 'Ci::PendingBuild' has_many :builds, class_name: 'Ci::Build', inverse_of: :project @@ -874,7 +889,7 @@ class Project < ApplicationRecord def reference_pattern %r{ (?<!#{Gitlab::PathRegex::PATH_START_CHAR}) - ((?<namespace>#{Gitlab::PathRegex::FULL_NAMESPACE_FORMAT_REGEX})\/)? + ((?<namespace>#{Gitlab::PathRegex::FULL_NAMESPACE_FORMAT_REGEX})/)? (?<project>#{Gitlab::PathRegex::PROJECT_PATH_FORMAT_REGEX}) }xo end @@ -950,27 +965,44 @@ class Project < ApplicationRecord .where(pending_delete: false) .where(archived: false) end + + def project_features_defaults + PROJECT_FEATURES_DEFAULTS + end + + def by_pages_enabled_unique_domain(domain) + without_deleted + .joins(:project_setting) + .find_by(project_setting: { + pages_unique_domain_enabled: true, + pages_unique_domain: domain + }) + end end def initialize(attributes = nil) - # We can't use default_value_for because the database has a default - # value of 0 for visibility_level. If someone attempts to create a - # private project, default_value_for will assume that the - # visibility_level hasn't changed and will use the application - # setting default, which could be internal or public. For projects - # inside a private group, those levels are invalid. - # - # To fix the problem, we assign the actual default in the application if - # no explicit visibility has been initialized. + # We assign the actual snippet default if no explicit visibility has been initialized. attributes ||= {} unless visibility_attribute_present?(attributes) attributes[:visibility_level] = Gitlab::CurrentSettings.default_project_visibility end + @init_attributes = attributes + super end + # Remove along with ProjectFeaturesCompatibility module + def set_project_feature_defaults + self.class.project_features_defaults.each do |attr, value| + # If the deprecated _enabled or the accepted _access_level attribute is specified, we don't need to set the default + next unless @init_attributes[:"#{attr}_enabled"].nil? && @init_attributes[:"#{attr}_access_level"].nil? + + public_send("#{attr}_enabled=", value) # rubocop:disable GitlabSecurity/PublicSend + end + end + def parent_loaded? association(:namespace).loaded? end @@ -1077,8 +1109,10 @@ class Project < ApplicationRecord end def preload_protected_branches - preloader = ActiveRecord::Associations::Preloader.new - preloader.preload(self, protected_branches: [:push_access_levels, :merge_access_levels]) + ActiveRecord::Associations::Preloader.new( + records: [self], + associations: { protected_branches: [:push_access_levels, :merge_access_levels] } + ).call end # returns all ancestor-groups upto but excluding the given namespace @@ -1089,11 +1123,7 @@ class Project < ApplicationRecord end def ancestors(hierarchy_order: nil) - if Feature.enabled?(:linear_project_ancestors, self) - group&.self_and_ancestors(hierarchy_order: hierarchy_order) || Group.none - else - ancestors_upto(hierarchy_order: hierarchy_order) - end + group&.self_and_ancestors(hierarchy_order: hierarchy_order) || Group.none end def ancestors_upto_ids(...) @@ -1154,10 +1184,6 @@ class Project < ApplicationRecord { scope: :project, status: auto_devops&.enabled || Feature.enabled?(:force_autodevops_on_by_default, self) } end - def unlink_forks_upon_visibility_decrease_enabled? - Feature.enabled?(:unlink_fork_network_upon_visibility_decrease, self) - end - # LFS and hashed repository storage are required for using Design Management. def design_management_enabled? lfs_enabled? && hashed_storage?(:repository) @@ -1177,15 +1203,6 @@ class Project < ApplicationRecord end end - # Because we use default_value_for we need to be sure - # packages_enabled= method does exist even if we rollback migration. - # Otherwise many tests from spec/migrations will fail. - def packages_enabled=(value) - if has_attribute?(:packages_enabled) - write_attribute(:packages_enabled, value) - end - end - def cleanup @repository = nil end @@ -1272,6 +1289,18 @@ class Project < ApplicationRecord import_state&.human_status_name || 'none' end + def beautified_import_status_name + if import_finished? + return 'completed' unless import_checksums.present? + + fetched = import_checksums['fetched'] + imported = import_checksums['imported'] + fetched.keys.any? { |key| fetched[key] != imported[key] } ? 'partially completed' : 'completed' + else + import_status + end + end + def add_import_job job_id = if forked? @@ -1314,6 +1343,11 @@ class Project < ApplicationRecord super(value&.delete("\0")) end + # Used by Import/Export to export commit notes + def commit_notes + notes.where(noteable_type: "Commit") + end + def import_url=(value) if Gitlab::UrlSanitizer.valid?(value) import_url = Gitlab::UrlSanitizer.new(value) @@ -1631,7 +1665,7 @@ class Project < ApplicationRecord def disabled_integrations disabled_integrations = [] - disabled_integrations << 'apple_app_store' unless Feature.enabled?(:apple_app_store_integration, self) + disabled_integrations << 'google_play' unless Feature.enabled?(:google_play_integration, self) disabled_integrations end @@ -1935,19 +1969,6 @@ class Project < ApplicationRecord create_repository(force: true) unless repository_exists? end - # update visibility_level of forks - def update_forks_visibility_level - return if unlink_forks_upon_visibility_decrease_enabled? - return unless visibility_level < visibility_level_before_last_save - - forks.each do |forked_project| - if forked_project.visibility_level > visibility_level - forked_project.visibility_level = visibility_level - forked_project.save! - end - end - end - def allowed_to_share_with_group? !namespace.share_with_group_lock end @@ -2080,7 +2101,11 @@ class Project < ApplicationRecord # rubocop: disable CodeReuse/ServiceClass def open_merge_requests_count(_current_user = nil) - Projects::OpenMergeRequestsCountService.new(self).count + BatchLoader.for(self).batch do |projects, loader| + ::Projects::BatchOpenMergeRequestsCountService.new(projects) + .refresh_cache_and_retrieve_data + .each { |project, count| loader.call(project, count) } + end end # rubocop: enable CodeReuse/ServiceClass @@ -2107,23 +2132,13 @@ class Project < ApplicationRecord ensure_runners_token! end - override :format_runners_token - def format_runners_token(token) - "#{RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX}#{token}" - end - def pages_deployed? pages_metadatum&.deployed? end - def pages_namespace_url - # The host in URL always needs to be downcased - Gitlab.config.pages.url.sub(%r{^https?://}) do |prefix| - "#{prefix}#{pages_subdomain}." - end.downcase - end - def pages_url + return pages_unique_url if pages_unique_domain_enabled? + url = pages_namespace_url url_path = full_path.partition('/').last namespace_url = "#{Settings.pages.protocol}://#{url_path}".downcase @@ -2141,6 +2156,14 @@ class Project < ApplicationRecord "#{url}/#{url_path}" end + def pages_unique_url + pages_url_for(project_setting.pages_unique_domain) + end + + def pages_namespace_url + pages_url_for(pages_subdomain) + end + def pages_subdomain full_path.partition('/').first end @@ -2809,7 +2832,7 @@ class Project < ApplicationRecord end def all_protected_branches - if Feature.enabled?(:group_protected_branches) + if Feature.enabled?(:group_protected_branches, group) @all_protected_branches ||= ProtectedBranch.from_union([protected_branches, group_protected_branches]) else protected_branches @@ -2971,7 +2994,7 @@ class Project < ApplicationRecord end def ci_inbound_job_token_scope_enabled? - return false unless ci_cd_settings + return true unless ci_cd_settings ci_cd_settings.inbound_job_token_scope_enabled? end @@ -3121,6 +3144,18 @@ class Project < ApplicationRecord private + def pages_unique_domain_enabled? + Feature.enabled?(:pages_unique_domain) && + project_setting.pages_unique_domain_enabled? + end + + def pages_url_for(domain) + # The host in URL always needs to be downcased + Gitlab.config.pages.url.sub(%r{^https?://}) do |prefix| + "#{prefix}#{domain}." + end.downcase + end + # overridden in EE def project_group_links_with_preload project_group_links @@ -3224,6 +3259,8 @@ class Project < ApplicationRecord case from when Project namespace_id != from.namespace_id + when Namespaces::ProjectNamespace + namespace_id != from.parent_id when Namespace namespace != from when User @@ -3233,9 +3270,14 @@ class Project < ApplicationRecord # Check if a reference is being done cross-project def cross_project_reference?(from) - return true if from.is_a?(Namespace) - - from && self != from + case from + when Namespaces::ProjectNamespace + project_namespace_id != from.id + when Namespace + true + else + from && self != from + end end def update_project_statistics @@ -3401,6 +3443,10 @@ class Project < ApplicationRecord project_setting.emails_enabled = !emails_disabled end end + + def runners_token_prefix + RunnersTokenPrefixable::RUNNERS_TOKEN_PREFIX + end end Project.prepend_mod_with('Project') diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb index 8741a341ad3..cc9003423be 100644 --- a/app/models/project_ci_cd_setting.rb +++ b/app/models/project_ci_cd_setting.rb @@ -20,10 +20,6 @@ class ProjectCiCdSetting < ApplicationRecord attribute :forward_deployment_enabled, default: true attribute :separated_caches, default: true - default_value_for :inbound_job_token_scope_enabled do |settings| - Feature.enabled?(:ci_inbound_job_token_scope, settings.project) - end - chronic_duration_attr :runner_token_expiration_interval_human_readable, :runner_token_expiration_interval def keep_latest_artifacts_available? diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb index 168646bbe41..053ccfac050 100644 --- a/app/models/project_feature.rb +++ b/app/models/project_feature.rb @@ -162,6 +162,12 @@ class ProjectFeature < ApplicationRecord end end + def public_packages? + return false unless Gitlab.config.packages.enabled + + package_registry_access_level == PUBLIC || project.public? + end + private def set_pages_access_level diff --git a/app/models/project_setting.rb b/app/models/project_setting.rb index db86bb5e1fb..379b94b3af5 100644 --- a/app/models/project_setting.rb +++ b/app/models/project_setting.rb @@ -25,6 +25,10 @@ class ProjectSetting < ApplicationRecord validates :target_platforms, inclusion: { in: ALLOWED_TARGET_PLATFORMS } validates :suggested_reviewers_enabled, inclusion: { in: [true, false] } + validates :pages_unique_domain, + uniqueness: { if: -> { pages_unique_domain.present? } }, + presence: { if: :require_unique_domain? } + validate :validates_mr_default_target_self attribute :legacy_open_source_license_available, default: -> do @@ -68,6 +72,11 @@ class ProjectSetting < ApplicationRecord errors.add :mr_default_target_self, _('This setting is allowed for forked projects only') end end + + def require_unique_domain? + pages_unique_domain_enabled || + pages_unique_domain_in_database.present? + end end ProjectSetting.prepend_mod diff --git a/app/models/projects/data_transfer.rb b/app/models/projects/data_transfer.rb index a93aea55781..faab0bb6db2 100644 --- a/app/models/projects/data_transfer.rb +++ b/app/models/projects/data_transfer.rb @@ -4,6 +4,9 @@ # This class ensures that we keep 1 record per project per month. module Projects class DataTransfer < ApplicationRecord + include AfterCommitQueue + include CounterAttribute + self.table_name = 'project_data_transfers' belongs_to :project @@ -11,6 +14,11 @@ module Projects scope :current_month, -> { where(date: beginning_of_month) } + counter_attribute :repository_egress, returns_current: true + counter_attribute :artifacts_egress, returns_current: true + counter_attribute :packages_egress, returns_current: true + counter_attribute :registry_egress, returns_current: true + def self.beginning_of_month(time = Time.current) time.utc.beginning_of_month end diff --git a/app/models/projects/forks/divergence_counts.rb b/app/models/projects/forks/details.rb index 7d630b00083..9e09ef09022 100644 --- a/app/models/projects/forks/divergence_counts.rb +++ b/app/models/projects/forks/details.rb @@ -3,8 +3,11 @@ module Projects module Forks # Class for calculating the divergence of a fork with the source project - class DivergenceCounts + class Details + include Gitlab::Utils::StrongMemoize + LATEST_COMMITS_COUNT = 10 + LEASE_TIMEOUT = 15.minutes.to_i EXPIRATION_TIME = 8.hours def initialize(project, ref) @@ -20,32 +23,55 @@ module Projects { ahead: ahead, behind: behind } end + def exclusive_lease + key = ['project_details', project.id, ref].join(':') + uuid = Gitlab::ExclusiveLease.get_uuid(key) + + Gitlab::ExclusiveLease.new(key, uuid: uuid, timeout: LEASE_TIMEOUT) + end + strong_memoize_attr :exclusive_lease + + def syncing? + exclusive_lease.exists? + end + + def has_conflicts? + !(attrs && attrs[:has_conflicts]).nil? + end + + def update!(params) + Rails.cache.write(cache_key, params, expires_in: EXPIRATION_TIME) + + @attrs = nil + end + private attr_reader :project, :fork_repo, :source_repo, :ref def cache_key - @cache_key ||= ['project_forks', project.id, ref, 'divergence_counts'] + @cache_key ||= ['project_fork_details', project.id, ref].join(':') end def divergence_counts - fork_sha = fork_repo.commit(ref).sha - source_sha = source_repo.commit.sha + sha = fork_repo.commit(ref)&.sha + source_sha = source_repo.commit&.sha - cached_source_sha, cached_fork_sha, counts = Rails.cache.read(cache_key) - return counts if cached_source_sha == source_sha && cached_fork_sha == fork_sha + return if sha.blank? || source_sha.blank? - counts = calculate_divergence_counts(fork_sha, source_sha) + return attrs[:counts] if attrs.present? && attrs[:source_sha] == source_sha && attrs[:sha] == sha - Rails.cache.write(cache_key, [source_sha, fork_sha, counts], expires_in: EXPIRATION_TIME) + counts = calculate_divergence_counts(sha, source_sha) + + update!({ sha: sha, source_sha: source_sha, counts: counts }) counts end - def calculate_divergence_counts(fork_sha, source_sha) + def calculate_divergence_counts(sha, source_sha) # If the upstream latest commit exists in the fork repo, then # it's possible to calculate divergence counts within the fork repository. - return fork_repo.diverging_commit_count(fork_sha, source_sha) if fork_repo.commit(source_sha) + return fork_repo.diverging_commit_count(sha, source_sha) if fork_repo.commit(source_sha) # Otherwise, we need to find a commit that exists both in the fork and upstream # in order to use this commit as a base for calculating divergence counts. @@ -67,6 +93,10 @@ module Projects [ahead, behind] end + + def attrs + @attrs ||= Rails.cache.read(cache_key) + end end end end diff --git a/app/models/projects/import_export/relation_export.rb b/app/models/projects/import_export/relation_export.rb index 9bdf10d7c0e..2771c5131b2 100644 --- a/app/models/projects/import_export/relation_export.rb +++ b/app/models/projects/import_export/relation_export.rb @@ -51,12 +51,16 @@ module Projects transition queued: :started end + event :retry do + transition started: :queued + end + event :finish do transition started: :finished end event :fail_op do - transition [:queued, :started] => :failed + transition [:queued, :started, :failed] => :failed end end @@ -65,6 +69,14 @@ module Projects project_tree_relation_names + EXTRA_RELATION_LIST end + + def mark_as_failed(export_error) + sanitized_error = Gitlab::UrlSanitizer.sanitize(export_error) + + fail_op + + update_column(:export_error, sanitized_error) + end end end end diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index b3331b99a6b..22eaac94897 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -37,38 +37,13 @@ class ProtectedBranch < ApplicationRecord return true if project.empty_repo? && project.default_branch_protected? return false if ref_name.blank? - dry_run = Feature.disabled?(:rely_on_protected_branches_cache, project) - - new_cache_result = new_cache(project, ref_name, dry_run: dry_run) - - return new_cache_result unless new_cache_result.nil? - - deprecated_cache(project, ref_name) - end - - def self.new_cache(project, ref_name, dry_run: true) - ProtectedBranches::CacheService.new(project).fetch(ref_name, dry_run: dry_run) do # rubocop: disable CodeReuse/ServiceClass - self.matching(ref_name, protected_refs: protected_refs(project)).present? - end - end - - # Deprecated: https://gitlab.com/gitlab-org/gitlab/-/issues/370608 - # ---------------------------------------------------------------- - CACHE_EXPIRE_IN = 1.hour - - def self.deprecated_cache(project, ref_name) - Rails.cache.fetch(protected_ref_cache_key(project, ref_name), expires_in: CACHE_EXPIRE_IN) do + ProtectedBranches::CacheService.new(project).fetch(ref_name) do # rubocop: disable CodeReuse/ServiceClass self.matching(ref_name, protected_refs: protected_refs(project)).present? end end - def self.protected_ref_cache_key(project, ref_name) - "protected_ref-#{project.cache_key}-#{Digest::SHA1.hexdigest(ref_name)}" - end - # End of deprecation -------------------------------------------- - def self.allow_force_push?(project, ref_name) - if Feature.enabled?(:group_protected_branches) + if Feature.enabled?(:group_protected_branches, project.group) protected_branches = project.all_protected_branches.matching(ref_name) project_protected_branches, group_protected_branches = protected_branches.partition(&:project_id) @@ -92,11 +67,7 @@ class ProtectedBranch < ApplicationRecord end def self.protected_refs(project) - if Feature.enabled?(:group_protected_branches) - project.all_protected_branches - else - project.protected_branches - end + project.all_protected_branches end # overridden in EE diff --git a/app/models/repository.rb b/app/models/repository.rb index d15f2a430fa..587b71315c2 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -48,7 +48,7 @@ class Repository # For example, for entry `:commit_count` there's a method called `commit_count` which # stores its data in the `commit_count` cache key. CACHED_METHODS = %i(size commit_count readme_path contribution_guide - changelog license_blob license_licensee license_gitaly gitignore + changelog license_blob license_gitaly gitignore gitlab_ci_yml branch_names tag_names branch_count tag_count avatar exists? root_ref merged_branch_names has_visible_content? issue_template_names_hash merge_request_template_names_hash @@ -60,7 +60,7 @@ class Repository METHOD_CACHES_FOR_FILE_TYPES = { readme: %i(readme_path), changelog: :changelog, - license: %i(license_blob license_licensee license_gitaly), + license: %i(license_blob license_gitaly), contributing: :contribution_guide, gitignore: :gitignore, gitlab_ci: :gitlab_ci_yml, @@ -161,7 +161,8 @@ class Repository first_parent: !!opts[:first_parent], order: opts[:order], literal_pathspec: opts.fetch(:literal_pathspec, true), - trailers: opts[:trailers] + trailers: opts[:trailers], + include_referenced_by: opts[:include_referenced_by] } commits = Gitlab::Git::Commit.where(options) @@ -655,24 +656,13 @@ class Repository end def license - if Feature.enabled?(:license_from_gitaly) - license_gitaly - else - license_licensee - end - end - - def license_licensee - return unless exists? - - raw_repository.license(false) + license_gitaly end - cache_method :license_licensee def license_gitaly return unless exists? - raw_repository.license(true) + raw_repository.license end cache_method :license_gitaly @@ -844,6 +834,26 @@ class Repository commit_files(user, **options) end + def move_dir_files(user, path, previous_path, **options) + regex = Regexp.new("^#{Regexp.escape(previous_path + '/')}", 'i') + files = ls_files(options[:branch_name]) + + options[:actions] = files.each_with_object([]) do |item, list| + next unless item =~ regex + + list.push( + action: :move, + file_path: "#{path}/#{item[regex.match(item)[0].size..]}", + previous_path: item, + infer_content: true + ) + end + + return if options[:actions].blank? + + commit_files(user, **options) + end + def delete_file(user, path, **options) options[:actions] = [{ action: :delete, file_path: path }] @@ -948,6 +958,8 @@ class Repository end def merged_to_root_ref?(branch_or_name) + return unless head_commit + branch = Gitlab::Git::Branch.find(self, branch_or_name) if branch @@ -960,7 +972,7 @@ class Repository end def root_ref_sha - @root_ref_sha ||= commit(root_ref).sha + @root_ref_sha ||= head_commit.sha end # If this method is not provided a set of branch names to check merge status, diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb index efffc1bd6dc..13610d37a74 100644 --- a/app/models/resource_label_event.rb +++ b/app/models/resource_label_event.rb @@ -29,9 +29,8 @@ class ResourceLabelEvent < ResourceEvent labels = events.map(&:label).compact project_labels, group_labels = labels.partition { |label| label.is_a? ProjectLabel } - preloader = ActiveRecord::Associations::Preloader.new - preloader.preload(project_labels, { project: :project_feature }) - preloader.preload(group_labels, :group) + ActiveRecord::Associations::Preloader.new(records: project_labels, associations: { project: :project_feature }).call + ActiveRecord::Associations::Preloader.new(records: group_labels, associations: :group).call end def issuable diff --git a/app/models/resource_milestone_event.rb b/app/models/resource_milestone_event.rb index def7e91af3f..f3301ee2051 100644 --- a/app/models/resource_milestone_event.rb +++ b/app/models/resource_milestone_event.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class ResourceMilestoneEvent < ResourceTimeboxEvent - include IgnorableColumns - belongs_to :milestone scope :include_relations, -> { includes(:user, milestone: [:project, :group]) } @@ -10,8 +8,6 @@ class ResourceMilestoneEvent < ResourceTimeboxEvent # state is used for issue and merge request states. enum state: Issue.available_states.merge(MergeRequest.available_states) - ignore_columns %i[reference reference_html cached_markdown_version], remove_with: '13.1', remove_after: '2020-06-22' - def milestone_title milestone&.title end diff --git a/app/models/serverless/domain.rb b/app/models/serverless/domain.rb deleted file mode 100644 index 164f93afa9a..00000000000 --- a/app/models/serverless/domain.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class Domain - include ActiveModel::Model - - REGEXP = %r{^(?<scheme>https?://)?(?<function_name>[^.]+)-(?<cluster_left>\h{2})a1(?<cluster_middle>\h{10})f2(?<cluster_right>\h{2})(?<environment_id>\h+)-(?<environment_slug>[^.]+)\.(?<pages_domain_name>.+)}.freeze - UUID_LENGTH = 14 - - attr_accessor :function_name, :serverless_domain_cluster, :environment - - validates :function_name, presence: true, allow_blank: false - validates :serverless_domain_cluster, presence: true - validates :environment, presence: true - - def self.generate_uuid - SecureRandom.hex(UUID_LENGTH / 2) - end - - def uri - URI("https://#{function_name}-#{serverless_domain_cluster_uuid}#{"%x" % environment.id}-#{environment.slug}.#{serverless_domain_cluster.domain}") - end - - def knative_uri - URI("http://#{function_name}.#{namespace}.#{serverless_domain_cluster.knative.hostname}") - end - - private - - def namespace - serverless_domain_cluster.cluster.kubernetes_namespace_for(environment) - end - - def serverless_domain_cluster_uuid - [ - serverless_domain_cluster.uuid[0..1], - 'a1', - serverless_domain_cluster.uuid[2..-3], - 'f2', - serverless_domain_cluster.uuid[-2..] - ].join - end - end -end diff --git a/app/models/serverless/domain_cluster.rb b/app/models/serverless/domain_cluster.rb deleted file mode 100644 index 561bfc65b2b..00000000000 --- a/app/models/serverless/domain_cluster.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class DomainCluster < ApplicationRecord - self.table_name = 'serverless_domain_cluster' - - HEX_REGEXP = %r{\A\h+\z}.freeze - - belongs_to :pages_domain - belongs_to :knative, class_name: 'Clusters::Applications::Knative', foreign_key: 'clusters_applications_knative_id' - belongs_to :creator, class_name: 'User', optional: true - - attr_encrypted :key, - mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_32, - algorithm: 'aes-256-gcm' - - validates :pages_domain, :knative, presence: true - validates :uuid, presence: true, uniqueness: true, length: { is: ::Serverless::Domain::UUID_LENGTH }, - format: { with: HEX_REGEXP, message: 'only allows hex characters' } - - after_initialize :set_uuid, if: :new_record? - - delegate :domain, to: :pages_domain - delegate :cluster, to: :knative - - def self.for_uuid(uuid) - joins(:pages_domain, :knative) - .includes(:pages_domain, :knative) - .find_by(uuid: uuid) - end - - private - - def set_uuid - self.uuid = ::Serverless::Domain.generate_uuid - end - end -end diff --git a/app/models/serverless/function.rb b/app/models/serverless/function.rb deleted file mode 100644 index 5d4f8e0c9e2..00000000000 --- a/app/models/serverless/function.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class Function - attr_accessor :name, :namespace - - def initialize(project, name, namespace) - @project = project - @name = name - @namespace = namespace - end - - def id - @project.id.to_s + "/" + @name + "/" + @namespace - end - - def self.find_by_id(id) - array = id.split("/") - project = Project.find_by_id(array[0]) - name = array[1] - namespace = array[2] - - self.new(project, name, namespace) - end - end -end diff --git a/app/models/serverless/lookup_path.rb b/app/models/serverless/lookup_path.rb deleted file mode 100644 index c09b3718651..00000000000 --- a/app/models/serverless/lookup_path.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class LookupPath - attr_reader :serverless_domain - - delegate :serverless_domain_cluster, to: :serverless_domain - delegate :knative, to: :serverless_domain_cluster - delegate :certificate, to: :serverless_domain_cluster - delegate :key, to: :serverless_domain_cluster - - def initialize(serverless_domain) - @serverless_domain = serverless_domain - end - - def source - { - type: 'serverless', - service: serverless_domain.knative_uri.host, - cluster: { - hostname: knative.hostname, - address: knative.external_ip, - port: 443, - cert: certificate, - key: key - } - } - end - end -end diff --git a/app/models/serverless/virtual_domain.rb b/app/models/serverless/virtual_domain.rb deleted file mode 100644 index d6a23a4c0ce..00000000000 --- a/app/models/serverless/virtual_domain.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class VirtualDomain - attr_reader :serverless_domain - - delegate :serverless_domain_cluster, to: :serverless_domain - delegate :pages_domain, to: :serverless_domain_cluster - delegate :certificate, to: :pages_domain - delegate :key, to: :pages_domain - - def initialize(serverless_domain) - @serverless_domain = serverless_domain - end - - def lookup_paths - [ - ::Serverless::LookupPath.new(serverless_domain) - ] - end - end -end diff --git a/app/models/airflow.rb b/app/models/service_desk.rb index 2e5642a2639..cb9c924c01f 100644 --- a/app/models/airflow.rb +++ b/app/models/service_desk.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true -module Airflow + +module ServiceDesk def self.table_name_prefix - 'airflow_' + 'service_desk_' end end diff --git a/app/models/service_desk/custom_email_verification.rb b/app/models/service_desk/custom_email_verification.rb new file mode 100644 index 00000000000..b3b9390bb82 --- /dev/null +++ b/app/models/service_desk/custom_email_verification.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +module ServiceDesk + class CustomEmailVerification < ApplicationRecord + enum state: { + running: 0, + verified: 1, + error: 2 + }, _default: 'running' + + enum error: { + incorrect_token: 0, + incorrect_from: 1, + mail_not_received_within_timeframe: 2, + invalid_credentials: 3, + smtp_host_issue: 4 + } + + TIMEFRAME = 30.minutes + + attr_encrypted :token, + mode: :per_attribute_iv, + algorithm: 'aes-256-gcm', + key: Settings.attr_encrypted_db_key_base_32, + encode: false, + encode_iv: false + + belongs_to :project + belongs_to :triggerer, class_name: 'User', optional: true + + validates :project, presence: true + validates :state, presence: true + + delegate :service_desk_setting, to: :project + + class << self + def generate_token + SecureRandom.alphanumeric(12) + end + end + + def accepted_until + return unless running? + return unless triggered_at.present? + + TIMEFRAME.since(triggered_at) + end + + def in_timeframe? + return false unless running? + + !!accepted_until&.future? + end + end +end diff --git a/app/models/service_desk_setting.rb b/app/models/service_desk_setting.rb index 5152746abb4..69afb445734 100644 --- a/app/models/service_desk_setting.rb +++ b/app/models/service_desk_setting.rb @@ -3,6 +3,8 @@ class ServiceDeskSetting < ApplicationRecord include Gitlab::Utils::StrongMemoize + CUSTOM_EMAIL_VERIFICATION_SUBADDRESS = '+verify' + attribute :custom_email_enabled, default: false attr_encrypted :custom_email_smtp_password, mode: :per_attribute_iv, @@ -12,6 +14,7 @@ class ServiceDeskSetting < ApplicationRecord encode_iv: false belongs_to :project + validates :project_id, presence: true validate :valid_issue_template validate :valid_project_key @@ -32,21 +35,25 @@ class ServiceDeskSetting < ApplicationRecord validates :custom_email, presence: true, devise_email: true, - if: :custom_email_enabled? + if: :needs_custom_email_smtp_credentials? validates :custom_email_smtp_address, presence: true, hostname: { allow_numeric_hostname: true, require_valid_tld: true }, - if: :custom_email_enabled? + if: :needs_custom_email_smtp_credentials? validates :custom_email_smtp_username, presence: true, - if: :custom_email_enabled? + if: :needs_custom_email_smtp_credentials? validates :custom_email_smtp_port, presence: true, numericality: { only_integer: true, greater_than: 0 }, - if: :custom_email_enabled? + if: :needs_custom_email_smtp_credentials? scope :with_project_key, ->(key) { where(project_key: key) } + def custom_email_verification + project&.service_desk_custom_email_verification + end + def custom_email_delivery_options { user_name: custom_email_smtp_username, @@ -57,6 +64,12 @@ class ServiceDeskSetting < ApplicationRecord } end + def custom_email_address_for_verification + return unless custom_email.present? + + custom_email.sub("@", "#{CUSTOM_EMAIL_VERIFICATION_SUBADDRESS}@") + end + def issue_template_content strong_memoize(:issue_template_content) do next unless issue_template_key.present? @@ -102,6 +115,10 @@ class ServiceDeskSetting < ApplicationRecord setting.project.full_path_slug == project_slug end end + + def needs_custom_email_smtp_credentials? + custom_email_enabled? || custom_email_verification.present? + end end ServiceDeskSetting.prepend_mod diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 9ec685c5580..8ed5513aab9 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -183,7 +183,7 @@ class Snippet < ApplicationRecord end def link_reference_pattern - @link_reference_pattern ||= super("snippets", /(?<snippet>\d+)/) + @link_reference_pattern ||= compose_link_reference_pattern('snippets', /(?<snippet>\d+)/) end def find_by_id_and_project(id:, project:) @@ -203,14 +203,7 @@ class Snippet < ApplicationRecord end def initialize(attributes = {}) - # We can't use default_value_for because the database has a default - # value of 0 for visibility_level. If someone attempts to create a - # private snippet, default_value_for will assume that the - # visibility_level hasn't changed and will use the application - # setting default, which could be internal or public. - # - # To fix the problem, we assign the actual snippet default if no - # explicit visibility has been initialized. + # We assign the actual snippet default if no explicit visibility has been initialized. attributes ||= {} unless visibility_attribute_present?(attributes) diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb index bb8527d8c01..0e0534d45ae 100644 --- a/app/models/system_note_metadata.rb +++ b/app/models/system_note_metadata.rb @@ -26,8 +26,7 @@ class SystemNoteMetadata < ApplicationRecord title time_tracking branch milestone discussion task moved cloned opened closed merged duplicate locked unlocked outdated reviewer tag due_date start_date_or_due_date pinned_embed cherry_pick health_status approved unapproved - status alert_issue_added relate unrelate new_alert_added severity - attention_requested attention_request_removed contact timeline_event + status alert_issue_added relate unrelate new_alert_added severity contact timeline_event issue_type relate_to_child unrelate_from_child relate_to_parent unrelate_from_parent ].freeze diff --git a/app/models/user.rb b/app/models/user.rb index f3e8f14adf5..3bd8a035357 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -28,6 +28,7 @@ class User < ApplicationRecord include UpdateHighestRole include HasUserType include Gitlab::Auth::Otp::Fortinet + include Gitlab::Auth::Otp::DuoAuth include RestrictedSignup include StripAttribute include EachBatch @@ -71,6 +72,7 @@ class User < ApplicationRecord attribute :notified_of_own_activity, default: false attribute :preferred_language, default: -> { Gitlab::CurrentSettings.default_preferred_language } attribute :theme_id, default: -> { gitlab_config.default_theme } + attribute :color_scheme_id, default: -> { Gitlab::CurrentSettings.default_syntax_highlighting_theme } attr_encrypted :otp_secret, key: Gitlab::Application.secrets.otp_key_base, @@ -101,8 +103,6 @@ class User < ApplicationRecord MINIMUM_DAYS_CREATED = 7 - ignore_columns %i[linkedin twitter skype website_url location organization], remove_with: '15.10', remove_after: '2023-02-22' - # Override Devise::Models::Trackable#update_tracked_fields! # to limit database writes to at most once every hour # rubocop: disable CodeReuse/ServiceClass @@ -227,7 +227,9 @@ class User < ApplicationRecord has_many :notification_settings has_many :award_emoji, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :triggers, class_name: 'Ci::Trigger', foreign_key: :owner_id + has_many :audit_events, foreign_key: :author_id, inverse_of: :user + has_many :alert_assignees, class_name: '::AlertManagement::AlertAssignee', inverse_of: :assignee has_many :issue_assignees, inverse_of: :assignee has_many :merge_request_assignees, inverse_of: :assignee, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :merge_request_reviewers, inverse_of: :reviewer, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -289,7 +291,7 @@ class User < ApplicationRecord validate :check_password_weakness, if: :encrypted_password_changed? validates :namespace, presence: true - validate :namespace_move_dir_allowed, if: :username_changed? + validate :namespace_move_dir_allowed, if: :username_changed?, unless: :new_record? validate :unique_email, if: :email_changed? validate :notification_email_verified, if: :notification_email_changed? @@ -614,13 +616,12 @@ class User < ApplicationRecord def self.with_two_factor where(otp_required_for_login: true) - .or(where_exists(U2fRegistration.where(U2fRegistration.arel_table[:user_id].eq(arel_table[:id])))) .or(where_exists(WebauthnRegistration.where(WebauthnRegistration.arel_table[:user_id].eq(arel_table[:id])))) end def self.without_two_factor where - .missing(:u2f_registrations, :webauthn_registrations) + .missing(:webauthn_registrations) .where(otp_required_for_login: false) end @@ -1062,27 +1063,14 @@ class User < ApplicationRecord end def two_factor_enabled? - two_factor_otp_enabled? || two_factor_webauthn_u2f_enabled? + two_factor_otp_enabled? || two_factor_webauthn_enabled? end def two_factor_otp_enabled? otp_required_for_login? || forti_authenticator_enabled?(self) || - forti_token_cloud_enabled?(self) - end - - def two_factor_u2f_enabled? - return false if Feature.enabled?(:webauthn) - - if u2f_registrations.loaded? - u2f_registrations.any? - else - u2f_registrations.exists? - end - end - - def two_factor_webauthn_u2f_enabled? - two_factor_u2f_enabled? || two_factor_webauthn_enabled? + forti_token_cloud_enabled?(self) || + duo_auth_enabled?(self) end def two_factor_webauthn_enabled? @@ -1725,11 +1713,7 @@ class User < ApplicationRecord end def manageable_groups(include_groups_with_developer_maintainer_access: false) - owned_and_maintainer_group_hierarchy = if Feature.enabled?(:linear_user_manageable_groups, self) - owned_or_maintainers_groups.self_and_descendants - else - Gitlab::ObjectHierarchy.new(owned_or_maintainers_groups).base_and_descendants - end + owned_and_maintainer_group_hierarchy = owned_or_maintainers_groups.self_and_descendants if include_groups_with_developer_maintainer_access union_sql = ::Gitlab::SQL::Union.new( @@ -2136,7 +2120,15 @@ class User < ApplicationRecord end def confirmation_required_on_sign_in? - !confirmed? && !confirmation_period_valid? + return false if confirmed? + + if ::Gitlab::CurrentSettings.email_confirmation_setting_off? + false + elsif ::Gitlab::CurrentSettings.email_confirmation_setting_soft? + !in_confirmation_period? + elsif ::Gitlab::CurrentSettings.email_confirmation_setting_hard? + true + end end def impersonated? @@ -2217,10 +2209,13 @@ class User < ApplicationRecord # override from Devise::Confirmable def confirmation_period_valid? - return false if Feature.disabled?(:soft_email_confirmation) + return super if ::Gitlab::CurrentSettings.email_confirmation_setting_soft? - super + # Following devise logic for method, we want to return `true` + # See: https://github.com/heartcombo/devise/blob/main/lib/devise/models/confirmable.rb#L191-L218 + true end + alias_method :in_confirmation_period?, :confirmation_period_valid? # This is copied from Devise::Models::TwoFactorAuthenticatable#consume_otp! # diff --git a/app/models/user_status.rb b/app/models/user_status.rb index 0c66f465356..da24ef47a2a 100644 --- a/app/models/user_status.rb +++ b/app/models/user_status.rb @@ -17,7 +17,7 @@ class UserStatus < ApplicationRecord '30_days' => 30.days }.freeze - belongs_to :user + belongs_to :user, inverse_of: :status enum availability: { not_set: 0, busy: 1 } diff --git a/app/models/users/banned_user.rb b/app/models/users/banned_user.rb index 615668e2b55..466fc71f83a 100644 --- a/app/models/users/banned_user.rb +++ b/app/models/users/banned_user.rb @@ -10,3 +10,5 @@ module Users validates :user_id, uniqueness: { message: N_("banned user already exists") } end end + +Users::BannedUser.prepend_mod_with('Users::BannedUser') diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb index 3f9353214ee..70c31f0a8ec 100644 --- a/app/models/users/callout.rb +++ b/app/models/users/callout.rb @@ -65,7 +65,8 @@ module Users new_top_level_group_alert: 61, artifacts_management_page_feedback_banner: 62, vscode_web_ide: 63, - vscode_web_ide_callout: 64 + vscode_web_ide_callout: 64, + branch_rules_info_callout: 65 } validates :feature_name, diff --git a/app/models/users/group_callout.rb b/app/models/users/group_callout.rb index 2552407fa4c..fe04800539c 100644 --- a/app/models/users/group_callout.rb +++ b/app/models/users/group_callout.rb @@ -24,7 +24,9 @@ module Users namespace_storage_limit_banner_error_threshold: 13, # EE-only usage_quota_trial_alert: 14, # EE-only preview_usage_quota_free_plan_alert: 15, # EE-only - enforcement_at_limit_alert: 16 # EE-only + enforcement_at_limit_alert: 16, # EE-only + web_hook_disabled: 17, # EE-only + unlimited_members_during_trial_alert: 18 # EE-only } validates :group, presence: true diff --git a/app/models/wiki.rb b/app/models/wiki.rb index 57488749b76..33b2b3b7c87 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -326,6 +326,11 @@ class Wiki content, previous_path: page.path, **multi_commit_options(:updated, message, title)) + repository.move_dir_files( + user, + sluggified_title(title), + page.url_path, + **multi_commit_options(:moved, message, title)) after_wiki_activity diff --git a/app/models/wiki_directory.rb b/app/models/wiki_directory.rb index 76fe664f23d..e57d186a3e3 100644 --- a/app/models/wiki_directory.rb +++ b/app/models/wiki_directory.rb @@ -7,34 +7,48 @@ class WikiDirectory validates :slug, presence: true alias_method :to_param, :slug - # Groups a list of wiki pages into a nested collection of WikiPage and WikiDirectory objects, - # preserving the order of the passed pages. - # - # Returns an array with all entries for the toplevel directory. - # - # @param [Array<WikiPage>] pages - # @return [Array<WikiPage, WikiDirectory>] - # - def self.group_pages(pages) - # Build a hash to map paths to created WikiDirectory objects, - # and recursively create them for each level of the path. - # For the toplevel directory we use '' as path, as that's what WikiPage#directory returns. - directories = Hash.new do |_, path| - directories[path] = new(path).tap do |directory| - if path.present? - parent = File.dirname(path) - parent = '' if parent == '.' - directories[parent].entries << directory - directories[parent].entries.delete_if { |item| item.is_a?(WikiPage) && item.slug == directory.slug } + class << self + # Groups a list of wiki pages into a nested collection of WikiPage and WikiDirectory objects, + # preserving the order of the passed pages. + # + # Returns an array with all entries for the toplevel directory. + # + # @param [Array<WikiPage>] pages + # @return [Array<WikiPage, WikiDirectory>] + # + def group_pages(pages) + # Build a hash to map paths to created WikiDirectory objects, + # and recursively create them for each level of the path. + # For the toplevel directory we use '' as path, as that's what WikiPage#directory returns. + directories = Hash.new do |_, path| + directories[path] = new(path).tap do |directory| + if path.present? + parent = File.dirname(path) + parent = '' if parent == '.' + directories[parent].entries << directory + directories[parent].entries.delete_if do |item| + item.is_a?(WikiPage) && item.slug.casecmp?(directory.slug) + end + end end end - end - pages.each do |page| - directories[page.directory].entries << page + pages.each do |page| + next unless directory_for_page?(directories[page.directory], page) + + directories[page.directory].entries << page + end + + directories[''].entries end - directories[''].entries + private + + def directory_for_page?(directory, page) + directory.entries.none? do |item| + item.is_a?(WikiDirectory) && item.slug.casecmp?(page.slug) + end + end end def initialize(slug, entries = []) diff --git a/app/models/work_item.rb b/app/models/work_item.rb index 5ae3fb6cf78..a7cd522f023 100644 --- a/app/models/work_item.rb +++ b/app/models/work_item.rb @@ -85,6 +85,26 @@ class WorkItem < Issue COMMON_QUICK_ACTIONS_COMMANDS + commands_for_widgets end + # Widgets have a set of quick action params that they must process. + # Map them to widget_params so they can be picked up by widget services. + def transform_quick_action_params(command_params) + common_params = command_params.deep_dup + widget_params = {} + + work_item_type.widgets + .filter { |widget| widget.respond_to?(:quick_action_params) } + .each do |widget| + widget.quick_action_params + .filter { |param_name| common_params.key?(param_name) } + .each do |param_name| + widget_params[widget.api_symbol] ||= {} + widget_params[widget.api_symbol][param_name] = common_params.delete(param_name) + end + end + + { common: common_params, widgets: widget_params } + end + private override :parent_link_confidentiality diff --git a/app/models/work_items/widget_definition.rb b/app/models/work_items/widget_definition.rb index 5d4414e95d8..9e8c421d740 100644 --- a/app/models/work_items/widget_definition.rb +++ b/app/models/work_items/widget_definition.rb @@ -28,7 +28,8 @@ module WorkItems progress: 10, # EE-only status: 11, # EE-only requirement_legacy: 12, # EE-only - test_reports: 13 # EE-only + test_reports: 13, # EE-only + notifications: 14 } def self.available_widgets diff --git a/app/models/work_items/widgets/notifications.rb b/app/models/work_items/widgets/notifications.rb new file mode 100644 index 00000000000..9a13e5ebbea --- /dev/null +++ b/app/models/work_items/widgets/notifications.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +module WorkItems + module Widgets + class Notifications < Base + delegate :subscribed?, to: :work_item + end + end +end diff --git a/app/policies/achievements/user_achievement_policy.rb b/app/policies/achievements/user_achievement_policy.rb new file mode 100644 index 00000000000..b500d0a25c8 --- /dev/null +++ b/app/policies/achievements/user_achievement_policy.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Achievements + class UserAchievementPolicy < ::BasePolicy + delegate { @subject.achievement.namespace } + end +end diff --git a/app/policies/ci/pipeline_schedule_policy.rb b/app/policies/ci/pipeline_schedule_policy.rb index 3a674bfef92..7b0d484f9f7 100644 --- a/app/policies/ci/pipeline_schedule_policy.rb +++ b/app/policies/ci/pipeline_schedule_policy.rb @@ -23,6 +23,10 @@ module Ci enable :update_pipeline_schedule end + # `take_ownership_pipeline_schedule` is deprecated, and should not be used. It can be removed in 17.0 + # once the deprecated field `take_ownership_pipeline_schedule` is removed from the GraphQL type + # `PermissionTypes::Ci::PipelineSchedules`. + # Use `admin_pipeline_schedule` to decide if a user has the ability to take ownership of a pipeline schedule. rule { can?(:admin_pipeline_schedule) & ~owner_of_schedule }.policy do enable :take_ownership_pipeline_schedule end diff --git a/app/policies/ci/runner_machine_policy.rb b/app/policies/ci/runner_machine_policy.rb new file mode 100644 index 00000000000..9893d7dee14 --- /dev/null +++ b/app/policies/ci/runner_machine_policy.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module Ci + class RunnerMachinePolicy < BasePolicy + with_options scope: :subject, score: 0 + + condition(:can_read_runner, scope: :subject) do + can?(:read_runner, @subject.runner) + end + + rule { anonymous }.prevent_all + + rule { can_read_runner }.policy do + enable :read_builds + enable :read_runner_machine + end + end +end diff --git a/app/policies/clusters/instance_policy.rb b/app/policies/clusters/instance_policy.rb index 3c5ca4bf4e1..2781e943bae 100644 --- a/app/policies/clusters/instance_policy.rb +++ b/app/policies/clusters/instance_policy.rb @@ -9,6 +9,7 @@ module Clusters enable :update_cluster enable :admin_cluster enable :read_prometheus + enable :use_k8s_proxies end end end diff --git a/app/policies/concerns/archived_abilities.rb b/app/policies/concerns/archived_abilities.rb index b4dfad599c7..7d61f83528e 100644 --- a/app/policies/concerns/archived_abilities.rb +++ b/app/policies/concerns/archived_abilities.rb @@ -37,6 +37,7 @@ module ArchivedAbilities pages cluster release + timelog ].freeze class_methods do diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb index d028738ccc9..b64e7e16433 100644 --- a/app/policies/global_policy.rb +++ b/app/policies/global_policy.rb @@ -23,9 +23,11 @@ class GlobalPolicy < BasePolicy condition(:migration_bot, scope: :user) { @user&.migration_bot? } condition(:create_runner_workflow_enabled) do - Feature.enabled?(:create_runner_workflow) + Feature.enabled?(:create_runner_workflow_for_admin, @user) end + condition(:service_account, scope: :user) { @user&.service_account? } + rule { anonymous }.policy do prevent :log_in prevent :receive_notifications @@ -64,7 +66,7 @@ class GlobalPolicy < BasePolicy prevent :access_git end - rule { project_bot }.policy do + rule { project_bot | service_account }.policy do prevent :log_in prevent :receive_notifications end diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 6cc65248914..ee1140b8405 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -85,7 +85,11 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy condition(:crm_enabled, score: 0, scope: :subject) { @subject.crm_enabled? } condition(:create_runner_workflow_enabled) do - Feature.enabled?(:create_runner_workflow) + Feature.enabled?(:create_runner_workflow_for_namespace, group) + end + + condition(:achievements_enabled, scope: :subject) do + Feature.enabled?(:achievements, @subject) end condition(:group_runner_registration_allowed, scope: :subject) do @@ -131,9 +135,17 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :read_group_member enable :read_custom_emoji enable :read_counts + end + + rule { can?(:read_group) & achievements_enabled }.policy do enable :read_achievement end + rule { can?(:maintainer_access) & achievements_enabled }.policy do + enable :admin_achievement + enable :award_achievement + end + rule { ~public_group & ~has_access }.prevent :read_counts rule { ~can_read_group_member }.policy do @@ -147,17 +159,15 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy rule { has_access }.enable :read_namespace rule { developer }.policy do - enable :create_metrics_dashboard_annotation - enable :delete_metrics_dashboard_annotation - enable :update_metrics_dashboard_annotation + enable :admin_metrics_dashboard_annotation enable :create_custom_emoji enable :create_package enable :developer_access enable :admin_crm_organization enable :admin_crm_contact enable :read_cluster - enable :read_group_all_available_runners + enable :use_k8s_proxies end rule { reporter }.policy do @@ -191,7 +201,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :maintainer_access enable :read_upload enable :destroy_upload - enable :admin_achievement end rule { owner }.policy do @@ -246,7 +255,9 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy rule { ~can?(:view_globally) }.prevent :request_access rule { has_access }.prevent :request_access - rule { owner & (~share_with_group_locked | ~has_parent | ~parent_share_with_group_locked | can_change_parent_share_with_group_lock) }.enable :change_share_with_group_lock + rule do + owner & (~share_with_group_locked | ~has_parent | ~parent_share_with_group_locked | can_change_parent_share_with_group_lock) + end.enable :change_share_with_group_lock rule { developer & developer_maintainer_access }.enable :create_projects rule { create_projects_disabled }.prevent :create_projects @@ -325,6 +336,10 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :read_observability end + rule { can?(:maintainer_access) & observability_enabled }.policy do + enable :admin_observability + end + rule { ~create_runner_workflow_enabled }.policy do prevent :create_group_runners end diff --git a/app/policies/issue_policy.rb b/app/policies/issue_policy.rb index d1e35793c64..804709ed072 100644 --- a/app/policies/issue_policy.rb +++ b/app/policies/issue_policy.rb @@ -59,6 +59,7 @@ class IssuePolicy < IssuablePolicy rule { ~can?(:read_issue) }.policy do prevent :read_design prevent :create_design + prevent :update_design prevent :destroy_design end diff --git a/app/policies/project_hook_policy.rb b/app/policies/project_hook_policy.rb index c177fabb1ba..b4590c13670 100644 --- a/app/policies/project_hook_policy.rb +++ b/app/policies/project_hook_policy.rb @@ -1,10 +1,9 @@ # frozen_string_literal: true class ProjectHookPolicy < ::BasePolicy - delegate(:project) + delegate { @subject.project } rule { can?(:admin_project) }.policy do - enable :read_web_hook enable :destroy_web_hook end end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 875520d24be..a955de77309 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -234,8 +234,12 @@ class ProjectPolicy < BasePolicy Gitlab.config.packages.enabled end + condition :terraform_state_disabled do + !Gitlab.config.terraform_state.enabled + end + condition(:create_runner_workflow_enabled) do - Feature.enabled?(:create_runner_workflow) + Feature.enabled?(:create_runner_workflow_for_namespace, project.namespace) end # `:read_project` may be prevented in EE, but `:read_project_for_iids` should @@ -257,6 +261,7 @@ class ProjectPolicy < BasePolicy enable :reporter_access enable :developer_access enable :maintainer_access + enable :add_catalog_resource enable :change_namespace enable :change_visibility_level @@ -353,6 +358,7 @@ class ProjectPolicy < BasePolicy enable :read_ci_cd_analytics enable :read_external_emails enable :read_grafana + enable :export_work_items end # We define `:public_user_access` separately because there are cases in gitlab-ee @@ -404,11 +410,15 @@ class ProjectPolicy < BasePolicy end rule { infrastructure_disabled }.policy do - prevent(*create_read_update_admin_destroy(:terraform_state)) prevent(*create_read_update_admin_destroy(:cluster)) prevent(:read_pod_logs) prevent(:read_prometheus) prevent(:admin_project_google_cloud) + prevent(:admin_project_aws) + end + + rule { infrastructure_disabled | terraform_state_disabled }.policy do + prevent(*create_read_update_admin_destroy(:terraform_state)) end rule { can?(:metrics_dashboard) }.policy do @@ -429,6 +439,7 @@ class ProjectPolicy < BasePolicy rule { ~request_access_enabled }.prevent :request_access rule { can?(:developer_access) & can?(:create_issue) }.enable :import_issues + rule { can?(:reporter_access) & can?(:create_work_item) }.enable :import_work_items rule { can?(:developer_access) }.policy do enable :create_package @@ -455,15 +466,15 @@ class ProjectPolicy < BasePolicy enable :create_deployment enable :update_deployment enable :read_cluster + enable :use_k8s_proxies enable :create_release enable :update_release enable :destroy_release - enable :create_metrics_dashboard_annotation - enable :delete_metrics_dashboard_annotation - enable :update_metrics_dashboard_annotation + enable :admin_metrics_dashboard_annotation enable :read_alert_management_alert enable :update_alert_management_alert enable :create_design + enable :update_design enable :move_design enable :destroy_design enable :read_terraform_state @@ -477,7 +488,6 @@ class ProjectPolicy < BasePolicy enable :update_escalation_status enable :read_secure_files enable :update_sentry_issue - enable :read_airflow_dags end rule { can?(:developer_access) & user_confirmed? }.policy do @@ -531,8 +541,8 @@ class ProjectPolicy < BasePolicy enable :create_project_runners enable :update_runners_registration_token enable :admin_project_google_cloud + enable :admin_project_aws enable :admin_secure_files - enable :read_web_hooks enable :read_upload enable :destroy_upload enable :admin_incident_management_timeline_event_tag @@ -752,6 +762,7 @@ class ProjectPolicy < BasePolicy prevent :read_design prevent :read_design_activity prevent :create_design + prevent :update_design prevent :destroy_design prevent :move_design end @@ -780,6 +791,7 @@ class ProjectPolicy < BasePolicy rule { write_package_registry_deploy_token }.policy do enable :create_package enable :read_package + enable :destroy_package enable :read_project end diff --git a/app/presenters/README.md b/app/presenters/README.md index e2461580107..5b600e8f2b2 100644 --- a/app/presenters/README.md +++ b/app/presenters/README.md @@ -165,15 +165,15 @@ however, there is a risk that it accidentally overrides important logic. For example, [this production incident](https://gitlab.com/gitlab-com/gl-infra/production/-/issues/5498) was caused by [including `ActionView::Helpers::UrlHelper` in a presenter](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69537/diffs#4b581cff00ef3cc9780efd23682af383de302e7d_3_3). -The `tag` accesor in `Ci::Build` was accidentally overridden by `ActionView::Helpers::TagHelper#tag`, -and as a conseuqence, a wrong `tag` value was persited into database. +The `tag` accessor in `Ci::Build` was accidentally overridden by `ActionView::Helpers::TagHelper#tag`, +and as a consequence, a wrong `tag` value was persisted into database. -Starting from GitLab 14.4, we validate the presenters (specifically all of the subclasses of `Gitlab::View::Presenter::Delegated`) +Starting from GitLab 14.4, we [validate](../../lib/gitlab/utils/delegator_override/validator.rb) the presenters (specifically all of the subclasses of `Gitlab::View::Presenter::Delegated`) that they do not accidentally override core/backend logic. In such case, a pipeline in merge requests fails with an error message, here is an example: ```plaintext -We've detected that a presetner is overriding a specific method(s) on a subject model. +We've detected that a presenter is overriding a specific method(s) on a subject model. There is a risk that it accidentally modifies the backend/core logic that leads to production incident. Please follow https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/presenters/README.md#validate-accidental-overrides to resolve this error with caution. @@ -193,7 +193,7 @@ Here are the potential solutions: ### How to use the `Gitlab::Utils::DelegatorOverride` validator -If a presenter class inhertis from `Gitlab::View::Presenter::Delegated`, +If a presenter class inherits from `Gitlab::View::Presenter::Delegated`, you should define what object class is presented: ```ruby @@ -201,7 +201,7 @@ class WebHookLogPresenter < Gitlab::View::Presenter::Delegated presents ::WebHookLog, as: :web_hook_log # This defines that the presenter presents `WebHookLog` Active Record model. ``` -These presenters are validated not to accidentaly override the methods in the presented object. +These presenters are validated not to accidentally override the methods in the presented object. You can run the validation locally with: ```shell diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb index 9a586a1733f..79c1946f3d2 100644 --- a/app/presenters/ci/build_runner_presenter.rb +++ b/app/presenters/ci/build_runner_presenter.rb @@ -34,9 +34,7 @@ module Ci def runner_variables variables - .sort_and_expand_all(keep_undefined: true, - expand_file_refs: false, - expand_raw_refs: false) + .sort_and_expand_all(keep_undefined: true, expand_file_refs: false, expand_raw_refs: false) .to_runner_variables end @@ -58,7 +56,7 @@ module Ci # rubocop: disable CodeReuse/ActiveRecord def all_dependencies dependencies = super - ActiveRecord::Associations::Preloader.new.preload(dependencies, :job_artifacts_archive) + ActiveRecord::Associations::Preloader.new(records: dependencies, associations: :job_artifacts_archive).call dependencies end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/presenters/commit_presenter.rb b/app/presenters/commit_presenter.rb index 2cb88179845..2f505901901 100644 --- a/app/presenters/commit_presenter.rb +++ b/app/presenters/commit_presenter.rb @@ -25,6 +25,10 @@ class CommitPresenter < Gitlab::View::Presenter::Delegated commit.pipelines.any? end + def tags_for_display + commit.referenced_by&.map { |tag| tag.delete_prefix(Gitlab::Git::TAG_REF_PREFIX) } + end + def signature_html return unless commit.has_signature? diff --git a/app/presenters/event_presenter.rb b/app/presenters/event_presenter.rb index 2f2fb1aa3ba..a098db7fbbc 100644 --- a/app/presenters/event_presenter.rb +++ b/app/presenters/event_presenter.rb @@ -9,7 +9,7 @@ class EventPresenter < Gitlab::View::Presenter::Delegated @visible_to_user_cache = ActiveSupport::Cache::MemoryStore.new end - # Caching `visible_to_user?` method in the presenter beause it might be called multiple times. + # Caching `visible_to_user?` method in the presenter because it might be called multiple times. delegator_override :visible_to_user? def visible_to_user?(user = nil) @visible_to_user_cache.fetch(user&.id) { super(user) } diff --git a/app/presenters/label_presenter.rb b/app/presenters/label_presenter.rb index e60cdf4088c..56d986a9c23 100644 --- a/app/presenters/label_presenter.rb +++ b/app/presenters/label_presenter.rb @@ -27,14 +27,18 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated def filter_path(type: :issue) case context_subject when Group - send("#{type.to_s.pluralize}_group_path", # rubocop:disable GitlabSecurity/PublicSend - context_subject, - label_name: [label.name]) + send( # rubocop:disable GitlabSecurity/PublicSend + "#{type.to_s.pluralize}_group_path", + context_subject, + label_name: [label.name] + ) when Project - send("namespace_project_#{type.to_s.pluralize}_path", # rubocop:disable GitlabSecurity/PublicSend - context_subject.namespace, - context_subject, - label_name: [label.name]) + send( # rubocop:disable GitlabSecurity/PublicSend + "namespace_project_#{type.to_s.pluralize}_path", + context_subject.namespace, + context_subject, + label_name: [label.name] + ) end end diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 353e0fad6fb..12f4b0496e4 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -57,9 +57,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated notice_now: edit_in_new_fork_notice_now } - project_forks_path(merge_request.project, - namespace_key: current_user.namespace.id, - continue: continue_params) + project_forks_path(merge_request.project, namespace_key: current_user.namespace.id, continue: continue_params) end end @@ -71,9 +69,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated notice_now: edit_in_new_fork_notice_now } - project_forks_path(project, - namespace_key: current_user.namespace.id, - continue: continue_params) + project_forks_path(project, namespace_key: current_user.namespace.id, continue: continue_params) end end @@ -155,12 +151,12 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated def assign_to_closing_issues_count # rubocop: disable CodeReuse/ServiceClass - issues = MergeRequests::AssignIssuesService.new(project: project, - current_user: current_user, - params: { - merge_request: merge_request, - closes_issues: closing_issues - }).assignable_issues + issues = MergeRequests::AssignIssuesService.new( + project: project, + current_user: current_user, + params: { merge_request: merge_request, closes_issues: closing_issues } + ).assignable_issues + issues.count # rubocop: enable CodeReuse/ServiceClass end diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index 392a2fcd390..c02f3021069 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -99,11 +99,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated def contribution_guide_path if project && contribution_guide = repository.contribution_guide - project_blob_path( - project, - tree_join(project.default_branch, - contribution_guide.name) - ) + project_blob_path(project, tree_join(project.default_branch, contribution_guide.name)) end end @@ -166,14 +162,16 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated def storage_anchor_data can_show_quota = can?(current_user, :admin_project, project) && !empty_repo? - AnchorData.new(true, - statistic_icon('disk') + - _('%{strong_start}%{human_size}%{strong_end} Project Storage').html_safe % { - human_size: storage_counter(statistics.storage_size), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - can_show_quota ? project_usage_quotas_path(project) : nil) + AnchorData.new( + true, + statistic_icon('disk') + + _('%{strong_start}%{human_size}%{strong_end} Project Storage').html_safe % { + human_size: storage_counter(statistics.storage_size), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + can_show_quota ? project_usage_quotas_path(project) : nil + ) end def releases_anchor_data @@ -182,14 +180,16 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated releases_count = project.releases.count return if releases_count < 1 - AnchorData.new(true, - statistic_icon('deployments') + - n_('%{strong_start}%{release_count}%{strong_end} Release', '%{strong_start}%{release_count}%{strong_end} Releases', releases_count).html_safe % { - release_count: number_with_delimiter(releases_count), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - project_releases_path(project)) + AnchorData.new( + true, + statistic_icon('deployments') + + n_('%{strong_start}%{release_count}%{strong_end} Release', '%{strong_start}%{release_count}%{strong_end} Releases', releases_count).html_safe % { + release_count: number_with_delimiter(releases_count), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + project_releases_path(project) + ) end def environments_anchor_data @@ -198,67 +198,76 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated environments_count = project.environments.available.count return if environments_count == 0 - AnchorData.new(true, - statistic_icon('environment') + - n_('%{strong_start}%{count}%{strong_end} Environment', '%{strong_start}%{count}%{strong_end} Environments', environments_count).html_safe % { - count: number_with_delimiter(environments_count), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - project_environments_path(project)) + AnchorData.new( + true, + statistic_icon('environment') + + n_('%{strong_start}%{count}%{strong_end} Environment', '%{strong_start}%{count}%{strong_end} Environments', environments_count).html_safe % { + count: number_with_delimiter(environments_count), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + project_environments_path(project) + ) end def commits_anchor_data - AnchorData.new(true, - statistic_icon('commit') + - n_('%{strong_start}%{commit_count}%{strong_end} Commit', '%{strong_start}%{commit_count}%{strong_end} Commits', statistics.commit_count).html_safe % { - commit_count: number_with_delimiter(statistics.commit_count), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - empty_repo? ? nil : project_commits_path(project, default_branch_or_main)) + AnchorData.new( + true, + statistic_icon('commit') + + n_('%{strong_start}%{commit_count}%{strong_end} Commit', '%{strong_start}%{commit_count}%{strong_end} Commits', statistics.commit_count).html_safe % { + commit_count: number_with_delimiter(statistics.commit_count), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + empty_repo? ? nil : project_commits_path(project, default_branch_or_main) + ) end def branches_anchor_data - AnchorData.new(true, - statistic_icon('branch') + - n_('%{strong_start}%{branch_count}%{strong_end} Branch', '%{strong_start}%{branch_count}%{strong_end} Branches', repository.branch_count).html_safe % { - branch_count: number_with_delimiter(repository.branch_count), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - empty_repo? ? nil : project_branches_path(project)) + AnchorData.new( + true, + statistic_icon('branch') + + n_('%{strong_start}%{branch_count}%{strong_end} Branch', '%{strong_start}%{branch_count}%{strong_end} Branches', repository.branch_count).html_safe % { + branch_count: number_with_delimiter(repository.branch_count), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + empty_repo? ? nil : project_branches_path(project) + ) end def tags_anchor_data - AnchorData.new(true, - statistic_icon('label') + - n_('%{strong_start}%{tag_count}%{strong_end} Tag', '%{strong_start}%{tag_count}%{strong_end} Tags', repository.tag_count).html_safe % { - tag_count: number_with_delimiter(repository.tag_count), - strong_start: '<strong class="project-stat-value">'.html_safe, - strong_end: '</strong>'.html_safe - }, - empty_repo? ? nil : project_tags_path(project)) + AnchorData.new( + true, + statistic_icon('label') + + n_('%{strong_start}%{tag_count}%{strong_end} Tag', '%{strong_start}%{tag_count}%{strong_end} Tags', repository.tag_count).html_safe % { + tag_count: number_with_delimiter(repository.tag_count), + strong_start: '<strong class="project-stat-value">'.html_safe, + strong_end: '</strong>'.html_safe + }, + empty_repo? ? nil : project_tags_path(project) + ) end def upload_anchor_data strong_memoize(:upload_anchor_data) do next unless can_current_user_push_to_default_branch? - AnchorData.new(false, - statistic_icon('upload') + _('Upload file'), - '#modal-upload-blob', - 'js-upload-file-trigger', - nil, - nil, - { - 'target_branch' => default_branch_or_main, - 'original_branch' => default_branch_or_main, - 'can_push_code' => 'true', - 'path' => project_create_blob_path(project, default_branch_or_main), - 'project_path' => project.full_path - } - ) + AnchorData.new( + false, + statistic_icon('upload') + _('Upload file'), + '#modal-upload-blob', + 'js-upload-file-trigger', + nil, + nil, + { + 'target_branch' => default_branch_or_main, + 'original_branch' => default_branch_or_main, + 'can_push_code' => 'true', + 'path' => project_create_blob_path(project, default_branch_or_main), + 'project_path' => project.full_path + } + ) end end @@ -266,37 +275,38 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated if can_current_user_push_to_default_branch? new_file_path = empty_repo? ? ide_edit_path(project, default_branch_or_main) : project_new_blob_path(project, default_branch_or_main) - AnchorData.new(false, - statistic_icon + _('New file'), - new_file_path, - 'btn-dashed') + AnchorData.new(false, statistic_icon + _('New file'), new_file_path, 'btn-dashed') end end def readme_anchor_data if can_current_user_push_to_default_branch? && readme_path.nil? - AnchorData.new(false, - statistic_icon + _('Add README'), - empty_repo? ? add_readme_ide_path : add_readme_path) + AnchorData.new(false, statistic_icon + _('Add README'), empty_repo? ? add_readme_ide_path : add_readme_path) elsif readme_path - AnchorData.new(false, - statistic_icon('doc-text') + _('README'), - default_view != 'readme' ? readme_path : '#readme', - 'btn-default', - 'doc-text') + AnchorData.new( + false, + statistic_icon('doc-text') + _('README'), + default_view != 'readme' ? readme_path : '#readme', + 'btn-default', + 'doc-text' + ) end end def changelog_anchor_data if can_current_user_push_to_default_branch? && repository.changelog.blank? - AnchorData.new(false, - statistic_icon + _('Add CHANGELOG'), - empty_repo? ? add_changelog_ide_path : add_changelog_path) + AnchorData.new( + false, + statistic_icon + _('Add CHANGELOG'), + empty_repo? ? add_changelog_ide_path : add_changelog_path + ) elsif repository.changelog.present? - AnchorData.new(false, - statistic_icon('doc-text') + _('CHANGELOG'), - changelog_path, - 'btn-default') + AnchorData.new( + false, + statistic_icon('doc-text') + _('CHANGELOG'), + changelog_path, + 'btn-default' + ) end end @@ -304,29 +314,37 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated icon = statistic_icon('scale') if repository.license_blob.present? - AnchorData.new(false, - icon + content_tag(:span, license_short_name, class: 'project-stat-value'), - license_path, - 'btn-default', - nil, - 'license') + AnchorData.new( + false, + icon + content_tag(:span, license_short_name, class: 'project-stat-value'), + license_path, + 'btn-default', + nil, + 'license' + ) elsif can_current_user_push_to_default_branch? - AnchorData.new(false, - content_tag(:span, statistic_icon + _('Add LICENSE'), class: 'add-license-link d-flex'), - empty_repo? ? add_license_ide_path : add_license_path) + AnchorData.new( + false, + content_tag(:span, statistic_icon + _('Add LICENSE'), class: 'add-license-link d-flex'), + empty_repo? ? add_license_ide_path : add_license_path + ) end end def contribution_guide_anchor_data if can_current_user_push_to_default_branch? && repository.contribution_guide.blank? - AnchorData.new(false, - statistic_icon + _('Add CONTRIBUTING'), - empty_repo? ? add_contribution_guide_ide_path : add_contribution_guide_path) + AnchorData.new( + false, + statistic_icon + _('Add CONTRIBUTING'), + empty_repo? ? add_contribution_guide_ide_path : add_contribution_guide_path + ) elsif repository.contribution_guide.present? - AnchorData.new(false, - statistic_icon('doc-text') + _('CONTRIBUTING'), - contribution_guide_path, - 'btn-default') + AnchorData.new( + false, + statistic_icon('doc-text') + _('CONTRIBUTING'), + contribution_guide_path, + 'btn-default' + ) end end @@ -335,35 +353,32 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout if auto_devops_enabled? - AnchorData.new(false, - statistic_icon('settings') + _('Auto DevOps enabled'), - project_settings_ci_cd_path(project, anchor: 'autodevops-settings'), - 'btn-default') + AnchorData.new( + false, + statistic_icon('settings') + _('Auto DevOps enabled'), + project_settings_ci_cd_path(project, anchor: 'autodevops-settings'), + 'btn-default' + ) else - AnchorData.new(false, - statistic_icon + _('Enable Auto DevOps'), - project_settings_ci_cd_path(project, anchor: 'autodevops-settings')) + AnchorData.new( + false, + statistic_icon + _('Enable Auto DevOps'), + project_settings_ci_cd_path(project, anchor: 'autodevops-settings') + ) end elsif auto_devops_enabled? - AnchorData.new(false, - _('Auto DevOps enabled'), - nil) + AnchorData.new(false, _('Auto DevOps enabled'), nil) end end def kubernetes_cluster_anchor_data if can_instantiate_cluster? if clusters.empty? - AnchorData.new(false, - statistic_icon + _('Add Kubernetes cluster'), - project_clusters_path(project)) + AnchorData.new(false, statistic_icon + _('Add Kubernetes cluster'), project_clusters_path(project)) else cluster_link = clusters.count == 1 ? project_cluster_path(project, clusters.first) : project_clusters_path(project) - AnchorData.new(false, - _('Kubernetes'), - cluster_link, - 'btn-default') + AnchorData.new(false, _('Kubernetes'), cluster_link, 'btn-default') end end end @@ -372,14 +387,9 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated return unless can_view_pipeline_editor?(project) if cicd_missing? - AnchorData.new(false, - statistic_icon + _('Set up CI/CD'), - project_ci_pipeline_editor_path(project)) + AnchorData.new(false, statistic_icon + _('Set up CI/CD'), project_ci_pipeline_editor_path(project)) elsif repository.gitlab_ci_yml.present? - AnchorData.new(false, - statistic_icon('doc-text') + _('CI/CD configuration'), - project_ci_pipeline_editor_path(project), - 'btn-default') + AnchorData.new(false, statistic_icon('doc-text') + _('CI/CD configuration'), project_ci_pipeline_editor_path(project), 'btn-default') end end diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb index 2e5d3ae21d9..84e98e18e32 100644 --- a/app/presenters/snippet_blob_presenter.rb +++ b/app/presenters/snippet_blob_presenter.rb @@ -40,9 +40,11 @@ class SnippetBlobPresenter < BlobPresenter end def render_rich_partial - renderer.render("projects/blob/viewers/_#{blob.rich_viewer.partial_name}", - locals: { viewer: blob.rich_viewer, blob: blob, blob_raw_path: raw_path, blob_raw_url: raw_url, parent_dir_raw_path: raw_directory }, - layout: false) + renderer.render( + "projects/blob/viewers/_#{blob.rich_viewer.partial_name}", + locals: { viewer: blob.rich_viewer, blob: blob, blob_raw_path: raw_path, blob_raw_url: raw_url, parent_dir_raw_path: raw_directory }, + layout: false + ) end def renderer diff --git a/app/serializers/admin/abuse_report_entity.rb b/app/serializers/admin/abuse_report_entity.rb new file mode 100644 index 00000000000..a550763f0ff --- /dev/null +++ b/app/serializers/admin/abuse_report_entity.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Admin + class AbuseReportEntity < Grape::Entity + expose :category + expose :updated_at + + expose :reported_user do |report| + UserEntity.represent(report.user, only: [:name]) + end + + expose :reporter do |report| + UserEntity.represent(report.reporter, only: [:name]) + end + end +end diff --git a/app/serializers/admin/abuse_report_serializer.rb b/app/serializers/admin/abuse_report_serializer.rb new file mode 100644 index 00000000000..af43e459482 --- /dev/null +++ b/app/serializers/admin/abuse_report_serializer.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Admin + class AbuseReportSerializer < BaseSerializer + entity Admin::AbuseReportEntity + end +end diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb deleted file mode 100644 index f57ac4af113..00000000000 --- a/app/serializers/cluster_application_entity.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -class ClusterApplicationEntity < Grape::Entity - expose :name - expose :status_name, as: :status - expose :status_reason - expose :version, if: -> (e, _) { e.respond_to?(:version) } - expose :external_ip, if: -> (e, _) { e.respond_to?(:external_ip) } - expose :external_hostname, if: -> (e, _) { e.respond_to?(:external_hostname) } - expose :hostname, if: -> (e, _) { e.respond_to?(:hostname) } - expose :email, if: -> (e, _) { e.respond_to?(:email) } - expose :stack, if: -> (e, _) { e.respond_to?(:stack) } - expose :update_available?, as: :update_available, if: -> (e, _) { e.respond_to?(:update_available?) } - expose :can_uninstall?, as: :can_uninstall - expose :available_domains, using: Serverless::DomainEntity, if: -> (e, _) { e.respond_to?(:available_domains) } - expose :pages_domain, using: Serverless::DomainEntity, if: -> (e, _) { e.respond_to?(:pages_domain) } - expose :host, if: -> (e, _) { e.respond_to?(:host) } - expose :port, if: -> (e, _) { e.respond_to?(:port) } - expose :protocol, if: -> (e, _) { e.respond_to?(:protocol) } -end diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb index 8e256863bcd..161758debca 100644 --- a/app/serializers/cluster_entity.rb +++ b/app/serializers/cluster_entity.rb @@ -13,7 +13,6 @@ class ClusterEntity < Grape::Entity expose :provider_type expose :status_name, as: :status expose :status_reason - expose :applications, using: ClusterApplicationEntity expose :path do |cluster| Clusters::ClusterPresenter.new(cluster).show_path # rubocop: disable CodeReuse/Presenter diff --git a/app/serializers/cluster_serializer.rb b/app/serializers/cluster_serializer.rb index 30b8863efa2..a4e12e51f69 100644 --- a/app/serializers/cluster_serializer.rb +++ b/app/serializers/cluster_serializer.rb @@ -22,6 +22,6 @@ class ClusterSerializer < BaseSerializer end def represent_status(resource) - represent(resource, { only: [:status, :status_reason, :applications] }) + represent(resource, { only: [:status, :status_reason] }) end end diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb index 76797a773b5..6c20f665bfa 100644 --- a/app/serializers/pipeline_details_entity.rb +++ b/app/serializers/pipeline_details_entity.rb @@ -8,8 +8,14 @@ class PipelineDetailsEntity < Ci::PipelineEntity end expose :details do - expose :manual_actions, using: BuildActionEntity - expose :scheduled_actions, using: BuildActionEntity + expose :manual_actions, unless: proc { options[:disable_manual_and_scheduled_actions] }, using: BuildActionEntity + expose :scheduled_actions, unless: proc { options[:disable_manual_and_scheduled_actions] }, using: BuildActionEntity + expose :has_manual_actions do |pipeline| + pipeline.manual_actions.any? + end + expose :has_scheduled_actions do |pipeline| + pipeline.scheduled_actions.any? + end end expose :triggered_by_pipeline, as: :triggered_by, with: TriggeredPipelineEntity diff --git a/app/serializers/profile/event_entity.rb b/app/serializers/profile/event_entity.rb new file mode 100644 index 00000000000..fe90265c888 --- /dev/null +++ b/app/serializers/profile/event_entity.rb @@ -0,0 +1,125 @@ +# frozen_string_literal: true + +module Profile + class EventEntity < Grape::Entity + include ActionView::Helpers::SanitizeHelper + include RequestAwareEntity + include MarkupHelper + include MergeRequestsHelper + include EventsHelper + + expose :created_at, if: ->(event) { include_private_event?(event) } + expose(:action, if: ->(event) { include_private_event?(event) }) { |event| event_action(event) } + + expose :ref, if: ->(event) { event.visible_to_user?(current_user) && event.push_action? } do + expose(:type) { |event| event.ref_type } # rubocop:disable Style/SymbolProc + expose(:count) { |event| event.ref_count } # rubocop:disable Style/SymbolProc + expose(:name) { |event| event.ref_name } # rubocop:disable Style/SymbolProc + expose(:path) { |event| ref_path(event) } + end + + expose :commit, if: ->(event) { event.visible_to_user?(current_user) && event.push_action? } do + expose(:truncated_sha) { |event| Commit.truncate_sha(event.commit_id) } + expose(:path) { |event| project_commit_path(event.project, event.commit_id) } + expose(:title) { |event| event_commit_title(event.commit_title) } + expose(:count) { |event| event.commits_count } # rubocop:disable Style/SymbolProc + expose(:create_mr_path) { |event| commit_create_mr_path(event) } + expose(:from_truncated_sha) { |event| commit_from(event) if event.commit_from } + expose(:to_truncated_sha) { |event| Commit.truncate_sha(event.commit_to) if event.commit_to } + + expose :compare_path, if: ->(event) { event.push_with_commits? && event.commits_count > 1 } do |event| + project = event.project + from = event.md_ref? ? event.commit_from : project.default_branch + project_compare_path(project, from: from, to: event.commit_to) + end + end + + expose :author, if: ->(event) { include_private_event?(event) } do + expose(:id) { |event| event.author.id } + expose(:name) { |event| event.author.name } + expose(:path) { |event| event.author.username } + end + + expose :target, if: ->(event) { event.visible_to_user?(current_user) } do + expose :target_type + + expose(:title) { |event| event.target_title } # rubocop:disable Style/SymbolProc + expose :target_url, if: ->(event) { event.target } do |event| + Gitlab::UrlBuilder.build(event.target, only_path: true) + end + expose :reference_link_text, if: ->(event) { event.target&.respond_to?(:reference_link_text) } do |event| + event.target.reference_link_text + end + expose :first_line_in_markdown, if: ->(event) { event.note? && event.target && event.project } do |event| + first_line_in_markdown(event.target, :note, 150, project: event.project) + end + expose :attachment, if: ->(event) { event.note? && event.target&.attachment } do + expose(:url) { |event| event.target.attachment.url } + end + end + + expose :resource_parent, if: ->(event) { event.visible_to_user?(current_user) } do + expose(:type) { |event| resource_parent_type(event) } + expose(:full_name) { |event| event.resource_parent&.full_name } + expose(:full_path) { |event| event.resource_parent&.full_path } + end + + private + + def current_user + request.current_user + end + + def target_user + request.target_user + end + + def include_private_event?(event) + event.visible_to_user?(current_user) || target_user.include_private_contributions? + end + + def commit_from(event) + if event.md_ref? + Commit.truncate_sha(event.commit_from) + else + event.project.default_branch + end + end + + def event_action(event) + if event.visible_to_user?(current_user) + event.action + elsif target_user.include_private_contributions? + 'private' + end + end + + def ref_path(event) + project = event.project + commits_link = project_commits_path(project, event.ref_name) + should_link = if event.tag? + project.repository.tag_exists?(event.ref_name) + else + project.repository.branch_exists?(event.ref_name) + end + + should_link ? commits_link : nil + end + + def commit_create_mr_path(event) + if event.new_ref? && + create_mr_button_from_event?(event) && + event.authored_by?(current_user) + create_mr_path_from_push_event(event) + end + end + + def resource_parent_type(event) + if event.project + "project" + elsif event.group + "group" + end + end + end +end diff --git a/app/serializers/profile/event_serializer.rb b/app/serializers/profile/event_serializer.rb new file mode 100644 index 00000000000..c7f23d61fe1 --- /dev/null +++ b/app/serializers/profile/event_serializer.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Profile + class EventSerializer < BaseSerializer + entity Profile::EventEntity + end +end diff --git a/app/serializers/project_import_entity.rb b/app/serializers/project_import_entity.rb index 58360321f7c..302086143c1 100644 --- a/app/serializers/project_import_entity.rb +++ b/app/serializers/project_import_entity.rb @@ -16,4 +16,11 @@ class ProjectImportEntity < ProjectEntity expose :import_error, if: ->(project) { project.import_state&.failed? } do |project| project.import_failures.last&.exception_message end + + # Only for GitHub importer where we pass client through + expose :relation_type do |project, options| + next nil if options[:client].nil? || Feature.disabled?(:remove_legacy_github_client) + + ::Gitlab::GithubImport::ProjectRelationType.new(options[:client]).for(project.import_source) + end end diff --git a/app/services/achievements/award_service.rb b/app/services/achievements/award_service.rb new file mode 100644 index 00000000000..674bb8837fb --- /dev/null +++ b/app/services/achievements/award_service.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +module Achievements + class AwardService + attr_reader :current_user, :achievement_id, :recipient_id + + def initialize(current_user, achievement_id, recipient_id) + @current_user = current_user + @achievement_id = achievement_id + @recipient_id = recipient_id + end + + def execute + achievement = Achievements::Achievement.find(achievement_id) + return error_no_permissions unless allowed?(achievement) + + recipient = User.find(recipient_id) + + user_achievement = Achievements::UserAchievement.create( + achievement: achievement, + user: recipient, + awarded_by_user: current_user) + return error_awarding(user_achievement) unless user_achievement.persisted? + + ServiceResponse.success(payload: user_achievement) + rescue ActiveRecord::RecordNotFound => e + error(e.message) + end + + private + + def allowed?(achievement) + current_user&.can?(:award_achievement, achievement) + end + + def error_no_permissions + error('You have insufficient permissions to award this achievement') + end + + def error_awarding(user_achievement) + error(user_achievement&.errors&.full_messages || 'Failed to award achievement') + end + + def error(message) + ServiceResponse.error(message: Array(message)) + end + end +end diff --git a/app/services/achievements/revoke_service.rb b/app/services/achievements/revoke_service.rb new file mode 100644 index 00000000000..4601622f517 --- /dev/null +++ b/app/services/achievements/revoke_service.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +module Achievements + class RevokeService + attr_reader :current_user, :user_achievement + + def initialize(current_user, user_achievement) + @current_user = current_user + @user_achievement = user_achievement + end + + def execute + return error_no_permissions unless allowed?(user_achievement.achievement) + return error_already_revoked if user_achievement.revoked? + + user_achievement.assign_attributes({ + revoked_by_user_id: current_user.id, + revoked_at: Time.zone.now + }) + return error_awarding unless user_achievement.save + + ServiceResponse.success(payload: user_achievement) + end + + private + + def allowed?(achievement) + current_user&.can?(:award_achievement, achievement) + end + + def error_no_permissions + error('You have insufficient permissions to revoke this achievement') + end + + def error_already_revoked + error('This achievement has already been revoked') + end + + def error_awarding + error(user_achievement&.errors&.full_messages || 'Failed to revoke achievement') + end + + def error(message) + ServiceResponse.error(message: Array(message)) + end + end +end diff --git a/app/services/authorized_project_update/project_recalculate_service.rb b/app/services/authorized_project_update/project_recalculate_service.rb index 8d60fffd959..cb83dc57478 100644 --- a/app/services/authorized_project_update/project_recalculate_service.rb +++ b/app/services/authorized_project_update/project_recalculate_service.rb @@ -82,3 +82,5 @@ module AuthorizedProjectUpdate end end end + +AuthorizedProjectUpdate::ProjectRecalculateService.prepend_mod diff --git a/app/services/base_container_service.rb b/app/services/base_container_service.rb index 86df0236a7f..f46e8d5ec42 100644 --- a/app/services/base_container_service.rb +++ b/app/services/base_container_service.rb @@ -10,13 +10,17 @@ # the top of the original BaseService. class BaseContainerService include BaseServiceUtility + include ::Gitlab::Utils::StrongMemoize + attr_accessor :project, :group attr_reader :container, :current_user, :params def initialize(container:, current_user: nil, params: {}) @container = container @current_user = current_user @params = params.dup + + handle_container_type(container) end def project_container? @@ -30,4 +34,22 @@ class BaseContainerService def namespace_container? container.is_a?(::Namespace) end + + def project_group + project&.group + end + strong_memoize_attr :project_group + + private + + def handle_container_type(container) + case container + when Project + @project = container + when Group + @group = container + when Namespaces::ProjectNamespace + @project = container.project + end + end end diff --git a/app/services/bulk_imports/archive_extraction_service.rb b/app/services/bulk_imports/archive_extraction_service.rb index caa40d98a76..fec8fd0e1f5 100644 --- a/app/services/bulk_imports/archive_extraction_service.rb +++ b/app/services/bulk_imports/archive_extraction_service.rb @@ -33,7 +33,6 @@ module BulkImports validate_symlink extract_archive - remove_symlinks tmpdir end @@ -60,15 +59,5 @@ module BulkImports def extract_archive untar_xf(archive: filepath, dir: tmpdir) end - - def extracted_files - Dir.glob(File.join(tmpdir, '**', '*')) - end - - def remove_symlinks - extracted_files.each do |path| - FileUtils.rm(path) if symlink?(path) - end - end end end diff --git a/app/services/ci/catalog/add_resource_service.rb b/app/services/ci/catalog/add_resource_service.rb new file mode 100644 index 00000000000..1f53513b7d1 --- /dev/null +++ b/app/services/ci/catalog/add_resource_service.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +module Ci + module Catalog + class AddResourceService + include Gitlab::Allowable + + attr_reader :project, :current_user + + def initialize(project, user) + @current_user = user + @project = project + end + + def execute + raise Gitlab::Access::AccessDeniedError unless can?(current_user, :add_catalog_resource, project) + + validation_response = Ci::Catalog::ValidateResourceService.new(project, project.default_branch).execute + + if validation_response.success? + create_catalog_resource + else + ServiceResponse.error(message: validation_response.message) + end + end + + private + + def create_catalog_resource + catalog_resource = Ci::Catalog::Resource.new(project: project) + + if catalog_resource.valid? + catalog_resource.save! + ServiceResponse.success(payload: catalog_resource) + else + ServiceResponse.error(message: catalog_resource.errors.full_messages.join(', ')) + end + end + end + end +end diff --git a/app/services/ci/catalog/validate_resource_service.rb b/app/services/ci/catalog/validate_resource_service.rb new file mode 100644 index 00000000000..f166c220869 --- /dev/null +++ b/app/services/ci/catalog/validate_resource_service.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +module Ci + module Catalog + class ValidateResourceService + attr_reader :project + + def initialize(project, ref) + @project = project + @ref = ref + @errors = [] + end + + def execute + check_project_readme + check_project_description + + if errors.empty? + ServiceResponse.success + else + ServiceResponse.error(message: errors.join(' , ')) + end + end + + private + + attr_reader :ref, :errors + + def check_project_description + return if project.description.present? + + errors << 'Project must have a description' + end + + def check_project_readme + return if project_has_readme? + + errors << 'Project must have a README' + end + + def project_has_readme? + project.repository.blob_data_at(ref, 'README.md') + end + end + end +end diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 390675ab80b..7cad7e8301c 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -7,7 +7,6 @@ module Ci LOG_MAX_DURATION_THRESHOLD = 3.seconds LOG_MAX_PIPELINE_SIZE = 2_000 LOG_MAX_CREATION_THRESHOLD = 20.seconds - SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Build, Gitlab::Ci::Pipeline::Chain::Build::Associations, Gitlab::Ci::Pipeline::Chain::Validate::Abilities, @@ -161,7 +160,7 @@ module Ci pipeline_includes_count = observations['pipeline_includes_count'] next false unless pipeline_includes_count - pipeline_includes_count.to_i > Gitlab::Ci::Config::External::Context::MAX_INCLUDES + pipeline_includes_count.to_i > Gitlab::Ci::Config::External::Context::TEMP_MAX_INCLUDES end end end diff --git a/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb b/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb new file mode 100644 index 00000000000..738fa19e29b --- /dev/null +++ b/app/services/ci/job_artifacts/bulk_delete_by_project_service.rb @@ -0,0 +1,73 @@ +# frozen_string_literal: true + +module Ci + module JobArtifacts + class BulkDeleteByProjectService + include BaseServiceUtility + + JOB_ARTIFACTS_COUNT_LIMIT = 50 + + def initialize(job_artifact_ids:, project:, current_user:) + @job_artifact_ids = job_artifact_ids + @project = project + @current_user = current_user + end + + def execute + if exceeds_limits? + return ServiceResponse.error( + message: "Can only delete up to #{JOB_ARTIFACTS_COUNT_LIMIT} job artifacts per call" + ) + end + + find_result = find_artifacts + + return ServiceResponse.error(message: find_result[:error_message]) if find_result[:error_message] + + @job_artifact_scope = find_result[:scope] + + unless all_job_artifacts_belong_to_project? + return ServiceResponse.error(message: 'Not all artifacts belong to requested project') + end + + result = Ci::JobArtifacts::DestroyBatchService.new(job_artifact_scope).execute + + destroyed_artifacts_count = result.fetch(:destroyed_artifacts_count) + destroyed_ids = result.fetch(:destroyed_ids) + + ServiceResponse.success( + payload: { + destroyed_count: destroyed_artifacts_count, + destroyed_ids: destroyed_ids, + errors: [] + }) + end + + private + + def find_artifacts + job_artifacts = ::Ci::JobArtifact.id_in(job_artifact_ids) + + error_message = nil + if job_artifacts.count != job_artifact_ids.count + not_found_artifacts = job_artifact_ids - job_artifacts.map(&:id) + error_message = "Artifacts (#{not_found_artifacts.join(',')}) not found" + end + + { scope: job_artifacts, error_message: error_message } + end + + def exceeds_limits? + job_artifact_ids.count > JOB_ARTIFACTS_COUNT_LIMIT + end + + def all_job_artifacts_belong_to_project? + # rubocop:disable CodeReuse/ActiveRecord + job_artifact_scope.pluck(:project_id).all?(project.id) + # rubocop:enable CodeReuse/ActiveRecord + end + + attr_reader :job_artifact_ids, :job_artifact_scope, :current_user, :project + end + end +end diff --git a/app/services/ci/job_artifacts/create_service.rb b/app/services/ci/job_artifacts/create_service.rb index 3d19fec6617..30d310dec7f 100644 --- a/app/services/ci/job_artifacts/create_service.rb +++ b/app/services/ci/job_artifacts/create_service.rb @@ -113,7 +113,13 @@ module Ci end def accessibility(params) - params[:accessibility] || 'public' + accessibility = params[:accessibility] + + return :public if Feature.disabled?(:non_public_artifacts, type: :development) + + return accessibility if accessibility.present? + + job.artifacts_public? ? :public : :private end def parse_artifact(artifact) @@ -125,11 +131,13 @@ module Ci def persist_artifact(artifact, artifact_metadata, params) Ci::JobArtifact.transaction do - artifact.save! - artifact_metadata&.save! - # NOTE: The `artifacts_expire_at` column is already deprecated and to be removed in the near future. + # Running it first because in migrations we lock the `ci_builds` table + # first and then the others. This reduces the chances of deadlocks. job.update_column(:artifacts_expire_at, artifact.expire_at) + + artifact.save! + artifact_metadata&.save! end success(artifact: artifact) diff --git a/app/services/ci/job_artifacts/destroy_all_expired_service.rb b/app/services/ci/job_artifacts/destroy_all_expired_service.rb index b5dd5b843c6..57b95e59d7d 100644 --- a/app/services/ci/job_artifacts/destroy_all_expired_service.rb +++ b/app/services/ci/job_artifacts/destroy_all_expired_service.rb @@ -25,11 +25,7 @@ module Ci # which is scheduled every 7 minutes. def execute in_lock(EXCLUSIVE_LOCK_KEY, ttl: LOCK_TIMEOUT, retries: 1) do - if ::Feature.enabled?(:ci_destroy_unlocked_job_artifacts) - destroy_unlocked_job_artifacts - else - destroy_job_artifacts_with_slow_iteration - end + destroy_unlocked_job_artifacts end @removed_artifacts_count @@ -39,26 +35,12 @@ module Ci def destroy_unlocked_job_artifacts loop_until(timeout: LOOP_TIMEOUT, limit: LOOP_LIMIT) do - artifacts = Ci::JobArtifact.expired_before(@start_at).artifact_unlocked.limit(BATCH_SIZE) + artifacts = Ci::JobArtifact.expired_before(@start_at).non_trace.artifact_unlocked.limit(BATCH_SIZE) service_response = destroy_batch(artifacts) @removed_artifacts_count += service_response[:destroyed_artifacts_count] end end - def destroy_job_artifacts_with_slow_iteration - Ci::JobArtifact.expired_before(@start_at).each_batch(of: BATCH_SIZE, column: :expire_at, order: :desc) do |relation, index| - # For performance reasons, join with ci_pipelines after the batch is queried. - # See: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47496 - artifacts = relation.unlocked - - service_response = destroy_batch(artifacts) - @removed_artifacts_count += service_response[:destroyed_artifacts_count] - - break if loop_timeout? - break if index >= LOOP_LIMIT - end - end - def destroy_batch(artifacts) Ci::JobArtifacts::DestroyBatchService.new(artifacts, skip_projects_on_refresh: true).execute end diff --git a/app/services/ci/job_artifacts/destroy_batch_service.rb b/app/services/ci/job_artifacts/destroy_batch_service.rb index 7cb1be95a3e..81cbeb31711 100644 --- a/app/services/ci/job_artifacts/destroy_batch_service.rb +++ b/app/services/ci/job_artifacts/destroy_batch_service.rb @@ -21,6 +21,7 @@ module Ci @job_artifacts = job_artifacts.with_destroy_preloads.to_a @pick_up_at = pick_up_at @skip_projects_on_refresh = skip_projects_on_refresh + @destroyed_ids = [] end # rubocop: disable CodeReuse/ActiveRecord @@ -31,16 +32,17 @@ module Ci track_artifacts_undergoing_stats_refresh end - exclude_trace_artifacts - - return success(destroyed_artifacts_count: 0, statistics_updates: {}) if @job_artifacts.empty? + if @job_artifacts.empty? + return success(destroyed_ids: @destroyed_ids, destroyed_artifacts_count: 0, statistics_updates: {}) + end destroy_related_records(@job_artifacts) destroy_around_hook(@job_artifacts) do + @destroyed_ids = @job_artifacts.map(&:id) Ci::DeletedObject.transaction do Ci::DeletedObject.bulk_import(@job_artifacts, @pick_up_at) - Ci::JobArtifact.id_in(@job_artifacts.map(&:id)).delete_all + Ci::JobArtifact.id_in(@destroyed_ids).delete_all end end @@ -52,7 +54,11 @@ module Ci Gitlab::Ci::Artifacts::Logger.log_deleted(@job_artifacts, 'Ci::JobArtifacts::DestroyBatchService#execute') - success(destroyed_artifacts_count: artifacts_count, statistics_updates: statistics_updates_per_project) + success( + destroyed_ids: @destroyed_ids, + destroyed_artifacts_count: artifacts_count, + statistics_updates: statistics_updates_per_project + ) end # rubocop: enable CodeReuse/ActiveRecord @@ -110,11 +116,6 @@ module Ci end end - # Traces should never be destroyed. - def exclude_trace_artifacts - _trace_artifacts, @job_artifacts = @job_artifacts.partition(&:trace?) - end - def track_artifacts_undergoing_stats_refresh project_ids = @job_artifacts.find_all do |artifact| artifact.project.refreshing_build_artifacts_size? diff --git a/app/services/ci/job_token_scope/add_project_service.rb b/app/services/ci/job_token_scope/add_project_service.rb index 15553ad6e92..4f745042f07 100644 --- a/app/services/ci/job_token_scope/add_project_service.rb +++ b/app/services/ci/job_token_scope/add_project_service.rb @@ -6,8 +6,6 @@ module Ci include EditScopeValidations def execute(target_project, direction: :outbound) - direction = :outbound if Feature.disabled?(:ci_inbound_job_token_scope) - validate_edit!(project, target_project, current_user) link = allowlist(direction) diff --git a/app/services/ci/pipeline_processing/atomic_processing_service.rb b/app/services/ci/pipeline_processing/atomic_processing_service.rb index 2b8eb104be5..4f2230ea1fc 100644 --- a/app/services/ci/pipeline_processing/atomic_processing_service.rb +++ b/app/services/ci/pipeline_processing/atomic_processing_service.rb @@ -48,10 +48,10 @@ module Ci def update_stage!(stage) # Update processables for a given stage in bulk/slices @collection - .created_processable_ids_for_stage_position(stage.position) + .created_processable_ids_in_stage(stage.position) .in_groups_of(BATCH_SIZE, false) { |ids| update_processables!(ids) } - status = @collection.status_for_stage_position(stage.position) + status = @collection.status_of_stage(stage.position) stage.set_status(status) end @@ -79,29 +79,27 @@ module Ci end def update_processable!(processable) - status = processable_status(processable) - return unless Ci::HasStatus::COMPLETED_STATUSES.include?(status) + previous_status = status_of_previous_processables(processable) + # We do not continue to process the processable if the previous status is not completed + return unless Ci::HasStatus::COMPLETED_STATUSES.include?(previous_status) - # transition status if possible Gitlab::OptimisticLocking.retry_lock(processable, name: 'atomic_processing_update_processable') do |subject| Ci::ProcessBuildService.new(project, subject.user) - .execute(subject, status) + .execute(subject, previous_status) # update internal representation of status - # to make the status change of processable - # to be taken into account during further processing - @collection.set_processable_status( - processable.id, processable.status, processable.lock_version) + # to make the status change of processable to be taken into account during further processing + @collection.set_processable_status(processable.id, processable.status, processable.lock_version) end end - def processable_status(processable) + def status_of_previous_processables(processable) if processable.scheduling_type_dag? # Processable uses DAG, get status of all dependent needs - @collection.status_for_names(processable.aggregated_needs_names.to_a, dag: true) + @collection.status_of_processables(processable.aggregated_needs_names.to_a, dag: true) else # Processable uses Stages, get status of prior stage - @collection.status_for_prior_stage_position(processable.stage_idx.to_i) + @collection.status_of_processables_prior_to_stage(processable.stage_idx.to_i) end end diff --git a/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb b/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb index 676c2ecb257..9738e4e65b7 100644 --- a/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb +++ b/app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb @@ -35,40 +35,40 @@ module Ci status_for_array(all_statuses, dag: false) end + # This methods gets composite status for processables at a given stage + def status_of_stage(stage_position) + strong_memoize("status_of_stage_#{stage_position}") do + stage_statuses = all_statuses_grouped_by_stage_position[stage_position].to_a + + status_for_array(stage_statuses.flatten, dag: false) + end + end + # This methods gets composite status for processables with given names - def status_for_names(names, dag:) + def status_of_processables(names, dag:) name_statuses = all_statuses_by_name.slice(*names) status_for_array(name_statuses.values, dag: dag) end # This methods gets composite status for processables before given stage - def status_for_prior_stage_position(position) - strong_memoize("status_for_prior_stage_position_#{position}") do + def status_of_processables_prior_to_stage(stage_position) + strong_memoize("status_of_processables_prior_to_stage_#{stage_position}") do stage_statuses = all_statuses_grouped_by_stage_position - .select { |stage_position, _| stage_position < position } + .select { |position, _| position < stage_position } status_for_array(stage_statuses.values.flatten, dag: false) end end # This methods gets a list of processables for a given stage - def created_processable_ids_for_stage_position(current_position) - all_statuses_grouped_by_stage_position[current_position] + def created_processable_ids_in_stage(stage_position) + all_statuses_grouped_by_stage_position[stage_position] .to_a .select { |processable| processable[:status] == 'created' } .map { |processable| processable[:id] } end - # This methods gets composite status for processables at a given stage - def status_for_stage_position(current_position) - strong_memoize("status_for_stage_position_#{current_position}") do - stage_statuses = all_statuses_grouped_by_stage_position[current_position].to_a - - status_for_array(stage_statuses.flatten, dag: false) - end - end - # This method returns a list of all processable, that are to be processed def processing_processables all_statuses.lazy.reject { |status| status[:processed] } diff --git a/app/services/ci/pipeline_schedules/take_ownership_service.rb b/app/services/ci/pipeline_schedules/take_ownership_service.rb index 9b4001c74bd..b4d193cb875 100644 --- a/app/services/ci/pipeline_schedules/take_ownership_service.rb +++ b/app/services/ci/pipeline_schedules/take_ownership_service.rb @@ -23,7 +23,7 @@ module Ci attr_reader :schedule, :user def allowed? - user.can?(:take_ownership_pipeline_schedule, schedule) + user.can?(:admin_pipeline_schedule, schedule) end def forbidden diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb index a5300cfd29f..afaf18a4de2 100644 --- a/app/services/ci/process_build_service.rb +++ b/app/services/ci/process_build_service.rb @@ -2,40 +2,40 @@ module Ci class ProcessBuildService < BaseService - def execute(build, current_status) - if valid_statuses_for_build(build).include?(current_status) - process(build) + def execute(processable, current_status) + if valid_statuses_for_processable(processable).include?(current_status) + process(processable) true else - build.skip + processable.skip false end end private - def process(build) - return enqueue(build) if build.enqueue_immediately? + def process(processable) + return enqueue(processable) if processable.enqueue_immediately? - if build.schedulable? - build.schedule - elsif build.action? - build.actionize + if processable.schedulable? + processable.schedule + elsif processable.action? + processable.actionize else - enqueue(build) + enqueue(processable) end end - def enqueue(build) - return build.drop!(:failed_outdated_deployment_job) if build.outdated_deployment? + def enqueue(processable) + return processable.drop!(:failed_outdated_deployment_job) if processable.outdated_deployment? - build.enqueue + processable.enqueue end - def valid_statuses_for_build(build) - case build.when + def valid_statuses_for_processable(processable) + case processable.when when 'on_success', 'manual', 'delayed' - build.scheduling_type_dag? ? %w[success] : %w[success skipped] + processable.scheduling_type_dag? ? %w[success] : %w[success skipped] when 'on_failure' %w[failed] when 'always' diff --git a/app/services/ci/queue/pending_builds_strategy.rb b/app/services/ci/queue/pending_builds_strategy.rb index cfafe66d10b..b2929390e58 100644 --- a/app/services/ci/queue/pending_builds_strategy.rb +++ b/app/services/ci/queue/pending_builds_strategy.rb @@ -57,9 +57,10 @@ module Ci # if disaster recovery is enabled, we fallback to FIFO scheduling relation.order('ci_pending_builds.build_id ASC') else - # Implement fair scheduling - # this returns builds that are ordered by number of running builds - # we prefer projects that don't use shared runners at all + # Implements Fair Scheduling + # Builds are ordered by projects that have the fewest running builds. + # This keeps projects that create many builds at once from hogging capacity but + # has the downside of penalizing projects with lots of builds created in a short period of time relation .with(running_builds_for_shared_runners_cte.to_arel) .joins("LEFT JOIN project_builds ON ci_pending_builds.project_id = project_builds.project_id") diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 205da2632c2..228a246f480 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -244,7 +244,6 @@ module Ci def assign_runner!(build, params) build.runner_id = runner.id build.runner_session_attributes = params[:session] if params[:session].present? - build.ensure_metadata.runner_machine = runner_machine if runner_machine failure_reason, _ = pre_assign_runner_checks.find { |_, check| check.call(build, params) } @@ -256,6 +255,7 @@ module Ci @metrics.increment_queue_operation(:runner_pre_assign_checks_success) build.run! + build.runner_machine = runner_machine if runner_machine end !failure_reason diff --git a/app/services/ci/runners/create_runner_service.rb b/app/services/ci/runners/create_runner_service.rb index 2de9ee4d38e..5906cdce99d 100644 --- a/app/services/ci/runners/create_runner_service.rb +++ b/app/services/ci/runners/create_runner_service.rb @@ -33,7 +33,7 @@ module Ci def normalize_params params[:registration_type] = :authenticated_user params[:runner_type] = type - params[:active] = !params.delete(:paused) if params[:paused].present? + params[:active] = !params.delete(:paused) if params.key?(:paused) params[:creator] = user strategy.normalize_params diff --git a/app/services/ci/runners/process_runner_version_update_service.rb b/app/services/ci/runners/process_runner_version_update_service.rb index c8a5e42ccab..5c42a2ab018 100644 --- a/app/services/ci/runners/process_runner_version_update_service.rb +++ b/app/services/ci/runners/process_runner_version_update_service.rb @@ -8,6 +8,7 @@ module Ci end def execute + return ServiceResponse.error(message: 'version update disabled') unless enabled? return ServiceResponse.error(message: 'version not present') unless @version _, status = upgrade_check_service.check_runner_upgrade_suggestion(@version) @@ -22,6 +23,10 @@ module Ci def upgrade_check_service @runner_upgrade_check ||= Gitlab::Ci::RunnerUpgradeCheck.new(::Gitlab::VERSION) end + + def enabled? + Gitlab::Ci::RunnerReleases.instance.enabled? + end end end end diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index 58927a90b6e..40941dd4cd0 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -37,7 +37,7 @@ module Ci end ## - # Force recemove build from the queue, without checking a transition state + # Force remove build from the queue, without checking a transition state # def remove!(build) removed = build.all_queuing_entries.delete_all diff --git a/app/services/clusters/agent_tokens/create_service.rb b/app/services/clusters/agent_tokens/create_service.rb index 2539ffdc5ba..66a3cb04d98 100644 --- a/app/services/clusters/agent_tokens/create_service.rb +++ b/app/services/clusters/agent_tokens/create_service.rb @@ -2,16 +2,24 @@ module Clusters module AgentTokens - class CreateService < ::BaseContainerService + class CreateService ALLOWED_PARAMS = %i[agent_id description name].freeze + attr_reader :agent, :current_user, :params + + def initialize(agent:, current_user:, params:) + @agent = agent + @current_user = current_user + @params = params + end + def execute - return error_no_permissions unless current_user.can?(:create_cluster, container) + return error_no_permissions unless current_user.can?(:create_cluster, agent.project) - token = ::Clusters::AgentToken.new(filtered_params.merge(created_by_user: current_user)) + token = ::Clusters::AgentToken.new(filtered_params.merge(agent_id: agent.id, created_by_user: current_user)) if token.save - log_activity_event!(token) + log_activity_event(token) ServiceResponse.success(payload: { secret: token.token, token: token }) else @@ -29,7 +37,7 @@ module Clusters params.slice(*ALLOWED_PARAMS) end - def log_activity_event!(token) + def log_activity_event(token) Clusters::Agents::CreateActivityEventService.new( token.agent, kind: :token_created, @@ -42,3 +50,5 @@ module Clusters end end end + +Clusters::AgentTokens::CreateService.prepend_mod diff --git a/app/services/clusters/agent_tokens/revoke_service.rb b/app/services/clusters/agent_tokens/revoke_service.rb new file mode 100644 index 00000000000..5d89b405969 --- /dev/null +++ b/app/services/clusters/agent_tokens/revoke_service.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +module Clusters + module AgentTokens + class RevokeService + attr_reader :current_project, :current_user, :token + + def initialize(token:, current_user:) + @token = token + @current_user = current_user + end + + def execute + return error_no_permissions unless current_user.can?(:create_cluster, token.agent.project) + + if token.update(status: token.class.statuses[:revoked]) + log_activity_event(token) + + ServiceResponse.success + else + ServiceResponse.error(message: token.errors.full_messages) + end + end + + private + + def error_no_permissions + ServiceResponse.error( + message: s_('ClusterAgent|User has insufficient permissions to revoke the token for this project')) + end + + def log_activity_event(token) + Clusters::Agents::CreateActivityEventService.new( + token.agent, + kind: :token_revoked, + level: :info, + recorded_at: token.updated_at, + user: current_user, + agent_token: token + ).execute + end + end + end +end + +Clusters::AgentTokens::RevokeService.prepend_mod diff --git a/app/services/clusters/agents/authorize_proxy_user_service.rb b/app/services/clusters/agents/authorize_proxy_user_service.rb new file mode 100644 index 00000000000..ec6645b2db4 --- /dev/null +++ b/app/services/clusters/agents/authorize_proxy_user_service.rb @@ -0,0 +1,99 @@ +# frozen_string_literal: true + +module Clusters + module Agents + class AuthorizeProxyUserService < ::BaseService + include ::Gitlab::Utils::StrongMemoize + + def initialize(current_user, agent) + @current_user = current_user + @agent = agent + end + + def execute + return forbidden unless user_access_config.present? + + access_as = user_access_config[:access_as] + return forbidden unless access_as.present? + return forbidden if access_as.size != 1 + + if authorizations = handle_access(access_as, user_access_config) + return success(payload: authorizations) + end + + forbidden + end + + private + + attr_reader :current_user, :agent + + # Override in EE + def handle_access(access_as, user_access) + access_as_agent(user_access) if access_as.key?(:agent) + end + + def response_base + { + agent: { + id: agent.id, + config_project: { id: agent.project.id } + }, + user: { + id: current_user.id, + username: current_user.username + } + } + end + + def access_as_agent(user_access) + projects = authorized_projects(user_access) + groups = authorized_groups(user_access) + return unless projects.size + groups.size > 0 + + response_base.merge(access_as: { agent: {} }) + end + + def authorized_projects(user_access) + strong_memoize_with(:authorized_projects, user_access) do + user_access.fetch(:projects, []) + .first(::Clusters::Agents::RefreshAuthorizationService::AUTHORIZED_ENTITY_LIMIT) + .map { |project| ::Project.find_by_full_path(project[:id]) } + .select { |project| current_user.can?(:use_k8s_proxies, project) } + end + end + + def authorized_groups(user_access) + strong_memoize_with(:authorized_groups, user_access) do + user_access.fetch(:groups, []) + .first(::Clusters::Agents::RefreshAuthorizationService::AUTHORIZED_ENTITY_LIMIT) + .map { |group| ::Group.find_by_full_path(group[:id]) } + .select { |group| current_user.can?(:use_k8s_proxies, group) } + end + end + + def user_access_config + # TODO: Read the configuration from the database once it has been + # indexed. See https://gitlab.com/gitlab-org/gitlab/-/issues/389430 + branch = agent.project.default_branch_or_main + path = ".gitlab/agents/#{agent.name}/config.yaml" + config_yaml = agent.project.repository + &.blob_at_branch(branch, path) + &.data + return unless config_yaml.present? + + config = YAML.safe_load(config_yaml, aliases: true, symbolize_names: true) + config[:user_access] + end + strong_memoize_attr :user_access_config + + delegate :success, to: ServiceResponse, private: true + + def forbidden + ServiceResponse.error(reason: :forbidden, message: '403 Forbidden') + end + end + end +end + +Clusters::Agents::AuthorizeProxyUserService.prepend_mod diff --git a/app/services/clusters/agents/create_activity_event_service.rb b/app/services/clusters/agents/create_activity_event_service.rb index 886dddf1a52..87554f0e495 100644 --- a/app/services/clusters/agents/create_activity_event_service.rb +++ b/app/services/clusters/agents/create_activity_event_service.rb @@ -14,6 +14,10 @@ module Clusters DeleteExpiredEventsWorker.perform_at(schedule_cleanup_at, agent.id) ServiceResponse.success + rescue StandardError => e + Gitlab::ErrorTracking.track_exception(e, agent_id: agent.id) + + ServiceResponse.error(message: e.message) end private diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb index dc7f84ab807..0b97aae9972 100644 --- a/app/services/commits/change_service.rb +++ b/app/services/commits/change_service.rb @@ -29,12 +29,24 @@ module Commits dry_run: @dry_run ) rescue Gitlab::Git::Repository::CreateTreeError => ex - act = action.to_s.dasherize type = @commit.change_type_title(current_user) - error_msg = "Sorry, we cannot #{act} this #{type} automatically. " \ - "This #{type} may already have been #{act}ed, or a more recent " \ - "commit may have updated some of its content." + status = case [type, action] + when ['commit', :cherry_pick] + s_("MergeRequests|Commit cherry-pick failed") + when ['commit', :revert] + s_("MergeRequests|Commit revert failed") + when ['merge request', :cherry_pick] + s_("MergeRequests|Merge request cherry-pick failed") + when ['merge request', :revert] + s_("MergeRequests|Merge request revert failed") + end + + detail = s_("MergeRequests|Can't perform this action automatically. " \ + "It may have already been done, or a more recent commit may have updated some of this content. " \ + "Please perform this action locally.") + + error_msg = "#{status}: #{detail}" raise ChangeError.new(error_msg, ex.error_code) end diff --git a/app/services/concerns/incident_management/usage_data.rb b/app/services/concerns/incident_management/usage_data.rb index 40183085344..775dea9b949 100644 --- a/app/services/concerns/incident_management/usage_data.rb +++ b/app/services/concerns/incident_management/usage_data.rb @@ -13,8 +13,6 @@ module IncidentManagement namespace = target.try(:namespace) project = target.try(:project) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2, target.try(:namespace)) - Gitlab::Tracking.event( self.class.to_s, event, diff --git a/app/services/concerns/update_repository_storage_methods.rb b/app/services/concerns/update_repository_storage_methods.rb index b21d05f4178..a0b4040cff7 100644 --- a/app/services/concerns/update_repository_storage_methods.rb +++ b/app/services/concerns/update_repository_storage_methods.rb @@ -28,10 +28,7 @@ module UpdateRepositoryStorageMethods track_repository(destination_storage_name) end - unless same_filesystem? - remove_old_paths - enqueue_housekeeping - end + remove_old_paths unless same_filesystem? repository_storage_move.finish_cleanup! @@ -95,10 +92,6 @@ module UpdateRepositoryStorageMethods end end - def enqueue_housekeeping - # no-op - end - def wait_for_pushes(type) reference_counter = container.reference_counter(type: type) diff --git a/app/services/container_expiration_policies/cleanup_service.rb b/app/services/container_expiration_policies/cleanup_service.rb index 1123b29f217..6c2b41a4daf 100644 --- a/app/services/container_expiration_policies/cleanup_service.rb +++ b/app/services/container_expiration_policies/cleanup_service.rb @@ -19,7 +19,6 @@ module ContainerExpirationPolicies return ServiceResponse.error(message: 'invalid policy') end - repository.start_expiration_policy! schedule_next_run_if_needed begin diff --git a/app/services/dependency_proxy/head_manifest_service.rb b/app/services/dependency_proxy/head_manifest_service.rb index cd575b83a98..5bc5cb45a12 100644 --- a/app/services/dependency_proxy/head_manifest_service.rb +++ b/app/services/dependency_proxy/head_manifest_service.rb @@ -2,7 +2,7 @@ module DependencyProxy class HeadManifestService < DependencyProxy::BaseService - ACCEPT_HEADERS = ::ContainerRegistry::Client::ACCEPTED_TYPES.join(',') + ACCEPT_HEADERS = DependencyProxy::Manifest::ACCEPTED_TYPES.join(',') def initialize(image, tag, token) @image = image diff --git a/app/services/event_create_service.rb b/app/services/event_create_service.rb index d848f694598..96edaa06fc2 100644 --- a/app/services/event_create_service.rb +++ b/app/services/event_create_service.rb @@ -28,7 +28,7 @@ class EventCreateService def open_mr(merge_request, current_user) create_record_event(merge_request, current_user, :created).tap do - track_event(event_action: :created, event_target: MergeRequest, author_id: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:merge_request_action, values: current_user.id) track_snowplow_event( action: :created, project: merge_request.project, @@ -41,7 +41,7 @@ class EventCreateService def close_mr(merge_request, current_user) create_record_event(merge_request, current_user, :closed).tap do - track_event(event_action: :closed, event_target: MergeRequest, author_id: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:merge_request_action, values: current_user.id) track_snowplow_event( action: :closed, project: merge_request.project, @@ -58,7 +58,7 @@ class EventCreateService def merge_mr(merge_request, current_user) create_record_event(merge_request, current_user, :merged).tap do - track_event(event_action: :merged, event_target: MergeRequest, author_id: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:merge_request_action, values: current_user.id) track_snowplow_event( action: :merged, project: merge_request.project, @@ -88,7 +88,7 @@ class EventCreateService def leave_note(note, current_user) create_record_event(note, current_user, :commented).tap do if note.is_a?(DiffNote) && note.for_merge_request? - track_event(event_action: :commented, event_target: MergeRequest, author_id: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:merge_request_action, values: current_user.id) track_snowplow_event( action: :commented, project: note.project, @@ -128,12 +128,17 @@ class EventCreateService records = create.zip([:created].cycle) + update.zip([:updated].cycle) return [] if records.empty? - event_meta = { user: current_user, label: DEGIGN_EVENT_LABEL, property: Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION } + event_meta = { user: current_user, label: DEGIGN_EVENT_LABEL, property: :design_action } track_snowplow_event(action: :create, project: create.first.project, **event_meta) if create.any? track_snowplow_event(action: :update, project: update.first.project, **event_meta) if update.any? - create_record_events(records, current_user) + inserted_events = create_record_events(records, current_user) + + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:design_action, values: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:git_write_action, values: current_user.id) + + inserted_events end def destroy_designs(designs, current_user) @@ -144,9 +149,15 @@ class EventCreateService project: designs.first.project, user: current_user, label: DEGIGN_EVENT_LABEL, - property: Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION + property: :design_action ) - create_record_events(designs.zip([:destroyed].cycle), current_user) + + inserted_events = create_record_events(designs.zip([:destroyed].cycle), current_user) + + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:design_action, values: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:git_write_action, values: current_user.id) + + inserted_events end # Create a new wiki page event @@ -163,7 +174,8 @@ class EventCreateService def wiki_event(wiki_page_meta, author, action, fingerprint) raise IllegalActionError, action unless Event::WIKI_ACTIONS.include?(action) - track_event(event_action: action, event_target: wiki_page_meta.class, author_id: author.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:wiki_action, values: author.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:git_write_action, values: author.id) duplicate = Event.for_wiki_meta(wiki_page_meta).for_fingerprint(fingerprint).first return duplicate if duplicate.present? @@ -205,13 +217,7 @@ class EventCreateService .merge(action: action, fingerprint: fingerprint, target_id: record.id, target_type: record.class.name) end - result = Event.insert_all(attribute_sets, returning: %w[id]) - - tuples.each do |record, status, _| - track_event(event_action: status, event_target: record.class, author_id: current_user.id) - end - - result + Event.insert_all(attribute_sets, returning: %w[id]) end def create_push_event(service_class, project, current_user, push_data) @@ -226,7 +232,8 @@ class EventCreateService new_event end - track_event(event_action: :pushed, event_target: Project, author_id: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:project_action, values: current_user.id) + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:git_write_action, values: current_user.id) namespace = project.namespace Gitlab::Tracking.event( @@ -273,13 +280,7 @@ class EventCreateService { resource_parent_attr => resource_parent.id } end - def track_event(...) - Gitlab::UsageDataCounters::TrackUniqueEvents.track_event(...) - end - def track_snowplow_event(action:, project:, user:, label:, property:) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2) - Gitlab::Tracking.event( self.class.to_s, action.to_s, diff --git a/app/services/feature_flags/base_service.rb b/app/services/feature_flags/base_service.rb index 59db1a5f12f..028906a0b43 100644 --- a/app/services/feature_flags/base_service.rb +++ b/app/services/feature_flags/base_service.rb @@ -7,42 +7,24 @@ module FeatureFlags AUDITABLE_ATTRIBUTES = %w(name description active).freeze def success(**args) - audit_event = args.fetch(:audit_event) { audit_event(args[:feature_flag]) } - save_audit_event(audit_event) sync_to_jira(args[:feature_flag]) + + audit_event(args[:feature_flag], args[:audit_context]) super end protected - def update_last_feature_flag_updated_at! - Operations::FeatureFlagsClient.update_last_feature_flag_updated_at!(project) - end - - def audit_event(feature_flag) - message = audit_message(feature_flag) + def audit_event(feature_flag, context = nil) + context ||= audit_context(feature_flag) - return if message.blank? + return if context[:message].blank? - details = - { - custom_message: message, - target_id: feature_flag.id, - target_type: feature_flag.class.name, - target_details: feature_flag.name - } - - ::AuditEventService.new( - current_user, - feature_flag.project, - details - ) + ::Gitlab::Audit::Auditor.audit(context) end - def save_audit_event(audit_event) - return unless audit_event - - audit_event.security_event + def update_last_feature_flag_updated_at! + Operations::FeatureFlagsClient.update_last_feature_flag_updated_at!(project) end def sync_to_jira(feature_flag) diff --git a/app/services/feature_flags/create_service.rb b/app/services/feature_flags/create_service.rb index 6ea40345191..2a3153e6a54 100644 --- a/app/services/feature_flags/create_service.rb +++ b/app/services/feature_flags/create_service.rb @@ -21,6 +21,16 @@ module FeatureFlags private + def audit_context(feature_flag) + { + name: 'feature_flag_created', + message: audit_message(feature_flag), + author: current_user, + scope: feature_flag.project, + target: feature_flag + } + end + def audit_message(feature_flag) message_parts = ["Created feature flag #{feature_flag.name} with description \"#{feature_flag.description}\"."] diff --git a/app/services/feature_flags/destroy_service.rb b/app/services/feature_flags/destroy_service.rb index 0fdc890b8a3..fdcbb802b16 100644 --- a/app/services/feature_flags/destroy_service.rb +++ b/app/services/feature_flags/destroy_service.rb @@ -22,6 +22,16 @@ module FeatureFlags end end + def audit_context(feature_flag) + { + name: 'feature_flag_deleted', + message: audit_message(feature_flag), + author: current_user, + scope: feature_flag.project, + target: feature_flag + } + end + def audit_message(feature_flag) "Deleted feature flag #{feature_flag.name}." end diff --git a/app/services/feature_flags/update_service.rb b/app/services/feature_flags/update_service.rb index a465ca1dd5f..555b5a93d23 100644 --- a/app/services/feature_flags/update_service.rb +++ b/app/services/feature_flags/update_service.rb @@ -25,13 +25,13 @@ module FeatureFlags end end - # We generate the audit event before the feature flag is saved as #changed_strategies_messages depends on the strategies' states before save - audit_event = audit_event(feature_flag) + # We generate the audit context before the feature flag is saved as #changed_strategies_messages depends on the strategies' states before save + saved_audit_context = audit_context feature_flag if feature_flag.save update_last_feature_flag_updated_at! - success(feature_flag: feature_flag, audit_event: audit_event) + success(feature_flag: feature_flag, audit_context: saved_audit_context) else error(feature_flag.errors.full_messages, :bad_request) end @@ -50,6 +50,16 @@ module FeatureFlags end end + def audit_context(feature_flag) + { + name: 'feature_flag_updated', + message: audit_message(feature_flag), + author: current_user, + scope: feature_flag.project, + target: feature_flag + } + end + def audit_message(feature_flag) changes = changed_attributes_messages(feature_flag) changes += changed_strategies_messages(feature_flag) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 8f722de2019..613785d01cc 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -26,16 +26,23 @@ module Files def file_has_changed?(path, commit_id) return false unless commit_id - last_commit = Gitlab::Git::Commit - .last_for_path(@start_project.repository, @start_branch, path, literal_pathspec: true) + last_commit_from_branch = get_last_commit_for_path(ref: @start_branch, path: path) - return false unless last_commit + return false unless last_commit_from_branch - last_commit.sha != commit_id + last_commit_from_commit_id = get_last_commit_for_path(ref: commit_id, path: path) + + return false unless last_commit_from_commit_id + + last_commit_from_branch.sha != last_commit_from_commit_id.sha end private + def get_last_commit_for_path(ref:, path:) + Gitlab::Git::Commit.last_for_path(@start_project.repository, ref, path, literal_pathspec: true) + end + def commit_email(git_user) return params[:author_email] if params[:author_email].present? return unless current_user diff --git a/app/services/groups/autocomplete_service.rb b/app/services/groups/autocomplete_service.rb index 92b05d9ac08..5b9d60495e9 100644 --- a/app/services/groups/autocomplete_service.rb +++ b/app/services/groups/autocomplete_service.rb @@ -13,7 +13,7 @@ module Groups IssuesFinder.new(current_user, finder_params) .execute .preload(project: :namespace) - .select(:iid, :title, :project_id) + .select(:iid, :title, :project_id, :namespace_id) end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/services/groups/group_links/create_service.rb b/app/services/groups/group_links/create_service.rb index 9c1a003ff36..a6e2c0b952e 100644 --- a/app/services/groups/group_links/create_service.rb +++ b/app/services/groups/group_links/create_service.rb @@ -36,3 +36,5 @@ module Groups end end end + +Groups::GroupLinks::CreateService.prepend_mod diff --git a/app/services/groups/group_links/destroy_service.rb b/app/services/groups/group_links/destroy_service.rb index dc3cab927be..8eed46b28ca 100644 --- a/app/services/groups/group_links/destroy_service.rb +++ b/app/services/groups/group_links/destroy_service.rb @@ -24,7 +24,11 @@ module Groups Gitlab::AppLogger.info( "Failed to delete GroupGroupLinks with ids: #{links.map(&:id)}.") end + + links end end end end + +Groups::GroupLinks::DestroyService.prepend_mod diff --git a/app/services/groups/group_links/update_service.rb b/app/services/groups/group_links/update_service.rb index 66d0d63cb9b..913bf2bfce7 100644 --- a/app/services/groups/group_links/update_service.rb +++ b/app/services/groups/group_links/update_service.rb @@ -15,6 +15,8 @@ module Groups if requires_authorization_refresh?(group_link_params) group_link.shared_with_group.refresh_members_authorized_projects(direct_members_only: true) end + + group_link end private @@ -27,3 +29,5 @@ module Groups end end end + +Groups::GroupLinks::UpdateService.prepend_mod diff --git a/app/services/import/github/cancel_project_import_service.rb b/app/services/import/github/cancel_project_import_service.rb index 5dce5e73662..62cd0c95eaf 100644 --- a/app/services/import/github/cancel_project_import_service.rb +++ b/app/services/import/github/cancel_project_import_service.rb @@ -9,6 +9,8 @@ module Import if project.import_in_progress? project.import_state.cancel + metrics.track_canceled_import + success(project: project) else error(cannot_cancel_error_message, :bad_request) @@ -31,6 +33,10 @@ module Import project_status: project.import_state.status ) end + + def metrics + @metrics ||= Gitlab::Import::Metrics.new(:github_importer, project) + end end end end diff --git a/app/services/import/validate_remote_git_endpoint_service.rb b/app/services/import/validate_remote_git_endpoint_service.rb index 1b8fa45e979..2886bd5c9b7 100644 --- a/app/services/import/validate_remote_git_endpoint_service.rb +++ b/app/services/import/validate_remote_git_endpoint_service.rb @@ -21,7 +21,9 @@ module Import def execute uri = Gitlab::Utils.parse_url(@params[:url]) - return ServiceResponse.error(message: "#{@params[:url]} is not a valid URL") unless uri + if !uri || !uri.hostname || Project::VALID_IMPORT_PROTOCOLS.exclude?(uri.scheme) + return ServiceResponse.error(message: "#{@params[:url]} is not a valid URL") + end return ServiceResponse.success if uri.scheme == 'git' diff --git a/app/services/import_csv/base_service.rb b/app/services/import_csv/base_service.rb index feb76425fb4..1d27a5811c7 100644 --- a/app/services/import_csv/base_service.rb +++ b/app/services/import_csv/base_service.rb @@ -2,6 +2,8 @@ module ImportCsv class BaseService + include Gitlab::Utils::StrongMemoize + def initialize(user, project, csv_io) @user = user @project = project @@ -9,6 +11,8 @@ module ImportCsv @results = { success: 0, error_lines: [], parse_error: false } end + PreprocessError = Class.new(StandardError) + def execute process_csv email_results_to_user @@ -36,7 +40,22 @@ module ImportCsv raise NotImplementedError end + def validate_structure! + header_line = csv_data.lines.first + + validate_headers_presence!(header_line) + detect_col_sep + end + + def preprocess! + # any logic can be added in subclasses if needed + # hence just a no-op rather than NotImplementedError + end + def process_csv + validate_structure! + preprocess! + with_csv_lines.each do |row, line_no| attributes = attributes_for(row) @@ -46,23 +65,30 @@ module ImportCsv results[:error_lines].push(line_no) end end - rescue ArgumentError, CSV::MalformedCSVError + rescue ArgumentError, CSV::MalformedCSVError => e results[:parse_error] = true + results[:error_lines].push(e.line_number) if e.respond_to?(:line_number) + rescue PreprocessError + results[:parse_error] = false end def with_csv_lines - csv_data = @csv_io.open(&:read).force_encoding(Encoding::UTF_8) - validate_headers_presence!(csv_data.lines.first) - CSV.new( csv_data, - col_sep: detect_col_sep(csv_data.lines.first), + col_sep: detect_col_sep, headers: true, header_converters: :symbol ).each.with_index(2) end - def detect_col_sep(header) + def csv_data + @csv_io.open(&:read).force_encoding(Encoding::UTF_8) + end + strong_memoize_attr :csv_data + + def detect_col_sep + header = csv_data.lines.first + if header.include?(",") "," elsif header.include?(";") @@ -73,6 +99,7 @@ module ImportCsv raise CSV::MalformedCSVError.new('Invalid CSV format', 1) end end + strong_memoize_attr :detect_col_sep def create_object(attributes) # NOTE: CSV imports are performed by workers, so we do not have a request context in order diff --git a/app/services/incident_management/timeline_events/base_service.rb b/app/services/incident_management/timeline_events/base_service.rb index e997d940ed4..75a3811af2d 100644 --- a/app/services/incident_management/timeline_events/base_service.rb +++ b/app/services/incident_management/timeline_events/base_service.rb @@ -29,8 +29,6 @@ module IncidentManagement namespace = project.namespace track_usage_event(event, user.id) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2, namespace) - Gitlab::Tracking.event( self.class.to_s, event, diff --git a/app/services/issuable/clone/base_service.rb b/app/services/issuable/clone/base_service.rb index 02beaaf5d83..a4e815e70fc 100644 --- a/app/services/issuable/clone/base_service.rb +++ b/app/services/issuable/clone/base_service.rb @@ -7,11 +7,6 @@ module Issuable alias_method :old_project, :project - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(original_entity, target_parent) @original_entity = original_entity @target_parent = target_parent diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb index 4c3e518d62b..261afb767bb 100644 --- a/app/services/issuable/destroy_service.rb +++ b/app/services/issuable/destroy_service.rb @@ -4,7 +4,7 @@ module Issuable class DestroyService < IssuableBaseService # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) + super(container: container, current_user: current_user, params: params) end def execute(issuable) diff --git a/app/services/issuable/import_csv/base_service.rb b/app/services/issuable/import_csv/base_service.rb index 83cf5a67453..9ef9fb76e3c 100644 --- a/app/services/issuable/import_csv/base_service.rb +++ b/app/services/issuable/import_csv/base_service.rb @@ -21,7 +21,7 @@ module Issuable headers.downcase! if headers return if headers && headers.include?('title') && headers.include?('description') - raise CSV::MalformedCSVError + raise CSV::MalformedCSVError.new('Invalid CSV format - missing required headers.', 1) end end end diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 911d04d6b7a..c630d01cd84 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class IssuableBaseService < ::BaseProjectService +class IssuableBaseService < ::BaseContainerService private def self.constructor_container_arg(value) @@ -10,13 +10,15 @@ class IssuableBaseService < ::BaseProjectService # Follow on issue to address this: # https://gitlab.com/gitlab-org/gitlab/-/issues/328438 - { project: value } + { container: value } end attr_accessor :params, :skip_milestone_email - def initialize(project:, current_user: nil, params: {}) - super + def initialize(container:, current_user: nil, params: {}) + # we need to exclude project params since they may come from external requests. project should always + # be passed as part of the service's initializer + super(container: container, current_user: current_user, params: params.except(:project, :project_id)) @skip_milestone_email = @params.delete(:skip_milestone_email) end diff --git a/app/services/issues/after_create_service.rb b/app/services/issues/after_create_service.rb index 011a78029c8..5d10eca2979 100644 --- a/app/services/issues/after_create_service.rb +++ b/app/services/issues/after_create_service.rb @@ -2,11 +2,6 @@ module Issues class AfterCreateService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(issue) todo_service.new_issue(issue, current_user) delete_milestone_total_issue_counter_cache(issue.milestone) diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 553fb6e2ac9..75ef9f735ab 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -33,6 +33,14 @@ module Issues private + # overriding this because IssuableBaseService#constructor_container_arg returns { project: value } + # Issues::ReopenService constructor signature is different now, it takes container instead of project also + # IssuableBaseService#change_state dynamically picks one of the `Issues::ReopenService`, `Epics::ReopenService` or + # MergeRequests::ReopenService, so we need this method to return { }container: value } for Issues::ReopenService + def self.constructor_container_arg(value) + { container: value } + end + def find_work_item_type_id(issue_type) work_item_type = WorkItems::Type.default_by_type(issue_type) work_item_type ||= WorkItems::Type.default_issue_type diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index 877ce09e065..75bd2b88e86 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -4,11 +4,6 @@ module Issues class BuildService < Issues::BaseService include ResolveDiscussions - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute filter_resolve_discussion_params diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index 9fde1cc2ac2..4f6a859e20e 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -2,11 +2,6 @@ module Issues class CloseService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - # Closes the supplied issue if the current user is able to do so. def execute(issue, commit: nil, notifications: true, system_note: true, skip_authorization: false) return issue unless can_close?(issue, skip_authorization: skip_authorization) @@ -56,11 +51,6 @@ module Issues private - # TODO: remove once MergeRequests::CloseService or IssuableBaseService method is changed. - def self.constructor_container_arg(value) - { container: value } - end - def can_close?(issue, skip_authorization: false) skip_authorization || can?(current_user, :update_issue, issue) || issue.is_a?(ExternalIssue) end diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index fa5233da489..ec5f9ea8167 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -15,9 +15,10 @@ module Issues # SpamParams constructor are not otherwise available, spam_params: must be explicitly passed as nil. def initialize(container:, spam_params:, current_user: nil, params: {}, build_service: nil) @extra_params = params.delete(:extra_params) || {} - super(project: container, current_user: current_user, params: params) + super(container: container, current_user: current_user, params: params) @spam_params = spam_params - @build_service = build_service || BuildService.new(container: project, current_user: current_user, params: params) + @build_service = build_service || + BuildService.new(container: project, current_user: current_user, params: params) end def execute(skip_system_notes: false) @@ -100,10 +101,6 @@ module Issues private - def self.constructor_container_arg(value) - { container: value } - end - def handle_quick_actions(issue) # Do not handle quick actions unless the work item is the default Issue. # The available quick actions for a work item depend on its type and widgets. diff --git a/app/services/issues/duplicate_service.rb b/app/services/issues/duplicate_service.rb index a3213c50f86..1fff9a4a684 100644 --- a/app/services/issues/duplicate_service.rb +++ b/app/services/issues/duplicate_service.rb @@ -2,11 +2,6 @@ module Issues class DuplicateService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(duplicate_issue, canonical_issue) return if canonical_issue == duplicate_issue return unless can?(current_user, :update_issue, duplicate_issue) diff --git a/app/services/issues/referenced_merge_requests_service.rb b/app/services/issues/referenced_merge_requests_service.rb index ba03927136a..ff7cf65e757 100644 --- a/app/services/issues/referenced_merge_requests_service.rb +++ b/app/services/issues/referenced_merge_requests_service.rb @@ -2,19 +2,15 @@ module Issues class ReferencedMergeRequestsService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - # rubocop: disable CodeReuse/ActiveRecord def execute(issue) referenced = referenced_merge_requests(issue) closed_by = closed_by_merge_requests(issue) - preloader = ActiveRecord::Associations::Preloader.new - preloader.preload(referenced + closed_by, - head_pipeline: { project: [:route, { namespace: :route }] }) + ActiveRecord::Associations::Preloader.new( + records: referenced + closed_by, + associations: { head_pipeline: { project: [:route, { namespace: :route }] } } + ).call [sort_by_iid(referenced), sort_by_iid(closed_by)] end diff --git a/app/services/issues/related_branches_service.rb b/app/services/issues/related_branches_service.rb index 3f4413fdfd7..ef6de83fcf4 100644 --- a/app/services/issues/related_branches_service.rb +++ b/app/services/issues/related_branches_service.rb @@ -4,11 +4,6 @@ # those with a merge request open referencing the current issue. module Issues class RelatedBranchesService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(issue) branch_names_with_mrs = branches_with_merge_request_for(issue) branches = branches_with_iid_of(issue).reject { |b| branch_names_with_mrs.include?(b[:name]) } diff --git a/app/services/issues/reopen_service.rb b/app/services/issues/reopen_service.rb index ebcf2fb5c83..f4f81e9455a 100644 --- a/app/services/issues/reopen_service.rb +++ b/app/services/issues/reopen_service.rb @@ -2,11 +2,6 @@ module Issues class ReopenService < Issues::BaseService - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(issue, skip_authorization: false) return issue unless can_reopen?(issue, skip_authorization: skip_authorization) @@ -27,14 +22,6 @@ module Issues private - # overriding this because IssuableBaseService#constructor_container_arg returns { project: value } - # Issues::ReopenService constructor signature is different now, it takes container instead of project also - # IssuableBaseService#change_state dynamically picks one of the `Issues::ReopenService`, `Epics::ReopenService` or - # MergeRequests::ReopenService, so we need this method to return { }container: value } for Issues::ReopenService - def self.constructor_container_arg(value) - { container: value } - end - def can_reopen?(issue, skip_authorization: false) skip_authorization || can?(current_user, :reopen_issue, issue) end diff --git a/app/services/issues/reorder_service.rb b/app/services/issues/reorder_service.rb index 059b4196b23..1afec4c94f4 100644 --- a/app/services/issues/reorder_service.rb +++ b/app/services/issues/reorder_service.rb @@ -4,11 +4,6 @@ module Issues class ReorderService < Issues::BaseService include Gitlab::Utils::StrongMemoize - # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container - def initialize(container:, current_user: nil, params: {}) - super(project: container, current_user: current_user, params: params) - end - def execute(issue) return false unless can?(current_user, :update_issue, issue) return false unless move_between_ids diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 71324b3f044..322065c5b7c 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -6,7 +6,7 @@ module Issues # necessary in many cases, and we don't want to require every caller to explicitly pass it as nil # to disable spam checking. def initialize(container:, current_user: nil, params: {}, spam_params: nil) - super(project: container, current_user: current_user, params: params) + super(container: container, current_user: current_user, params: params) @spam_params = spam_params end @@ -116,15 +116,6 @@ module Issues attr_reader :spam_params - # TODO: remove this once MergeRequests::UpdateService#initialize is changed to take container as named argument. - # - # Issues::UpdateService is used together with MergeRequests::UpdateService in Mutations::Assignable#assign! method - # however MergeRequests::UpdateService#initialize still takes `project` as param and Issues::UpdateService is being - # changed to take `container` as param. So we are adding this workaround in the meantime. - def self.constructor_container_arg(value) - { container: value } - end - def handle_quick_actions(issue) # Do not handle quick actions unless the work item is the default Issue. # The available quick actions for a work item depend on its type and widgets. diff --git a/app/services/issues/zoom_link_service.rb b/app/services/issues/zoom_link_service.rb index 4144c293990..bfd3e6a945f 100644 --- a/app/services/issues/zoom_link_service.rb +++ b/app/services/issues/zoom_link_service.rb @@ -3,7 +3,7 @@ module Issues class ZoomLinkService < Issues::BaseService def initialize(container:, current_user:, params:) - super(project: container, current_user: current_user, params: params) + super @issue = params.fetch(:issue) @added_meeting = ZoomMeeting.canonical_meeting(@issue) diff --git a/app/services/jira_connect_installations/proxy_lifecycle_event_service.rb b/app/services/jira_connect_installations/proxy_lifecycle_event_service.rb index d94d9e1324e..9f3b4a37672 100644 --- a/app/services/jira_connect_installations/proxy_lifecycle_event_service.rb +++ b/app/services/jira_connect_installations/proxy_lifecycle_event_service.rb @@ -82,9 +82,9 @@ module JiraConnectInstallations Gitlab::IntegrationsLogger.info( integration: 'JiraConnect', message: 'Proxy lifecycle event received error response', - event_type: event, - status_code: status_code, - body: body + jira_event_type: event, + jira_status_code: status_code, + jira_body: body ) end end diff --git a/app/services/keys/revoke_service.rb b/app/services/keys/revoke_service.rb index 42ea9ab73be..9684d4e461e 100644 --- a/app/services/keys/revoke_service.rb +++ b/app/services/keys/revoke_service.rb @@ -13,8 +13,6 @@ module Keys private def unverify_associated_signatures(key) - return unless Feature.enabled?(:revoke_ssh_signatures) - key.ssh_signatures.each_batch do |batch| batch.update_all( verification_status: CommitSignatures::SshSignature.verification_statuses[:revoked_key], diff --git a/app/services/markup/rendering_service.rb b/app/services/markup/rendering_service.rb index cd89c170efa..104bdb6dd41 100644 --- a/app/services/markup/rendering_service.rb +++ b/app/services/markup/rendering_service.rb @@ -52,6 +52,8 @@ module Markup def other_markup_unsafe Gitlab::OtherMarkup.render(file_name, text, context) + rescue GitHub::Markup::CommandError + ActionController::Base.helpers.simple_format(text) end def postprocess(html) diff --git a/app/services/mattermost/create_team_service.rb b/app/services/mattermost/create_team_service.rb index 9f6efab1e43..dc448cbc5eb 100644 --- a/app/services/mattermost/create_team_service.rb +++ b/app/services/mattermost/create_team_service.rb @@ -9,7 +9,7 @@ module Mattermost def execute # The user that creates the team will be Team Admin - ::Mattermost::Team.new(current_user).create(@group.mattermost_team_params) + ::Mattermost::Team.new(current_user).create(**@group.mattermost_team_params) rescue ::Mattermost::ClientError => e @group.errors.add(:mattermost_team, e.message) end diff --git a/app/services/merge_requests/add_context_service.rb b/app/services/merge_requests/add_context_service.rb index 2ce6073050e..a9ef3e85911 100644 --- a/app/services/merge_requests/add_context_service.rb +++ b/app/services/merge_requests/add_context_service.rb @@ -57,7 +57,7 @@ module MergeRequests def build_context_commit_rows(merge_request_id, commits) commits.map.with_index do |commit, index| # generate context commit information for given commit - commit_hash = commit.to_hash.except(:parent_ids) + commit_hash = commit.to_hash.except(:parent_ids, :referenced_by) sha = Gitlab::Database::ShaAttribute.serialize(commit_hash.delete(:id)) commit_hash.merge( merge_request_id: merge_request_id, @@ -75,7 +75,7 @@ module MergeRequests diff_order = 0 commits.flat_map.with_index do |commit, index| - commit_hash = commit.to_hash.except(:parent_ids) + commit_hash = commit.to_hash.except(:parent_ids, :referenced_by) sha = Gitlab::Database::ShaAttribute.serialize(commit_hash.delete(:id)) # generate context commit diff information for given commit diffs = commit.diffs diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index f6cbe889128..97ca96043fb 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -5,6 +5,12 @@ module MergeRequests extend ::Gitlab::Utils::Override include MergeRequests::AssignsMergeParams + delegate :repository, to: :project + + def initialize(project:, current_user: nil, params: {}) + super(container: project, current_user: current_user, params: params) + end + def create_note(merge_request, state = merge_request.state) SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, state, nil) end @@ -94,6 +100,10 @@ module MergeRequests private + def self.constructor_container_arg(value) + { project: value } + end + def refresh_pipelines_on_merge_requests(merge_request, allow_duplicate: false) create_pipeline_for(merge_request, current_user, async: true, allow_duplicate: allow_duplicate) end diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index 61831a624c7..21e0d9a6e6b 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -127,16 +127,23 @@ module MergeRequests merge_requests_array = merge_requests.to_a + merge_requests_from_forks.to_a filter_merge_requests(merge_requests_array).each do |merge_request| + skip_merge_status_trigger = true + if branch_and_project_match?(merge_request) || @push.force_push? merge_request.reload_diff(current_user) # Clear existing merge error if the push were directed at the # source branch. Clearing the error when the target branch # changes will hide the error from the user. merge_request.merge_error = nil + + # Don't skip trigger since we to update the MR's merge status in real-time + # when the push if for the MR's source branch and project. + skip_merge_status_trigger = false elsif merge_request.merge_request_diff.includes_any_commits?(push_commit_ids) merge_request.reload_diff(current_user) end + merge_request.skip_merge_status_trigger = skip_merge_status_trigger merge_request.mark_as_unchecked end diff --git a/app/services/metrics/dashboard/annotations/create_service.rb b/app/services/metrics/dashboard/annotations/create_service.rb index b86fa82a5e8..47e9afa36b9 100644 --- a/app/services/metrics/dashboard/annotations/create_service.rb +++ b/app/services/metrics/dashboard/annotations/create_service.rb @@ -26,7 +26,7 @@ module Metrics attr_reader :user, :params def authorize_environment_access(options) - if environment.nil? || Ability.allowed?(user, :create_metrics_dashboard_annotation, project) + if environment.nil? || Ability.allowed?(user, :admin_metrics_dashboard_annotation, project) options[:environment] = environment success(options) else @@ -35,7 +35,7 @@ module Metrics end def authorize_cluster_access(options) - if cluster.nil? || Ability.allowed?(user, :create_metrics_dashboard_annotation, cluster) + if cluster.nil? || Ability.allowed?(user, :admin_metrics_dashboard_annotation, cluster) options[:cluster] = cluster success(options) else diff --git a/app/services/metrics/dashboard/annotations/delete_service.rb b/app/services/metrics/dashboard/annotations/delete_service.rb index 3cb22f8d3da..34918c89304 100644 --- a/app/services/metrics/dashboard/annotations/delete_service.rb +++ b/app/services/metrics/dashboard/annotations/delete_service.rb @@ -24,7 +24,7 @@ module Metrics attr_reader :user, :annotation def authorize_action(_options) - if Ability.allowed?(user, :delete_metrics_dashboard_annotation, annotation) + if Ability.allowed?(user, :admin_metrics_dashboard_annotation, annotation) success else error(s_('MetricsDashboardAnnotation|You are not authorized to delete this annotation')) diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index f5efc480fef..8898f7feb17 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -54,6 +54,7 @@ module Notes content, update_params, message, command_names = quick_actions_service.execute(note, quick_action_options) only_commands = content.empty? note.note = content + note.command_names = command_names yield(only_commands) @@ -161,10 +162,7 @@ module Notes track_note_creation_usage_for_merge_requests(note) if note.for_merge_request? track_incident_action(user, note.noteable, 'incident_comment') if note.for_issue? track_note_creation_in_ipynb(note) - - if Feature.enabled?(:notes_create_service_tracking, project) - Gitlab::Tracking.event('Notes::CreateService', 'execute', **tracking_data_for(note)) - end + track_note_creation_visual_review(note) if Feature.enabled?(:route_hll_to_snowplow_phase4, project&.namespace) && note.for_commit? metric_key_path = 'counts.commit_comment' @@ -208,6 +206,10 @@ module Notes Gitlab::UsageDataCounters::IpynbDiffActivityCounter.note_created(note) end + + def track_note_creation_visual_review(note) + Gitlab::Tracking.event('Notes::CreateService', 'execute', **tracking_data_for(note)) + end end end diff --git a/app/services/notes/quick_actions_service.rb b/app/services/notes/quick_actions_service.rb index 900ace24ab4..ce1204298aa 100644 --- a/app/services/notes/quick_actions_service.rb +++ b/app/services/notes/quick_actions_service.rb @@ -14,6 +14,7 @@ module Notes delegate :commands_executed_count, to: :interpret_service, allow_nil: true UPDATE_SERVICES = { + 'WorkItem' => WorkItems::UpdateService, 'Issue' => Issues::UpdateService, 'MergeRequest' => MergeRequests::UpdateService, 'Commit' => Commits::TagService @@ -25,6 +26,8 @@ module Notes end def self.noteable_update_service_class(note) + return update_services['WorkItem'] if note.for_work_item? + update_services[note.noteable_type] end @@ -63,7 +66,11 @@ module Notes # Follow-on issue to address this is here: # https://gitlab.com/gitlab-org/gitlab/-/issues/328734 service = - if noteable_update_service_class.respond_to?(:constructor_container_arg) + if noteable_update_service_class == WorkItems::UpdateService + parsed_params = note.noteable.transform_quick_action_params(update_params) + + noteable_update_service_class.new(container: note.resource_parent, current_user: current_user, params: parsed_params[:common], widget_params: parsed_params[:widgets]) + elsif noteable_update_service_class.respond_to?(:constructor_container_arg) noteable_update_service_class.new(**noteable_update_service_class.constructor_container_arg(note.resource_parent), current_user: current_user, params: update_params) else noteable_update_service_class.new(note.resource_parent, current_user, update_params) diff --git a/app/services/packages/debian/extract_metadata_service.rb b/app/services/packages/debian/extract_metadata_service.rb index eb8227d1296..cc9defd2e73 100644 --- a/app/services/packages/debian/extract_metadata_service.rb +++ b/app/services/packages/debian/extract_metadata_service.rb @@ -14,6 +14,10 @@ module Packages def execute raise ExtractionError, 'invalid package file' unless valid_package_file? + if file_type == :unsupported + raise ExtractionError, "unsupported file extension for file #{package_file.file_name}" + end + extract_metadata end @@ -28,7 +32,7 @@ module Packages end def file_type_basic - %i[dsc deb udeb buildinfo changes].each do |format| + %i[dsc deb udeb buildinfo changes ddeb].each do |format| return format if package_file.file_name.end_with?(".#{format}") end @@ -36,8 +40,8 @@ module Packages end def file_type_source - # https://manpages.debian.org/buster/dpkg-dev/dpkg-source.1.en.html - %i[gzip bzip2 lzma xz].each do |format| + # https://manpages.debian.org/buster/dpkg-dev/dpkg-source.1.en.html#Format:_3.0_(quilt) + %i[gz bz2 lzma xz].each do |format| return :source if package_file.file_name.end_with?(".tar.#{format}") end @@ -45,13 +49,12 @@ module Packages end def file_type - strong_memoize(:file_type) do - file_type_basic || file_type_source || :unknown - end + file_type_basic || file_type_source || :unsupported end + strong_memoize_attr :file_type def file_type_debian? - file_type == :deb || file_type == :udeb + file_type == :deb || file_type == :udeb || file_type == :ddeb end def file_type_meta? @@ -59,18 +62,17 @@ module Packages end def fields - strong_memoize(:fields) do - if file_type_debian? - package_file.file.use_open_file(unlink_early: false) do |file| - ::Packages::Debian::ExtractDebMetadataService.new(file.file_path).execute - end - elsif file_type_meta? - package_file.file.use_open_file do |file| - ::Packages::Debian::ParseDebian822Service.new(file.read).execute.each_value.first - end + if file_type_debian? + package_file.file.use_open_file(unlink_early: false) do |file| + ::Packages::Debian::ExtractDebMetadataService.new(file.file_path).execute + end + elsif file_type_meta? + package_file.file.use_open_file do |file| + ::Packages::Debian::ParseDebian822Service.new(file.read).execute.each_value.first end end end + strong_memoize_attr :fields def extract_metadata architecture = fields['Architecture'] if file_type_debian? diff --git a/app/services/packages/debian/generate_distribution_service.rb b/app/services/packages/debian/generate_distribution_service.rb index 12ae6c68918..ee43fe208c9 100644 --- a/app/services/packages/debian/generate_distribution_service.rb +++ b/app/services/packages/debian/generate_distribution_service.rb @@ -165,16 +165,29 @@ module Packages def reuse_or_create_component_file(component, component_file_type, architecture, content) file_md5 = Digest::MD5.hexdigest(content) file_sha256 = Digest::SHA256.hexdigest(content) - component_file = component.files - .with_file_type(component_file_type) - .with_architecture(architecture) - .with_compression_type(nil) - .with_file_sha256(file_sha256) - .last - - if component_file + component_files = component.files + .with_file_type(component_file_type) + .with_architecture(architecture) + .with_compression_type(nil) + .order_updated_asc + component_file = component_files.with_file_sha256(file_sha256).last + last_component_file = component_files.last + + if content.empty? && (!last_component_file || last_component_file.file_sha256 == file_sha256) + # Do not create empty component file for empty content + # when there is no last component file or when the last component file is empty too + component_file = last_component_file || component.files.build( + updated_at: release_date, + file_type: component_file_type, + architecture: architecture, + compression_type: nil, + size: 0 + ) + elsif component_file + # Reuse existing component file component_file.touch(time: release_date) else + # Create a new component file component_file = component.files.create!( updated_at: release_date, file_type: component_file_type, @@ -182,7 +195,8 @@ module Packages compression_type: nil, file: CarrierWaveStringFile.new(content), file_md5: file_md5, - file_sha256: file_sha256 + file_sha256: file_sha256, + size: content.size ) end @@ -255,7 +269,7 @@ module Packages # used by ExclusiveLeaseGuard def lease_key - "packages:debian:generate_distribution_service:distribution:#{@distribution.id}" + "packages:debian:generate_distribution_service:#{@distribution.class.container_type}_distribution:#{@distribution.id}" end # used by ExclusiveLeaseGuard diff --git a/app/services/packages/debian/process_package_file_service.rb b/app/services/packages/debian/process_package_file_service.rb index 7d2d71184e6..dc16d38902b 100644 --- a/app/services/packages/debian/process_package_file_service.rb +++ b/app/services/packages/debian/process_package_file_service.rb @@ -41,7 +41,9 @@ module Packages raise ArgumentError, 'package file without Debian metadata' unless @package_file.debian_file_metadatum raise ArgumentError, 'already processed package file' unless @package_file.debian_file_metadatum.unknown? - return if file_metadata[:file_type] == :deb || file_metadata[:file_type] == :udeb + if file_metadata[:file_type] == :deb || file_metadata[:file_type] == :udeb || file_metadata[:file_type] == :ddeb + return + end raise ArgumentError, "invalid package file type: #{file_metadata[:file_type]}" end diff --git a/app/services/packages/mark_package_for_destruction_service.rb b/app/services/packages/mark_package_for_destruction_service.rb index 3417febe79a..8ccc242ae36 100644 --- a/app/services/packages/mark_package_for_destruction_service.rb +++ b/app/services/packages/mark_package_for_destruction_service.rb @@ -13,7 +13,8 @@ module Packages package.sync_maven_metadata(current_user) service_response_success('Package was successfully marked as pending destruction') - rescue StandardError + rescue StandardError => e + track_exception(e) service_response_error('Failed to mark the package as pending destruction', 400) end @@ -30,5 +31,13 @@ module Packages def user_can_delete_package? can?(current_user, :destroy_package, package.project) end + + def track_exception(error) + Gitlab::ErrorTracking.track_exception( + error, + project_id: package.project_id, + package_id: package.id + ) + end end end diff --git a/app/services/packages/mark_packages_for_destruction_service.rb b/app/services/packages/mark_packages_for_destruction_service.rb index 023392cf2d9..ade9ad2c974 100644 --- a/app/services/packages/mark_packages_for_destruction_service.rb +++ b/app/services/packages/mark_packages_for_destruction_service.rb @@ -31,13 +31,15 @@ module Packages def execute(batch_size: BATCH_SIZE) no_access = false min_batch_size = [batch_size, BATCH_SIZE].min + package_ids = [] @packages.each_batch(of: min_batch_size) do |batched_packages| loaded_packages = batched_packages.including_project_route.to_a + package_ids = loaded_packages.map(&:id) break no_access = true unless can_destroy_packages?(loaded_packages) - ::Packages::Package.id_in(loaded_packages.map(&:id)) + ::Packages::Package.id_in(package_ids) .update_all(status: :pending_destruction) sync_maven_metadata(loaded_packages) @@ -47,7 +49,8 @@ module Packages return UNAUTHORIZED_RESPONSE if no_access SUCCESS_RESPONSE - rescue StandardError + rescue StandardError => e + track_exception(e, package_ids) ERROR_RESPONSE end @@ -75,5 +78,9 @@ module Packages can?(@current_user, :destroy_package, package) end end + + def track_exception(error, package_ids) + Gitlab::ErrorTracking.track_exception(error, package_ids: package_ids) + end end end diff --git a/app/services/packages/maven/find_or_create_package_service.rb b/app/services/packages/maven/find_or_create_package_service.rb index b29adf4e11a..ac0c77391d7 100644 --- a/app/services/packages/maven/find_or_create_package_service.rb +++ b/app/services/packages/maven/find_or_create_package_service.rb @@ -3,10 +3,13 @@ module Packages module Maven class FindOrCreatePackageService < BaseService SNAPSHOT_TERM = '-SNAPSHOT' + MAX_FILE_NAME_LENGTH = 5000 def execute + return ServiceResponse.error(message: 'File name is too long') if file_name_too_long? + package = - ::Packages::Maven::PackageFinder.new(current_user, project, path: params[:path]) + ::Packages::Maven::PackageFinder.new(current_user, project, path: path) .execute unless Namespace::PackageSetting.duplicates_allowed?(package) @@ -32,16 +35,16 @@ module Packages # - my-company/my-app/maven-metadata.xml # # The first upload has to create the proper package (the one with the version set). - if params[:file_name] == Packages::Maven::Metadata.filename && !params[:path]&.ends_with?(SNAPSHOT_TERM) - package_name = params[:path] + if file_name == Packages::Maven::Metadata.filename && !snapshot_version? + package_name = path version = nil else - package_name, _, version = params[:path].rpartition('/') + package_name, _, version = path.rpartition('/') end package_params = { name: package_name, - path: params[:path], + path: path, status: params[:status], version: version } @@ -58,21 +61,55 @@ module Packages private - def extname(filename) - return if filename.blank? + def file_name_too_long? + return false unless file_name - File.extname(filename) + file_name.size > MAX_FILE_NAME_LENGTH end def target_package_is_duplicate?(package) # duplicate metadata files can be uploaded multiple times return false if package.version.nil? - package - .package_files - .map { |file| extname(file.file_name) } - .compact - .include?(extname(params[:file_name])) + existing_file_names = strip_snapshot_parts( + package.package_files + .map(&:file_name) + .compact + ) + + published_file_name = strip_snapshot_parts_from(file_name) + existing_file_names.include?(published_file_name) + end + + def strip_snapshot_parts(file_names) + return file_names unless snapshot_version? + + Array.wrap(file_names).map { |f| strip_snapshot_parts_from(f) } + end + + def strip_snapshot_parts_from(file_name) + return file_name unless snapshot_version? + return unless file_name + + match_data = file_name.match(Gitlab::Regex::Packages::MAVEN_SNAPSHOT_DYNAMIC_PARTS) + + if match_data + file_name.gsub(match_data.captures.last, "") + else + file_name + end + end + + def snapshot_version? + path&.ends_with?(SNAPSHOT_TERM) + end + + def path + params[:path] + end + + def file_name + params[:file_name] end end end diff --git a/app/services/personal_access_tokens/create_service.rb b/app/services/personal_access_tokens/create_service.rb index e2f2e220750..adb7924f35e 100644 --- a/app/services/personal_access_tokens/create_service.rb +++ b/app/services/personal_access_tokens/create_service.rb @@ -2,11 +2,12 @@ module PersonalAccessTokens class CreateService < BaseService - def initialize(current_user:, target_user:, params: {}) + def initialize(current_user:, target_user:, params: {}, concatenate_errors: true) @current_user = current_user @target_user = target_user @params = params.dup @ip_address = @params.delete(:ip_address) + @concatenate_errors = concatenate_errors end def execute @@ -19,7 +20,10 @@ module PersonalAccessTokens notification_service.access_token_created(target_user, token.name) ServiceResponse.success(payload: { personal_access_token: token }) else - ServiceResponse.error(message: token.errors.full_messages.to_sentence, payload: { personal_access_token: token }) + message = token.errors.full_messages + message = message.to_sentence if @concatenate_errors + + ServiceResponse.error(message: message, payload: { personal_access_token: token }) end end diff --git a/app/services/projects/batch_open_merge_requests_count_service.rb b/app/services/projects/batch_open_merge_requests_count_service.rb new file mode 100644 index 00000000000..62d1b018a55 --- /dev/null +++ b/app/services/projects/batch_open_merge_requests_count_service.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +# Service class for getting and caching the number of merge requests of several projects +# Warning: do not user this service with a really large set of projects +# because the service use maps to retrieve the project ids +module Projects + class BatchOpenMergeRequestsCountService < Projects::BatchCountService + # rubocop: disable CodeReuse/ActiveRecord + def global_count + @global_count ||= count_service.query(project_ids).group(:project_id).count + end + # rubocop: enable CodeReuse/ActiveRecord + + def count_service + ::Projects::OpenMergeRequestsCountService + end + end +end diff --git a/app/services/projects/blame_service.rb b/app/services/projects/blame_service.rb index 58e146e5a32..1ea16040655 100644 --- a/app/services/projects/blame_service.rb +++ b/app/services/projects/blame_service.rb @@ -5,15 +5,19 @@ module Projects class BlameService PER_PAGE = 1000 + STREAMING_FIRST_PAGE_SIZE = 200 + STREAMING_PER_PAGE = 2000 def initialize(blob, commit, params) @blob = blob @commit = commit - @page = extract_page(params) + @streaming_enabled = streaming_state(params) @pagination_enabled = pagination_state(params) + @page = extract_page(params) + @params = params end - attr_reader :page + attr_reader :page, :streaming_enabled def blame Gitlab::Blame.new(blob, commit, range: blame_range) @@ -28,7 +32,22 @@ module Projects end def per_page - PER_PAGE + streaming_enabled ? STREAMING_PER_PAGE : PER_PAGE + end + + def total_pages + total = (blob_lines_count.to_f / per_page).ceil + return total unless streaming_enabled + + ([blob_lines_count - STREAMING_FIRST_PAGE_SIZE, 0].max.to_f / per_page).ceil + 1 + end + + def total_extra_pages + [total_pages - 1, 0].max + end + + def streaming_possible + Feature.enabled?(:blame_page_streaming, commit.project) end private @@ -36,9 +55,16 @@ module Projects attr_reader :blob, :commit, :pagination_enabled def blame_range - return unless pagination_enabled + return unless pagination_enabled || streaming_enabled first_line = (page - 1) * per_page + 1 + + if streaming_enabled + return 1..STREAMING_FIRST_PAGE_SIZE if page == 1 + + first_line = STREAMING_FIRST_PAGE_SIZE + (page - 2) * per_page + 1 + end + last_line = (first_line + per_page).to_i - 1 first_line..last_line @@ -52,6 +78,12 @@ module Projects page end + def streaming_state(params) + return false unless streaming_possible + + Gitlab::Utils.to_boolean(params[:streaming], default: false) + end + def pagination_state(params) return false if Gitlab::Utils.to_boolean(params[:no_pagination], default: false) @@ -59,7 +91,7 @@ module Projects end def overlimit?(page) - page * per_page >= blob_lines_count + per_page + page > total_pages end def blob_lines_count diff --git a/app/services/projects/container_repository/gitlab/cleanup_tags_service.rb b/app/services/projects/container_repository/gitlab/cleanup_tags_service.rb index b69a3cc1a2c..714a9d43333 100644 --- a/app/services/projects/container_repository/gitlab/cleanup_tags_service.rb +++ b/app/services/projects/container_repository/gitlab/cleanup_tags_service.rb @@ -45,12 +45,12 @@ module Projects end def with_timeout - result = { + result = success( original_size: 0, before_delete_size: 0, deleted_size: 0, deleted: [] - } + ) yield Time.zone.now, result diff --git a/app/services/projects/forks/sync_service.rb b/app/services/projects/forks/sync_service.rb new file mode 100644 index 00000000000..4c70d7f17f5 --- /dev/null +++ b/app/services/projects/forks/sync_service.rb @@ -0,0 +1,113 @@ +# frozen_string_literal: true + +module Projects + module Forks + # A service for fetching upstream default branch and merging it to the fork's specified branch. + class SyncService < BaseService + ONGOING_MERGE_ERROR = 'The synchronization did not happen due to another merge in progress' + + MergeError = Class.new(StandardError) + + def initialize(project, user, target_branch) + super(project, user) + + @source_project = project.fork_source + @head_sha = project.repository.commit(target_branch).sha + @target_branch = target_branch + @details = Projects::Forks::Details.new(project, target_branch) + end + + def execute + execute_service + + ServiceResponse.success + rescue MergeError => e + Gitlab::ErrorTracking.log_exception(e, { project_id: project.id, user_id: current_user.id }) + + ServiceResponse.error(message: e.message) + ensure + details.exclusive_lease.cancel + end + + private + + attr_reader :source_project, :head_sha, :target_branch, :details + + # The method executes multiple steps: + # + # 1. Gitlab::Git::CrossRepo fetches upstream default branch into a temporary ref and returns new source sha. + # 2. New divergence counts are calculated using the source sha. + # 3. If the fork is not behind, there is nothing to merge -> exit. + # 4. Otherwise, continue with the new source sha. + # 5. If Gitlab::Git::CommandError is raised it means that merge couldn't happen due to a merge conflict. The + # details are updated to transfer this error to the user. + def execute_service + counts = [] + source_sha = source_project.commit.sha + + Gitlab::Git::CrossRepo.new(repository, source_project.repository) + .execute(source_sha) do |cross_repo_source_sha| + counts = repository.diverging_commit_count(head_sha, cross_repo_source_sha) + ahead, behind = counts + next if behind == 0 + + execute_with_fetched_source(cross_repo_source_sha, ahead) + end + rescue Gitlab::Git::CommandError => e + details.update!({ sha: head_sha, source_sha: source_sha, counts: counts, has_conflicts: true }) + + raise MergeError, e.message + end + + def execute_with_fetched_source(cross_repo_source_sha, ahead) + with_linked_lfs_pointers(cross_repo_source_sha) do + merge_commit_id = perform_merge(cross_repo_source_sha, ahead) + raise MergeError, ONGOING_MERGE_ERROR unless merge_commit_id + end + end + + # This method merges the upstream default branch to the fork specified branch. + # Depending on whether the fork branch is ahead of upstream or not, a different type of + # merge is performed. + # + # If the fork's branch is not ahead of the upstream (only behind), fast-forward merge is performed. + # However, if the fork's branch contains commits that don't exist upstream, a merge commit is created. + # In this case, a conflict may happen, which interrupts the merge and returns a message to the user. + def perform_merge(cross_repo_source_sha, ahead) + if ahead > 0 + message = "Merge branch #{source_project.path}:#{source_project.default_branch} into #{target_branch}" + + repository.merge_to_branch(current_user, + source_sha: cross_repo_source_sha, + target_branch: target_branch, + target_sha: head_sha, + message: message) + else + repository.ff_merge(current_user, cross_repo_source_sha, target_branch, target_sha: head_sha) + end + end + + # This method links the newly merged lfs objects (if any) with the existing ones upstream. + # The LfsLinkService service has a limit and may raise an error if there are too many lfs objects to link. + # This is the reason why the block is passed: + # + # 1. Verify that there are not too many lfs objects to link + # 2. Execute the block (which basically performs the merge) + # 3. Link lfs objects + def with_linked_lfs_pointers(newrev, &block) + return yield unless project.lfs_enabled? + + oldrev = head_sha + new_lfs_oids = + Gitlab::Git::LfsChanges + .new(repository, newrev) + .new_pointers(not_in: [oldrev]) + .map(&:lfs_oid) + + Projects::LfsPointers::LfsLinkService.new(project).execute(new_lfs_oids, &block) + rescue Projects::LfsPointers::LfsLinkService::TooManyOidsError => e + raise MergeError, e.message + end + end + end +end diff --git a/app/services/projects/import_export/relation_export_service.rb b/app/services/projects/import_export/relation_export_service.rb index dce40cf18ba..33da5b39c20 100644 --- a/app/services/projects/import_export/relation_export_service.rb +++ b/app/services/projects/import_export/relation_export_service.rb @@ -85,6 +85,7 @@ module Projects logger.error( message: 'Project relation export failed', export_error: error_message, + relation: relation_export.relation, project_export_job_id: project_export_job.id, project_name: project.name, project_id: project.id diff --git a/app/services/projects/lfs_pointers/lfs_link_service.rb b/app/services/projects/lfs_pointers/lfs_link_service.rb index cf3cc5cd8e0..f8f03d481af 100644 --- a/app/services/projects/lfs_pointers/lfs_link_service.rb +++ b/app/services/projects/lfs_pointers/lfs_link_service.rb @@ -15,9 +15,9 @@ module Projects def execute(oids) return [] unless project&.lfs_enabled? - if oids.size > MAX_OIDS - raise TooManyOidsError, 'Too many LFS object ids to link, please push them manually' - end + validate!(oids) + + yield if block_given? # Search and link existing LFS Object link_existing_lfs_objects(oids) @@ -25,6 +25,12 @@ module Projects private + def validate!(oids) + return if oids.size <= MAX_OIDS + + raise TooManyOidsError, 'Too many LFS object ids to link, please push them manually' + end + def link_existing_lfs_objects(oids) linked_existing_objects = [] iterations = 0 diff --git a/app/services/projects/open_merge_requests_count_service.rb b/app/services/projects/open_merge_requests_count_service.rb index 76ec13952ab..c67ebf2f26a 100644 --- a/app/services/projects/open_merge_requests_count_service.rb +++ b/app/services/projects/open_merge_requests_count_service.rb @@ -4,12 +4,12 @@ module Projects # Service class for counting and caching the number of open merge requests of # a project. class OpenMergeRequestsCountService < Projects::CountService - def relation_for_count - @project.merge_requests.opened - end - def cache_key_name 'open_merge_requests_count' end + + def self.query(project_ids) + MergeRequest.opened.of_projects(project_ids) + end end end diff --git a/app/services/projects/protect_default_branch_service.rb b/app/services/projects/protect_default_branch_service.rb index 5360902038b..0aca525921c 100644 --- a/app/services/projects/protect_default_branch_service.rb +++ b/app/services/projects/protect_default_branch_service.rb @@ -45,11 +45,7 @@ module Projects end def protected_branch_exists? - if Feature.enabled?(:group_protected_branches) - project.all_protected_branches.find_by_name(default_branch).present? - else - project.protected_branches.find_by_name(default_branch).present? - end + project.all_protected_branches.find_by_name(default_branch).present? end def default_branch diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb index 7c63216af5e..cadf3012131 100644 --- a/app/services/projects/update_repository_storage_service.rb +++ b/app/services/projects/update_repository_storage_service.rb @@ -25,19 +25,6 @@ module Projects end end - # The underlying FetchInternalRemote call uses a `git fetch` to move data - # to the new repository, which leaves it in a less-well-packed state, - # lacking bitmaps and commit graphs. Housekeeping will boost performance - # significantly. - def enqueue_housekeeping - return unless Gitlab::CurrentSettings.housekeeping_enabled? - return unless Feature.enabled?(:repack_after_shard_migration, project) - - Repositories::HousekeepingService.new(project, :gc).execute - rescue Repositories::HousekeepingService::LeaseTaken - # No action required - end - def remove_old_paths super diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 301d11d841c..bea994e8bb2 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -10,6 +10,8 @@ module Projects def execute build_topics remove_unallowed_params + add_pages_unique_domain + validate! ensure_wiki_exists if enabling_wiki? @@ -48,6 +50,24 @@ module Projects private + def add_pages_unique_domain + if Feature.disabled?(:pages_unique_domain) + params[:project_setting_attributes]&.delete(:pages_unique_domain_enabled) + + return + end + + return unless params.dig(:project_setting_attributes, :pages_unique_domain_enabled) + + # If the project used a unique domain once, it'll always use the same + return if project.project_setting.pages_unique_domain_in_database.present? + + params[:project_setting_attributes][:pages_unique_domain] = Gitlab::Pages::RandomDomain.generate( + project_path: project.path, + namespace_path: project.parent.full_path + ) + end + def validate! unless valid_visibility_level_change?(project, project.visibility_attribute_value(params)) raise ValidationError, s_('UpdateProject|New visibility level not allowed!') diff --git a/app/services/protected_branches/base_service.rb b/app/services/protected_branches/base_service.rb index 951017b2d01..6906ab2b642 100644 --- a/app/services/protected_branches/base_service.rb +++ b/app/services/protected_branches/base_service.rb @@ -21,3 +21,5 @@ module ProtectedBranches end end end + +ProtectedBranches::BaseService.prepend_mod diff --git a/app/services/protected_branches/cache_service.rb b/app/services/protected_branches/cache_service.rb index 4a9fc335421..ac02bf25617 100644 --- a/app/services/protected_branches/cache_service.rb +++ b/app/services/protected_branches/cache_service.rb @@ -73,7 +73,8 @@ module ProtectedBranches end def redis_key - @redis_key ||= if Feature.enabled?(:group_protected_branches) + group = project_or_group.is_a?(Group) ? project_or_group : project_or_group.group + @redis_key ||= if Feature.enabled?(:group_protected_branches, group) [CACHE_ROOT_KEY, project_or_group.class.name, project_or_group.id].join(':') else [CACHE_ROOT_KEY, project_or_group.id].join(':') diff --git a/app/services/releases/links/base_service.rb b/app/services/releases/links/base_service.rb new file mode 100644 index 00000000000..8bab258f80a --- /dev/null +++ b/app/services/releases/links/base_service.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +module Releases + module Links + REASON_BAD_REQUEST = :bad_request + REASON_NOT_FOUND = :not_found + REASON_FORBIDDEN = :forbidden + + class BaseService + attr_accessor :release, :current_user, :params + + def initialize(release, current_user = nil, params = {}) + @release = release + @current_user = current_user + @params = params.dup + end + + private + + def allowed_params + @allowed_params ||= params.slice(:name, :url, :link_type).tap do |hash| + hash[:filepath] = filepath if provided_filepath? + end + end + + def provided_filepath? + params.key?(:direct_asset_path) || params.key?(:filepath) + end + + def filepath + params[:direct_asset_path] || params[:filepath] + end + end + end +end diff --git a/app/services/releases/links/create_service.rb b/app/services/releases/links/create_service.rb new file mode 100644 index 00000000000..94823c54596 --- /dev/null +++ b/app/services/releases/links/create_service.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module Releases + module Links + class CreateService < BaseService + def execute + return ServiceResponse.error(reason: REASON_FORBIDDEN, message: _('Access Denied')) unless allowed? + + link = release.links.create(allowed_params) + + if link.persisted? + ServiceResponse.success(payload: { link: link }) + else + ServiceResponse.error(reason: REASON_BAD_REQUEST, message: link.errors.full_messages) + end + end + + private + + def allowed? + Ability.allowed?(current_user, :create_release, release) + end + end + end +end diff --git a/app/services/releases/links/destroy_service.rb b/app/services/releases/links/destroy_service.rb new file mode 100644 index 00000000000..1c1158017bb --- /dev/null +++ b/app/services/releases/links/destroy_service.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module Releases + module Links + class DestroyService < BaseService + def execute(link) + return ServiceResponse.error(reason: REASON_FORBIDDEN, message: _('Access Denied')) unless allowed? + return ServiceResponse.error(reason: REASON_NOT_FOUND, message: _('Link does not exist')) unless link + + if link.destroy + ServiceResponse.success(payload: { link: link }) + else + ServiceResponse.error(reason: REASON_BAD_REQUEST, message: link.errors.full_messages) + end + end + + private + + def allowed? + Ability.allowed?(current_user, :destroy_release, release) + end + end + end +end diff --git a/app/services/releases/links/update_service.rb b/app/services/releases/links/update_service.rb new file mode 100644 index 00000000000..c29de86f31b --- /dev/null +++ b/app/services/releases/links/update_service.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module Releases + module Links + class UpdateService < BaseService + def execute(link) + return ServiceResponse.error(reason: REASON_FORBIDDEN, message: _('Access Denied')) unless allowed? + return ServiceResponse.error(reason: REASON_NOT_FOUND, message: _('Link does not exist')) unless link + + if link.update(allowed_params) + ServiceResponse.success(payload: { link: link }) + else + ServiceResponse.error(reason: REASON_BAD_REQUEST, message: link.errors.full_messages) + end + end + + private + + def allowed? + Ability.allowed?(current_user, :update_release, release) + end + end + end +end diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb index f6fe23b4555..cfa43f5d9c8 100644 --- a/app/services/resource_access_tokens/create_service.rb +++ b/app/services/resource_access_tokens/create_service.rb @@ -2,6 +2,8 @@ module ResourceAccessTokens class CreateService < BaseService + include Gitlab::Utils::StrongMemoize + def initialize(current_user, resource, params = {}) @resource_type = resource.class.name.downcase @resource = resource @@ -25,7 +27,7 @@ module ResourceAccessTokens unless member.persisted? delete_failed_user(user) - return error("Could not provision #{Gitlab::Access.human_access(access_level).downcase} access to project access token") + return error("Could not provision #{Gitlab::Access.human_access(access_level.to_i).downcase} access to the access token. ERROR: #{member.errors.full_messages.to_sentence}") end token_response = create_personal_access_token(user) @@ -43,6 +45,14 @@ module ResourceAccessTokens attr_reader :resource_type, :resource + def username_and_email_generator + Gitlab::Utils::UsernameAndEmailGenerator.new( + username_prefix: "#{resource_type}_#{resource.id}_bot", + email_domain: "noreply.#{Gitlab.config.gitlab.host}" + ) + end + strong_memoize_attr :username_and_email_generator + def has_permission_to_create? %w(project group).include?(resource_type) && can?(current_user, :create_resource_access_tokens, resource) end @@ -63,31 +73,13 @@ module ResourceAccessTokens def default_user_params { name: params[:name] || "#{resource.name.to_s.humanize} bot", - email: generate_email, - username: generate_username, + email: username_and_email_generator.email, + username: username_and_email_generator.username, user_type: :project_bot, skip_confirmation: true # Bot users should always have their emails confirmed. } end - def generate_username - base_username = "#{resource_type}_#{resource.id}_bot" - - uniquify.string(base_username) { |s| User.find_by_username(s) } - end - - def generate_email - email_pattern = "#{resource_type}#{resource.id}_bot%s@noreply.#{Gitlab.config.gitlab.host}" - - uniquify.string(-> (n) { Kernel.sprintf(email_pattern, n) }) do |s| - User.find_by_email(s) - end - end - - def uniquify - Uniquify.new - end - def create_personal_access_token(user) PersonalAccessTokens::CreateService.new( current_user: user, target_user: user, params: personal_access_token_params diff --git a/app/services/security/ci_configuration/base_create_service.rb b/app/services/security/ci_configuration/base_create_service.rb index 3e8865d3dff..0534925aaec 100644 --- a/app/services/security/ci_configuration/base_create_service.rb +++ b/app/services/security/ci_configuration/base_create_service.rb @@ -19,7 +19,8 @@ module Security target: '_blank', rel: 'noopener noreferrer' raise Gitlab::Graphql::Errors::MutationError, - _(format('You must %s before using Security features.', docs_link.html_safe)).html_safe + Gitlab::Utils::ErrorMessage.to_user_facing( + _(format('You must %s before using Security features.', docs_link.html_safe)).html_safe) end project.repository.add_branch(current_user, branch_name, project.default_branch) @@ -51,7 +52,7 @@ module Security end def existing_gitlab_ci_content - root_ref = root_ref_sha(project) + root_ref = root_ref_sha(project.repository) return if root_ref.nil? @gitlab_ci_yml ||= project.ci_config_for(root_ref) @@ -82,13 +83,10 @@ module Security ) end - def root_ref_sha(project) - project.repository.root_ref_sha - rescue StandardError => e - # this might fail on the very first commit, - # and unfortunately it raises a StandardError - Gitlab::ErrorTracking.track_exception(e, project_id: project.id) - nil + def root_ref_sha(repository) + commit = repository.commit(repository.root_ref) + + commit&.sha end end end diff --git a/app/services/serverless/associate_domain_service.rb b/app/services/serverless/associate_domain_service.rb deleted file mode 100644 index 0c6ee58924c..00000000000 --- a/app/services/serverless/associate_domain_service.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -module Serverless - class AssociateDomainService - PLACEHOLDER_HOSTNAME = 'example.com' - - def initialize(knative, pages_domain_id:, creator:) - @knative = knative - @pages_domain_id = pages_domain_id - @creator = creator - end - - def execute - return if unchanged? - - knative.hostname ||= PLACEHOLDER_HOSTNAME - - knative.pages_domain = knative.find_available_domain(pages_domain_id) - knative.serverless_domain_cluster.update(creator: creator) if knative.pages_domain - end - - private - - attr_reader :knative, :pages_domain_id, :creator - - def unchanged? - knative.pages_domain&.id == pages_domain_id - end - end -end diff --git a/app/services/system_notes/commit_service.rb b/app/services/system_notes/commit_service.rb index 592351079aa..e4d89ecb930 100644 --- a/app/services/system_notes/commit_service.rb +++ b/app/services/system_notes/commit_service.rb @@ -2,6 +2,8 @@ module SystemNotes class CommitService < ::SystemNotes::BaseService + NEW_COMMIT_DISPLAY_LIMIT = 10 + # Called when commits are added to a merge request # # new_commits - Array of Commits added since last push @@ -36,25 +38,73 @@ module SystemNotes create_note(NoteSummary.new(noteable, project, author, body, action: 'tag')) end + private + # Build an Array of lines detailing each commit added in a merge request # # new_commits - Array of new Commit objects # # Returns an Array of Strings - def new_commit_summary(new_commits) + def new_commits_list(new_commits) new_commits.collect do |commit| content_tag('li', "#{commit.short_id} - #{commit.title}") end end - private + # Builds an Array of lines describing each commit and truncate them based on the limit + # to avoid creating a note with a large number of commits. + # + # commits - Array of Commit objects + # + # Returns an Array of Strings + # + # rubocop: disable CodeReuse/ActiveRecord + def new_commit_summary(commits, start_rev) + if commits.size > NEW_COMMIT_DISPLAY_LIMIT + no_of_commits_to_truncate = commits.size - NEW_COMMIT_DISPLAY_LIMIT + commits_to_truncate = commits.take(no_of_commits_to_truncate) + remaining_commits = commits.drop(no_of_commits_to_truncate) + + [truncated_new_commits(commits_to_truncate, start_rev)] + new_commits_list(remaining_commits) + else + new_commits_list(commits) + end + end + # rubocop: enable CodeReuse/ActiveRecord + + # Builds a summary line that describes given truncated commits. + # + # commits - Array of Commit objects + # start_rev - String SHA of a Commit that will be used as the starting SHA of the range + # + # Returns a String wrapped in 'li' tag. + def truncated_new_commits(commits, start_rev) + count = commits.size + + commit_ids = if count == 1 + commits.first.short_id + elsif start_rev && !Gitlab::Git.blank_ref?(start_rev) + "#{Commit.truncate_sha(start_rev)}...#{commits.last.short_id}" + else + # This two-dots notation seems to be not functioning as expected, but we should + # fallback to it as start_rev can be empty. + # + # For more information, please see https://gitlab.com/gitlab-org/gitlab/-/issues/391809 + "#{commits.first.short_id}..#{commits.last.short_id}" + end + + commits_text = "#{count} earlier commit".pluralize(count) + + content_tag('li', "#{commit_ids} - #{commits_text}") + end # Builds a list of existing and new commits according to existing_commits and # new_commits methods. # Returns a String wrapped in `ul` and `li` tags. def commits_list(noteable, new_commits, existing_commits, oldrev) existing_commit_summary = existing_commit_summary(noteable, existing_commits, oldrev) - new_commit_summary = new_commit_summary(new_commits).join + start_rev = existing_commits.empty? ? oldrev : existing_commits.last.id + new_commit_summary = new_commit_summary(new_commits, start_rev).join content_tag('ul', "#{existing_commit_summary}#{new_commit_summary}".html_safe) end diff --git a/app/services/tasks_to_be_done/base_service.rb b/app/services/tasks_to_be_done/base_service.rb index 5851a2cb9e5..ba52e9abeb2 100644 --- a/app/services/tasks_to_be_done/base_service.rb +++ b/app/services/tasks_to_be_done/base_service.rb @@ -11,7 +11,7 @@ module TasksToBeDone description: description, add_labels: label_name } - super(project: container, current_user: current_user, params: params) + super(container: container, current_user: current_user, params: params) end def execute diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb index 42a8aca17d3..2025d438ae7 100644 --- a/app/services/todo_service.rb +++ b/app/services/todo_service.rb @@ -428,8 +428,6 @@ class TodoService event = "incident_management_incident_todo" track_usage_event(event, user.id) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2, namespace) - Gitlab::Tracking.event( self.class.to_s, event, diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index 934dccf2f76..9d221119985 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -70,7 +70,7 @@ module Users @user_params[:created_by_id] = current_user&.id @user_params[:external] = user_external? if set_external_param? - @user_params.delete(:user_type) unless project_bot? + @user_params.delete(:user_type) unless allowed_user_type? end def set_external_param? @@ -81,7 +81,7 @@ module Users user_default_internal_regex_instance.match(params[:email]).nil? end - def project_bot? + def allowed_user_type? user_params[:user_type]&.to_sym == :project_bot end diff --git a/app/services/users/refresh_authorized_projects_service.rb b/app/services/users/refresh_authorized_projects_service.rb index b1ffd006795..d01fa29d8d4 100644 --- a/app/services/users/refresh_authorized_projects_service.rb +++ b/app/services/users/refresh_authorized_projects_service.rb @@ -92,3 +92,5 @@ module Users end end end + +Users::RefreshAuthorizedProjectsService.prepend_mod diff --git a/app/services/users/validate_manual_otp_service.rb b/app/services/users/validate_manual_otp_service.rb index 96a827db13c..8ba76f5f593 100644 --- a/app/services/users/validate_manual_otp_service.rb +++ b/app/services/users/validate_manual_otp_service.rb @@ -3,6 +3,7 @@ module Users class ValidateManualOtpService < BaseService include ::Gitlab::Auth::Otp::Fortinet + include ::Gitlab::Auth::Otp::DuoAuth def initialize(current_user) @current_user = current_user @@ -10,6 +11,8 @@ module Users ::Gitlab::Auth::Otp::Strategies::FortiAuthenticator::ManualOtp.new(current_user) elsif forti_token_cloud_enabled?(current_user) ::Gitlab::Auth::Otp::Strategies::FortiTokenCloud.new(current_user) + elsif duo_auth_enabled?(current_user) + ::Gitlab::Auth::Otp::Strategies::DuoAuth::ManualOtp.new(current_user) else ::Gitlab::Auth::Otp::Strategies::Devise.new(current_user) end diff --git a/app/services/work_items/export_csv_service.rb b/app/services/work_items/export_csv_service.rb index 9bef75e2c40..a715aab1b30 100644 --- a/app/services/work_items/export_csv_service.rb +++ b/app/services/work_items/export_csv_service.rb @@ -11,7 +11,7 @@ module WorkItems end def email(mail_to_user) - # TODO - will be implemented as part of https://gitlab.com/gitlab-org/gitlab/-/issues/379082 + Notify.export_work_items_csv_email(mail_to_user, resource_parent, csv_data, csv_builder.status).deliver_now end private diff --git a/app/services/work_items/import_csv_service.rb b/app/services/work_items/import_csv_service.rb new file mode 100644 index 00000000000..e7043cc882a --- /dev/null +++ b/app/services/work_items/import_csv_service.rb @@ -0,0 +1,116 @@ +# frozen_string_literal: true + +module WorkItems + class ImportCsvService < ImportCsv::BaseService + extend ::Gitlab::Utils::Override + + FeatureNotAvailableError = StandardError.new( + 'This feature is currently behind a feature flag and it is not available.' + ) + NotAuthorizedError = StandardError.new('You do not have permission to import work items in this project.') + + override :initialize + def initialize(*args) + super + + @type_errors = { + blank: [], + missing: {}, + disallowed: {} + } + end + + def self.required_headers + %w[title type].freeze + end + + def execute + raise FeatureNotAvailableError if ::Feature.disabled?(:import_export_work_items_csv, project) + raise NotAuthorizedError unless Ability.allowed?(user, :import_work_items, project) + + super + end + + def email_results_to_user + Notify.import_work_items_csv_email(user.id, project.id, results).deliver_later + end + + private + + attr_accessor :type_errors + + def create_object(attributes) + super[:work_item] + end + + def create_object_class + ::WorkItems::CreateService + end + + override :attributes_for + def attributes_for(row) + { + title: row[:title], + work_item_type: match_work_item_type(row[:type]) + } + end + + override :validate_headers_presence! + def validate_headers_presence!(headers) + required_headers = self.class.required_headers + + headers.downcase! + return if headers && required_headers.all? { |rh| headers.include?(rh) } + + required_headers_message = "Required headers are missing. Required headers are #{required_headers.join(', ')}" + raise CSV::MalformedCSVError.new(required_headers_message, 1) + end + + def match_work_item_type(work_item_type) + match = available_work_item_types[work_item_type&.downcase] + match[:type] if match + end + + def available_work_item_types + { + issue: { + allowed: Ability.allowed?(user, :create_issue, project), + type: WorkItems::Type.default_by_type(:issue) + } + }.with_indifferent_access + end + strong_memoize_attr :available_work_item_types + + def preprocess! + with_csv_lines.each do |row, line_no| + work_item_type = row[:type]&.strip&.downcase + + if work_item_type.blank? + type_errors[:blank] << line_no + elsif missing?(work_item_type) + # does this work item exist in the range of work items we support? + (type_errors[:missing][work_item_type] ||= []) << line_no + elsif !allowed?(work_item_type) + (type_errors[:disallowed][work_item_type] ||= []) << line_no + end + end + + return if type_errors[:blank].empty? && + type_errors[:missing].blank? && + type_errors[:disallowed].blank? + + results[:type_errors] = type_errors + raise PreprocessError + end + + def missing?(work_item_type_name) + !available_work_item_types.key?(work_item_type_name) + end + + def allowed?(work_item_type_name) + !!available_work_item_types[work_item_type_name][:allowed] + end + end +end + +WorkItems::ImportCsvService.prepend_mod diff --git a/app/services/work_items/parent_links/create_service.rb b/app/services/work_items/parent_links/create_service.rb index 288ca152f93..85b470c47ca 100644 --- a/app/services/work_items/parent_links/create_service.rb +++ b/app/services/work_items/parent_links/create_service.rb @@ -10,6 +10,8 @@ module WorkItems link = WorkItems::ParentLink.find_or_initialize_by(work_item: work_item) link.work_item_parent = issuable + link.move_to_end + if link.changed? && link.save create_notes(work_item) end diff --git a/app/services/work_items/widgets/notifications_service/update_service.rb b/app/services/work_items/widgets/notifications_service/update_service.rb new file mode 100644 index 00000000000..b301e2ca7db --- /dev/null +++ b/app/services/work_items/widgets/notifications_service/update_service.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module WorkItems + module Widgets + module NotificationsService + class UpdateService < WorkItems::Widgets::BaseService + def before_update_in_transaction(params:) + return unless params.present? && params.key?(:subscribed) + return unless has_permission?(:update_subscription) + + update_subscription(work_item, params) + end + + private + + def update_subscription(work_item, subscription_params) + work_item.set_subscription( + current_user, + subscription_params[:subscribed], + work_item.project + ) + end + end + end + end +end diff --git a/app/uploaders/ci/pipeline_artifact_uploader.rb b/app/uploaders/ci/pipeline_artifact_uploader.rb index d3a83c5d633..62e00fe1a66 100644 --- a/app/uploaders/ci/pipeline_artifact_uploader.rb +++ b/app/uploaders/ci/pipeline_artifact_uploader.rb @@ -4,7 +4,7 @@ module Ci class PipelineArtifactUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.artifacts + storage_location :artifacts alias_method :upload, :model diff --git a/app/uploaders/ci/secure_file_uploader.rb b/app/uploaders/ci/secure_file_uploader.rb index 11cbfc6c1f2..09d9b3abafb 100644 --- a/app/uploaders/ci/secure_file_uploader.rb +++ b/app/uploaders/ci/secure_file_uploader.rb @@ -4,7 +4,7 @@ module Ci class SecureFileUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.ci_secure_files + storage_location :ci_secure_files # Use Lockbox to encrypt/decrypt the stored file (registers CarrierWave callbacks) encrypt(key: :key) diff --git a/app/uploaders/deleted_object_uploader.rb b/app/uploaders/deleted_object_uploader.rb index fc0f62b920c..eaf584c5dfa 100644 --- a/app/uploaders/deleted_object_uploader.rb +++ b/app/uploaders/deleted_object_uploader.rb @@ -3,7 +3,7 @@ class DeletedObjectUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.artifacts + storage_location :artifacts def store_dir model.store_dir diff --git a/app/uploaders/dependency_proxy/file_uploader.rb b/app/uploaders/dependency_proxy/file_uploader.rb index f0222d4cf06..d4e486bfe84 100644 --- a/app/uploaders/dependency_proxy/file_uploader.rb +++ b/app/uploaders/dependency_proxy/file_uploader.rb @@ -5,7 +5,7 @@ class DependencyProxy::FileUploader < GitlabUploader include ObjectStorage::Concern before :cache, :set_content_type - storage_options Gitlab.config.dependency_proxy + storage_location :dependency_proxy alias_method :upload, :model diff --git a/app/uploaders/external_diff_uploader.rb b/app/uploaders/external_diff_uploader.rb index d2707cd0777..86c3d734174 100644 --- a/app/uploaders/external_diff_uploader.rb +++ b/app/uploaders/external_diff_uploader.rb @@ -3,7 +3,7 @@ class ExternalDiffUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.external_diffs + storage_location :external_diffs alias_method :upload, :model diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 62024bff4c0..2eb34288bd7 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -3,7 +3,7 @@ class GitlabUploader < CarrierWave::Uploader::Base include ContentTypeWhitelist::Concern - class_attribute :options + class_attribute :storage_location_identifier PROTECTED_METHODS = %i(filename cache_dir work_dir store_dir).freeze @@ -11,8 +11,13 @@ class GitlabUploader < CarrierWave::Uploader::Base class << self # DSL setter - def storage_options(options) - self.options = options + def storage_location(location) + self.storage_location_identifier = location + _ = options # Ensures that we have a valid storage_location_identifier + end + + def options + ObjectStorage::Config::LOCATIONS.fetch(storage_location_identifier) end def root @@ -41,7 +46,7 @@ class GitlabUploader < CarrierWave::Uploader::Base end end - storage_options Gitlab.config.uploads + storage_location :uploads delegate :base_dir, :file_storage?, to: :class @@ -51,6 +56,10 @@ class GitlabUploader < CarrierWave::Uploader::Base super(model, mounted_as) end + def options + self.class.options + end + def file_cache_storage? cache_storage.is_a?(CarrierWave::Storage::File) end diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb index b38e7d93eac..5ee8c42f510 100644 --- a/app/uploaders/job_artifact_uploader.rb +++ b/app/uploaders/job_artifact_uploader.rb @@ -7,7 +7,7 @@ class JobArtifactUploader < GitlabUploader UnknownFileLocationError = Class.new(StandardError) - storage_options Gitlab.config.artifacts + storage_location :artifacts alias_method :upload, :model diff --git a/app/uploaders/lfs_object_uploader.rb b/app/uploaders/lfs_object_uploader.rb index 027857500f4..4111bb92322 100644 --- a/app/uploaders/lfs_object_uploader.rb +++ b/app/uploaders/lfs_object_uploader.rb @@ -4,7 +4,7 @@ class LfsObjectUploader < GitlabUploader extend Workhorse::UploadPath include ObjectStorage::Concern - storage_options Gitlab.config.lfs + storage_location :lfs alias_method :upload, :model diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index 1b47400d5e8..ab5c46d14f9 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -277,8 +277,7 @@ module ObjectStorage end # Set ACL of uploaded objects to not-public (fog-aws)[1] or no ACL at all - # (fog-google). Value is ignored by other supported backends (fog-aliyun, - # fog-openstack, fog-rackspace) + # (fog-google). Value is ignored by fog-aliyun # [1]: https://github.com/fog/fog-aws/blob/daa50bb3717a462baf4d04d0e0cbfc18baacb541/lib/fog/aws/models/storage/file.rb#L152-L159 def fog_public nil diff --git a/app/uploaders/packages/composer/cache_uploader.rb b/app/uploaders/packages/composer/cache_uploader.rb index ad7c017c4ba..ef581b5d6a1 100644 --- a/app/uploaders/packages/composer/cache_uploader.rb +++ b/app/uploaders/packages/composer/cache_uploader.rb @@ -2,7 +2,7 @@ class Packages::Composer::CacheUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.packages + storage_location :packages alias_method :upload, :model diff --git a/app/uploaders/packages/debian/component_file_uploader.rb b/app/uploaders/packages/debian/component_file_uploader.rb index 2de4743d7f7..b1ed8d853f1 100644 --- a/app/uploaders/packages/debian/component_file_uploader.rb +++ b/app/uploaders/packages/debian/component_file_uploader.rb @@ -3,7 +3,7 @@ class Packages::Debian::ComponentFileUploader < GitlabUploader extend Workhorse::UploadPath include ObjectStorage::Concern - storage_options Gitlab.config.packages + storage_location :packages alias_method :upload, :model diff --git a/app/uploaders/packages/debian/distribution_release_file_uploader.rb b/app/uploaders/packages/debian/distribution_release_file_uploader.rb index 268d42796e9..fe10861b77f 100644 --- a/app/uploaders/packages/debian/distribution_release_file_uploader.rb +++ b/app/uploaders/packages/debian/distribution_release_file_uploader.rb @@ -3,7 +3,7 @@ class Packages::Debian::DistributionReleaseFileUploader < GitlabUploader extend Workhorse::UploadPath include ObjectStorage::Concern - storage_options Gitlab.config.packages + storage_location :packages alias_method :upload, :model diff --git a/app/uploaders/packages/package_file_uploader.rb b/app/uploaders/packages/package_file_uploader.rb index c8a09c50dc6..57feee9f19d 100644 --- a/app/uploaders/packages/package_file_uploader.rb +++ b/app/uploaders/packages/package_file_uploader.rb @@ -3,7 +3,7 @@ class Packages::PackageFileUploader < GitlabUploader extend Workhorse::UploadPath include ObjectStorage::Concern - storage_options Gitlab.config.packages + storage_location :packages alias_method :upload, :model diff --git a/app/uploaders/packages/rpm/repository_file_uploader.rb b/app/uploaders/packages/rpm/repository_file_uploader.rb index f95f861585c..399e9fa07d5 100644 --- a/app/uploaders/packages/rpm/repository_file_uploader.rb +++ b/app/uploaders/packages/rpm/repository_file_uploader.rb @@ -4,7 +4,7 @@ module Packages class RepositoryFileUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.packages + storage_location :packages alias_method :upload, :model diff --git a/app/uploaders/pages/deployment_uploader.rb b/app/uploaders/pages/deployment_uploader.rb index c5ba65673ab..bb4f1a2235d 100644 --- a/app/uploaders/pages/deployment_uploader.rb +++ b/app/uploaders/pages/deployment_uploader.rb @@ -4,7 +4,7 @@ module Pages class DeploymentUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.pages + storage_location :pages alias_method :upload, :model diff --git a/app/uploaders/terraform/state_uploader.rb b/app/uploaders/terraform/state_uploader.rb index 61e7ed7b0e6..5fe3048f7b0 100644 --- a/app/uploaders/terraform/state_uploader.rb +++ b/app/uploaders/terraform/state_uploader.rb @@ -4,7 +4,7 @@ module Terraform class StateUploader < GitlabUploader include ObjectStorage::Concern - storage_options Gitlab.config.terraform_state + storage_location :terraform_state # TODO: Remove this line # See https://gitlab.com/gitlab-org/gitlab/-/issues/232917 diff --git a/app/validators/addressable_url_validator.rb b/app/validators/addressable_url_validator.rb index c6d9bd73566..3e6ec0b6f29 100644 --- a/app/validators/addressable_url_validator.rb +++ b/app/validators/addressable_url_validator.rb @@ -31,6 +31,8 @@ # * <tt>allow_blank</tt> - Allow urls to be +blank+. Default: +false+ # * <tt>allow_nil</tt> - Allow urls to be +nil+. Default: +false+ # * <tt>ports</tt> - Allowed ports. Default: +all+. +# * <tt>deny_all_requests_except_allowed</tt> - Deny all requests. Default: Respects the instance app setting. +# Note: Regardless of whether enforced during validation, an HTTP request that uses the URI may still be blocked. # * <tt>enforce_user</tt> - Validate user format. Default: +false+ # * <tt>enforce_sanitization</tt> - Validate that there are no html/css/js tags. Default: +false+ # @@ -54,6 +56,7 @@ class AddressableUrlValidator < ActiveModel::EachValidator allow_localhost: true, allow_local_network: true, ascii_only: false, + deny_all_requests_except_allowed: Gitlab::UrlBlocker::DENY_ALL_REQUESTS_EXCEPT_ALLOWED_DEFAULT, enforce_user: false, enforce_sanitization: false, dns_rebind_protection: false diff --git a/app/validators/json_schema_validator.rb b/app/validators/json_schema_validator.rb index 4896c2ea2ef..9c246a114f6 100644 --- a/app/validators/json_schema_validator.rb +++ b/app/validators/json_schema_validator.rb @@ -25,6 +25,7 @@ class JsonSchemaValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) value = value.to_h.stringify_keys if options[:hash_conversion] == true + value = Gitlab::Json.parse(value.to_s) if options[:parse_json] == true && !value.nil? unless valid_schema?(value) record.errors.add(attribute, _("must be a valid json schema")) diff --git a/app/validators/json_schemas/google_service_account_key.json b/app/validators/json_schemas/google_service_account_key.json new file mode 100644 index 00000000000..d040ef19f66 --- /dev/null +++ b/app/validators/json_schemas/google_service_account_key.json @@ -0,0 +1,48 @@ +{ + "description": "Google service account key", + "type": "object", + "required": [ + "type", + "project_id", + "private_key_id", + "private_key", + "client_email", + "client_id", + "auth_uri", + "token_uri", + "auth_provider_x509_cert_url", + "client_x509_cert_url" + ], + "properties": { + "type": { + "const": "service_account" + }, + "project_id": { + "type": "string" + }, + "private_key_id": { + "type": "string" + }, + "private_key": { + "type": "string" + }, + "client_email": { + "type": "string" + }, + "client_id": { + "type": "string" + }, + "auth_uri": { + "type": "string" + }, + "token_uri": { + "type": "string" + }, + "auth_provider_x509_cert_url": { + "type": "string" + }, + "client_x509_cert_url": { + "type": "string" + } + } +} diff --git a/app/validators/json_schemas/import_failure_external_identifiers.json b/app/validators/json_schemas/import_failure_external_identifiers.json new file mode 100644 index 00000000000..3756e712de5 --- /dev/null +++ b/app/validators/json_schemas/import_failure_external_identifiers.json @@ -0,0 +1,18 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "description": "Import failure external identifiers", + "type": "object", + "maxProperties": 3, + "patternProperties": { + ".*": { + "oneOf": [ + { + "type": "string" + }, + { + "type": "integer" + } + ] + } + } +} diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml index eeedd58ec15..1a0f4132d49 100644 --- a/app/views/admin/abuse_reports/_abuse_report.html.haml +++ b/app/views/admin/abuse_reports/_abuse_report.html.haml @@ -24,13 +24,13 @@ = markdown_field(abuse_report, :message) %td - if user - = render Pajamas::ButtonComponent.new(href: admin_abuse_report_path(abuse_report, remove_user: true), variant: :danger, block: true, button_options: { data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name }, confirm_btn_variant: "danger", remote: true, method: :delete }, class: "js-remove-tr gl-mb-5" }) do + = render Pajamas::ButtonComponent.new(href: admin_abuse_report_path(abuse_report, remove_user: true), variant: :danger, block: true, button_options: { data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name }, confirm_btn_variant: "danger", remote: true, method: :delete }, class: "js-remove-tr" }) do = _('Remove user & report') - if user && !user.blocked? - = render Pajamas::ButtonComponent.new(href: block_admin_user_path(user), block: true, button_options: { data: { confirm: _('USER WILL BE BLOCKED! Are you sure?'), method: :put }, class: "gl-mb-5" }) do + = render Pajamas::ButtonComponent.new(href: block_admin_user_path(user), block: true, button_options: { data: { confirm: _('USER WILL BE BLOCKED! Are you sure?'), method: :put } }) do = _('Block user') - else - = render Pajamas::ButtonComponent.new(href: block_admin_user_path(user), block: true, disabled: true, button_options: { data: { confirm: _('USER WILL BE BLOCKED! Are you sure?'), method: :put }, class: "gl-mb-5" }) do + = render Pajamas::ButtonComponent.new(href: block_admin_user_path(user), block: true, disabled: true, button_options: { data: { confirm: _('USER WILL BE BLOCKED! Are you sure?'), method: :put } }) do = _('Already blocked') = render Pajamas::ButtonComponent.new(href: [:admin, abuse_report], block: true, button_options: { data: { remote: true, method: :delete }, class: "js-remove-tr" }) do = _('Remove report') diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml index 20499a2e3bf..fee3a846849 100644 --- a/app/views/admin/abuse_reports/index.html.haml +++ b/app/views/admin/abuse_reports/index.html.haml @@ -2,31 +2,35 @@ %h1.page-title.gl-font-size-h-display= _('Abuse Reports') -.row-content-block.second-block - = form_tag admin_abuse_reports_path, method: :get, class: 'filter-form' do - .filter-categories.flex-fill - .filter-item.inline - = dropdown_tag(user_dropdown_label(params[:user_id], 'User'), - options: { toggle_class: 'js-filter-submit js-user-search', - title: _('Filter by user'), filter: true, filterInput: 'input#user-search', - dropdown_class: 'dropdown-menu-selectable dropdown-menu-user js-filter-submit', - placeholder: _('Search users'), - data: { current_user: true, field_name: 'user_id' }}) +- if Feature.enabled?(:abuse_reports_list) + #js-abuse-reports-list-app{ data: abuse_reports_list_data(@abuse_reports) } + = gl_loading_icon(css_class: 'gl-my-5', size: 'md') +- else + .row-content-block.second-block + = form_tag admin_abuse_reports_path, method: :get, class: 'filter-form' do + .filter-categories.flex-fill + .filter-item.inline + = dropdown_tag(user_dropdown_label(params[:user_id], 'User'), + options: { toggle_class: 'js-filter-submit js-user-search', + title: _('Filter by user'), filter: true, filterInput: 'input#user-search', + dropdown_class: 'dropdown-menu-selectable dropdown-menu-user js-filter-submit', + placeholder: _('Search users'), + data: { current_user: true, field_name: 'user_id' }}) -.abuse-reports - - if @abuse_reports.present? - .table-holder - %table.table.responsive-table - %thead.d-none.d-md-table-header-group - %tr - %th= _('User') - %th= _('Reported by') - %th.wide= _('Message') - %th= _('Action') - = render @abuse_reports - = paginate @abuse_reports, theme: 'gitlab' - - else - .empty-state - .text-center - %h4= _("There are no abuse reports!") - %h3= emoji_icon('tada') + .abuse-reports + - if @abuse_reports.present? + .table-holder + %table.table.responsive-table + %thead.d-none.d-md-table-header-group + %tr + %th= _('User') + %th= _('Reported by') + %th.wide= _('Message') + %th= _('Action') + = render @abuse_reports + = paginate @abuse_reports, theme: 'gitlab' + - else + .empty-state + .text-center + %h4= _("There are no abuse reports!") + %h3= emoji_icon('tada') diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 8fafa52cd4c..fd671f72238 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -77,31 +77,31 @@ %fieldset = f.hidden_field(:plan_id, value: plan.id) .form-group - = f.label :ci_pipeline_size, s_('AdminSettings|Maximum number of jobs in a single pipeline') + = f.label :ci_pipeline_size, plan_limit_setting_description(:ci_pipeline_size) = f.number_field :ci_pipeline_size, class: 'form-control gl-form-input' .form-group - = f.label :ci_active_jobs, s_('AdminSettings|Total number of jobs in currently active pipelines') + = f.label :ci_active_jobs, plan_limit_setting_description(:ci_active_jobs) = f.number_field :ci_active_jobs, class: 'form-control gl-form-input' .form-group - = f.label :ci_active_pipelines, s_('AdminSettings|Maximum number of active pipelines per project') + = f.label :ci_active_pipelines, plan_limit_setting_description(:ci_active_pipelines) = f.number_field :ci_active_pipelines, class: 'form-control gl-form-input' .form-group - = f.label :ci_project_subscriptions, s_('AdminSettings|Maximum number of pipeline subscriptions to and from a project') + = f.label :ci_project_subscriptions, plan_limit_setting_description(:ci_project_subscriptions) = f.number_field :ci_project_subscriptions, class: 'form-control gl-form-input' .form-group - = f.label :ci_pipeline_schedules, s_('AdminSettings|Maximum number of pipeline schedules') + = f.label :ci_pipeline_schedules, plan_limit_setting_description(:ci_pipeline_schedules) = f.number_field :ci_pipeline_schedules, class: 'form-control gl-form-input' .form-group - = f.label :ci_needs_size_limit, s_('AdminSettings|Maximum number of DAG dependencies that a job can have') + = f.label :ci_needs_size_limit, plan_limit_setting_description(:ci_needs_size_limit) = f.number_field :ci_needs_size_limit, class: 'form-control gl-form-input' .form-text.text-muted= s_('AdminSettings|This limit cannot be disabled. Set to 0 to block all DAG dependencies.') .form-group - = f.label :ci_registered_group_runners, s_('AdminSettings|Maximum number of runners registered per group') + = f.label :ci_registered_group_runners, plan_limit_setting_description(:ci_registered_group_runners) = f.number_field :ci_registered_group_runners, class: 'form-control gl-form-input' .form-group - = f.label :ci_registered_project_runners, s_('AdminSettings|Maximum number of runners registered per project') + = f.label :ci_registered_project_runners, plan_limit_setting_description(:ci_registered_project_runners) = f.number_field :ci_registered_project_runners, class: 'form-control gl-form-input' .form-group - = f.label :pipeline_hierarchy_size, s_("AdminSettings|Maximum number of downstream pipelines in a pipeline's hierarchy tree") + = f.label :pipeline_hierarchy_size, plan_limit_setting_description(:pipeline_hierarchy_size) = f.number_field :pipeline_hierarchy_size, class: 'form-control gl-form-input' = f.submit s_('AdminSettings|Save %{name} limits').html_safe % { name: plan.name.capitalize }, pajamas_button: true diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index 1821c8ef4bb..6efafa3c415 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -1,25 +1,36 @@ +- deny_all_requests = @application_setting.deny_all_requests_except_allowed + = gitlab_ui_form_for @application_setting, url: network_admin_application_settings_path(anchor: 'js-outbound-settings'), html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset .form-group + = f.gitlab_ui_checkbox_component :deny_all_requests_except_allowed, + s_('OutboundRequests|Block all requests, except for IP addresses, IP ranges, and domain names defined in the allowlist'), + checkbox_options: { class: 'js-deny-all-requests' } + = render Pajamas::AlertComponent.new(variant: :warning, + dismissible: false, + alert_options: { class: "gl-mb-3 js-deny-all-requests-warning #{'gl-display-none' unless deny_all_requests}" }) do |c| + = c.body do + = s_('OutboundRequests|Webhooks and integrations might not work properly.') = f.gitlab_ui_checkbox_component :allow_local_requests_from_web_hooks_and_services, - s_('OutboundRequests|Allow requests to the local network from web hooks and services'), - checkbox_options: { data: { qa_selector: 'allow_requests_from_services_checkbox' } } + s_('OutboundRequests|Allow requests to the local network from webhooks and integrations'), + checkbox_options: { disabled: deny_all_requests, class: 'js-allow-local-requests', data: { qa_selector: 'allow_requests_from_services_checkbox' } } = f.gitlab_ui_checkbox_component :allow_local_requests_from_system_hooks, - s_('OutboundRequests|Allow requests to the local network from system hooks') + s_('OutboundRequests|Allow requests to the local network from system hooks'), + checkbox_options: { disabled: deny_all_requests, class: 'js-allow-local-requests' } .form-group = f.label :outbound_local_requests_allowlist_raw, class: 'label-bold' do - = s_('OutboundRequests|Local IP addresses and domain names that hooks and services may access') + = s_('OutboundRequests|Local IP addresses and domain names that hooks and integrations can access') = f.text_area :outbound_local_requests_allowlist_raw, placeholder: "example.com, 192.168.1.1, xn--itlab-j1a.com", class: 'form-control gl-form-input', rows: 8 %span.form-text.text-muted - = s_('OutboundRequests|Requests to these domains and IP addresses are accessible to both system hooks and web hooks even when local requests are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 and 127.0.0.0/28 are supported. Domain wildcards are not supported. To separate entries use commas, semicolons, or newlines. The allowlist can hold a maximum of 1000 entries. Domains must be IDNA encoded.') - = link_to _('Learn more.'), help_page_path('security/webhooks.md', anchor: 'create-an-allowlist-for-local-requests'), target: '_blank', rel: 'noopener noreferrer' + = s_('OutboundRequests|Requests can be made to these IP addresses and domains even when local requests are not allowed. IP ranges such as %{code_start}1:0:0:0:0:0:0:0/124%{code_end} and %{code_start}127.0.0.0/28%{code_end} are supported. Domain wildcards are not supported. To separate entries, use commas, semicolons, or newlines. The allowlist can have a maximum of 1000 entries. Domains must be IDNA-encoded.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } + = link_to _('Learn more.'), help_page_path('security/webhooks.md', anchor: 'allow-outbound-requests-to-certain-ip-addresses-and-domains'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.gitlab_ui_checkbox_component :dns_rebinding_protection_enabled, - s_('OutboundRequests|Enforce DNS rebinding attack protection'), - help_text: s_('OutboundRequests|Resolve IP addresses once and uses them to submit requests.') + s_('OutboundRequests|Enforce DNS-rebinding attack protection'), + help_text: s_('OutboundRequests|Resolve IP addresses for outbound requests to prevent DNS-rebinding attacks.') = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' } diff --git a/app/views/admin/application_settings/_projects_api_limits.html.haml b/app/views/admin/application_settings/_projects_api_limits.html.haml new file mode 100644 index 00000000000..4efab4d77a9 --- /dev/null +++ b/app/views/admin/application_settings/_projects_api_limits.html.haml @@ -0,0 +1,21 @@ +%section.settings.as-projects-api-limits.no-animate#js-projects-api-limits-settings{ class: ('expanded' if expanded_by_default?) } + .settings-header + %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only + = _('Projects API rate limit') + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do + = expanded_by_default? ? _('Collapse') : _('Expand') + %p + = _('Set the per-IP address rate limit applicable to unauthenticated requests for getting a list of projects via the API.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/rate_limit_on_projects_api.md'), target: '_blank', rel: 'noopener noreferrer' + .settings-content + = gitlab_ui_form_for @application_setting, url: network_admin_application_settings_path(anchor: 'js-projects-api-limits-settings'), html: { class: 'fieldset-form' } do |f| + = form_errors(@application_setting) + + %fieldset + .form-group + = f.label :projects_api_rate_limit_unauthenticated, _('Maximum requests per 10 minutes per IP address'), class: 'label-bold' + = f.number_field :projects_api_rate_limit_unauthenticated, class: 'form-control gl-form-input' + .form-text.gl-text-gray-600 + = _("Set this number to 0 to disable the limit.") + + = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml index 6a7ec05d206..2b8b023baea 100644 --- a/app/views/admin/application_settings/_realtime.html.haml +++ b/app/views/admin/application_settings/_realtime.html.haml @@ -1,4 +1,4 @@ -= form_for @application_setting, url: preferences_admin_application_settings_path(anchor: 'js-realtime-settings'), html: { class: 'fieldset-form' } do |f| += gitlab_ui_form_for @application_setting, url: preferences_admin_application_settings_path(anchor: 'js-realtime-settings'), html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) %fieldset @@ -8,4 +8,4 @@ .form-text.text-muted = _('Multiplier to apply to polling intervals. Decimal values are supported. Defaults to 1.') - = f.submit _('Save changes'), class: "gl-button btn btn-confirm" + = f.submit _('Save changes'), pajamas_button: true diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index b67cc29f296..5751ae9059a 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -13,7 +13,9 @@ = _("If you get a lot of false alarms from repository checks, you can clear all repository check information from the database.") - clear_repository_checks_link = _('Clear all repository checks') - clear_repository_checks_message = _('This clears repository check states for all projects in the database and cannot be undone. Are you sure?') - = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message, confirm_btn_variant: 'danger' }, aria: { label: _('Clear repository checks') }, method: :put, class: "gl-button btn btn-sm btn-danger gl-mt-3" + = render Pajamas::ButtonComponent.new(variant: :danger, href: clear_repository_check_states_admin_application_settings_path, method: :put, button_options: { class: 'btn-sm gl-mt-3', data: { confirm: clear_repository_checks_message, confirm_btn_variant: 'danger' }, aria: { label: _('Clear repository checks') } }) do + = clear_repository_checks_link + .sub-section %h4= _("Housekeeping") diff --git a/app/views/admin/application_settings/_runner_registrars_form.html.haml b/app/views/admin/application_settings/_runner_registrars_form.html.haml index baf7c5de7b9..53832e93ed2 100644 --- a/app/views/admin/application_settings/_runner_registrars_form.html.haml +++ b/app/views/admin/application_settings/_runner_registrars_form.html.haml @@ -2,7 +2,18 @@ = form_errors(@application_setting) %fieldset + .form-group + %h5 + = s_('Runners|Runner version management') + %span.form-text.gl-mb-3.gl-mt-0 + - help_text = s_('Runners|Official runner version data is periodically fetched from GitLab.com to determine whether the runners need upgrades.') + - learn_more_link = link_to _('Learn more.'), help_page_path('ci/runners/configure_runners.md', anchor: 'determine-which-runners-need-to-be-upgraded'), target: '_blank', rel: 'noopener noreferrer' + = f.gitlab_ui_checkbox_component :update_runner_versions_enabled, + s_('Runners|Fetch GitLab Runner release version data from GitLab.com'), + help_text: '%{help_text} %{learn_more_link}'.html_safe % { help_text: help_text, learn_more_link: learn_more_link } .gl-form-group + %h5 + = s_('Runners|Runner registration') %span.form-text.gl-mb-3.gl-mt-0 = s_('Runners|If both settings are disabled, new runners cannot be registered.') = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'restrict-runner-registration-by-all-users-in-an-instance'), target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 0305a9487ca..b64617f3f11 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -38,6 +38,8 @@ = render_if_exists 'admin/application_settings/ldap_access_setting', form: f + = render_if_exists 'admin/application_settings/saml_group_locks_setting', form: f + .form-group{ data: { testid: 'project-export' } } = f.label :project_export, s_('AdminSettings|Project export'), class: 'label-bold' = f.gitlab_ui_checkbox_component :project_export_enabled, s_('AdminSettings|Enabled') diff --git a/app/views/admin/application_settings/appearances/_form.html.haml b/app/views/admin/application_settings/appearances/_form.html.haml index 6c6334905ca..1b0e974a0ca 100644 --- a/app/views/admin/application_settings/appearances/_form.html.haml +++ b/app/views/admin/application_settings/appearances/_form.html.haml @@ -16,7 +16,8 @@ = image_tag @appearance.header_logo_path, class: 'appearance-light-logo-preview' - if @appearance.persisted? %br - = link_to _('Remove header logo'), header_logos_admin_application_settings_appearances_path, data: { confirm: _("Header logo will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove header logo') }, method: :delete, class: "btn gl-button btn-danger btn-danger-secondary btn-sm" + = render Pajamas::ButtonComponent.new(variant: :danger, category: :secondary, size: :small, method: :delete, href: header_logos_admin_application_settings_appearances_path, button_options: { data: { confirm: _("Header logo will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove header logo') } }) do + = _('Remove header logo') %hr = f.hidden_field :header_logo_cache = f.file_field :header_logo, class: "", accept: 'image/*' @@ -35,7 +36,8 @@ = image_tag @appearance.favicon_path, class: 'appearance-light-logo-preview' - if @appearance.persisted? %br - = link_to _('Remove favicon'), favicon_admin_application_settings_appearances_path, data: { confirm: _("Favicon will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove favicon') }, method: :delete, class: "btn gl-button btn-danger btn-danger-secondary btn-sm" + = render Pajamas::ButtonComponent.new(variant: :danger, category: :secondary, size: :small, method: :delete, href: favicon_admin_application_settings_appearances_path, button_options: { data: { confirm: _("Favicon will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove favicon') } }) do + = _('Remove favicon') %hr = f.hidden_field :favicon_cache = f.file_field :favicon, class: '', accept: 'image/*' @@ -67,7 +69,8 @@ = image_tag @appearance.logo_path, class: 'appearance-logo-preview' - if @appearance.persisted? %br - = link_to _('Remove logo'), logo_admin_application_settings_appearances_path, data: { confirm: _("Logo will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove logo') }, method: :delete, class: "btn gl-button btn-danger btn-danger-secondary btn-sm remove-logo" + = render Pajamas::ButtonComponent.new(variant: :danger, category: :secondary, size: :small, method: :delete, href: logo_admin_application_settings_appearances_path, button_options: { data: { confirm: _("Logo will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove logo') } }) do + = _('Remove logo') %hr = f.hidden_field :logo_cache = f.file_field :logo, class: "", accept: 'image/*' @@ -98,7 +101,8 @@ = image_tag @appearance.pwa_icon_path, class: 'appearance-pwa-icon-preview' - if @appearance.persisted? %br - = link_to _('Remove icon'), pwa_icon_admin_application_settings_appearances_path, data: { confirm: _("Icon will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove icon') }, method: :delete, class: "btn gl-button btn-danger btn-danger-secondary btn-sm remove-logo" + = render Pajamas::ButtonComponent.new(variant: :danger, category: :secondary, size: :small, method: :delete, href: pwa_icon_admin_application_settings_appearances_path, button_options: { data: { confirm: _("Icon will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove icon') } }) do + = _('Remove icon') %hr = f.hidden_field :pwa_icon_cache = f.file_field :pwa_icon, class: "", accept: 'image/*' diff --git a/app/views/admin/application_settings/appearances/show.html.haml b/app/views/admin/application_settings/appearances/show.html.haml index 1e55190d53b..cd255d961f4 100644 --- a/app/views/admin/application_settings/appearances/show.html.haml +++ b/app/views/admin/application_settings/appearances/show.html.haml @@ -1,5 +1,4 @@ - page_title _("Appearance") -- @content_class = "limit-container-width" unless fluid_layout - add_page_specific_style 'page_bundles/settings' = render 'form' diff --git a/app/views/admin/application_settings/ci_cd.html.haml b/app/views/admin/application_settings/ci_cd.html.haml index bd0ce766f81..c2dc3c3707e 100644 --- a/app/views/admin/application_settings/ci_cd.html.haml +++ b/app/views/admin/application_settings/ci_cd.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("CI/CD") - page_title _("CI/CD") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.no-animate#js-ci-cd-variables{ class: ('expanded' if expanded_by_default?) } .settings-header @@ -42,7 +41,7 @@ %section.settings.as-runner.no-animate#js-runner-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only - = s_('Runners|Runner registration') + = s_('Runners|Runners') = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? 'Collapse' : 'Expand' .settings-content diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml index a4af1913d22..a7c80abdbc9 100644 --- a/app/views/admin/application_settings/general.html.haml +++ b/app/views/admin/application_settings/general.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("General") - page_title _("General") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-visibility-access.no-animate#js-visibility-settings{ class: ('expanded' if expanded_by_default?), data: { testid: 'admin-visibility-access-settings' } } .settings-header diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index fd1ad5cd304..396e6f3e7d6 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title s_('Integrations|Instance-level integration management') - page_title s_('Integrations|Instance-level integration management') - add_page_specific_style 'page_bundles/settings' -- @content_class = 'limit-container-width' unless fluid_layout %h3= s_('Integrations|Instance-level integration management') diff --git a/app/views/admin/application_settings/metrics_and_profiling.html.haml b/app/views/admin/application_settings/metrics_and_profiling.html.haml index b5981578866..711b2c97d65 100644 --- a/app/views/admin/application_settings/metrics_and_profiling.html.haml +++ b/app/views/admin/application_settings/metrics_and_profiling.html.haml @@ -3,7 +3,6 @@ - breadcrumb_title _("Metrics and profiling") - page_title _("Metrics and profiling") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-prometheus.no-animate#js-prometheus-settings{ class: ('expanded' if expanded_by_default?) } .settings-header diff --git a/app/views/admin/application_settings/network.html.haml b/app/views/admin/application_settings/network.html.haml index 779263b439f..32b10fd36e8 100644 --- a/app/views/admin/application_settings/network.html.haml +++ b/app/views/admin/application_settings/network.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("Network") - page_title _("Network") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-performance.no-animate#js-performance-settings{ class: ('expanded' if expanded_by_default?) } .settings-header @@ -92,7 +91,7 @@ = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? _('Collapse') : _('Expand') %p - = s_('OutboundRequests|Allow requests to the local network from hooks and services.') + = s_('OutboundRequests|Allow requests to the local network from hooks and integrations.') = link_to _('Learn more.'), help_page_path('security/webhooks.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'outbound' @@ -146,6 +145,9 @@ .settings-content = render 'users_api_limits' +- if Feature.enabled?(:rate_limit_for_unauthenticated_projects_api_access) + = render 'projects_api_limits' + %section.settings.as-import-export-limits.no-animate#js-import-export-limits-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only diff --git a/app/views/admin/application_settings/preferences.html.haml b/app/views/admin/application_settings/preferences.html.haml index dd6666542ca..3843fc8e863 100644 --- a/app/views/admin/application_settings/preferences.html.haml +++ b/app/views/admin/application_settings/preferences.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("Preferences") - page_title _("Preferences") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-email.no-animate#js-email-settings{ class: ('expanded' if expanded_by_default?), data: { qa_selector: 'email_content' } } .settings-header diff --git a/app/views/admin/application_settings/reporting.html.haml b/app/views/admin/application_settings/reporting.html.haml index 3d803e95cd0..0046275c7d1 100644 --- a/app/views/admin/application_settings/reporting.html.haml +++ b/app/views/admin/application_settings/reporting.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("Reporting") - page_title _("Reporting") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-spam.no-animate#js-spam-settings{ class: ('expanded' if expanded_by_default?) } .settings-header diff --git a/app/views/admin/application_settings/repository.html.haml b/app/views/admin/application_settings/repository.html.haml index 50798ad476c..518b40a0326 100644 --- a/app/views/admin/application_settings/repository.html.haml +++ b/app/views/admin/application_settings/repository.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title _("Repository") - page_title _("Repository") - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout %section.settings.as-default-branch-name.no-animate#js-default-branch-name{ class: ('expanded' if expanded_by_default?) } .settings-header diff --git a/app/views/admin/application_settings/service_usage_data.html.haml b/app/views/admin/application_settings/service_usage_data.html.haml index d6860cc08ac..af646d79c29 100644 --- a/app/views/admin/application_settings/service_usage_data.html.haml +++ b/app/views/admin/application_settings/service_usage_data.html.haml @@ -3,7 +3,6 @@ - breadcrumb_title name - page_title name - add_page_specific_style 'page_bundles/settings' -- @content_class = "limit-container-width" unless fluid_layout - payload_class = 'js-service-ping-payload' %section.js-search-settings-section diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml index 212e3eeb951..b93a3c5d7fe 100644 --- a/app/views/admin/applications/show.html.haml +++ b/app/views/admin/applications/show.html.haml @@ -7,4 +7,5 @@ edit_path: edit_admin_application_path(@application), delete_path: admin_application_path(@application), index_path: admin_applications_path, + renew_path: renew_admin_application_path(@application), show_trusted_row: true diff --git a/app/views/admin/background_migrations/index.html.haml b/app/views/admin/background_migrations/index.html.haml index 0f76fdce416..00859bf6b66 100644 --- a/app/views/admin/background_migrations/index.html.haml +++ b/app/views/admin/background_migrations/index.html.haml @@ -5,7 +5,7 @@ .gl-flex-grow-1 %h3= s_('BackgroundMigrations|Background Migrations') %p.light.gl-mb-0 - - learnmore_link = help_page_path('user/admin_area/monitoring/background_migrations') + - learnmore_link = help_page_path('update/background_migrations') - learnmore_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: learnmore_link } = html_escape(s_('BackgroundMigrations|Background migrations are used to perform data migrations whenever a migration exceeds the time limits in our guidelines. %{linkStart}Learn more%{linkEnd}')) % { linkStart: learnmore_link_start, linkEnd: '</a>'.html_safe } diff --git a/app/views/admin/broadcast_messages/_preview.html.haml b/app/views/admin/broadcast_messages/_preview.html.haml deleted file mode 100644 index 56168926a6e..00000000000 --- a/app/views/admin/broadcast_messages/_preview.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.js-broadcast-banner-message-preview - = render "shared/broadcast_message", { message: @broadcast_message, preview: true } do - = _('Your message here') diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml index a2425b93ad3..d92d13260fe 100644 --- a/app/views/admin/dev_ops_report/show.html.haml +++ b/app/views/admin/dev_ops_report/show.html.haml @@ -1,5 +1,5 @@ - page_title _('DevOps Reports') -- add_page_specific_style 'page_bundles/dev_ops_report' +- add_page_specific_style 'page_bundles/dev_ops_reports' .container .gl-mt-3 diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml index f9ebda2bc21..20d24161c57 100644 --- a/app/views/admin/groups/_group.html.haml +++ b/app/views/admin/groups/_group.html.haml @@ -1,10 +1,9 @@ - group = local_assigns.fetch(:group) %li.group-row.gl-py-3.gl-align-items-center{ class: 'gl-display-flex!', data: { qa_selector: 'group_row_content' } } - .avatar-container.rect-avatar.s40.gl-flex-shrink-0 - = group_icon(group, class: "avatar s40") + = render Pajamas::AvatarComponent.new(group, size: 32, alt: '') - .gl-min-w-0.gl-flex-grow-1 + .gl-min-w-0.gl-flex-grow-1.gl-ml-3 .title = link_to [:admin, group], class: 'group-name', data: { qa_selector: 'group_name_link' } do = group.full_name diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index c8b0704c35d..73fe1941818 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -20,8 +20,7 @@ - c.body do %ul.content-list.content-list-items-padding %li - .avatar-container.rect-avatar.s60 - = group_icon(@group, class: "avatar s60") + = render Pajamas::AvatarComponent.new(@group, size: 64, alt: '') %li %span.light= _('Name:') %strong diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index 98427cb6419..e7aa4f38634 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -8,9 +8,8 @@ #{ s_('HealthCheck|Access token is') } %code#health-check-token= Gitlab::CurrentSettings.health_check_access_token .gl-mt-3 - = button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path, - method: :put, class: 'gl-button btn btn-default', - data: { confirm: _('Are you sure you want to reset the health check token?') } + = render Pajamas::ButtonComponent.new(href: reset_health_check_token_admin_application_settings_path, method: :put, button_options: { data: { confirm: _('Are you sure you want to reset the health check token?') } }) do + = _("Reset health check access token") %p.light #{ _('Health information can be retrieved from the following endpoints. More information is available') } = link_to s_('More information is available|here'), help_page_path('user/admin_area/monitoring/health_check') diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml new file mode 100644 index 00000000000..18bef523168 --- /dev/null +++ b/app/views/admin/projects/_form.html.haml @@ -0,0 +1,23 @@ += gitlab_ui_form_for [:admin, @project] do |f| + = form_errors(@project) + = render ::Layouts::HorizontalSectionComponent.new(options: { class: 'gl-pb-3 gl-mb-6' }) do |c| + = c.title { _('Naming') } + = c.description do + = _('Update your project name and description.') + = c.body do + .form-group.gl-form-group + = f.label :name, _('Project name') + = f.text_field :name, class: 'form-control gl-form-input gl-md-form-input-md' + + .form-group.gl-form-group + = f.label :id, _('Project ID') + = f.text_field :id, class: 'form-control gl-form-input gl-md-form-input-sm', readonly: true + + .form-group.gl-form-group + = f.label :description, _('Project description (optional)') + = f.text_area :description, class: 'form-control gl-form-input gl-form-textarea gl-lg-form-input-xl', rows: 5 + + .gl-mt-5 + = f.submit _('Save changes'), pajamas_button: true + = render Pajamas::ButtonComponent.new(href: admin_project_path(@project)) do + = _('Cancel') diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml index cf1bd2a8022..df1653cdd71 100644 --- a/app/views/admin/projects/_projects.html.haml +++ b/app/views/admin/projects/_projects.html.haml @@ -3,9 +3,8 @@ %ul.content-list - @projects.each do |project| %li.project-row.gl-align-items-center{ class: 'gl-display-flex!' } - .avatar-container.rect-avatar.s40.gl-flex-shrink-0 - = project_icon(project, alt: '', class: 'avatar project-avatar s40', width: 40, height: 40) - .gl-min-w-0.gl-flex-grow-1 + = render Pajamas::AvatarComponent.new(project, size: 32, alt: '') + .gl-min-w-0.gl-flex-grow-1.gl-ml-3 .title = link_to(admin_project_path(project)) do %span.project-full-name @@ -24,7 +23,7 @@ = render_if_exists 'admin/projects/archived', project: project .controls.gl-flex-shrink-0.gl-ml-5 - = render Pajamas::ButtonComponent.new(href: edit_project_path(project), button_options: { id: dom_id(project, :edit) }) do + = render Pajamas::ButtonComponent.new(href: edit_admin_namespace_project_path({ id: project.to_param, namespace_id: project.namespace.to_param }), button_options: { id: dom_id(project) }) do = _('Edit') = render Pajamas::ButtonComponent.new(variant: :danger, button_options: { class: 'delete-project-button', data: { delete_project_url: admin_project_path(project), project_name: project.name } }) do = s_('AdminProjects|Delete') diff --git a/app/views/admin/projects/edit.html.haml b/app/views/admin/projects/edit.html.haml new file mode 100644 index 00000000000..ade0f543d58 --- /dev/null +++ b/app/views/admin/projects/edit.html.haml @@ -0,0 +1,4 @@ +- page_title _("Edit"), @project.name, _("Projects") +%h1.page-title.gl-font-size-h-display= _('Edit project: %{project_name}') % { project_name: @project.name } +%hr += render 'form' diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 464027e73f4..2803bec49c3 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -6,7 +6,9 @@ %h1.page-title.gl-font-size-h-display = _('Project: %{name}') % { name: @project.full_name } - = render Pajamas::ButtonComponent.new(href: edit_project_path(@project), icon: 'pencil', button_options: { class: 'gl-float-right' }) do + = render Pajamas::ButtonComponent.new(href: edit_admin_namespace_project_path({ id: @project.to_param, namespace_id: @project.namespace.to_param }), + icon: 'pencil', + button_options: { class: 'gl-float-right'}) do = _('Edit') %hr - if @project.last_repository_check_failed? diff --git a/app/views/admin/runners/register.html.haml b/app/views/admin/runners/register.html.haml new file mode 100644 index 00000000000..662bb9ea00e --- /dev/null +++ b/app/views/admin/runners/register.html.haml @@ -0,0 +1,7 @@ +- runner_name = "##{@runner.id} (#{@runner.short_sha})" +- breadcrumb_title s_('Runners|Register') +- page_title s_('Runners|Register'), "##{@runner.id} (#{@runner.short_sha})" +- add_to_breadcrumbs _('Runners'), admin_runners_path +- add_to_breadcrumbs runner_name, register_admin_runner_path(@runner) + +#js-admin-register-runner{ data: { runner_id: @runner.id, runners_path: admin_runners_path } } diff --git a/app/views/admin/sessions/_two_factor_otp.html.haml b/app/views/admin/sessions/_two_factor_otp.html.haml index 40ba79d1a65..f7b4035488d 100644 --- a/app/views/admin/sessions/_two_factor_otp.html.haml +++ b/app/views/admin/sessions/_two_factor_otp.html.haml @@ -1,9 +1,9 @@ -= form_tag(admin_session_path, { method: :post, class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if current_user.two_factor_webauthn_u2f_enabled?}" }) do += form_tag(admin_session_path, { method: :post, class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if current_user.two_factor_webauthn_enabled?}" }) do .form-group - = label_tag :user_otp_attempt, _('Two-Factor Authentication code') - = text_field_tag 'user[otp_attempt]', nil, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: _('This field is required.') + = label_tag :user_otp_attempt, _('Enter verification code') + = text_field_tag 'user[otp_attempt]', nil, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', inputmode: 'numeric', title: _('This field is required.') %p.form-text.text-muted.hint - = _("Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.") + = _("Enter the code from your two-factor authenticator app. If you've lost your device, you can enter one of your recovery codes.") .submit-container.move-submit-down = submit_tag 'Verify code', class: 'gl-button btn btn-confirm' diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml index 7d07b49c98e..3950170e486 100644 --- a/app/views/admin/sessions/new.html.haml +++ b/app/views/admin/sessions/new.html.haml @@ -1,4 +1,3 @@ -- @hide_breadcrumbs = true - page_title _('Enter Admin Mode') .row.justify-content-center diff --git a/app/views/admin/sessions/two_factor.html.haml b/app/views/admin/sessions/two_factor.html.haml index 3f915846dd8..d05cc51af41 100644 --- a/app/views/admin/sessions/two_factor.html.haml +++ b/app/views/admin/sessions/two_factor.html.haml @@ -1,4 +1,3 @@ -- @hide_breadcrumbs = true - page_title _('Enter 2FA for Admin Mode') .row.justify-content-center @@ -11,5 +10,5 @@ .login-body - if current_user.two_factor_otp_enabled? = render 'admin/sessions/two_factor_otp' - - if current_user.two_factor_webauthn_u2f_enabled? + - if current_user.two_factor_webauthn_enabled? = render 'authentication/authenticate', render_remember_me: false, target_path: admin_session_path diff --git a/app/views/admin/spam_logs/index.html.haml b/app/views/admin/spam_logs/index.html.haml index c974f455112..001662c4015 100644 --- a/app/views/admin/spam_logs/index.html.haml +++ b/app/views/admin/spam_logs/index.html.haml @@ -17,6 +17,6 @@ %th= _('Primary Action') %th = render @spam_logs - = paginate @spam_logs, theme: 'gitlab' + = paginate_collection @spam_logs - else %h4= _('There are no Spam Logs') diff --git a/app/views/admin/topics/_topic.html.haml b/app/views/admin/topics/_topic.html.haml index 869194a21f6..c63828cf41f 100644 --- a/app/views/admin/topics/_topic.html.haml +++ b/app/views/admin/topics/_topic.html.haml @@ -2,10 +2,9 @@ - title = topic.title || topic.name %li.topic-row.gl-py-3.gl-align-items-center{ class: 'gl-display-flex!', data: { qa_selector: 'topic_row_content' } } - .avatar-container.rect-avatar.s40.gl-flex-shrink-0 - = topic_icon(topic, class: "avatar s40") + = render Pajamas::AvatarComponent.new(topic, size: 32, alt: '') - .gl-min-w-0.gl-flex-grow-1 + .gl-min-w-0.gl-flex-grow-1.gl-ml-3 .title = link_to title, topic_explore_projects_path(topic_name: topic.name) %div diff --git a/app/views/authentication/_register.html.haml b/app/views/authentication/_register.html.haml index d6fe20e48bf..dc4511a8159 100644 --- a/app/views/authentication/_register.html.haml +++ b/app/views/authentication/_register.html.haml @@ -1,47 +1,50 @@ -#js-register-token-2fa +- if Feature.enabled?(:webauthn) && Feature.enabled?(:webauthn_without_totp) + #js-device-registration{ data: device_registration_data(current_password_required: current_password_required?, target_path: target_path, webauthn_error: @webauthn_error) } +- else + #js-register-token-2fa --# haml-lint:disable InlineJavaScript -%script#js-register-2fa-message{ type: "text/template" } - %p <%= message %> + -# haml-lint:disable InlineJavaScript + %script#js-register-2fa-message{ type: "text/template" } + %p <%= message %> --# haml-lint:disable InlineJavaScript -%script#js-register-token-2fa-setup{ type: "text/template" } - - if current_user.two_factor_otp_enabled? - .row.gl-mb-3 - .col-md-5 - = render Pajamas::ButtonComponent.new(variant: :confirm, - button_options: { id: 'js-setup-token-2fa-device' }) do - = _("Set up new device") - .col-md-7 - %p= _("Your device needs to be set up. Plug it in (if needed) and click the button on the left.") - - else - .row.gl-mb-3 - .col-md-4 - = render Pajamas::ButtonComponent.new(variant: :confirm, - disabled: true, - button_options: { id: 'js-setup-token-2fa-device' }) do - = _("Set up new device") - .col-md-8 - %p= _("You need to register a two-factor authentication app before you can set up a device.") + -# haml-lint:disable InlineJavaScript + %script#js-register-token-2fa-setup{ type: "text/template" } + - if current_user.two_factor_otp_enabled? + .row.gl-mb-3 + .col-md-5 + = render Pajamas::ButtonComponent.new(variant: :confirm, + button_options: { id: 'js-setup-token-2fa-device' }) do + = _("Set up new device") + .col-md-7 + %p= _("Your device needs to be set up. Plug it in (if needed) and click the button on the left.") + - else + .row.gl-mb-3 + .col-md-4 + = render Pajamas::ButtonComponent.new(variant: :confirm, + disabled: true, + button_options: { id: 'js-setup-token-2fa-device' }) do + = _("Set up new device") + .col-md-8 + %p= _("You need to register a two-factor authentication app before you can set up a device.") --# haml-lint:disable InlineJavaScript -%script#js-register-token-2fa-error{ type: "text/template" } - %div - %p - %span <%= error_message %> (<%= error_name %>) - = render Pajamas::ButtonComponent.new(button_options: { id: 'js-token-2fa-try-again' }) do - = _("Try again?") + -# haml-lint:disable InlineJavaScript + %script#js-register-token-2fa-error{ type: "text/template" } + %div + %p + %span <%= error_message %> (<%= error_name %>) + = render Pajamas::ButtonComponent.new(button_options: { id: 'js-token-2fa-try-again' }) do + = _("Try again?") --# haml-lint:disable InlineJavaScript -%script#js-register-token-2fa-registered{ type: "text/template" } - .row.gl-mb-3 - .col-md-12 - %p= _("Your device was successfully set up! Give it a name and register it with the GitLab server.") - = form_tag(target_path, method: :post) do - .row.gl-mb-3 - .col-md-3 - = text_field_tag 'device_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name") - .col-md-3 - = hidden_field_tag 'device_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response" - = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do - = _("Register device") + -# haml-lint:disable InlineJavaScript + %script#js-register-token-2fa-registered{ type: "text/template" } + .row.gl-mb-3 + .col-md-12 + %p= _("Your device was successfully set up! Give it a name and register it with the GitLab server.") + = form_tag(target_path, method: :post) do + .row.gl-mb-3 + .col-md-3 + = text_field_tag 'device_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name") + .col-md-3 + = hidden_field_tag 'device_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response" + = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do + = _("Register device") diff --git a/app/views/clusters/clusters/_integrations.html.haml b/app/views/clusters/clusters/_integrations.html.haml index 4a3062def8c..0f62b640b97 100644 --- a/app/views/clusters/clusters/_integrations.html.haml +++ b/app/views/clusters/clusters/_integrations.html.haml @@ -6,7 +6,7 @@ - if can?(current_user, :admin_cluster, @cluster) .sub-section.form-group = gitlab_ui_form_for @prometheus_integration, as: :integration, namespace: :prometheus, url: @cluster.integrations_path, method: :post, html: { class: 'js-cluster-integrations-form' } do |prometheus_form| - = prometheus_form.hidden_field :application_type + = prometheus_form.hidden_field :application_type, value: @prometheus_integration.application_type .form-group.gl-form-group - help_text = s_('ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Prometheus for metrics.') - help_link = link_to(_('More information.'), help_page_path("user/clusters/integrations", anchor: "prometheus-cluster-integration"), target: '_blank', rel: 'noopener noreferrer') diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 09e2e35c617..7734c0a7c9a 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -1,14 +1,13 @@ .page-title-holder.d-flex.align-items-center %h1.page-title.gl-font-size-h-display= _('Groups') - - if current_user.can_create_group? - .page-title-controls + .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5 + = link_to _("Explore groups"), explore_groups_path + - if current_user.can_create_group? = render Pajamas::ButtonComponent.new(href: new_group_path, variant: :confirm, button_options: { data: { qa_selector: "new_group_button", testid: "new-group-button" } }) do = _("New group") -.top-area - = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do - = gl_tab_link_to _("Your groups"), dashboard_groups_path - = gl_tab_link_to _("Explore public groups"), explore_groups_path, data: { qa_selector: "public_groups_tab" } + +.top-area.gl-p-3.gl-justify-content-end .nav-controls = render 'shared/groups/search_form' = render 'shared/groups/dropdown' diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index c58d4cff034..e600d84f492 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -4,8 +4,9 @@ .page-title-holder.gl-display-flex.gl-align-items-center %h1.page-title.gl-font-size-h-display= _('Projects') - - if current_user.can_create_project? - .page-title-controls + .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5 + = link_to _("Explore projects"), explore_projects_path + - if current_user.can_create_project? = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm, button_options: { data: { qa_selector: 'new_project_button' } }) do = _("New project") diff --git a/app/views/dashboard/_projects_nav.html.haml b/app/views/dashboard/_projects_nav.html.haml index 7cbd2fb14ec..87bd5209fdf 100644 --- a/app/views/dashboard/_projects_nav.html.haml +++ b/app/views/dashboard/_projects_nav.html.haml @@ -1,5 +1,4 @@ - is_your_projects_path = current_page?(dashboard_projects_path) || current_page?(root_path) -- is_explore_projects_path = current_page?(explore_root_path) || current_page?(trending_explore_projects_path) || current_page?(starred_explore_projects_path) || current_page?(explore_projects_path) = gl_tabs_nav({ class: 'scrolling-tabs nav-links gl-display-flex gl-flex-grow-1 gl-w-full nav gl-tabs-nav' }) do = gl_tab_link_to dashboard_projects_path, { item_active: is_your_projects_path, class: 'shortcuts-activity', data: { placement: 'right' } } do @@ -8,6 +7,4 @@ = gl_tab_link_to starred_dashboard_projects_path, { data: { placement: 'right' } } do = s_("ProjectList|Starred") = gl_tab_counter_badge(limited_counter_with_delimiter(@total_starred_projects_count)) - = gl_tab_link_to s_("ProjectList|Explore"), explore_root_path, { item_active: is_explore_projects_path, data: { placement: 'right' } } - = gl_tab_link_to s_("ProjectList|Topics"), topics_explore_projects_path, { data: { placement: 'right' } } = render_if_exists "dashboard/removed_projects_tab" diff --git a/app/views/dashboard/_snippets_head.html.haml b/app/views/dashboard/_snippets_head.html.haml index 5a798c249d1..e0e8aaa0fd9 100644 --- a/app/views/dashboard/_snippets_head.html.haml +++ b/app/views/dashboard/_snippets_head.html.haml @@ -1,13 +1,8 @@ .page-title-holder.d-flex.align-items-center %h1.page-title.gl-font-size-h-display= _('Snippets') - - if current_user && current_user.snippets.any? || @snippets.any? - .page-title-controls - - if can?(current_user, :create_snippet) - = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm, button_options: { title: _("New snippet") }) do - = _("New snippet") - -.top-area - = gl_tabs_nav({ class: 'gl-border-0' }) do - = gl_tab_link_to _('Your snippets'), dashboard_snippets_path, { title: _('Your snippets') } - = gl_tab_link_to _('Explore snippets'), explore_snippets_path, { title: _('Explore snippets') } + .page-title-controls.gl-display-flex.gl-align-items-center.gl-gap-5 + = link_to _("Explore snippets"), explore_snippets_path + - if can?(current_user, :create_snippet) + = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm, button_options: { title: _("New snippet") }) do + = _("New snippet") diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml index eba5e7c6e9b..855177fd836 100644 --- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -7,7 +7,7 @@ = link_to new_project_path, class: link_classes do .blank-state-icon = custom_icon("add_new_project", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Create a project') %p @@ -17,7 +17,7 @@ = link_to new_group_path, class: link_classes do .blank-state-icon = custom_icon("add_new_group", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Create a group') %p @@ -26,7 +26,7 @@ = link_to new_admin_user_path, class: link_classes do .blank-state-icon = custom_icon("add_new_user", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Add people') %p @@ -35,7 +35,7 @@ = link_to admin_root_path, class: link_classes do .blank-state-icon = custom_icon("configure_server", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Configure GitLab') %p diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index a9a34af3f96..c5fdc31a775 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -5,7 +5,7 @@ = link_to new_project_path, class: link_classes do .blank-state-icon = custom_icon("add_new_project", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Create a project') %p @@ -19,7 +19,7 @@ = link_to new_group_path, class: link_classes do .blank-state-icon = custom_icon("add_new_group", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Create a group') %p @@ -28,7 +28,7 @@ = link_to trending_explore_projects_path, class: link_classes do .blank-state-icon = custom_icon("globe", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Explore public projects') %p @@ -37,7 +37,7 @@ = link_to Gitlab::Saas::doc_url, class: link_classes do .blank-state-icon = custom_icon("lightbulb", size: 50) - .blank-state-body.gl-sm-pl-0.gl-pl-6 + .blank-state-body.gl-sm-pl-6 %h3.gl-font-size-h2.gl-mt-0 = _('Learn more about GitLab') %p diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml index 68457ab33f7..42386e5b9cc 100644 --- a/app/views/dashboard/snippets/index.html.haml +++ b/app/views/dashboard/snippets/index.html.haml @@ -5,7 +5,7 @@ = render 'dashboard/snippets_head' - if current_user.snippets.exists? - = render partial: 'snippets/snippets_scope_menu', locals: { include_private: true, counts: @snippet_counts } + .top-area= render partial: 'snippets/snippets_scope_menu', locals: { include_private: true, counts: @snippet_counts } = render partial: 'shared/snippets/list', locals: { link_project: true } - else = render 'shared/empty_states/snippets', button_path: button_path diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 9e59f9d700f..7ca89651282 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -62,7 +62,7 @@ = sort_options_hash[@sort] - else = sort_title_recently_created - = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3') + = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon') %ul.dropdown-menu.dropdown-menu-sort.dropdown-menu-right %li = link_to todos_filter_path(sort: sort_value_label_priority) do @@ -82,15 +82,15 @@ = render @allowed_todos = paginate @todos, theme: "gitlab" .js-nothing-here-container.empty-state.hidden - .svg-content - = image_tag 'illustrations/todos_all_done.svg' + .svg-content.svg-150 + = image_tag 'illustrations/empty-todos-all-done-md.svg' .text-content.gl-text-center %h4 = s_("Todos|You're all done!") - elsif current_user.todos.any? .col.todos-all-done.empty-state - .svg-content.svg-250 - = image_tag 'illustrations/todos_all_done.svg' + .svg-content.svg-150 + = image_tag 'illustrations/empty-todos-all-done-md.svg' .text-content.gl-text-center - if todos_filter_empty? %h4 @@ -102,8 +102,8 @@ = s_("Todos|Nothing is on your to-do list. Nice work!") - else .col.empty-state - .svg-content - = image_tag 'illustrations/todos_empty.svg' + .svg-content.svg-150 + = image_tag 'illustrations/empty-todos-md.svg' .text-content.gl-text-center %h4 = s_("Todos|Your To-Do List shows what to work on next") diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml index 01f9595f35c..c22eeba2f01 100644 --- a/app/views/devise/confirmations/almost_there.haml +++ b/app/views/devise/confirmations/almost_there.haml @@ -1,6 +1,7 @@ - user_email = "(#{params[:email]})" if Devise.email_regexp.match?(params[:email]) - request_link_start = '<a href="%{new_user_confirmation_path}">'.html_safe % { new_user_confirmation_path: new_user_confirmation_path } -- request_link_end = '</a>'.html_safe +- registration_link_start = '<a href="%{new_user_registration_path}">'.html_safe % { new_user_registration_path: new_user_registration_path } +- link_end = '</a>'.html_safe - content_for :page_specific_javascripts do = render "layouts/google_tag_manager_head" = render "layouts/one_trust" @@ -12,9 +13,11 @@ = _("Almost there...") %p{ class: 'gl-mb-6 gl-font-lg!' } = _('Please check your email %{email} to confirm your account') % { email: user_email } + %br + = _('If the email address is incorrect, you can %{registration_link_start}register again with a different email%{registration_link_end}.').html_safe % { registration_link_start: registration_link_start, registration_link_end: link_end } %hr - if Gitlab::CurrentSettings.after_sign_up_text.present? .well-confirmation.gl-text-center = markdown_field(Gitlab::CurrentSettings, :after_sign_up_text) %p.gl-text-center - = _("No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}.").html_safe % { request_link_start: request_link_start, request_link_end: request_link_end } + = _("No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}.").html_safe % { request_link_start: request_link_start, request_link_end: link_end } diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index d3bd1d58d21..4b586b2f580 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -1,7 +1,7 @@ = render 'devise/shared/tab_single', tab_title: 'Resend confirmation instructions' .login-box.gl-p-5 .login-body - = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| + = gitlab_ui_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| .devise-errors = render "devise/shared/error_messages", resource: resource .form-group @@ -13,7 +13,8 @@ = recaptcha_tags nonce: content_security_policy_nonce .gl-mt-5 - = f.submit _("Resend"), class: 'gl-button btn btn-confirm' + = render Pajamas::ButtonComponent.new(block: true, type: :submit, variant: :confirm) do + = _("Resend") .clearfix.prepend-top-20 = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 8a960602536..3bd7147f195 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -8,7 +8,7 @@ = render "layouts/google_tag_manager_body" .signup-page - = render 'devise/shared/signup_box', + = render signup_box_template, url: registration_path(resource_name, glm_tracking_params.to_hash), button_text: _('Register'), borderless: Feature.enabled?(:restyle_login_page, @project), diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index f63f1aa9197..12e5a7263f7 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -2,15 +2,15 @@ = render 'devise/shared/tab_single', tab_title: _('Two-Factor Authentication') if Feature.disabled?(:restyle_login_page, @project) .login-box.gl-p-5 .login-body - - if @user.two_factor_otp_enabled? - = gitlab_ui_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if @user.two_factor_webauthn_u2f_enabled?}" }) do |f| + - if @user.two_factor_otp_enabled? || (Feature.enabled?(:webauthn_without_totp) && @user.two_factor_enabled?) + = gitlab_ui_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if @user.two_factor_webauthn_enabled?}" }) do |f| - resource_params = params[resource_name].presence || params = f.hidden_field :remember_me, value: resource_params.fetch(:remember_me, 0) %div - = f.label _('Two-Factor Authentication code'), name: :otp_attempt, class: Feature.enabled?(:restyle_login_page, @project) ? 'gl-mb-1' : '' - = f.text_field :otp_attempt, class: 'form-control gl-form-input', required: true, autofocus: true, autocomplete: 'off', title: _('This field is required.'), data: { qa_selector: 'two_fa_code_field' } - %p.form-text.text-muted.hint= _("Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.") + = f.label _('Enter verification code'), name: :otp_attempt, class: Feature.enabled?(:restyle_login_page, @project) ? 'gl-mb-1' : '' + = f.text_field :otp_attempt, class: 'form-control gl-form-input', required: true, autofocus: true, autocomplete: 'off', inputmode: 'numeric', title: _('This field is required.'), data: { qa_selector: 'two_fa_code_field' } + %p.form-text.text-muted.hint= _("Enter the code from your two-factor authenticator app. If you've lost your device, you can enter one of your recovery codes.") .prepend-top-20 = f.submit _("Verify code"), pajamas_button: true, data: { qa_selector: 'verify_code_button' } - - if @user.two_factor_webauthn_u2f_enabled? + - if @user.two_factor_webauthn_enabled? = render "authentication/authenticate", params: params, resource: resource, resource_name: resource_name, render_remember_me: true, target_path: new_user_session_path diff --git a/app/views/devise/shared/_error_messages.html.haml b/app/views/devise/shared/_error_messages.html.haml new file mode 100644 index 00000000000..b7589a4460e --- /dev/null +++ b/app/views/devise/shared/_error_messages.html.haml @@ -0,0 +1,9 @@ +- if resource.errors.any? + = render Pajamas::AlertComponent.new(title: I18n.t("errors.messages.not_saved", count: resource.errors.count, resource: resource.class.model_name.human.downcase), + variant: :danger, + dismissible: false, + alert_options: { id: 'error_explanation', class: 'gl-mb-3'}) do |c| + = c.body do + %ul.gl-pl-4 + - resource.errors.full_messages.each do |message| + %li= message diff --git a/app/views/devise/shared/_sign_in_link.html.haml b/app/views/devise/shared/_sign_in_link.html.haml index 0a48c342502..a1d10898c5b 100644 --- a/app/views/devise/shared/_sign_in_link.html.haml +++ b/app/views/devise/shared/_sign_in_link.html.haml @@ -1,6 +1,6 @@ %p.text-center %span.light - = _('Already have login and password?') + = _('Already have an account?') - path_params = { redirect_to_referer: 'yes' } - path_params[:invite_email] = @invite_email if @invite_email.present? = link_to _('Sign in'), new_session_path(:user, path_params) diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index f4f3965bdc1..57cd819cb89 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -66,7 +66,7 @@ = render_if_exists 'devise/shared/phone_verification', form: f %div - - if arkose_labs_challenge_enabled? + - if arkose_labs_enabled? = render_if_exists 'devise/registrations/arkose_labs' - elsif show_recaptcha_sign_up? = recaptcha_tags nonce: content_security_policy_nonce diff --git a/app/views/doorkeeper/applications/show.html.haml b/app/views/doorkeeper/applications/show.html.haml index 0428b9c340c..d087d85a94e 100644 --- a/app/views/doorkeeper/applications/show.html.haml +++ b/app/views/doorkeeper/applications/show.html.haml @@ -9,4 +9,5 @@ = render 'shared/doorkeeper/applications/show', edit_path: edit_oauth_application_path(@application), delete_path: oauth_application_path(@application), - index_path: oauth_applications_path + index_path: oauth_applications_path, + renew_path: renew_oauth_application_path(@application) diff --git a/app/views/explore/groups/_nav.html.haml b/app/views/explore/groups/_nav.html.haml index 3c9c4e9f76b..176bfd307b2 100644 --- a/app/views/explore/groups/_nav.html.haml +++ b/app/views/explore/groups/_nav.html.haml @@ -1,6 +1,4 @@ -.top-area - = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do - = gl_tab_link_to _("Explore Groups"), explore_groups_path +.top-area.gl-p-3.gl-justify-content-end .nav-controls = render 'shared/groups/search_form' = render 'shared/groups/dropdown' diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml index 60132818193..213346b4cc2 100644 --- a/app/views/explore/groups/index.html.haml +++ b/app/views/explore/groups/index.html.haml @@ -1,14 +1,17 @@ -- @hide_top_links = true -- page_title _("Groups") +- breadcrumb_title _("Groups") +- page_title _("Explore groups") - header_title _("Groups"), dashboard_groups_path = render_dashboard_ultimate_trial(current_user) -- if current_user - = render 'dashboard/groups_head' -- else - = render 'explore/head' - = render 'nav' +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title + .page-title-controls + - if current_user&.can_create_group? + = render Pajamas::ButtonComponent.new(href: new_group_path, variant: :confirm) do + = _("New group") + += render 'nav' - if cookies[:explore_groups_landing_dismissed] != 'true' .explore-groups.landing.content-block.js-explore-groups-landing.hide diff --git a/app/views/explore/projects/_nav.html.haml b/app/views/explore/projects/_nav.html.haml index 9119026320a..ab565279238 100644 --- a/app/views/explore/projects/_nav.html.haml +++ b/app/views/explore/projects/_nav.html.haml @@ -1,10 +1,8 @@ .top-area = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do = gl_tab_link_to _('All'), explore_projects_path, { item_active: current_page?(explore_projects_path) || current_page?(explore_root_path) } - = gl_tab_link_to _('Most stars'), starred_explore_projects_path + = gl_tab_link_to _('Most starred'), starred_explore_projects_path = gl_tab_link_to _('Trending'), trending_explore_projects_path .nav-controls - - unless current_user - = render 'shared/projects/search_form' - = render 'filter' + = render 'shared/projects/search_form' diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml index 9585eb76912..53b252db4fe 100644 --- a/app/views/explore/projects/index.html.haml +++ b/app/views/explore/projects/index.html.haml @@ -1,14 +1,15 @@ -- @hide_top_links = true -- page_title _("Projects") -- header_title _("Projects"), dashboard_projects_path +- breadcrumb_title _("Projects") +- page_title _("Explore projects") - page_canonical_link explore_projects_url = render_dashboard_ultimate_trial(current_user) -- if current_user - = render 'dashboard/projects_head', project_tab_filter: :explore -- else - = render 'explore/head' +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title + .page-title-controls + - if current_user&.can_create_project? + = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do + = _("New project") = render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml index ec7eefea264..c765c086027 100644 --- a/app/views/explore/projects/starred.html.haml +++ b/app/views/explore/projects/starred.html.haml @@ -1,13 +1,14 @@ - @hide_top_links = true -- page_title _("Projects") +- page_title _("Explore projects") - header_title _("Projects"), dashboard_projects_path = render_dashboard_ultimate_trial(current_user) -- if current_user - = render 'dashboard/projects_head', project_tab_filter: :starred -- else - = render 'explore/head' +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title + .page-title-controls + = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do + = _("New project") = render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml index 7b2c5683482..b26abefcb0e 100644 --- a/app/views/explore/projects/topic.html.haml +++ b/app/views/explore/projects/topic.html.haml @@ -1,23 +1,23 @@ -- @hide_top_links = false -- @no_container = true +- add_to_breadcrumbs _("Topics"), topics_explore_projects_path +- breadcrumb_title @topic.title_or_name - page_title @topic.title_or_name, _("Topics") - max_topic_title_length = 50 = render_dashboard_ultimate_trial(current_user) -.gl-text-center.gl-bg-gray-10.gl-pb-2.gl-pt-6 - .gl-pb-5.gl-align-items-center.gl-justify-content-center.gl-display-flex - .avatar-container.rect-avatar.s60.gl-flex-shrink-0 - = topic_icon(@topic, alt: _('Topic avatar'), class: 'avatar topic-avatar s60') - - if @topic.title_or_name.length > max_topic_title_length - %h1.gl-mt-3.gl-str-truncated.has-tooltip{ title: @topic.title_or_name } - = truncate(@topic.title_or_name, length: max_topic_title_length) - - else - %h1.gl-mt-3 - = @topic.title_or_name - - if @topic.description.present? - .topic-description.gl-ml-4.gl-mr-4 - = markdown(@topic.description) +.gl-text-center.gl-bg-gray-10.gl-pb-3.gl-pt-6 + %div{ class: container_class } + .gl-pb-5.gl-align-items-center.gl-justify-content-center.gl-display-flex + = render Pajamas::AvatarComponent.new(@topic, size: 64, alt: '') + - if @topic.title_or_name.length > max_topic_title_length + %h1.gl-mt-3.gl-ml-5.gl-str-truncated.has-tooltip{ title: @topic.title_or_name } + = truncate(@topic.title_or_name, length: max_topic_title_length) + - else + %h1.gl-mt-3.gl-ml-5 + = @topic.title_or_name + - if @topic.description.present? + .topic-description + = markdown(@topic.description) %div{ class: container_class } .gl-py-5.gl-border-gray-100.gl-border-b-solid.gl-border-b-1 diff --git a/app/views/explore/projects/topics.html.haml b/app/views/explore/projects/topics.html.haml index 228304d25b6..08cd122c6aa 100644 --- a/app/views/explore/projects/topics.html.haml +++ b/app/views/explore/projects/topics.html.haml @@ -1,12 +1,9 @@ -- @hide_top_links = true -- page_title _("Topics") +- breadcrumb_title _("Topics") +- page_title _("Explore topics") - header_title _("Topics"), topics_explore_projects_path = render_dashboard_ultimate_trial(current_user) -- if current_user - = render 'explore/topics/head' -- else - = render 'explore/head' += render 'explore/topics/head' = render partial: 'shared/topics/list' diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml index 8a92ec31b22..043189315b4 100644 --- a/app/views/explore/projects/trending.html.haml +++ b/app/views/explore/projects/trending.html.haml @@ -1,13 +1,15 @@ - @hide_top_links = true -- page_title _("Projects") +- page_title _("Explore projects") - header_title _("Projects"), dashboard_projects_path = render_dashboard_ultimate_trial(current_user) -- if current_user - = render 'dashboard/projects_head', project_tab_filter: :explore_trending -- else - = render 'explore/head' +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title + .page-title-controls + - if current_user&.can_create_project? + = render Pajamas::ButtonComponent.new(href: new_project_path, variant: :confirm) do + = _("New project") = render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/snippets/index.html.haml b/app/views/explore/snippets/index.html.haml index bf861e30b3a..bd8b9c29389 100644 --- a/app/views/explore/snippets/index.html.haml +++ b/app/views/explore/snippets/index.html.haml @@ -1,10 +1,12 @@ -- @hide_top_links = true -- page_title _("Snippets") +- breadcrumb_title _("Snippets") +- page_title _("Explore snippets") - header_title _("Snippets"), snippets_path -- if current_user - = render 'dashboard/snippets_head' -- else - = render 'explore/head' +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title + .page-title-controls + - if can?(current_user, :create_snippet) + = render Pajamas::ButtonComponent.new(href: new_snippet_path, variant: :confirm) do + = _("New snippet") = render partial: 'shared/snippets/list', locals: { link_project: true } diff --git a/app/views/explore/topics/_head.html.haml b/app/views/explore/topics/_head.html.haml index f7d80d63c45..db8de333517 100644 --- a/app/views/explore/topics/_head.html.haml +++ b/app/views/explore/topics/_head.html.haml @@ -1,10 +1,6 @@ -.page-title-holder.d-flex.align-items-center - %h1.page-title.gl-font-size-h-display= _('Projects') +.page-title-holder.gl-display-flex.gl-align-items-center + %h1.page-title.gl-font-size-h-display= page_title -.top-area - .scrolling-tabs-container.inner-page-scroll-tabs.gl-flex-grow-1.gl-min-w-0.gl-w-full - .fade-left= sprite_icon('chevron-lg-left', size: 12) - .fade-right= sprite_icon('chevron-lg-right', size: 12) - = render 'dashboard/projects_nav' +.top-area.gl-p-4 .nav-controls = render 'shared/topics/search_form' diff --git a/app/views/groups/_import_group_from_another_instance_panel.html.haml b/app/views/groups/_import_group_from_another_instance_panel.html.haml index 24ba060a89a..4a34e124c4c 100644 --- a/app/views/groups/_import_group_from_another_instance_panel.html.haml +++ b/app/views/groups/_import_group_from_another_instance_panel.html.haml @@ -25,9 +25,9 @@ = render Pajamas::AlertComponent.new(dismissible: false, variant: :warning) do |c| = c.body do - - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } + - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md', anchor: 'migrated-group-items') } - docs_link_end = '</a>'.html_safe - = s_('GroupsNew|Not all related objects are migrated. %{docs_link_start}More info%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } + = s_('GroupsNew|Not all group items are migrated. %{docs_link_start}What items are migrated%{docs_link_end}?').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } %p.gl-mt-3 = s_('GroupsNew|Provide credentials for the source instance to import from. You can provide this instance as a source to move groups in this instance.') diff --git a/app/views/groups/_import_group_from_file_panel.html.haml b/app/views/groups/_import_group_from_file_panel.html.haml index 35e8b7dc977..775b9c79817 100644 --- a/app/views/groups/_import_group_from_file_panel.html.haml +++ b/app/views/groups/_import_group_from_file_panel.html.haml @@ -10,14 +10,14 @@ alert_options: { class: 'gl-mb-5' }, dismissible: false) do |c| = c.body do - - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } + - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md', anchor: 'migrate-groups-by-direct-transfer-recommended') } - link_end = '</a>'.html_safe - = s_('GroupsNew|This feature is deprecated and replaced by %{docs_link_start}group migration%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: link_end } + = s_('GroupsNew|This feature is deprecated and replaced by group migration by direct transfer. %{docs_link_start}Learn more%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: link_end } = render 'shared/groups/group_name_and_path_fields', f: f .form-group = f.label :file, s_('GroupsNew|Upload file') .gl-font-weight-normal - - import_export_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('user/group/settings/import_export') } + - import_export_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('user/group/import/index') } = s_('GroupsNew|To import a group, navigate to the group settings for the GitLab source instance, %{link_start}generate an export file%{link_end}, and upload it here.').html_safe % { link_start: import_export_link_start, link_end: '</a>'.html_safe } .gl-mt-3 = render 'shared/file_picker_button', f: f, field: :file, help_text: nil, classes: 'gl-button btn-confirm-secondary gl-mr-2' diff --git a/app/views/groups/_invite_members_modal.html.haml b/app/views/groups/_invite_members_modal.html.haml index f0fd9026b30..cd3327ba9ec 100644 --- a/app/views/groups/_invite_members_modal.html.haml +++ b/app/views/groups/_invite_members_modal.html.haml @@ -2,5 +2,5 @@ .js-invite-members-modal{ data: { is_project: 'false', access_levels: group.access_level_roles.to_json, - reload_page_on_submit: local_assigns.fetch(:reload_page_on_submit, false).to_s, + reload_page_on_submit: current_path?('group_members#index').to_s, help_link: help_page_url('user/permissions') }.merge(common_invite_modal_dataset(group)).merge(users_filter_data(group)) } diff --git a/app/views/groups/_invite_members_side_nav_link.html.haml b/app/views/groups/_invite_members_side_nav_link.html.haml deleted file mode 100644 index 978ef01984c..00000000000 --- a/app/views/groups/_invite_members_side_nav_link.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.js-invite-members-trigger{ data: { trigger_source: 'group-side-nav', - icon: 'users', - display_text: title, - trigger_element: 'side-nav', - qa_selector: 'invite_members_sidebar_button' } } - -= render partial: 'shared/nav/sidebar_submenu', locals: { sidebar_menu: sidebar_menu } -= render 'groups/invite_members_modal', group: group diff --git a/app/views/groups/_invite_members_top_nav_link.html.haml b/app/views/groups/_invite_members_top_nav_link.html.haml new file mode 100644 index 00000000000..35a8d4d9944 --- /dev/null +++ b/app/views/groups/_invite_members_top_nav_link.html.haml @@ -0,0 +1,5 @@ +- data = local_assigns.fetch(:data) +- data[:display_text] = local_assigns.fetch(:display_text) +- data[:icon] = local_assigns.fetch(:icon) + +.js-invite-members-trigger{ data: data } diff --git a/app/views/groups/_new_group_fields.html.haml b/app/views/groups/_new_group_fields.html.haml index 95990e8937c..ddf6e52796f 100644 --- a/app/views/groups/_new_group_fields.html.haml +++ b/app/views/groups/_new_group_fields.html.haml @@ -31,6 +31,5 @@ .row .col-sm-12 = f.submit submit_label, pajamas_button: true, data: { qa_selector: 'create_group_button' } - = render Pajamas::ButtonComponent.new(href: dashboard_groups_path) do + = render Pajamas::ButtonComponent.new(href: @parent_group || dashboard_groups_path) do = _('Cancel') - diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index 298ed2c0806..a2a5f519221 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -1,6 +1,9 @@ - add_page_specific_style 'page_bundles/members' - page_title _('Group members') += content_for :page_level_alert do + = render_if_exists 'shared/unlimited_members_during_trial_alert', group: @group.root_ancestor + .row.gl-mt-3 .col-lg-12 .gl-display-flex.gl-flex-wrap @@ -16,7 +19,6 @@ trigger_source: 'group-members-page', display_text: _('Invite members') } } = render 'groups/invite_groups_modal', group: @group, reload_page_on_submit: true - = render 'groups/invite_members_modal', group: @group, reload_page_on_submit: true = render_if_exists 'groups/group_members/ldap_sync' diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml index a99d76f99a7..1fd8e12016c 100644 --- a/app/views/groups/milestones/_form.html.haml +++ b/app/views/groups/milestones/_form.html.haml @@ -1,30 +1,25 @@ = gitlab_ui_form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| = form_errors(@milestone) - .form-group.row - .col-form-label.col-sm-2 - = f.label :title, _("Title") - .col-sm-10 - = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true + .form-group + = f.label :title, _("Title") + = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true = render "shared/milestones/form_dates", f: f - .form-group.row.milestone-description - .col-form-label.col-sm-2 - = f.label :description, _("Description") - .col-sm-10 - = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do - = render 'shared/zen', f: f, attr: :description, - classes: 'note-textarea', - qa_selector: 'milestone_description_field', - supports_autocomplete: true, - placeholder: _('Write milestone description...') + .form-group + = f.label :description, _("Description") + = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do + = render 'shared/zen', f: f, attr: :description, + classes: 'note-textarea', + qa_selector: 'milestone_description_field', + supports_autocomplete: true, + placeholder: _('Write milestone description...') .clearfix .error-alert - .form-actions - - if @milestone.new_record? - = f.submit _('Create milestone'), data: { qa_selector: "create_milestone_button" }, pajamas_button: true - = render Pajamas::ButtonComponent.new(href: group_milestones_path(@group)) do - = _("Cancel") - - else - = f.submit _('Update milestone'), pajamas_button: true - = render Pajamas::ButtonComponent.new(href: group_milestone_path(@group, @milestone)) do - = _("Cancel") + - if @milestone.new_record? + = f.submit _('Create milestone'), data: { qa_selector: "create_milestone_button" }, class: 'gl-mr-2', pajamas_button: true + = render Pajamas::ButtonComponent.new(href: group_milestones_path(@group)) do + = _("Cancel") + - else + = f.submit _('Save changes'), class: 'gl-mr-2', pajamas_button: true + = render Pajamas::ButtonComponent.new(href: group_milestone_path(@group, @milestone)) do + = _("Cancel") diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml index 8bceb1ddd5c..e1837bdd6fa 100644 --- a/app/views/groups/milestones/new.html.haml +++ b/app/views/groups/milestones/new.html.haml @@ -5,6 +5,5 @@ %h1.page-title.gl-font-size-h-display = _("New Milestone") -%hr - -= render "form" +.gl-mt-3 + = render "form" diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index b75fda2f344..a5cbc443fa4 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -4,9 +4,9 @@ - header_title _("Groups"), dashboard_groups_path - add_page_specific_style 'page_bundles/new_namespace' -.group-edit-container.gl-mt-5 +.group-edit-container - .js-new-group-creation{ data: { has_errors: @group.errors.any?.to_s }.merge(subgroup_creation_data(@group), + .js-new-group-creation{ data: { has_errors: @group.errors.any?.to_s, groups_url: dashboard_groups_url }.merge(subgroup_creation_data(@group), verification_for_group_creation_data) } .row{ 'v-cloak': true } diff --git a/app/views/groups/settings/_export.html.haml b/app/views/groups/settings/_export.html.haml index 5d79d0f8e79..6b505755727 100644 --- a/app/views/groups/settings/_export.html.haml +++ b/app/views/groups/settings/_export.html.haml @@ -5,13 +5,12 @@ %p= _('Export this group with all related data.') = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'gl-mb-4' }) do |c| = c.body do - - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } + - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index', anchor: 'migrate-groups-by-direct-transfer-recommended') } - docs_link_end = '</a>'.html_safe - = s_('GroupsNew|This feature is deprecated and replaced by %{docs_link_start}group migration%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } + = s_('GroupsNew|This feature is deprecated and replaced by group migration by direct transfer. %{docs_link_start}Learn more%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end } %p - export_information = _('After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance.') % { strong_text_start: '<strong>'.html_safe, strong_text_end: '</strong>'.html_safe} = export_information.html_safe - = link_to _('Learn more.'), help_page_path('user/group/settings/import_export.md'), target: '_blank', rel: 'noopener noreferrer' = render Pajamas::AlertComponent.new(dismissible: false, alert_options: { class: 'gl-mb-5' }) do |c| = c.body do %p.gl-mb-0 diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml index 658109fde64..5258854c931 100644 --- a/app/views/groups/settings/_general.html.haml +++ b/app/views/groups/settings/_general.html.haml @@ -23,8 +23,7 @@ = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group .form-group.gl-mt-3.gl-mb-6 - .avatar-container.rect-avatar.s90 - = group_icon(@group, alt: '', class: 'avatar group-avatar s90') + = render Pajamas::AvatarComponent.new(@group, size: 96, alt: '', class: 'gl-float-left gl-mr-5') = f.label :avatar, s_('Groups|Group avatar'), class: 'label-bold d-block' = render 'shared/choose_avatar_button', f: f - if @group.avatar? diff --git a/app/views/groups/settings/_transfer.html.haml b/app/views/groups/settings/_transfer.html.haml index a4a83330fa9..415459f1584 100644 --- a/app/views/groups/settings/_transfer.html.haml +++ b/app/views/groups/settings/_transfer.html.haml @@ -10,7 +10,7 @@ - learn_more_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: learn_more_link } - warning_text = s_("GroupSettings|Be careful. Changing a group's parent can have unintended side effects. %{learn_more_link_start}Learn more.%{learn_more_link_end}") % { learn_more_link_start: learn_more_link_start, learn_more_link_end: '</a>'.html_safe } %li= warning_text.html_safe - %li= s_('GroupSettings|You can only transfer the group to a group you manage.') + %li= s_('GroupSettings|You must have the Owner role in the target group') %li= s_('GroupSettings|You will need to update your local repositories to point to the new location.') %li= s_("GroupSettings|If the parent group's visibility is lower than the group's current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.") - if group.paid? diff --git a/app/views/groups/settings/applications/show.html.haml b/app/views/groups/settings/applications/show.html.haml index 4a83d96aae4..e24aa993b26 100644 --- a/app/views/groups/settings/applications/show.html.haml +++ b/app/views/groups/settings/applications/show.html.haml @@ -9,4 +9,5 @@ = render 'shared/doorkeeper/applications/show', edit_path: edit_group_settings_application_path(@group, @application), delete_path: group_settings_application_path(@group, @application), - index_path: group_settings_applications_path + index_path: group_settings_applications_path, + renew_path: renew_group_settings_application_path(@group, @application) diff --git a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml index 06cb9893196..8c45809261c 100644 --- a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml +++ b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml @@ -2,8 +2,8 @@ = form_errors(group) %fieldset .form-group - .card.gl-mb-3 - .card-body + = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }) do |c| + - c.body do - learn_more_link = link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer' - help_text = s_('GroupSettings|The Auto DevOps pipeline runs if no alternative CI configuration file is found.') - badge = gl_badge_tag badge_for_auto_devops_scope(group), variant: :info @@ -13,4 +13,5 @@ help_text: '%{help_text} %{learn_more_link}'.html_safe % { help_text: help_text, learn_more_link: learn_more_link }, checkbox_options: { checked: group.auto_devops_enabled? } - = f.submit _('Save changes'), class: 'gl-mt-5', pajamas_button: true + = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, button_options: { class: 'gl-mt-5' }) do + = _('Save changes') diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 72b7bec1b92..7983274f319 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -14,7 +14,6 @@ callouts_path: group_callouts_path, callouts_feature_id: Users::GroupCalloutsHelper::INVITE_MEMBERS_BANNER, group_id: @group.id } } - = render 'groups/invite_members_modal', group: @group = content_for :meta_tags do = auto_discovery_link_tag(:atom, group_url(@group, rss_url_options), title: "#{@group.name} activity") diff --git a/app/views/help/instance_configuration/_ci_cd_limits.html.haml b/app/views/help/instance_configuration/_ci_cd_limits.html.haml index bd5b8a6f10d..0a5cbb710e3 100644 --- a/app/views/help/instance_configuration/_ci_cd_limits.html.haml +++ b/app/views/help/instance_configuration/_ci_cd_limits.html.haml @@ -19,34 +19,34 @@ %th= title.to_s.humanize %tbody %tr - %td= s_('AdminSettings|Maximum number of jobs in a single pipeline') + %td= plan_limit_setting_description(:ci_pipeline_size) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_pipeline_size]) %tr - %td= s_('AdminSettings|Total number of jobs in currently active pipelines') + %td= plan_limit_setting_description(:ci_active_jobs) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_active_jobs]) %tr - %td= s_('AdminSettings|Maximum number of active pipelines per project') + %td= plan_limit_setting_description(:ci_active_pipelines) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_active_pipelines]) %tr - %td= s_('AdminSettings|Maximum number of pipeline subscriptions to and from a project') + %td= plan_limit_setting_description(:ci_project_subscriptions) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_project_subscriptions]) %tr - %td= s_('AdminSettings|Maximum number of pipeline schedules') + %td= plan_limit_setting_description(:ci_pipeline_schedules) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_pipeline_schedules]) %tr - %td= s_('AdminSettings|Maximum number of DAG dependencies that a job can have') + %td= plan_limit_setting_description(:ci_needs_size_limit) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_needs_size_limit]) %tr - %td= s_('AdminSettings|Maximum number of runners registered per group') + %td= plan_limit_setting_description(:ci_registered_group_runners) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_registered_group_runners]) %tr - %td= s_('AdminSettings|Maximum number of runners registered per project') + %td= plan_limit_setting_description(:ci_registered_project_runners) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_registered_project_runners]) diff --git a/app/views/ide/_show.html.haml b/app/views/ide/_show.html.haml index 5a6e93c3573..eb6d5668807 100644 --- a/app/views/ide/_show.html.haml +++ b/app/views/ide/_show.html.haml @@ -7,4 +7,6 @@ - content_for :prefetch_asset_tags do - webpack_preload_asset_tag('monaco') -= render partial: 'shared/ide_root', locals: { data: ide_data(project: @project, branch: @branch, path: @path, merge_request: @merge_request, fork_info: @fork_info), loading_text: _('Loading the GitLab IDE...') } +- data = ide_data(project: @project, fork_info: @fork_info, params: params) + += render partial: 'shared/ide_root', locals: { data: data, loading_text: _('Loading the GitLab IDE...') } diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index dd441d0d155..2dd6eab2e17 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -10,6 +10,7 @@ %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } = render 'layouts/startup_js' + = yield :startup_js - if page_canonical_link %link{ rel: 'canonical', href: page_canonical_link } @@ -57,6 +58,8 @@ = yield :page_specific_javascripts + = webpack_bundle_tag 'super_sidebar' if show_super_sidebar? + = webpack_controller_bundle_tags = yield :project_javascripts diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml index 9026bec84c3..b20b95cade8 100644 --- a/app/views/layouts/_loading_hints.html.haml +++ b/app/views/layouts/_loading_hints.html.haml @@ -12,7 +12,8 @@ = preload_link_tag(path_to_stylesheet('application'), crossorigin: css_crossorigin) = preload_link_tag(path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin) - if Gitlab::Tracking.enabled? && Gitlab::Tracking.collector_hostname - %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' } + - unless Rails.env.development? + %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' } -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug. -# See https://github.com/web-platform-tests/wpt/pull/36930 %link{ rel: 'preload', href: font_path('gitlab-sans/GitLabSans.woff2'), as: 'font', crossorigin: css_crossorigin } diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index d2ed70d6b48..74567af3554 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -2,8 +2,12 @@ - @left_sidebar = true .layout-page.hide-when-top-nav-responsive-open{ class: page_with_sidebar_class } - if show_super_sidebar? - - sidebar_data = super_sidebar_context(current_user, group: @group, project: @project).to_json - %aside.js-super-sidebar.nav-sidebar{ data: { root_path: root_path, sidebar: sidebar_data, toggle_new_nav_endpoint: profile_preferences_url } } + -# Render the parent group sidebar while creating a new subgroup/project, see GroupsController#new. + - group = @parent_group || @group + + - sidebar_panel = super_sidebar_nav_panel(nav: nav, user: current_user, group: group, project: @project, current_ref: current_ref, ref_type: @ref_type, viewed_user: @user) + - sidebar_data = super_sidebar_context(current_user, group: group, project: @project, panel: sidebar_panel).to_json + %aside.js-super-sidebar.super-sidebar.super-sidebar-loading{ data: { root_path: root_path, sidebar: sidebar_data, toggle_new_nav_endpoint: profile_preferences_url } } - if display_whats_new? #whats-new-app{ data: { version_digest: whats_new_version_digest } } @@ -44,4 +48,4 @@ -# This is needed by [GitLab JH](https://gitlab.com/gitlab-jh/jh-team/gitlab-cn/-/issues/81) = render_if_exists "shared/footer/global_footer" -= render "layouts/nav/top_nav_responsive", class: 'layout-page content-wrapper-margin' += render "layouts/nav/top_nav_responsive", class: 'layout-page content-wrapper-margin' unless show_super_sidebar? diff --git a/app/views/layouts/component_preview.html.haml b/app/views/layouts/component_preview.html.haml index a1b1304f994..8217ac13c52 100644 --- a/app/views/layouts/component_preview.html.haml +++ b/app/views/layouts/component_preview.html.haml @@ -1,12 +1,12 @@ %head - - if params[:lookbook][:display][:theme] == 'light' + - if params[:lookbook][:display][:theme] == "light" = stylesheet_link_tag "application" = stylesheet_link_tag "application_utilities" - else = stylesheet_link_tag "application_dark" = stylesheet_link_tag "application_utilities_dark" %body - .container.gl-mt-6 + .gl-mt-6{ class: (params[:lookbook][:display][:layout] == "fluid" ? "container-fluid" : "container") } - if params[:lookbook][:display][:bg_dark] .bg-dark.rounded.shadow.p-4 = yield diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index 89f238eb6b3..1ac5f0a8497 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -2,6 +2,6 @@ - header_title _("Dashboard"), root_path unless header_title - @left_sidebar = true -- nav "your_work" +- nav (@parent_group ? "group" : "your_work") = render template: "layouts/application" diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml index c495bab4547..02c00a53316 100644 --- a/app/views/layouts/explore.html.haml +++ b/app/views/layouts/explore.html.haml @@ -1,11 +1,6 @@ -- page_title _("Explore") +- header_title _("Explore"), explore_root_path -- if current_user - - @left_sidebar = true - - nav "your_work" - -- unless current_user - - @hide_breadcrumbs = true - - header_title _("Explore GitLab"), explore_root_path +- @left_sidebar = true +- nav "explore" = render template: "layouts/application" diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 95934f43a51..40ec1ff199b 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -16,6 +16,10 @@ :plain window.uploads_path = "#{group_uploads_path(@group)}"; +- content_for :before_content do + = render 'groups/invite_members_modal', group: @group + += dispensable_render_if_exists "shared/web_hooks/group_web_hook_disabled_alert" = dispensable_render_if_exists "shared/free_user_cap_alert", source: @group = render template: base_layout || "layouts/application" diff --git a/app/views/layouts/header/_new_dropdown.html.haml b/app/views/layouts/header/_new_dropdown.html.haml index 372babea18e..50a2b45aa7e 100644 --- a/app/views/layouts/header/_new_dropdown.html.haml +++ b/app/views/layouts/header/_new_dropdown.html.haml @@ -26,8 +26,13 @@ = section.fetch(:title) - section.fetch(:menu_items).each do |menu_item| %li< - = link_to menu_item.fetch(:href), class: menu_item.fetch(:css_class), data: menu_item.fetch(:data) do - = menu_item.fetch(:title) - - if menu_item.fetch(:emoji) - -# We need to insert a space between the title and emoji - = " #{emoji_icon(menu_item.fetch(:emoji), 'aria-hidden': true, class: 'gl-font-base gl-vertical-align-baseline')}".html_safe + - if menu_item.fetch(:partial).present? + = render partial: menu_item.fetch(:partial), + locals: { display_text: menu_item.fetch(:title), + icon: menu_item.fetch(:icon), + data: menu_item.fetch(:data) } + - else + = link_to menu_item.fetch(:title), + menu_item.fetch(:href), + class: menu_item.fetch(:css_class), + data: menu_item.fetch(:data) diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 98d6af28cf5..06dff99718c 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -3,25 +3,26 @@ - unless @skip_current_level_breadcrumb - push_to_schema_breadcrumb(@breadcrumb_title, breadcrumb_title_link) -%nav.breadcrumbs{ class: [container, @content_class], 'aria-label': _('Breadcrumbs') } - .breadcrumbs-container{ class: ("border-bottom-0" if @no_breadcrumb_border) } - - if defined?(@left_sidebar) - = button_tag class: 'toggle-mobile-nav', data: { qa_selector: 'toggle_mobile_nav_button' }, type: 'button' do - %span.sr-only= _("Open sidebar") - = sprite_icon('sidebar', size: 18) - .breadcrumbs-links{ data: { testid: 'breadcrumb-links', qa_selector: 'breadcrumb_links_content' } } - %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list - - unless hide_top_links - = header_title - - if @breadcrumbs_extra_links - - @breadcrumbs_extra_links.each do |extra| - = breadcrumb_list_item link_to(extra[:text], extra[:link]) - = render "layouts/nav/breadcrumbs/collapsed_inline_list", location: :after - - unless @skip_current_level_breadcrumb - %li{ data: { testid: 'breadcrumb-current-link', qa_selector: 'breadcrumb_current_link' } } - = link_to @breadcrumb_title, breadcrumb_title_link - -# haml-lint:disable InlineJavaScript - %script{ type: 'application/ld+json' } - :plain - #{schema_breadcrumb_json} - = yield :header_content +.gl-relative + .breadcrumbs{ class: [container, @content_class] } + .breadcrumbs-container{ class: ("border-bottom-0" if @no_breadcrumb_border) } + - if show_super_sidebar? + = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'js-super-sidebar-toggle super-sidebar-toggle gl-ml-n3 gl-mr-2', title: _('Expand sidebar'), aria: { label: _('Expand sidebar') }, data: {toggle: 'tooltip', placement: 'right' } }) + - elsif defined?(@left_sidebar) + = render Pajamas::ButtonComponent.new(icon: 'sidebar', category: :tertiary, button_options: { class: 'toggle-mobile-nav gl-ml-n3 gl-mr-2', data: { qa_selector: 'toggle_mobile_nav_button' }, aria: { label: _('Open sidebar') } }) + %nav.breadcrumbs-links{ 'aria-label': _('Breadcrumbs'), data: { testid: 'breadcrumb-links', qa_selector: 'breadcrumb_links_content' } } + %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list + - unless hide_top_links + = header_title + - if @breadcrumbs_extra_links + - @breadcrumbs_extra_links.each do |extra| + = breadcrumb_list_item link_to(extra[:text], extra[:link]) + = render "layouts/nav/breadcrumbs/collapsed_inline_list", location: :after + - unless @skip_current_level_breadcrumb + %li{ data: { testid: 'breadcrumb-current-link', qa_selector: 'breadcrumb_current_link' } } + = link_to @breadcrumb_title, breadcrumb_title_link + -# haml-lint:disable InlineJavaScript + %script{ type: 'application/ld+json' } + :plain + #{schema_breadcrumb_json} + = yield :header_content diff --git a/app/views/layouts/nav/sidebar/_explore.html.haml b/app/views/layouts/nav/sidebar/_explore.html.haml new file mode 100644 index 00000000000..ccbcb434af1 --- /dev/null +++ b/app/views/layouts/nav/sidebar/_explore.html.haml @@ -0,0 +1 @@ += render partial: 'shared/nav/sidebar', object: Sidebars::Explore::Panel.new(Sidebars::Context.new(current_user: current_user, container: nil)) diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index c2b50bc0e52..fd0e47b543f 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -1 +1,2 @@ -= render partial: 'shared/nav/sidebar', object: Sidebars::Groups::Panel.new(group_sidebar_context(@group, current_user)) +- group = @parent_group || @group += render partial: 'shared/nav/sidebar', object: Sidebars::Groups::Panel.new(group_sidebar_context(group, current_user)) diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml index 087eca3ba35..d53316442f8 100644 --- a/app/views/layouts/nav/sidebar/_profile.html.haml +++ b/app/views/layouts/nav/sidebar/_profile.html.haml @@ -1,169 +1 @@ -%aside.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?), **sidebar_tracking_attributes_by_object(current_user), 'aria-label': _('User settings') } - .nav-sidebar-inner-scroll - .context-header - = link_to profile_path, title: _('Profile Settings'), class: 'has-tooltip', data: { container: 'body', placement: 'right' } do - = render Pajamas::AvatarComponent.new(current_user, size: 32, alt: current_user.name, class: 'gl-mr-3 js-sidebar-user-avatar', avatar_options: { data: { testid: 'sidebar-user-avatar' } }) - %span.sidebar-context-title= _('User Settings') - %ul.sidebar-top-level-items - = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do - = link_to profile_path do - .nav-icon-container - = sprite_icon('profile') - %span.nav-item-name - = _('Profile') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(path: 'profiles#show', html_options: { class: "fly-out-top-item" }) do - = link_to profile_path do - %strong.fly-out-top-item-name - = _('Profile') - = nav_link(controller: [:accounts, :two_factor_auths]) do - = link_to profile_account_path, data: { qa_selector: 'profile_account_link' } do - .nav-icon-container - = sprite_icon('account') - %span.nav-item-name - = _('Account') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" }) do - = link_to profile_account_path do - %strong.fly-out-top-item-name - = _('Account') - - = render_if_exists 'layouts/nav/sidebar/profile_billing_link' - = nav_link(controller: 'oauth/applications') do - = link_to applications_profile_path do - .nav-icon-container - = sprite_icon('applications') - %span.nav-item-name - = _('Applications') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: 'oauth/applications', html_options: { class: "fly-out-top-item" }) do - = link_to applications_profile_path do - %strong.fly-out-top-item-name - = _('Applications') - = nav_link(controller: :chat_names) do - = link_to profile_chat_names_path do - .nav-icon-container - = sprite_icon('comment') - %span.nav-item-name - = _('Chat') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :chat_names, html_options: { class: "fly-out-top-item" }) do - = link_to profile_chat_names_path do - %strong.fly-out-top-item-name - = _('Chat') - - unless Gitlab::CurrentSettings.personal_access_tokens_disabled? - = nav_link(controller: :personal_access_tokens) do - = link_to profile_personal_access_tokens_path do - .nav-icon-container - = sprite_icon('token') - %span.nav-item-name - = _('Access Tokens') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :personal_access_tokens, html_options: { class: "fly-out-top-item" }) do - = link_to profile_personal_access_tokens_path do - %strong.fly-out-top-item-name - = _('Access Tokens') - = nav_link(controller: :emails) do - = link_to profile_emails_path, data: { qa_selector: 'profile_emails_link' } do - .nav-icon-container - = sprite_icon('mail') - %span.nav-item-name - = _('Emails') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :emails, html_options: { class: "fly-out-top-item" }) do - = link_to profile_emails_path do - %strong.fly-out-top-item-name - = _('Emails') - - if current_user.allow_password_authentication? - = nav_link(controller: :passwords) do - = link_to edit_profile_password_path , data: { qa_selector: 'profile_password_link' } do - .nav-icon-container - = sprite_icon('lock') - %span.nav-item-name - = _('Password') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :passwords, html_options: { class: "fly-out-top-item" }) do - = link_to edit_profile_password_path do - %strong.fly-out-top-item-name - = _('Password') - = nav_link(controller: :notifications) do - = link_to profile_notifications_path do - .nav-icon-container - = sprite_icon('notifications') - %span.nav-item-name - = _('Notifications') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :notifications, html_options: { class: "fly-out-top-item" }) do - = link_to profile_notifications_path do - %strong.fly-out-top-item-name - = _('Notifications') - = nav_link(controller: :keys) do - = link_to profile_keys_path do - .nav-icon-container - = sprite_icon('key') - %span.nav-item-name - = _('SSH Keys') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :keys, html_options: { class: "fly-out-top-item" }) do - = link_to profile_keys_path do - %strong.fly-out-top-item-name - = _('SSH Keys') - = nav_link(controller: :gpg_keys) do - = link_to profile_gpg_keys_path do - .nav-icon-container - = sprite_icon('key') - %span.nav-item-name - = _('GPG Keys') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :gpg_keys, html_options: { class: "fly-out-top-item" }) do - = link_to profile_gpg_keys_path do - %strong.fly-out-top-item-name - = _('GPG Keys') - = nav_link(controller: :preferences) do - = link_to profile_preferences_path do - .nav-icon-container - = sprite_icon('preferences') - %span.nav-item-name - = _('Preferences') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :preferences, html_options: { class: "fly-out-top-item" }) do - = link_to profile_preferences_path do - %strong.fly-out-top-item-name - = _('Preferences') - - if saved_replies_enabled? - = nav_link(controller: :saved_replies) do - = link_to profile_saved_replies_path do - .nav-icon-container - = sprite_icon('symlink') - %span.nav-item-name - = _('Saved Replies') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :saved_replies, html_options: { class: "fly-out-top-item" }) do - = link_to profile_saved_replies_path do - %strong.fly-out-top-item-name - = _('Saved Replies') - = nav_link(controller: :active_sessions) do - = link_to profile_active_sessions_path do - .nav-icon-container - = sprite_icon('monitor-lines') - %span.nav-item-name - = _('Active Sessions') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :active_sessions, html_options: { class: "fly-out-top-item" }) do - = link_to profile_active_sessions_path do - %strong.fly-out-top-item-name - = _('Active Sessions') - = nav_link(path: 'profiles#audit_log') do - = link_to audit_log_profile_path do - .nav-icon-container - = sprite_icon('log') - %span.nav-item-name - = _('Authentication log') - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" }) do - = link_to audit_log_profile_path do - %strong.fly-out-top-item-name - = _('Authentication Log') - = render_if_exists 'layouts/nav/sidebar/profile_usage_quotas_link' - - = render 'shared/sidebar_toggle_button' += render partial: 'shared/nav/sidebar', object: Sidebars::UserSettings::Panel.new(Sidebars::Context.new(current_user: current_user, container: current_user)) diff --git a/app/views/layouts/nav/sidebar/_user_profile.html.haml b/app/views/layouts/nav/sidebar/_user_profile.html.haml new file mode 100644 index 00000000000..b24334f48c4 --- /dev/null +++ b/app/views/layouts/nav/sidebar/_user_profile.html.haml @@ -0,0 +1 @@ += render partial: 'shared/nav/sidebar', object: Sidebars::UserProfile::Panel.new(Sidebars::Context.new(current_user: current_user, container: @user)) diff --git a/app/views/layouts/nav/sidebar/_your_work.html.haml b/app/views/layouts/nav/sidebar/_your_work.html.haml index 0eba5045ab1..0da66c2e14e 100644 --- a/app/views/layouts/nav/sidebar/_your_work.html.haml +++ b/app/views/layouts/nav/sidebar/_your_work.html.haml @@ -1 +1 @@ -= render partial: 'shared/nav/sidebar', object: Sidebars::YourWork::Panel.new(Sidebars::Context.new(current_user: current_user, container: nil)) += render partial: 'shared/nav/sidebar', object: Sidebars::YourWork::Panel.new(your_work_sidebar_context(current_user)) diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 6ad6696b313..09fa8575106 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -18,6 +18,9 @@ :plain window.uploads_path = "#{project_uploads_path(project)}"; +- content_for :before_content do + = render 'projects/invite_members_modal', project: @project + = dispensable_render_if_exists "shared/web_hooks/web_hook_disabled_alert" = dispensable_render_if_exists "projects/free_user_cap_alert", project: @project diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml index 95a204a3319..e396f38499a 100644 --- a/app/views/layouts/snippets.html.haml +++ b/app/views/layouts/snippets.html.haml @@ -1,9 +1,10 @@ - page_title _("Snippets") -- header_title _("Snippets"), snippets_path +- header_title _("Snippets"), dashboard_snippets_path - snippets_upload_path = snippets_upload_path(@snippet, current_user) +- @left_sidebar = true + - if current_user - - @left_sidebar = true - nav "your_work" - content_for :page_specific_javascripts do diff --git a/app/views/notify/_issuable_csv_export.html.haml b/app/views/notify/_issuable_csv_export.html.haml index 3b1fe90eaee..f7c6168ecb6 100644 --- a/app/views/notify/_issuable_csv_export.html.haml +++ b/app/views/notify/_issuable_csv_export.html.haml @@ -1,6 +1,8 @@ +- type = type.to_s.humanize.downcase + %p{ style: 'font-size:18px; text-align:center; line-height:30px;' } - project_link = link_to(@project.full_name, project_url(@project), style: "color:#3777b0; text-decoration:none; display:block;") - = _('Your CSV export of %{count} from project %{project_link} has been added to this email as an attachment.').html_safe % { count: pluralize(@written_count, type.to_s.titleize.downcase), project_link: project_link } + = _('Your CSV export of %{count} from project %{project_link} has been added to this email as an attachment.').html_safe % { count: pluralize(@written_count, type.titleize.downcase), project_link: project_link } - if @truncated %p - = _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of %{size_limit}. %{written_count} of %{count} %{issuables} have been included. Consider re-exporting with a narrower selection of %{issuables}.') % { written_count: @written_count, count: @count, issuables: type.to_s.pluralize, size_limit: @size_limit } + = _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of %{size_limit}. %{written_count} of %{count} %{issuables} have been included. Consider re-exporting with a narrower selection of %{issuables}.') % { written_count: @written_count, count: @count, issuables: type.pluralize, size_limit: @size_limit } diff --git a/app/views/notify/_issuable_csv_export.text.erb b/app/views/notify/_issuable_csv_export.text.erb new file mode 100644 index 00000000000..a6e908803f5 --- /dev/null +++ b/app/views/notify/_issuable_csv_export.text.erb @@ -0,0 +1,7 @@ +<% type = type.to_s.humanize.downcase %> + +<%= _('Your CSV export of %{exported_objects} from project %{project_name} (%{project_url}) has been added to this email as an attachment.') % { exported_objects: pluralize(@written_count, type), project_name: @project.full_name, project_url: project_url(@project) } %> + +<% if @truncated %> + <%= _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of %{size_limit}. %{written_count} of %{total_count} %{object_type} have been included. Consider re-exporting with a narrower selection of %{object_type}.') % { written_count: @written_count, total_count: @count, size_limit: @size_limit, object_type: type.pluralize } %> +<% end %> diff --git a/app/views/notify/export_work_items_csv_email.html.haml b/app/views/notify/export_work_items_csv_email.html.haml new file mode 100644 index 00000000000..db842262049 --- /dev/null +++ b/app/views/notify/export_work_items_csv_email.html.haml @@ -0,0 +1 @@ += render 'issuable_csv_export', type: :work_item diff --git a/app/views/notify/export_work_items_csv_email.text.erb b/app/views/notify/export_work_items_csv_email.text.erb new file mode 100644 index 00000000000..ec4aaa38886 --- /dev/null +++ b/app/views/notify/export_work_items_csv_email.text.erb @@ -0,0 +1 @@ +<%= render 'issuable_csv_export', type: :work_item %> diff --git a/app/views/notify/import_work_items_csv_email.html.haml b/app/views/notify/import_work_items_csv_email.html.haml new file mode 100644 index 00000000000..d4326d6bdf9 --- /dev/null +++ b/app/views/notify/import_work_items_csv_email.html.haml @@ -0,0 +1,49 @@ +- info_style = 'font-size:16px; text-align:center; line-height:24px;' +- error_style = 'font-size:13px; text-align:center; line-height:16px; color:#dd2b0e;' + +%p{ style: info_style } + - project_link = link_to(@project.full_name, project_url(@project), style: "color:#3777b0; text-decoration:none;") + = s_('Notify|Here are the results for your CSV import for %{project_link}.').html_safe % { project_link: project_link } + +- success_lines = @results[:success] +%p{ style: info_style } + - if success_lines > 0 + - work_items = n_('%d work item', '%d work items', success_lines) % success_lines + = s_('Notify|%{work_items} successfully imported.') % { work_items: work_items } + - else + = s_('Notify|No work items have been imported.') + + - if @results[:parse_error] + %p{ style: info_style } + = s_('Notify|Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.') + +- type_errors = @results[:type_errors] +- if type_errors + %p{ style: info_style } + = s_('Notify|Some values in the "type" column could not be matched with supported work item types:') + + - blank_lines = type_errors[:blank] + - missing_lines = type_errors[:missing] + - disallowed_lines = type_errors[:disallowed] + + - if blank_lines.present? + %p{ style: error_style } + = s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type is empty.') % { singular_or_plural_line: n_('Line', 'Lines', blank_lines.size), error_lines: blank_lines.join(', ') } + + - if missing_lines.present? + %p{ style: error_style } + = s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type cannot be found or is not supported.') % { singular_or_plural_line: n_('Line', 'Lines', missing_lines.size), error_lines: missing_lines.join(', ') } + + - if disallowed_lines.present? + %p{ style: error_style } + = s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type is not available. Please check your license and permissions.') % { singular_or_plural_line: n_('Line', 'Lines', disallowed_lines.size), error_lines: disallowed_lines.join(', ') } + +- error_lines = @results[:error_lines] +- if error_lines.present? + %p{ style: error_style } + = s_('Notify|Errors found on %{singular_or_plural_line}: %{error_lines}. Please check that these lines have the following fields: %{required_headers}.') % { singular_or_plural_line: n_('line', 'lines', error_lines.size), required_headers: WorkItems::ImportCsvService.required_headers.join(', '), + error_lines: error_lines.join(', ') } + +- if error_lines.present? || type_errors + %p{ style: info_style } + = s_('Notify|Please fix the lines with errors and try the CSV import again.') diff --git a/app/views/notify/import_work_items_csv_email.text.erb b/app/views/notify/import_work_items_csv_email.text.erb new file mode 100644 index 00000000000..059dbc95cbc --- /dev/null +++ b/app/views/notify/import_work_items_csv_email.text.erb @@ -0,0 +1,48 @@ +<%= s_('Notify|Here are the results for your CSV import for %{project_name} (%{project_link}).') % { project_name: @project.full_name, project_link: project_url(@project) } %> + +<% success_lines = @results[:success] %> +<% if success_lines > 0 %> + <% work_items = n_('%d work item', '%d work items', success_lines) % success_lines %> + <%= s_('Notify|%{work_items} successfully imported.') % { work_items: work_items } %> +<% else %> + <%= s_('Notify|No work items have been imported.') %> + + <% if @results[:parse_error] %> + <%= s_('Notify|Error parsing CSV file. Please make sure it has the correct format: a delimited text file that uses a comma to separate values.') %> + <% end %> +<% end %> + +<% type_errors = @results[:type_errors] %> +<% + if type_errors + blank_lines = type_errors[:blank] + missing_lines = type_errors[:missing] + disallowed_lines = type_errors[:disallowed] +%> + <%= s_('Notify|Some values in the "type" column could not be matched with supported work item types:') %> + + <% if blank_lines.present? %> + <%= s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type is empty.') % { singular_or_plural_line: n_('Line', 'Lines', blank_lines.size), error_lines: blank_lines.join(', ') } %> + <% end %> + + <% if missing_lines.present? %> + <%= s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type cannot be found or is not supported.') % { singular_or_plural_line: n_('Line', 'Lines', missing_lines.size), error_lines: missing_lines.join(', ') } %> + <% end %> + + <% if disallowed_lines.present? %> + <%= s_('Notify|%{singular_or_plural_line} %{error_lines}: Work item type is not available. Please check your license and permissions.') % { singular_or_plural_line: n_('Line', 'Lines', disallowed_lines.size), error_lines: disallowed_lines.join(', ') } %> + <% end %> +<% end %> + +<% + error_lines = @results[:error_lines] + if error_lines.present? +%> + <%= s_('Notify|Errors found on %{singular_or_plural_line}: %{error_lines}. Please check that these lines have the following fields: %{required_headers}.') % { singular_or_plural_line: n_('line', 'lines', error_lines.size), required_headers: WorkItems::ImportCsvService.required_headers.join(', '), + error_lines: error_lines.join(', ') } %> +<% end %> + +<% if error_lines.present? || type_errors %> + <%= s_('Notify|Please fix the lines with errors and try the CSV import again.') %> +<% end %> + diff --git a/app/views/notify/issues_csv_email.text.erb b/app/views/notify/issues_csv_email.text.erb index cf2910c4014..5b6c151e4ce 100644 --- a/app/views/notify/issues_csv_email.text.erb +++ b/app/views/notify/issues_csv_email.text.erb @@ -1,5 +1 @@ -<%= _('Your CSV export of %{written_count} from project %{project_name} (%{project_url}) has been added to this email as an attachment.') % { written_count: pluralize(@written_count, 'issue'), project_name: @project.full_name, project_url: project_url(@project) } %> - -<% if @truncated %> - <%= _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of %{size_limit}. %{written_count} of %{issues_count} issues have been included. Consider re-exporting with a narrower selection of issues.') % { written_count: @written_count, issues_count: @issues_count, size_limit: @size_limit } %> -<% end %> +<%= render 'issuable_csv_export', type: :issue %> diff --git a/app/views/notify/merge_request_status_email.text.haml b/app/views/notify/merge_request_status_email.text.haml index 61c9b130da8..7d10bc77126 100644 --- a/app/views/notify/merge_request_status_email.text.haml +++ b/app/views/notify/merge_request_status_email.text.haml @@ -1,4 +1,4 @@ -= sprintf(s_('Notify|Merge request %{merge_request} was %{mr_status}'), { merge_request: @merge_request.to_reference, mr_status: sanitize_name(@updated_by.name) }) += sprintf(s_('Notify|Merge request %{merge_request} was %{mr_status} by %{updated_by}'), { merge_request: @merge_request.to_reference, mr_status: @mr_status, updated_by: sanitize_name(@updated_by.name) }) = sprintf(s_('Notify|Merge request URL: %{merge_request_url}'), { merge_request_url: project_merge_request_url(@merge_request.target_project, @merge_request) }) diff --git a/app/views/notify/merge_requests_csv_email.text.erb b/app/views/notify/merge_requests_csv_email.text.erb index 78d11dde69f..c5dec164a4d 100644 --- a/app/views/notify/merge_requests_csv_email.text.erb +++ b/app/views/notify/merge_requests_csv_email.text.erb @@ -1,5 +1 @@ -<%= _('Your CSV export of %{written_count} from project %{project_name} (%{project_url}) has been added to this email as an attachment.') % { written_count: pluralize(@written_count, 'merge request'), project_name: @project.full_name, project_url: project_url(@project) } %> - -<% if @truncated %> - <%= _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of %{size_limit}. %{written_count} of %{merge_requests_count} merge requests have been included. Consider re-exporting with a narrower selection of merge requests.') % { written_count: @written_count, merge_requests_count: @merge_requests_count, size_limit: @size_limit} %> -<% end %> +<%= render 'issuable_csv_export', type: :merge_request %> diff --git a/app/views/notify/new_review_email.text.erb b/app/views/notify/new_review_email.text.erb index 7bf878aefd0..69cb33b05df 100644 --- a/app/views/notify/new_review_email.text.erb +++ b/app/views/notify/new_review_email.text.erb @@ -4,7 +4,6 @@ -- <% @notes.each_with_index do |note, index| %> - <!-- Get preloaded note discussion--> <% discussion = @discussions[note.discussion_id] if note.part_of_discussion?%> <% target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{note.id}") %> <%= render 'note_email', note: note, diff_limit: 3, target_url: target_url, discussion: discussion, author: @author %> diff --git a/app/views/notify/two_factor_otp_attempt_failed_email.html.haml b/app/views/notify/two_factor_otp_attempt_failed_email.html.haml index 83f028af500..968d84f700d 100644 --- a/app/views/notify/two_factor_otp_attempt_failed_email.html.haml +++ b/app/views/notify/two_factor_otp_attempt_failed_email.html.haml @@ -9,7 +9,7 @@ %tr %td{ style: "#{default_font}vertical-align:middle;color:#ffffff;text-align:center;" } %span - = _("We detected an attempt to sign in to your %{host} account using a wrong two-factor authentication code") % { host: Gitlab.config.gitlab.host } + = _("GitLab detected an attempt to sign in to your %{host} account using an incorrect verification code") % { host: Gitlab.config.gitlab.host } %tr.spacer %td{ style: spacer_style } @@ -43,7 +43,7 @@ %tr{ style: 'width:100%;' } %td{ style: "#{default_style}text-align:center;" } - password_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_url('user/profile/user_passwords', anchor: 'change-your-password') } - = _('If you recently tried to sign in, but mistakenly entered a wrong two-factor authentication code, you may ignore this email.') + = _('If you recently tried to sign in, but mistakenly entered an incorrect verification code, you can ignore this email.') - if password_authentication_enabled_for_web? %p diff --git a/app/views/notify/two_factor_otp_attempt_failed_email.text.haml b/app/views/notify/two_factor_otp_attempt_failed_email.text.haml index 8718ab034ff..9760dd3d985 100644 --- a/app/views/notify/two_factor_otp_attempt_failed_email.text.haml +++ b/app/views/notify/two_factor_otp_attempt_failed_email.text.haml @@ -1,7 +1,7 @@ = _('Hi %{username}!') % { username: sanitize_name(@user.name) } -= _('We detected an attempt to sign in to your %{host} account using a wrong two-factor authentication code, from the following IP address: %{ip}, at %{time}') % { host: Gitlab.config.gitlab.host, ip: @ip, time: @time } += _('GitLab detected an attempt to sign in to your %{host} account using an incorrect verification code from the following IP address: %{ip}, at %{time}') % { host: Gitlab.config.gitlab.host, ip: @ip, time: @time } -= _('If you recently tried to sign in, but mistakenly entered a wrong two-factor authentication code, you may ignore this email.') += _('If you recently tried to sign in, but mistakenly entered an incorrect verification code, you can ignore this email.') = _('If you did not recently try to sign in, you should immediately change your password: %{password_link}.') % { password_link: help_page_url('user/profile/user_passwords', anchor: 'change-your-password') } = _('Make sure you choose a strong, unique password.') diff --git a/app/views/notify/unknown_sign_in_email.html.haml b/app/views/notify/unknown_sign_in_email.html.haml index f8a0ae1352c..e252af78060 100644 --- a/app/views/notify/unknown_sign_in_email.html.haml +++ b/app/views/notify/unknown_sign_in_email.html.haml @@ -24,6 +24,11 @@ = Gitlab.config.gitlab.host %tr %td{ style: "#{default_style}border-top:1px solid #ededed;" } + = _('User') + %td{ style: "#{default_style}color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } + #{sanitize_name(@user.name)} (#{@user.username}) + %tr + %td{ style: "#{default_style}border-top:1px solid #ededed;" } = _('IP Address') %td{ style: "#{default_style}color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } %span.muted{ style: "color:#333333;text-decoration:none;" } diff --git a/app/views/notify/unknown_sign_in_email.text.haml b/app/views/notify/unknown_sign_in_email.text.haml index f3e318f0d15..fbe35c502da 100644 --- a/app/views/notify/unknown_sign_in_email.text.haml +++ b/app/views/notify/unknown_sign_in_email.text.haml @@ -1,4 +1,4 @@ -= _('Hi %{username}!') % { username: sanitize_name(@user.name) } += _('Hi %{user_name} (%{user_username})!') % { user_name: sanitize_name(@user.name), user_username: @user.username } = _('A sign-in to your account has been made from the following IP address: %{ip}') % { ip: @ip } diff --git a/app/views/profiles/chat_names/_chat_name.html.haml b/app/views/profiles/chat_names/_chat_name.html.haml index ce2fc2098c5..afc3894c23b 100644 --- a/app/views/profiles/chat_names/_chat_name.html.haml +++ b/app/views/profiles/chat_names/_chat_name.html.haml @@ -1,21 +1,5 @@ -- integration = chat_name.integration -- project = integration&.project %tr %td - %strong - - if project.present? && can?(current_user, :read_project, project) - = link_to project.full_name, project_path(project) - - else - .light= _('Not applicable.') - %td - %strong - - if integration.present? && can?(current_user, :admin_project, project) - = link_to integration.title, edit_project_settings_integration_path(project, integration) - - elsif integration.present? - = integration.title - - else - .light= _('Not applicable.') - %td = chat_name.team_domain %td = chat_name.chat_name diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml index 41bd81d0250..6de5f183981 100644 --- a/app/views/profiles/chat_names/index.html.haml +++ b/app/views/profiles/chat_names/index.html.haml @@ -1,7 +1,8 @@ - page_title _('Chat') - @content_class = "limit-container-width" unless fluid_layout +- @hide_search_settings = true -.row.gl-mt-3.js-search-settings-section +.row.gl-mt-5.js-search-settings-section .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = page_title @@ -14,11 +15,9 @@ - if @chat_names.present? .table-responsive - %table.table.chat-names + %table.table %thead %tr - %th= _('Project') - %th= _('Service') %th= _('Team domain') %th= _('Nickname') %th= _('Last used') diff --git a/app/views/profiles/chat_names/new.html.haml b/app/views/profiles/chat_names/new.html.haml index 303b8b10027..8ff2e6f34a0 100644 --- a/app/views/profiles/chat_names/new.html.haml +++ b/app/views/profiles/chat_names/new.html.haml @@ -1,14 +1,28 @@ -%h1.page-title.gl-font-size-h-display - = _("Authorization required") -%main{ :role => "main" } - %p.h4 - = html_escape(_("Authorize %{user} to use your account?")) % { user: tag.strong(@chat_name_params[:chat_name]) } +- @hide_search_settings = true - %hr - .actions - = form_tag profile_chat_names_path, method: :post do - = hidden_field_tag :token, @chat_name_token.token - = submit_tag _("Authorize"), class: "gl-button btn btn-confirm wide float-left" - = form_tag deny_profile_chat_names_path, method: :delete do - = hidden_field_tag :token, @chat_name_token.token - = submit_tag _("Deny"), class: "gl-button btn btn-danger gl-ml-3" +%main{ role: 'main' } + .gl-max-w-80.gl-mx-auto.gl-mt-6 + = render Pajamas::CardComponent.new do |c| + - c.header do + %h4.gl-m-0= s_('SlackIntegration|Authorize GitLab for Slack app (%{user}) to use your account?').html_safe % { user: @chat_name_params[:chat_name] } + - c.body do + %p + = s_('SlackIntegration|An application called GitLab for Slack app is requesting access to your GitLab account. This application was created by GitLab Inc.') + %p + = _('This application will be able to:') + %ul + %li= s_('SlackIntegration|Create and read issue data and comments.') + %li= s_('SlackIntegration|Perform deployments.') + %li= s_('SlackIntegration|Run ChatOps jobs.') + %p.gl-mb-0 + = s_("SlackIntegration|You don't have to reauthorize this application if the permission scope changes in future releases.") + - c.footer do + .gl-display-flex + = form_tag profile_chat_names_path, method: :post do + = hidden_field_tag :token, @chat_name_token.token + = render Pajamas::ButtonComponent.new(type: :submit, variant: :danger) do + = _('Authorize') + = form_tag deny_profile_chat_names_path, method: :delete do + = hidden_field_tag :token, @chat_name_token.token + = render Pajamas::ButtonComponent.new(type: :submit, button_options: { class: 'gl-ml-3' }) do + = _('Deny') diff --git a/app/views/profiles/gpg_keys/_key.html.haml b/app/views/profiles/gpg_keys/_key.html.haml index ec48a611377..d52b16814c0 100644 --- a/app/views/profiles/gpg_keys/_key.html.haml +++ b/app/views/profiles/gpg_keys/_key.html.haml @@ -18,7 +18,7 @@ %code= subkey.fingerprint .float-right %span.key-created-at - = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago: time_ago_with_tooltip(key.created_at) } + = html_escape(s_('Profiles|Created %{time_ago}')) % { time_ago: time_ago_with_tooltip(key.created_at) } = link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "gl-button btn btn-icon btn-danger gl-ml-3" do %span.sr-only= _('Remove') = sprite_icon('remove') diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index 825fb98782a..288007ec806 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -35,7 +35,7 @@ = ssh_key_usage_types.invert[key.usage_type] .gl-display-flex.gl-float-right - if key.can_delete? - - if key.signing? && !is_admin && Feature.enabled?(:revoke_ssh_signatures) + - if key.signing? && !is_admin = render Pajamas::ButtonComponent.new(size: :small, button_options: { class: 'js-confirm-modal-button', data: ssh_key_revoke_modal_data(key, revoke_profile_key_path(key)) }) do = _('Revoke') .gl-pl-3 diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index b10d05efc4f..5f74a4c4427 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -17,6 +17,9 @@ = s_('Preferences|Color theme') %p = s_('Preferences|Customize the color of GitLab.') + - if show_super_sidebar? + %p + = s_('Preferences|Note: You have the new navigation enabled, so only Dark Mode theme significantly changes GitLab\'s appearance.') .col-lg-8.application-theme .row - Gitlab::Themes.each do |theme| diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 5ffffb80d97..659b218bdef 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -53,7 +53,9 @@ = status_form.hidden_field :emoji, data: { js_name: 'emoji' } = status_form.hidden_field :message, data: { js_name: 'message' } = status_form.hidden_field :availability, data: { js_name: 'availability' } - = status_form.hidden_field :clear_status_after, value: @user.status&.clear_status_at&.to_s(:iso8601), data: { js_name: 'clearStatusAfter' } + = status_form.hidden_field :clear_status_after, + value: user_clear_status_at(@user), + data: { js_name: 'clearStatusAfter' } .col-lg-12 %hr .row.user-time-preferences.js-search-settings-section @@ -106,9 +108,18 @@ .form-group.gl-form-group - external_accounts_help_url = help_page_path('user/profile/index', anchor: 'add-external-accounts-to-your-user-profile-page') - external_accounts_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: external_accounts_help_url } - - external_accounts_docs_link = s_('Profiles|Your Discord user ID. Should be between %{min} and %{max} digits long. %{external_accounts_link_start}Learn more.%{external_accounts_link_end}').html_safe % { min: '17', max: '20', external_accounts_link_start: external_accounts_link_start, external_accounts_link_end: '</a>'.html_safe } + - external_accounts_docs_link = s_('Profiles|Your Discord user ID. %{external_accounts_link_start}Learn more.%{external_accounts_link_end}').html_safe % { external_accounts_link_start: external_accounts_link_start, external_accounts_link_end: '</a>'.html_safe } + - min_discord_length = 17 + - max_discord_length = 20 = f.label :discord - = f.text_field :discord, class: 'gl-form-input form-control gl-md-form-input-lg', placeholder: s_("Profiles|User ID") + = f.text_field :discord, + class: 'gl-form-input form-control gl-md-form-input-lg js-validate-length', + placeholder: s_("Profiles|User ID"), + data: { min_length: min_discord_length, + min_length_message: s_('Profiles|Discord ID is too short (minimum is %{min_length} characters).') % { min_length: min_discord_length }, + max_length: max_discord_length, + max_length_message: s_('Profiles|Discord ID is too long (maximum is %{max_length} characters).') % { max_length: max_discord_length }, + allow_empty: true} %small.form-text.text-gl-muted = external_accounts_docs_link diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 3add3af3c65..61fe6ba8e47 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -8,24 +8,13 @@ .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 - = _('Register Two-Factor Authenticator') + = _('Register a one-time password authenticator') %p = _('Use a one-time password authenticator on your mobile device or computer to enable two-factor authentication (2FA).') .col-lg-8 - if current_user.two_factor_otp_enabled? %p = _("You've already enabled two-factor authentication using one time password authenticators. In order to register a different device, you must first disable two-factor authentication.") - %p - = _('If you lose your recovery codes you can generate new ones, invalidating all previous codes.') - - if @error - = render Pajamas::AlertComponent.new(title: @error[:message], - variant: :danger, - alert_options: { class: 'gl-mb-3' }, - dismissible: false) do |c| - = c.body do - = link_to _('Try the troubleshooting steps here.'), help_page_path('user/profile/account/two_factor_authentication.md', anchor: 'troubleshooting'), target: '_blank', rel: 'noopener noreferrer' - .js-manage-two-factor-form{ data: { webauthn_enabled: webauthn_enabled, current_password_required: current_password_required?.to_s, profile_two_factor_auth_path: profile_two_factor_auth_path, profile_two_factor_auth_method: 'delete', codes_profile_two_factor_auth_path: codes_profile_two_factor_auth_path, codes_profile_two_factor_auth_method: 'post' } } - - else %p - register_2fa_token = _('We recommend using cloud-based authenticator applications that can restore access if you lose your hardware device.') @@ -36,8 +25,8 @@ .gl-p-2.gl-mb-3{ style: 'background: #fff' } = raw @qr_code .col-md-8 - .gl-card - .gl-card-body + = render Pajamas::CardComponent.new do |c| + - c.body do %p.gl-mt-0.gl-mb-3.gl-font-weight-bold = _("Can't scan the code?") %p.gl-mt-0.gl-mb-3 @@ -58,15 +47,15 @@ = c.body do = link_to _('Try the troubleshooting steps here.'), help_page_path('user/profile/account/two_factor_authentication.md', anchor: 'troubleshooting'), target: '_blank', rel: 'noopener noreferrer' - .form-group - = label_tag :pin_code, _('Pin code'), class: "label-bold" - = text_field_tag :pin_code, nil, class: "form-control gl-form-input", required: true, data: { qa_selector: 'pin_code_field' } - if current_password_required? .form-group = label_tag :current_password, _('Current password'), class: 'label-bold' = password_field_tag :current_password, nil, autocomplete: 'current-password', required: true, class: 'form-control gl-form-input', data: { qa_selector: 'current_password_field' } %p.form-text.text-muted = _('Your current password is required to register a two-factor authenticator app.') + .form-group + = label_tag :pin_code, _('Enter verification code'), class: "label-bold" + = text_field_tag :pin_code, nil, autocomplete: 'off', inputmode: 'numeric', class: "form-control gl-form-input", required: true, data: { qa_selector: 'pin_code_field' } .gl-mt-3 = submit_tag _('Register with two-factor app'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'register_2fa_app_button' } @@ -75,37 +64,27 @@ .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 - - if webauthn_enabled - = _('Register WebAuthn Device') - - else - = _('Register Universal Two-Factor (U2F) Device') + = _('Register a WebAuthn device') %p - = _('Set up a hardware device as a second factor to sign in.') + = _('Set up a hardware device to enable two-factor authentication (2FA).') %p - - if webauthn_enabled - = _("Not all browsers support WebAuthn. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even from an unsupported browser.") + - if webauthn_enabled && Feature.enabled?(:webauthn_without_totp) + = _("Not all browsers support WebAuthn. You must save your recovery codes after you first register a two-factor authenticator to be able to sign in, even from an unsupported browser.") - else - = _("Not all browsers support U2F devices. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in - even when you're using an unsupported browser.") + = _("Not all browsers support WebAuthn. Therefore, we require that you set up a two-factor authentication app first. That way you'll always be able to sign in, even from an unsupported browser.") .col-lg-8 - - registration = webauthn_enabled ? @webauthn_registration : @u2f_registration - - if registration.errors.present? - = form_errors(registration) - - if webauthn_enabled - = render "authentication/register", target_path: create_webauthn_profile_two_factor_auth_path - - else - = render "authentication/register", target_path: create_u2f_profile_two_factor_auth_path + - if @webauthn_registration.errors.present? + = form_errors(@webauthn_registration) + = render "authentication/register", target_path: create_webauthn_profile_two_factor_auth_path %hr %h5 - - if webauthn_enabled - = _('WebAuthn Devices (%{length})') % { length: @registrations.length } - - else - = _('U2F Devices (%{length})') % { length: @registrations.length } + = _('WebAuthn Devices (%{length})') % { length: @registrations.length } - if @registrations.present? .table-responsive - %table.table.table-bordered.u2f-registrations + %table.table %colgroup %col{ width: "50%" } %col{ width: "30%" } @@ -134,7 +113,28 @@ - else .settings-message.text-center - - if webauthn_enabled - = _("You don't have any WebAuthn devices registered yet.") - - else - = _("You don't have any U2F devices registered yet.") + = _("You don't have any WebAuthn devices registered yet.") + + %hr + + .row.gl-mt-3 + .col-lg-4 + %h4.gl-mt-0 + = _('Disable two-factor authentication') + %p + = _('Use this section to disable your one-time password authenticator and WebAuthn devices. You can also generate new recovery codes.') + .col-lg-8 + - if current_user.two_factor_enabled? + %p + = _('If you lose your recovery codes you can generate new ones, invalidating all previous codes.') + - if @error + = render Pajamas::AlertComponent.new(title: @error[:message], + variant: :danger, + alert_options: { class: 'gl-mb-3' }, + dismissible: false) do |c| + = c.body do + = link_to _('Try the troubleshooting steps here.'), help_page_path('user/profile/account/two_factor_authentication.md', anchor: 'troubleshooting'), target: '_blank', rel: 'noopener noreferrer' + .js-manage-two-factor-form{ data: { webauthn_enabled: webauthn_enabled, current_password_required: current_password_required?.to_s, profile_two_factor_auth_path: profile_two_factor_auth_path, profile_two_factor_auth_method: 'delete', codes_profile_two_factor_auth_path: codes_profile_two_factor_auth_path, codes_profile_two_factor_auth_method: 'post' } } + - else + %p + = _("Register a one-time password authenticator or a WebAuthn device first.") diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml index e2d1a50ae5e..6ac084b7749 100644 --- a/app/views/projects/_files.html.haml +++ b/app/views/projects/_files.html.haml @@ -8,7 +8,7 @@ - add_page_startup_api_call project_blob_path(@project, tree_join(@ref, readme_path), viewer: "rich", format: "json") #tree-holder.tree-holder.clearfix.js-per-page{ data: { blame_per_page: Projects::BlameService::PER_PAGE } } - .info-well.gl-display-none.gl-sm-display-flex.project-last-commit.gl-flex-direction-column + .info-well.gl-display-none.gl-sm-display-flex.project-last-commit.gl-flex-direction-column.gl-mt-2 #js-last-commit.gl-m-auto = gl_loading_icon(size: 'md') #js-code-owners diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index b9aeed188fa..65fd02b291c 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -3,7 +3,7 @@ - emails_disabled = @project.emails_disabled? - cache_enabled = Feature.enabled?(:cache_home_panel, @project, type: :development) -.project-home-panel.js-show-on-project-root.gl-my-5{ class: [("empty-project" if empty_repo)] } +.project-home-panel.js-show-on-project-root.gl-mt-2.gl-mb-5{ class: [("empty-project" if empty_repo)] } .gl-display-flex.gl-justify-content-space-between.gl-flex-wrap.gl-sm-flex-direction-column.gl-mb-3.gl-gap-5 .home-panel-title-row.gl-display-flex.gl-align-items-center %div{ class: 'avatar-container rect-avatar s64 home-panel-avatar gl-flex-shrink-0 gl-w-11 gl-h-11 gl-mr-3! float-none' } diff --git a/app/views/projects/_invite_members_empty_project.html.haml b/app/views/projects/_invite_members_empty_project.html.haml index 5bc53339bf0..18d06c7d0bb 100644 --- a/app/views/projects/_invite_members_empty_project.html.haml +++ b/app/views/projects/_invite_members_empty_project.html.haml @@ -6,8 +6,4 @@ .js-invite-members-trigger{ data: { variant: 'confirm', classes: 'gl-mb-8 gl-xs-w-full', display_text: s_('InviteMember|Invite members'), - trigger_source: 'project-empty-page', - event: 'click_button', - label: 'invite_members_empty_project' } } - -= render 'projects/invite_members_modal', project: @project + trigger_source: 'project-empty-page' } } diff --git a/app/views/projects/_invite_members_modal.html.haml b/app/views/projects/_invite_members_modal.html.haml index 53f74a0f270..a1b0bdd6c56 100644 --- a/app/views/projects/_invite_members_modal.html.haml +++ b/app/views/projects/_invite_members_modal.html.haml @@ -2,5 +2,5 @@ .js-invite-members-modal{ data: { is_project: 'true', access_levels: ProjectMember.permissible_access_level_roles(current_user, project).to_json, - reload_page_on_submit: local_assigns.fetch(:reload_page_on_submit, false).to_s, + reload_page_on_submit: current_path?('project_members#index').to_s, help_link: help_page_url('user/permissions') }.merge(common_invite_modal_dataset(project)).merge(users_filter_data(project.group)) } diff --git a/app/views/projects/_invite_members_side_nav_link.html.haml b/app/views/projects/_invite_members_side_nav_link.html.haml deleted file mode 100644 index b96a7608ce2..00000000000 --- a/app/views/projects/_invite_members_side_nav_link.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.js-invite-members-trigger{ data: { trigger_source: 'project-side-nav', - icon: 'users', - display_text: title, - trigger_element: 'side-nav', - qa_selector: 'invite_members_sidebar_button' } } - -= render partial: 'shared/nav/sidebar_submenu', locals: { sidebar_menu: sidebar_menu } -= render 'projects/invite_members_modal', project: project diff --git a/app/views/projects/_invite_members_top_nav_link.html.haml b/app/views/projects/_invite_members_top_nav_link.html.haml new file mode 100644 index 00000000000..35a8d4d9944 --- /dev/null +++ b/app/views/projects/_invite_members_top_nav_link.html.haml @@ -0,0 +1,5 @@ +- data = local_assigns.fetch(:data) +- data[:display_text] = local_assigns.fetch(:display_text) +- data[:icon] = local_assigns.fetch(:icon) + +.js-invite-members-trigger{ data: data } diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 53a1abdff33..27211ffb1e5 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -98,4 +98,4 @@ -# this partial is from JiHu, see details in https://jihulab.com/gitlab-cn/gitlab/-/merge_requests/675 = render_if_exists 'shared/other_project_options', f: f, visibility_level: visibility_level, track_label: track_label = f.submit _('Create project'), class: "js-create-project-button", data: { qa_selector: 'project_create_button', track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }, pajamas_button: true -= link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" } += link_to _('Cancel'), @parent_group || dashboard_groups_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" } diff --git a/app/views/projects/_self_monitoring_deprecation_notice.html.haml b/app/views/projects/_self_monitoring_deprecation_notice.html.haml new file mode 100644 index 00000000000..b9e32356688 --- /dev/null +++ b/app/views/projects/_self_monitoring_deprecation_notice.html.haml @@ -0,0 +1,13 @@ +- return unless project.self_monitoring? + += content_for :page_level_alert do + .flash-container.flash-container-page.sticky + %div{ class: [container_class, 'limit-container-width', 'gl-pt-5!'] } + = render Pajamas::AlertComponent.new(title: _('Deprecation notice'), + variant: :danger, + alert_options: { class: 'gl-mb-3 gl-sticky' }) do |c| + = c.body do + - deprecation_link = '<a href="%{url}">'.html_safe % { url: help_page_path('update/deprecations', anchor: 'gitlab-self-monitoring-project') } + - removal_link = '<a href="%{url}">'.html_safe % { url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/348909' } + - opstrace_link = '<a href="%{url}">'.html_safe % { url: 'https://gitlab.com/groups/gitlab-org/-/epics/6976' } + = _("Self-monitoring was %{deprecation}deprecated%{link_end} in GitLab 14.9, and is %{removal}scheduled for removal%{link_end} in GitLab 16.0. For information on a possible replacement, %{opstrace}learn more about Opstrace%{link_end}.").html_safe % { deprecation: deprecation_link, removal: removal_link, opstrace: opstrace_link, link_end: '</a>'.html_safe } diff --git a/app/views/projects/airflow/dags/index.html.haml b/app/views/projects/airflow/dags/index.html.haml deleted file mode 100644 index d631d084db1..00000000000 --- a/app/views/projects/airflow/dags/index.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -- breadcrumb_title s_('Airflow|Airflow DAGs') -- page_title s_('Airflow|Airflow DAGs') - -.page-title-holder - %h1.page-title.gl-font-size-h-display= s_('Airflow|Airflow DAGs') - -#js-show-airflow-dags{ data: { - dags: @dags.to_json, - pagination: @pagination.to_json - } -} diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index 3359ea5f63b..ccda06c7e4c 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -12,7 +12,7 @@ .nav-block %ul.breadcrumb.repo-breadcrumb %li.breadcrumb-item - = link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build) + = link_to _('Artifacts'), browse_project_job_artifacts_path(@project, @build) - path_breadcrumbs do |title, path| %li.breadcrumb-item = link_to truncate(title, length: 40), browse_project_job_artifacts_path(@project, @build, path) diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index 74b85a93c8e..ee7ca9cd351 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -1,6 +1,15 @@ - page_title _("Blame"), @blob.path, @ref - add_page_specific_style 'page_bundles/tree' -- dataset = { testid: 'blob-content-holder', qa_selector: 'blame_file_content', per_page: @blame_per_page } +- if @streaming_enabled && total_extra_pages > 0 + - content_for :startup_js do + = javascript_tag do + :plain + window.blamePageStream = (() => { + const url = new URL("#{@blame_pages_url}"); + url.searchParams.set('page', 2); + return fetch(url).then(response => response.body); + })(); +- dataset = { testid: 'blob-content-holder', qa_selector: 'blame_file_content', per_page: @blame_per_page, total_extra_pages: total_extra_pages - 1, pages_url: @blame_pages_url } #blob-content-holder.tree-holder.js-per-page{ data: dataset } = render "projects/blob/breadcrumb", blob: @blob, blame: true @@ -26,11 +35,21 @@ .blame-table-wrapper = render partial: 'page' + - if @streaming_enabled + #blame-stream-container.blame-stream-container + - if @blame_pagination && @blame_pagination.total_pages > 1 .gl-display-flex.gl-justify-content-center.gl-flex-direction-column.gl-align-items-center.gl-p-3.gl-bg-gray-50.gl-border-t-solid.gl-border-t-1.gl-border-gray-100 - = _('For faster browsing, not all history is shown.') - = render Pajamas::ButtonComponent.new(href: namespace_project_blame_path(namespace_id: @project.namespace, project_id: @project, id: @id, no_pagination: true), size: :small, button_options: { class: 'gl-mt-3' }) do |c| - = _('View entire blame') + = render Pajamas::ButtonComponent.new(href: @entire_blame_path, size: :small, button_options: { class: 'gl-mt-3' }) do |c| + = _('Show full blame') + + - if @streaming_enabled + #blame-stream-loading.blame-stream-loading + .gradient + = gl_loading_icon(size: 'sm') + %span.gl-mx-2 + = _('Loading full blame...') - if @blame_pagination = paginate(@blame_pagination, theme: "gitlab") + diff --git a/app/views/projects/blob/_breadcrumb.html.haml b/app/views/projects/blob/_breadcrumb.html.haml index 7c2caf34fd1..e77367a7b42 100644 --- a/app/views/projects/blob/_breadcrumb.html.haml +++ b/app/views/projects/blob/_breadcrumb.html.haml @@ -2,7 +2,7 @@ .nav-block .tree-ref-container .tree-ref-holder - = render 'shared/ref_switcher', destination: 'blob' + #js-tree-ref-switcher{ data: { project_id: @project.id, project_root_path: project_path(@project), ref: current_ref } } %ul.breadcrumb.repo-breadcrumb %li.breadcrumb-item diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 87a6b54d697..ff95e9a1088 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -16,7 +16,7 @@ - if current_action?(:new) || current_action?(:create) %span.float-left.gl-mr-3 \/ - = text_field_tag 'file_name', params[:file_name], placeholder: "File name", data: { qa_selector: 'file_name_field' }, + = text_field_tag 'file_name', params[:file_name], placeholder: "Filename", data: { qa_selector: 'file_name_field' }, required: true, class: 'form-control gl-form-input new-file-name js-file-path-name-input', value: params[:file_name] || (should_suggest_gitlab_ci_yml? ? '.gitlab-ci.yml' : '') = render 'template_selectors' - if should_suggest_gitlab_ci_yml? @@ -26,15 +26,15 @@ dismiss_key: @project.id, human_access: human_access } } - .file-buttons.gl-display-flex.gl-align-items-center.gl-justify-content-end - - if is_markdown - - unless Feature.enabled?(:source_editor_toolbar, current_user) + - unless Feature.enabled?(:source_editor_toolbar, current_user) + .file-buttons.gl-display-flex.gl-align-items-center.gl-justify-content-end + - if is_markdown = render 'shared/blob/markdown_buttons', show_fullscreen_button: false, supports_file_upload: false - %span.soft-wrap-toggle - = render Pajamas::ButtonComponent.new(icon: 'soft-unwrap', button_options: { class: 'no-wrap' }) do - = _("No wrap") - = render Pajamas::ButtonComponent.new(icon: 'soft-wrap', button_options: { class: 'soft-wrap' }) do - = _("Soft wrap") + %span.soft-wrap-toggle + = render Pajamas::ButtonComponent.new(icon: 'soft-unwrap', button_options: { class: 'no-wrap' }) do + = _("No wrap") + = render Pajamas::ButtonComponent.new(icon: 'soft-wrap', button_options: { class: 'soft-wrap' }) do + = _("Soft wrap") .file-editor.code - if Feature.enabled?(:source_editor_toolbar, current_user) diff --git a/app/views/projects/blob/viewers/_csv.html.haml b/app/views/projects/blob/viewers/_csv.html.haml index 3a58bc9902c..3538ba1dd0d 100644 --- a/app/views/projects/blob/viewers/_csv.html.haml +++ b/app/views/projects/blob/viewers/_csv.html.haml @@ -1 +1 @@ -.file-content#js-csv-viewer{ data: { data: viewer.blob.data } } +.file-content#js-csv-viewer{ data: { data: blob_raw_path } } diff --git a/app/views/projects/branch_defaults/_branch_names_fields.html.haml b/app/views/projects/branch_defaults/_branch_names_fields.html.haml index 393b19e6c5a..3bdb81f02ad 100644 --- a/app/views/projects/branch_defaults/_branch_names_fields.html.haml +++ b/app/views/projects/branch_defaults/_branch_names_fields.html.haml @@ -12,3 +12,4 @@ = sprintf(s_('ProjectSettings|Maximum %{maxLength} characters.'), { maxLength: Issue::MAX_BRANCH_TEMPLATE }) - branch_name_help_link = help_page_path('user/project/merge_requests/creating_merge_requests.md', anchor: 'from-an-issue') = link_to _('What variables can I use?'), branch_name_help_link, target: "_blank" + = render_if_exists 'projects/branch_defaults/branch_names_help' diff --git a/app/views/projects/branch_rules/_show.html.haml b/app/views/projects/branch_rules/_show.html.haml index 27525b441ab..6e70dc42776 100644 --- a/app/views/projects/branch_rules/_show.html.haml +++ b/app/views/projects/branch_rules/_show.html.haml @@ -1,4 +1,7 @@ - expanded = expanded_by_default? +- show_code_owners = @project.licensed_feature_available?(:code_owner_approval_required) +- show_status_checks = @project.licensed_feature_available?(:external_status_checks) +- show_approvers = @project.licensed_feature_available?(:merge_request_approvers) %section.settings.no-animate#branch-rules{ class: ('expanded' if expanded) } .settings-header @@ -7,6 +10,7 @@ = expanded ? _('Collapse') : _('Expand') %p = _('Define rules for who can push, merge, and the required approvals for each branch.') + = link_to(_('Leave feedback.'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/388149', target: '_blank', rel: 'noopener noreferrer') .settings-content.gl-pr-0 - #js-branch-rules{ data: { project_path: @project.full_path, branch_rules_path: project_settings_repository_branch_rules_path(@project) } } + #js-branch-rules{ data: { project_path: @project.full_path, branch_rules_path: project_settings_repository_branch_rules_path(@project), show_code_owners: show_code_owners.to_s, show_status_checks: show_status_checks.to_s, show_approvers: show_approvers.to_s } } diff --git a/app/views/projects/branches/_branch_rules_info.haml b/app/views/projects/branches/_branch_rules_info.haml new file mode 100644 index 00000000000..15bee31c596 --- /dev/null +++ b/app/views/projects/branches/_branch_rules_info.haml @@ -0,0 +1,12 @@ +- return unless show_branch_rules_info? += render Pajamas::AlertComponent.new(variant: :info, + title: s_("Branches|See all branch-related settings together with branch rules"), + alert_options: { class: 'js-branch-rules-info-callout gl-mb-6 gl-mt-4', data: { feature_id: Users::CalloutsHelper::BRANCH_RULES_INFO_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| + = c.body do + = s_("Branches|You can now find an overview of settings for protected branches, merge request approvals, status checks, and security approvals conveniently in one spot.") + + = c.actions do + = render Pajamas::ButtonComponent.new(variant: :confirm, href: project_settings_repository_path(@project, anchor: 'js-branch-rules'), button_options: { class: 'deferred-link gl-alert-action' }) do + = s_("Branches|View branch rules") + = render Pajamas::ButtonComponent.new(button_options: { class: 'js-close'}) do + = _('Dismiss') diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index f43d19e2542..518292effd8 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -1,6 +1,8 @@ - add_page_specific_style 'page_bundles/branches' - page_title _('Branches') - add_to_breadcrumbs(_('Repository'), project_tree_path(@project)) +- is_branch_rules_available = (can? current_user, :maintainer_access, @project) && Feature.enabled?(:branch_rules, @project) +- can_push_code = (can? current_user, :push_code, @project) -# Possible values for variables passed down from the projects/branches_controller.rb -# @@ -22,16 +24,24 @@ sorted_by: @sort } } - - if can? current_user, :push_code, @project + - if can_push_code .js-delete-merged-branches{ data: { default_branch: @project.repository.root_ref, form_path: project_merged_branches_path(@project) } } + - if is_branch_rules_available + = link_to project_settings_repository_path(@project, anchor: 'js-branch-rules'), class: 'gl-button btn btn-default' do + = s_('Branches|View branch rules') + + - if can_push_code = link_to new_project_branch_path(@project), class: 'gl-button btn btn-confirm' do = s_('Branches|New branch') = render_if_exists 'projects/commits/mirror_status' +- if is_branch_rules_available + = render 'branch_rules_info' + .js-branch-list{ data: { diverging_counts_endpoint: diverging_commit_counts_namespace_project_branches_path(@project.namespace, @project, format: :json), default_branch: @project.default_branch } } - if @gitaly_unavailable diff --git a/app/views/projects/buttons/_clone.html.haml b/app/views/projects/buttons/_clone.html.haml index a8a911adb7d..ab026d9c6ac 100644 --- a/app/views/projects/buttons/_clone.html.haml +++ b/app/views/projects/buttons/_clone.html.haml @@ -13,7 +13,7 @@ %label.label-bold = _('Clone with SSH') .input-group.btn-group - = text_field_tag :ssh_project_clone, project.ssh_url_to_repo, class: "js-select-on-focus form-control", readonly: true, aria: { label: _('Repository clone URL') }, data: { qa_selector: 'ssh_clone_url_content' } + = text_field_tag :ssh_project_clone, ssh_clone_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: _('Repository clone URL') }, data: { qa_selector: 'ssh_clone_url_content' } .input-group-append = clipboard_button(target: '#ssh_project_clone', title: _("Copy URL"), class: "input-group-text gl-button btn btn-icon btn-default") = render_if_exists 'projects/buttons/geo' @@ -22,7 +22,7 @@ %label.label-bold = _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase } .input-group.btn-group - = text_field_tag :http_project_clone, project.http_url_to_repo, class: "js-select-on-focus form-control", readonly: true, aria: { label: _('Repository clone URL') }, data: { qa_selector: 'http_clone_url_content' } + = text_field_tag :http_project_clone, http_clone_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: _('Repository clone URL') }, data: { qa_selector: 'http_clone_url_content' } .input-group-append = clipboard_button(target: '#http_project_clone', title: _("Copy URL"), class: "input-group-text gl-button btn btn-icon btn-default") = render_if_exists 'projects/buttons/geo' @@ -32,12 +32,12 @@ %label.label-bold{ class: 'gl-px-4!' } = _('Open in your IDE') - if ssh_enabled? - - escaped_ssh_url_to_repo = CGI.escape(project.ssh_url_to_repo) + - escaped_ssh_url_to_repo = CGI.escape(ssh_clone_url_to_repo(project)) %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + escaped_ssh_url_to_repo } .gl-dropdown-item-text-wrapper = _('Visual Studio Code (SSH)') - if http_enabled? - - escaped_http_url_to_repo = CGI.escape(project.http_url_to_repo) + - escaped_http_url_to_repo = CGI.escape(http_clone_url_to_repo(project)) %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + escaped_http_url_to_repo } .gl-dropdown-item-text-wrapper = _('Visual Studio Code (HTTPS)') diff --git a/app/views/projects/commit/_signature_badge.html.haml b/app/views/projects/commit/_signature_badge.html.haml index 88631f14e56..9cca928e794 100644 --- a/app/views/projects/commit/_signature_badge.html.haml +++ b/app/views/projects/commit/_signature_badge.html.haml @@ -29,5 +29,5 @@ = link_to(_('Learn about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gl-link gl-display-block gl-mt-3') -%a.signature-badge.gl-display-flex{ role: 'button', tabindex: 0, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } } +%a.signature-badge.gl-display-inline-block{ role: 'button', tabindex: 0, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } } = gl_badge_tag label, variant: variant diff --git a/app/views/projects/commit/diff_files.html.haml b/app/views/projects/commit/diff_files.html.haml index 0c52c1a15a4..7287d10a109 100644 --- a/app/views/projects/commit/diff_files.html.haml +++ b/app/views/projects/commit/diff_files.html.haml @@ -1 +1,5 @@ -= render partial: 'projects/diffs/file', collection: diffs.diff_files, as: :diff_file, locals: { project: diffs.project, environment: environment, diff_page_context: 'is-commit' } +- diff_files = conditionally_paginate_diff_files(diffs, paginate: true, page: params[:page], per: Projects::CommitController::COMMIT_DIFFS_PER_PAGE) + += render partial: 'projects/diffs/file', collection: diff_files, as: :diff_file, locals: { project: diffs.project, environment: environment, diff_page_context: 'is-commit' } + += paginate(diff_files, theme: "gitlab", params: { action: :show }) diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index b5481f19352..6209ef48f96 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -15,6 +15,7 @@ - ref = local_assigns.fetch(:ref) { merge_request&.source_branch } - commit = commit.present(current_user: current_user) - commit_status = commit.detailed_status_for(ref) +- tags = commit.tags_for_display - collapsible = local_assigns.fetch(:collapsible, true) - link_data_attrs = local_assigns.fetch(:link_data_attrs, {}) - link = commit_path(project, commit, merge_request: merge_request) @@ -55,6 +56,13 @@ = preserve(markdown_field(commit, :description)) .commit-actions.flex-row + - if tags.present? + = gl_badge_tag(variant: :neutral, icon: 'tag', class: 'gl-font-monospace') do + - if tags.size > 1 + = link_to _('%{count} tags') % { count: tags.size } , project_commit_path(project, commit.id) + - else + = link_to tags.first, project_commits_path(project, tags.first, ref_type: 'tags'), class: 'gl-text-truncate gl-max-w-15' + - if request.xhr? = render partial: 'projects/commit/signature', object: commit.signature - else diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index b3590eea631..58da76a3231 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title _("Compare Revisions") -- page_title _("Compare") +- breadcrumb_title _("Compare revisions") +- page_title _("Compare revisions") %h1.page-title.gl-font-size-h-display = _("Compare Git revisions") diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 1bdf3d1e6e3..bc378182057 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _("Compare Revisions"), project_compare_index_path(@project) +- add_to_breadcrumbs _("Compare revisions"), project_compare_index_path(@project) - page_title "#{params[:from]}...#{params[:to]}" .sub-header-block.gl-border-b-0.gl-mb-0 diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index ba79f0ee3cb..1e8b1255f0c 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -1,6 +1,5 @@ - page_title _("Value Stream Analytics") - data_attributes = @request_params.valid? ? @request_params.to_data_attributes : {} -- data_attributes.merge!(cycle_analytics_initial_data(@project, @group)) - add_page_specific_style 'page_bundles/cycle_analytics' #js-cycle-analytics{ data: data_attributes } diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 8ff6d348d95..03e26fd4456 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -3,7 +3,7 @@ - can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project) - diff_page_context = local_assigns.fetch(:diff_page_context, nil) - load_diff_files_async = Feature.enabled?(:async_commit_diff_files, @project) && diff_page_context == "is-commit" -- paginate_diffs = local_assigns.fetch(:paginate_diffs, false) && !load_diff_files_async +- paginate_diffs = local_assigns.fetch(:paginate_diffs, false) - paginate_diffs_per_page = local_assigns.fetch(:paginate_diffs_per_page, nil) - page = local_assigns.fetch(:page, nil) - diff_files = conditionally_paginate_diff_files(diffs, paginate: paginate_diffs, page: page, per: paginate_diffs_per_page) @@ -32,7 +32,7 @@ .files{ data: { can_create_note: can_create_note } } - if load_diff_files_async - - url = url_for(safe_params.merge(action: 'diff_files')) + - url = url_for(safe_params.merge(action: 'diff_files', page: page)) .js-diffs-batch{ data: { diff_files_path: url } } = gl_loading_icon(size: "md", css_class: "gl-mt-4") - else diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index e87005434e4..b2270e0faf7 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -7,6 +7,13 @@ = render_if_exists 'shared/ultimate_feature_removal_banner', project: @project +- if Feature.enabled?(:show_pages_in_deployments_menu, current_user, type: :experiment) + = render Pajamas::AlertComponent.new(variant: :info, + title: _('GitLab Pages has moved'), + alert_options: { class: 'gl-my-5', data: { feature_id: Users::CalloutsHelper::PAGES_MOVED_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c| + = c.body do + = _('To go to GitLab Pages, on the left sidebar, select %{pages_link}.').html_safe % {pages_link: link_to('Deployments > Pages', project_pages_path(@project)).html_safe} + %section.settings.general-settings.no-animate.expanded#js-general-settings .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar') @@ -27,7 +34,6 @@ %input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' } %template.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data(@project).to_json.html_safe .js-project-permissions-form{ data: visibility_confirm_modal_data(@project, reduce_visibility_form_id) } - - if show_merge_request_settings_callout?(@project) %section.settings.expanded = render Pajamas::AlertComponent.new(variant: :info, diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 43159a759f4..ca3f49bae95 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -8,6 +8,7 @@ = render "home_panel" = render "archived_notice", project: @project += render "self_monitoring_deprecation_notice", project: @project = render "invite_members_empty_project" if can_admin_project_member?(@project) diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 53b2af88511..4666ee738d7 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -20,7 +20,9 @@ %p = html_escape(_("Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } .text-center - = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "gl-button btn btn-confirm" + = render Pajamas::ButtonComponent.new(variant: :confirm, href: help_page_path("ci/environments/index.md")) do + = s_('Read more') + - else .table-holder.gl-overflow-visible .ci-table.environments{ role: 'grid' } diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml index 53fe30422ca..a6eaeacc61f 100644 --- a/app/views/projects/feature_flags/index.html.haml +++ b/app/views/projects/feature_flags/index.html.haml @@ -6,7 +6,7 @@ "error-state-svg-path" => image_path('illustrations/feature_flag.svg'), "feature-flags-help-page-path" => help_page_path("operations/feature_flags"), "feature-flags-client-libraries-help-page-path" => help_page_path("operations/feature_flags", anchor: "choose-a-client-library"), - "feature-flags-client-example-help-page-path" => help_page_path("operations/feature_flags", anchor: "golang-application-example"), + "feature-flags-client-example-help-page-path" => help_page_path("operations/feature_flags", anchor: "go-application-example"), "feature-flags-limit-exceeded" => @project.actual_limits.exceeded?(:project_feature_flags, @project.operations_feature_flags.count), "feature-flags-limit" => @project.actual_limits.project_feature_flags, "unleash-api-url" => (unleash_api_url(@project) if can?(current_user, :admin_feature_flag, @project)), diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml index 754de2db8f3..9d6f67bd190 100644 --- a/app/views/projects/graphs/show.html.haml +++ b/app/views/projects/graphs/show.html.haml @@ -1,4 +1,4 @@ -- page_title _('Contributors') +- page_title _('Contributor statistics') - graph_path = project_graph_path(@project, current_ref, ref_type: @ref_type, format: :json) - commits_path = project_commits_path(@project, current_ref, ref_type: @ref_type) diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml index c5ce0549816..5e2b2bbfcc4 100644 --- a/app/views/projects/issues/_design_management.html.haml +++ b/app/views/projects/issues/_design_management.html.haml @@ -12,7 +12,8 @@ issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue), register_path: new_user_registration_path(redirect_to_referer: 'yes'), - sign_in_path: new_session_path(:user, redirect_to_referer: 'yes') } } + sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'), + saved_replies_new_path: profile_saved_replies_path } } - else .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center = enable_lfs_message diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index c86f9c79912..8f259fe73e1 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -12,4 +12,5 @@ show_timeline_view_toggle: show_timeline_view_toggle?(@issue).to_s, current_user_data: UserSerializer.new.represent(current_user, {only_path: true}, CurrentUserEntity).to_json, can_add_timeline_events: "#{can?(current_user, :admin_incident_management_timeline_event, @issue)}", - report_abuse_path: add_category_abuse_reports_path } } + report_abuse_path: add_category_abuse_reports_path, + saved_replies_new_path: profile_saved_replies_path } } diff --git a/app/views/projects/issues/_work_item_links.html.haml b/app/views/projects/issues/_work_item_links.html.haml index 3deceacec8d..911260308b4 100644 --- a/app/views/projects/issues/_work_item_links.html.haml +++ b/app/views/projects/issues/_work_item_links.html.haml @@ -1,4 +1,4 @@ -.js-work-item-links-root{ data: { issuable_id: @issue.id, iid: @issue.iid, +.js-work-item-links-root{ data: { issuable_id: @issue.id, project_path: @project.full_path, wi: work_items_index_data(@project), register_path: new_user_registration_path(redirect_to_referer: 'yes'), diff --git a/app/views/projects/issues/service_desk/_nav_btns.html.haml b/app/views/projects/issues/service_desk/_nav_btns.html.haml index 8d16c3d978f..818de77dc89 100644 --- a/app/views/projects/issues/service_desk/_nav_btns.html.haml +++ b/app/views/projects/issues/service_desk/_nav_btns.html.haml @@ -1,7 +1,7 @@ - show_feed_buttons = local_assigns.fetch(:show_feed_buttons, true) - show_import_button = local_assigns.fetch(:show_import_button, true) && can?(current_user, :import_issues, @project) - show_export_button = local_assigns.fetch(:show_export_button, true) -- issuable_type = 'issues' +- issuable_type = 'issue' - can_edit = can?(current_user, :admin_project, @project) - notification_email = @current_user.present? ? @current_user.notification_email_or_default : nil diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index a8edf87b696..7e8bf4ae57f 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -8,4 +8,3 @@ - add_page_specific_style 'page_bundles/work_items' = render 'projects/issuable/show', issuable: @issue, api_awards_path: award_emoji_issue_api_path(@issue) -= render 'projects/invite_members_modal', project: @project diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 9d25603994a..d0bd176028f 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -27,7 +27,8 @@ .detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex - if can_update_merge_request - = link_to _('Edit'), edit_project_merge_request_path(@project, @merge_request), class: "gl-display-none gl-md-display-block btn gl-button btn-default js-issuable-edit", data: { qa_selector: "edit_button" } + = render Pajamas::ButtonComponent.new(href: edit_project_merge_request_path(@project, @merge_request), button_options: {class: "gl-display-none gl-md-display-block js-issuable-edit", data: { qa_selector: "edit_button" }}) do + = _('Edit') - if @merge_request.source_project = render 'projects/merge_requests/code_dropdown' diff --git a/app/views/projects/merge_requests/_nav_btns.html.haml b/app/views/projects/merge_requests/_nav_btns.html.haml index 1efea6a1d37..beb6de4698c 100644 --- a/app/views/projects/merge_requests/_nav_btns.html.haml +++ b/app/views/projects/merge_requests/_nav_btns.html.haml @@ -1,4 +1,4 @@ -- issuable_type = 'merge-requests' +- issuable_type = 'merge_request' - notification_email = @current_user.present? ? @current_user.notification_email_or_default : nil = render 'shared/issuable/feed_buttons', show_calendar_button: false diff --git a/app/views/projects/merge_requests/_page.html.haml b/app/views/projects/merge_requests/_page.html.haml index 880bffc43ab..5bd33cd210d 100644 --- a/app/views/projects/merge_requests/_page.html.haml +++ b/app/views/projects/merge_requests/_page.html.haml @@ -81,7 +81,8 @@ help_page_path: suggest_changes_help_path, current_user_data: @current_user_data, is_locked: @merge_request.discussion_locked.to_s, - report_abuse_path: add_category_abuse_reports_path } } + report_abuse_path: add_category_abuse_reports_path, + saved_replies_new_path: profile_saved_replies_path } } - if moved_mr_sidebar_enabled? = render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees, reviewers: @merge_request.reviewers, source_branch: @merge_request.source_branch @@ -90,7 +91,7 @@ = render "projects/merge_requests/tabs/pane", name: "pipelines", id: "pipelines", class: "pipelines" do - if @project.builds_enabled? = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) - - params = request.query_parameters.merge(diff_head: true) + - params = request.query_parameters.merge(ck: @diffs_batch_cache_key, diff_head: true) = render "projects/merge_requests/tabs/pane", name: "diffs", id: "js-diffs-app", class: "diffs", data: diffs_tab_pane_data(@project, @merge_request, params) .mr-loading-status @@ -105,10 +106,9 @@ - if @merge_request.can_be_cherry_picked? = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit -#js-review-bar +#js-review-bar{ data: { saved_replies_new_path: profile_saved_replies_path } } - if current_user && Feature.enabled?(:mr_experience_survey, current_user) #js-mr-experience-survey{ data: { account_age: current_user.account_age_in_days } } -= render 'projects/invite_members_modal', project: @project = render 'shared/web_ide_path' diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index cdb8a63bca9..91c161e8602 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -1,32 +1,26 @@ -= gitlab_ui_form_for [@project, @milestone], - html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| += gitlab_ui_form_for [@project, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| = form_errors(@milestone) - if @redirect_path.present? = f.hidden_field(:redirect_path, name: :redirect_path, id: :redirect_path, value: @redirect_path) - .form-group.row - .col-form-label.col-sm-2 - = f.label :title, _('Title') - .col-sm-10 - = f.text_field :title, maxlength: 255, class: 'form-control gl-form-input', data: { qa_selector: 'milestone_title_field' }, required: true, autofocus: true + .form-group + = f.label :title, _('Title') + = f.text_field :title, maxlength: 255, class: 'form-control gl-form-input', data: { qa_selector: 'milestone_title_field' }, required: true, autofocus: true = render 'shared/milestones/form_dates', f: f - .form-group.row.milestone-description - .col-form-label.col-sm-2 - = f.label :description, _('Description') - .col-sm-10 - = render layout: 'shared/md_preview', locals: { url: preview_markdown_path(@project) } do - = render 'shared/zen', f: f, attr: :description, - classes: 'note-textarea', - qa_selector: 'milestone_description_field', - supports_autocomplete: true, - placeholder: _('Write milestone description...') - = render 'shared/notes/hints' - .clearfix - .error-alert + .form-group + = f.label :description, _('Description') + = render layout: 'shared/md_preview', locals: { url: preview_markdown_path(@project) } do + = render 'shared/zen', f: f, attr: :description, + classes: 'note-textarea', + qa_selector: 'milestone_description_field', + supports_autocomplete: true, + placeholder: _('Write milestone description...') + = render 'shared/notes/hints' + .clearfix + .error-alert - .form-actions - - if @milestone.new_record? - = f.submit _('Create milestone'), data: { qa_selector: 'create_milestone_button' }, pajamas_button: true - = link_to _('Cancel'), project_milestones_path(@project), class: 'gl-button btn btn-default btn-cancel' - - else - = f.submit _('Save changes'), pajamas_button: true - = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'gl-button btn btn-default btn-cancel' + - if @milestone.new_record? + = f.submit _('Create milestone'), data: { qa_selector: 'create_milestone_button' }, class: 'gl-mr-2', pajamas_button: true + = link_to _('Cancel'), project_milestones_path(@project), class: 'gl-button btn btn-default btn-cancel' + - else + = f.submit _('Save changes'), class: 'gl-mr-2', pajamas_button: true + = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'gl-button btn btn-default btn-cancel' diff --git a/app/views/projects/mirrors/_mirror_repos_list.html.haml b/app/views/projects/mirrors/_mirror_repos_list.html.haml index 46833b5986b..5dbbb72db56 100644 --- a/app/views/projects/mirrors/_mirror_repos_list.html.haml +++ b/app/views/projects/mirrors/_mirror_repos_list.html.haml @@ -3,11 +3,11 @@ .panel.panel-default .table-responsive - if !@project.mirror? && @project.remote_mirrors.count == 0 - .gl-card.gl-mt-5 - .gl-card-header + = render Pajamas::CardComponent.new(card_options: { class: 'gl-mt-5' }) do |c| + - c.header do %strong = _('Mirrored repositories') + ' (0)' - .gl-card-body + - c.body do = _('There are currently no mirrored repositories.') - else %table.table.push-pull-table diff --git a/app/views/projects/ml/candidates/show.html.haml b/app/views/projects/ml/candidates/show.html.haml index 77262243efb..aea74ecfb48 100644 --- a/app/views/projects/ml/candidates/show.html.haml +++ b/app/views/projects/ml/candidates/show.html.haml @@ -2,5 +2,6 @@ - add_to_breadcrumbs _("Experiments"), project_ml_experiments_path(@project) - add_to_breadcrumbs experiment.name, project_ml_experiment_path(@project, experiment.iid) - breadcrumb_title "Candidate #{@candidate.iid}" +- add_page_specific_style 'page_bundles/ml_experiment_tracking' #js-show-ml-candidate{ data: { view_model: show_candidate_view_model(@candidate) } } diff --git a/app/views/projects/ml/experiments/_experiment.html.haml b/app/views/projects/ml/experiments/_experiment.html.haml deleted file mode 100644 index 42823f47469..00000000000 --- a/app/views/projects/ml/experiments/_experiment.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -%li.ml-experiment-row.py-3 - = link_to project_ml_experiment_path(@project, experiment.iid), class: "title" do - = experiment.name diff --git a/app/views/projects/ml/experiments/_experiment_list.html.haml b/app/views/projects/ml/experiments/_experiment_list.html.haml deleted file mode 100644 index a25e814b2b5..00000000000 --- a/app/views/projects/ml/experiments/_experiment_list.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- if experiments.blank? - .nothing-here-block= s_('MlExperimentsEmptyState|No Experiments to Show') -- else - .ml-experiments-list-holder - %ul.content-list - = render partial: 'experiment', collection: experiments, as: :experiment - = paginate_collection @experiments diff --git a/app/views/projects/ml/experiments/_incubation_banner.html.haml b/app/views/projects/ml/experiments/_incubation_banner.html.haml deleted file mode 100644 index e34f3fd2d2f..00000000000 --- a/app/views/projects/ml/experiments/_incubation_banner.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -= render Pajamas::AlertComponent.new(variant: :warning, - title: _('Machine Learning Experiment Tracking is in Incubating Phase'), - alert_options: { class: 'gl-my-3' }) do |c| - = c.body do - = _('GitLab incubates features to explore new use cases. These features are updated regularly, and support is limited') - = link_to _('Learn more.'), 'https://about.gitlab.com/handbook/engineering/incubation/', target: "_blank" - = c.actions do - = link_to _('Feedback and Updates'), 'https://gitlab.com/groups/gitlab-org/-/epics/8560', target: "_blank" diff --git a/app/views/projects/ml/experiments/show.html.haml b/app/views/projects/ml/experiments/show.html.haml index 4433d1fafe9..52145eb0964 100644 --- a/app/views/projects/ml/experiments/show.html.haml +++ b/app/views/projects/ml/experiments/show.html.haml @@ -1,6 +1,8 @@ - add_to_breadcrumbs _("Experiments"), project_ml_experiments_path(@project) - breadcrumb_title @experiment.name - page_title @experiment.name +- add_page_specific_style 'page_bundles/ml_experiment_tracking' + - items = candidates_table_items(@candidates) - metrics = unique_logged_names(@candidates, &:latest_metrics) - params = unique_logged_names(@candidates, &:params) diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 56581fe7b18..f4a5862b2c0 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -4,11 +4,19 @@ - header_title _("Projects"), dashboard_projects_path - add_page_specific_style 'page_bundles/new_namespace' -.project-edit-container.gl-mt-5 +.project-edit-container .project-edit-errors = render 'projects/errors' - .js-new-project-creation{ data: { is_ci_cd_available: (ci_cd_projects_available? if Gitlab.ee?).to_s, has_errors: @project.errors.any?.to_s, new_project_guidelines: brand_new_project_guidelines, push_to_create_project_command: push_to_create_project_command, working_with_projects_help_path: help_page_path("user/project/working_with_projects") } } + .js-new-project-creation{ data: { + is_ci_cd_available: remote_mirror_setting_enabled?.to_s, + has_errors: @project.errors.any?.to_s, + new_project_guidelines: brand_new_project_guidelines, + push_to_create_project_command: push_to_create_project_command, + working_with_projects_help_path: help_page_path("user/project/working_with_projects"), + parent_group_url: @project.parent && group_url(@project.parent), + parent_group_name: @project.parent&.name, + projects_url: dashboard_projects_url } } .row{ 'v-cloak': true } #blank-project-pane.tab-pane.active diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml index 0010564081e..11e105d349d 100644 --- a/app/views/projects/pages/_pages_settings.html.haml +++ b/app/views/projects/pages/_pages_settings.html.haml @@ -17,5 +17,14 @@ %p.gl-pl-6 = s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end } + - if Feature.enabled?(:pages_unique_domain) + .form-group + = f.fields_for :project_setting do |settings| + = settings.gitlab_ui_checkbox_component :pages_unique_domain_enabled, + s_('GitLabPages|Use unique domain'), + label_options: { class: 'label-bold' } + %p.gl-pl-6 + = s_("GitLabPages|When enabled, a unique domain is generated to access pages.").html_safe + .gl-mt-3 - = f.submit s_('GitLabPages|Save changes'), class: 'btn btn-confirm gl-button' + = f.submit s_('GitLabPages|Save changes'), pajamas_button: true diff --git a/app/views/projects/pages_domains/_certificate.html.haml b/app/views/projects/pages_domains/_certificate.html.haml index 4ba3e084dc4..3433958a397 100644 --- a/app/views/projects/pages_domains/_certificate.html.haml +++ b/app/views/projects/pages_domains/_certificate.html.haml @@ -30,10 +30,10 @@ - if has_user_defined_certificate .row .col-sm-10.offset-sm-2 - .card - .card-header - = _('Certificate') - .d-flex.justify-content-between.align-items-center.p-3 + = render Pajamas::CardComponent.new(body_options: { class: 'gl-display-flex gl-align-items-center gl-justify-content-space-between gl-p-5' }) do |c| + - c.header do + = s_('Certificate') + - c.body do %span = domain_presenter.pages_domain.subject || _('missing') = link_to _('Remove'), diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 0de31f59033..37b2b3ecfde 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -37,7 +37,7 @@ - if can?(current_user, :play_pipeline_schedule, pipeline_schedule) = link_to play_pipeline_schedule_path(pipeline_schedule), method: :post, title: _('Play'), class: 'btn gl-button btn-default btn-icon' do = sprite_icon('play') - - if can?(current_user, :take_ownership_pipeline_schedule, pipeline_schedule) + - if can?(current_user, :admin_pipeline_schedule, pipeline_schedule) && pipeline_schedule.owner != current_user = render Pajamas::ButtonComponent.new(button_options: { class: 'js-take-ownership-button has-tooltip', title: s_('PipelineSchedule|Take ownership to edit'), data: { url: take_ownership_pipeline_schedule_path(pipeline_schedule) } }) do = s_('PipelineSchedules|Take ownership') - if can?(current_user, :update_pipeline_schedule, pipeline_schedule) diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 8f7f0a15e69..7a889570f56 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -11,17 +11,20 @@ = preserve(markdown(commit.description, pipeline: :single_line)) .info-well - .well-segment.pipeline-info{ class: "gl-align-items-baseline!" } - .icon-container - = sprite_icon('clock', css_class: 'gl-top-0!') - - jobs = n_('%d job', '%d jobs', @pipeline.total_size) % @pipeline.total_size - - if @pipeline.duration - = s_('Pipelines|%{jobs} %{ref_text} in %{duration}').html_safe % { jobs: jobs, ref_text: @pipeline.ref_text, duration: time_interval_in_words(@pipeline.duration) } - - else - = jobs + .well-segment.pipeline-info{ class: "gl-align-items-baseline! gl-flex-direction-column" } + %div + .icon-container + = sprite_icon('clock', css_class: 'gl-top-0!') + = n_('%d job', '%d jobs', @pipeline.total_size) % @pipeline.total_size = @pipeline.ref_text - - if @pipeline.queued_duration - = s_("Pipelines|(queued for %{queued_duration})") % { queued_duration: time_interval_in_words(@pipeline.queued_duration)} + - if @pipeline.finished_at + - duration = time_interval_in_words(@pipeline.duration) + - queued_duration = time_interval_in_words(@pipeline.queued_duration) + %span.gl-pl-7{ 'data-testid': 'pipeline-stats-text' } + - if Feature.enabled?(:refactor_ci_minutes_consumption, @project) + = render_if_exists 'projects/pipelines/pipeline_stats_text', duration: duration, pipeline: @pipeline, queued_duration: queued_duration + - else + = s_("in %{duration} and was queued for %{queued_duration}").html_safe % { duration: duration, queued_duration: queued_duration } - if has_pipeline_badges?(@pipeline) .well-segment diff --git a/app/views/projects/pipelines/_pipeline_stats_text.html.haml b/app/views/projects/pipelines/_pipeline_stats_text.html.haml new file mode 100644 index 00000000000..8adf94e61c4 --- /dev/null +++ b/app/views/projects/pipelines/_pipeline_stats_text.html.haml @@ -0,0 +1 @@ += s_("in %{duration} and was queued for %{queued_duration}").html_safe % { duration: duration, queued_duration: queued_duration } diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index d2b2a58fcf8..ee51ee9b0e2 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -9,6 +9,8 @@ pipelines_path: project_pipelines_path(@project), config_variables_path: config_variables_namespace_project_pipelines_path(@project.namespace, @project), default_branch: @project.default_branch, + pipelines_editor_path: project_ci_pipeline_editor_path(@project), + can_view_pipeline_editor: can_view_pipeline_editor?(@project), ref_param: params[:ref] || @project.default_branch, var_param: params[:var].to_json, file_param: params[:file_var].to_json, diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index 9b0a81a2f60..15d729c89b9 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -17,11 +17,17 @@ = render "projects/pipelines/info", commit: @pipeline.commit - if pipeline_has_errors - .bs-callout.bs-callout-danger - %h4= _('Unable to create pipeline') - %ul - - @pipeline.yaml_errors.split("\n").each do |error| - %li= error + = render Pajamas::AlertComponent.new(title: s_('Pipelines|Unable to create pipeline'), + variant: :danger, + dismissible: false, + alert_options: { class: 'gl-mb-5' }) do |c| + = c.body do + %ul + - @pipeline.yaml_errors.split("\n").each do |error| + %li= error + - if can_view_pipeline_editor?(@project) + = render Pajamas::ButtonComponent.new(href: project_ci_pipeline_editor_path(@project), variant: :confirm) do + = s_("Pipelines|Go to the pipeline editor") - else #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline, @current_user) } diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 4ac0e28d386..0cfb5ff6a3d 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -3,6 +3,10 @@ = render_if_exists 'shared/ultimate_feature_removal_banner', project: @project += content_for :page_level_alert do + - if can_invite_members_for_project?(@project) + = render_if_exists 'shared/unlimited_members_during_trial_alert', group: @project.root_ancestor + .row.gl-mt-3 .col-lg-12 .gl-display-flex.gl-flex-wrap @@ -25,7 +29,6 @@ classes: 'gl-md-w-auto gl-w-full gl-md-ml-3 gl-md-mt-0 gl-mt-3', trigger_source: 'project-members-page', display_text: _('Invite members') } } - = render 'projects/invite_members_modal', project: @project, reload_page_on_submit: true - else - if project_can_be_shared? %h4 diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml index d19a6401fc8..ef3974b04b5 100644 --- a/app/views/projects/protected_tags/_create_protected_tag.html.haml +++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml @@ -1,9 +1,9 @@ - content_for :create_access_levels do .create_access_levels-container = dropdown_tag('Select', - options: { toggle_class: 'js-allowed-to-create wide', + options: { toggle_class: 'js-allowed-to-create js-multiselect wide', dropdown_class: 'dropdown-menu-selectable capitalize-header', - dropdown_qa_selector: 'access_levels_content', + dropdown_qa_selector: 'access_levels_content', dropdown_testid: 'allowed-to-create-dropdown', data: { field_name: 'protected_tag[create_access_levels_attributes][0][access_level]', input_id: 'create_access_levels_attributes', qa_selector: 'access_levels_dropdown' }}) = render 'projects/protected_tags/shared/create_protected_tag' diff --git a/app/views/projects/protected_tags/_protected_tag.html.haml b/app/views/projects/protected_tags/_protected_tag.html.haml index e0912bf39c0..68e4a5e97a3 100644 --- a/app/views/projects/protected_tags/_protected_tag.html.haml +++ b/app/views/projects/protected_tags/_protected_tag.html.haml @@ -1,4 +1,4 @@ = render layout: 'projects/protected_tags/shared/protected_tag', locals: { protected_tag: protected_tag } do - %td - = render 'projects/protected_tags/protected_tag_create_access_levels', protected_tag: protected_tag, create_access_level: protected_tag.create_access_levels.for_role.first + %td.create_access_levels-container + = render 'projects/protected_tags/protected_tag_create_access_levels', protected_tag: protected_tag, create_access_level: protected_tag.create_access_levels.for_role = render_if_exists 'projects/protected_tags/protected_tag_extra_create_access_levels', protected_tag: protected_tag diff --git a/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml b/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml index 1d4e9565156..30b9e3e9005 100644 --- a/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml +++ b/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml @@ -1,8 +1,8 @@ - protected_tag = local_assigns.fetch(:protected_tag) - create_access_level = local_assigns.fetch(:create_access_level) -- dropdown_label = create_access_level&.humanize || 'Select' +- dropdown_label = create_access_level.first&.humanize || 'Select' -= hidden_field_tag "allowed_to_create_#{protected_tag.id}", create_access_level&.access_level += hidden_field_tag "allowed_to_create_#{protected_tag.id}", create_access_level.first&.access_level = dropdown_tag(dropdown_label, - options: { toggle_class: 'js-allowed-to-create', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container', - data: { field_name: "allowed_to_create_#{protected_tag.id}", access_level_id: create_access_level&.id }}) + options: { toggle_class: 'js-allowed-to-create js-multiselect', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container', + data: { field_name: "allowed_to_create_#{protected_tag.id}", preselected_items: access_levels_data(create_access_level) }}) diff --git a/app/views/projects/security/configuration/show.html.haml b/app/views/projects/security/configuration/show.html.haml index 4b82f74d035..2904fb81afe 100644 --- a/app/views/projects/security/configuration/show.html.haml +++ b/app/views/projects/security/configuration/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title _("Security Configuration") -- page_title _("Security Configuration") +- breadcrumb_title _("Security configuration") +- page_title _("Security configuration") - @content_class = "limit-container-width" unless fluid_layout #js-security-configuration{ data: { **@configuration.to_html_data_attribute, diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml index 5f1dee39e25..847f9ad3e2a 100644 --- a/app/views/projects/settings/_general.html.haml +++ b/app/views/projects/settings/_general.html.haml @@ -16,7 +16,6 @@ .row .form-group.col-md-9 - = f.label :topics, _('Topics'), class: 'label-bold' .js-topics-selector{ data: { hidden_input_id: hidden_topics_field_id } } = f.hidden_field :topics, value: @project.topic_list.join(', '), id: hidden_topics_field_id @@ -31,8 +30,7 @@ = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project .form-group.gl-mt-3.gl-mb-3 - .avatar-container.rect-avatar.s90 - = project_icon(@project, alt: _('Project avatar'), class: 'avatar project-avatar s90') + = render Pajamas::AvatarComponent.new(@project, size: 96, alt: '', class: 'gl-float-left gl-mr-5') = f.label :avatar, _('Project avatar'), class: 'label-bold d-block' = render 'shared/choose_avatar_button', f: f - if @project.avatar? diff --git a/app/views/projects/settings/branch_rules/index.html.haml b/app/views/projects/settings/branch_rules/index.html.haml index 80a41bb579b..f05a528745c 100644 --- a/app/views/projects/settings/branch_rules/index.html.haml +++ b/app/views/projects/settings/branch_rules/index.html.haml @@ -3,4 +3,4 @@ %h3.gl-mb-5= s_('BranchRules|Branch rules details') -#js-branch-rules{ data: { project_path: @project.full_path, protected_branches_path: project_settings_repository_path(@project, anchor: 'js-protected-branches-settings'), approval_rules_path: project_settings_merge_requests_path(@project, anchor: 'js-merge-request-approval-settings'), status_checks_path: project_settings_merge_requests_path(@project, anchor: 'js-merge-request-settings'), branches_path: project_branches_path(@project) } } +#js-branch-rules{ data: branch_rules_data(@project) } diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index 86238a41f0b..5afbace3f26 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -20,15 +20,15 @@ %fieldset.builds-feature.js-auto-devops-settings .form-group = f.fields_for :auto_devops_attributes, @auto_devops do |form| - .card.gl-mb-3 - .card-body + = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-3' }, footer_options: { class: auto_devops_enabled || 'hidden' }) do |c| + - c.body do - autodevops_help_link = link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer' - auto_devops_badge = auto_devops_enabled ? (gl_badge_tag badge_for_auto_devops_scope(@project), { variant: :info }, { class: 'js-instance-default-badge gl-ml-3 gl-mt-n1'}) : '' = form.gitlab_ui_checkbox_component :enabled, (s_('CICD|Default to Auto DevOps pipeline') + auto_devops_badge).html_safe, checkbox_options: { class: 'js-toggle-extra-settings', checked: auto_devops_enabled, data: { qa_selector: 'enable_autodevops_checkbox' } }, help_text: (s_('CICD|The Auto DevOps pipeline runs if no alternative CI configuration file is found.') + ' ' + autodevops_help_link).html_safe - .card-footer.js-extra-settings{ class: auto_devops_enabled || 'hidden' } + - c.footer do - if @project.all_clusters.empty? %p.settings-message.text-center = s_('CICD|Add a %{kubernetes_cluster_link_start}Kubernetes cluster integration%{link_end} with a domain, or create an AUTO_DEVOPS_PLATFORM_TARGET CI variable.').html_safe % { kubernetes_cluster_link_start: kubernetes_cluster_link_start, link_end: link_end } diff --git a/app/views/projects/settings/ci_cd/_badge.html.haml b/app/views/projects/settings/ci_cd/_badge.html.haml index 99eef38827b..76a7b42e0e5 100644 --- a/app/views/projects/settings/ci_cd/_badge.html.haml +++ b/app/views/projects/settings/ci_cd/_badge.html.haml @@ -9,7 +9,7 @@ = badge.title.capitalize · = badge.to_html - = render 'shared/ref_switcher', destination: 'badges', align_right: true + .js-ref-switcher-badge{ id: "js-project-ci-cd-ref-switcher-#{badge.title.parameterize(separator: '-') }", data: { project_id: @project.id, ref: @ref } } - c.body do .row .col-md-2.gl-text-center diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 68dc7f2be8d..6f64d3f3f76 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -18,7 +18,7 @@ _("Auto-cancel redundant pipelines"), checked_value: 'enabled', unchecked_value: 'disabled', - help_text: (_('New pipelines cause older pending or running pipelines on the same branch to be cancelled.') + ' ' + help_link_auto_canceling).html_safe + help_text: (_('Pipelines for new changes cause older pending or running pipelines on the same branch to be cancelled.') + ' ' + help_link_auto_canceling).html_safe .form-group = f.fields_for :ci_cd_settings_attributes, @project.ci_cd_settings do |form| diff --git a/app/views/projects/settings/integrations/_form.html.haml b/app/views/projects/settings/integrations/_form.html.haml index 9d74f99bb19..97d90976f18 100644 --- a/app/views/projects/settings/integrations/_form.html.haml +++ b/app/views/projects/settings/integrations/_form.html.haml @@ -11,6 +11,9 @@ = c.body do = s_('ExternalIssueIntegration|Only one issue tracker integration can be active at a time. Please disable the active tracker first and try again.') +- if integration.to_param === 'slack' + = render 'shared/integrations/slack_notifications_deprecation_alert' + %h2.gl-mb-4 = integration.title - if integration.operating? diff --git a/app/views/projects/settings/integrations/index.html.haml b/app/views/projects/settings/integrations/index.html.haml index 2077d244b24..c316b4e9cac 100644 --- a/app/views/projects/settings/integrations/index.html.haml +++ b/app/views/projects/settings/integrations/index.html.haml @@ -2,6 +2,8 @@ - breadcrumb_title _('Integration Settings') - page_title _('Integrations') += render 'shared/integrations/slack_notifications_deprecation_alert' + %section.js-search-settings-section %h3= _('Integrations') - integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/index') } diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 5fa70c3af32..f47f4ebc7ee 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -9,6 +9,8 @@ = render_if_exists 'shared/ultimate_feature_removal_banner', project: @project = render partial: 'flash_messages', locals: { project: @project } += render "self_monitoring_deprecation_notice", project: @project + = render 'clusters_deprecation_alert' = render "projects/last_push" diff --git a/app/views/projects/starrers/_starrer.html.haml b/app/views/projects/starrers/_starrer.html.haml index c1cd2488142..d9fda2a6e36 100644 --- a/app/views/projects/starrers/_starrer.html.haml +++ b/app/views/projects/starrers/_starrer.html.haml @@ -1,8 +1,8 @@ - starrer = local_assigns.fetch(:starrer) .col-lg-3.col-md-4.col-sm-12 - .card - .card-body.gl-display-flex + = render Pajamas::CardComponent.new(body_options: { class: 'gl-display-flex' }) do |c| + - c.body do = render Pajamas::AvatarComponent.new(starrer.user, size: 48, alt: "", class: 'gl-mr-3') .user-info diff --git a/app/views/projects/work_items/index.html.haml b/app/views/projects/work_items/index.html.haml index 69597aab7ef..dad8bb09ff6 100644 --- a/app/views/projects/work_items/index.html.haml +++ b/app/views/projects/work_items/index.html.haml @@ -4,4 +4,3 @@ - @noteable_type = 'WorkItem' #js-work-items{ data: work_items_index_data(@project) } -= render 'projects/invite_members_modal', project: @project diff --git a/app/views/registrations/welcome/show.html.haml b/app/views/registrations/welcome/show.html.haml index f4e9a597fe2..2796f0c0a7e 100644 --- a/app/views/registrations/welcome/show.html.haml +++ b/app/views/registrations/welcome/show.html.haml @@ -38,4 +38,5 @@ - if partial_exists? "registrations/welcome/button" = render "registrations/welcome/button" - else - = f.submit _('Get started!'), class: 'btn-confirm gl-button btn btn-block gl-mb-0 gl-p-3', data: { qa_selector: 'get_started_button' } + = render Pajamas::ButtonComponent.new(block: true, type: :submit, variant: :confirm, button_options: { class: 'gl-mb-0', data: { qa_selector: 'get_started_button' }}) do + = _('Get started!') diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index fee943042f9..3280dcf2cd4 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -5,5 +5,5 @@ .results.gl-md-display-flex.gl-mt-0 #js-search-sidebar{ class: search_bar_classes, data: { navigation_json: search_navigation_json } } .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden - = render partial: 'search/results_status' unless @search_objects.to_a.empty? + = render partial: 'search/results_status' if @search_objects.present? = render partial: 'search/results_list' diff --git a/app/views/search/_results_list.html.haml b/app/views/search/_results_list.html.haml index 7a57b5cc0fc..c36acaf9ea8 100644 --- a/app/views/search/_results_list.html.haml +++ b/app/views/search/_results_list.html.haml @@ -2,19 +2,20 @@ = render partial: "search/results/timeout" - elsif @search_results.respond_to?(:failed?) && @search_results.failed? = render partial: "search/results/error" -- elsif @search_objects.to_a.empty? +- elsif @search_objects.blank? = render partial: "search/results/empty" - else - - if @scope == 'commits' - %ul.content-list.commit-list - = render partial: "search/results/commit", collection: @search_objects - - else - .search-results.js-search-results - - if @scope == 'projects' - .term - = render 'shared/projects/list', projects: @search_objects, pipeline_status: false - - else - = render_if_exists partial: "search/results/#{@scope.singularize}", collection: @search_objects + .gl-md-pl-5 + - if @scope == 'commits' + %ul.content-list.commit-list + = render partial: "search/results/commit", collection: @search_objects + - else + .search-results.js-search-results + - if @scope == 'projects' + .term + = render 'shared/projects/list', projects: @search_objects, pipeline_status: false + - else + = render_if_exists partial: "search/results/#{@scope.singularize}", collection: @search_objects - - if @scope != 'projects' - = paginate_collection(@search_objects) + - if @scope != 'projects' + = paginate_collection(@search_objects) diff --git a/app/views/search/_results_status.html.haml b/app/views/search/_results_status.html.haml index 27405631360..4ab68caaf22 100644 --- a/app/views/search/_results_status.html.haml +++ b/app/views/search/_results_status.html.haml @@ -1,25 +1,26 @@ - return unless @search_service_presenter.show_results_status? - -.search-results-status - .gl-display-flex.gl-flex-direction-column - .gl-p-5.gl-display-flex - .gl-md-display-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1.gl-white-space-nowrap.gl-max-w-full - - unless @search_service_presenter.without_count? - = search_entries_info(@search_objects, @scope, @search_term) - - unless @search_service_presenter.show_snippets? - - if @project - - link_to_project = link_to(@project.full_name, @project, class: 'ml-md-1 gl-text-truncate search-wrap-f-md-down') - - if @scope == 'blobs' - = _("in") - .mx-md-1 - #js-blob-ref-switcher{ data: { "project-id" => @project.id, "ref" => repository_ref(@project), "field-name": "repository_ref" } } - = s_('SearchCodeResults|of %{link_to_project}').html_safe % { link_to_project: link_to_project } - - else - = _("in project %{link_to_project}").html_safe % { link_to_project: link_to_project } - - elsif @group - - link_to_group = link_to(@group.name, @group, class: 'ml-md-1') - = _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group } - - if @search_service_presenter.show_sort_dropdown? - .gl-md-display-flex.gl-flex-direction-column - #js-search-sort{ data: { "search-sort-options" => search_sort_options.to_json } } - %hr.gl-mb-5.gl-mt-0.gl-border-gray-100.gl-w-full +.gl-md-pl-5 + .search-results-status + .gl-display-flex.gl-flex-direction-column + .gl-p-5.gl-display-flex + .gl-md-display-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1.gl-white-space-nowrap.gl-max-w-full + - unless @search_service_presenter.without_count? + .gl-text-truncate + = search_entries_info(@search_objects, @scope, @search_term) + - unless @search_service_presenter.show_snippets? + - if @project + - link_to_project = link_to(@project.full_name, @project, class: 'ml-md-1 gl-text-truncate search-wrap-f-md-down') + - if @scope == 'blobs' + = _("in") + .mx-md-1 + #js-blob-ref-switcher{ data: { "project-id" => @project.id, "ref" => repository_ref(@project), "field-name": "repository_ref" } } + = s_('SearchCodeResults|of %{link_to_project}').html_safe % { link_to_project: link_to_project } + - else + = _("in project %{link_to_project}").html_safe % { link_to_project: link_to_project } + - elsif @group + - link_to_group = link_to(@group.name, @group, class: 'ml-md-1') + = _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group } + - if @search_service_presenter.show_sort_dropdown? + .gl-md-display-flex.gl-flex-direction-column + #js-search-sort{ data: { "search-sort-options" => search_sort_options.to_json } } + %hr.gl-mb-5.gl-mt-0.gl-border-gray-100.gl-w-full diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml index 3681f823ef5..115bb6cc9fa 100644 --- a/app/views/search/results/_blob.html.haml +++ b/app/views/search/results/_blob.html.haml @@ -1,6 +1,8 @@ - project = blob.project - return unless project -- blob_link = project_blob_path(project, tree_join(repository_ref(project), blob.path)) -- blame_link = project_blame_path(project, tree_join(repository_ref(project), blob.path)) +- project_repository_ref = repository_ref(project) || '' +- blob_path = blob.path || '' +- blob_link = project_blob_path(project, tree_join(project_repository_ref, blob_path)) +- blame_link = project_blame_path(project, tree_join(project_repository_ref, blob_path)) -= render partial: 'search/results/blob_data', locals: { blob: blob, project: project, path: blob.path, blob_link: blob_link, blame_link: blame_link } += render partial: 'search/results/blob_data', locals: { blob: blob, project: project, path: blob_path, blob_link: blob_link, blame_link: blame_link } diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml index 04103794e60..826d78c470d 100644 --- a/app/views/search/show.html.haml +++ b/app/views/search/show.html.haml @@ -1,6 +1,6 @@ - @hide_top_links = true +- breadcrumb_title _('Search') - page_title @search_term -- @hide_breadcrumbs = true - if params[:group_id].present? = hidden_field_tag :group_id, params[:group_id] - if params[:project_id].present? @@ -19,7 +19,6 @@ %h1.page-title.gl-font-size-h-display.gl-mr-5= _('Search') = render_if_exists 'search/form_elasticsearch', attrs: { class: 'mb-2 mb-sm-0 align-self-center' } -.gl-mt-3 - #js-search-topbar{ data: { "group-initial-json": group_attributes.to_json, "project-initial-json": project_attributes.to_json, "elasticsearch-enabled": @search_service_presenter.advanced_search_enabled?.to_s, "default-branch-name": @project&.default_branch } } +#js-search-topbar{ data: { "group-initial-json": group_attributes.to_json, "project-initial-json": project_attributes.to_json, "elasticsearch-enabled": @search_service_presenter.advanced_search_enabled?.to_s, "default-branch-name": @project&.default_branch } } - if @search_term = render 'search/results' diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 8a626f1620b..547f12ac8fc 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -31,14 +31,13 @@ %ul - if label.project_label? && label.project.group && can?(current_user, :admin_label, label.project.group) %li - = render Pajamas::ButtonComponent.new(category: :tertiary, + = render Pajamas::ButtonComponent.new(category: :tertiary, variant: :link, button_options: { class: 'js-promote-project-label-button', data: { url: promote_project_label_path(label.project, label), label_title: label.title, label_color: label.color, label_text_color: label.text_color, group_name: label.project.group.name } }) do = _('Promote to group label') %li - %span - = render Pajamas::ButtonComponent.new(category: :tertiary, - button_options: { class: 'text-danger js-delete-label-modal-button', data: { label_name: label.name, subject_name: label.subject_name, destroy_path: label.destroy_path } }) do - = _('Delete') + = render Pajamas::ButtonComponent.new(category: :tertiary, variant: :link, + button_options: { class: 'text-danger js-delete-label-modal-button', data: { label_name: label.name, subject_name: label.subject_name, destroy_path: label.destroy_path } }) do + = _('Delete') - if current_user %li.gl-display-inline-block.label-subscription.js-label-subscription.gl-ml-3 - if label.can_subscribe_to_label_in_different_levels? diff --git a/app/views/shared/_mobile_clone_panel.html.haml b/app/views/shared/_mobile_clone_panel.html.haml index 8b7ef838d2b..aa3043b8fd6 100644 --- a/app/views/shared/_mobile_clone_panel.html.haml +++ b/app/views/shared/_mobile_clone_panel.html.haml @@ -9,8 +9,8 @@ %ul.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown{ data: { dropdown: true } } - if ssh_enabled? %li - = dropdown_item_with_description(ssh_copy_label, project.ssh_url_to_repo, href: project.ssh_url_to_repo, data: { clone_type: 'ssh' }, default: true) + = dropdown_item_with_description(ssh_copy_label, ssh_clone_url_to_repo(project), href: ssh_clone_url_to_repo(project), data: { clone_type: 'ssh' }, default: true) - if http_enabled? %li - = dropdown_item_with_description(http_copy_label, project.http_url_to_repo, href: project.http_url_to_repo, data: { clone_type: 'http' }) + = dropdown_item_with_description(http_copy_label, http_clone_url_to_repo(project), href: http_clone_url_to_repo(project), data: { clone_type: 'http' }) = render_if_exists 'shared/mobile_kerberos_clone' diff --git a/app/views/shared/doorkeeper/applications/_show.html.haml b/app/views/shared/doorkeeper/applications/_show.html.haml index 5b0cff2c1c0..19f4c971c1d 100644 --- a/app/views/shared/doorkeeper/applications/_show.html.haml +++ b/app/views/shared/doorkeeper/applications/_show.html.haml @@ -15,14 +15,17 @@ %td = _('Secret') %td - - if Feature.enabled?('hash_oauth_secrets') - - if @application.plaintext_secret - = clipboard_button(clipboard_text: @application.plaintext_secret, button_text: _('Copy'), title: _("Copy secret"), class: "btn btn-default btn-md gl-button") - %span= _('This is the only time the secret is accessible. Copy the secret and store it securely.') - - else - = _('The secret is only available when you first create the application.') + - if @application.plaintext_secret + = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'gl-mb-5'}) do |c| + = c.body do + = _('This is the only time the secret is accessible. Copy the secret and store it securely.') + = clipboard_button(clipboard_text: @application.plaintext_secret, button_text: _('Copy'), title: _("Copy secret"), class: "btn btn-default btn-md gl-button") - else - = clipboard_button(clipboard_text: @application.secret, button_text: _('Copy'), title: _("Copy secret"), class: "btn btn-default btn-md gl-button") + = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_options: { class: 'gl-mb-5'}) do |c| + = c.body do + = _('The secret is only available when you create the application or renew the secret.') + = render 'shared/doorkeeper/applications/update_form', path: renew_path + %tr %td = _('Callback URL') diff --git a/app/views/shared/doorkeeper/applications/_update_form.html.haml b/app/views/shared/doorkeeper/applications/_update_form.html.haml new file mode 100644 index 00000000000..1bee3288639 --- /dev/null +++ b/app/views/shared/doorkeeper/applications/_update_form.html.haml @@ -0,0 +1,3 @@ +- path = local_assigns.fetch(:path) += form_for(@application, url: path, html: {class: 'gl-display-inline-block', method: "put"}) do |f| + = submit_tag s_('AuthorizedApplication|Renew secret'), data: { confirm: s_("AuthorizedApplication|Are you sure you want to renew this secret? Any applications using the old secret will no longer be able to authenticate with GitLab."), confirm_btn_variant: "danger" }, aria: { label: s_('AuthorizedApplication|Renew secret') }, class: 'gl-button btn btn-md btn-default' diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml index 37f7fbc0de5..ad6e5578878 100644 --- a/app/views/shared/empty_states/_issues.html.haml +++ b/app/views/shared/empty_states/_issues.html.haml @@ -4,7 +4,6 @@ - opened_issues_count = issuables_count_for_state(:issues, :opened) - is_opened_state = params[:state] == 'opened' - is_closed_state = params[:state] == 'closed' -- issuable_type = 'issues' - can_edit = can?(current_user, :admin_project, @project) .row.empty-state @@ -43,7 +42,7 @@ = link_to _('New issue'), button_path, class: 'gl-button btn btn-confirm', id: 'new_issue_link' - if show_import_button - .js-csv-import-export-buttons{ data: { show_import_button: 'true', issuable_type: issuable_type, import_csv_issues_path: import_csv_namespace_project_issues_path, can_edit: can_edit.to_s, project_import_jira_path: project_import_jira_path(@project), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), container_class: 'gl-w-full gl-sm-w-auto gl-sm-mr-3 gl-display-inline-flex gl-vertical-align-middle', show_label: 'true' } } + .js-csv-import-export-buttons{ data: { show_import_button: 'true', issuable_type: 'issue', import_csv_issues_path: import_csv_namespace_project_issues_path, can_edit: can_edit.to_s, project_import_jira_path: project_import_jira_path(@project), max_attachment_size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes), container_class: 'gl-w-full gl-sm-w-auto gl-sm-mr-3 gl-display-inline-flex gl-vertical-align-middle', show_label: 'true' } } %hr %p.gl-text-center.gl-mb-0 %strong diff --git a/app/views/shared/icons/_mr_widget_empty_state.svg b/app/views/shared/icons/_mr_widget_empty_state.svg deleted file mode 100644 index a75eee846c9..00000000000 --- a/app/views/shared/icons/_mr_widget_empty_state.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="256" height="146" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><mask id="d" x="0" y="0" width="178.7" height="115.4" fill="#FFF"><use xlink:href="#a"/></mask><mask id="e" x="0" y="0" width="43.1" height="36.4" fill="#FFF"><use xlink:href="#b"/></mask><mask id="f" x="0" y="0" width="43.1" height="36.4" fill="#FFF"><use xlink:href="#c"/></mask><path d="M8.8 31.5H33a10 10 0 0 0 10-10V10A10 10 0 0 0 33 0H10A10 10 0 0 0 0 10v11.6c0 1.2.2 2.4.7 3.5H0v7.5c0 4 2.4 5 5.3 2.2l3.5-3.3z" id="b"/><path d="M8.8 31.5H33a10 10 0 0 0 10-10V10A10 10 0 0 0 33 0H10A10 10 0 0 0 0 10v11.6c0 1.2.2 2.4.7 3.5H0v7.5c0 4 2.4 5 5.3 2.2l3.5-3.3z" id="c"/><rect id="a" width="178.7" height="115.4" rx="10"/></defs><g fill="none" fill-rule="evenodd"><g transform="translate(0 3.9)" fill="var(--gray-10, #f9f9f9)"><rect x="19.3" width="77.1" height="14.2" rx="7.1"/><rect y="28.4" width="84.9" height="14.2" rx="7.1"/><rect x="133.7" y="42.5" width="122.1" height="14.2" rx="7.1"/><rect x="82.9" y="127" width="101.6" height="14.2" rx="7.1"/><rect x="42.4" y="99.3" width="101.6" height="14.2" rx="7.1"/><rect x="19.9" y="70.9" width="225" height="14.2" rx="7.1"/><path d="M98.4 14.2h-85 13.9a7.1 7.1 0 0 1 7 7 7 7 0 0 1-7 7.2H13.5h84.9-23.5a7.1 7.1 0 0 1-7-7.1 7 7 0 0 1 7-7.1h23.5zm162 42.5H185h23.5a7.1 7.1 0 0 1 7 7.1 7 7 0 0 1-7 7.1H185h75.3-23.5a7.1 7.1 0 0 1-7-7 7 7 0 0 1 7-7.2h23.5zM103.5 85.1H28.3h23.4a7.1 7.1 0 0 1 7.1 7 7 7 0 0 1-7 7.2H28.2h75.2H80a7.1 7.1 0 0 1-7.1-7.1 7 7 0 0 1 7-7.1h23.5zm48.2 28.4H76.5h13.8a7.1 7.1 0 0 1 7 7 7 7 0 0 1-7 7.1H76.5h75.2-33a7.1 7.1 0 0 1-7.2-7 7 7 0 0 1 7.1-7.1h33.1z"/></g><g transform="translate(38.6 12.2)"><use stroke="var(--gray-200, #EEE)" mask="url(#d)" stroke-width="8" fill="var(--white, #fff)" xlink:href="#a"/><path fill="var(--gray-200, #EEE)" d="M2.6 18.7h174.2v2.6H2.6z"/><g fill="var(--gray-100, #EEE)"><g transform="translate(21.9 38.7)"><g fill="var(--dark-icon-color-purple-2, #B5A7DD)"><rect y=".6" width="3.9" height="1.3" rx=".6"/><rect y="7.7" width="3.9" height="1.3" rx=".6"/><rect y="14.8" width="3.9" height="1.3" rx=".6"/></g><rect x="9.6" width="9.6" height="2.6" rx="1.3"/><rect x="46.3" width="9.6" height="2.6" rx="1.3"/><rect x="25.1" y="14.2" width="9.6" height="2.6" rx="1.3"/><rect fill="#FC6D26" x="34.1" y="7.1" width="9.6" height="2.6" rx="1.3"/><rect fill="#FC6D26" opacity=".5" x="30.9" width="12.9" height="2.6" rx="1.3"/><rect x="9.6" y="14.2" width="12.9" height="2.6" rx="1.3"/><rect x="18.6" y="7.1" width="12.9" height="2.6" rx="1.3"/><rect fill="#FC6D26" x="21.9" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="7.1" width="6.4" height="2.6" rx="1.3"/></g><g transform="translate(21.9 60)"><g fill="var(--dark-icon-color-purple-2, #B5A7DD)"><rect y=".6" width="3.9" height="1.3" rx=".6"/><rect y="7.7" width="3.9" height="1.3" rx=".6"/><rect y="14.8" width="3.9" height="1.3" rx=".6"/></g><rect fill="#FC6D26" x="9.6" width="9.6" height="2.6" rx="1.3"/><rect x="46.3" width="9.6" height="2.6" rx="1.3"/><rect fill="#FC6D26" opacity=".5" x="25.1" y="14.2" width="9.6" height="2.6" rx="1.3"/><rect x="34.1" y="7.1" width="9.6" height="2.6" rx="1.3"/><rect fill="#FC6D26" x="30.9" width="12.9" height="2.6" rx="1.3"/><rect fill="#FC6D26" x="9.6" y="14.2" width="12.9" height="2.6" rx="1.3"/><rect x="18.6" y="7.1" width="12.9" height="2.6" rx="1.3"/><rect fill="#FC6D26" opacity=".5" x="21.9" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="7.1" width="6.4" height="2.6" rx="1.3"/></g><g transform="translate(21.9 81.2)"><g fill="var(--dark-icon-color-purple-2, #B5A7DD)"><rect y=".6" width="3.9" height="1.3" rx=".6"/><rect y="7.7" width="3.9" height="1.3" rx=".6"/><rect y="14.8" width="3.9" height="1.3" rx=".6"/></g><rect x="9.6" width="9.6" height="2.6" rx="1.3"/><rect x="46.3" width="9.6" height="2.6" rx="1.3"/><rect x="25.1" y="14.2" width="9.6" height="2.6" rx="1.3"/><rect x="34.1" y="7.1" width="9.6" height="2.6" rx="1.3"/><rect fill="#FC6D26" x="30.9" width="12.9" height="2.6" rx="1.3"/><rect x="9.6" y="14.2" width="12.9" height="2.6" rx="1.3"/><rect x="18.6" y="7.1" width="12.9" height="2.6" rx="1.3"/><rect fill="#FC6D26" opacity=".5" x="21.9" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="7.1" width="6.4" height="2.6" rx="1.3"/></g><g transform="translate(101 38)"><g fill="var(--dark-icon-color-purple-3, #6B4FBB)"><rect opacity=".5" x="25.1" y="14.2" width="9.6" height="2.6" rx="1.3"/><rect x="34.1" y="7.1" width="9.6" height="2.6" rx="1.3"/><rect opacity=".5" x="30.9" width="12.9" height="2.6" rx="1.3"/><rect x="9.6" y="14.2" width="12.9" height="2.6" rx="1.3"/><rect x="21.9" width="6.4" height="2.6" rx="1.3"/><rect opacity=".5" x="25.1" y="35.5" width="9.6" height="2.6" rx="1.3"/><rect x="18.6" y="28.4" width="9.6" height="2.6" rx="1.3"/><rect x="30.9" y="21.3" width="12.9" height="2.6" rx="1.3"/><rect x="9.6" y="42.5" width="9.6" height="2.6" rx="1.3"/><rect opacity=".5" x="34.1" y="49.6" width="9.6" height="2.6" rx="1.3"/><rect x="18.6" y="49.6" width="12.9" height="2.6" rx="1.3"/></g><g fill="var(--dark-icon-color-orange-1, #FDE5D8)"><rect y=".6" width="3.9" height="1.3" rx=".6"/><rect y="7.7" width="3.9" height="1.3" rx=".6"/><rect y="14.8" width="3.9" height="1.3" rx=".6"/><rect y="21.9" width="3.9" height="1.3" rx=".6"/><rect y="29" width="3.9" height="1.3" rx=".6"/><rect y="36.1" width="3.9" height="1.3" rx=".6"/><rect y="43.2" width="3.9" height="1.3" rx=".6"/><rect y="50.3" width="3.9" height="1.3" rx=".6"/><rect y="57.4" width="3.9" height="1.3" rx=".6"/></g><rect x="9.6" width="9.6" height="2.6" rx="1.3"/><rect x="46.3" width="9.6" height="2.6" rx="1.3"/><rect x="18.6" y="7.1" width="12.9" height="2.6" rx="1.3"/><rect x="9.6" y="7.1" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="21.3" width="9.6" height="2.6" rx="1.3"/><rect x="37.3" y="14.2" width="9.6" height="2.6" rx="1.3"/><rect x="9.6" y="35.5" width="12.9" height="2.6" rx="1.3"/><rect x="21.9" y="21.3" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="28.4" width="6.4" height="2.6" rx="1.3"/><rect x="30.9" y="28.4" width="6.4" height="2.6" rx="1.3"/><rect x="39.9" y="28.4" width="6.4" height="2.6" rx="1.3"/><rect x="49.5" y="14.2" width="6.4" height="2.6" rx="1.3"/><rect x="25.1" y="56.7" width="9.6" height="2.6" rx="1.3"/><rect x="9.6" y="56.7" width="12.9" height="2.6" rx="1.3"/><rect x="21.9" y="42.5" width="6.4" height="2.6" rx="1.3"/><rect x="46.3" y="49.6" width="6.4" height="2.6" rx="1.3"/><rect x="9.6" y="49.6" width="6.4" height="2.6" rx="1.3"/></g></g></g><g transform="translate(196)"><use stroke="var(--dark-icon-color-orange-1, #FDE5D8)" mask="url(#e)" stroke-width="8" fill="var(--white, #fff)" xlink:href="#b"/><g fill="var(--dark-icon-color-orange-2, #FDB692)"><rect x="9" y="9" width="18.6" height="1.9" rx="1"/><rect x="9" y="14.8" width="25.1" height="1.9" rx="1"/><rect x="9" y="20.6" width="18.6" height="1.9" rx="1"/></g></g><g transform="translate(189 41.3)"><ellipse stroke="#FC6D26" stroke-width="3" fill="#fde5d8" cx="10.3" cy="9.7" rx="9.6" ry="9.7"/><path d="M0 9a8.4 8.4 0 0 0 8-4.3m1-4V0" stroke="#FC6D26" stroke-width="2"/><path d="M5 2a10.3 10.3 0 0 0 8.5 4.4c2.1 0 4-.6 5.7-1.7" stroke="#FC6D26" stroke-width="2"/><circle fill="#FC6D26" cx="6.8" cy="11.3" r="1"/><circle fill="#FC6D26" cx="13.8" cy="11.3" r="1"/></g><g transform="translate(47 96)"><ellipse stroke="var(--dark-icon-color-purple-3, #6B4FBB)" stroke-width="3" fill="#F4F1FA" cx="9.6" cy="10.3" rx="9.6" ry="9.7"/><path d="m12.9 4.5-1.7-2-1.6 2-1.6-2-1.6 2-1.6-2-1.6 2H1.5A9.6 9.6 0 0 1 9.6 0c3.5 0 6.5 1.8 8.2 4.5h-1.7l-1.6-2-1.6 2z" fill="var(--dark-icon-color-purple-3, #6B4FBB)"/><circle fill="var(--dark-icon-color-purple-3, #6B4FBB)" cx="6.1" cy="11.3" r="1"/><circle fill="var(--dark-icon-color-purple-3, #6B4FBB)" cx="13.2" cy="11.3" r="1"/></g><g transform="matrix(-1 0 0 1 56.6 54.8)" fill="var(--dark-icon-color-purple-2, #b5a8dd)"><use stroke="var(--dark-icon-color-purple-1, #E2DCF2)" mask="url(#f)" stroke-width="8" fill="var(--white, #fff)" xlink:href="#c"/><rect x="15.4" y="9" width="18.6" height="1.9" rx="1"/><rect x="21.9" y="14.8" width="12.2" height="1.9" rx="1"/><rect x="21.9" y="20.6" width="12.2" height="1.9" rx="1"/></g></g></svg> diff --git a/app/views/shared/integrations/_slack_notifications_deprecation_alert.html.haml b/app/views/shared/integrations/_slack_notifications_deprecation_alert.html.haml new file mode 100644 index 00000000000..de4439a8fde --- /dev/null +++ b/app/views/shared/integrations/_slack_notifications_deprecation_alert.html.haml @@ -0,0 +1,20 @@ +- if Gitlab.com? + = render Pajamas::AlertComponent.new(title: _('Slack notifications integration is deprecated'), + variant: :warning, + dismissible: false, + alert_options: { class: 'gl-mt-5', data: { testid: "slack-notifications-deprecation" } }) do |c| + = c.body do + - help_page_link = help_page_url('user/project/integrations/gitlab_slack_application') + - learn_more_link = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_link } + + = html_escape(s_('The Slack notifications integration is deprecated and will be removed in a future release. To continue to receive notifications from Slack, use the GitLab for Slack app instead. %{learn_more_link_start}Learn more%{link_end}.')) % { learn_more_link_start: learn_more_link, link_end: '</a>'.html_safe } +- else + = render Pajamas::AlertComponent.new(title: _('Slack notifications will be deprecated'), + variant: :warning, + dismissible: false, + alert_options: { class: 'gl-mt-5', data: { testid: "slack-notifications-deprecation" } }) do |c| + = c.body do + - help_page_link = help_page_url('user/project/integrations/gitlab_slack_application') + - learn_more_link = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_link } + + = html_escape(s_('Slack notifications will be brought into the GitLab for Slack app so you can manage both integrations from one place. %{learn_more_link_start}Learn more%{link_end}.')) % { learn_more_link_start: learn_more_link, link_end: '</a>'.html_safe } diff --git a/app/views/shared/integrations/prometheus/_custom_metrics.html.haml b/app/views/shared/integrations/prometheus/_custom_metrics.html.haml index dda84e0fb9e..e5ddc055aef 100644 --- a/app/views/shared/integrations/prometheus/_custom_metrics.html.haml +++ b/app/views/shared/integrations/prometheus/_custom_metrics.html.haml @@ -6,13 +6,13 @@ = link_to s_('PrometheusService|More information'), help_page_path('operations/metrics/index.md', anchor: 'adding-custom-metrics'), target: '_blank', rel: "noopener noreferrer" .col-lg-9 - .card.custom-monitored-metrics.js-panel-custom-monitored-metrics{ data: { active_custom_metrics: project_prometheus_metrics_path(project), environments_data: environments_list_data, service_active: "#{integration.active}" } } - .card-header + = render Pajamas::CardComponent.new(header_options: { class: 'gl-display-flex gl-align-items-center' }, body_options: { class: 'gl-p-0' }, card_options: { class: 'gl-mb-5 custom-monitored-metrics js-panel-custom-monitored-metrics', data: { active_custom_metrics: project_prometheus_metrics_path(project), environments_data: environments_list_data, service_active: "#{integration.active}" } }) do |c| + - c.header do %strong = s_('PrometheusService|Custom metrics') - = gl_badge_tag 0, nil, class: 'js-custom-monitored-count' + = gl_badge_tag 0, nil, class: 'gl-ml-2 js-custom-monitored-count' = link_to s_('PrometheusService|New metric'), new_project_prometheus_metric_path(project), class: 'btn gl-button btn-confirm gl-ml-auto js-new-metric-button hidden' - .card-body + - c.body do .flash-container.hidden .flash-warning .flash-text diff --git a/app/views/shared/integrations/prometheus/_metrics.html.haml b/app/views/shared/integrations/prometheus/_metrics.html.haml index c74dbfd8b15..a8125c3e3ec 100644 --- a/app/views/shared/integrations/prometheus/_metrics.html.haml +++ b/app/views/shared/integrations/prometheus/_metrics.html.haml @@ -8,12 +8,12 @@ = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus'), target: '_blank', rel: "noopener noreferrer" .col-lg-9 - .card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/index') } } - .card-header + = render Pajamas::CardComponent.new(body_options: { class: 'gl-p-0' }, card_options: { class: 'gl-mb-5 js-panel-monitored-metrics', data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/index') }}) do |c| + - c.header do %strong = s_('PrometheusService|Common metrics') - = gl_badge_tag 0, nil, class: 'js-monitored-count' - .card-body + = gl_badge_tag 0, nil, class: 'js-monitored-count' + - c.body do .loading-metrics.js-loading-metrics %p.m-3 = gl_loading_icon(inline: true, css_class: 'metrics-load-spinner') @@ -23,13 +23,13 @@ = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics') %ul.list-unstyled.metrics-list.hidden.js-metrics-list - .card.hidden.js-panel-missing-env-vars - .card-header + = render Pajamas::CardComponent.new(body_options: { class: 'hidden gl-p-0' }, card_options: { class: 'hidden js-panel-missing-env-vars' }) do |c| + - c.header do = sprite_icon('chevron-lg-right', css_class: 'panel-toggle js-panel-toggle-right') = sprite_icon('chevron-lg-down', css_class: 'panel-toggle js-panel-toggle-down hidden') = s_('PrometheusService|Missing environment variable') = gl_badge_tag 0, nil, class: 'js-env-var-count' - .card-body.hidden + - c.body do .flash-container .flash-notice .flash-text diff --git a/app/views/shared/issuable/_feed_buttons.html.haml b/app/views/shared/issuable/_feed_buttons.html.haml index 94b7fe14721..e0f676021a1 100644 --- a/app/views/shared/issuable/_feed_buttons.html.haml +++ b/app/views/shared/issuable/_feed_buttons.html.haml @@ -1,8 +1,8 @@ - show_calendar_button = local_assigns.fetch(:show_calendar_button, true) -= render Pajamas::ButtonComponent.new(href: safe_params.merge(rss_url_options), icon: 'rss', button_options: { class: 'has-tooltip', 'aria-label': _('Subscribe to RSS feed'), data: { container: 'body', testid: 'rss-feed-link' } }) do - = _('Subscribe to RSS feed') += render Pajamas::ButtonComponent.new(href: safe_params.merge(rss_url_options), button_options: { class: 'has-tooltip btn-icon', title: _('Subscribe to RSS feed'), 'aria-label': _('Subscribe to RSS feed'), data: { container: 'body', testid: 'rss-feed-link' } }) do + = sprite_icon('rss') - if show_calendar_button - = render Pajamas::ButtonComponent.new(href: safe_params.merge(calendar_url_options), icon: 'calendar', button_options: { class: 'has-tooltip', 'aria-label': _('Subscribe to calendar'), data: { container: 'body' } }) do - = _('Subscribe to calendar') + = render Pajamas::ButtonComponent.new(href: safe_params.merge(calendar_url_options), button_options: { class: 'has-tooltip btn-icon', title: _('Subscribe to calendar'), 'aria-label': _('Subscribe to calendar'), data: { container: 'body' } }) do + = sprite_icon('calendar') diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index af63839d7c1..3c4ee01d04f 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -26,7 +26,7 @@ - apply_is_default_styles = (selected.nil? || selected.empty?) && !no_default_styles %span.dropdown-toggle-text{ class: ("is-default" if apply_is_default_styles) } = multi_label_name(selected, label_name) - = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3") + = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon") .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable.dropdown-extended-height = render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create } - if show_create && project && can?(current_user, :admin_label, project) diff --git a/app/views/shared/issuable/_label_page_create.html.haml b/app/views/shared/issuable/_label_page_create.html.haml index eb3acd8e055..96167db80b4 100644 --- a/app/views/shared/issuable/_label_page_create.html.haml +++ b/app/views/shared/issuable/_label_page_create.html.haml @@ -10,9 +10,9 @@ %input#new_label_name.default-dropdown-input{ type: "text", placeholder: _('Name new label') } .suggest-colors.suggest-colors-dropdown = render_suggested_colors - .dropdown-label-color-input - .dropdown-label-color-preview.js-dropdown-label-color-preview - %input#new_label_color.default-dropdown-input{ type: "text", placeholder: _('Assign custom color like #FF0000') } + .dropdown-label-color-input.gl-display-flex + %input.dropdown-label-color-preview.js-dropdown-label-color-preview.gl-w-7.gl-h-7.gl-border-1.gl-border-solid.gl-border-gray-500.gl-rounded-top-right-none.gl-rounded-bottom-right-none{ class: "gl-border-r-0!", type: "color", placeholder: _('Select color') } + %input#new_label_color.default-dropdown-input.gl-rounded-top-left-none.gl-rounded-bottom-left-none{ type: "text", placeholder: _('Assign custom color like #FF0000') } - if show_add_list .dropdown-label-input{ class: add_list_class } %label diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 72940b64801..95c5f51c339 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -162,6 +162,14 @@ %li.filter-dropdown-item{ data: { value: 'no', capitalize: true } } %button.gl-button.btn.btn-link{ type: 'button' } = _('No') + #js-dropdown-approved.filtered-search-input-dropdown-menu.dropdown-menu + %ul.filter-dropdown{ data: { dropdown: true } } + %li.filter-dropdown-item{ data: { value: 'yes', capitalize: true } } + %button.gl-button.btn.btn-link{ type: 'button' } + = _('Yes') + %li.filter-dropdown-item{ data: { value: 'no', capitalize: true } } + %button.gl-button.btn.btn-link{ type: 'button' } + = _('No') #js-dropdown-confidential.filtered-search-input-dropdown-menu.dropdown-menu %ul.filter-dropdown{ data: { dropdown: true } } %li.filter-dropdown-item{ data: { value: 'yes', capitalize: true } } diff --git a/app/views/shared/issuable/_sidebar_user_dropdown.html.haml b/app/views/shared/issuable/_sidebar_user_dropdown.html.haml index c058e7ebe3e..9bfdacc8cfd 100644 --- a/app/views/shared/issuable/_sidebar_user_dropdown.html.haml +++ b/app/views/shared/issuable/_sidebar_user_dropdown.html.haml @@ -14,8 +14,6 @@ %li .js-invite-members-trigger{ data: { trigger_element: 'anchor', display_text: _('Invite Members'), - event: 'click_invite_members', - trigger_source: local_assigns.fetch(:trigger_source), - label: data['track-label'] } } + trigger_source: local_assigns.fetch(:trigger_source) } } - else = dropdown_tag(data['dropdown-title'], options: options) diff --git a/app/views/shared/issuable/form/_type_selector.html.haml b/app/views/shared/issuable/form/_type_selector.html.haml index a94ef70b2d5..6d4cd83d55b 100644 --- a/app/views/shared/issuable/form/_type_selector.html.haml +++ b/app/views/shared/issuable/form/_type_selector.html.haml @@ -10,7 +10,7 @@ %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %span.dropdown-toggle-text.is-default = issuable.issue_type.capitalize || _("Select type") - = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3") + = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon") .dropdown-menu.dropdown-menu-selectable.dropdown-select .dropdown-title.gl-display-flex %span.gl-ml-auto diff --git a/app/views/shared/issue_type/_details_content.html.haml b/app/views/shared/issue_type/_details_content.html.haml index e1a9b30ef67..e189cc34899 100644 --- a/app/views/shared/issue_type/_details_content.html.haml +++ b/app/views/shared/issue_type/_details_content.html.haml @@ -2,7 +2,7 @@ - api_awards_path = local_assigns.fetch(:api_awards_path, nil) .issue-details.issuable-details.js-issue-details - .detail-page-description.content-block.js-detail-page-description.gl-pb-0.gl-border-none + .detail-page-description.content-block.js-detail-page-description.gl-pt-2.gl-pb-0.gl-border-none #js-issuable-app{ data: { initial: issuable_initial_data(issuable).to_json, issuable_id: issuable.id, full_path: @project.full_path, diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml index 9ef4b9e084d..5d749b16eee 100644 --- a/app/views/shared/labels/_form.html.haml +++ b/app/views/shared/labels/_form.html.haml @@ -16,7 +16,7 @@ = f.label :color, _("Background color") .input-group .input-group-prepend - .input-group-text.label-color-preview + %input.label-color-preview.gl-w-7.gl-h-full.gl-border-1.gl-border-solid.gl-border-gray-500.gl-border-r-0.gl-rounded-top-right-none.gl-rounded-bottom-right-none{ type: "color", placeholder: _('Select color') } = f.text_field :color, class: "gl-form-input form-control", data: { qa_selector: 'label_color_field' } .form-text.text-muted = _('Choose any color.') diff --git a/app/views/shared/milestones/_description.html.haml b/app/views/shared/milestones/_description.html.haml index fc25c7e8f89..d7908b1c210 100644 --- a/app/views/shared/milestones/_description.html.haml +++ b/app/views/shared/milestones/_description.html.haml @@ -1,4 +1,4 @@ -.detail-page-description.milestone-detail +.detail-page-description.milestone-detail.gl-py-5 %h2.gl-m-0{ data: { qa_selector: "milestone_title_content" } } = markdown_field(milestone, :title) .gl-font-sm.gl-text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal{ data: { qa_selector: 'milestone_id_content' }, itemprop: 'identifier' } @@ -9,5 +9,5 @@ - if milestone.try(:description).present? %div{ data: { qa_selector: "milestone_description_content" } } - .description.md.gl-px-0.gl-pt-4.gl-border-1.gl-border-t-solid.gl-border-gray-100 + .description.md.gl-px-0.gl-pt-4 = markdown_field(milestone, :description) diff --git a/app/views/shared/milestones/_form_dates.html.haml b/app/views/shared/milestones/_form_dates.html.haml index 50e3e8e195c..3e75775bf73 100644 --- a/app/views/shared/milestones/_form_dates.html.haml +++ b/app/views/shared/milestones/_form_dates.html.haml @@ -1,11 +1,14 @@ -.form-group.row - .col-form-label.col-sm-2 +.gl-form-group + %div = f.label :start_date, _('Start Date') - .col-sm-4 - = f.gitlab_ui_datepicker :start_date, data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off' - %a.inline.float-right.gl-mt-2.js-clear-start-date{ href: "#" }= _('Clear start date') - .col-form-label.col-sm-2 + %div + .issuable-form-select-holder + = f.gitlab_ui_datepicker :start_date, data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off' + %a.gl-white-space-nowrap.gl-pl-4.js-clear-start-date{ href: "#" }= _('Clear start date') +.gl-form-group + %div = f.label :due_date, _('Due Date') - .col-sm-4 - = f.gitlab_ui_datepicker :due_date, data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off' - %a.inline.float-right.gl-mt-2.js-clear-due-date{ href: "#" }= _('Clear due date') + %div + .issuable-form-select-holder + = f.gitlab_ui_datepicker :due_date, data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off' + %a.gl-white-space-nowrap.gl-pl-4.js-clear-due-date{ href: "#" }= _('Clear due date') diff --git a/app/views/shared/nav/_explore_scope_header.html.haml b/app/views/shared/nav/_explore_scope_header.html.haml new file mode 100644 index 00000000000..da22d6dbcf2 --- /dev/null +++ b/app/views/shared/nav/_explore_scope_header.html.haml @@ -0,0 +1,6 @@ +%li.context-header + = link_to explore_root_url, title: _('Explore'), class: 'has-tooltip', data: { container: 'body', placement: 'right' } do + %span.avatar-container.icon-avatar.rect-avatar.s32 + = sprite_icon('compass', size: 18) + %span.sidebar-context-title + = _('Explore') diff --git a/app/views/shared/nav/_user_settings_scope_header.html.haml b/app/views/shared/nav/_user_settings_scope_header.html.haml new file mode 100644 index 00000000000..c1601822736 --- /dev/null +++ b/app/views/shared/nav/_user_settings_scope_header.html.haml @@ -0,0 +1,4 @@ +%li.context-header + = link_to profile_path, title: _('User Settings'), class: 'has-tooltip', data: { container: 'body', placement: 'right' } do + = render Pajamas::AvatarComponent.new(current_user, size: 32, alt: current_user.name, class: 'gl-mr-3 js-sidebar-user-avatar', avatar_options: { data: { testid: 'sidebar-user-avatar' } }) + %span.sidebar-context-title= _('User Settings') diff --git a/app/views/shared/topics/_topic.html.haml b/app/views/shared/topics/_topic.html.haml index 83d5ecdb833..9b9630733fd 100644 --- a/app/views/shared/topics/_topic.html.haml +++ b/app/views/shared/topics/_topic.html.haml @@ -5,9 +5,8 @@ = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-display-flex gl-align-items-center' }) do |c| = c.body do - .avatar-container.rect-avatar.s40.gl-flex-shrink-0 - = link_to detail_page_link do - = topic_icon(topic, class: "avatar s40") + = link_to detail_page_link do + = render Pajamas::AvatarComponent.new(topic, size: 48, alt: '', class: 'gl-mr-3') = link_to detail_page_link do - if topic.title_or_name.length > max_topic_title_length %h5.gl-str-truncated.has-tooltip{ title: topic.title_or_name } diff --git a/app/views/shared/wikis/_wiki_directory.html.haml b/app/views/shared/wikis/_wiki_directory.html.haml index 5c2233a4db2..ced51e1f697 100644 --- a/app/views/shared/wikis/_wiki_directory.html.haml +++ b/app/views/shared/wikis/_wiki_directory.html.haml @@ -1,6 +1,9 @@ %li{ class: active_when(params[:id] == wiki_directory.slug), data: { qa_selector: 'wiki_directory_content' } } - = link_to wiki_page_path(@wiki, wiki_directory), data: { qa_selector: 'wiki_dir_page_link', qa_page_name: wiki_directory.title } do - = wiki_directory.title + .gl-relative.gl-display-flex.gl-align-items-center.js-wiki-list-toggle.wiki-list< + = sprite_icon('chevron-right', css_class: 'js-wiki-list-expand-button wiki-list-expand-button gl-mr-2 gl-cursor-pointer') + = sprite_icon('chevron-down', css_class: 'js-wiki-list-collapse-button wiki-list-collapse-button gl-mr-2 gl-cursor-pointer') + = link_to wiki_page_path(@wiki, wiki_directory), data: { qa_selector: 'wiki_dir_page_link', qa_page_name: wiki_directory.title } do + = wiki_directory.title %ul - wiki_directory.entries.each do |entry| = render partial: entry.to_partial_path, object: entry, locals: { context: context } diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index eb9465a409f..583f25b68eb 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -4,8 +4,9 @@ - add_page_startup_graphql_call('snippet/project_permissions', { fullPath: @snippet.project_id }) - else - add_page_startup_graphql_call('snippet/user_permissions') -- @hide_top_links = true -- add_to_breadcrumbs _("Snippets"), dashboard_snippets_path +- if @snippet.author != current_user + -# Different breadcrumbs if this page is rendered as part of the Explore section + - add_to_breadcrumbs _("Snippets"), explore_snippets_path - breadcrumb_title @snippet.to_reference - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets") - content_for :prefetch_asset_tags do diff --git a/app/views/users/_profile_basic_info.html.haml b/app/views/users/_profile_basic_info.html.haml index b62440fcbde..c916b6c3d45 100644 --- a/app/views/users/_profile_basic_info.html.haml +++ b/app/views/users/_profile_basic_info.html.haml @@ -1,9 +1,9 @@ -.gl-text-gray-900.gl-mt-4 - = render 'middle_dot_divider' do +.gl-text-gray-900 + = render 'middle_dot_divider', stacking: true do @#{@user.username} - if can?(current_user, :read_user_profile, @user) - = render 'middle_dot_divider' do + = render 'middle_dot_divider', stacking: true do = s_('UserProfile|User ID: %{id}') % { id: @user.id } = clipboard_button(title: s_('UserProfile|Copy user ID'), text: @user.id) - = render 'middle_dot_divider' do + = render 'middle_dot_divider', stacking: true do = s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) } diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index b9290972656..3543d5c4336 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -6,6 +6,9 @@ - page_itemtype 'http://schema.org/Person' - add_page_specific_style 'page_bundles/profile' - link_classes = "flex-grow-1 mx-1 " +- if show_super_sidebar? + - @left_sidebar = true + - nav "user_profile" = content_for :meta_tags do = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") @@ -43,137 +46,129 @@ = _('Follow') .profile-header{ class: [('with-no-profile-tabs' if profile_tabs.empty?)] } - .avatar-holder - = link_to avatar_icon_for_user(@user, 400, current_user: current_user), target: '_blank', rel: 'noopener noreferrer' do - = render Pajamas::AvatarComponent.new(@user, alt: "", size: 96, avatar_options: { itemprop: "image" }) - - - if @user.blocked? || !@user.confirmed? - .user-info - %h1.cover-title - = user_display_name(@user) - = render "users/profile_basic_info" - - else - .user-info - %h1.cover-title{ itemprop: 'name' } - = @user.name - - if @user.pronouns.present? - %span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle - = "(#{@user.pronouns})" - - if @user.status&.busy? - %span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle= s_("UserProfile|(Busy)") - - - if @user.pronunciation.present? - .gl-align-items-center - %p.gl-mb-4.gl-text-gray-500= s_("UserProfile|Pronounced as: %{pronunciation}") % { pronunciation: @user.pronunciation } - - - if @user.status&.customized? - .cover-status.gl-display-inline-flex.gl-align-items-center - = emoji_icon(@user.status.emoji, class: 'gl-mr-2') - = markdown_field(@user.status, :message) + .gl-display-inline-block.gl-mx-8.gl-vertical-align-top + .avatar-holder + = link_to avatar_icon_for_user(@user, 400, current_user: current_user), target: '_blank', rel: 'noopener noreferrer' do + = render Pajamas::AvatarComponent.new(@user, alt: "", size: 96, avatar_options: { itemprop: "image" }) + #js-user-achievements{ data: { root_url: root_url, user_id: @user.id } } + .gl-display-inline-block.gl-vertical-align-top.gl-text-left + - if @user.blocked? || !@user.confirmed? + .user-info + %h1.cover-title.gl-my-0 + = user_display_name(@user) = render "users/profile_basic_info" - .gl-text-gray-900.mb-1.mb-sm-2 - - unless @user.location.blank? - = render 'middle_dot_divider', stacking: true, itemprop: 'address', itemscope: true, itemtype: 'https://schema.org/PostalAddress' do - = sprite_icon('location', css_class: 'fgray') - %span{ itemprop: 'addressLocality' } - = @user.location + - else + .user-info + %h1.cover-title.gl-my-0{ itemprop: 'name' } + = @user.name + - if @user.pronouns.present? + %span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle + = "(#{@user.pronouns})" + - if @user.status&.busy? + %span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle= s_("UserProfile|(Busy)") + + - if @user.pronunciation.present? + .gl-align-items-center + %p.gl-mb-4.gl-text-gray-500.gl-max-w-80.gl-mx-auto= s_("UserProfile|Pronounced as: %{pronunciation}") % { pronunciation: @user.pronunciation } + + - if @user.status&.customized? + .cover-status.gl-display-inline-flex.gl-align-items-center.gl-mb-3 + = emoji_icon(@user.status.emoji, class: 'gl-mr-2') + = markdown_field(@user.status, :message) + = render "users/profile_basic_info" - user_local_time = local_time(@user.timezone) - - unless user_local_time.nil? - = render 'middle_dot_divider', stacking: true, data: { testid: 'user-local-time' } do - = sprite_icon('clock', css_class: 'fgray') - %span - = user_local_time - - unless work_information(@user).blank? - = render 'middle_dot_divider', stacking: true do - = sprite_icon('work', css_class: 'fgray') - %span - = work_information(@user, with_schema_markup: true) - .gl-text-gray-900 - - unless @user.skype.blank? - = render 'middle_dot_divider' do - = link_to "skype:#{@user.skype}", class: 'gl-hover-text-decoration-none', title: "Skype" do - = sprite_icon('skype', css_class: 'skype-icon') - - unless @user.linkedin.blank? - = render 'middle_dot_divider' do - = link_to linkedin_url(@user), class: 'gl-hover-text-decoration-none', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' do - = sprite_icon('linkedin', css_class: 'linkedin-icon') - - unless @user.twitter.blank? - = render 'middle_dot_divider', breakpoint: 'sm' do - = link_to twitter_url(@user), class: 'gl-hover-text-decoration-none', title: "Twitter", target: '_blank', rel: 'noopener noreferrer nofollow' do - = sprite_icon('twitter', css_class: 'twitter-icon') - - unless @user.discord.blank? - = render 'middle_dot_divider', breakpoint: 'sm' do - = link_to discord_url(@user), class: 'gl-hover-text-decoration-none', title: "Discord", target: '_blank', rel: 'noopener noreferrer nofollow' do - = sprite_icon('discord', css_class: 'discord-icon') - - unless @user.website_url.blank? - = render 'middle_dot_divider', stacking: true do - - if Feature.enabled?(:security_auto_fix) && @user.bot? - = sprite_icon('question', css_class: 'gl-text-blue-600') - = link_to @user.short_website_url, @user.full_website_url, target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url' - - if display_public_email?(@user) - = render 'middle_dot_divider', stacking: true do - = link_to @user.public_email, "mailto:#{@user.public_email}", itemprop: 'email' - .gl-text-gray-900 - = sprite_icon('users', css_class: 'gl-vertical-align-middle gl-text-gray-500') - = render 'middle_dot_divider' do - = link_to user_followers_path do - - count = @user.followers.count - = n_('1 follower', '%{count} followers', count) % { count: count } - = render 'middle_dot_divider' do - = link_to user_following_path, data: { qa_selector: 'following_link' } do - = @user.followees.count - = _('following') - - if @user.bio.present? - .gl-text-gray-900 - .profile-user-bio - = @user.bio - - - unless profile_tabs.empty? - - if Feature.enabled?(:profile_tabs_vue, current_user) - #js-profile-tabs - - else - .scrolling-tabs-container - .fade-left= sprite_icon('chevron-lg-left', size: 12) - .fade-right= sprite_icon('chevron-lg-right', size: 12) - %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs - - if profile_tab?(:overview) - %li.js-overview-tab - = link_to user_path, data: { target: 'div#js-overview', action: 'overview', toggle: 'tab' } do - = s_('UserProfile|Overview') - - if profile_tab?(:activity) - %li.js-activity-tab - = link_to user_activity_path, data: { target: 'div#activity', action: 'activity', toggle: 'tab' } do - = s_('UserProfile|Activity') - - unless Feature.enabled?(:security_auto_fix) && @user.bot? - - if profile_tab?(:groups) - %li.js-groups-tab - = link_to user_groups_path, data: { target: 'div#groups', action: 'groups', toggle: 'tab', endpoint: user_groups_path(format: :json) } do - = s_('UserProfile|Groups') - - if profile_tab?(:contributed) - %li.js-contributed-tab - = link_to user_contributed_projects_path, data: { target: 'div#contributed', action: 'contributed', toggle: 'tab', endpoint: user_contributed_projects_path(format: :json) } do - = s_('UserProfile|Contributed projects') - - if profile_tab?(:projects) - %li.js-projects-tab - = link_to user_projects_path, data: { target: 'div#projects', action: 'projects', toggle: 'tab', endpoint: user_projects_path(format: :json) } do - = s_('UserProfile|Personal projects') - - if profile_tab?(:starred) - %li.js-starred-tab - = link_to user_starred_projects_path, data: { target: 'div#starred', action: 'starred', toggle: 'tab', endpoint: user_starred_projects_path(format: :json) } do - = s_('UserProfile|Starred projects') - - if profile_tab?(:snippets) - %li.js-snippets-tab - = link_to user_snippets_path, data: { target: 'div#snippets', action: 'snippets', toggle: 'tab', endpoint: user_snippets_path(format: :json) } do - = s_('UserProfile|Snippets') - - if profile_tab?(:followers) - %li.js-followers-tab - = link_to user_followers_path, data: { target: 'div#followers', action: 'followers', toggle: 'tab', endpoint: user_followers_path(format: :json) } do - = s_('UserProfile|Followers') - - if profile_tab?(:following) - %li.js-following-tab - = link_to user_following_path, data: { target: 'div#following', action: 'following', toggle: 'tab', endpoint: user_following_path(format: :json) } do - = s_('UserProfile|Following') - + - if @user.location.present? || user_local_time.present? || work_information(@user).present? + .gl-text-gray-900 + - if @user.location.present? + = render 'middle_dot_divider', stacking: true, itemprop: 'address', itemscope: true, itemtype: 'https://schema.org/PostalAddress' do + = sprite_icon('location', css_class: 'fgray') + %span{ itemprop: 'addressLocality' } + = @user.location + - if user_local_time.present? + = render 'middle_dot_divider', stacking: true, data: { testid: 'user-local-time' } do + = sprite_icon('clock', css_class: 'fgray') + %span + = user_local_time + - if work_information(@user).present? + = render 'middle_dot_divider', stacking: true do + = sprite_icon('work', css_class: 'fgray') + %span + = work_information(@user, with_schema_markup: true) + .gl-text-gray-900 + - if @user.skype.present? + = render 'middle_dot_divider' do + = link_to "skype:#{@user.skype}", class: 'gl-hover-text-decoration-none', title: "Skype" do + = sprite_icon('skype', css_class: 'skype-icon') + - if @user.linkedin.present? + = render 'middle_dot_divider' do + = link_to linkedin_url(@user), class: 'gl-hover-text-decoration-none', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' do + = sprite_icon('linkedin', css_class: 'linkedin-icon') + - if @user.twitter.present? + = render 'middle_dot_divider', breakpoint: 'sm' do + = link_to twitter_url(@user), class: 'gl-hover-text-decoration-none', title: "Twitter", target: '_blank', rel: 'noopener noreferrer nofollow' do + = sprite_icon('twitter', css_class: 'twitter-icon') + - if @user.discord.present? + = render 'middle_dot_divider', breakpoint: 'sm' do + = link_to discord_url(@user), class: 'gl-hover-text-decoration-none', title: "Discord", target: '_blank', rel: 'noopener noreferrer nofollow' do + = sprite_icon('discord', css_class: 'discord-icon') + - if @user.website_url.present? + = render 'middle_dot_divider', stacking: true do + - if Feature.enabled?(:security_auto_fix) && @user.bot? + = sprite_icon('question', css_class: 'gl-text-blue-600') + = link_to @user.short_website_url, @user.full_website_url, target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url' + - if display_public_email?(@user) + = render 'middle_dot_divider', stacking: true do + = link_to @user.public_email, "mailto:#{@user.public_email}", itemprop: 'email' + - if @user.bio.present? && @user.confirmed? && !@user.blocked? + %p.profile-user-bio.gl-mb-3 + = @user.bio + + - if !profile_tabs.empty? && !Feature.enabled?(:profile_tabs_vue, current_user) + .scrolling-tabs-container{ class: [('gl-display-none' if show_super_sidebar?)] } + .fade-left= sprite_icon('chevron-lg-left', size: 12) + .fade-right= sprite_icon('chevron-lg-right', size: 12) + %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs + - if profile_tab?(:overview) + %li.js-overview-tab + = link_to user_path, data: { target: 'div#js-overview', action: 'overview', toggle: 'tab' } do + = s_('UserProfile|Overview') + - if profile_tab?(:activity) + %li.js-activity-tab + = link_to user_activity_path, data: { target: 'div#activity', action: 'activity', toggle: 'tab' } do + = s_('UserProfile|Activity') + - unless Feature.enabled?(:security_auto_fix) && @user.bot? + - if profile_tab?(:groups) + %li.js-groups-tab + = link_to user_groups_path, data: { target: 'div#groups', action: 'groups', toggle: 'tab', endpoint: user_groups_path(format: :json) } do + = s_('UserProfile|Groups') + - if profile_tab?(:contributed) + %li.js-contributed-tab + = link_to user_contributed_projects_path, data: { target: 'div#contributed', action: 'contributed', toggle: 'tab', endpoint: user_contributed_projects_path(format: :json) } do + = s_('UserProfile|Contributed projects') + - if profile_tab?(:projects) + %li.js-projects-tab + = link_to user_projects_path, data: { target: 'div#projects', action: 'projects', toggle: 'tab', endpoint: user_projects_path(format: :json) } do + = s_('UserProfile|Personal projects') + - if profile_tab?(:starred) + %li.js-starred-tab + = link_to user_starred_projects_path, data: { target: 'div#starred', action: 'starred', toggle: 'tab', endpoint: user_starred_projects_path(format: :json) } do + = s_('UserProfile|Starred projects') + - if profile_tab?(:snippets) + %li.js-snippets-tab + = link_to user_snippets_path, data: { target: 'div#snippets', action: 'snippets', toggle: 'tab', endpoint: user_snippets_path(format: :json) } do + = s_('UserProfile|Snippets') + - if profile_tab?(:followers) + %li.js-followers-tab + = link_to user_followers_path, data: { target: 'div#followers', action: 'followers', toggle: 'tab', endpoint: user_followers_path(format: :json) } do + = s_('UserProfile|Followers') + = gl_badge_tag @user.followers.count, size: :sm + - if profile_tab?(:following) + %li.js-following-tab + = link_to user_following_path, data: { target: 'div#following', action: 'following', toggle: 'tab', endpoint: user_following_path(format: :json), qa_selector: 'following_tab' } do + = s_('UserProfile|Following') + = gl_badge_tag @user.followees.count, size: :sm + - if !profile_tabs.empty? && Feature.enabled?(:profile_tabs_vue, current_user) + #js-profile-tabs{ data: user_profile_tabs_app_data(@user) } %div{ class: container_class } - unless Feature.enabled?(:profile_tabs_vue, current_user) .tab-content diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index c660243d336..1624538152e 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -5,7 +5,7 @@ --- - :name: authorized_project_update:authorized_project_update_project_recalculate :worker_name: AuthorizedProjectUpdate::ProjectRecalculateWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :high :resource_boundary: :unknown @@ -14,7 +14,7 @@ :tags: [] - :name: authorized_project_update:authorized_project_update_project_recalculate_per_user :worker_name: AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :high :resource_boundary: :unknown @@ -23,7 +23,7 @@ :tags: [] - :name: authorized_project_update:authorized_project_update_user_refresh_from_replica :worker_name: AuthorizedProjectUpdate::UserRefreshFromReplicaWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -32,7 +32,7 @@ :tags: [] - :name: authorized_project_update:authorized_project_update_user_refresh_over_user_range :worker_name: AuthorizedProjectUpdate::UserRefreshOverUserRangeWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -41,7 +41,7 @@ :tags: [] - :name: authorized_project_update:authorized_project_update_user_refresh_with_low_urgency :worker_name: AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -617,7 +617,7 @@ :tags: [] - :name: cronjob:personal_access_tokens_expired_notification :worker_name: PersonalAccessTokens::ExpiredNotificationWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -626,7 +626,7 @@ :tags: [] - :name: cronjob:personal_access_tokens_expiring :worker_name: PersonalAccessTokens::ExpiringWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -680,7 +680,7 @@ :tags: [] - :name: cronjob:remove_expired_group_links :worker_name: RemoveExpiredGroupLinksWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -689,7 +689,7 @@ :tags: [] - :name: cronjob:remove_expired_members :worker_name: RemoveExpiredMembersWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :cpu @@ -698,7 +698,7 @@ :tags: [] - :name: cronjob:remove_unaccepted_member_invites :worker_name: RemoveUnacceptedMemberInvitesWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -1137,6 +1137,15 @@ :weight: 1 :idempotent: false :tags: [] +- :name: github_importer:github_import_import_collaborator + :worker_name: Gitlab::GithubImport::ImportCollaboratorWorker + :feature_category: :importers + :has_external_dependencies: true + :urgency: :low + :resource_boundary: :unknown + :weight: 1 + :idempotent: false + :tags: [] - :name: github_importer:github_import_import_diff_note :worker_name: Gitlab::GithubImport::ImportDiffNoteWorker :feature_category: :importers @@ -1272,6 +1281,15 @@ :weight: 1 :idempotent: false :tags: [] +- :name: github_importer:github_import_stage_import_collaborators + :worker_name: Gitlab::GithubImport::Stage::ImportCollaboratorsWorker + :feature_category: :importers + :has_external_dependencies: false + :urgency: :low + :resource_boundary: :unknown + :weight: 1 + :idempotent: false + :tags: [] - :name: github_importer:github_import_stage_import_issue_events :worker_name: Gitlab::GithubImport::Stage::ImportIssueEventsWorker :feature_category: :importers @@ -2165,7 +2183,7 @@ :tags: [] - :name: unassign_issuables:members_destroyer_unassign_issuables :worker_name: MembersDestroyer::UnassignIssuablesWorker - :feature_category: :authentication_and_authorization + :feature_category: :user_management :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -2219,7 +2237,7 @@ :tags: [] - :name: authorized_projects :worker_name: AuthorizedProjectsWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :high :resource_boundary: :unknown @@ -2417,7 +2435,7 @@ :tags: [] - :name: delete_user :worker_name: DeleteUserWorker - :feature_category: :authentication_and_authorization + :feature_category: :user_management :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -2611,7 +2629,7 @@ :urgency: :low :resource_boundary: :unknown :weight: 1 - :idempotent: false + :idempotent: true :tags: [] - :name: group_export :worker_name: GroupExportWorker @@ -2642,7 +2660,7 @@ :tags: [] - :name: groups_update_two_factor_requirement_for_members :worker_name: Groups::UpdateTwoFactorRequirementForMembersWorker - :feature_category: :authentication_and_authorization + :feature_category: :system_access :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -3070,7 +3088,7 @@ :urgency: :low :resource_boundary: :unknown :weight: 1 - :idempotent: false + :idempotent: true :tags: [] - :name: project_export :worker_name: ProjectExportWorker @@ -3108,6 +3126,15 @@ :weight: 1 :idempotent: true :tags: [] +- :name: projects_forks_sync + :worker_name: Projects::Forks::SyncWorker + :feature_category: :source_code_management + :has_external_dependencies: false + :urgency: :high + :resource_boundary: :unknown + :weight: 1 + :idempotent: true + :tags: [] - :name: projects_git_garbage_collect :worker_name: Projects::GitGarbageCollectWorker :feature_category: :gitaly @@ -3117,6 +3144,15 @@ :weight: 1 :idempotent: false :tags: [] +- :name: projects_import_export_create_relation_exports + :worker_name: Projects::ImportExport::CreateRelationExportsWorker + :feature_category: :importers + :has_external_dependencies: false + :urgency: :low + :resource_boundary: :cpu + :weight: 1 + :idempotent: true + :tags: [] - :name: projects_import_export_parallel_project_export :worker_name: Projects::ImportExport::ParallelProjectExportWorker :feature_category: :importers @@ -3135,6 +3171,15 @@ :weight: 1 :idempotent: true :tags: [] +- :name: projects_import_export_wait_relation_exports + :worker_name: Projects::ImportExport::WaitRelationExportsWorker + :feature_category: :importers + :has_external_dependencies: false + :urgency: :low + :resource_boundary: :cpu + :weight: 1 + :idempotent: true + :tags: [] - :name: projects_inactive_projects_deletion_notification :worker_name: Projects::InactiveProjectsDeletionNotificationWorker :feature_category: :compliance_management diff --git a/app/workers/authorized_project_update/project_recalculate_per_user_worker.rb b/app/workers/authorized_project_update/project_recalculate_per_user_worker.rb index 352c82e5021..96647cc671c 100644 --- a/app/workers/authorized_project_update/project_recalculate_per_user_worker.rb +++ b/app/workers/authorized_project_update/project_recalculate_per_user_worker.rb @@ -4,7 +4,7 @@ module AuthorizedProjectUpdate class ProjectRecalculatePerUserWorker < ProjectRecalculateWorker data_consistency :always - feature_category :authentication_and_authorization + feature_category :system_access urgency :high queue_namespace :authorized_project_update diff --git a/app/workers/authorized_project_update/project_recalculate_worker.rb b/app/workers/authorized_project_update/project_recalculate_worker.rb index 1b5faee0b6f..cbf068f0b85 100644 --- a/app/workers/authorized_project_update/project_recalculate_worker.rb +++ b/app/workers/authorized_project_update/project_recalculate_worker.rb @@ -9,7 +9,7 @@ module AuthorizedProjectUpdate prepend WaitableWorker - feature_category :authentication_and_authorization + feature_category :system_access urgency :high queue_namespace :authorized_project_update diff --git a/app/workers/authorized_project_update/user_refresh_from_replica_worker.rb b/app/workers/authorized_project_update/user_refresh_from_replica_worker.rb index daebb23baae..cdc0a097c92 100644 --- a/app/workers/authorized_project_update/user_refresh_from_replica_worker.rb +++ b/app/workers/authorized_project_update/user_refresh_from_replica_worker.rb @@ -5,7 +5,7 @@ module AuthorizedProjectUpdate include ApplicationWorker sidekiq_options retry: 3 - feature_category :authentication_and_authorization + feature_category :system_access urgency :low data_consistency :always queue_namespace :authorized_project_update diff --git a/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb b/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb index 8452f2a7821..ae243a94d3d 100644 --- a/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb +++ b/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb @@ -16,7 +16,7 @@ module AuthorizedProjectUpdate sidekiq_options retry: 3 - feature_category :authentication_and_authorization + feature_category :system_access urgency :low queue_namespace :authorized_project_update diff --git a/app/workers/authorized_project_update/user_refresh_with_low_urgency_worker.rb b/app/workers/authorized_project_update/user_refresh_with_low_urgency_worker.rb index 7ca59a72adf..d6b41ba949c 100644 --- a/app/workers/authorized_project_update/user_refresh_with_low_urgency_worker.rb +++ b/app/workers/authorized_project_update/user_refresh_with_low_urgency_worker.rb @@ -2,7 +2,7 @@ module AuthorizedProjectUpdate class UserRefreshWithLowUrgencyWorker < ::AuthorizedProjectsWorker - feature_category :authentication_and_authorization + feature_category :system_access urgency :low queue_namespace :authorized_project_update deduplicate :until_executing, including_scheduled: true diff --git a/app/workers/authorized_projects_worker.rb b/app/workers/authorized_projects_worker.rb index 4312ba41367..b553a2cd14e 100644 --- a/app/workers/authorized_projects_worker.rb +++ b/app/workers/authorized_projects_worker.rb @@ -8,7 +8,7 @@ class AuthorizedProjectsWorker sidekiq_options retry: 3 prepend WaitableWorker - feature_category :authentication_and_authorization + feature_category :system_access urgency :high weight 2 idempotent! diff --git a/app/workers/ci/archive_traces_cron_worker.rb b/app/workers/ci/archive_traces_cron_worker.rb index fe23d10c2ac..879192e67c4 100644 --- a/app/workers/ci/archive_traces_cron_worker.rb +++ b/app/workers/ci/archive_traces_cron_worker.rb @@ -11,20 +11,12 @@ module Ci feature_category :continuous_integration deduplicate :until_executed, including_scheduled: true - # rubocop: disable CodeReuse/ActiveRecord def perform # Archive stale live traces which still resides in redis or database # This could happen when Ci::ArchiveTraceWorker sidekiq jobs were lost by receiving SIGKILL # More details in https://gitlab.com/gitlab-org/gitlab-foss/issues/36791 - if Feature.enabled?(:deduplicate_archive_traces_cron_worker) - Ci::ArchiveTraceService.new.batch_execute(worker_name: self.class.name) - else - Ci::Build.with_stale_live_trace.find_each(batch_size: 100) do |build| - Ci::ArchiveTraceService.new.execute(build, worker_name: self.class.name) - end - end + Ci::ArchiveTraceService.new.batch_execute(worker_name: self.class.name) end - # rubocop: enable CodeReuse/ActiveRecord end end diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb index e2e31b0a5bd..ce77592daac 100644 --- a/app/workers/concerns/application_worker.rb +++ b/app/workers/concerns/application_worker.rb @@ -11,6 +11,7 @@ module ApplicationWorker include WorkerAttributes include WorkerContext include Gitlab::SidekiqVersioning::Worker + include Gitlab::Loggable LOGGING_EXTRA_KEY = 'extra' SAFE_PUSH_BULK_LIMIT = 1000 @@ -28,7 +29,7 @@ module ApplicationWorker 'jid' => jid ) - payload.stringify_keys.merge(context) + build_structured_payload(**payload).merge(context) end def log_extra_metadata_on_done(key, value) diff --git a/app/workers/concerns/gitlab/github_import/object_importer.rb b/app/workers/concerns/gitlab/github_import/object_importer.rb index c5c7da23892..7e488862696 100644 --- a/app/workers/concerns/gitlab/github_import/object_importer.rb +++ b/app/workers/concerns/gitlab/github_import/object_importer.rb @@ -13,12 +13,27 @@ module Gitlab sidekiq_options retry: 3 include GithubImport::Queue include ReschedulingMethods - include Gitlab::NotifyUponDeath feature_category :importers worker_has_external_dependencies! + + sidekiq_retries_exhausted do |msg| + args = msg['args'] + correlation_id = msg['correlation_id'] + jid = msg['jid'] + + new.perform_failure(args[0], args[1], correlation_id) + + # If a job is being exhausted we still want to notify the + # Gitlab::Import::AdvanceStageWorker to prevent the entire import from getting stuck + if args.length == 3 && (key = args.last) && key.is_a?(String) + JobWaiter.notify(key, jid) + end + end end + NotRetriableError = Class.new(StandardError) + # project - An instance of `Project` to import the data into. # client - An instance of `Gitlab::GithubImport::Client` # hash - A Hash containing the details of the object to import. @@ -47,13 +62,27 @@ module Gitlab # Representation is created but the developer forgot to add a # `:github_identifiers` field. track_and_raise_exception(project, e, fail_import: true) - rescue ActiveRecord::RecordInvalid => e + rescue ActiveRecord::RecordInvalid, NotRetriableError => e # We do not raise exception to prevent job retry - track_exception(project, e) + failure = track_exception(project, e) + add_identifiers_to_failure(failure, object.github_identifiers) rescue StandardError => e track_and_raise_exception(project, e) end + # hash - A Hash containing the details of the object to import. + def perform_failure(project_id, hash, correlation_id) + project = Project.find_by_id(project_id) + return unless project + + failure = project.import_failures.failures_by_correlation_id(correlation_id).first + return unless failure + + object = representation_class.from_json_hash(hash) + + add_identifiers_to_failure(failure, object.github_identifiers) + end + def increment_object_counter?(_object) true end @@ -103,6 +132,10 @@ module Gitlab raise(exception) end + + def add_identifiers_to_failure(failure, external_identifiers) + failure.update_column(:external_identifiers, external_identifiers) + end end end end diff --git a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb index f40855a7455..53e3ac3a1b0 100644 --- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb +++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb @@ -68,7 +68,7 @@ module ContainerExpirationPolicies container_repository_id: repo.id ) - repo.cleanup_ongoing! + repo.start_expiration_policy! end end end @@ -95,10 +95,9 @@ module ContainerExpirationPolicies def cleanup_scheduled_count strong_memoize(:cleanup_scheduled_count) do limit = max_running_jobs + 1 - ContainerExpirationPolicy.with_container_repositories - .runnable_schedules - .limit(limit) - .count + ContainerRepository.requiring_cleanup + .limit(limit) + .count end end diff --git a/app/workers/delete_user_worker.rb b/app/workers/delete_user_worker.rb index 0af084caf86..bca156ff84c 100644 --- a/app/workers/delete_user_worker.rb +++ b/app/workers/delete_user_worker.rb @@ -7,7 +7,7 @@ class DeleteUserWorker # rubocop:disable Scalability/IdempotentWorker sidekiq_options retry: 3 - feature_category :authentication_and_authorization + feature_category :user_management loggable_arguments 2 def perform(current_user_id, delete_user_id, options = {}) diff --git a/app/workers/gitlab/github_import/advance_stage_worker.rb b/app/workers/gitlab/github_import/advance_stage_worker.rb index a9f645bd634..45f4bf486d7 100644 --- a/app/workers/gitlab/github_import/advance_stage_worker.rb +++ b/app/workers/gitlab/github_import/advance_stage_worker.rb @@ -20,6 +20,7 @@ module Gitlab # The known importer stages and their corresponding Sidekiq workers. STAGES = { + collaborators: Stage::ImportCollaboratorsWorker, pull_requests_merged_by: Stage::ImportPullRequestsMergedByWorker, pull_request_review_requests: Stage::ImportPullRequestsReviewRequestsWorker, pull_request_reviews: Stage::ImportPullRequestsReviewsWorker, diff --git a/app/workers/gitlab/github_import/import_collaborator_worker.rb b/app/workers/gitlab/github_import/import_collaborator_worker.rb new file mode 100644 index 00000000000..35cb3fa6830 --- /dev/null +++ b/app/workers/gitlab/github_import/import_collaborator_worker.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +module Gitlab + module GithubImport + class ImportCollaboratorWorker # rubocop:disable Scalability/IdempotentWorker + include ObjectImporter + + def representation_class + Representation::Collaborator + end + + def importer_class + Importer::CollaboratorImporter + end + + def object_type + :collaborator + end + end + end +end diff --git a/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb b/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb new file mode 100644 index 00000000000..d63d1fd3f5f --- /dev/null +++ b/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb @@ -0,0 +1,66 @@ +# frozen_string_literal: true + +module Gitlab + module GithubImport + module Stage + class ImportCollaboratorsWorker # rubocop:disable Scalability/IdempotentWorker + include ApplicationWorker + + data_consistency :always + + sidekiq_options retry: 3 + include GithubImport::Queue + include StageMethods + + # client - An instance of Gitlab::GithubImport::Client. + # project - An instance of Project. + def import(client, project) + info(project.id, message: 'starting importer', importer: 'Importer::CollaboratorsImporter') + return skip_to_next_stage(project) unless has_push_access?(client, project.import_source) + + waiter = Importer::CollaboratorsImporter.new(project, client).execute + project.import_state.refresh_jid_expiration + + move_to_next_stage(project, { waiter.key => waiter.jobs_remaining }) + rescue StandardError => e + Gitlab::Import::ImportFailureService.track( + project_id: project.id, + error_source: self.class.name, + exception: e, + fail_import: abort_on_failure, + metrics: true + ) + + raise(e) + end + + private + + def has_push_access?(client, repo) + client.repository(repo).dig(:permissions, :push) + end + + def skip_to_next_stage(project) + Gitlab::GithubImport::Logger.warn( + log_attributes( + project.id, + message: 'no push access rights to fetch collaborators', + importer: 'Importer::CollaboratorsImporter' + ) + ) + move_to_next_stage(project, {}) + end + + def move_to_next_stage(project, waiters = {}) + AdvanceStageWorker.perform_async( + project.id, waiters, :pull_requests_merged_by + ) + end + + def abort_on_failure + true + end + end + end + end +end diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb index 71d0247bae0..e7eee0915d5 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb @@ -25,7 +25,7 @@ module Gitlab AdvanceStageWorker.perform_async( project.id, { waiter.key => waiter.jobs_remaining }, - :pull_requests_merged_by + :collaborators ) rescue StandardError => e Gitlab::Import::ImportFailureService.track( diff --git a/app/workers/gitlab/github_import/stage/import_repository_worker.rb b/app/workers/gitlab/github_import/stage/import_repository_worker.rb index 8c1a2cd2677..e13f43ee1f3 100644 --- a/app/workers/gitlab/github_import/stage/import_repository_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_repository_worker.rb @@ -72,7 +72,7 @@ module Gitlab return unless last_github_issue - Issue.track_project_iid!(project, last_github_issue[:number]) + Issue.track_namespace_iid!(project.project_namespace, last_github_issue[:number]) end end end diff --git a/app/workers/gitlab_service_ping_worker.rb b/app/workers/gitlab_service_ping_worker.rb index b02e7318585..53a4361fb48 100644 --- a/app/workers/gitlab_service_ping_worker.rb +++ b/app/workers/gitlab_service_ping_worker.rb @@ -52,3 +52,5 @@ class GitlabServicePingWorker # rubocop:disable Scalability/IdempotentWorker nil end end + +GitlabServicePingWorker.prepend_mod diff --git a/app/workers/group_destroy_worker.rb b/app/workers/group_destroy_worker.rb index 92195d3fe16..a116944feb9 100644 --- a/app/workers/group_destroy_worker.rb +++ b/app/workers/group_destroy_worker.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker +class GroupDestroyWorker include ApplicationWorker data_consistency :always @@ -10,6 +10,9 @@ class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker feature_category :subgroups + idempotent! + deduplicate :until_executed, ttl: 2.hours + def perform(group_id, user_id) begin group = Group.find(group_id) diff --git a/app/workers/groups/update_two_factor_requirement_for_members_worker.rb b/app/workers/groups/update_two_factor_requirement_for_members_worker.rb index ac1d3589516..ca68a82ec66 100644 --- a/app/workers/groups/update_two_factor_requirement_for_members_worker.rb +++ b/app/workers/groups/update_two_factor_requirement_for_members_worker.rb @@ -9,7 +9,7 @@ module Groups idempotent! - feature_category :authentication_and_authorization + feature_category :system_access def perform(group_id) group = Group.find_by_id(group_id) diff --git a/app/workers/issuable_export_csv_worker.rb b/app/workers/issuable_export_csv_worker.rb index 1c5fab8c4c0..d5e3a86eac1 100644 --- a/app/workers/issuable_export_csv_worker.rb +++ b/app/workers/issuable_export_csv_worker.rb @@ -25,7 +25,13 @@ class IssuableExportCsvWorker # rubocop:disable Scalability/IdempotentWorker def export_service(type, user, project, params) issuable_classes = issuable_classes_for(type.to_sym) issuables = issuable_classes[:finder].new(user, parse_params(params, project.id, type)).execute - issuable_classes[:service].new(issuables, project) + + if type.to_sym == :issue # issues do not support field selection for export + issuable_classes[:service].new(issuables, project, user) + else + fields = params.with_indifferent_access.delete(:selected_fields) || [] + issuable_classes[:service].new(issuables, project, fields) + end end def issuable_classes_for(type) @@ -34,6 +40,8 @@ class IssuableExportCsvWorker # rubocop:disable Scalability/IdempotentWorker { finder: IssuesFinder, service: Issues::ExportCsvService } when :merge_request { finder: MergeRequestsFinder, service: MergeRequests::ExportCsvService } + when :work_item + { finder: WorkItems::WorkItemsFinder, service: WorkItems::ExportCsvService } else raise ArgumentError, type_error_message(type) end @@ -47,7 +55,13 @@ class IssuableExportCsvWorker # rubocop:disable Scalability/IdempotentWorker end def type_error_message(type) - "Type parameter must be :issue or :merge_request, it was #{type}" + types_sentence = allowed_types.to_sentence(last_word_connector: ' or ') + + "Type parameter must be #{types_sentence}, it was #{type}" + end + + def allowed_types + %w[:issue :merge_request :work_item] end end diff --git a/app/workers/issues/placement_worker.rb b/app/workers/issues/placement_worker.rb index ec29a754128..0a4f2612912 100644 --- a/app/workers/issues/placement_worker.rb +++ b/app/workers/issues/placement_worker.rb @@ -40,7 +40,7 @@ module Issues leftover = to_place.pop if to_place.count > QUERY_LIMIT Issue.move_nulls_to_end(to_place) - Issues::BaseService.new(project: nil).rebalance_if_needed(to_place.max_by(&:relative_position)) + Issues::BaseService.new(container: nil).rebalance_if_needed(to_place.max_by(&:relative_position)) Issues::PlacementWorker.perform_async(nil, leftover.project_id) if leftover.present? rescue RelativePositioning::NoSpaceLeft => e Gitlab::ErrorTracking.log_exception(e, issue_id: issue_id, project_id: project_id) diff --git a/app/workers/members_destroyer/unassign_issuables_worker.rb b/app/workers/members_destroyer/unassign_issuables_worker.rb index 915551d6e30..2e6ce0005fc 100644 --- a/app/workers/members_destroyer/unassign_issuables_worker.rb +++ b/app/workers/members_destroyer/unassign_issuables_worker.rb @@ -11,7 +11,7 @@ module MembersDestroyer ENTITY_TYPES = %w(Group Project).freeze queue_namespace :unassign_issuables - feature_category :authentication_and_authorization + feature_category :user_management idempotent! diff --git a/app/workers/new_merge_request_worker.rb b/app/workers/new_merge_request_worker.rb index a32a414c0ba..74239c5d968 100644 --- a/app/workers/new_merge_request_worker.rb +++ b/app/workers/new_merge_request_worker.rb @@ -18,7 +18,6 @@ class NewMergeRequestWorker # rubocop:disable Scalability/IdempotentWorker def perform(merge_request_id, user_id) return unless objects_found?(merge_request_id, user_id) - return if issuable.prepared? MergeRequests::AfterCreateService .new(project: issuable.target_project, current_user: user) diff --git a/app/workers/packages/debian/generate_distribution_worker.rb b/app/workers/packages/debian/generate_distribution_worker.rb index 1eff3ea02dd..f0c753c3a9b 100644 --- a/app/workers/packages/debian/generate_distribution_worker.rb +++ b/app/workers/packages/debian/generate_distribution_worker.rb @@ -20,7 +20,7 @@ module Packages loggable_arguments 0 def perform(container_type, distribution_id) - @container_type = container_type + @container_type = container_type.to_sym @distribution_id = distribution_id return unless distribution diff --git a/app/workers/personal_access_tokens/expired_notification_worker.rb b/app/workers/personal_access_tokens/expired_notification_worker.rb index b119957fa2c..f86bd604cdf 100644 --- a/app/workers/personal_access_tokens/expired_notification_worker.rb +++ b/app/workers/personal_access_tokens/expired_notification_worker.rb @@ -8,7 +8,7 @@ module PersonalAccessTokens include CronjobQueue - feature_category :authentication_and_authorization + feature_category :system_access MAX_TOKENS = 100 diff --git a/app/workers/personal_access_tokens/expiring_worker.rb b/app/workers/personal_access_tokens/expiring_worker.rb index f4afa9f8994..de0bda82573 100644 --- a/app/workers/personal_access_tokens/expiring_worker.rb +++ b/app/workers/personal_access_tokens/expiring_worker.rb @@ -8,7 +8,7 @@ module PersonalAccessTokens include CronjobQueue - feature_category :authentication_and_authorization + feature_category :system_access MAX_TOKENS = 100 diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index f95176da252..676a834d79d 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -140,8 +140,6 @@ class PostReceive end def emit_snowplow_event(project, user) - return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project.namespace) - metric_path = 'counts.source_code_pushes' Gitlab::Tracking.event( 'PostReceive', diff --git a/app/workers/project_destroy_worker.rb b/app/workers/project_destroy_worker.rb index 45d0ebd2b65..181eebe56e8 100644 --- a/app/workers/project_destroy_worker.rb +++ b/app/workers/project_destroy_worker.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker +class ProjectDestroyWorker include ApplicationWorker data_consistency :always @@ -10,6 +10,9 @@ class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker feature_category :source_code_management + idempotent! + deduplicate :until_executed, ttl: 2.hours + def perform(project_id, user_id, params) project = Project.find(project_id) user = User.find(user_id) diff --git a/app/workers/projects/forks/sync_worker.rb b/app/workers/projects/forks/sync_worker.rb new file mode 100644 index 00000000000..2fa6785bc91 --- /dev/null +++ b/app/workers/projects/forks/sync_worker.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +module Projects + module Forks + class SyncWorker + include ApplicationWorker + + data_consistency :sticky + idempotent! + urgency :high + feature_category :source_code_management + + def perform(project_id, user_id, ref) + project = Project.find_by_id(project_id) + user = User.find_by_id(user_id) + return unless project && user + + ::Projects::Forks::SyncService.new(project, user, ref).execute + end + end + end +end diff --git a/app/workers/projects/import_export/create_relation_exports_worker.rb b/app/workers/projects/import_export/create_relation_exports_worker.rb new file mode 100644 index 00000000000..9ca69a5500a --- /dev/null +++ b/app/workers/projects/import_export/create_relation_exports_worker.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +module Projects + module ImportExport + class CreateRelationExportsWorker + include ApplicationWorker + include ExceptionBacktrace + + idempotent! + data_consistency :always + deduplicate :until_executed + feature_category :importers + worker_resource_boundary :cpu + sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + + # This delay is an arbitrary number to finish the export quicker in case all relations + # are exported before the first execution of the WaitRelationExportsWorker worker. + INITIAL_DELAY = 10.seconds + + # rubocop: disable CodeReuse/ActiveRecord + def perform(user_id, project_id, after_export_strategy = {}) + project = Project.find_by_id(project_id) + return unless project + + project_export_job = project.export_jobs.find_or_create_by!(jid: jid) + return if project_export_job.started? + + relation_exports = RelationExport.relation_names_list.map do |relation_name| + project_export_job.relation_exports.find_or_create_by!(relation: relation_name) + end + + relation_exports.each do |relation_export| + RelationExportWorker.with_status.perform_async(relation_export.id) + end + + WaitRelationExportsWorker.perform_in( + INITIAL_DELAY, + project_export_job.id, + user_id, + after_export_strategy + ) + + project_export_job.start! + end + # rubocop: enable CodeReuse/ActiveRecord + end + end +end diff --git a/app/workers/projects/import_export/relation_export_worker.rb b/app/workers/projects/import_export/relation_export_worker.rb index 13ca33c4457..7747d4f4099 100644 --- a/app/workers/projects/import_export/relation_export_worker.rb +++ b/app/workers/projects/import_export/relation_export_worker.rb @@ -10,13 +10,34 @@ module Projects data_consistency :always deduplicate :until_executed feature_category :importers - sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + sidekiq_options dead: false, status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION urgency :low worker_resource_boundary :memory + sidekiq_retries_exhausted do |job, exception| + relation_export = Projects::ImportExport::RelationExport.find(job['args'].first) + project_export_job = relation_export.project_export_job + project = project_export_job.project + + relation_export.mark_as_failed(job['error_message']) + + log_payload = { + message: 'Project relation export failed', + export_error: job['error_message'], + relation: relation_export.relation, + project_export_job_id: project_export_job.id, + project_name: project.name, + project_id: project.id + } + Gitlab::ExceptionLogFormatter.format!(exception, log_payload) + Gitlab::Export::Logger.error(log_payload) + end + def perform(project_relation_export_id) relation_export = Projects::ImportExport::RelationExport.find(project_relation_export_id) + relation_export.retry! if relation_export.started? + if relation_export.queued? Projects::ImportExport::RelationExportService.new(relation_export, jid).execute end diff --git a/app/workers/projects/import_export/wait_relation_exports_worker.rb b/app/workers/projects/import_export/wait_relation_exports_worker.rb new file mode 100644 index 00000000000..4250073edce --- /dev/null +++ b/app/workers/projects/import_export/wait_relation_exports_worker.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +module Projects + module ImportExport + class WaitRelationExportsWorker + include ApplicationWorker + include ExceptionBacktrace + + idempotent! + data_consistency :always + deduplicate :until_executed + feature_category :importers + loggable_arguments 1, 2 + worker_resource_boundary :cpu + sidekiq_options dead: false, status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + + INTERVAL = 1.minute + + def perform(project_export_job_id, user_id, after_export_strategy = {}) + @export_job = ProjectExportJob.find(project_export_job_id) + + return unless @export_job.started? + + @export_job.update_attribute(:jid, jid) + @relation_exports = @export_job.relation_exports + + if queued_relation_exports.any? || started_relation_exports.any? + fail_started_jobs_no_longer_running + + self.class.perform_in(INTERVAL, project_export_job_id, user_id, after_export_strategy) + return + end + + if all_relation_export_finished? + ParallelProjectExportWorker.perform_async(project_export_job_id, user_id, after_export_strategy) + return + end + + fail_and_notify_user(user_id) + end + + private + + def relation_exports_with_status(status) + @relation_exports.select { |relation_export| relation_export.status == status } + end + + def queued_relation_exports + relation_exports_with_status(RelationExport::STATUS[:queued]) + end + + def started_relation_exports + @started_relation_exports ||= relation_exports_with_status(RelationExport::STATUS[:started]) + end + + def all_relation_export_finished? + @relation_exports.all? { |relation_export| relation_export.status == RelationExport::STATUS[:finished] } + end + + def fail_started_jobs_no_longer_running + started_relation_exports.each do |relation_export| + next if Gitlab::SidekiqStatus.running?(relation_export.jid) + next if relation_export.reset.finished? + + relation_export.mark_as_failed("Exausted number of retries to export: #{relation_export.relation}") + end + end + + def fail_and_notify_user(user_id) + @export_job.fail_op! + + @user = User.find_by_id(user_id) + return unless @user + + failed_relation_exports = relation_exports_with_status(RelationExport::STATUS[:failed]) + errors = failed_relation_exports.map(&:export_error) + + NotificationService.new.project_not_exported(@export_job.project, @user, errors) + end + end + end +end diff --git a/app/workers/prune_old_events_worker.rb b/app/workers/prune_old_events_worker.rb index c8dfb2ade0a..927c21d9c53 100644 --- a/app/workers/prune_old_events_worker.rb +++ b/app/workers/prune_old_events_worker.rb @@ -15,9 +15,13 @@ class PruneOldEventsWorker # rubocop:disable Scalability/IdempotentWorker DELETE_LIMIT = 10_000 def perform - # Contribution calendar shows maximum 12 months of events, we retain 3 years for data integrity. - cutoff_date = (3.years + 1.day).ago + if Feature.enabled?(:ops_prune_old_events, type: :ops) + # Contribution calendar shows maximum 12 months of events, we retain 3 years for data integrity. + cutoff_date = (3.years + 1.day).ago - Event.unscoped.created_before(cutoff_date).delete_with_limit(DELETE_LIMIT) + Event.unscoped.created_before(cutoff_date).delete_with_limit(DELETE_LIMIT) + else + Gitlab::AppLogger.info(":ops_prune_old_events is disabled, skipping.") + end end end diff --git a/app/workers/remove_expired_group_links_worker.rb b/app/workers/remove_expired_group_links_worker.rb index 37298c53a5c..f1da5f37945 100644 --- a/app/workers/remove_expired_group_links_worker.rb +++ b/app/workers/remove_expired_group_links_worker.rb @@ -7,7 +7,7 @@ class RemoveExpiredGroupLinksWorker # rubocop:disable Scalability/IdempotentWork include CronjobQueue # rubocop:disable Scalability/CronWorkerContext - feature_category :authentication_and_authorization + feature_category :system_access def perform ProjectGroupLink.expired.find_each do |link| diff --git a/app/workers/remove_expired_members_worker.rb b/app/workers/remove_expired_members_worker.rb index c9eb715a522..b5031f4cda6 100644 --- a/app/workers/remove_expired_members_worker.rb +++ b/app/workers/remove_expired_members_worker.rb @@ -7,7 +7,7 @@ class RemoveExpiredMembersWorker # rubocop:disable Scalability/IdempotentWorker include CronjobQueue - feature_category :authentication_and_authorization + feature_category :system_access worker_resource_boundary :cpu # rubocop: disable CodeReuse/ActiveRecord diff --git a/app/workers/remove_unaccepted_member_invites_worker.rb b/app/workers/remove_unaccepted_member_invites_worker.rb index 7fe45b26094..96f60b5fa12 100644 --- a/app/workers/remove_unaccepted_member_invites_worker.rb +++ b/app/workers/remove_unaccepted_member_invites_worker.rb @@ -7,7 +7,7 @@ class RemoveUnacceptedMemberInvitesWorker # rubocop:disable Scalability/Idempote include CronjobQueue # rubocop:disable Scalability/CronWorkerContext - feature_category :authentication_and_authorization + feature_category :system_access urgency :low idempotent! diff --git a/app/workers/stage_update_worker.rb b/app/workers/stage_update_worker.rb index e0d8958fc80..97da76346b6 100644 --- a/app/workers/stage_update_worker.rb +++ b/app/workers/stage_update_worker.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +# This will be scheduled to be removed after removing the FF ci_remove_ensure_stage_service class StageUpdateWorker include ApplicationWorker |
