kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fixed specs and the non-rendering stat_graph_contributors_graph

Browse source
This commit is contained in:
Jose Ivan Vargas 2017-11-24 16:01:01 -06:00
parent 49bc458ad7
commit be60cca90d
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/common_d3/index.js
View file

@ -36,5 +36,5 @@ export {
} from 'd3-axis';
export {
brush,
brushX,
} from 'd3-brush';

11
app/assets/javascripts/graphs/stat_graph_contributors_graph.js
View file

@ -5,13 +5,12 @@ import {
extent as d3Extent,
max as d3Max,
select as d3Select,
selectAll as d3SelectAll,
scaleTime as d3ScaleTime,
scaleLinear as d3ScaleLinear,
axisLeft as d3AxisLeft,
axisBottom as d3AxisBottom,
area as d3Area,
brush as d3Brush,
brushX as d3BrushX,
timeParse as d3TimeParse,
} from '../common_d3/index';
@ -163,11 +162,11 @@ export const ContributorsMasterGraph = (function(superClass) {
}).y0(this.height).y1(function(d) {
d.commits = d.commits || d.additions || d.deletions;
return y(d.commits);
}).interpolate("basis");
});
};
ContributorsMasterGraph.prototype.create_brush = function() {
return this.brush = d3Brush().x(this.x).on("brushend", this.update_content);
return this.brush = d3BrushX(this.x).on("end", this.update_content);
};
ContributorsMasterGraph.prototype.draw_path = function(data) {
@ -257,11 +256,11 @@ export const ContributorsAuthorGraph = (function(superClass) {
return y(0);
}
};
})(this)).interpolate("basis");
})(this));
};
ContributorsAuthorGraph.prototype.create_svg = function() {
this.list_item = d3SelectAll(".person")[0].pop();
this.list_item = document.querySelectorAll('.person')[0];
return this.svg = d3Select(this.list_item).append("svg").attr("width", this.width + this.MARGIN.left + this.MARGIN.right).attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom).attr("class", "spark").append("g").attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")");
};

2
spec/features/calendar_spec.rb
View file

@ -12,7 +12,7 @@ feature 'Contributions Calendar', :js do
issue_params = { title: issue_title }
def get_cell_color_selector(contributions)
activity_colors = %w[#ededed #acd5f2 #7fa8c9 #527ba0 #254e77]
activity_colors = ["#ededed", "rgb(172, 213, 242)", "rgb(127, 168, 201)", "rgb(82, 123, 160)", "rgb(37, 78, 119)"]
# We currently don't actually test the cases with contributions >= 20
activity_colors_index =
if contributions > 0 && contributions < 10