Remove loadSchools trigger

Lokiedu · Jan 29, 2017 · bba36ae · bba36ae
1 parent 57f9de1
commit bba36ae
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 44 deletions.
diff --git a/src/pages/geotag-edit.js b/src/pages/geotag-edit.js
@@ -60,9 +60,6 @@ class GeotagEditPage extends React.Component {
       return 404;
     }
 
-    const trigger = new ActionsTrigger(client, store.dispatch);
-    await trigger.loadSchools();
-
     return 200;
   }
 

diff --git a/src/pages/geotag.js b/src/pages/geotag.js
@@ -85,10 +85,7 @@ export class UnwrappedGeotagPage extends Component {
     store.dispatch(setGeotagPosts(router.params.url_name, await geotagPosts));
 
     const trigger = new ActionsTrigger(client, store.dispatch);
-    Promise.all([
-      trigger.loadSchools(),
-      trigger.loadUserRecentTags()
-    ]);
+    await trigger.loadUserRecentTags();
 
     return 200;
   }

diff --git a/src/pages/hashtag-edit.js b/src/pages/hashtag-edit.js
@@ -63,9 +63,6 @@ class HashtagEditPage extends React.Component {
       return 404;
     }
 
-    const trigger = new ActionsTrigger(client, store.dispatch);
-    await trigger.loadSchools();
-
     return 200;
   }
 

diff --git a/src/pages/list.js b/src/pages/list.js
@@ -89,7 +89,6 @@ export class UnwrappedListPage extends React.Component {
     store.dispatch(clearRiver());
 
     await Promise.all([
-      trigger.loadSchools(),
       trigger.loadPostRiver(),
       trigger.loadPersonalizedSuggestions(),
       trigger.loadUserRecentTags()

diff --git a/src/pages/post-edit.js b/src/pages/post-edit.js
@@ -70,13 +70,7 @@ class PostEditPage extends React.Component {
   };
 
   static async fetchData(router, store, client) {
-    const noSchoolsLoaded = store.getState().get('schools').isEmpty();
     const trigger = new ActionsTrigger(client, store.dispatch);
-    let schoolsPromise;
-
-    if (noSchoolsLoaded) {
-      schoolsPromise = trigger.loadSchools();
-    }
 
     try {
       const post = await client.postInfo(router.params.uuid);
@@ -86,10 +80,6 @@ class PostEditPage extends React.Component {
       return 404;
     }
 
-    if (noSchoolsLoaded) {
-      await schoolsPromise;
-    }
-
     await trigger.loadUserRecentTags();
     return 200;
   }

diff --git a/src/pages/school-edit.js b/src/pages/school-edit.js
@@ -63,15 +63,10 @@ class SchoolEditPage extends React.Component {
     const props = store.getState();
     const trigger = new ActionsTrigger(client, store.dispatch);
 
-    const promises = [];
-    promises.push(trigger.loadSchools());
-
     if (props.get('geo').get('countries').size === 0) {
-      promises.push(trigger.getCountries());
+      await trigger.getCountries();
     }
 
-    await Promise.all(promises);
-
     return 200;
   }
 

diff --git a/src/pages/school.js b/src/pages/school.js
@@ -79,10 +79,8 @@ export class UnwrappedSchoolPage extends React.Component {
     store.dispatch(setSchoolPosts(school, await posts));
 
     const trigger = new ActionsTrigger(client, store.dispatch);
-    await Promise.all([
-      trigger.loadSchools(),
-      trigger.loadUserRecentTags()
-    ]);
+    await trigger.loadUserRecentTags();
+
 
     return 200;
   }

diff --git a/src/pages/tag.js b/src/pages/tag.js
@@ -84,10 +84,7 @@ export class UnwrappedTagPage extends Component {
     store.dispatch(setHashtagPosts(router.params.tag, await tagPosts));
 
     const trigger = new ActionsTrigger(client, store.dispatch);
-    Promise.all([
-      trigger.loadSchools(),
-      trigger.loadUserRecentTags()
-    ]);
+    await trigger.loadUserRecentTags();
 
     return 200;
   }

diff --git a/src/triggers/index.js b/src/triggers/index.js
@@ -488,15 +488,6 @@ export class ActionsTrigger {
     }
   };
 
-  loadSchools = async () => {
-    try {
-      const result = await this.client.schools();
-      this.dispatch(a.schools.setSchools(result));
-    } catch (e) {
-      this.dispatch(a.messages.addError(e.message));
-    }
-  };
-
   toolsLoadSchoolsRiver = async (query = {}, triggerUiChanges = true) => {
     if (triggerUiChanges) {
       this.dispatch(a.ui.setProgress('loadingSchoolsRiver', true));