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
c6e79e1d
Commit
c6e79e1d
authored
Mar 09, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Jira status to sidebar
On Jira issue details page
parent
dc1d3fcf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
...sues_show/components/sidebar/jira_issues_sidebar_root.vue
+8
-0
ee/spec/frontend/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root_spec.js
..._show/components/sidebar/jira_issues_sidebar_root_spec.js
+11
-0
ee/spec/frontend/integrations/jira/issues_show/mock_data.js
ee/spec/frontend/integrations/jira/issues_show/mock_data.js
+1
-0
No files found.
ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
View file @
c6e79e1d
<
script
>
<
script
>
import
{
labelsFilterParam
}
from
'
ee/integrations/jira/issues_show/constants
'
;
import
{
labelsFilterParam
}
from
'
ee/integrations/jira/issues_show/constants
'
;
import
{
__
}
from
'
~/locale
'
;
import
LabelsSelect
from
'
~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue
'
;
import
LabelsSelect
from
'
~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue
'
;
import
Assignee
from
'
./assignee.vue
'
;
import
Assignee
from
'
./assignee.vue
'
;
import
IssueDueDate
from
'
./issue_due_date.vue
'
;
import
IssueDueDate
from
'
./issue_due_date.vue
'
;
import
IssueField
from
'
./issue_field.vue
'
;
import
IssueReference
from
'
./issue_reference.vue
'
;
import
IssueReference
from
'
./issue_reference.vue
'
;
export
default
{
export
default
{
...
@@ -11,6 +14,7 @@ export default {
...
@@ -11,6 +14,7 @@ export default {
components
:
{
components
:
{
Assignee
,
Assignee
,
IssueDueDate
,
IssueDueDate
,
IssueField
,
IssueReference
,
IssueReference
,
LabelsSelect
,
LabelsSelect
,
},
},
...
@@ -39,6 +43,9 @@ export default {
...
@@ -39,6 +43,9 @@ export default {
},
},
},
},
labelsFilterParam
,
labelsFilterParam
,
i18n
:
{
statusTitle
:
__
(
'
Status
'
),
},
};
};
</
script
>
</
script
>
...
@@ -47,6 +54,7 @@ export default {
...
@@ -47,6 +54,7 @@ export default {
<assignee
class=
"block"
:assignee=
"assignee"
/>
<assignee
class=
"block"
:assignee=
"assignee"
/>
<issue-due-date
:due-date=
"issue.dueDate"
/>
<issue-due-date
:due-date=
"issue.dueDate"
/>
<issue-field
icon=
"progress"
:title=
"$options.i18n.statusTitle"
:value=
"issue.status"
/>
<labels-select
<labels-select
:selected-labels=
"issue.labels"
:selected-labels=
"issue.labels"
...
...
ee/spec/frontend/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root_spec.js
View file @
c6e79e1d
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
Assignee
from
'
ee/integrations/jira/issues_show/components/sidebar/assignee.vue
'
;
import
Assignee
from
'
ee/integrations/jira/issues_show/components/sidebar/assignee.vue
'
;
import
IssueDueDate
from
'
ee/integrations/jira/issues_show/components/sidebar/issue_due_date.vue
'
;
import
IssueDueDate
from
'
ee/integrations/jira/issues_show/components/sidebar/issue_due_date.vue
'
;
import
IssueField
from
'
ee/integrations/jira/issues_show/components/sidebar/issue_field.vue
'
;
import
IssueReference
from
'
ee/integrations/jira/issues_show/components/sidebar/issue_reference.vue
'
;
import
IssueReference
from
'
ee/integrations/jira/issues_show/components/sidebar/issue_reference.vue
'
;
import
Sidebar
from
'
ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
'
;
import
Sidebar
from
'
ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
...
@@ -33,6 +34,7 @@ describe('JiraIssuesSidebar', () => {
...
@@ -33,6 +34,7 @@ describe('JiraIssuesSidebar', () => {
const
findLabelsSelect
=
()
=>
wrapper
.
findComponent
(
LabelsSelect
);
const
findLabelsSelect
=
()
=>
wrapper
.
findComponent
(
LabelsSelect
);
const
findAssignee
=
()
=>
wrapper
.
findComponent
(
Assignee
);
const
findAssignee
=
()
=>
wrapper
.
findComponent
(
Assignee
);
const
findIssueDueDate
=
()
=>
wrapper
.
findComponent
(
IssueDueDate
);
const
findIssueDueDate
=
()
=>
wrapper
.
findComponent
(
IssueDueDate
);
const
findIssueField
=
()
=>
wrapper
.
findComponent
(
IssueField
);
const
findIssueReference
=
()
=>
wrapper
.
findComponent
(
IssueReference
);
const
findIssueReference
=
()
=>
wrapper
.
findComponent
(
IssueReference
);
it
(
'
renders Labels block
'
,
()
=>
{
it
(
'
renders Labels block
'
,
()
=>
{
...
@@ -55,6 +57,15 @@ describe('JiraIssuesSidebar', () => {
...
@@ -55,6 +57,15 @@ describe('JiraIssuesSidebar', () => {
expect
(
dueDate
.
props
(
'
dueDate
'
)).
toBe
(
mockJiraIssue
.
dueDate
);
expect
(
dueDate
.
props
(
'
dueDate
'
)).
toBe
(
mockJiraIssue
.
dueDate
);
});
});
it
(
'
renders IssueField
'
,
()
=>
{
createComponent
();
const
field
=
findIssueField
();
expect
(
field
.
props
(
'
icon
'
)).
toBe
(
'
progress
'
);
expect
(
field
.
props
(
'
title
'
)).
toBe
(
'
Status
'
);
expect
(
field
.
props
(
'
value
'
)).
toBe
(
mockJiraIssue
.
status
);
});
describe
(
'
when references.relative is null
'
,
()
=>
{
describe
(
'
when references.relative is null
'
,
()
=>
{
it
(
'
does not render IssueReference
'
,
()
=>
{
it
(
'
does not render IssueReference
'
,
()
=>
{
createComponent
({
createComponent
({
...
...
ee/spec/frontend/integrations/jira/issues_show/mock_data.js
View file @
c6e79e1d
...
@@ -28,4 +28,5 @@ export const mockJiraIssue = {
...
@@ -28,4 +28,5 @@ export const mockJiraIssue = {
relative
:
'
FE-2
'
,
relative
:
'
FE-2
'
,
},
},
state
:
'
opened
'
,
state
:
'
opened
'
,
status
:
'
In Progress
'
,
};
};
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