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
83e98e05
Commit
83e98e05
authored
Nov 03, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove frontend for editing of Jira labels
Feature is will no longer be implemented Changelog: removed EE: true
parent
829d5921
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
77 deletions
+2
-77
ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue
...ons/jira/issues_show/components/jira_issues_show_root.vue
+0
-20
ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
...sues_show/components/sidebar/jira_issues_sidebar_root.vue
+1
-36
ee/app/assets/javascripts/integrations/jira/issues_show/jira_issues_show_bundle.js
.../integrations/jira/issues_show/jira_issues_show_bundle.js
+1
-2
ee/spec/frontend/integrations/jira/issues_show/components/jira_issues_show_root_spec.js
...jira/issues_show/components/jira_issues_show_root_spec.js
+0
-16
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue
View file @
83e98e05
...
...
@@ -35,7 +35,6 @@ export default {
return
{
isLoading
:
true
,
isLoadingStatus
:
false
,
isUpdatingLabels
:
false
,
isUpdatingStatus
:
false
,
errorMessage
:
null
,
issue
:
{},
...
...
@@ -79,23 +78,6 @@ export default {
return
`jira_note_
${
id
}
`
;
},
onIssueLabelsUpdated
(
labels
)
{
this
.
isUpdatingLabels
=
true
;
updateIssue
(
this
.
issue
,
{
labels
})
.
then
((
response
)
=>
{
this
.
issue
.
labels
=
response
.
labels
;
})
.
catch
(()
=>
{
createFlash
({
message
:
s__
(
'
JiraService|Failed to update Jira issue labels. View the issue in Jira, or reload the page.
'
,
),
});
})
.
finally
(()
=>
{
this
.
isUpdatingLabels
=
false
;
});
},
onIssueStatusFetch
()
{
this
.
isLoadingStatus
=
true
;
fetchIssueStatuses
()
...
...
@@ -156,10 +138,8 @@ export default {
:sidebar-expanded=
"sidebarExpanded"
:issue=
"issue"
:is-loading-status=
"isLoadingStatus"
:is-updating-labels=
"isUpdatingLabels"
:is-updating-status=
"isUpdatingStatus"
:statuses=
"statuses"
@
issue-labels-updated=
"onIssueLabelsUpdated"
@
issue-status-fetch=
"onIssueStatusFetch"
@
issue-status-updated=
"onIssueStatusUpdated"
@
sidebar-toggle=
"toggleSidebar"
...
...
ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue
View file @
83e98e05
...
...
@@ -20,9 +20,6 @@ export default {
},
mixins
:
[
glFeatureFlagsMixin
()],
inject
:
{
issueLabelsPath
:
{
default
:
null
,
},
issuesListPath
:
{
default
:
null
,
},
...
...
@@ -41,11 +38,6 @@ export default {
required
:
false
,
default
:
false
,
},
isUpdatingLabels
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
isUpdatingStatus
:
{
type
:
Boolean
,
required
:
false
,
...
...
@@ -57,11 +49,6 @@ export default {
default
:
()
=>
[],
},
},
data
()
{
return
{
isEditingLabels
:
false
,
};
},
computed
:
{
assignee
()
{
// Jira issues have at most 1 assignee
...
...
@@ -70,9 +57,6 @@ export default {
reference
()
{
return
this
.
issue
.
references
?.
relative
;
},
canUpdateLabels
()
{
return
this
.
glFeatures
.
jiraIssueDetailsEditLabels
;
},
canUpdateStatus
()
{
return
this
.
glFeatures
.
jiraIssueDetailsEditStatus
;
},
...
...
@@ -108,18 +92,6 @@ export default {
});
}
},
onIssueLabelsClose
()
{
this
.
isEditingLabels
=
false
;
},
onIssueLabelsToggle
()
{
this
.
expandSidebarAndOpenDropdown
();
this
.
afterSidebarTransitioned
(()
=>
{
this
.
isEditingLabels
=
true
;
});
},
onIssueLabelsUpdated
(
labels
)
{
this
.
$emit
(
'
issue-labels-updated
'
,
labels
);
},
onIssueStatusFetch
()
{
this
.
$emit
(
'
issue-status-fetch
'
);
},
...
...
@@ -149,20 +121,13 @@ export default {
@
issue-field-updated=
"onIssueStatusUpdated"
/>
<labels-select
:allow-label-edit=
"canUpdateLabels"
:allow-multiselect=
"true"
:allow-scoped-labels=
"true"
:selected-labels=
"issue.labels"
:labels-fetch-path=
"issueLabelsPath"
:labels-filter-base-path=
"issuesListPath"
:labels-filter-param=
"$options.labelsFilterParam"
:labels-select-in-progress=
"isUpdatingLabels"
:is-editing=
"isEditingLabels"
variant=
"sidebar"
class=
"block labels js-labels-block"
@
onDropdownClose=
"onIssueLabelsClose"
@
toggleCollapse=
"onIssueLabelsToggle"
@
updateSelectedLabels=
"onIssueLabelsUpdated"
@
toggleCollapse=
"expandSidebarAndOpenDropdown"
>
{{
__
(
'
None
'
)
}}
</labels-select>
...
...
ee/app/assets/javascripts/integrations/jira/issues_show/jira_issues_show_bundle.js
View file @
83e98e05
...
...
@@ -9,12 +9,11 @@ export default function initJiraIssueShow({ mountPointSelector }) {
return
null
;
}
const
{
issue
LabelsPath
,
issue
sShowPath
,
issuesListPath
}
=
mountPointEl
.
dataset
;
const
{
issuesShowPath
,
issuesListPath
}
=
mountPointEl
.
dataset
;
return
new
Vue
({
el
:
mountPointEl
,
provide
:
{
issueLabelsPath
,
issuesShowPath
,
issuesListPath
,
isClassicSidebar
:
true
,
...
...
ee/spec/frontend/integrations/jira/issues_show/components/jira_issues_show_root_spec.js
View file @
83e98e05
...
...
@@ -120,22 +120,6 @@ describe('JiraIssuesShow', () => {
await
waitForPromises
();
});
it
(
'
updates issue labels on issue-labels-updated
'
,
async
()
=>
{
const
updateIssueSpy
=
jest
.
spyOn
(
JiraIssuesShowApi
,
'
updateIssue
'
).
mockResolvedValue
();
const
labels
=
[{
id
:
'
ecosystem
'
}];
findJiraIssueSidebar
().
vm
.
$emit
(
'
issue-labels-updated
'
,
labels
);
await
wrapper
.
vm
.
$nextTick
();
expect
(
updateIssueSpy
).
toHaveBeenCalledWith
(
expect
.
any
(
Object
),
{
labels
});
expect
(
findJiraIssueSidebar
().
props
(
'
isUpdatingLabels
'
)).
toBe
(
true
);
await
waitForPromises
();
expect
(
findJiraIssueSidebar
().
props
(
'
isUpdatingLabels
'
)).
toBe
(
false
);
});
it
(
'
fetches issue statuses on issue-status-fetch
'
,
async
()
=>
{
const
fetchIssueStatusesSpy
=
jest
.
spyOn
(
JiraIssuesShowApi
,
'
fetchIssueStatuses
'
)
...
...
locale/gitlab.pot
View file @
83e98e05
...
...
@@ -19607,9 +19607,6 @@ msgstr ""
msgid "JiraService|Failed to load Jira issue. View the issue in Jira, or reload the page."
msgstr ""
msgid "JiraService|Failed to update Jira issue labels. View the issue in Jira, or reload the page."
msgstr ""
msgid "JiraService|Failed to update Jira issue status. View the issue in Jira, or reload the page."
msgstr ""
...
...
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