measure_filter.col.language=Language
measure_filter.col.links=Links
measure_filter.col.name=Name
-measure_filter.col.short_name=Name
+measure_filter.col.short_name=Short Name
measure_filter.col.version=Version
measure_filter.missing_name=Name is missing
measure_filter.name_too_long=Name is too long
measure_filter.add_to_system=Add to system
measure_filter.title_shared_filters=Shared Filters
measure_filter.title_system_filters=System Filters
+measure_filter.key_like=Key like
+measure_filter.name_contains=Name contains
+measure_filter.only_favourites=Favourites only
#------------------------------------------------------------------------------
#
// conditions on resources
private String baseResourceKey;
- private boolean onBaseResourceChildren = false; // only if getBaseResourceKey is set
+ private Long baseResourceId;
+
+ // only if baseResourceKey or baseResourceId are set
+ private boolean onBaseResourceChildren = false;
+
private List<String> resourceScopes = Collections.emptyList();
private List<String> resourceQualifiers = Collections.emptyList();
private List<String> resourceLanguages = Collections.emptyList();
return this;
}
+ public Long getBaseResourceId() {
+ return baseResourceId;
+ }
+
+ public MeasureFilter setBaseResourceId(Long i) {
+ this.baseResourceId = i;
+ return this;
+ }
+
public MeasureFilter setOnBaseResourceChildren(boolean b) {
this.onBaseResourceChildren = b;
return this;
import org.sonar.api.measures.Metric;
public class MeasureFilterCondition {
+ public enum Operator {
+ EQUALS("eq", "="), GREATER("gt", ">"), GREATER_OR_EQUALS("gte", ">="), LESS("lt", "<"), LESS_OR_EQUALS("lte", "<=");
+
+ private String code;
+ private String sql;
+
+ private Operator(String code, String sql) {
+ this.code = code;
+ this.sql = sql;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getSql() {
+ return sql;
+ }
+
+ public static Operator fromCode(String code) {
+ for (Operator operator : values()) {
+ if (operator.code.equals(code)) {
+ return operator;
+ }
+ }
+ throw new IllegalArgumentException("Unknown operator code: " + code);
+ }
+
+ public static Operator fromSql(String sql) {
+ for (Operator operator : values()) {
+ if (operator.sql.equals(sql)) {
+ return operator;
+ }
+ }
+ throw new IllegalArgumentException("Unknown operator sql: " + sql);
+ }
+ }
private final Metric metric;
- private final String operator;
+ private final Operator operator;
private final double value;
private Integer period = null;
- public MeasureFilterCondition(Metric metric, String operator, double value) {
+ public MeasureFilterCondition(Metric metric, Operator operator, double value) {
this.metric = metric;
this.operator = operator;
this.value = value;
return metric;
}
- public String operator() {
+ public Operator operator() {
return operator;
}
void appendSqlCondition(StringBuilder sql) {
sql.append(" pm.metric_id=");
sql.append(metric.getId());
- sql.append(" AND ").append(valueColumn()).append(operator).append(value);
+ sql.append(" AND ").append(valueColumn()).append(operator.getSql()).append(value);
}
@Override
Metric metric = metricFinder.findByKey((String) c.get("metric"));
String operator = (String) c.get("op");
Double value = (Double) c.get("val");
- MeasureFilterCondition condition = new MeasureFilterCondition(metric, operator, value);
+ MeasureFilterCondition condition = new MeasureFilterCondition(metric, MeasureFilterCondition.Operator.fromSql(operator), value);
if (c.containsKey("period")) {
condition.setPeriod(((Long) c.get("period")).intValue());
}
private void prepareContext(MeasureFilterContext context, MeasureFilter filter, SqlSession session) {
if (filter.getBaseResourceKey() != null) {
context.setBaseSnapshot(resourceDao.getLastSnapshot(filter.getBaseResourceKey(), session));
+ } else if (filter.getBaseResourceId() != null) {
+ context.setBaseSnapshot(resourceDao.getLastSnapshotByResourceId(filter.getBaseResourceId(), session));
}
}
static boolean isValid(MeasureFilter filter, MeasureFilterContext context) {
boolean valid = (Strings.isNullOrEmpty(filter.getBaseResourceKey()) || context.getBaseSnapshot()!=null);
+ valid &= (filter.getBaseResourceId()==null || context.getBaseSnapshot()!=null);
valid &= !(filter.isOnBaseResourceChildren() && context.getBaseSnapshot() == null);
valid &= !(filter.isOnFavourites() && context.getUserId() == null);
valid &= validateMeasureConditions(filter);
public MeasureFilter create(Map<String, Object> properties) {
MeasureFilter filter = new MeasureFilter();
filter.setBaseResourceKey((String) properties.get("base"));
+ if (properties.containsKey("baseId")) {
+ filter.setBaseResourceId(Long.valueOf((String) properties.get("baseId")));
+ }
filter.setResourceScopes(toList(properties.get("scopes")));
filter.setResourceQualifiers(toList(properties.get("qualifiers")));
filter.setResourceLanguages(toList(properties.get("languages")));
private MeasureFilterCondition toCondition(Map<String, Object> props, int index) {
MeasureFilterCondition condition = null;
- String metricKey = (String) props.get("c" + index + "metric");
- String op = (String) props.get("c" + index + "op");
- String val = (String) props.get("c" + index + "val");
+ String metricKey = (String) props.get("c" + index + "_metric");
+ String op = (String) props.get("c" + index + "_op");
+ String val = (String) props.get("c" + index + "_val");
if (!Strings.isNullOrEmpty(metricKey) && !Strings.isNullOrEmpty(op) && !Strings.isNullOrEmpty(val)) {
Metric metric = metricFinder.findByKey(metricKey);
- condition = new MeasureFilterCondition(metric, op, Double.parseDouble(val));
- String period = (String) props.get("c" + index + "period");
+ MeasureFilterCondition.Operator operator = MeasureFilterCondition.Operator.fromCode(op);
+ condition = new MeasureFilterCondition(metric, operator, Double.parseDouble(val));
+ String period = (String) props.get("c" + index + "_period");
if (period != null) {
condition.setPeriod(Integer.parseInt(period));
}
}
public SnapshotDto getLastSnapshot(String resourceKey, SqlSession session) {
- return session.getMapper(ResourceMapper.class).selectLastSnapshotByKey(resourceKey);
+ return session.getMapper(ResourceMapper.class).selectLastSnapshotByResourceKey(resourceKey);
}
+ public SnapshotDto getLastSnapshotByResourceId(long resourceId, SqlSession session) {
+ return session.getMapper(ResourceMapper.class).selectLastSnapshotByResourceId(resourceId);
+ }
+
public List<ResourceDto> getDescendantProjects(long projectId) {
SqlSession session = mybatis.openSession();
try {
public interface ResourceMapper {
SnapshotDto selectSnapshot(Long snapshotId);
- SnapshotDto selectLastSnapshotByKey(String resourceKey);
+ SnapshotDto selectLastSnapshotByResourceKey(String resourceKey);
+
+ SnapshotDto selectLastSnapshotByResourceId(long resourceId);
ResourceDto selectResource(long id);
select s.* from snapshots s, projects p where p.kee=#{id} and p.enabled=${_true} and p.copy_resource_id is null and s.islast=${_true} and p.id=s.project_id
</select>
+ <select id="selectLastSnapshotByResourceId" parameterType="string" resultMap="snapshotResultMap">
+ select s.* from snapshots s where s.project_id=#{id} and s.islast=${_true}
+ </select>
+
<select id="selectDescendantProjects" parameterType="long" resultMap="resourceResultMap">
select * from projects where scope='PRJ' and root_id=#{id}
</select>
@Test
public void filter_is_not_valid_if_condition_on_unknown_metric() {
MeasureFilterContext context = new MeasureFilterContext();
- MeasureFilter filter = new MeasureFilter().addCondition(new MeasureFilterCondition(null, "<", 3.0));
+ MeasureFilter filter = new MeasureFilter().addCondition(new MeasureFilterCondition(null, MeasureFilterCondition.Operator.LESS, 3.0));
assertThat(MeasureFilterExecutor.isValid(filter, context)).isFalse();
}
public void condition_on_numeric_measure() throws SQLException {
MeasureFilter filter = new MeasureFilter().setResourceQualifiers(Arrays.asList("CLA"))
.setSortOnMetric(METRIC_LINES)
- .addCondition(new MeasureFilterCondition(METRIC_LINES, ">", 200));
+ .addCondition(new MeasureFilterCondition(METRIC_LINES, MeasureFilterCondition.Operator.GREATER, 200));
List<MeasureFilterRow> rows = executor.execute(filter, new MeasureFilterContext());
assertThat(rows).hasSize(1);
public void condition_on_measure_variation() throws SQLException {
MeasureFilter filter = new MeasureFilter().setResourceQualifiers(Arrays.asList("TRK"))
.setSortOnMetric(METRIC_LINES)
- .addCondition(new MeasureFilterCondition(METRIC_LINES, ">", 1000).setPeriod(5));
+ .addCondition(new MeasureFilterCondition(METRIC_LINES, MeasureFilterCondition.Operator.GREATER, 1000).setPeriod(5));
List<MeasureFilterRow> rows = executor.execute(filter, new MeasureFilterContext());
assertThat(rows).hasSize(1);
public void multiple_conditions_on_numeric_measures() throws SQLException {
MeasureFilter filter = new MeasureFilter().setResourceQualifiers(Arrays.asList("CLA"))
.setSortOnMetric(METRIC_LINES)
- .addCondition(new MeasureFilterCondition(METRIC_LINES, ">", 2))
- .addCondition(new MeasureFilterCondition(METRIC_LINES, "<=", 50));
+ .addCondition(new MeasureFilterCondition(METRIC_LINES, MeasureFilterCondition.Operator.GREATER, 2))
+ .addCondition(new MeasureFilterCondition(METRIC_LINES, MeasureFilterCondition.Operator.LESS_OR_EQUALS, 50));
List<MeasureFilterRow> rows = executor.execute(filter, new MeasureFilterContext());
assertThat(rows).hasSize(1);
elsif column.key=='version'
h result.snapshot.version
elsif column.key=='language'
- h result.snapshot.resource.language
+ Api::Utils.language_name(result.snapshot.resource.language)
elsif column.key=='links' && result.links
html = ''
result.links.select { |link| link.href.start_with?('http') }.each do |link|
criteria.merge({'id' => self.id})
end
+ def base_resource
+ if criteria('base')
+ Project.find(:first, :conditions => ['kee=? and copy_resource_id is null and person_id is null', criteria('base')])
+ elsif criteria('baseId')
+ Project.find(criteria('baseId'))
+ end
+ end
+
private
def init_results
end
end
end
- if criteria['base'].present?
- base_snapshot = Snapshot.find(:first, :include => 'project', :conditions => ['projects.kee=? and islast=?', criteria['base'], true])
+ if base_resource
+ base_snapshot = base_resource.last_snapshot
if base_snapshot
@base_result = Result.new(base_snapshot)
unless metric_ids.empty?
display_favourites = logged_in?
colspan = @filter.display.columns.size
colspan += 1 if display_favourites
+ table_columns = []
+ table_columns << '' if display_favourites
+ table_columns.concat(@filter.display.columns.map{|c| c.key})
if edit_mode
content_for :script do
%>
<script>
- var cols = [<%= @filter.display.columns.map{|c| "'#{c.key}'"}.join(',')-%>];
+ var cols = [<%= table_columns.map{|col| "'#{col}'"}.join(',')-%>];
function leftCol(id) {
var cell = $j('#measures-table tr.admin td[index=' + id + ']');
var columnIndex = cell.parent().children().index(cell);
var tr = $j(this);
var td1 = tr.find('th:eq(' + from + ')');
var td2 = tr.find('th:eq(' + to + ')');
- td1.detach().insertAfter(td2);
+ td1.remove().insertAfter(td2);
});
$j('#measures-table tbody tr').each(function () {
var tr = $j(this);
var td1 = tr.find('td:eq(' + from + ')');
var td2 = tr.find('td:eq(' + to + ')');
- td1.detach().insertAfter(td2);
+ td1.remove().insertAfter(td2);
});
}
function deleteCol(id) {
$j('#measures-table thead tr').each(function () {
var tr = $j(this);
var td1 = tr.find('th:eq(' + columnIndex + ')');
- td1.detach();
+ td1.remove();
});
$j('#measures-table tbody tr').each(function () {
var tr = $j(this);
var td1 = tr.find('td:eq(' + columnIndex + ')');
- td1.detach();
+ td1.remove();
});
}
</script>
:html_id => 'select-metric',
:allow_empty => true,
:key_prefix => 'metric:',
- :extra_values => [['Name', 'name'], ['Short Name', 'short_name'], ['Description', 'description'], ['Version', 'version']] -%>
+ :extra_values => [[message('measure_filter.col.name'), 'name'], [message('measure_filter.col.short_name'), 'short_name'], [message('measure_filter.col.description'), 'description'], [message('measure_filter.col.language'), 'language'], [message('measure_filter.col.version'), 'version']] -%>
<select id="select-period" style="display: none;">
<option value="">Value</option>
<% period_names.each_with_index do |period_name, index| %>
}
cols.push(columnKey);
window.location = removeUrlAttr(decodeURI(window.location.href), 'cols\\[\\]') + '&' + $j.map(cols,function (a) {
- return 'cols[]=' + a;
+ return a ? 'cols[]=' + a : null;
}).join('&');
});
$j("#exit-edit").on("click", function (e) {
var url = removeUrlAttr(decodeURI(window.location.href), 'cols\\[\\]');
url = removeUrlAttr(url, 'edit');
url += '&' + $j.map(cols,function (a) {
- return 'cols[]=' + a;
+ return a ? 'cols[]=' + a : null;
}).join('&');
window.location = url;
});
<% if edit_mode %>
<tr class="admin">
<% if display_favourites %>
- <th></th>
+ <td></td>
<% end %>
<% @filter.display.columns.each_with_index do |column, index| %>
<td class="<%= column.align -%>" index="<%= index -%>">
<% if logged_in? %>
<br/>
+ <div class="h2">My Favourites</div>
<ul id="fav-filters">
<% current_user.favourited_measure_filters.each do |filter| %>
<li>
</li>
<% end %>
</ul>
+ <br>
<a href="<%= ApplicationController.root_context -%>/measures/manage" class="link-action">Manage</a>
<% end %>
$j('#filters').show();
if (!filtersLoaded) {
$j('#filters').load(baseUrl + '/measures/filters');
- filtersLoaded=true;
+ filtersLoaded = true;
}
});
}
<tr>
<td class="width100">
Base:<br>
- <input type="text" name="base" value="<%= @filter.criteria['base'] -%>" class="large-input">
+ <%= resource_select_tag 'baseId', :resource_type_property => 'supportsGlobalDashboards', :width => '100%', :selected_resource => @filter.base_resource -%>
</td>
</tr>
<tr>
</tr>
<tr>
<td class="width100">
- Name:<br>
+ <%= message('measure_filter.name_contains') -%>:<br>
<input type="text" name="nameRegexp" value="<%= h @filter.criteria['nameRegexp'] -%>" class="large-input"></td>
</tr>
<tr>
<td class="width100">
- Key:<br>
+ <%= message('measure_filter.key_like') -%>:<br>
<input type="text" name="keyRegexp" value="<%= h @filter.criteria['keyRegexp'] -%>" class="large-input"></td>
</tr>
<tr>
<td>
- Favourites only:<br>
+ <%= message 'measure_filter.only_favourites' %>:<br>
<%= check_box_tag 'onFavourites', 'true', @filter.criteria['onFavourites']=='true' -%>
</td>
</tr>
+
+ <% condition_metrics = Metric.all.select { |m| m.numeric? } %>
+ <tr>
+ <td>
+ <br>
+ <%= metric_select_tag 'c1_metric', condition_metrics, :allow_empty => true, :selected_key => @filter.criteria('c1_metric'), :width => '180px' -%>
+ <%= select_tag 'c1_period', options_for_select([['Value', ''], ['Period 1', '1'], ['Period 2', '2'], ['Period 3', '3']], @filter.criteria('c1_period')) -%>
+ <%= select_tag 'c1_op', options_for_select([['Equals', 'eq'], ['Less than', 'lt'], ['Less or equals', 'lte'], ['Greater than', 'gt'], ['Greater or equals', 'gte']], @filter.criteria('c1_op')) -%>
+ <input type="text" size="5" name="c1_val" value="<%= h @filter.criteria('c1_val') -%>">
+ <br><br>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <br>
+ <%= metric_select_tag 'c2_metric', condition_metrics, :allow_empty => true, :selected_key => @filter.criteria('c2_metric'), :width => '180px' -%>
+ <%= select_tag 'c2_period', options_for_select([['Value', ''], ['Period 1', '1'], ['Period 2', '2'], ['Period 3', '3']], @filter.criteria('c2_period')) -%>
+ <%= select_tag 'c2_op', options_for_select([['Equals', 'eq'], ['Less than', 'lt'], ['Less or equals', 'lte'], ['Greater than', 'gt'], ['Greater or equals', 'gte']], @filter.criteria('c2_op')) -%>
+ <input type="text" size="5" name="c2_val" value="<%= h @filter.criteria('c2_val') -%>">
+ <br><br>
+ </td>
+ </tr>
+
<tr>
<td>
From date:<br>
</div>
<% if @filter.results && @filter.display %>
- <div id="filter-result" class="page-split-right width100">
+ <div id="filter-result" class="page-split-right">
+
<% if @filter.name %>
<p>
<span class="h3"><%= h @filter.name -%></span>
- <span><%= h @filter.description -%></span>
<% end %>
</p>
-
<% end %>
<%
edit_mode = (params[:edit]=='true')
unless edit_mode
%>
- Display as:
- <% MeasureFilterDisplay.keys.each do |display_key| %>
- <%= link_to_if display_key!=@filter.display.key, display_key, params.merge(:action => 'search', :display => display_key, :id => @filter.id) -%>
- <% end %>
- <a id="edit" href="<%= url_for params.merge({:edit => true, :id => @filter.id}) -%>" class="button"><%= message('configure') -%></a>
- <% if logged_in? %>
- <% if @filter.id==nil || @filter.user_id==current_user.id %>
- <a id="save" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('save') -%></a>
- <% end %>
- <a id="copy" href="<%= url_for params.merge({:action => 'copy_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('copy') -%></a>
- <% end %>
+ <table class="width100">
+ <tr>
+ <td class="left">
+ Display as:
+ <% MeasureFilterDisplay.keys.each do |display_key| %>
+ <%= link_to_if display_key!=@filter.display.key, display_key, params.merge(:action => 'search', :display => display_key, :id => @filter.id) -%>
+ <% end %>
+ <td class="right">
+ <a id="edit" href="<%= url_for params.merge({:edit => true, :id => @filter.id}) -%>" class="button"><%= message('configure') -%></a>
+ <% if logged_in? %>
+ <% if @filter.id==nil || @filter.user_id==current_user.id %>
+ <a id="save" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('save') -%></a>
+ <% end %>
+ <% if @filter.id %>
+ <a id="copy" href="<%= url_for params.merge({:action => 'copy_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('copy') -%></a>
+ <% end %>
+ <% end %>
+ </tr>
+ </table>
<% end %>
- <%= render :partial => "measures/display_#{@filter.display.class::KEY}", :locals => {:edit_mode => edit_mode} -%>
- <br>
-
<% if @filter.security_exclusions %>
<p class="notes"><%= message('results_not_display_due_to_security') -%></p>
<% end %>
-
+ <%= render :partial => "measures/display_#{@filter.display.class::KEY}", :locals => {:edit_mode => edit_mode} -%>
</div>
<% end %>
new_filter.shared = (old_filter.shared || old_filter.user_id.nil?)
data = []
data << 'onFavourites=true' if old_filter.favourites
- if old_filter.resource_id
- resource = Project.find(:first, :conditions => {:id => old_filter.id})
- data << "base=#{resource.kee}" if resource
- end
+ data << "baseId=#{old_filter.resource_id}" if old_filter.resource_id
data << "pageSize=#{old_filter.page_size}" if old_filter.page_size
+ data << "display=#{old_filter.default_value || 'list'}"
columns = []
asc = nil
display: table-cell;
margin: 0;
vertical-align: top;
+ width: 100%;
}
\ No newline at end of file
projects / sonarqube.git / commitdiff