bellingcat/ukraine-timemap
1
0
Fork 0
mirror of https://github.com/bellingcat/ukraine-timemap.git synced 2026-06-13 13:58:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

wip: categoryGroups -> categories

Browse Source
This commit is contained in:
Lachie Kermode
2018-11-30 18:46:17 +00:00
parent e9bd136082
commit 5b83a82c35
6 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/components/Dashboard.jsx
View File

@@ -92,21 +92,20 @@ class Dashboard extends React.Component {
}
}
getCategoryGroup(category) {
const cat = this.props.domain.categories.find(t => t.category === category)
if (cat) return cat.group;
return 'other';
// getCategoryGroup(category) {
// const cat = this.props.domain.categories.find(t => t.category === category)
// if (cat) return cat.group;
// return 'other';
// }
getCategoryColor(category) {
return this.props.ui.style.categories[category];
}
getCategoryGroupColor(category) {
const group = this.getCategoryGroup(category);
return this.props.ui.style.groupColors[group];
}
getCategoryLabel(category) {
const categories = this.props.domain.categories;
return categories.find(t => t.category === category).category_label;
}
// getCategoryLabel(category) {
// const categories = this.props.domain.categories;
// return categories.find(t => t.category === category).category_label;
// }
getNarrativeLinks(event) {
const narrative = this.props.domain.narratives.find(nv => nv.key === event.narrative);
@@ -169,14 +168,12 @@ class Dashboard extends React.Component {
highlight={this.handleHighlight}
toggle={this.handleToggle}
getNarrativeLinks={event => this.getNarrativeLinks(event)}
getCategoryGroup={category => this.getCategoryGroup(category)}
getCategoryGroupColor={category => this.getCategoryGroupColor(category)}
getCategoryLabel={category => this.getCategoryLabel(category)}
getCategoryColor={category => this.getCategoryColor(category)}
/>
<Timeline
events={this.props.domain.events.filter(item => item)}
narratives={this.props.domain.narratives}
categoryGroups={this.props.domain.categoryGroups}
categories={this.props.domain.categories}
timerange={this.props.app.filters.timerange}
selected={this.props.app.selected}
@@ -189,9 +186,7 @@ class Dashboard extends React.Component {
filter={this.handleTimeFilter}
highlight={this.handleHighlight}
toggle={() => this.handleToggle('TOGGLE_CARDSTACK')}
getCategoryGroup={category => this.getCategoryGroup(category)}
getCategoryGroupColor={category => this.getCategoryGroupColor(category)}
getCategoryLabel={category => this.getCategoryLabel(category)}
getCategoryColor={category => this.getCategoryColor(category)}
/>
<InfoPopUp
ui={this.props.ui}
@@ -219,7 +214,6 @@ function mapStateToProps(state) {
events: selectors.selectEvents(state),
locations: selectors.selectLocations(state),
categories: selectors.selectCategories(state),
categoryGroups: selectors.selectCategoryGroups(state),
narratives: selectors.selectNarratives(state),
// These items are not affected by selectionFilters