Get region names from API instead of hard-coding them

images/upload/upload.js

@@ -15,11 +15,12 @@
  * along with Linode Manager Classic.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { settings, elements, regionNames, apiGet, apiPost, objPut, parseParams, setupHeader } from "/global.js";
+import { settings, elements, regionNames, countryContinents, apiGet, apiPost, objPut, parseParams, setupHeader } from "/global.js";
 
 (function()
 {
 	// Element names specific to this page
+	elements.dcOther = "dc-other";
 	elements.description = "description";
 	elements.imageFile = "image-file";
 	elements.label = "label";
@@ -35,6 +36,7 @@ import { settings, elements, regionNames, apiGet, apiPost, objPut, parseParams,
 
 	// Static references to UI elements
 	var ui = {};
+	ui.dcOther = {};
 	ui.description = {};
 	ui.imageFile = {};
 	ui.label = {};
@@ -49,11 +51,19 @@ import { settings, elements, regionNames, apiGet, apiPost, objPut, parseParams,
 		for (var i = 0; i < response.data.length; i++) {
 			var dc = document.createElement("option");
 			dc.value = response.data[i].id;
-			if (regionNames[response.data[i].id])
+			if (response.data[i].label && response.data[i].label.length)
+				dc.innerHTML = response.data[i].label;
+			else if (regionNames[response.data[i].id])
 				dc.innerHTML = regionNames[response.data[i].id];
 			else
 				dc.innerHTML = response.data[i].id;
-			ui.region.appendChild(dc);
+			var optgroup = null;
+			if (countryContinents[response.data[i].country])
+				optgroup = document.getElementById(countryContinents[response.data[i].country]);
+			if (!optgroup)
+				optgroup = ui.dcOther;
+			optgroup.style.display = "initial";
+			optgroup.appendChild(dc);
 		}
 
 		ui.nextButton.disabled = false;
@@ -126,6 +136,7 @@ import { settings, elements, regionNames, apiGet, apiPost, objPut, parseParams,
 		}
 
 		// Get element references
+		ui.dcOther = document.getElementById(elements.dcOther);
 		ui.description = document.getElementById(elements.description);
 		ui.imageFile = document.getElementById(elements.imageFile);
 		ui.label = document.getElementById(elements.label);