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
61ace015
Commit
61ace015
authored
Jul 10, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
43289042
5b669c19
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
424 additions
and
0 deletions
+424
-0
changelogs/unreleased/embedded-metrics-be-2.yml
changelogs/unreleased/embedded-metrics-be-2.yml
+5
-0
lib/banzai/filter/inline_embeds_filter.rb
lib/banzai/filter/inline_embeds_filter.rb
+67
-0
lib/banzai/filter/inline_metrics_filter.rb
lib/banzai/filter/inline_metrics_filter.rb
+43
-0
lib/banzai/filter/inline_metrics_redactor_filter.rb
lib/banzai/filter/inline_metrics_redactor_filter.rb
+98
-0
lib/banzai/pipeline/gfm_pipeline.rb
lib/banzai/pipeline/gfm_pipeline.rb
+1
-0
lib/banzai/pipeline/post_process_pipeline.rb
lib/banzai/pipeline/post_process_pipeline.rb
+1
-0
lib/gitlab/metrics/dashboard/url.rb
lib/gitlab/metrics/dashboard/url.rb
+40
-0
spec/lib/banzai/filter/inline_metrics_filter_spec.rb
spec/lib/banzai/filter/inline_metrics_filter_spec.rb
+55
-0
spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
.../lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
+58
-0
spec/lib/gitlab/metrics/dashboard/url_spec.rb
spec/lib/gitlab/metrics/dashboard/url_spec.rb
+56
-0
No files found.
changelogs/unreleased/embedded-metrics-be-2.yml
0 → 100644
View file @
61ace015
---
title
:
Expose placeholder element for metrics charts in GFM
merge_request
:
29861
author
:
type
:
added
lib/banzai/filter/inline_embeds_filter.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
module
Banzai
module
Filter
# HTML filter that inserts a node for each occurence of
# a given link format. To transform references to DB
# resources in place, prefer to inherit from AbstractReferenceFilter.
class
InlineEmbedsFilter
<
HTML
::
Pipeline
::
Filter
# Find every relevant link, create a new node based on
# the link, and insert this node after any html content
# surrounding the link.
def
call
return
doc
unless
Feature
.
enabled?
(
:gfm_embedded_metrics
,
context
[
:project
])
doc
.
xpath
(
xpath_search
).
each
do
|
node
|
next
unless
element
=
element_to_embed
(
node
)
# We want this to follow any surrounding content. For example,
# if a link is inline in a paragraph.
node
.
parent
.
children
.
last
.
add_next_sibling
(
element
)
end
doc
end
# Implement in child class.
#
# Return a Nokogiri::XML::Element to embed in the
# markdown.
def
create_element
(
params
)
end
# Implement in child class unless overriding #embed_params
#
# Returns the regex pattern used to filter
# to only matching urls.
def
link_pattern
end
# Returns the xpath query string used to select nodes
# from the html document on which the embed is based.
#
# Override to select nodes other than links.
def
xpath_search
'descendant-or-self::a[@href]'
end
# Creates a new element based on the parameters
# obtained from the target link
def
element_to_embed
(
node
)
return
unless
params
=
embed_params
(
node
)
create_element
(
params
)
end
# Returns a hash of named parameters based on the
# provided regex with string keys.
#
# Override to select nodes other than links.
def
embed_params
(
node
)
url
=
node
[
'href'
]
link_pattern
.
match
(
url
)
{
|
m
|
m
.
named_captures
}
end
end
end
end
lib/banzai/filter/inline_metrics_filter.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
module
Banzai
module
Filter
# HTML filter that inserts a placeholder element for each
# reference to a metrics dashboard.
class
InlineMetricsFilter
<
Banzai
::
Filter
::
InlineEmbedsFilter
# Placeholder element for the frontend to use as an
# injection point for charts.
def
create_element
(
params
)
doc
.
document
.
create_element
(
'div'
,
class:
'js-render-metrics'
,
'data-dashboard-url'
:
metrics_dashboard_url
(
params
)
)
end
# Endpoint FE should hit to collect the appropriate
# chart information
def
metrics_dashboard_url
(
params
)
Gitlab
::
Metrics
::
Dashboard
::
Url
.
build_dashboard_url
(
params
[
'namespace'
],
params
[
'project'
],
params
[
'environment'
],
embedded:
true
)
end
# Search params for selecting metrics links. A few
# simple checks is enough to boost performance without
# the cost of doing a full regex match.
def
xpath_search
"descendant-or-self::a[contains(@href,'metrics') and \
starts-with(@href, '
#{
Gitlab
.
config
.
gitlab
.
url
}
')]"
end
# Regular expression matching metrics urls
def
link_pattern
Gitlab
::
Metrics
::
Dashboard
::
Url
.
regex
end
end
end
end
lib/banzai/filter/inline_metrics_redactor_filter.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
module
Banzai
module
Filter
# HTML filter that removes embeded elements that the current user does
# not have permission to view.
class
InlineMetricsRedactorFilter
<
HTML
::
Pipeline
::
Filter
include
Gitlab
::
Utils
::
StrongMemoize
METRICS_CSS_CLASS
=
'.js-render-metrics'
# Finds all embeds based on the css class the FE
# uses to identify the embedded content, removing
# only unnecessary nodes.
def
call
return
doc
unless
Feature
.
enabled?
(
:gfm_embedded_metrics
,
context
[
:project
])
nodes
.
each
do
|
node
|
path
=
paths_by_node
[
node
]
user_has_access
=
user_access_by_path
[
path
]
node
.
remove
unless
user_has_access
end
doc
end
private
def
user
context
[
:current_user
]
end
# Returns all nodes which the FE will identify as
# a metrics dashboard placeholder element
#
# @return [Nokogiri::XML::NodeSet]
def
nodes
@nodes
||=
doc
.
css
(
METRICS_CSS_CLASS
)
end
# Maps a node to the full path of a project.
# Memoized so we only need to run the regex to get
# the project full path from the url once per node.
#
# @return [Hash<Nokogiri::XML::Node, String>]
def
paths_by_node
strong_memoize
(
:paths_by_node
)
do
nodes
.
each_with_object
({})
do
|
node
,
paths
|
paths
[
node
]
=
path_for_node
(
node
)
end
end
end
# Gets a project's full_path from the dashboard url
# in the placeholder node. The FE will use the attr
# `data-dashboard-url`, so we want to check against that
# attribute directly in case a user has manually
# created a metrics element (rather than supporting
# an alternate attr in InlineMetricsFilter).
#
# @return [String]
def
path_for_node
(
node
)
url
=
node
.
attribute
(
'data-dashboard-url'
).
to_s
Gitlab
::
Metrics
::
Dashboard
::
Url
.
regex
.
match
(
url
)
do
|
m
|
"
#{
$~
[
:namespace
]
}
/
#{
$~
[
:project
]
}
"
end
end
# Maps a project's full path to a Project object.
# Contains all of the Projects referenced in the
# metrics placeholder elements of the current document
#
# @return [Hash<String, Project>]
def
projects_by_path
strong_memoize
(
:projects_by_path
)
do
Project
.
eager_load
(
:route
,
namespace:
[
:route
])
.
where_full_path_in
(
paths_by_node
.
values
.
uniq
)
.
index_by
(
&
:full_path
)
end
end
# Returns a mapping representing whether the current user
# has permission to view the metrics for the project.
# Determined in a batch
#
# @return [Hash<Project, Boolean>]
def
user_access_by_path
strong_memoize
(
:user_access_by_path
)
do
projects_by_path
.
each_with_object
({})
do
|
(
path
,
project
),
access
|
access
[
path
]
=
Ability
.
allowed?
(
user
,
:read_environment
,
project
)
end
end
end
end
end
end
lib/banzai/pipeline/gfm_pipeline.rb
View file @
61ace015
...
...
@@ -27,6 +27,7 @@ module Banzai
Filter
::
VideoLinkFilter
,
Filter
::
ImageLazyLoadFilter
,
Filter
::
ImageLinkFilter
,
Filter
::
InlineMetricsFilter
,
Filter
::
TableOfContentsFilter
,
Filter
::
AutolinkFilter
,
Filter
::
ExternalLinkFilter
,
...
...
lib/banzai/pipeline/post_process_pipeline.rb
View file @
61ace015
...
...
@@ -15,6 +15,7 @@ module Banzai
def
self
.
internal_link_filters
[
Filter
::
RedactorFilter
,
Filter
::
InlineMetricsRedactorFilter
,
Filter
::
RelativeLinkFilter
,
Filter
::
IssuableStateFilter
,
Filter
::
SuggestionFilter
...
...
lib/gitlab/metrics/dashboard/url.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
# Manages url matching for metrics dashboards.
module
Gitlab
module
Metrics
module
Dashboard
class
Url
class
<<
self
# Matches urls for a metrics dashboard. This could be
# either the /metrics endpoint or the /metrics_dashboard
# endpoint.
#
# EX - https://<host>/<namespace>/<project>/environments/<env_id>/metrics
def
regex
%r{
(?<url>
#{
Regexp
.
escape
(
Gitlab
.
config
.
gitlab
.
url
)
}
\/
#{
Project
.
reference_pattern
}
(?:
\/\-
)?
\/
environments
\/
(?<environment>
\d
+)
\/
metrics
(?<query>
\?
[a-z0-9_=-]+
(&[a-z0-9_=-]+)*
)?
(?<anchor>
\#
[a-z0-9_-]+)?
)
}x
end
# Builds a metrics dashboard url based on the passed in arguments
def
build_dashboard_url
(
*
args
)
Gitlab
::
Routing
.
url_helpers
.
metrics_dashboard_namespace_project_environment_url
(
*
args
)
end
end
end
end
end
end
spec/lib/banzai/filter/inline_metrics_filter_spec.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
require
'spec_helper'
describe
Banzai
::
Filter
::
InlineMetricsFilter
do
include
FilterSpecHelper
let
(
:input
)
{
%(<a href="#{url}">example</a>)
}
let
(
:doc
)
{
filter
(
input
)
}
context
'when the document has an external link'
do
let
(
:url
)
{
'https://foo.com'
}
it
'leaves regular non-metrics links unchanged'
do
expect
(
doc
.
to_s
).
to
eq
input
end
end
context
'when the document has a metrics dashboard link'
do
let
(
:params
)
{
[
'foo'
,
'bar'
,
12
]
}
let
(
:url
)
{
urls
.
metrics_namespace_project_environment_url
(
*
params
)
}
it
'leaves the original link unchanged'
do
expect
(
doc
.
at_css
(
'a'
).
to_s
).
to
eq
input
end
it
'appends a metrics charts placeholder with dashboard url after metrics links'
do
node
=
doc
.
at_css
(
'.js-render-metrics'
)
expect
(
node
).
to
be_present
dashboard_url
=
urls
.
metrics_dashboard_namespace_project_environment_url
(
*
params
,
embedded:
true
)
expect
(
node
.
attribute
(
'data-dashboard-url'
).
to_s
).
to
eq
dashboard_url
end
context
'when the metrics dashboard link is part of a paragraph'
do
let
(
:paragraph
)
{
%(This is an <a href="#{url}">example</a> of metrics.)
}
let
(
:input
)
{
%(<p>#{paragraph}</p>)
}
it
'appends the charts placeholder after the enclosing paragraph'
do
expect
(
doc
.
at_css
(
'p'
).
to_s
).
to
include
paragraph
expect
(
doc
.
at_css
(
'.js-render-metrics'
)).
to
be_present
end
context
'when the feature is disabled'
do
before
do
stub_feature_flags
(
gfm_embedded_metrics:
false
)
end
it
'does nothing'
do
expect
(
doc
.
to_s
).
to
eq
input
end
end
end
end
end
spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
require
'spec_helper'
describe
Banzai
::
Filter
::
InlineMetricsRedactorFilter
do
include
FilterSpecHelper
set
(
:project
)
{
create
(
:project
)
}
let
(
:url
)
{
urls
.
metrics_dashboard_project_environment_url
(
project
,
1
,
embedded:
true
)
}
let
(
:input
)
{
%(<a href="#{url}">example</a>)
}
let
(
:doc
)
{
filter
(
input
)
}
context
'when the feature is disabled'
do
before
do
stub_feature_flags
(
gfm_embedded_metrics:
false
)
end
it
'does nothing'
do
expect
(
doc
.
to_s
).
to
eq
input
end
end
context
'without a metrics charts placeholder'
do
it
'leaves regular non-metrics links unchanged'
do
expect
(
doc
.
to_s
).
to
eq
input
end
end
context
'with a metrics charts placeholder'
do
let
(
:input
)
{
%(<div class="js-render-metrics" data-dashboard-url="#{url}"></div>)
}
context
'no user is logged in'
do
it
'redacts the placeholder'
do
expect
(
doc
.
to_s
).
to
be_empty
end
end
context
'the user does not have permission do see charts'
do
let
(
:doc
)
{
filter
(
input
,
current_user:
build
(
:user
))
}
it
'redacts the placeholder'
do
expect
(
doc
.
to_s
).
to
be_empty
end
end
context
'the user has requisite permissions'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:doc
)
{
filter
(
input
,
current_user:
user
)
}
it
'leaves the placeholder'
do
project
.
add_maintainer
(
user
)
expect
(
doc
.
to_s
).
to
eq
input
end
end
end
end
spec/lib/gitlab/metrics/dashboard/url_spec.rb
0 → 100644
View file @
61ace015
# frozen_string_literal: true
require
'spec_helper'
describe
Gitlab
::
Metrics
::
Dashboard
::
Url
do
describe
'#regex'
do
it
'returns a regular expression'
do
expect
(
described_class
.
regex
).
to
be_a
Regexp
end
it
'matches a metrics dashboard link with named params'
do
url
=
Gitlab
::
Routing
.
url_helpers
.
metrics_namespace_project_environment_url
(
'foo'
,
'bar'
,
1
,
start:
123345456
,
anchor:
'title'
)
expected_params
=
{
'url'
=>
url
,
'namespace'
=>
'foo'
,
'project'
=>
'bar'
,
'environment'
=>
'1'
,
'query'
=>
'?start=123345456'
,
'anchor'
=>
'#title'
}
expect
(
described_class
.
regex
).
to
match
url
described_class
.
regex
.
match
(
url
)
do
|
m
|
expect
(
m
.
named_captures
).
to
eq
expected_params
end
end
it
'does not match other gitlab urls that contain the term metrics'
do
url
=
Gitlab
::
Routing
.
url_helpers
.
active_common_namespace_project_prometheus_metrics_url
(
'foo'
,
'bar'
,
:json
)
expect
(
described_class
.
regex
).
not_to
match
url
end
it
'does not match other gitlab urls'
do
url
=
Gitlab
.
config
.
gitlab
.
url
expect
(
described_class
.
regex
).
not_to
match
url
end
it
'does not match non-gitlab urls'
do
url
=
'https://www.super_awesome_site.com/'
expect
(
described_class
.
regex
).
not_to
match
url
end
end
describe
'#build_dashboard_url'
do
it
'builds the url for the dashboard endpoint'
do
url
=
described_class
.
build_dashboard_url
(
'foo'
,
'bar'
,
1
)
expect
(
url
).
to
match
described_class
.
regex
end
end
end
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