Merge pull request #52 from chanzuckerberg/bkmartinjr-cleanup

small cleanup requests from recent PR
This commit is contained in:
Colin Megill
2018-05-14 11:40:30 -07:00
committed by GitHub
2 changed files with 13 additions and 15 deletions

View File

@@ -90,19 +90,17 @@ const initialize = () => {
function cleanupExpressionResponse(data) {
const s = store.getState();
const metadata = s.controls.currentCellSelectionMap;
let errorOccured = false;
const newcells = _.filter(data.data.cells, cell => {
const found = metadata[cell.cellname];
errorOccured = errorOccured || !found;
return found;
let errorFound = false;
data.data.cells = _.filter(data.data.cells, cell => {
if (!errorFound && !metadata[cell.cellname]) {
errorFound = true;
console.error(
"Warning: /expression REST API returned unexpected cell names -- discarding surprises."
);
}
return metadata[cell.cellname];
});
if (errorOccured) {
console.error(
"Warning: /expression REST API returned unexpected cell names -- discarding surprises."
);
data.data.cells = newcells;
}
return data;
}

View File

@@ -9,10 +9,10 @@
// this is is equivalent to d3.scaleLinear().domain([0,1]).range([-1,1])
export const scaleLinear = (domain, range) => {
const offsetD = domain[0];
const domainStart = domain[0];
const scale = (range[1] - range[0]) / (domain[1] - domain[0]);
const offsetR = range[0];
return function(v) {
return (v - offsetD) * scale + offsetR;
const rangeStart = range[0];
return function(value) {
return (value - domainStart) * scale + rangeStart;
};
};