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
6139357e
Commit
6139357e
authored
Jul 27, 2020
by
David O'Regan
Committed by
Natalia Tepluhina
Jul 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add link to details
parent
1dabbb15
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
9 deletions
+34
-9
app/assets/javascripts/incidents/components/incidents_list.vue
...ssets/javascripts/incidents/components/incidents_list.vue
+7
-3
app/assets/javascripts/incidents/list.js
app/assets/javascripts/incidents/list.js
+2
-1
app/helpers/projects/incidents_helper.rb
app/helpers/projects/incidents_helper.rb
+2
-1
changelogs/unreleased/incidents-issue-link.yml
changelogs/unreleased/incidents-issue-link.yml
+5
-0
spec/frontend/incidents/components/incidents_list_spec.js
spec/frontend/incidents/components/incidents_list_spec.js
+15
-3
spec/helpers/projects/incidents_helper_spec.rb
spec/helpers/projects/incidents_helper_spec.rb
+3
-1
No files found.
app/assets/javascripts/incidents/components/incidents_list.vue
View file @
6139357e
...
...
@@ -11,7 +11,7 @@ import {
}
from
'
@gitlab/ui
'
;
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
mergeUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
mergeUrlParams
,
joinPaths
,
visitUrl
}
from
'
~/lib/utils/url_utility
'
;
import
getIncidents
from
'
../graphql/queries/get_incidents.query.graphql
'
;
import
{
I18N
}
from
'
../constants
'
;
...
...
@@ -19,7 +19,7 @@ const tdClass =
'
table-col gl-display-flex d-md-table-cell gl-align-items-center gl-white-space-nowrap
'
;
const
thClass
=
'
gl-hover-bg-blue-50
'
;
const
bodyTrClass
=
'
gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-bg-blue-50 gl-hover-border-b-solid gl-hover-border-blue-200
'
;
'
gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-
cursor-pointer gl-hover-
bg-blue-50 gl-hover-border-b-solid gl-hover-border-blue-200
'
;
export
default
{
i18n
:
I18N
,
...
...
@@ -56,7 +56,7 @@ export default {
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
inject
:
[
'
projectPath
'
,
'
newIssuePath
'
,
'
incidentTemplateName
'
],
inject
:
[
'
projectPath
'
,
'
newIssuePath
'
,
'
incidentTemplateName
'
,
'
issuePath
'
],
apollo
:
{
incidents
:
{
query
:
getIncidents
,
...
...
@@ -102,6 +102,9 @@ export default {
hasAssignees
(
assignees
)
{
return
Boolean
(
assignees
.
nodes
?.
length
);
},
navigateToIncidentDetails
({
iid
})
{
return
visitUrl
(
joinPaths
(
this
.
issuePath
,
iid
));
},
},
};
</
script
>
...
...
@@ -138,6 +141,7 @@ export default {
:tbody-tr-class=
"tbodyTrClass"
:no-local-sorting=
"true"
fixed
@
row-clicked=
"navigateToIncidentDetails"
>
<template
#cell(title)=
"
{ item }">
<div
class=
"gl-max-w-full text-truncate"
:title=
"item.title"
>
{{
item
.
title
}}
</div>
...
...
app/assets/javascripts/incidents/list.js
View file @
6139357e
...
...
@@ -8,7 +8,7 @@ export default () => {
const
selector
=
'
#js-incidents
'
;
const
domEl
=
document
.
querySelector
(
selector
);
const
{
projectPath
,
newIssuePath
,
incidentTemplateName
}
=
domEl
.
dataset
;
const
{
projectPath
,
newIssuePath
,
incidentTemplateName
,
issuePath
}
=
domEl
.
dataset
;
const
apolloProvider
=
new
VueApollo
({
defaultClient
:
createDefaultClient
(),
...
...
@@ -20,6 +20,7 @@ export default () => {
projectPath
,
incidentTemplateName
,
newIssuePath
,
issuePath
,
},
apolloProvider
,
components
:
{
...
...
app/helpers/projects/incidents_helper.rb
View file @
6139357e
...
...
@@ -5,7 +5,8 @@ module Projects::IncidentsHelper
{
'project-path'
=>
project
.
full_path
,
'new-issue-path'
=>
new_project_issue_path
(
project
),
'incident-template-name'
=>
'incident'
'incident-template-name'
=>
'incident'
,
'issue-path'
=>
project_issues_path
(
project
)
}
end
end
changelogs/unreleased/incidents-issue-link.yml
0 → 100644
View file @
6139357e
---
title
:
Add link to issue details page from Incident list page
merge_request
:
37814
author
:
type
:
other
spec/frontend/incidents/components/incidents_list_spec.js
View file @
6139357e
import
{
mount
}
from
'
@vue/test-utils
'
;
import
{
GlAlert
,
GlLoadingIcon
,
GlTable
,
GlAvatar
}
from
'
@gitlab/ui
'
;
import
{
visitUrl
,
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
import
IncidentsList
from
'
~/incidents/components/incidents_list.vue
'
;
import
TimeAgoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
{
I18N
}
from
'
~/incidents/constants
'
;
import
mockIncidents
from
'
../mocks/incidents.json
'
;
jest
.
mock
(
'
~/lib/utils/url_utility
'
,
()
=>
({
visitUrl
:
jest
.
fn
().
mockName
(
'
visitUrlMock
'
),
joinPaths
:
jest
.
fn
().
mockName
(
'
joinPaths
'
),
mergeUrlParams
:
jest
.
fn
().
mockName
(
'
mergeUrlParams
'
),
}));
describe
(
'
Incidents List
'
,
()
=>
{
let
wrapper
;
const
newIssuePath
=
'
namespace/project/-/issues/new
'
;
...
...
@@ -36,6 +43,7 @@ describe('Incidents List', () => {
projectPath
:
'
/project/path
'
,
newIssuePath
,
incidentTemplateName
,
issuePath
:
'
/project/isssues
'
,
},
stubs
:
{
GlButton
:
true
,
...
...
@@ -111,6 +119,13 @@ describe('Incidents List', () => {
expect
(
label
).
toBe
(
name
);
expect
(
src
).
toBe
(
avatarUrl
);
});
it
(
'
contains a link to the issue details
'
,
()
=>
{
findTableRows
()
.
at
(
0
)
.
trigger
(
'
click
'
);
expect
(
visitUrl
).
toHaveBeenCalledWith
(
joinPaths
(
`/project/isssues/`
,
mockIncidents
[
0
].
iid
));
});
});
});
...
...
@@ -124,9 +139,6 @@ describe('Incidents List', () => {
it
(
'
shows the button linking to new incidents page with prefilled incident template
'
,
()
=>
{
expect
(
findCreateIncidentBtn
().
exists
()).
toBe
(
true
);
expect
(
findCreateIncidentBtn
().
attributes
(
'
href
'
)).
toBe
(
`
${
newIssuePath
}
?issuable_template=
${
incidentTemplateName
}
`
,
);
});
it
(
'
sets button loading on click
'
,
()
=>
{
...
...
spec/helpers/projects/incidents_helper_spec.rb
View file @
6139357e
...
...
@@ -8,6 +8,7 @@ RSpec.describe Projects::IncidentsHelper do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project_path
)
{
project
.
full_path
}
let
(
:new_issue_path
)
{
new_project_issue_path
(
project
)
}
let
(
:issue_path
)
{
project_issues_path
(
project
)
}
describe
'#incidents_data'
do
subject
(
:data
)
{
helper
.
incidents_data
(
project
)
}
...
...
@@ -16,7 +17,8 @@ RSpec.describe Projects::IncidentsHelper do
expect
(
data
).
to
match
(
'project-path'
=>
project_path
,
'new-issue-path'
=>
new_issue_path
,
'incident-template-name'
=>
'incident'
'incident-template-name'
=>
'incident'
,
'issue-path'
=>
issue_path
)
end
end
...
...
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