From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Nov 2020 08:27:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- .../boards/components/board_assignee_dropdown.vue | 178 ++++++++++ .../boards/components/board_card_layout.vue | 5 +- .../javascripts/boards/components/board_column.vue | 49 +-- .../boards/components/board_column_new.vue | 94 ++++++ .../components/board_configuration_options.vue | 2 +- .../boards/components/board_content.vue | 8 +- .../javascripts/boards/components/board_form.vue | 4 +- .../javascripts/boards/components/board_list.vue | 15 +- .../boards/components/board_list_header.vue | 50 +-- .../boards/components/board_list_header_new.vue | 358 +++++++++++++++++++++ .../boards/components/board_list_new.vue | 2 +- .../boards/components/board_new_issue.vue | 34 +- .../boards/components/board_new_issue_new.vue | 129 ++++++++ .../boards/components/board_promotion_state.js | 1 + .../boards/components/board_settings_sidebar.vue | 18 +- .../boards/components/boards_selector.vue | 2 +- .../boards/components/issue_card_inner.vue | 35 +- .../boards/components/modal/empty_state.vue | 21 +- .../boards/components/new_list_dropdown.js | 3 +- .../boards/components/project_select.vue | 12 +- .../components/sidebar/board_sidebar_due_date.vue | 111 +++++++ .../sidebar/board_sidebar_labels_select.vue | 14 +- .../sidebar/board_sidebar_subscription.vue | 71 ++++ app/assets/javascripts/boards/constants.js | 4 + .../issue_set_subscription.mutation.graphql | 8 + app/assets/javascripts/boards/index.js | 12 +- .../boards/mixins/sortable_default_options.js | 5 - .../boards/queries/board_labels.query.graphql | 23 ++ .../queries/board_list_destroy.mutation.graphql | 5 + .../boards/queries/issue_create.mutation.graphql | 10 + .../queries/issue_set_due_date.mutation.graphql | 8 + .../boards/queries/users_search.query.graphql | 11 + app/assets/javascripts/boards/stores/actions.js | 193 +++++++++-- .../javascripts/boards/stores/boards_store.js | 7 +- app/assets/javascripts/boards/stores/getters.js | 11 +- .../javascripts/boards/stores/mutation_types.js | 9 +- app/assets/javascripts/boards/stores/mutations.js | 41 ++- app/assets/javascripts/boards/toggle_focus.js | 5 +- 38 files changed, 1362 insertions(+), 206 deletions(-) create mode 100644 app/assets/javascripts/boards/components/board_assignee_dropdown.vue create mode 100644 app/assets/javascripts/boards/components/board_column_new.vue create mode 100644 app/assets/javascripts/boards/components/board_list_header_new.vue create mode 100644 app/assets/javascripts/boards/components/board_new_issue_new.vue create mode 100644 app/assets/javascripts/boards/components/board_promotion_state.js create mode 100644 app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue create mode 100644 app/assets/javascripts/boards/components/sidebar/board_sidebar_subscription.vue create mode 100644 app/assets/javascripts/boards/graphql/mutations/issue_set_subscription.mutation.graphql create mode 100644 app/assets/javascripts/boards/queries/board_labels.query.graphql create mode 100644 app/assets/javascripts/boards/queries/board_list_destroy.mutation.graphql create mode 100644 app/assets/javascripts/boards/queries/issue_create.mutation.graphql create mode 100644 app/assets/javascripts/boards/queries/issue_set_due_date.mutation.graphql create mode 100644 app/assets/javascripts/boards/queries/users_search.query.graphql (limited to 'app/assets/javascripts/boards') diff --git a/app/assets/javascripts/boards/components/board_assignee_dropdown.vue b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue new file mode 100644 index 00000000000..c81f171af2b --- /dev/null +++ b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue @@ -0,0 +1,178 @@ + + + diff --git a/app/assets/javascripts/boards/components/board_card_layout.vue b/app/assets/javascripts/boards/components/board_card_layout.vue index 072dd87861a..f796acd2303 100644 --- a/app/assets/javascripts/boards/components/board_card_layout.vue +++ b/app/assets/javascripts/boards/components/board_card_layout.vue @@ -44,9 +44,6 @@ export default { multiSelectVisible() { return this.multiSelect.list.findIndex(issue => issue.id === this.issue.id) > -1; }, - canMultiSelect() { - return gon.features && gon.features.multiSelectBoard; - }, }, methods: { mouseDown() { @@ -59,7 +56,7 @@ export default { // Don't do anything if this happened on a no trigger element if (e.target.classList.contains('js-no-trigger')) return; - const isMultiSelect = this.canMultiSelect && (e.ctrlKey || e.metaKey); + const isMultiSelect = e.ctrlKey || e.metaKey; if (this.showDetail || isMultiSelect) { this.showDetail = false; diff --git a/app/assets/javascripts/boards/components/board_column.vue b/app/assets/javascripts/boards/components/board_column.vue index 9295065b7b7..cb93340bcf8 100644 --- a/app/assets/javascripts/boards/components/board_column.vue +++ b/app/assets/javascripts/boards/components/board_column.vue @@ -1,14 +1,10 @@ @@ -131,7 +98,7 @@ export default { 'board-type-assignee': list.type === 'assignee', }" :data-id="list.id" - class="board gl-h-full gl-px-3 gl-vertical-align-top gl-white-space-normal" + class="board gl-display-inline-block gl-h-full gl-px-3 gl-vertical-align-top gl-white-space-normal" data-qa-selector="board_list" >
+import { mapGetters, mapActions, mapState } from 'vuex'; +import BoardListHeader from 'ee_else_ce/boards/components/board_list_header_new.vue'; +import BoardPromotionState from 'ee_else_ce/boards/components/board_promotion_state'; +import BoardList from './board_list_new.vue'; +import { ListType } from '../constants'; + +export default { + components: { + BoardPromotionState, + BoardListHeader, + BoardList, + }, + props: { + list: { + type: Object, + default: () => ({}), + required: false, + }, + disabled: { + type: Boolean, + required: true, + }, + canAdminList: { + type: Boolean, + required: false, + default: false, + }, + }, + inject: { + boardId: { + default: '', + }, + }, + computed: { + ...mapState(['filterParams']), + ...mapGetters(['getIssuesByList']), + showBoardListAndBoardInfo() { + return this.list.type !== ListType.promotion; + }, + listIssues() { + return this.getIssuesByList(this.list.id); + }, + shouldFetchIssues() { + return this.list.type !== ListType.blank; + }, + }, + watch: { + filterParams: { + handler() { + if (this.shouldFetchIssues) { + this.fetchIssuesForList({ listId: this.list.id }); + } + }, + deep: true, + immediate: true, + }, + }, + methods: { + ...mapActions(['fetchIssuesForList']), + // TODO: Reordering of lists https://gitlab.com/gitlab-org/gitlab/-/issues/280515 + }, +}; + + + diff --git a/app/assets/javascripts/boards/components/board_configuration_options.vue b/app/assets/javascripts/boards/components/board_configuration_options.vue index ad3d653b905..754b00b54e0 100644 --- a/app/assets/javascripts/boards/components/board_configuration_options.vue +++ b/app/assets/javascripts/boards/components/board_configuration_options.vue @@ -43,7 +43,7 @@ export default {