fix: Repo refresh add noLimit param (#536)

openpitrix · Nov 8, 2018 · 2c1d2f1 · 2c1d2f1
1 parent f9fa1f8
commit 2c1d2f1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/src/pages/Dashboard/Apps/Add/index.jsx b/src/pages/Dashboard/Apps/Add/index.jsx
@@ -20,11 +20,10 @@ import styles from './index.scss';
 @observer
 export default class AppAdd extends Component {
   async componentDidMount() {
-    const { repoStore, user } = this.props;
+    const { repoStore } = this.props;
 
     await repoStore.fetchAll({
-      noLimit: true,
-      isQueryPublic: user.isDev
+      noLimit: true
     });
   }
 

diff --git a/src/pages/Dashboard/Apps/index.jsx b/src/pages/Dashboard/Apps/index.jsx
@@ -37,8 +37,7 @@ export default class Apps extends Component {
     }
     await repoStore.fetchAll({
       status: ['active', 'deleted'],
-      noLimit: true,
-      isQueryPublic: user.isDev
+      noLimit: true
     });
     await categoryStore.fetchAll();
   }

diff --git a/src/pages/Dashboard/Overview/index.jsx b/src/pages/Dashboard/Overview/index.jsx
@@ -86,12 +86,11 @@ export default class Overview extends React.Component {
       await clusterStore.fetchAll({ noLimit: true });
     }
 
-    //fixme developer user query public repos
     if (user.isDev) {
-      await appStore.fetchAll({ limit: 5 });
-      await clusterStore.fetchAll({ limit: 5 });
       await repoStore.fetchAll({ visibility: ['private'], limit: 1 });
       await runtimeStore.fetchAll({ noLimit: true });
+      await appStore.fetchAll({ limit: 5 });
+      await clusterStore.fetchAll({ limit: 5 });
     }
     this.setState({ isLoading: false });
   }

diff --git a/src/pages/Dashboard/Repos/index.jsx b/src/pages/Dashboard/Repos/index.jsx
@@ -27,13 +27,7 @@ export default class Repos extends Component {
     window.onscroll = _.throttle(this.handleScroll, 200);
 
     repoStore.appStore = appStore;
-    await repoStore.fetchAll(
-      {
-        noLimit: true,
-        isQueryPublic: user.isDev
-      },
-      appStore
-    );
+    await repoStore.fetchAll({ noLimit: true }, appStore);
   }
 
   componentWillUnmount() {

diff --git a/src/stores/repo/index.js b/src/stores/repo/index.js
@@ -55,23 +55,11 @@ export default class RepoStore extends Store {
     if (this.userId) {
       defaultParams.owner = this.userId;
     }
-    if (params.isQueryPublic) {
-      params.visibility = ['private'];
-    }
 
     this.isLoading = true;
     const result = await this.request.get('repos', assign(defaultParams, params));
     let repos = get(result, 'repo_set', []);
     this.totalCount = get(result, 'total_count', 0);
-
-    if (params.isQueryPublic) {
-      delete params.isQueryPublic;
-      params.visibility = ['public'];
-      const pubResult = await this.request.get('repos', assign(defaultParams, params));
-      const pubRepos = get(pubResult, 'repo_set', []);
-      repos = [...pubRepos, ...repos];
-    }
-
     this.repos = orderBy(repos, ['visibility', 'status_time'], ['desc', 'desc']);
 
     if (appStore) {
@@ -88,7 +76,7 @@ export default class RepoStore extends Store {
   onSearch = async word => {
     this.searchWord = word;
     this.currentPage = 1;
-    await this.fetchAll({}, this.appStore);
+    await this.fetchAll({ noLimit: true }, this.appStore);
   };
 
   @action
@@ -98,7 +86,7 @@ export default class RepoStore extends Store {
 
   @action
   onRefresh = async () => {
-    await this.fetchAll({}, this.appStore);
+    await this.fetchAll({ noLimit: true }, this.appStore);
   };
 
   @action
@@ -215,7 +203,6 @@ export default class RepoStore extends Store {
 
     this.repos = [];
     this.repoDetail = {};
-
   };
 
   @action