Get region names from API instead of hard-coding them

volumes/volumes.js

@@ -28,6 +28,7 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 	// Data recieved from API calls
 	var data = {};
 	data.linodes = {};
+	data.regions = [];
 	data.volumes = [];
 
 	// Static references to UI elements
@@ -35,6 +36,11 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 	ui.loading = {};
 	ui.volumeBody = {};
 
+	// Temporary state
+	var state = {};
+	state.haveRegions = false;
+	state.haveVolumes = false;
+
 	// Generates a table row for a volume
 	var createVolumeRow = function(volume, alt)
 	{
@@ -59,8 +65,17 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 		size.innerHTML = volume.size + " GiB";
 		row.appendChild(size);
 
+		var regionData = null;
+		for (var i = 0; i < data.regions.length; i++) {
+			if (data.regions[i].id == volume.region) {
+				regionData = data.regions[i];
+				break;
+			}
+		}
 		var region = document.createElement("td");
-		if (regionNames[volume.region])
+		if (regionData && regionData.label && regionData.label.length)
+			region.innerHTML = regionData.label;
+		else if (regionNames[volume.region])
 			region.innerHTML = regionNames[volume.region];
 		else
 			region.innerHTML = volume.region;
@@ -108,6 +123,27 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 		return row;
 	};
 
+	// Callback for regions API call
+	var displayRegions = function(response)
+	{
+		// Add regions to array
+		data.regions = data.regions.concat(response.data);
+
+		// Request the next page if there are more pages
+		if (response.page != response.pages) {
+			apiGet("/regions?page=" + (response.page + 1), displayRegions, null);
+			return;
+		}
+
+		state.haveRegions = true;
+		if (state.haveVolumes) {
+			// Insert volumes
+			ui.loading.remove();
+			for (var i = 0; i < data.volumes.length; i++)
+				ui.volumeBody.appendChild(createVolumeRow(data.volumes[i], i % 2));
+		}
+	};
+
 	// Callback for volumes API call
 	var displayVolumes = function(response)
 	{
@@ -127,10 +163,13 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 		if (data.volumes.length == 0)
 			location.href = "/volumes/add";
 
-		// Insert volumes
-		ui.loading.remove();
-		for (var i = 0; i < data.volumes.length; i++)
-			ui.volumeBody.appendChild(createVolumeRow(data.volumes[i], i % 2));
+		state.haveVolumes = true;
+		if (state.haveRegions) {
+			// Insert volumes
+			ui.loading.remove();
+			for (var i = 0; i < data.volumes.length; i++)
+				ui.volumeBody.appendChild(createVolumeRow(data.volumes[i], i % 2));
+		}
 	};
 
 	// Initial setup
@@ -147,6 +186,7 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
 
 		// Get data from API
 		apiGet("/volumes", displayVolumes, null);
+		apiGet("/regions", displayRegions, null);
 	};
 
 	// Get the label of a given linode ID and update a cell's contents