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
496d339b
Commit
496d339b
authored
Jan 13, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Incident sidebar on issue boards
Review feedback
parent
743ee5d6
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
53 additions
and
77 deletions
+53
-77
app/assets/javascripts/boards/graphql/issue.fragment.graphql
app/assets/javascripts/boards/graphql/issue.fragment.graphql
+3
-34
app/assets/javascripts/boards/graphql/issue_create.mutation.graphql
.../javascripts/boards/graphql/issue_create.mutation.graphql
+1
-1
app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql
...vascripts/boards/graphql/issue_move_list.mutation.graphql
+1
-1
app/assets/javascripts/boards/graphql/lists_issues.query.graphql
...ets/javascripts/boards/graphql/lists_issues.query.graphql
+2
-2
app/assets/javascripts/graphql_shared/fragments/issue.fragment.graphql
...vascripts/graphql_shared/fragments/issue.fragment.graphql
+37
-0
ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql
.../assets/javascripts/boards/graphql/issue.fragment.graphql
+3
-33
ee/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql
...vascripts/boards/graphql/issue_move_list.mutation.graphql
+1
-1
ee/spec/frontend/boards/components/board_content_sidebar_spec.js
.../frontend/boards/components/board_content_sidebar_spec.js
+2
-2
spec/frontend/boards/components/board_content_sidebar_spec.js
.../frontend/boards/components/board_content_sidebar_spec.js
+3
-3
No files found.
app/assets/javascripts/boards/graphql/issue.fragment.graphql
View file @
496d339b
#import "~/graphql_shared/fragments/milestone.fragment.graphql"
#import "~/graphql_shared/fragments/user.fragment.graphql"
#import "~/graphql_shared/fragments/issue.fragment.graphql"
fragment
Issue
Node
on
Issue
{
fragment
Issue
on
Issue
{
id
iid
title
referencePath
:
reference
(
full
:
true
)
dueDate
timeEstimate
totalTimeSpent
humanTimeEstimate
humanTotalTimeSpent
emailsDisabled
confidential
hidden
webUrl
relativePosition
type
severity
milestone
{
...
MilestoneFragment
}
assignees
{
nodes
{
...
User
}
}
labels
{
nodes
{
id
title
color
description
}
}
...
IssueNode
}
app/assets/javascripts/boards/graphql/issue_create.mutation.graphql
View file @
496d339b
...
...
@@ -3,7 +3,7 @@
mutation
CreateIssue
(
$input
:
CreateIssueInput
!)
{
createIssue
(
input
:
$input
)
{
issue
{
...
Issue
Node
...
Issue
}
errors
}
...
...
app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql
View file @
496d339b
...
...
@@ -21,7 +21,7 @@ mutation issueMoveList(
}
)
{
issue
{
...
Issue
Node
...
Issue
}
errors
}
...
...
app/assets/javascripts/boards/graphql/lists_issues.query.graphql
View file @
496d339b
...
...
@@ -22,7 +22,7 @@ query BoardListsEE(
issues
(
first
:
$first
,
filters
:
$filters
,
after
:
$after
)
{
edges
{
node
{
...
Issue
Node
...
Issue
}
}
pageInfo
{
...
...
@@ -46,7 +46,7 @@ query BoardListsEE(
issues
(
first
:
$first
,
filters
:
$filters
,
after
:
$after
)
{
edges
{
node
{
...
Issue
Node
...
Issue
}
}
pageInfo
{
...
...
app/assets/javascripts/graphql_shared/fragments/issue.fragment.graphql
0 → 100644
View file @
496d339b
#import "~/graphql_shared/fragments/milestone.fragment.graphql"
#import "~/graphql_shared/fragments/user.fragment.graphql"
fragment
IssueNode
on
Issue
{
id
iid
title
referencePath
:
reference
(
full
:
true
)
dueDate
timeEstimate
totalTimeSpent
humanTimeEstimate
humanTotalTimeSpent
emailsDisabled
confidential
hidden
webUrl
relativePosition
type
severity
milestone
{
...
MilestoneFragment
}
assignees
{
nodes
{
...
User
}
}
labels
{
nodes
{
id
title
color
description
}
}
}
ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql
View file @
496d339b
#import "~/graphql_shared/fragments/milestone.fragment.graphql"
#import "~/graphql_shared/fragments/user.fragment.graphql"
#import "~/graphql_shared/fragments/issue.fragment.graphql"
fragment
IssueNode
on
Issue
{
fragment
Issue
on
Issue
{
...
IssueNode
id
iid
title
referencePath
:
reference
(
full
:
true
)
dueDate
timeEstimate
totalTimeSpent
humanTimeEstimate
humanTotalTimeSpent
weight
confidential
hidden
webUrl
blocked
blockedByCount
relativePosition
type
severity
epic
{
id
}
assignees
{
nodes
{
...
User
}
}
milestone
{
...
MilestoneFragment
}
iteration
{
id
title
...
...
@@ -39,12 +17,4 @@ fragment IssueNode on Issue {
title
}
}
labels
{
nodes
{
id
title
color
description
}
}
}
ee/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql
View file @
496d339b
...
...
@@ -23,7 +23,7 @@ mutation issueMoveListEE(
}
)
{
issue
{
...
Issue
Node
...
Issue
}
errors
}
...
...
ee/spec/frontend/boards/components/board_content_sidebar_spec.js
View file @
496d339b
...
...
@@ -97,7 +97,7 @@ describe('ee/BoardContentSidebar', () => {
});
it
(
'
matches the snapshot
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlDrawer
).
element
).
toMatchSnapshot
();
expect
(
wrapper
.
find
Component
(
GlDrawer
).
element
).
toMatchSnapshot
();
});
});
...
...
@@ -110,7 +110,7 @@ describe('ee/BoardContentSidebar', () => {
});
it
(
'
matches the snapshot
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlDrawer
).
element
).
toMatchSnapshot
();
expect
(
wrapper
.
find
Component
(
GlDrawer
).
element
).
toMatchSnapshot
();
});
});
});
spec/frontend/boards/components/board_content_sidebar_spec.js
View file @
496d339b
...
...
@@ -97,7 +97,7 @@ describe('BoardContentSidebar', () => {
});
it
(
'
confirms we render MountingPortal
'
,
()
=>
{
expect
(
wrapper
.
find
(
MountingPortal
).
props
()).
toMatchObject
({
expect
(
wrapper
.
find
Component
(
MountingPortal
).
props
()).
toMatchObject
({
mountTo
:
'
#js-right-sidebar-portal
'
,
append
:
true
,
name
:
'
board-content-sidebar
'
,
...
...
@@ -143,7 +143,7 @@ describe('BoardContentSidebar', () => {
});
it
(
'
does not render SidebarSeverity
'
,
()
=>
{
expect
(
wrapper
.
find
(
SidebarSeverity
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
Component
(
SidebarSeverity
).
exists
()).
toBe
(
false
);
});
describe
(
'
when we emit close
'
,
()
=>
{
...
...
@@ -175,7 +175,7 @@ describe('BoardContentSidebar', () => {
});
it
(
'
renders SidebarSeverity
'
,
()
=>
{
expect
(
wrapper
.
find
(
SidebarSeverity
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
Component
(
SidebarSeverity
).
exists
()).
toBe
(
true
);
});
});
});
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