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
12413158
Commit
12413158
authored
Jul 01, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fetch branch diverging counts from API
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
parent
8775e4a1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
25 deletions
+83
-25
app/assets/javascripts/branches/divergence_graph.js
app/assets/javascripts/branches/divergence_graph.js
+44
-18
app/assets/javascripts/pages/projects/branches/index/index.js
...assets/javascripts/pages/projects/branches/index/index.js
+1
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+2
-6
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/branches/divergence_graph_spec.js
spec/frontend/branches/divergence_graph_spec.js
+32
-0
No files found.
app/assets/javascripts/branches/divergence_graph.js
View file @
12413158
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
{
__
}
from
'
../locale
'
;
import
createFlash
from
'
../flash
'
;
import
axios
from
'
../lib/utils/axios_utils
'
;
import
DivergenceGraph
from
'
./components/divergence_graph.vue
'
;
import
DivergenceGraph
from
'
./components/divergence_graph.vue
'
;
export
default
()
=>
{
export
function
createGraphVueApp
(
el
,
data
,
maxCommits
)
{
document
.
querySelectorAll
(
'
.js-branch-divergence-graph
'
).
forEach
(
el
=>
{
return
new
Vue
({
const
{
distance
,
aheadCount
,
behindCount
,
defaultBranch
,
maxCommits
}
=
el
.
dataset
;
el
,
render
(
h
)
{
return
new
Vue
({
return
h
(
DivergenceGraph
,
{
el
,
props
:
{
render
(
h
)
{
defaultBranch
:
'
master
'
,
return
h
(
DivergenceGraph
,
{
distance
:
data
.
distance
?
parseInt
(
data
.
distance
,
10
)
:
null
,
props
:
{
aheadCount
:
parseInt
(
data
.
ahead
,
10
),
defaultBranch
,
behindCount
:
parseInt
(
data
.
behind
,
10
),
distance
:
distance
?
parseInt
(
distance
,
10
)
:
null
,
maxCommits
,
aheadCount
:
parseInt
(
aheadCount
,
10
),
},
behindCount
:
parseInt
(
behindCount
,
10
),
});
maxCommits
:
parseInt
(
maxCommits
,
10
),
},
},
});
},
});
});
});
}
export
default
endpoint
=>
{
const
names
=
[...
document
.
querySelectorAll
(
'
.js-branch-item
'
)].
map
(
({
dataset
})
=>
dataset
.
name
,
);
return
axios
.
get
(
endpoint
,
{
params
:
{
names
},
})
.
then
(({
data
})
=>
{
const
maxCommits
=
Object
.
entries
(
data
).
reduce
((
acc
,
[,
val
])
=>
{
const
max
=
Math
.
max
(...
Object
.
values
(
val
));
return
max
>
acc
?
max
:
acc
;
},
100
);
Object
.
entries
(
data
).
forEach
(([
branchName
,
val
])
=>
{
const
el
=
document
.
querySelector
(
`.js-branch-
${
branchName
}
.js-branch-divergence-graph`
);
if
(
!
el
)
return
;
createGraphVueApp
(
el
,
val
,
maxCommits
);
});
})
.
catch
(()
=>
createFlash
(
__
(
'
Error fetching diverging counts for branches. Please try again.
'
)),
);
};
};
app/assets/javascripts/pages/projects/branches/index/index.js
View file @
12413158
...
@@ -5,5 +5,5 @@ import initDiverganceGraph from '~/branches/divergence_graph';
...
@@ -5,5 +5,5 @@ import initDiverganceGraph from '~/branches/divergence_graph';
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
AjaxLoadingSpinner
.
init
();
AjaxLoadingSpinner
.
init
();
new
DeleteModal
();
// eslint-disable-line no-new
new
DeleteModal
();
// eslint-disable-line no-new
initDiverganceGraph
();
initDiverganceGraph
(
document
.
querySelector
(
'
.js-branch-list
'
).
dataset
.
divergingCountsEndpoint
);
});
});
app/views/projects/branches/_branch.html.haml
View file @
12413158
-
merged
=
local_assigns
.
fetch
(
:merged
,
false
)
-
merged
=
local_assigns
.
fetch
(
:merged
,
false
)
-
commit
=
@repository
.
commit
(
branch
.
dereferenced_target
)
-
commit
=
@repository
.
commit
(
branch
.
dereferenced_target
)
-
diverging_commit_counts
=
Branches
::
DivergingCommitCountsService
.
new
(
@repository
).
call
(
branch
)
-
number_commits_distance
=
diverging_commit_counts
[
:distance
]
-
number_commits_behind
=
diverging_commit_counts
[
:behind
]
-
number_commits_ahead
=
diverging_commit_counts
[
:ahead
]
-
merge_project
=
merge_request_source_project_for_project
(
@project
)
-
merge_project
=
merge_request_source_project_for_project
(
@project
)
%li
{
class:
"branch-item js-branch-
#{branch.name}"
}
%li
{
class:
"branch-item js-branch-
item js-branch-#{branch.name}"
,
data:
{
name:
branch
.
name
}
}
.branch-info
.branch-info
.branch-title
.branch-title
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
...
@@ -30,7 +26,7 @@
...
@@ -30,7 +26,7 @@
=
s_
(
'Branches|Cant find HEAD commit for this branch'
)
=
s_
(
'Branches|Cant find HEAD commit for this branch'
)
-
if
branch
.
name
!=
@repository
.
root_ref
-
if
branch
.
name
!=
@repository
.
root_ref
.js-branch-divergence-graph
{
data:
{
distance:
number_commits_distance
,
ahead_count:
number_commits_ahead
,
behind_count:
number_commits_behind
,
default_branch:
@repository
.
root_ref
,
max_commits:
@max_commits
}
}
.js-branch-divergence-graph
.controls.d-none.d-md-block
<
.controls.d-none.d-md-block
<
-
if
merge_project
&&
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
-
if
merge_project
&&
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
...
...
app/views/projects/branches/index.html.haml
View file @
12413158
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
=
render_if_exists
'projects/commits/mirror_status'
=
render_if_exists
'projects/commits/mirror_status'
.js-branch-list
{
data:
{
diverging_counts_endpoint:
diverging_commit_counts_namespace_project_branches_path
(
@project
.
namespace
,
@project
,
format: :json
)
}
}
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
project_settings_link
=
link_to
s_
(
'Branches|project settings'
),
project_protected_branches_path
(
@project
)
-
project_settings_link
=
link_to
s_
(
'Branches|project settings'
),
project_protected_branches_path
(
@project
)
.row-content-block
.row-content-block
...
...
locale/gitlab.pot
View file @
12413158
...
@@ -4133,6 +4133,9 @@ msgstr ""
...
@@ -4133,6 +4133,9 @@ msgstr ""
msgid "Error fetching contributors data."
msgid "Error fetching contributors data."
msgstr ""
msgstr ""
msgid "Error fetching diverging counts for branches. Please try again."
msgstr ""
msgid "Error fetching labels."
msgid "Error fetching labels."
msgstr ""
msgstr ""
...
...
spec/frontend/branches/divergence_graph_spec.js
0 → 100644
View file @
12413158
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
init
from
'
~/branches/divergence_graph
'
;
describe
(
'
Divergence graph
'
,
()
=>
{
let
mock
;
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/-/diverging_counts
'
).
reply
(
200
,
{
master
:
{
ahead
:
1
,
behind
:
1
},
});
jest
.
spyOn
(
axios
,
'
get
'
);
document
.
body
.
innerHTML
=
`
<div class="js-branch-item" data-name="master"></div>
`
;
});
afterEach
(()
=>
{
mock
.
restore
();
});
it
(
'
calls axos get with list of branch names
'
,
()
=>
init
(
'
/-/diverging_counts
'
).
then
(()
=>
{
expect
(
axios
.
get
).
toHaveBeenCalledWith
(
'
/-/diverging_counts
'
,
{
params
:
{
names
:
[
'
master
'
]
},
});
}));
});
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