Fix database name for sat.wikipedia

use Main Page if 'Cat' and 'Dog' don't exist
MusikAnimal · Aug 9, 2018 · 56872cc · 56872cc
1 parent bcd3411
commit 56872cc
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 27 deletions.
diff --git a/javascripts/pageviews/pageviews.js b/javascripts/pageviews/pageviews.js
@@ -142,9 +142,7 @@ class PageViews extends mix(Pv).with(ChartHelpers) {
         this.setInitialChartType(pages.length);
         getPageInfoAndSetDefaults(pages);
       }).fail(() => {
-        // manually hide spinny since we aren't drawing the chart,
-        // again using setTimeout to let everything catch up
-        setTimeout(this.stopSpinny.bind(this));
+        this.resetView();
         this.setInitialChartType();
         // leave Select2 empty and put focus on it so they can type in pages
         this.focusSelect2();
@@ -167,6 +165,12 @@ class PageViews extends mix(Pv).with(ChartHelpers) {
   getDefaultPages() {
     const dfd = $.Deferred();
 
+    const getMainPage = () => {
+      this.fetchSiteInfo(this.project).done(siteInfo => {
+        dfd.resolve([siteInfo[this.project].general.mainpage]);
+      }).fail(dfd.reject);
+    };
+
     // only set default of Cat and Dog for enwiki
     if (this.project === 'en.wikipedia') {
       dfd.resolve(['Cat', 'Dog']);
@@ -182,16 +186,19 @@ class PageViews extends mix(Pv).with(ChartHelpers) {
 
         const dbName = Object.keys(siteMap).find(key => siteMap[key] === `${this.project}.org`);
         const pages = Object.keys(data.entities).map(key => {
-          return data.entities[key].sitelinks[dbName].title;
-        });
+          return data.entities[key].sitelinks[dbName] ? data.entities[key].sitelinks[dbName].title : null;
+        }).filter(Boolean);
+
+        // 'Cat' and 'Dog' do not exist, so use the Main Page.
+        if (!pages.length) {
+          return getMainPage();
+        }
 
         dfd.resolve(pages);
       });
     } else {
       // get mainpage from siteinfo
-      this.fetchSiteInfo(this.project).done(siteInfo => {
-        dfd.resolve([siteInfo[this.project].general.mainpage]);
-      }).fail(dfd.reject);
+      getMainPage();
     }
 
     return dfd;

diff --git a/javascripts/shared/site_map.js b/javascripts/shared/site_map.js
@@ -656,7 +656,7 @@ const siteMap = {
   'rwwiktionary': 'rw.wiktionary.org',
   'sahwiki': 'sah.wikipedia.org',
   'sahwikisource': 'sah.wikisource.org',
-  'satwikipedia': 'sat.wikipedia.org',
+  'satwiki': 'sat.wikipedia.org',
   'sawiki': 'sa.wikipedia.org',
   'sawikibooks': 'sa.wikibooks.org',
   'sawikiquote': 'sa.wikiquote.org',

diff --git a/public_html/langviews/application.js b/public_html/langviews/application.js
diff --git a/public_html/massviews/application.js b/public_html/massviews/application.js
diff --git a/public_html/mediaviews/application.js b/public_html/mediaviews/application.js
diff --git a/public_html/metaviews/application.css b/public_html/metaviews/application.css
diff --git a/public_html/metaviews/application.js b/public_html/metaviews/application.js
diff --git a/public_html/pageviews/application.js b/public_html/pageviews/application.js
diff --git a/public_html/redirectviews/application.js b/public_html/redirectviews/application.js
diff --git a/public_html/siteviews/application.js b/public_html/siteviews/application.js
diff --git a/public_html/topviews/application.js b/public_html/topviews/application.js
diff --git a/public_html/userviews/application.js b/public_html/userviews/application.js
diff --git a/site_map.json b/site_map.json
@@ -651,7 +651,7 @@
   "sa.wiktionary.org": "sawiktionary",
   "sah.wikipedia.org": "sahwiki",
   "sah.wikisource.org": "sahwikisource",
-  "sat.wikipedia.org": "satwikipedia",
+  "sat.wikipedia.org": "satwiki",
   "sc.wikipedia.org": "scwiki",
   "sc.wiktionary.org": "scwiktionary",
   "scn.wikipedia.org": "scnwiki",