More fixes for normalizing pages names for list-based apps

Always show Clear button unless there are no pages
MusikAnimal · Nov 17, 2016 · 5f32e12 · 5f32e12
1 parent 3564740
commit 5f32e12
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 49 deletions.
diff --git a/javascripts/langviews/langviews.js b/javascripts/langviews/langviews.js
@@ -258,10 +258,11 @@ class LangViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
       params.end = this.daterangepicker.endDate.format('YYYY-MM-DD');
     }
 
-    /** only certain characters within the page name are escaped */
-    params.page = $(this.config.sourceInput).val().score().replace(/[&%]/g, escape);
-
-    if (!forCacheKey) {
+    if (forCacheKey) {
+      // Page name needed to make a unique cache key for the query.
+      // For other purposes (e.g. this.pushParams()), we want to do special escaping of the page name
+      params.page = $(this.config.sourceInput).val().score();
+    } else {
       params.sort = this.sort;
       params.direction = this.direction;
       params.view = this.view;
@@ -285,9 +286,11 @@ class LangViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
       return history.replaceState(null, document.title, location.href.split('?')[0]);
     }
 
-    window.history.replaceState({}, document.title, `?${$.param(this.getParams())}`);
+    const escapedPageName = $(this.config.sourceInput).val().score().replace(/[&%?]/g, escape);
+
+    window.history.replaceState({}, document.title, `?${$.param(this.getParams())}&page=${escapedPageName}`);
 
-    $('.permalink').prop('href', `/langviews?${$.param(this.getPermaLink())}`);
+    $('.permalink').prop('href', `/langviews?${$.param(this.getPermaLink())}&page=${escapedPageName}`);
   }
 
   /**
@@ -519,11 +522,6 @@ class LangViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
 
     this.patchUsage();
 
-    // fill in value for the page
-    if (params.page) {
-      $(this.config.sourceInput).val(decodeURIComponent(params.page).descore());
-    }
-
     // If there are invalid params, remove page from params so we don't process the defaults.
     // FIXME: we're checking for site messages because super.validateParams doesn't return a boolean
     //   or any indication the validations failed. This is hacky but necessary.
@@ -543,7 +541,19 @@ class LangViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
 
     /** start up processing if page name is present */
     if (params.page) {
-      this.processInput();
+      this.getPageInfo([params.page]).done(data => {
+        // throw errors if page is missing
+        const normalizedPage = Object.keys(data)[0];
+        if (data[normalizedPage].missing) {
+          this.setState('initial');
+          return this.writeMessage(`${this.getPageLink(normalizedPage)}: ${$.i18n('api-error-no-data')}`);
+        }
+        // fill in value for the page
+        $(this.config.sourceInput).val(normalizedPage);
+        this.processInput();
+      }).fail(() => {
+        this.writeMessage($.i18n('api-error-unknown', 'Info'));
+      });
     } else {
       $(this.config.sourceInput).focus();
     }
@@ -619,7 +629,7 @@ class LangViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
       this.getPageViewsData(interWikiData).done(pageViewsData => {
         $('.progress-bar').css('width', '100%');
         $('.progress-counter').text($.i18n('building-dataset'));
-        const pageLink = this.getPageLink(decodeURIComponent(page), this.project);
+        const pageLink = this.getPageLink(page, this.project);
         setTimeout(() => {
           this.buildMotherDataset(page, pageLink, pageViewsData);
           readyForRendering();

diff --git a/javascripts/pageviews.js b/javascripts/pageviews.js
@@ -404,7 +404,6 @@ class PageViews extends mix(Pv).with(ChartHelpers) {
       this.updateTable();
     });
     $('.clear-pages').on('click', () => {
-      $('.clear-pages').hide();
       this.resetView(true);
       this.focusSelect2();
     });

diff --git a/javascripts/redirectviews/redirectviews.js b/javascripts/redirectviews/redirectviews.js
@@ -490,11 +490,6 @@ class RedirectViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
 
     this.patchUsage();
 
-    // fill in value for the page
-    if (params.page) {
-      $(this.config.sourceInput).val(decodeURIComponent(params.page).descore());
-    }
-
     // If there are invalid params, remove page from params so we don't process the defaults.
     // FIXME: we're checking for site messages because super.validateParams doesn't return a boolean
     //   or any indication the validations failed. This is hacky but necessary.
@@ -514,7 +509,19 @@ class RedirectViews extends mix(Pv).with(ChartHelpers, ListHelpers) {
 
     /** start up processing if page name is present */
     if (params.page) {
-      this.processInput();
+      this.getPageInfo([params.page]).done(data => {
+        // throw errors if page is missing
+        const normalizedPage = Object.keys(data)[0];
+        if (data[normalizedPage].missing) {
+          this.setState('initial');
+          return this.writeMessage(`${this.getPageLink(normalizedPage)}: ${$.i18n('api-error-no-data')}`);
+        }
+        // fill in value for the page
+        $(this.config.sourceInput).val(normalizedPage);
+        this.processInput();
+      }).fail(() => {
+        this.writeMessage($.i18n('api-error-unknown', 'Info'));
+      });
     } else {
       $(this.config.sourceInput).focus();
     }

diff --git a/javascripts/shared/chart_helpers.js b/javascripts/shared/chart_helpers.js
@@ -612,10 +612,8 @@ const ChartHelpers = superclass => class extends superclass {
       return this.stopSpinny();
     } else if (entityNames.length === 1) {
       $('.multi-page-chart-node').hide();
-      $('.clear-pages').hide();
     } else {
       $('.multi-page-chart-node').show();
-      $('.clear-pages').show();
     }
 
     if (xhrData) {

diff --git a/javascripts/siteviews/siteviews.js b/javascripts/siteviews/siteviews.js
@@ -261,7 +261,6 @@ class SiteViews extends mix(Pv).with(ChartHelpers) {
       this.updateTable();
     });
     $('.clear-pages').on('click', () => {
-      $('.clear-pages').hide();
       this.resetView(true);
       this.focusSelect2();
     });

diff --git a/public_html/application.css b/public_html/application.css
diff --git a/public_html/application.js b/public_html/application.js
diff --git a/public_html/langviews/application.css b/public_html/langviews/application.css
diff --git a/public_html/langviews/application.js b/public_html/langviews/application.js
diff --git a/public_html/massviews/application.css b/public_html/massviews/application.css
diff --git a/public_html/massviews/application.js b/public_html/massviews/application.js
diff --git a/public_html/meta/application.css b/public_html/meta/application.css
diff --git a/public_html/meta/application.js b/public_html/meta/application.js
diff --git a/public_html/redirectviews/application.css b/public_html/redirectviews/application.css
diff --git a/public_html/redirectviews/application.js b/public_html/redirectviews/application.js
diff --git a/public_html/siteviews/application.css b/public_html/siteviews/application.css
diff --git a/public_html/siteviews/application.js b/public_html/siteviews/application.js
diff --git a/stylesheets/_chart_view.scss b/stylesheets/_chart_view.scss
@@ -9,7 +9,8 @@ body.initial {
   .table-view,
   .summary-column,
   .single-page-stats,
-  .single-page-ranking {
+  .single-page-ranking,
+  .clear-pages {
     display: none !important;
   }
 }
@@ -98,7 +99,6 @@ body.initial {
 
 .clear-pages {
   cursor: pointer;
-  display: none;
 }
 
 .modal-chart-type {