diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:07:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:07:52 +0000 |
commit | 7e019504f5ac6decde690565857238e7e59aa034 (patch) | |
tree | fab8832b40e25fc9bc1ae54b9303b95ea146b5d5 /app | |
parent | 116d4e56e83a1f408afe710ce070e699ba206475 (diff) | |
download | gitlab-ce-7e019504f5ac6decde690565857238e7e59aa034.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
27 files changed, 341 insertions, 44 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index dbfb3e97c20..531d23bb6e5 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -19,7 +19,12 @@ import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue'; import { s__ } from '~/locale'; import createFlash from '~/flash'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { mergeUrlParams, redirectTo, refreshCurrentPage } from '~/lib/utils/url_utility'; +import { + mergeUrlParams, + redirectTo, + refreshCurrentPage, + updateHistory, +} from '~/lib/utils/url_utility'; import invalidUrl from '~/lib/utils/invalid_url'; import Icon from '~/vue_shared/components/icon.vue'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; @@ -356,6 +361,14 @@ export default { refreshDashboard() { refreshCurrentPage(); }, + + onTimeRangeZoom({ start, end }) { + updateHistory({ + url: mergeUrlParams({ start, end }, window.location.href), + title: document.title, + }); + this.selectedTimeRange = { start, end }; + }, }, addMetric: { title: s__('Metrics|Add metric'), @@ -577,6 +590,7 @@ export default { :alerts-endpoint="alertsEndpoint" :prometheus-alerts-available="prometheusAlertsAvailable" :index="`${index}-${graphIndex}`" + @timerangezoom="onTimeRangeZoom" /> </div> </div> diff --git a/app/assets/javascripts/monitoring/components/panel_type.vue b/app/assets/javascripts/monitoring/components/panel_type.vue index ba92b72a71d..79f2c8ad41f 100644 --- a/app/assets/javascripts/monitoring/components/panel_type.vue +++ b/app/assets/javascripts/monitoring/components/panel_type.vue @@ -23,6 +23,10 @@ import MonitorEmptyChart from './charts/empty_chart.vue'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import { timeRangeToUrl, downloadCSVOptions, generateLinkToChartOptions } from '../utils'; +const events = { + timeRangeZoom: 'timerangezoom', +}; + export default { components: { MonitorSingleStatChart, @@ -159,6 +163,7 @@ export default { }, onDatazoom({ start, end }) { this.zoomedTimeRange = { start, end }; + this.$emit(events.timeRangeZoom, { start, end }); }, }, }; diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js index 8eccba07c38..c1edf7be870 100644 --- a/app/assets/javascripts/mr_notes/index.js +++ b/app/assets/javascripts/mr_notes/index.js @@ -4,6 +4,7 @@ import initNotesApp from './init_notes'; import initDiffsApp from '../diffs'; import discussionCounter from '../notes/components/discussion_counter.vue'; import initDiscussionFilters from '../notes/discussion_filters'; +import initSortDiscussions from '../notes/sort_discussions'; import MergeRequest from '../merge_request'; import { resetServiceWorkersPublicPath } from '../lib/utils/webpack'; @@ -32,5 +33,6 @@ export default function initMrNotes() { }); initDiscussionFilters(store); + initSortDiscussions(store); initDiffsApp(store); } diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index 762228dd138..c1dd56aedf2 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -12,6 +12,7 @@ import commentForm from './comment_form.vue'; import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue'; import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue'; import skeletonLoadingContainer from '../../vue_shared/components/notes/skeleton_note.vue'; +import OrderedLayout from '~/vue_shared/components/ordered_layout.vue'; import highlightCurrentUser from '~/behaviors/markdown/highlight_current_user'; import { __ } from '~/locale'; import initUserPopovers from '~/user_popovers'; @@ -27,6 +28,7 @@ export default { placeholderSystemNote, skeletonLoadingContainer, discussionFilterNote, + OrderedLayout, }, props: { noteableData: { @@ -70,7 +72,11 @@ export default { 'getNoteableData', 'userCanReply', 'discussionTabCounter', + 'sortDirection', ]), + sortDirDesc() { + return this.sortDirection === constants.DESC; + }, discussionTabCounterText() { return this.isLoading ? '' : this.discussionTabCounter; }, @@ -91,6 +97,9 @@ export default { canReply() { return this.userCanReply && !this.commentsDisabled; }, + slotKeys() { + return this.sortDirDesc ? ['form', 'comments'] : ['comments', 'form']; + }, }, watch: { shouldShow() { @@ -156,6 +165,9 @@ export default { 'convertToDiscussion', 'stopPolling', ]), + discussionIsIndividualNoteAndNotConverted(discussion) { + return discussion.individual_note && !this.convertedDisscussionIds.includes(discussion.id); + }, handleHashChanged() { const noteId = this.checkLocationHash(); @@ -232,44 +244,51 @@ export default { <template> <div v-show="shouldShow" id="notes"> - <ul id="notes-list" class="notes main-notes-list timeline"> - <template v-for="discussion in allDiscussions"> - <skeleton-loading-container v-if="discussion.isSkeletonNote" :key="discussion.id" /> - <template v-else-if="discussion.isPlaceholderNote"> - <placeholder-system-note - v-if="discussion.placeholderType === $options.systemNote" - :key="discussion.id" - :note="discussion.notes[0]" - /> - <placeholder-note v-else :key="discussion.id" :note="discussion.notes[0]" /> - </template> - <template - v-else-if="discussion.individual_note && !convertedDisscussionIds.includes(discussion.id)" - > - <system-note - v-if="discussion.notes[0].system" - :key="discussion.id" - :note="discussion.notes[0]" - /> - <noteable-note - v-else - :key="discussion.id" - :note="discussion.notes[0]" - :show-reply-button="canReply" - @startReplying="startReplying(discussion.id)" - /> - </template> - <noteable-discussion - v-else - :key="discussion.id" - :discussion="discussion" - :render-diff-file="true" - :help-page-path="helpPagePath" + <ordered-layout :slot-keys="slotKeys"> + <template #form> + <comment-form + v-if="!commentsDisabled" + class="js-comment-form" + :noteable-type="noteableType" /> </template> - <discussion-filter-note v-show="commentsDisabled" /> - </ul> - - <comment-form v-if="!commentsDisabled" :noteable-type="noteableType" /> + <template #comments> + <ul id="notes-list" class="notes main-notes-list timeline"> + <template v-for="discussion in allDiscussions"> + <skeleton-loading-container v-if="discussion.isSkeletonNote" :key="discussion.id" /> + <template v-else-if="discussion.isPlaceholderNote"> + <placeholder-system-note + v-if="discussion.placeholderType === $options.systemNote" + :key="discussion.id" + :note="discussion.notes[0]" + /> + <placeholder-note v-else :key="discussion.id" :note="discussion.notes[0]" /> + </template> + <template v-else-if="discussionIsIndividualNoteAndNotConverted(discussion)"> + <system-note + v-if="discussion.notes[0].system" + :key="discussion.id" + :note="discussion.notes[0]" + /> + <noteable-note + v-else + :key="discussion.id" + :note="discussion.notes[0]" + :show-reply-button="canReply" + @startReplying="startReplying(discussion.id)" + /> + </template> + <noteable-discussion + v-else + :key="discussion.id" + :discussion="discussion" + :render-diff-file="true" + :help-page-path="helpPagePath" + /> + </template> + <discussion-filter-note v-show="commentsDisabled" /> + </ul> + </template> + </ordered-layout> </div> </template> diff --git a/app/assets/javascripts/notes/components/sort_discussion.vue b/app/assets/javascripts/notes/components/sort_discussion.vue new file mode 100644 index 00000000000..16eded52763 --- /dev/null +++ b/app/assets/javascripts/notes/components/sort_discussion.vue @@ -0,0 +1,64 @@ +<script> +import { GlIcon } from '@gitlab/ui'; +import { mapActions, mapGetters } from 'vuex'; +import { __ } from '~/locale'; +import { ASC, DESC } from '../constants'; + +const SORT_OPTIONS = [ + { key: DESC, text: __('Newest first'), cls: 'js-newest-first' }, + { key: ASC, text: __('Oldest first'), cls: 'js-oldest-first' }, +]; + +export default { + SORT_OPTIONS, + components: { + GlIcon, + }, + computed: { + ...mapGetters(['sortDirection']), + selectedOption() { + return SORT_OPTIONS.find(({ key }) => this.sortDirection === key); + }, + dropdownText() { + return this.selectedOption.text; + }, + }, + methods: { + ...mapActions(['setDiscussionSortDirection']), + fetchSortedDiscussions(direction) { + if (this.isDropdownItemActive(direction)) { + return; + } + + this.setDiscussionSortDirection(direction); + }, + isDropdownItemActive(sortDir) { + return sortDir === this.sortDirection; + }, + }, +}; +</script> + +<template> + <div class="mr-2 d-inline-block align-bottom full-width-mobile"> + <button class="btn btn-sm js-dropdown-text" data-toggle="dropdown" aria-expanded="false"> + {{ dropdownText }} + <gl-icon name="chevron-down" /> + </button> + <div ref="dropdownMenu" class="dropdown-menu dropdown-menu-selectable dropdown-menu-right"> + <div class="dropdown-content"> + <ul> + <li v-for="{ text, key, cls } in $options.SORT_OPTIONS" :key="key"> + <button + :class="[cls, { 'is-active': isDropdownItemActive(key) }]" + type="button" + @click="fetchSortedDiscussions(key)" + > + {{ text }} + </button> + </li> + </ul> + </div> + </div> + </div> +</template> diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/notes/constants.js index e9a81bc9553..c1449237f8a 100644 --- a/app/assets/javascripts/notes/constants.js +++ b/app/assets/javascripts/notes/constants.js @@ -19,6 +19,8 @@ export const DISCUSSION_FILTERS_DEFAULT_VALUE = 0; export const DISCUSSION_TAB_LABEL = 'show'; export const NOTE_UNDERSCORE = 'note_'; export const TIME_DIFFERENCE_VALUE = 10; +export const ASC = 'asc'; +export const DESC = 'desc'; export const NOTEABLE_TYPE_MAPPING = { Issue: ISSUE_NOTEABLE_TYPE, diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js index 30372103590..8f9e2359e0d 100644 --- a/app/assets/javascripts/notes/index.js +++ b/app/assets/javascripts/notes/index.js @@ -1,6 +1,7 @@ import Vue from 'vue'; import notesApp from './components/notes_app.vue'; import initDiscussionFilters from './discussion_filters'; +import initSortDiscussions from './sort_discussions'; import createStore from './stores'; document.addEventListener('DOMContentLoaded', () => { @@ -50,4 +51,5 @@ document.addEventListener('DOMContentLoaded', () => { }); initDiscussionFilters(store); + initSortDiscussions(store); }); diff --git a/app/assets/javascripts/notes/sort_discussions.js b/app/assets/javascripts/notes/sort_discussions.js new file mode 100644 index 00000000000..a06c23f5f76 --- /dev/null +++ b/app/assets/javascripts/notes/sort_discussions.js @@ -0,0 +1,16 @@ +import Vue from 'vue'; +import SortDiscussion from './components/sort_discussion.vue'; + +export default store => { + const el = document.getElementById('js-vue-sort-issue-discussions'); + + if (!el) return null; + + return new Vue({ + el, + store, + render(createElement) { + return createElement(SortDiscussion); + }, + }); +}; diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index accc37121d0..1b80b59621a 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -69,6 +69,10 @@ export const updateDiscussion = ({ commit, state }, discussion) => { return utils.findNoteObjectById(state.discussions, discussion.id); }; +export const setDiscussionSortDirection = ({ commit }, direction) => { + commit(types.SET_DISCUSSIONS_SORT, direction); +}; + export const removeNote = ({ commit, dispatch, state }, note) => { const discussion = state.discussions.find(({ id }) => id === note.discussion_id); diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 28cc9cdd7e9..eb877083bca 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -1,8 +1,16 @@ -import { flattenDeep } from 'lodash'; +import { flattenDeep, clone } from 'lodash'; import * as constants from '../constants'; import { collapseSystemNotes } from './collapse_utils'; -export const discussions = state => collapseSystemNotes(state.discussions); +export const discussions = state => { + let discussionsInState = clone(state.discussions); + // NOTE: not testing bc will be removed when backend is finished. + if (state.discussionSortOrder === constants.DESC) { + discussionsInState = discussionsInState.reverse(); + } + + return collapseSystemNotes(discussionsInState); +}; export const convertedDisscussionIds = state => state.convertedDisscussionIds; @@ -12,6 +20,13 @@ export const getNotesData = state => state.notesData; export const isNotesFetched = state => state.isNotesFetched; +/* + * WARNING: This is an example of an "unnecessary" getter + * more info found here: https://gitlab.com/groups/gitlab-org/-/epics/2913. + */ + +export const sortDirection = state => state.discussionSortOrder; + export const isLoading = state => state.isLoading; export const getNotesDataByProp = state => prop => state.notesData[prop]; diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js index 2d317dcd7da..81844ad6e98 100644 --- a/app/assets/javascripts/notes/stores/modules/index.js +++ b/app/assets/javascripts/notes/stores/modules/index.js @@ -1,10 +1,12 @@ import * as actions from '../actions'; import * as getters from '../getters'; import mutations from '../mutations'; +import { ASC } from '../../constants'; export default () => ({ state: { discussions: [], + discussionSortOrder: ASC, convertedDisscussionIds: [], targetNoteHash: null, lastFetchedAt: null, diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/notes/stores/mutation_types.js index 0cc59f9150c..5b7225bb3d2 100644 --- a/app/assets/javascripts/notes/stores/mutation_types.js +++ b/app/assets/javascripts/notes/stores/mutation_types.js @@ -27,6 +27,7 @@ export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION'; export const SET_EXPAND_DISCUSSIONS = 'SET_EXPAND_DISCUSSIONS'; export const UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS = 'UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS'; export const SET_CURRENT_DISCUSSION_ID = 'SET_CURRENT_DISCUSSION_ID'; +export const SET_DISCUSSIONS_SORT = 'SET_DISCUSSIONS_SORT'; // Issue export const CLOSE_ISSUE = 'CLOSE_ISSUE'; diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index 68bf8394508..028fc87198c 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -263,6 +263,10 @@ export default { discussion.truncated_diff_lines = utils.prepareDiffLines(diffLines); }, + [types.SET_DISCUSSIONS_SORT](state, sort) { + state.discussionSortOrder = sort; + }, + [types.DISABLE_COMMENTS](state, value) { state.commentsDisabled = value; }, diff --git a/app/assets/javascripts/vue_shared/components/ordered_layout.vue b/app/assets/javascripts/vue_shared/components/ordered_layout.vue new file mode 100644 index 00000000000..117e79ca39f --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/ordered_layout.vue @@ -0,0 +1,12 @@ +<script> +export default { + functional: true, + render(h, context) { + const { slotKeys } = context.props; + const slots = context.slots(); + const children = slotKeys.map(key => slots[key]).filter(x => x); + + return children; + }, +}; +</script> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue index 285a0fe9ffb..842b2fdbc43 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue @@ -58,13 +58,13 @@ export default { </script> <template> - <div class="labels-select-contents-create"> + <div class="labels-select-contents-create js-labels-create"> <div class="dropdown-title d-flex align-items-center pt-0 pb-2"> <gl-button :aria-label="__('Go back')" variant="link" size="sm" - class="dropdown-header-button p-0" + class="js-btn-back dropdown-header-button p-0" @click="toggleDropdownContentsCreateView" > <gl-icon name="arrow-left" /> @@ -116,7 +116,7 @@ export default { <gl-loading-icon v-show="labelCreateInProgress" :inline="true" class="mr-1" /> {{ __('Create') }} </gl-button> - <gl-button class="pull-right" @click="toggleDropdownContentsCreateView"> + <gl-button class="pull-right js-btn-cancel-create" @click="toggleDropdownContentsCreateView"> {{ __('Cancel') }} </gl-button> </div> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue index 7ec420fa908..a3494a9e38f 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue @@ -117,7 +117,7 @@ export default { </script> <template> - <div class="labels-select-contents-list" @keydown="handleKeyDown"> + <div class="labels-select-contents-list js-labels-list" @keydown="handleKeyDown"> <gl-loading-icon v-if="labelsFetchInProgress" class="labels-fetch-loading position-absolute d-flex align-items-center w-100 h-100" diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue index 5e41a155ef6..78102caacf5 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue @@ -1,4 +1,5 @@ <script> +import $ from 'jquery'; import Vue from 'vue'; import Vuex, { mapState, mapActions } from 'vuex'; import { __ } from '~/locale'; @@ -149,9 +150,16 @@ export default { * the dropdown while dropdown is visible. */ handleDocumentClick({ target }) { + // This approach of element detection is needed + // as the dropdown wrapper is not using `GlDropdown` as + // it will also require us to use `BDropdownForm` + // which is yet to be implemented in GitLab UI. if ( this.showDropdownButton && this.showDropdownContents && + !$(target).parents('.js-btn-back').length && + !$(target).parents('.js-labels-list').length && + !target?.classList.contains('js-btn-cancel-create') && !target?.classList.contains('js-sidebar-dropdown-toggle') && !this.$refs.dropdownButtonCollapsed?.$el.contains(target) && !this.$refs.dropdownContents?.$el.contains(target) diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 5ddc60707d5..d813d7b8225 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -47,6 +47,10 @@ class Projects::IssuesController < Projects::ApplicationController push_frontend_feature_flag(:save_issuable_health_status, project.group) end + before_action only: :show do + push_frontend_feature_flag(:sort_discussions, @project) + end + around_action :allow_gitaly_ref_name_caching, only: [:discussions] respond_to :html diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index e87f1728cbb..a81fd0f7dc9 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -29,6 +29,10 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:vue_issuable_sidebar, @project.group) end + before_action only: :show do + push_frontend_feature_flag(:sort_discussions, @project) + end + around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions] def index diff --git a/app/models/member.rb b/app/models/member.rb index 089efcb81dd..a87efdf63ff 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -100,6 +100,7 @@ class Member < ApplicationRecord after_destroy :destroy_notification_setting after_destroy :post_destroy_hook, unless: :pending? after_commit :refresh_member_authorized_projects + after_commit :update_highest_role default_value_for :notification_level, NotificationSetting.levels[:global] @@ -459,6 +460,22 @@ class Member < ApplicationRecord errors.add(:access_level, s_("should be greater than or equal to %{access} inherited membership from group %{group_name}") % error_parameters) end end + + # Triggers the service to schedule a Sidekiq job to update the highest role + # for a User + # + # The job will be called outside of a transaction in order to ensure the changes + # for a Member to be commited before attempting to update the highest role. + # rubocop: disable CodeReuse/ServiceClass + def update_highest_role + return unless user_id.present? + return unless previous_changes[:access_level].present? + + run_after_commit_or_now do + Members::UpdateHighestRoleService.new(user_id).execute + end + end + # rubocop: enable CodeReuse/ServiceClass end Member.prepend_if_ee('EE::Member') diff --git a/app/models/user.rb b/app/models/user.rb index 090d033f80c..9fb3c47e143 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1694,6 +1694,11 @@ class User < ApplicationRecord end end + # Load the current highest access by looking directly at the user's memberships + def current_highest_access_level + members.non_request.maximum(:access_level) + end + protected # override, from Devise::Validatable diff --git a/app/services/members/update_highest_role_service.rb b/app/services/members/update_highest_role_service.rb new file mode 100644 index 00000000000..ce1707c13ec --- /dev/null +++ b/app/services/members/update_highest_role_service.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +module Members + class UpdateHighestRoleService < ::BaseService + include ExclusiveLeaseGuard + + LEASE_TIMEOUT = 30.minutes.to_i + + attr_reader :user_id + + def initialize(user_id) + @user_id = user_id + end + + def execute + try_obtain_lease do + UpdateHighestRoleWorker.perform_async(user_id) + end + end + + private + + def lease_key + "update_highest_role:#{user_id}" + end + + def lease_timeout + LEASE_TIMEOUT + end + + # Do not release the lease before the timeout to + # prevent multiple jobs being executed during the + # defined timeout + def lease_release? + false + end + end +end diff --git a/app/services/users/update_highest_member_role_service.rb b/app/services/users/update_highest_member_role_service.rb new file mode 100644 index 00000000000..00f0af89e8d --- /dev/null +++ b/app/services/users/update_highest_member_role_service.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +module Users + class UpdateHighestMemberRoleService < BaseService + attr_reader :user, :identity_params + + def initialize(user) + @user = user + end + + def execute + return true if user_highest_role.persisted? && highest_access_level == user_highest_role.highest_access_level + + user_highest_role.update!(highest_access_level: highest_access_level) + end + + private + + def user_highest_role + @user_highest_role ||= begin + @user.user_highest_role || @user.build_user_highest_role + end + end + + def highest_access_level + @highest_access_level ||= @user.current_highest_access_level + end + end +end diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9062f2097b8..f7702499970 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -87,6 +87,8 @@ .col-md-12.col-lg-6.js-noteable-awards = render 'award_emoji/awards_block', awardable: @issue, inline: true .col-md-12.col-lg-6.new-branch-col + - if Feature.enabled?(:sort_discussions, @project) + #js-vue-sort-issue-discussions #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } } = render 'new_branch' if show_new_branch_button? diff --git a/app/views/projects/merge_requests/_awards_block.html.haml b/app/views/projects/merge_requests/_awards_block.html.haml index 1eab28a2ff3..c1e92e22590 100644 --- a/app/views/projects/merge_requests/_awards_block.html.haml +++ b/app/views/projects/merge_requests/_awards_block.html.haml @@ -2,4 +2,6 @@ = render 'award_emoji/awards_block', awardable: @merge_request, inline: true do - if mr_tabs_position_enabled? .ml-auto.mt-auto.mb-auto + - if Feature.enabled?(:sort_discussions, @merge_request.target_project) + #js-vue-sort-issue-discussions = render "projects/merge_requests/discussion_filter" diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 72a5a2b653e..16520519a0b 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -1333,6 +1333,13 @@ :resource_boundary: :unknown :weight: 3 :idempotent: +- :name: update_highest_role + :feature_category: :authentication_and_authorization + :has_external_dependencies: + :urgency: :high + :resource_boundary: :unknown + :weight: 2 + :idempotent: true - :name: update_merge_requests :feature_category: :source_code_management :has_external_dependencies: diff --git a/app/workers/update_highest_role_worker.rb b/app/workers/update_highest_role_worker.rb new file mode 100644 index 00000000000..e62131a77d0 --- /dev/null +++ b/app/workers/update_highest_role_worker.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class UpdateHighestRoleWorker + include ApplicationWorker + + feature_category :authentication_and_authorization + urgency :high + weight 2 + + idempotent! + + # rubocop: disable CodeReuse/ActiveRecord + def perform(user_id) + user = User.active.find_by(id: user_id) + + Users::UpdateHighestMemberRoleService.new(user).execute if user.present? + end + # rubocop: enable CodeReuse/ActiveRecord +end |