fix: maintain major filter across channel switch (#38)

electron · Jan 17, 2024 · b39c021 · b39c021
1 parent 484719c
commit b39c021
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/routes/releases.js b/src/routes/releases.js
@@ -78,13 +78,16 @@ router.get(
     const releases = await getReleasesOrUpdate();
     const { page, limit, version } = req.query;
     const releasesFromChannel = releases.filter(filter);
-    const major = Number(version);
+    let major = parseInt(version, 10);
+    if (isNaN(major) || major < 0) {
+      major = null;
+    }
     const majors = releasesFromChannel.reduce((acc, val) => {
       acc.add(semver.major(val.version));
       return acc;
     }, new Set());
     const releasesFromMajor = releasesFromChannel.filter((release) => {
-      if (Number.isInteger(major) && major >= 0) {
+      if (major) {
         return semver.major(release.version) === major;
       } else {
         return true;

diff --git a/src/views/releases.handlebars b/src/views/releases.handlebars
@@ -3,19 +3,19 @@
   <div class="releases__filter-container">
     <strong>Filter by channel</strong>
     <div class="release-channel-selector-container">
-      <a class="releases__filter-link" href="/releases/stable">      
+      <a class="releases__filter-link" href="/releases/stable?version={{major}}">
         <div class="releases__filter {{#ifEquals channel "stable"}} releases__filter--selected{{/ifEquals}}">
           <span class="releases__filter-name"><i class="fas fa-clock"></i>&nbsp;Stable</span>
           <p class="releases__filter-description">Regular, supported releases</p>
         </div>
       </a>
-      <a  class="releases__filter-link" href="/releases/prerelease">
+      <a  class="releases__filter-link" href="/releases/prerelease?version={{major}}">
         <div class="releases__filter {{#ifEquals channel "prerelease"}} releases__filter--selected{{/ifEquals}}">
           <span class="releases__filter-name"><i class="fas fa-flask"></i>&nbsp;Prerelease</span>
           <p class="releases__filter-description">Test upcoming changes</p>
         </div>
       </a>
-      <a class="releases__filter-link" href="/releases/nightly">
+      <a class="releases__filter-link" href="/releases/nightly?version={{major}}">
         <div class="releases__filter {{#ifEquals channel "nightly"}} releases__filter--selected{{/ifEquals}}">
           <span class="releases__filter-name"><i class="fas fa-calendar"></i>&nbsp;Nightly</span>
           <p class="releases__filter-description">Experiment with the latest features</p>