Skip to content

Commit

Permalink
updates vizbuilder to v0.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@davelandry
davelandry committed Feb 26, 2019
1 parent 3a9c54b commit 4159cf7
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 37 deletions.
3 changes: 3 additions & 0 deletions app/pages/Map.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
& .select-label.source, & .select-label.dims {
display: none;
}
& .show-ci {
display: none;
}
}
& .grouping-manager {
& .grouping-item {
Expand Down
40 changes: 24 additions & 16 deletions app/pages/Map.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,33 @@ class Map extends Component {
};
}

onChange(query) {
componentDidUpdate(prevProps) {
const {vizbuilder} = this.props;

const {list} = this.context.formatters;
if (vizbuilder !== prevProps.vizbuilder && !vizbuilder.load.inProgress) {

const slug = `${query.measure.annotations._key}-${query.groups.map(d => d.level.annotations._key).join("-")}`;
const params = {
measures: [query.measure.name],
drilldowns: query.groups.map(d => d.level.name)
};
if (query.moe) params.measures.push(query.moe.name);
if (query.lci) params.measures.push(query.lci.name);
if (query.uci) params.measures.push(query.uci.name);
const {list} = this.context.formatters;
const {query} = vizbuilder;

const groups = query.groups.filter(d => d.key);
const slug = `${query.measure.annotations._key}-${groups.map(d => d.key).join("-")}`;
const params = {
measures: [query.measure.name],
drilldowns: groups.map(d => d.level.name)
};
if (query.moe) params.measures.push(query.moe.name);
if (query.lci) params.measures.push(query.lci.name);
if (query.uci) params.measures.push(query.uci.name);

const url = `/api/data?${Object.entries(params).map(([key, val]) => `${key}=${val.join(",")}`).join("&")}`;

const url = `/api/data?${Object.entries(params).map(([key, val]) => `${key}=${val.join(",")}`).join("&")}`;
const title = `${query.measure.name}${params.drilldowns ? ` by ${list(params.drilldowns)}` : ""}`;

const title = `${query.measure.name}${params.drilldowns ? ` by ${list(params.drilldowns)}` : ""}`;
const format = "function(d) { return d.data; }";

const format = "function(d) { return d.data; }";
this.setState({query: {urls: [url], format, slug, title}});
this.setState({query: {urls: [url], format, slug, title}});

}

}

Expand Down Expand Up @@ -90,7 +98,6 @@ class Map extends Component {
defaultGroup={["Geography.County", "Origin State.Origin State"]}
defaultMeasure="Uninsured"
measureConfig={measureConfig}
onChange={this.onChange.bind(this)}
config={{
colorScaleConfig: {color: colors.colorScaleGood},
colorScalePosition: "bottom",
Expand Down Expand Up @@ -125,7 +132,8 @@ Map.contextTypes = {

export default connect(state => ({
cube: state.env.CUBE,
cart: state.cart
cart: state.cart,
vizbuilder: state.vizbuilder
}), dispatch => ({
addToCart: build => dispatch(addToCart(build)),
removeFromCart: build => dispatch(removeFromCart(build))
Expand Down
10 changes: 10 additions & 0 deletions app/pages/Visualize.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@
height: calc(100vh - var(--nav-height) - 60px);
}
& .area-sidebar {
& .pt-checkbox {
color: var(--red);
cursor: pointer;
display: block;
font-family: "Palanquin", sans-serif;
font-size: 12px;
font-weight: 600;
margin: 10px 5px 0;
letter-spacing: 0.55px;
}
& .label {
color: var(--darkgray);
font-family: "Palanquin", sans-serif;
Expand Down
41 changes: 24 additions & 17 deletions app/pages/Visualize.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,33 @@ class Visualize extends Component {
// this.props.router.push(url);
}

onChange(query) {
componentDidUpdate(prevProps) {
const {vizbuilder} = this.props;

const {list} = this.context.formatters;
if (vizbuilder !== prevProps.vizbuilder && !vizbuilder.load.inProgress) {

const groups = query.groups.filter(d => d.key);
const slug = `${query.measure.annotations._key}-${groups.map(d => d.key).join("-")}`;
const params = {
measures: [query.measure.name],
drilldowns: groups.map(d => d.level.name)
};
if (query.moe) params.measures.push(query.moe.name);
if (query.lci) params.measures.push(query.lci.name);
if (query.uci) params.measures.push(query.uci.name);
const {list} = this.context.formatters;
const {query} = vizbuilder;

const groups = query.groups.filter(d => d.key);
const slug = `${query.measure.annotations._key}-${groups.map(d => d.key).join("-")}`;
const params = {
measures: [query.measure.name],
drilldowns: groups.map(d => d.level.name)
};
if (query.moe) params.measures.push(query.moe.name);
if (query.lci) params.measures.push(query.lci.name);
if (query.uci) params.measures.push(query.uci.name);

const url = `/api/data?${Object.entries(params).map(([key, val]) => `${key}=${val.join(",")}`).join("&")}`;

const url = `/api/data?${Object.entries(params).map(([key, val]) => `${key}=${val.join(",")}`).join("&")}`;
const title = `${query.measure.name}${params.drilldowns ? ` by ${list(params.drilldowns)}` : ""}`;

const title = `${query.measure.name}${params.drilldowns ? ` by ${list(params.drilldowns)}` : ""}`;
const format = "function(d) { return d.data; }";

const format = "function(d) { return d.data; }";
this.setState({query: {urls: [url], format, slug, title}});
this.setState({query: {urls: [url], format, slug, title}});

}

}

Expand Down Expand Up @@ -157,7 +164,6 @@ class Visualize extends Component {
defaultGroup={["Geography.State", "Origin State.Origin State", "Gender.Gender", "Age.Age"]}
defaultMeasure="Total Population"
measureConfig={measureConfig}
onChange={this.onChange.bind(this)}
config={{
colorScaleConfig: {
color: colors.colorScaleGood
Expand Down Expand Up @@ -210,7 +216,8 @@ Visualize.contextTypes = {

export default connect(state => ({
cube: state.env.CUBE,
cart: state.cart
cart: state.cart,
vizbuilder: state.vizbuilder
}), dispatch => ({
addToCart: build => dispatch(addToCart(build)),
removeFromCart: build => dispatch(removeFromCart(build))
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@blueprintjs/table": "^1.31.0",
"@datawheel/canon-core": "^0.16.20",
"@datawheel/canon-logiclayer": "^0.3.10",
"@datawheel/canon-vizbuilder": "^0.2.2",
"@datawheel/canon-vizbuilder": "^0.2.3",
"buble": "^0.19.3",
"eslint": "^4.16.0",
"flickr-sdk": "^3.7.0",
Expand Down

0 comments on commit 4159cf7

Please sign in to comment.