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
e7bfa5f1
Commit
e7bfa5f1
authored
Mar 29, 2021
by
Jacques Erasmus
Committed by
Mark Florian
Mar 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Blob Page to the repository vue app
Added a blob page in preparation for the blob viewer refactor
parent
e8906a60
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
73 additions
and
6 deletions
+73
-6
app/assets/javascripts/repository/components/table/row.vue
app/assets/javascripts/repository/components/table/row.vue
+17
-5
app/assets/javascripts/repository/pages/blob.vue
app/assets/javascripts/repository/pages/blob.vue
+17
-0
app/assets/javascripts/repository/router.js
app/assets/javascripts/repository/router.js
+20
-0
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+4
-0
config/feature_flags/development/refactor_blob_viewer.yml
config/feature_flags/development/refactor_blob_viewer.yml
+8
-0
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-0
spec/frontend/repository/components/table/row_spec.js
spec/frontend/repository/components/table/row_spec.js
+4
-1
spec/frontend/repository/router_spec.js
spec/frontend/repository/router_spec.js
+2
-0
No files found.
app/assets/javascripts/repository/components/table/row.vue
View file @
e7bfa5f1
...
...
@@ -12,6 +12,7 @@ import { escapeRegExp } from 'lodash';
import
{
escapeFileUrl
}
from
'
~/lib/utils/url_utility
'
;
import
FileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
TimeagoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
getRefMixin
from
'
../../mixins/get_ref
'
;
import
commitQuery
from
'
../../queries/commit.query.graphql
'
;
...
...
@@ -41,7 +42,7 @@ export default {
},
},
},
mixins
:
[
getRefMixin
],
mixins
:
[
getRefMixin
,
glFeatureFlagMixin
()
],
props
:
{
id
:
{
type
:
String
,
...
...
@@ -103,10 +104,21 @@ export default {
};
},
computed
:
{
refactorBlobViewerEnabled
()
{
return
this
.
glFeatures
.
refactorBlobViewer
;
},
routerLinkTo
()
{
return
this
.
isFolder
?
{
path
:
`/-/tree/
${
this
.
escapedRef
}
/
${
escapeFileUrl
(
this
.
path
)}
`
}
:
null
;
const
blobRouteConfig
=
{
path
:
`/-/blob/
${
this
.
escapedRef
}
/
${
escapeFileUrl
(
this
.
path
)}
`
};
const
treeRouteConfig
=
{
path
:
`/-/tree/
${
this
.
escapedRef
}
/
${
escapeFileUrl
(
this
.
path
)}
`
};
if
(
this
.
refactorBlobViewerEnabled
&&
this
.
isBlob
)
{
return
blobRouteConfig
;
}
return
this
.
isFolder
?
treeRouteConfig
:
null
;
},
isBlob
()
{
return
this
.
type
===
'
blob
'
;
},
isFolder
()
{
return
this
.
type
===
'
tree
'
;
...
...
@@ -115,7 +127,7 @@ export default {
return
this
.
type
===
'
commit
'
;
},
linkComponent
()
{
return
this
.
isFolder
?
'
router-link
'
:
'
a
'
;
return
this
.
isFolder
||
(
this
.
refactorBlobViewerEnabled
&&
this
.
isBlob
)
?
'
router-link
'
:
'
a
'
;
},
fullPath
()
{
return
this
.
path
.
replace
(
new
RegExp
(
`^
${
escapeRegExp
(
this
.
currentPath
)}
/`
),
''
);
...
...
app/assets/javascripts/repository/pages/blob.vue
0 → 100644
View file @
e7bfa5f1
<
script
>
// This file is in progress and behind a feature flag, please see the following issue for more:
// https://gitlab.com/gitlab-org/gitlab/-/issues/323200
// TODO (follow-up MR): import BlobContentViewer from '../components/blob_content_viewer.vue';
export
default
{
components
:
{
// TODO (follow-up MR): BlobContentViewer,
},
};
</
script
>
<
template
>
<div></div>
<!-- TODO (follow-up MR):
<blob-content-viewer/>
-->
</
template
>
app/assets/javascripts/repository/router.js
View file @
e7bfa5f1
...
...
@@ -2,6 +2,7 @@ import { escapeRegExp } from 'lodash';
import
Vue
from
'
vue
'
;
import
VueRouter
from
'
vue-router
'
;
import
{
joinPaths
}
from
'
../lib/utils/url_utility
'
;
import
BlobPage
from
'
./pages/blob.vue
'
;
import
IndexPage
from
'
./pages/index.vue
'
;
import
TreePage
from
'
./pages/tree.vue
'
;
...
...
@@ -15,6 +16,13 @@ export default function createRouter(base, baseRef) {
}),
};
const
blobPathRoute
=
{
component
:
BlobPage
,
props
:
(
route
)
=>
({
path
:
route
.
params
.
path
,
}),
};
return
new
VueRouter
({
mode
:
'
history
'
,
base
:
joinPaths
(
gon
.
relative_url_root
||
''
,
base
),
...
...
@@ -31,6 +39,18 @@ export default function createRouter(base, baseRef) {
path
:
`(/-)?/tree/
${
escapeRegExp
(
baseRef
)}
/:path*`
,
...
treePathRoute
,
},
{
name
:
'
blobPathDecoded
'
,
// Sometimes the ref needs decoding depending on how the backend sends it to us
path
:
`(/-)?/blob/
${
decodeURI
(
baseRef
)}
/:path*`
,
...
blobPathRoute
,
},
{
name
:
'
blobPath
'
,
// Support without decoding as well just in case the ref doesn't need to be decoded
path
:
`(/-)?/blob/
${
escapeRegExp
(
baseRef
)}
/:path*`
,
...
blobPathRoute
,
},
{
path
:
'
/
'
,
name
:
'
projectRoot
'
,
...
...
app/controllers/projects_controller.rb
View file @
e7bfa5f1
...
...
@@ -35,6 +35,10 @@ class ProjectsController < Projects::ApplicationController
push_frontend_feature_flag
(
:allow_editing_commit_messages
,
@project
)
end
before_action
do
push_frontend_feature_flag
(
:refactor_blob_viewer
,
@project
,
default_enabled: :yaml
)
end
layout
:determine_layout
feature_category
:projects
,
[
...
...
config/feature_flags/development/refactor_blob_viewer.yml
0 → 100644
View file @
e7bfa5f1
---
name
:
refactor_blob_viewer
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57326
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/324351
milestone
:
'
13.11'
type
:
development
group
:
group::source code
default_enabled
:
false
spec/features/projects_spec.rb
View file @
e7bfa5f1
...
...
@@ -290,6 +290,7 @@ RSpec.describe 'Project' do
let
(
:project
)
{
create
(
:forked_project_with_submodules
)
}
before
do
stub_feature_flags
(
refactor_blob_viewer:
false
)
project
.
add_maintainer
(
user
)
sign_in
user
visit
project_path
(
project
)
...
...
spec/frontend/repository/components/table/row_spec.js
View file @
e7bfa5f1
...
...
@@ -19,6 +19,9 @@ function factory(propsData = {}) {
projectPath
:
'
gitlab-org/gitlab-ce
'
,
url
:
`https://test.com`
,
},
provide
:
{
glFeatures
:
{
refactorBlobViewer
:
true
},
},
mocks
:
{
$router
,
},
...
...
@@ -81,7 +84,7 @@ describe('Repository table row component', () => {
it
.
each
`
type | component | componentName
${
'
tree
'
}
|
${
RouterLinkStub
}
|
${
'
RouterLink
'
}
${
'
file
'
}
|
${
'
a
'
}
|
${
'
hyperl
ink
'
}
${
'
blob
'
}
|
${
RouterLinkStub
}
|
${
'
RouterL
ink
'
}
${
'
commit
'
}
|
${
'
a
'
}
|
${
'
hyperlink
'
}
`
(
'
renders a $componentName for type $type
'
,
({
type
,
component
})
=>
{
factory
({
...
...
spec/frontend/repository/router_spec.js
View file @
e7bfa5f1
import
BlobPage
from
'
~/repository/pages/blob.vue
'
;
import
IndexPage
from
'
~/repository/pages/index.vue
'
;
import
TreePage
from
'
~/repository/pages/tree.vue
'
;
import
createRouter
from
'
~/repository/router
'
;
...
...
@@ -11,6 +12,7 @@ describe('Repository router spec', () => {
${
'
/-/tree/master
'
}
|
${
'
master
'
}
|
${
TreePage
}
|
${
'
TreePage
'
}
${
'
/-/tree/master/app/assets
'
}
|
${
'
master
'
}
|
${
TreePage
}
|
${
'
TreePage
'
}
${
'
/-/tree/123/app/assets
'
}
|
${
'
master
'
}
|
${
null
}
|
${
'
null
'
}
${
'
/-/blob/master/file.md
'
}
|
${
'
master
'
}
|
${
BlobPage
}
|
${
'
BlobPage
'
}
`
(
'
sets component as $componentName for path "$path"
'
,
({
path
,
component
,
branch
})
=>
{
const
router
=
createRouter
(
''
,
branch
);
...
...
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