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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e0ab3ed5
Commit
e0ab3ed5
authored
Aug 18, 2018
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable Web IDE button if user is not allowed to push the source branch.
parent
ba99dfcd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
26 deletions
+69
-26
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
.../vue_merge_request_widget/components/mr_widget_header.vue
+32
-10
changelogs/unreleased/_acet-disable-ide-button.yml
changelogs/unreleased/_acet-disable-ide-button.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
...scripts/vue_mr_widget/components/mr_widget_header_spec.js
+29
-16
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
View file @
e0ab3ed5
...
@@ -4,6 +4,7 @@ import { n__, s__, sprintf } from '~/locale';
...
@@ -4,6 +4,7 @@ import { n__, s__, sprintf } from '~/locale';
import
{
mergeUrlParams
,
webIDEUrl
}
from
'
~/lib/utils/url_utility
'
;
import
{
mergeUrlParams
,
webIDEUrl
}
from
'
~/lib/utils/url_utility
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
clipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
clipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
export
default
{
export
default
{
...
@@ -13,6 +14,9 @@ export default {
...
@@ -13,6 +14,9 @@ export default {
clipboardButton
,
clipboardButton
,
TooltipOnTruncate
,
TooltipOnTruncate
,
},
},
directives
:
{
tooltip
,
},
props
:
{
props
:
{
mr
:
{
mr
:
{
type
:
Object
,
type
:
Object
,
...
@@ -40,10 +44,19 @@ export default {
...
@@ -40,10 +44,19 @@ export default {
});
});
},
},
webIdePath
()
{
webIdePath
()
{
return
mergeUrlParams
({
if
(
this
.
mr
.
canPushToSourceBranch
)
{
target_project
:
this
.
mr
.
sourceProjectFullPath
!==
this
.
mr
.
targetProjectFullPath
?
return
mergeUrlParams
({
this
.
mr
.
targetProjectFullPath
:
''
,
target_project
:
this
.
mr
.
sourceProjectFullPath
!==
this
.
mr
.
targetProjectFullPath
?
},
webIDEUrl
(
`/
${
this
.
mr
.
sourceProjectFullPath
}
/merge_requests/
${
this
.
mr
.
iid
}
`
));
this
.
mr
.
targetProjectFullPath
:
''
,
},
webIDEUrl
(
`/
${
this
.
mr
.
sourceProjectFullPath
}
/merge_requests/
${
this
.
mr
.
iid
}
`
));
}
return
null
;
},
ideButtonTitle
()
{
return
!
this
.
mr
.
canPushToSourceBranch
?
s__
(
'
mrWidget|You are not allowed to edit this project directly. Please fork to make changes.
'
)
:
''
;
},
},
},
},
};
};
...
@@ -93,13 +106,22 @@ export default {
...
@@ -93,13 +106,22 @@ export default {
v-if=
"mr.isOpen"
v-if=
"mr.isOpen"
class=
"branch-actions"
class=
"branch-actions"
>
>
<a
<span
v-if=
"!mr.sourceBranchRemoved"
v-tooltip
:href=
"webIdePath"
:title=
"ideButtonTitle"
class=
"btn btn-default inline js-web-ide d-none d-md-inline-block"
data-placement=
"bottom"
tabindex=
"0"
>
>
{{
s__
(
"
mrWidget|Open in Web IDE
"
)
}}
<a
</a>
v-if=
"!mr.sourceBranchRemoved"
:href=
"webIdePath"
:class=
"
{ disabled: !mr.canPushToSourceBranch }"
class="btn btn-default inline js-web-ide d-none d-md-inline-block"
role="button"
>
{{
s__
(
"
mrWidget|Open in Web IDE
"
)
}}
</a>
</span>
<button
<button
:disabled=
"mr.sourceBranchRemoved"
:disabled=
"mr.sourceBranchRemoved"
data-target=
"#modal_merge_info"
data-target=
"#modal_merge_info"
...
...
changelogs/unreleased/_acet-disable-ide-button.yml
0 → 100644
View file @
e0ab3ed5
---
title
:
Disable Web IDE button if user is not allowed to push the source branch.
merge_request
:
21288
author
:
type
:
added
locale/gitlab.pot
View file @
e0ab3ed5
...
@@ -6796,6 +6796,9 @@ msgstr ""
...
@@ -6796,6 +6796,9 @@ msgstr ""
msgid "mrWidget|This project is archived, write access has been disabled"
msgid "mrWidget|This project is archived, write access has been disabled"
msgstr ""
msgstr ""
msgid "mrWidget|You are not allowed to edit this project directly. Please fork to make changes."
msgstr ""
msgid "mrWidget|You can merge this merge request manually using the"
msgid "mrWidget|You can merge this merge request manually using the"
msgstr ""
msgstr ""
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
View file @
e0ab3ed5
...
@@ -114,28 +114,31 @@ describe('MRWidgetHeader', () => {
...
@@ -114,28 +114,31 @@ describe('MRWidgetHeader', () => {
});
});
describe
(
'
with an open merge request
'
,
()
=>
{
describe
(
'
with an open merge request
'
,
()
=>
{
const
mrDefaultOptions
=
{
iid
:
1
,
divergedCommitsCount
:
12
,
sourceBranch
:
'
mr-widget-refactor
'
,
sourceBranchLink
:
'
<a href="/foo/bar/mr-widget-refactor">mr-widget-refactor</a>
'
,
sourceBranchRemoved
:
false
,
targetBranchPath
:
'
foo/bar/commits-path
'
,
targetBranchTreePath
:
'
foo/bar/tree/path
'
,
targetBranch
:
'
master
'
,
isOpen
:
true
,
canPushToSourceBranch
:
true
,
emailPatchesPath
:
'
/mr/email-patches
'
,
plainDiffPath
:
'
/mr/plainDiffPath
'
,
statusPath
:
'
abc
'
,
sourceProjectFullPath
:
'
root/gitlab-ce
'
,
targetProjectFullPath
:
'
gitlab-org/gitlab-ce
'
,
};
afterEach
(()
=>
{
afterEach
(()
=>
{
vm
.
$destroy
();
vm
.
$destroy
();
});
});
beforeEach
(()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Component
,
{
vm
=
mountComponent
(
Component
,
{
mr
:
{
mr
:
Object
.
assign
({},
mrDefaultOptions
),
iid
:
1
,
divergedCommitsCount
:
12
,
sourceBranch
:
'
mr-widget-refactor
'
,
sourceBranchLink
:
'
<a href="/foo/bar/mr-widget-refactor">mr-widget-refactor</a>
'
,
sourceBranchRemoved
:
false
,
targetBranchPath
:
'
foo/bar/commits-path
'
,
targetBranchTreePath
:
'
foo/bar/tree/path
'
,
targetBranch
:
'
master
'
,
isOpen
:
true
,
emailPatchesPath
:
'
/mr/email-patches
'
,
plainDiffPath
:
'
/mr/plainDiffPath
'
,
statusPath
:
'
abc
'
,
sourceProjectFullPath
:
'
root/gitlab-ce
'
,
targetProjectFullPath
:
'
gitlab-org/gitlab-ce
'
,
},
});
});
});
});
...
@@ -151,11 +154,21 @@ describe('MRWidgetHeader', () => {
...
@@ -151,11 +154,21 @@ describe('MRWidgetHeader', () => {
const
button
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
const
button
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
classList
.
contains
(
'
disabled
'
)).
toBe
(
false
);
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org%2Fgitlab-ce
'
,
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org%2Fgitlab-ce
'
,
);
);
});
});
it
(
'
renders web ide button in disabled state with no href
'
,
()
=>
{
const
mr
=
Object
.
assign
({},
mrDefaultOptions
,
{
canPushToSourceBranch
:
false
});
vm
=
mountComponent
(
Component
,
{
mr
});
const
link
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
expect
(
link
.
classList
.
contains
(
'
disabled
'
)).
toBe
(
true
);
expect
(
link
.
getAttribute
(
'
href
'
)).
toBeNull
();
});
it
(
'
renders web ide button with blank query string if target & source project branch
'
,
done
=>
{
it
(
'
renders web ide button with blank query string if target & source project branch
'
,
done
=>
{
vm
.
mr
.
targetProjectFullPath
=
'
root/gitlab-ce
'
;
vm
.
mr
.
targetProjectFullPath
=
'
root/gitlab-ce
'
;
...
...
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