Resolved Sacret#5

Sacret · Sacret · commit fdaa48fe2ead · 2015-12-26T22:32:57.000+03:00
diff --git a/js/actions/FilterActions.js b/js/actions/FilterActions.js
@@ -8,8 +8,7 @@ import Reflux from 'reflux';
 const FilterActions = Reflux.createActions([
   'getFilters',
   'setFilter',
-  'setFilterTags',
-  'loadMoreWithFilters'
+  'setFilterTags'
 ]);
 
 module.exports = FilterActions;
diff --git a/js/stores/FilterStore.js b/js/stores/FilterStore.js
@@ -25,6 +25,9 @@ const FilterStore = Reflux.createStore({
     this.filterInfo.filters = [{
       title: 'owner',
       active: false
+    }, {
+      title: 'forks',
+      active: false
     }, {
       title: 'member',
       active: false
@@ -71,10 +74,6 @@ const FilterStore = Reflux.createStore({
     });
     this.filterInfo.reposIds = _(reposIds).flatten().uniq().value();
     ReposActions.getRepos(accessToken, 1, this.filterInfo.currentFilter, this.filterInfo.reposIds);
-  },
-
-  loadMoreWithFilters(accessToken, nextPage) {
-    ReposActions.getRepos(accessToken, nextPage, this.filterInfo.currentFilter, this.filterInfo.reposIds);
   }
 
 });
diff --git a/js/stores/ReposStore.js b/js/stores/ReposStore.js
@@ -30,6 +30,8 @@ const ReposStore = Reflux.createStore({
     if (this.reposInfo.filter == 'starred') {
       reposUrl = 'starred';
     }
+    let includeForks = filter == 'forks';
+    //
     let requestUrl = Config.GithubApiUrl + 'user/' + reposUrl;
     let qs = {
       access_token: accessToken,
@@ -62,12 +64,13 @@ const ReposStore = Reflux.createStore({
           newRepos = res.body;
         }
         //
-        let allRepos = _.union(_this.reposInfo.repos, newRepos);
-        _this.reposInfo.repos = _.uniq(allRepos, (repo) => {
-          return repo.id;
+        newRepos = _.filter(newRepos, (repo) => {
+          return includeForks ? repo.fork : !repo.fork;
         });
         //
-        if (res.body.length) {
+        _this.reposInfo.repos = _.union(_this.reposInfo.repos, newRepos);
+        //
+        if (res.body.length == Config.PerPage) {
           _this.getRepos(accessToken, page + 1, filter, filterReposIds)
         }
         _this.trigger(_this.reposInfo);
