Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7dac22e9
Commit
7dac22e9
authored
Feb 02, 2021
by
Simon Knox
Committed by
Phil Hughes
Feb 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add board_new_list feature flag and placeholder
Button currently doesn't do anything
parent
b4b17286
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
72 additions
and
1 deletion
+72
-1
app/assets/javascripts/boards/components/board_add_new_column_trigger.vue
...cripts/boards/components/board_add_new_column_trigger.vue
+21
-0
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+16
-0
app/assets/javascripts/boards/stores/actions.js
app/assets/javascripts/boards/stores/actions.js
+4
-0
app/assets/javascripts/boards/stores/mutation_types.js
app/assets/javascripts/boards/stores/mutation_types.js
+1
-0
app/assets/javascripts/boards/stores/mutations.js
app/assets/javascripts/boards/stores/mutations.js
+4
-0
app/assets/javascripts/boards/stores/state.js
app/assets/javascripts/boards/stores/state.js
+1
-0
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+4
-1
config/feature_flags/development/board_new_list.yml
config/feature_flags/development/board_new_list.yml
+8
-0
ee/spec/features/boards/boards_spec.rb
ee/spec/features/boards/boards_spec.rb
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+2
-0
spec/features/labels_hierarchy_spec.rb
spec/features/labels_hierarchy_spec.rb
+5
-0
spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
..._examples/boards/multiple_issue_boards_shared_examples.rb
+2
-0
No files found.
app/assets/javascripts/boards/components/board_add_new_column_trigger.vue
0 → 100644
View file @
7dac22e9
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
mapActions
}
from
'
vuex
'
;
export
default
{
components
:
{
GlButton
,
},
methods
:
{
...
mapActions
([
'
setAddColumnFormVisibility
'
]),
},
};
</
script
>
<
template
>
<span
class=
"gl-ml-4"
>
<gl-button
variant=
"success"
@
click=
"setAddColumnFormVisibility(true)"
>
{{
__
(
'
Create list
'
)
}}
</gl-button>
</span>
</
template
>
app/assets/javascripts/boards/index.js
View file @
7dac22e9
...
@@ -16,6 +16,7 @@ import {
...
@@ -16,6 +16,7 @@ import {
getBoardsModalData
,
getBoardsModalData
,
}
from
'
ee_else_ce/boards/ee_functions
'
;
}
from
'
ee_else_ce/boards/ee_functions
'
;
import
BoardAddNewColumnTrigger
from
'
~/boards/components/board_add_new_column_trigger.vue
'
;
import
BoardContent
from
'
~/boards/components/board_content.vue
'
;
import
BoardContent
from
'
~/boards/components/board_content.vue
'
;
import
BoardExtraActions
from
'
~/boards/components/board_extra_actions.vue
'
;
import
BoardExtraActions
from
'
~/boards/components/board_extra_actions.vue
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
...
@@ -288,6 +289,21 @@ export default () => {
...
@@ -288,6 +289,21 @@ export default () => {
},
},
});
});
const
createColumnTriggerEl
=
document
.
querySelector
(
'
.js-create-column-trigger
'
);
if
(
createColumnTriggerEl
)
{
// eslint-disable-next-line no-new
new
Vue
({
el
:
createColumnTriggerEl
,
components
:
{
BoardAddNewColumnTrigger
,
},
store
,
render
(
createElement
)
{
return
createElement
(
'
board-add-new-column-trigger
'
);
},
});
}
boardConfigToggle
(
boardsStore
);
boardConfigToggle
(
boardsStore
);
const
issueBoardsModal
=
document
.
getElementById
(
'
js-add-issues-btn
'
);
const
issueBoardsModal
=
document
.
getElementById
(
'
js-add-issues-btn
'
);
...
...
app/assets/javascripts/boards/stores/actions.js
View file @
7dac22e9
...
@@ -547,6 +547,10 @@ export default {
...
@@ -547,6 +547,10 @@ export default {
}
}
},
},
setAddColumnFormVisibility
:
({
commit
},
visible
)
=>
{
commit
(
types
.
SET_ADD_COLUMN_FORM_VISIBLE
,
visible
);
},
fetchBacklog
:
()
=>
{
fetchBacklog
:
()
=>
{
notImplemented
();
notImplemented
();
},
},
...
...
app/assets/javascripts/boards/stores/mutation_types.js
View file @
7dac22e9
...
@@ -42,3 +42,4 @@ export const RECEIVE_GROUP_PROJECTS_FAILURE = 'RECEIVE_GROUP_PROJECTS_FAILURE';
...
@@ -42,3 +42,4 @@ export const RECEIVE_GROUP_PROJECTS_FAILURE = 'RECEIVE_GROUP_PROJECTS_FAILURE';
export
const
SET_SELECTED_PROJECT
=
'
SET_SELECTED_PROJECT
'
;
export
const
SET_SELECTED_PROJECT
=
'
SET_SELECTED_PROJECT
'
;
export
const
ADD_BOARD_ITEM_TO_SELECTION
=
'
ADD_BOARD_ITEM_TO_SELECTION
'
;
export
const
ADD_BOARD_ITEM_TO_SELECTION
=
'
ADD_BOARD_ITEM_TO_SELECTION
'
;
export
const
REMOVE_BOARD_ITEM_FROM_SELECTION
=
'
REMOVE_BOARD_ITEM_FROM_SELECTION
'
;
export
const
REMOVE_BOARD_ITEM_FROM_SELECTION
=
'
REMOVE_BOARD_ITEM_FROM_SELECTION
'
;
export
const
SET_ADD_COLUMN_FORM_VISIBLE
=
'
SET_ADD_COLUMN_FORM_VISIBLE
'
;
app/assets/javascripts/boards/stores/mutations.js
View file @
7dac22e9
...
@@ -270,4 +270,8 @@ export default {
...
@@ -270,4 +270,8 @@ export default {
state
.
selectedBoardItems
.
filter
((
obj
)
=>
obj
!==
boardItem
),
state
.
selectedBoardItems
.
filter
((
obj
)
=>
obj
!==
boardItem
),
);
);
},
},
[
mutationTypes
.
SET_ADD_COLUMN_FORM_VISIBLE
]:
(
state
,
visible
)
=>
{
state
.
addColumnFormVisible
=
visible
;
},
};
};
app/assets/javascripts/boards/stores/state.js
View file @
7dac22e9
...
@@ -24,6 +24,7 @@ export default () => ({
...
@@ -24,6 +24,7 @@ export default () => ({
},
},
selectedProject
:
{},
selectedProject
:
{},
error
:
undefined
,
error
:
undefined
,
addColumnFormVisible
:
false
,
// TODO: remove after ce/ee split of board_content.vue
// TODO: remove after ce/ee split of board_content.vue
isShowingEpicsSwimlanes
:
false
,
isShowingEpicsSwimlanes
:
false
,
});
});
app/views/shared/issuable/_search_bar.html.haml
View file @
7dac22e9
...
@@ -195,6 +195,9 @@
...
@@ -195,6 +195,9 @@
#js-board-labels-toggle
#js-board-labels-toggle
.js-board-config
{
data:
{
can_admin_list:
user_can_admin_list
,
has_scope:
board
.
scoped?
}
}
.js-board-config
{
data:
{
can_admin_list:
user_can_admin_list
,
has_scope:
board
.
scoped?
}
}
-
if
user_can_admin_list
-
if
user_can_admin_list
-
if
Feature
.
enabled?
(
:board_new_list
,
board
.
resource_parent
,
default_enabled: :yaml
)
.js-create-column-trigger
{
data:
board_list_data
}
-
else
=
render
'shared/issuable/board_create_list_dropdown'
,
board:
board
=
render
'shared/issuable/board_create_list_dropdown'
,
board:
board
-
if
@project
-
if
@project
#js-add-issues-btn
.gl-ml-3
{
data:
{
can_admin_list:
can?
(
current_user
,
:admin_list
,
@project
)
}
}
#js-add-issues-btn
.gl-ml-3
{
data:
{
can_admin_list:
can?
(
current_user
,
:admin_list
,
@project
)
}
}
...
...
config/feature_flags/development/board_new_list.yml
0 → 100644
View file @
7dac22e9
---
name
:
board_new_list
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52061
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/299366
milestone
:
'
13.8'
type
:
development
group
:
group::project management
default_enabled
:
false
ee/spec/features/boards/boards_spec.rb
View file @
7dac22e9
...
@@ -40,6 +40,7 @@ RSpec.describe 'issue boards', :js do
...
@@ -40,6 +40,7 @@ RSpec.describe 'issue boards', :js do
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
group
)
}
before
do
before
do
stub_feature_flags
(
board_new_list:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
group
.
add_reporter
(
user
)
group
.
add_reporter
(
user
)
login_as
(
user
)
login_as
(
user
)
...
...
locale/gitlab.pot
View file @
7dac22e9
...
@@ -8314,6 +8314,9 @@ msgstr ""
...
@@ -8314,6 +8314,9 @@ msgstr ""
msgid "Create iteration"
msgid "Create iteration"
msgstr ""
msgstr ""
msgid "Create list"
msgstr ""
msgid "Create lists from labels. Issues with that label appear in that list."
msgid "Create lists from labels. Issues with that label appear in that list."
msgstr ""
msgstr ""
...
...
spec/features/boards/boards_spec.rb
View file @
7dac22e9
...
@@ -13,6 +13,8 @@ RSpec.describe 'Issue Boards', :js do
...
@@ -13,6 +13,8 @@ RSpec.describe 'Issue Boards', :js do
let_it_be
(
:user2
)
{
create
(
:user
)
}
let_it_be
(
:user2
)
{
create
(
:user
)
}
before
do
before
do
stub_feature_flags
(
board_new_list:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user2
)
project
.
add_maintainer
(
user2
)
...
...
spec/features/labels_hierarchy_spec.rb
View file @
7dac22e9
...
@@ -18,6 +18,7 @@ RSpec.describe 'Labels Hierarchy', :js do
...
@@ -18,6 +18,7 @@ RSpec.describe 'Labels Hierarchy', :js do
before
do
before
do
stub_feature_flags
(
graphql_board_lists:
false
)
stub_feature_flags
(
graphql_board_lists:
false
)
stub_feature_flags
(
board_new_list:
false
)
grandparent
.
add_owner
(
user
)
grandparent
.
add_owner
(
user
)
sign_in
(
user
)
sign_in
(
user
)
...
@@ -270,6 +271,10 @@ RSpec.describe 'Labels Hierarchy', :js do
...
@@ -270,6 +271,10 @@ RSpec.describe 'Labels Hierarchy', :js do
end
end
context
'creating boards lists'
do
context
'creating boards lists'
do
before
do
stub_feature_flags
(
board_new_list:
false
)
end
context
'on project boards'
do
context
'on project boards'
do
let
(
:board
)
{
create
(
:board
,
project:
project_1
)
}
let
(
:board
)
{
create
(
:board
,
project:
project_1
)
}
...
...
spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
View file @
7dac22e9
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
RSpec
.
shared_examples
'multiple issue boards'
do
RSpec
.
shared_examples
'multiple issue boards'
do
context
'authorized user'
do
context
'authorized user'
do
before
do
before
do
stub_feature_flags
(
board_new_list:
false
)
parent
.
add_maintainer
(
user
)
parent
.
add_maintainer
(
user
)
login_as
(
user
)
login_as
(
user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment