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
404314c6
Commit
404314c6
authored
May 20, 2019
by
Phil Hughes
Committed by
Filipa Lacerda
May 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Setup Vue app for repository file listing
Part of
https://gitlab.com/gitlab-org/gitlab-ce/issues/61578
parent
2f613f28
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
184 additions
and
4 deletions
+184
-4
app/assets/javascripts/pages/projects/show/index.js
app/assets/javascripts/pages/projects/show/index.js
+8
-0
app/assets/javascripts/pages/projects/tree/show/index.js
app/assets/javascripts/pages/projects/tree/show/index.js
+8
-0
app/assets/javascripts/repository/components/app.vue
app/assets/javascripts/repository/components/app.vue
+3
-0
app/assets/javascripts/repository/graphql.js
app/assets/javascripts/repository/graphql.js
+11
-0
app/assets/javascripts/repository/index.js
app/assets/javascripts/repository/index.js
+25
-0
app/assets/javascripts/repository/pages/index.vue
app/assets/javascripts/repository/pages/index.vue
+24
-0
app/assets/javascripts/repository/pages/tree.vue
app/assets/javascripts/repository/pages/tree.vue
+15
-0
app/assets/javascripts/repository/queries/getRef.graphql
app/assets/javascripts/repository/queries/getRef.graphql
+3
-0
app/assets/javascripts/repository/router.js
app/assets/javascripts/repository/router.js
+36
-0
app/views/projects/_files.html.haml
app/views/projects/_files.html.haml
+8
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/tree/_readme.html.haml
app/views/projects/tree/_readme.html.haml
+1
-1
spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
...projects/files/files_sort_submodules_with_folders_spec.rb
+2
-0
spec/features/projects/files/user_browses_files_spec.rb
spec/features/projects/files/user_browses_files_spec.rb
+1
-0
spec/features/projects/files/user_browses_lfs_files_spec.rb
spec/features/projects/files/user_browses_lfs_files_spec.rb
+2
-0
spec/features/projects/files/user_creates_directory_spec.rb
spec/features/projects/files/user_creates_directory_spec.rb
+2
-0
spec/features/projects/files/user_deletes_files_spec.rb
spec/features/projects/files/user_deletes_files_spec.rb
+2
-0
spec/features/projects/files/user_edits_files_spec.rb
spec/features/projects/files/user_edits_files_spec.rb
+1
-0
spec/features/projects/files/user_replaces_files_spec.rb
spec/features/projects/files/user_replaces_files_spec.rb
+2
-0
spec/features/projects/files/user_uploads_files_spec.rb
spec/features/projects/files/user_uploads_files_spec.rb
+2
-0
spec/features/projects/tree/tree_show_spec.rb
spec/features/projects/tree/tree_show_spec.rb
+1
-0
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-0
spec/frontend/repository/router_spec.js
spec/frontend/repository/router_spec.js
+23
-0
spec/views/projects/tree/show.html.haml_spec.rb
spec/views/projects/tree/show.html.haml_spec.rb
+2
-0
No files found.
app/assets/javascripts/pages/projects/show/index.js
View file @
404314c6
...
@@ -46,4 +46,12 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -46,4 +46,12 @@ document.addEventListener('DOMContentLoaded', () => {
GpgBadges
.
fetch
();
GpgBadges
.
fetch
();
leaveByUrl
(
'
project
'
);
leaveByUrl
(
'
project
'
);
if
(
document
.
getElementById
(
'
js-tree-list
'
))
{
import
(
'
~/repository
'
)
.
then
(
m
=>
m
.
default
())
.
catch
(
e
=>
{
throw
e
;
});
}
});
});
app/assets/javascripts/pages/projects/tree/show/index.js
View file @
404314c6
...
@@ -40,4 +40,12 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -40,4 +40,12 @@ document.addEventListener('DOMContentLoaded', () => {
}
}
GpgBadges
.
fetch
();
GpgBadges
.
fetch
();
if
(
document
.
getElementById
(
'
js-tree-list
'
))
{
import
(
'
~/repository
'
)
.
then
(
m
=>
m
.
default
())
.
catch
(
e
=>
{
throw
e
;
});
}
});
});
app/assets/javascripts/repository/components/app.vue
0 → 100644
View file @
404314c6
<
template
>
<router-view
/>
</
template
>
app/assets/javascripts/repository/graphql.js
0 → 100644
View file @
404314c6
import
Vue
from
'
vue
'
;
import
VueApollo
from
'
vue-apollo
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
Vue
.
use
(
VueApollo
);
const
defaultClient
=
createDefaultClient
({});
export
default
new
VueApollo
({
defaultClient
,
});
app/assets/javascripts/repository/index.js
0 → 100644
View file @
404314c6
import
Vue
from
'
vue
'
;
import
createRouter
from
'
./router
'
;
import
App
from
'
./components/app.vue
'
;
import
apolloProvider
from
'
./graphql
'
;
export
default
function
setupVueRepositoryList
()
{
const
el
=
document
.
getElementById
(
'
js-tree-list
'
);
const
{
projectPath
,
ref
}
=
el
.
dataset
;
apolloProvider
.
clients
.
defaultClient
.
cache
.
writeData
({
data
:
{
projectPath
,
ref
,
},
});
return
new
Vue
({
el
,
router
:
createRouter
(
projectPath
,
ref
),
apolloProvider
,
render
(
h
)
{
return
h
(
App
);
},
});
}
app/assets/javascripts/repository/pages/index.vue
0 → 100644
View file @
404314c6
<
script
>
import
getRef
from
'
../queries/getRef.graphql
'
;
export
default
{
apollo
:
{
ref
:
{
query
:
getRef
,
},
},
data
()
{
return
{
ref
:
''
,
};
},
};
</
script
>
<
template
>
<div>
<router-link
:to=
"
{ path: `/tree/${ref}/app` }">
Go to tree
</router-link>
</div>
</
template
>
app/assets/javascripts/repository/pages/tree.vue
0 → 100644
View file @
404314c6
<
script
>
export
default
{
props
:
{
path
:
{
type
:
String
,
required
:
false
,
default
:
'
/
'
,
},
},
};
</
script
>
<
template
>
<div>
{{
path
}}
</div>
</
template
>
app/assets/javascripts/repository/queries/getRef.graphql
0 → 100644
View file @
404314c6
query
getRef
{
ref
@client
}
app/assets/javascripts/repository/router.js
0 → 100644
View file @
404314c6
import
Vue
from
'
vue
'
;
import
VueRouter
from
'
vue-router
'
;
import
{
joinPaths
}
from
'
../lib/utils/url_utility
'
;
import
IndexPage
from
'
./pages/index.vue
'
;
import
TreePage
from
'
./pages/tree.vue
'
;
Vue
.
use
(
VueRouter
);
export
default
function
createRouter
(
base
,
baseRef
)
{
return
new
VueRouter
({
mode
:
'
history
'
,
base
:
joinPaths
(
gon
.
relative_url_root
||
''
,
base
),
routes
:
[
{
path
:
'
/
'
,
name
:
'
projectRoot
'
,
component
:
IndexPage
,
},
{
path
:
`/tree/
${
baseRef
}
(/.*)?`
,
name
:
'
treePath
'
,
component
:
TreePage
,
props
:
route
=>
({
path
:
route
.
params
.
pathMatch
,
}),
beforeEnter
(
to
,
from
,
next
)
{
document
.
querySelectorAll
(
'
.js-hide-on-navigation
'
)
.
forEach
(
el
=>
el
.
classList
.
add
(
'
hidden
'
));
next
();
},
},
],
});
}
app/views/projects/_files.html.haml
View file @
404314c6
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
-
project
=
local_assigns
.
fetch
(
:project
)
{
@project
}
-
project
=
local_assigns
.
fetch
(
:project
)
{
@project
}
-
content_url
=
local_assigns
.
fetch
(
:content_url
)
{
@tree
.
readme
?
project_blob_path
(
@project
,
tree_join
(
@ref
,
@tree
.
readme
.
path
))
:
project_tree_path
(
@project
,
@ref
)
}
-
content_url
=
local_assigns
.
fetch
(
:content_url
)
{
@tree
.
readme
?
project_blob_path
(
@project
,
tree_join
(
@ref
,
@tree
.
readme
.
path
))
:
project_tree_path
(
@project
,
@ref
)
}
-
show_auto_devops_callout
=
show_auto_devops_callout?
(
@project
)
-
show_auto_devops_callout
=
show_auto_devops_callout?
(
@project
)
-
vue_file_list
=
Feature
.
enabled?
(
:vue_file_list
,
@project
)
#tree-holder
.tree-holder.clearfix
#tree-holder
.tree-holder.clearfix
.nav-block
.nav-block
...
@@ -13,7 +14,12 @@
...
@@ -13,7 +14,12 @@
=
render
'shared/commit_well'
,
commit:
commit
,
ref:
ref
,
project:
project
=
render
'shared/commit_well'
,
commit:
commit
,
ref:
ref
,
project:
project
-
if
is_project_overview
-
if
is_project_overview
.project-buttons.append-bottom-default
.project-buttons.append-bottom-default
{
class:
(
"js-hide-on-navigation"
if
vue_file_list
)
}
=
render
'stat_anchor_list'
,
anchors:
@project
.
statistics_buttons
(
show_auto_devops_callout:
show_auto_devops_callout
)
=
render
'stat_anchor_list'
,
anchors:
@project
.
statistics_buttons
(
show_auto_devops_callout:
show_auto_devops_callout
)
-
if
vue_file_list
#js-tree-list
{
data:
{
project_path:
@project
.
full_path
,
ref:
ref
}
}
-
if
@tree
.
readme
=
render
"projects/tree/readme"
,
readme:
@tree
.
readme
-
else
=
render
'projects/tree/tree_content'
,
tree:
@tree
,
content_url:
content_url
=
render
'projects/tree/tree_content'
,
tree:
@tree
,
content_url:
content_url
app/views/projects/_home_panel.html.haml
View file @
404314c6
-
empty_repo
=
@project
.
empty_repo?
-
empty_repo
=
@project
.
empty_repo?
-
show_auto_devops_callout
=
show_auto_devops_callout?
(
@project
)
-
show_auto_devops_callout
=
show_auto_devops_callout?
(
@project
)
-
max_project_topic_length
=
15
-
max_project_topic_length
=
15
.project-home-panel
{
class:
(
"empty-project"
if
empty_repo
)
}
.project-home-panel
{
class:
[(
"empty-project"
if
empty_repo
),
(
"js-hide-on-navigation"
if
Feature
.
enabled?
(
:vue_file_list
,
@project
))]
}
.row.append-bottom-8
.row.append-bottom-8
.home-panel-title-row.col-md-12.col-lg-6.d-flex
.home-panel-title-row.col-md-12.col-lg-6.d-flex
.avatar-container.rect-avatar.s64.home-panel-avatar.append-right-default.float-none
.avatar-container.rect-avatar.s64.home-panel-avatar.append-right-default.float-none
...
...
app/views/projects/tree/_readme.html.haml
View file @
404314c6
-
if
readme
.
rich_viewer
-
if
readme
.
rich_viewer
%article
.file-holder.readme-holder
{
id:
'readme'
,
class:
(
"limited-width-container"
unless
fluid_layout
)
}
%article
.file-holder.readme-holder
{
id:
'readme'
,
class:
[(
"limited-width-container"
unless
fluid_layout
),
(
"js-hide-on-navigation"
if
Feature
.
enabled?
(
:vue_file_list
,
@project
))]
}
.js-file-title.file-title
.js-file-title.file-title
=
blob_icon
readme
.
mode
,
readme
.
name
=
blob_icon
readme
.
mode
,
readme
.
name
=
link_to
project_blob_path
(
@project
,
tree_join
(
@ref
,
readme
.
path
))
do
=
link_to
project_blob_path
(
@project
,
tree_join
(
@ref
,
readme
.
path
))
do
...
...
spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
View file @
404314c6
...
@@ -5,6 +5,8 @@ describe 'Projects > Files > User views files page' do
...
@@ -5,6 +5,8 @@ describe 'Projects > Files > User views files page' do
let
(
:user
)
{
project
.
owner
}
let
(
:user
)
{
project
.
owner
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
sign_in
user
sign_in
user
visit
project_tree_path
(
project
,
project
.
repository
.
root_ref
)
visit
project_tree_path
(
project
,
project
.
repository
.
root_ref
)
end
end
...
...
spec/features/projects/files/user_browses_files_spec.rb
View file @
404314c6
...
@@ -11,6 +11,7 @@ describe "User browses files" do
...
@@ -11,6 +11,7 @@ describe "User browses files" do
let
(
:user
)
{
project
.
owner
}
let
(
:user
)
{
project
.
owner
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
stub_feature_flags
(
csslab:
false
)
stub_feature_flags
(
csslab:
false
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/files/user_browses_lfs_files_spec.rb
View file @
404314c6
...
@@ -5,6 +5,8 @@ describe 'Projects > Files > User browses LFS files' do
...
@@ -5,6 +5,8 @@ describe 'Projects > Files > User browses LFS files' do
let
(
:user
)
{
project
.
owner
}
let
(
:user
)
{
project
.
owner
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/files/user_creates_directory_spec.rb
View file @
404314c6
...
@@ -11,6 +11,8 @@ describe 'Projects > Files > User creates a directory', :js do
...
@@ -11,6 +11,8 @@ describe 'Projects > Files > User creates a directory', :js do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
visit
project_tree_path
(
project
,
'master'
)
visit
project_tree_path
(
project
,
'master'
)
...
...
spec/features/projects/files/user_deletes_files_spec.rb
View file @
404314c6
...
@@ -12,6 +12,8 @@ describe 'Projects > Files > User deletes files', :js do
...
@@ -12,6 +12,8 @@ describe 'Projects > Files > User deletes files', :js do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/files/user_edits_files_spec.rb
View file @
404314c6
...
@@ -10,6 +10,7 @@ describe 'Projects > Files > User edits files', :js do
...
@@ -10,6 +10,7 @@ describe 'Projects > Files > User edits files', :js do
before
do
before
do
stub_feature_flags
(
web_ide_default:
false
)
stub_feature_flags
(
web_ide_default:
false
)
stub_feature_flags
(
vue_file_list:
false
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/files/user_replaces_files_spec.rb
View file @
404314c6
...
@@ -14,6 +14,8 @@ describe 'Projects > Files > User replaces files', :js do
...
@@ -14,6 +14,8 @@ describe 'Projects > Files > User replaces files', :js do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/files/user_uploads_files_spec.rb
View file @
404314c6
...
@@ -14,6 +14,8 @@ describe 'Projects > Files > User uploads files' do
...
@@ -14,6 +14,8 @@ describe 'Projects > Files > User uploads files' do
let
(
:project2_tree_path_root_ref
)
{
project_tree_path
(
project2
,
project2
.
repository
.
root_ref
)
}
let
(
:project2_tree_path_root_ref
)
{
project_tree_path
(
project2
,
project2
.
repository
.
root_ref
)
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects/tree/tree_show_spec.rb
View file @
404314c6
...
@@ -8,6 +8,7 @@ describe 'Projects tree', :js do
...
@@ -8,6 +8,7 @@ describe 'Projects tree', :js do
let
(
:test_sha
)
{
'7975be0116940bf2ad4321f79d02a55c5f7779aa'
}
let
(
:test_sha
)
{
'7975be0116940bf2ad4321f79d02a55c5f7779aa'
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
spec/features/projects_spec.rb
View file @
404314c6
...
@@ -5,6 +5,7 @@ describe 'Project' do
...
@@ -5,6 +5,7 @@ describe 'Project' do
include
MobileHelpers
include
MobileHelpers
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
stub_feature_flags
(
approval_rules:
false
)
stub_feature_flags
(
approval_rules:
false
)
end
end
...
...
spec/frontend/repository/router_spec.js
0 → 100644
View file @
404314c6
import
IndexPage
from
'
~/repository/pages/index.vue
'
;
import
TreePage
from
'
~/repository/pages/tree.vue
'
;
import
createRouter
from
'
~/repository/router
'
;
describe
(
'
Repository router spec
'
,
()
=>
{
it
.
each
`
path | component | componentName
${
'
/
'
}
|
${
IndexPage
}
|
${
'
IndexPage
'
}
${
'
/tree/master
'
}
|
${
TreePage
}
|
${
'
TreePage
'
}
${
'
/tree/master/app/assets
'
}
|
${
TreePage
}
|
${
'
TreePage
'
}
${
'
/tree/123/app/assets
'
}
|
${
null
}
|
${
'
null
'
}
`
(
'
sets component as $componentName for path "$path"
'
,
({
path
,
component
})
=>
{
const
router
=
createRouter
(
''
,
'
master
'
);
const
componentsForRoute
=
router
.
getMatchedComponents
(
path
);
expect
(
componentsForRoute
.
length
).
toBe
(
component
?
1
:
0
);
if
(
component
)
{
expect
(
componentsForRoute
).
toContain
(
component
);
}
});
});
spec/views/projects/tree/show.html.haml_spec.rb
View file @
404314c6
...
@@ -7,6 +7,8 @@ describe 'projects/tree/show' do
...
@@ -7,6 +7,8 @@ describe 'projects/tree/show' do
let
(
:repository
)
{
project
.
repository
}
let
(
:repository
)
{
project
.
repository
}
before
do
before
do
stub_feature_flags
(
vue_file_list:
false
)
assign
(
:project
,
project
)
assign
(
:project
,
project
)
assign
(
:repository
,
repository
)
assign
(
:repository
,
repository
)
assign
(
:lfs_blob_ids
,
[])
assign
(
:lfs_blob_ids
,
[])
...
...
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