fix: correct download rendering for MacOS which now only has aarch64

In two more releases we can remove the multiple version logic, probably.

Author: chadlwilson

source/assets/javascripts/app/_download.js

@@ -330,24 +330,47 @@ Handlebars.registerHelper("size", function (
   }
 });
 
+function releasesFor(release, keyPrefix) {
+  return Object.keys(release).filter(function (key) { return key.startsWith(keyPrefix) });
+}
+
 Handlebars.registerHelper("has-additional-arch", function (release) {
-  return Object.keys(release).some(function (key) { return key.includes('-'); });
+  return releasesFor(release, "server").length > 1
 });
 
+function archsFor(release) {
+  return releasesFor(release, "server")
+    .map(function (key) {
+      return key.indexOf("server-") !== -1 ? key.substring("server-".length) : 'x64';
+    });
+}
+
+function primaryArch(release) {
+  return archsFor(release)[0];
+}
+
 function additionalArch(release) {
-  return Object.keys(release)
-    .filter(function (key) { return key.startsWith("server-"); })
-    .map(function (key) { return key.substring("server-".length); });
+  return archsFor(release)[1];
 }
 
+Handlebars.registerHelper("primary-arch", primaryArch);
+
 Handlebars.registerHelper("additional-arch", additionalArch);
 
+Handlebars.registerHelper("server-primary-arch", function(release) {
+  return releasesFor(release, 'server')[0]
+});
+
+Handlebars.registerHelper("agent-primary-arch", function(release) {
+  return releasesFor(release, 'agent')[0]
+});
+
 Handlebars.registerHelper("server-additional-arch", function(release) {
-  return "server-" + additionalArch(release)
+  return releasesFor(release, 'server')[1]
 });
 
 Handlebars.registerHelper("agent-additional-arch", function(release) {
-  return "agent-" + additionalArch(release)
+  return releasesFor(release, 'agent')[1]
 });
 
 

source/download.html.erb

@@ -295,17 +295,17 @@ meta_keywords: "GoCD download, go agent download, go cd download, install gocd"
   {{#*inline "show-server-and-agent-installer"}}
   {{#if (has-additional-arch this)}}
   <div class="download-files">
-    {{> show-file server type="server" display_name="Server" info=server.architecture os=../../installer_type latest=latest}}
-    {{> show-file agent type="agent" display_name="Agent" info=agent.architecture os=../../installer_type latest=latest}}
+    {{> show-file (lookup . (server-primary-arch this)) type="server" display_name="Server" info=(primary-arch this) os=../../installer_type latest=latest}}
+    {{> show-file (lookup . (agent-primary-arch this))  type="agent"  display_name="Agent"  info=(primary-arch this) os=../../installer_type latest=latest}}
   </div>
   <div class="download-files">
     {{> show-file (lookup . (server-additional-arch this)) type="server" display_name="Server" info=(additional-arch this) os=../../installer_type latest=latest}}
-    {{> show-file (lookup . (agent-additional-arch this)) type="agent" display_name="Agent" info=(additional-arch this) os=../../installer_type latest=latest}}
+    {{> show-file (lookup . (agent-additional-arch this))  type="agent"  display_name="Agent"  info=(additional-arch this) os=../../installer_type latest=latest}}
   </div>
   {{else}}
   <div>
-    {{> show-file server type="server" display_name="Server" os=../../installer_type latest=latest}}
-    {{> show-file agent type="agent" display_name="Agent" os=../../installer_type latest=latest}}
+    {{> show-file (lookup . (server-primary-arch this)) type="server" display_name="Server" os=../../installer_type latest=latest}}
+    {{> show-file (lookup . (agent-primary-arch this))  type="agent"  display_name="Agent"  os=../../installer_type latest=latest}}
   </div>
   {{/if}}
   {{/inline}}