diff --git a/client/src/js/newsboard/components/ScanNews.jsx b/client/src/js/newsboard/components/ScanNews.jsx index 890c782e..861bf4d1 100644 --- a/client/src/js/newsboard/components/ScanNews.jsx +++ b/client/src/js/newsboard/components/ScanNews.jsx @@ -25,6 +25,7 @@ export class ScanNews extends Component { componentWillMount() { const mainHeaderStrings = Locale.applicationStrings().messages.mainHeaderStrings; this.props.dispatch(setCurrentHeaderTab(mainHeaderStrings.newsBoard)); + this.props.dispatch(filterTabSwitch("web")); } displayFilters() { diff --git a/client/src/js/newsboard/filter/DisplayFilters.jsx b/client/src/js/newsboard/filter/DisplayFilters.jsx index 433d9e3c..fa12dbd3 100644 --- a/client/src/js/newsboard/filter/DisplayFilters.jsx +++ b/client/src/js/newsboard/filter/DisplayFilters.jsx @@ -43,6 +43,15 @@ export class DisplayFilters extends Component { selectedSources = { "web": new Set(web), "facebook": new Set(facebook), "twitter": new Set(twitter) }; } + selectAllSources() { + selectedSources = { "web": new Set(), "facebook": new Set(), "twitter": new Set() }; + Object.entries(this.props.sources).map(([key, value]) => { + value.forEach(elem => { + selectedSources[key].add(elem.url); + }); + }); + } + _renderSources(sourceType, searchKey) { const configuredSourceDOM = (source) => (
  • @@ -156,7 +165,9 @@ export class DisplayFilters extends Component { } - +
    diff --git a/client/src/js/newsboard/reducers/DisplayFeedReducers.js b/client/src/js/newsboard/reducers/DisplayFeedReducers.js index 27552287..09981592 100644 --- a/client/src/js/newsboard/reducers/DisplayFeedReducers.js +++ b/client/src/js/newsboard/reducers/DisplayFeedReducers.js @@ -62,7 +62,7 @@ export function selectedArticle(state = {}, action = {}) { } } -export const newsBoardCurrentSourceTab = (state = newsBoardSourceTypes.trending, action = {}) => { +export const newsBoardCurrentSourceTab = (state = newsBoardSourceTypes.web, action = {}) => { switch(action.type) { case NEWS_BOARD_CURRENT_TAB: { return action.currentTab; diff --git a/client/test/newsboard/reducers/DisplayFeedReducersSpec.js b/client/test/newsboard/reducers/DisplayFeedReducersSpec.js index f2d1a9da..3315db01 100644 --- a/client/test/newsboard/reducers/DisplayFeedReducersSpec.js +++ b/client/test/newsboard/reducers/DisplayFeedReducersSpec.js @@ -134,7 +134,7 @@ describe("DisplayFeedReducer", () => { }); it("should return web as current tab when newsBoardCurrentSourceTab called without any action type", () => { - expect(newsBoardCurrentSourceTab()).to.deep.equal("trending"); + expect(newsBoardCurrentSourceTab()).to.deep.equal("web"); }); }); diff --git a/other/ansible/installation/roles/couchdb-lucene/files/local.ini b/other/ansible/installation/roles/couchdb-lucene/files/local.ini index 84490110..189eea07 100644 --- a/other/ansible/installation/roles/couchdb-lucene/files/local.ini +++ b/other/ansible/installation/roles/couchdb-lucene/files/local.ini @@ -4,7 +4,7 @@ _fti = {couch_httpd_proxy, handle_proxy_req, <<"http://localhost:5985">>} [cors] origins = http://localhost:5000 credentials = true -port = 5986 +port = 5984 methods = GET, PUT, POST, HEAD, DELETE [httpd] -port = 5986 \ No newline at end of file +port = 5984 \ No newline at end of file