rm some semicolons, add tags check in getTagFilters

This commit is contained in:
Unknown
2018-11-19 15:01:22 +00:00
parent 3d42942a5c
commit 7e705fee34
3 changed files with 124 additions and 130 deletions

View File

@@ -58,7 +58,7 @@ export function fetchDomain () {
return Promise.all([ eventPromise, catPromise, sitesPromise, tagsPromise])
.then(response => {
dispatch(toggleFetchingDomain());
dispatch(toggleFetchingDomain())
const result = {
events: response[0],
categories: response[1],
@@ -70,12 +70,12 @@ export function fetchDomain () {
})
.catch(err => {
dispatch(fetchError(err.message))
dispatch(toggleFetchingDomain());
dispatch(toggleFetchingDomain())
})
};
}
export const FETCH_ERROR = 'FETCH_ERROR';
export const FETCH_ERROR = 'FETCH_ERROR'
export function fetchError(message) {
return {
type: FETCH_ERROR,
@@ -83,113 +83,114 @@ export function fetchError(message) {
}
}
export const UPDATE_DOMAIN = 'UPDATE_DOMAIN';
export const UPDATE_DOMAIN = 'UPDATE_DOMAIN'
export function updateDomain(domain) {
return {
type: UPDATE_DOMAIN,
domain: {
events: domain.events,
categories: domain.categories,
tags: domain.tags,
sites: domain.sites,
notifications: domain.notifications
}
};
return {
type: UPDATE_DOMAIN,
domain: {
events: domain.events,
categories: domain.categories,
tags: domain.tags,
sites: domain.sites,
notifications: domain.notifications
}
}
}
export function fetchEvents(events) {
return dispatch => {
dispatch(toggleFetchingEvents());
const urls = events.map(eventUrlMap);
return Promise.all(urls.map(url => fetch(url)
.then(response => response.json())
)
)
.then(json => {
dispatch(toggleFetchingEvents());
return json;
});
};
export function fetchEvents (events) {
return dispatch => {
dispatch(toggleFetchingEvents())
const urls = events.map(eventUrlMap)
return Promise.all(
urls.map(url => fetch(url)
.then(response => response.json())
)
)
.then(json => {
dispatch(toggleFetchingEvents())
return json
})
}
}
export const UPDATE_HIGHLIGHTED = 'UPDATE_HIGHLIGHTED';
export const UPDATE_HIGHLIGHTED = 'UPDATE_HIGHLIGHTED'
export function updateHighlighted(highlighted) {
return {
type: UPDATE_HIGHLIGHTED,
highlighted: highlighted
};
}
}
export const UPDATE_SELECTED = 'UPDATE_SELECTED';
export const UPDATE_SELECTED = 'UPDATE_SELECTED'
export function updateSelected(selected) {
return {
type: UPDATE_SELECTED,
selected: selected
};
}
}
export const UPDATE_DISTRICT = 'UPDATE_DISTRICT';
export const UPDATE_DISTRICT = 'UPDATE_DISTRICT'
export function updateDistrict(district) {
return {
type: UPDATE_DISTRICT,
district
};
}
}
export const UPDATE_TAGFILTERS = 'UPDATE_TIMEFILTERS';
export const UPDATE_TAGFILTERS = 'UPDATE_TIMEFILTERS'
export function updateTagFilters(tag) {
return {
type: UPDATE_TAGFILTERS,
tag
};
}
}
export const UPDATE_TIMERANGE = 'UPDATE_TIMERANGE';
export const UPDATE_TIMERANGE = 'UPDATE_TIMERANGE'
export function updateTimeRange(range) {
return {
type: UPDATE_TIMERANGE,
range
};
}
}
export const RESET_ALLFILTERS = 'RESET_ALLFILTERS';
export const RESET_ALLFILTERS = 'RESET_ALLFILTERS'
export function resetAllFilters() {
return {
type: RESET_ALLFILTERS
};
}
}
// UI
export const TOGGLE_FETCHING_DOMAIN = 'TOGGLE_FETCHING_DOMAIN';
export const TOGGLE_FETCHING_DOMAIN = 'TOGGLE_FETCHING_DOMAIN'
export function toggleFetchingDomain() {
return {
type: TOGGLE_FETCHING_DOMAIN
};
}
}
export const TOGGLE_FETCHING_EVENTS = 'TOGGLE_FETCHING_EVENTS';
export const TOGGLE_FETCHING_EVENTS = 'TOGGLE_FETCHING_EVENTS'
export function toggleFetchingEvents() {
return {
type: TOGGLE_FETCHING_EVENTS
};
}
}
export const TOGGLE_VIEW = 'TOGGLE_VIEW';
export const TOGGLE_VIEW = 'TOGGLE_VIEW'
export function toggleView() {
return {
type: TOGGLE_VIEW
};
}
}
export const TOGGLE_TIMELINE = 'TOGGLE_TIMELINE';
export const TOGGLE_TIMELINE = 'TOGGLE_TIMELINE'
export function toggleTimeline() {
return {
type: TOGGLE_TIMELINE
};
}
}
export const TOGGLE_LANGUAGE = 'TOGGLE_LANGUAGE';
export const TOGGLE_LANGUAGE = 'TOGGLE_LANGUAGE'
export function toggleLanguage(language) {
return {
type: TOGGLE_LANGUAGE,
@@ -197,46 +198,46 @@ export function toggleLanguage(language) {
}
}
export const OPEN_TOOLBAR = 'OPEN_TOOLBAR';
export const OPEN_TOOLBAR = 'OPEN_TOOLBAR'
export function openToolbar(toolbarTab = 0) {
return {
type: OPEN_TOOLBAR,
toolbarTab: toolbarTab,
};
}
}
export const CLOSE_TOOLBAR = 'CLOSE_TOOLBAR';
export const CLOSE_TOOLBAR = 'CLOSE_TOOLBAR'
export function closeToolbar() {
return {
type: CLOSE_TOOLBAR
};
}
}
export const OPEN_CABINET = 'OPEN_CABINET';
export const OPEN_CABINET = 'OPEN_CABINET'
export function openCabinet(tabNum) {
return {
type: OPEN_CABINET,
tabNum: tabNum,
};
}
}
export const CLOSE_CABINET = 'CLOSE_CABINET';
export const CLOSE_CABINET = 'CLOSE_CABINET'
export function closeCabinet() {
return {
type: CLOSE_CABINET
};
}
}
export const TOGGLE_INFOPOPUP = 'TOGGLE_INFOPOPUP';
export const TOGGLE_INFOPOPUP = 'TOGGLE_INFOPOPUP'
export function toggleInfoPopup() {
return {
type: TOGGLE_INFOPOPUP
};
}
}
export const TOGGLE_NOTIFICATIONS = 'TOGGLE_NOTIFICATIONS';
export const TOGGLE_NOTIFICATIONS = 'TOGGLE_NOTIFICATIONS'
export function toggleNotifications() {
return {
type: TOGGLE_NOTIFICATIONS
};
}
}