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
Boxiang Sun
gitlab-ce
Commits
2c9bb135
Commit
2c9bb135
authored
8 years ago
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed tests
Grab permissions description from backend Review changes Added unit tests
parent
26b0fe8d
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
151 additions
and
22 deletions
+151
-22
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+0
-1
app/assets/javascripts/project_new.js
app/assets/javascripts/project_new.js
+10
-0
app/assets/javascripts/visibility_select.js.es6
app/assets/javascripts/visibility_select.js.es6
+15
-17
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+11
-0
app/views/projects/_visibility_select.html.haml
app/views/projects/_visibility_select.html.haml
+7
-0
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-2
features/steps/shared/project.rb
features/steps/shared/project.rb
+1
-1
spec/features/projects/settings/visibility_settings_spec.rb
spec/features/projects/settings/visibility_settings_spec.rb
+3
-1
spec/javascripts/visibility_select_spec.js.es6
spec/javascripts/visibility_select_spec.js.es6
+100
-0
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
2c9bb135
...
...
@@ -262,7 +262,6 @@
case 'edit':
shortcut_handler = new ShortcutsNavigation();
new ProjectNew();
new gl.VisibilitySelect();
break;
case 'new':
new ProjectNew();
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/project_new.js
View file @
2c9bb135
...
...
@@ -14,11 +14,21 @@
return
$
(
'
.save-project-loader
'
).
show
();
};
})(
this
));
this
.
initVisibilitySelect
();
this
.
toggleSettings
();
this
.
toggleSettingsOnclick
();
this
.
toggleRepoVisibility
();
}
ProjectNew
.
prototype
.
initVisibilitySelect
=
function
()
{
const
visibilityContainer
=
document
.
querySelector
(
'
.js-visibility-select
'
);
if
(
!
visibilityContainer
)
return
;
const
visibilitySelect
=
new
gl
.
VisibilitySelect
(
visibilityContainer
);
visibilitySelect
.
init
();
};
ProjectNew
.
prototype
.
toggleSettings
=
function
()
{
var
self
=
this
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/visibility_select.js.es6
View file @
2c9bb135
(() => {
const global = window.gl || (window.gl = {});
const VISIBILITY_DESCRIPTIONS = {
0: 'Project access must be granted explicitly to each user.',
10: 'This project can be cloned by any logged in user.',
20: 'The project can be cloned without any authentication.',
};
const gl = window.gl || (window.gl = {});
class VisibilitySelect {
constructor() {
this.visibilitySelect = document.querySelector('.js-visibility-select');
this.helpBlock = this.visibilitySelect.querySelector('.help-block');
this.select = this.visibilitySelect.querySelector('select');
constructor(container) {
if (!container) throw new Error('VisibilitySelect requires a container element as argument 1');
this.container = container;
this.helpBlock = this.container.querySelector('.help-block');
this.select = this.container.querySelector('select');
}
init() {
if (this.select) {
this.
visibilityChanged
();
this.select.addEventListener('change', this.
visibilityChanged
.bind(this));
this.
updateHelpText
();
this.select.addEventListener('change', this.
updateHelpText
.bind(this));
} else {
this.helpBlock.textContent = this.
visibilitySelect
.querySelector('.js-locked').dataset.helpBlock;
this.helpBlock.textContent = this.
container
.querySelector('.js-locked').dataset.helpBlock;
}
}
visibilityChanged
() {
this.helpBlock.
innerText = VISIBILITY_DESCRIPTIONS[this.select.value]
;
updateHelpText
() {
this.helpBlock.
textContent = this.select.querySelector('option:checked').dataset.description
;
}
}
gl
obal
.VisibilitySelect = VisibilitySelect;
gl.VisibilitySelect = VisibilitySelect;
})();
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/projects.scss
View file @
2c9bb135
...
...
@@ -865,6 +865,8 @@ pre.light-well {
}
.project-feature
{
padding-top
:
10px
;
@media
(
min-width
:
$screen-sm-min
)
{
padding-left
:
45px
;
}
...
...
This diff is collapsed.
Click to expand it.
app/helpers/projects_helper.rb
View file @
2c9bb135
...
...
@@ -445,4 +445,15 @@ module ProjectsHelper
def
project_issues
(
project
)
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
).
execute
end
def
visibility_select_options
(
project
,
selected_level
)
levels_options_array
=
Gitlab
::
VisibilityLevel
.
values
.
map
do
|
level
|
[
visibility_level_label
(
level
),
{
data:
{
description:
visibility_level_description
(
level
,
project
)
}
},
level
]
end
options_for_select
(
levels_options_array
,
selected_level
)
end
end
This diff is collapsed.
Click to expand it.
app/views/
shared
/_visibility_select.html.haml
→
app/views/
projects
/_visibility_select.html.haml
View file @
2c9bb135
-
if
can_change_visibility_level?
(
@project
,
current_user
)
-
levels_options_hash
=
{}
-
Gitlab
::
VisibilityLevel
.
values
.
each
do
|
level
|
-
levels_options_hash
[
visibility_level_label
(
level
)]
=
level
-
options
=
options_for_select
(
levels_options_hash
,
selected_level
)
=
form
.
select
(
model_method
,
options
,
{},
class:
'form-control visibility-select'
)
=
form
.
select
(
model_method
,
visibility_select_options
(
@project
,
selected_level
),
{},
class:
'form-control visibility-select'
)
-
else
.info.js-locked
{
data:
{
help_block:
visibility_level_description
(
@project
.
visibility_level
,
@project
)
}
}
.info.js-locked
{
data:
{
help_block:
visibility_level_description
(
@project
.
visibility_level
,
@project
)
}
}
=
visibility_level_icon
(
@project
.
visibility_level
)
%strong
=
visibility_level_label
(
@project
.
visibility_level
)
This diff is collapsed.
Click to expand it.
app/views/projects/edit.html.haml
View file @
2c9bb135
...
...
@@ -37,13 +37,13 @@
=
link_to
"(?)"
,
help_page_path
(
"public_access/public_access"
)
%span
.help-block
.col-md-3.visibility-select-container
=
render
(
'
shared
/visibility_select'
,
model_method: :visibility_level
,
form:
f
,
selected_level:
@project
.
visibility_level
)
=
render
(
'
projects
/visibility_select'
,
model_method: :visibility_level
,
form:
f
,
selected_level:
@project
.
visibility_level
)
=
f
.
fields_for
:project_feature
do
|
feature_fields
|
%fieldset
.features
.row
.col-md-9.project-feature
=
feature_fields
.
label
:repository_access_level
,
"Repository"
,
class:
'label-light'
%span
.help-block
Push files to be stored
in this project
%span
.help-block
View and edit files
in this project
.col-md-3.js-repo-access-level
=
project_feature_access_select
(
:repository_access_level
)
...
...
This diff is collapsed.
Click to expand it.
features/steps/shared/project.rb
View file @
2c9bb135
...
...
@@ -97,7 +97,7 @@ module SharedProject
step
'I should see project settings'
do
expect
(
current_path
).
to
eq
edit_namespace_project_path
(
@project
.
namespace
,
@project
)
expect
(
page
).
to
have_content
(
"Project name"
)
expect
(
page
).
to
have_content
(
"
Feature Visibility
"
)
expect
(
page
).
to
have_content
(
"
Sharing & Permissions
"
)
end
def
current_project
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/settings/visibility_settings_spec.rb
View file @
2c9bb135
require
'spec_helper'
require
'byebug'
feature
'Visibility settings'
,
feature:
true
,
js:
true
do
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -13,6 +12,7 @@ feature 'Visibility settings', feature: true, js: true do
scenario
'project visibility select is available'
do
visibility_select_container
=
find
(
'.js-visibility-select'
)
expect
(
visibility_select_container
.
find
(
'.visibility-select'
).
value
).
to
eq
project
.
visibility_level
.
to_s
expect
(
visibility_select_container
).
to
have_content
'The project can be cloned without any authentication.'
end
...
...
@@ -21,6 +21,7 @@ feature 'Visibility settings', feature: true, js: true do
visibility_select_container
=
find
(
'.js-visibility-select'
)
visibility_select
=
visibility_select_container
.
find
(
'.visibility-select'
)
visibility_select
.
select
(
'Private'
)
expect
(
visibility_select
.
value
).
to
eq
'0'
expect
(
visibility_select_container
).
to
have_content
'Project access must be granted explicitly to each user.'
end
...
...
@@ -37,6 +38,7 @@ feature 'Visibility settings', feature: true, js: true do
scenario
'project visibility is locked'
do
visibility_select_container
=
find
(
'.js-visibility-select'
)
expect
(
visibility_select_container
).
not_to
have_select
'.visibility-select'
expect
(
visibility_select_container
).
to
have_content
'Public'
expect
(
visibility_select_container
).
to
have_content
'The project can be cloned without any authentication.'
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/visibility_select_spec.js.es6
0 → 100644
View file @
2c9bb135
/*= require visibility_select */
(() => {
const VisibilitySelect = gl.VisibilitySelect;
describe('VisibilitySelect', function () {
const lockedElement = document.createElement('div');
lockedElement.dataset.helpBlock = 'lockedHelpBlock';
const checkedElement = document.createElement('div');
checkedElement.dataset.description = 'checkedDescription';
const mockElements = {
container: document.createElement('div'),
select: document.createElement('div'),
'.help-block': document.createElement('div'),
'.js-locked': lockedElement,
'option:checked': checkedElement,
};
beforeEach(function () {
spyOn(Element.prototype, 'querySelector').and.callFake(selector => mockElements[selector]);
});
describe('#constructor', function () {
beforeEach(function () {
this.visibilitySelect = new VisibilitySelect(mockElements.container);
});
it('sets the container member', function () {
expect(this.visibilitySelect.container).toEqual(mockElements.container);
});
it('queries and sets the helpBlock member', function () {
expect(Element.prototype.querySelector).toHaveBeenCalledWith('.help-block');
expect(this.visibilitySelect.helpBlock).toEqual(mockElements['.help-block']);
});
it('queries and sets the select member', function () {
expect(Element.prototype.querySelector).toHaveBeenCalledWith('select');
expect(this.visibilitySelect.select).toEqual(mockElements.select);
});
describe('if there is no container element provided', function () {
it('throws an error', function () {
expect(() => new VisibilitySelect()).toThrowError('VisibilitySelect requires a container element as argument 1');
});
});
});
describe('#init', function () {
describe('if there is a select', function () {
beforeEach(function () {
this.visibilitySelect = new VisibilitySelect(mockElements.container);
});
it('calls updateHelpText', function () {
spyOn(VisibilitySelect.prototype, 'updateHelpText');
this.visibilitySelect.init();
expect(this.visibilitySelect.updateHelpText).toHaveBeenCalled();
});
it('adds a change event listener', function () {
spyOn(this.visibilitySelect.select, 'addEventListener');
this.visibilitySelect.init();
expect(this.visibilitySelect.select.addEventListener.calls.argsFor(0)).toContain('change');
});
});
describe('if there is no select', function () {
beforeEach(function () {
mockElements.select = undefined;
this.visibilitySelect = new VisibilitySelect(mockElements.container);
this.visibilitySelect.init();
});
it('updates the helpBlock text to the locked `data-help-block` messaged', function () {
expect(this.visibilitySelect.helpBlock.textContent)
.toEqual(lockedElement.dataset.helpBlock);
});
afterEach(function () {
mockElements.select = document.createElement('div');
});
});
});
describe('#updateHelpText', function () {
beforeEach(function () {
this.visibilitySelect = new VisibilitySelect(mockElements.container);
this.visibilitySelect.init();
});
it('updates the helpBlock text to the selected options `data-description`', function () {
expect(this.visibilitySelect.helpBlock.textContent)
.toEqual(checkedElement.dataset.description);
});
});
});
})();
This diff is collapsed.
Click to expand it.
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