brad/lmc
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Get region names from API instead of hard-coding them

Browse Source
This commit is contained in:
L. Bradley LaBoon
2024-05-06 16:57:12 -04:00
parent 4c4db6a734
commit 8ea657c757
21 changed files with 333 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linodes/add/add.css
View File

@ -89,6 +89,10 @@ h3 {
padding: 15px;
}
optgroup {
display: none;
}
#right-links {
float: right;
}

21
linodes/add/add.js
View File

@ -15,13 +15,14 @@
* along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
*/
import { settings, elements, regionNames, apiGet, apiPost, parseParams, setupHeader } from "/global.js";
import { settings, elements, regionNames, countryContinents, apiGet, apiPost, parseParams, setupHeader } from "/global.js";
(function()
{
// Element names specific to this page
elements.addButton = "add-button";
elements.datacenters = "datacenters";
elements.dcOther = "dc-other";
elements.instanceType = "instance-type";
elements.instanceTypeActive = "instance-type-active";
@ -33,6 +34,7 @@ import { settings, elements, regionNames, apiGet, apiPost, parseParams, setupHea
// Static references to UI elements
var ui = {};
ui.datacenters = {};
ui.dcOther = {};
var createLinodeTypeButton = function(type)
{
@ -67,16 +69,26 @@ import { settings, elements, regionNames, apiGet, apiPost, parseParams, setupHea
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.datacenters.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);
}
// Request the next page if there are more pages
if (response.page != response.pages)
if (response.page != response.pages) {
apiGet("/regions?page=" + (response.page + 1), displayRegions, null);
return;
}
};
var displayTypes = function(response)
@ -135,6 +147,7 @@ import { settings, elements, regionNames, apiGet, apiPost, parseParams, setupHea
data.params = parseParams();
ui.datacenters = document.getElementById(elements.datacenters);
ui.dcOther = document.getElementById(elements.dcOther);
// Register add button handler
document.getElementById(elements.addButton).addEventListener("click", handleAddLinode);

9
linodes/add/index.shtml
View File

@ -65,7 +65,14 @@ along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
</div>
<div id="location">
<h2>Location</h2>
<select id="datacenters"></select>
<select id="datacenters">
<optgroup id="na" label="North America"></optgroup>
<optgroup id="eu" label="Europe"></optgroup>
<optgroup id="ap" label="Asia/Pacific"></optgroup>
<optgroup id="sa" label="South America"></optgroup>
<optgroup id="af" label="Africa"></optgroup>
<optgroup id="dc-other" label="Other"></optgroup>
</select>
</div>
<div id="submit">
<button id="add-button" type="button">Add this Linode!</button>

54
linodes/backup_details/backup_details.js
View File

@ -50,6 +50,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
data.backup = {};
data.linode = {};
data.linodes = [];
data.region = {};
data.types = [];
// Static references to UI elements
@ -89,6 +90,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
var plan = document.createElement("td");
if (linode.type) {
plan.innerHTML = linode.type;
for (var i = 0; i < data.types.length; i++) {
if (data.types[i].id == linode.type) {
plan.innerHTML = data.types[i].label;
@ -103,7 +105,9 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
row.appendChild(plan);
var location = document.createElement("td");
if (regionNames[linode.region])
if (data.region.label && data.region.label.length)
location.innerHTML = data.region.label;
else if (regionNames[linode.region])
location.innerHTML = regionNames[linode.region];
else
location.innerHTML = linode.region;
@ -136,6 +140,15 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
ui.backupType.innerHTML = data.backup.type;
if (regionNames[data.backup.region]) {
ui.backupLocation.innerHTML = regionNames[data.backup.region];
ui.destLocation.innerHTML = regionNames[data.backup.region];
} else {
ui.backupLocation.innerHTML = data.backup.region;
ui.destLocation.innerHTML = data.backup.region;
}
apiGet("/regions/" + data.backup.region, displayRegion, null);
for (var i = 0; i < data.backup.configs.length; i++) {
var li = document.createElement("li");
li.innerHTML = data.backup.configs[i];
@ -152,7 +165,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
ui.backupSize.innerHTML = data.backup.totalSize + " MB";
if (state.haveTypes && data.linode.id)
if (state.haveTypes)
insertTypes();
};
@ -169,18 +182,6 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
ui.linodeTagLink.innerHTML = "(" + data.linode.tags[0] + ")";
ui.linodeTag.style.display = "inline";
}
// Display location
if (regionNames[data.linode.region]) {
ui.backupLocation.innerHTML = regionNames[data.linode.region];
ui.destLocation.innerHTML = regionNames[data.linode.region];
} else {
ui.backupLocation.innerHTML = data.linode.region;
ui.destLocation.innerHTML = data.linode.region;
}
if (state.haveTypes && data.backup.id)
insertTypes();
};
// Callback for linode disks API call
@ -238,7 +239,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
// Request the next page if there are more pages
if (response.page != response.pages) {
var filter = {
"region": data.linode.region
"region": data.backup.region
};
apiGet("/linode/instances?page=" + (response.page + 1), displayLinodes, filter);
return;
@ -254,6 +255,17 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
}
};
// Callback for region API call
var displayRegion = function(response)
{
data.region = response;
if (data.region.label && data.region.label.length) {
ui.backupLocation.innerHTML = response.label;
ui.destLocation.innerHTML = response.label;
}
};
// Callback for linode types API call
var displayTypes = function(response)
{
@ -267,7 +279,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
}
state.haveTypes = true;
if (data.backup.id && data.linode.id)
if (data.backup.id)
insertTypes();
};
@ -295,7 +307,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
var req = {
"label": ui.destLabel.value,
"type": ui.destPlan.value,
"region": data.linode.region,
"region": data.backup.region,
"backup_id": data.backup.id
};
var callback = function(response)
@ -348,11 +360,11 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
ui.destPlan.appendChild(option);
}
updatePrice(null);
updateSpace(null);
ui.newLinode.disabled = false;
var filter = {
"region": data.linode.region
"region": data.backup.region
};
apiGet("/linode/instances", displayLinodes, filter);
};
@ -410,7 +422,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
ui.newLinode = document.getElementById(elements.newLinode);
// Register event handlers
ui.destPlan.addEventListener("input", updatePrice);
ui.destPlan.addEventListener("input", updateSpace);
ui.newLinode.addEventListener("click", handleCreate);
// Get data from API
@ -431,7 +443,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
};
// Update the price display
var updatePrice = function(event)
var updateSpace = function(event)
{
// Find the selected type
var type = null;

71
linodes/clone/clone.js
View File

@ -15,7 +15,7 @@
* along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
*/
import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNames, setupHeader, translateKernel } from "/global.js";
import { settings, elements, apiGet, apiPost, countryContinents, migrateETA, parseParams, regionNames, setupHeader, translateKernel } from "/global.js";
(function()
{
@ -25,6 +25,7 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
elements.configDiskRow = "config-disk-row";
elements.configsNone = "configs-none";
elements.configTable = "config-table-body";
elements.dcOther = "dc-other";
elements.destBackups = "dest-backups";
elements.destBackupsPrice = "dest-backups-price";
elements.destLabel = "dest-label";
@ -54,6 +55,7 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
data.configs = [];
data.disks = [];
data.linode = {};
data.regions = [];
data.types = [];
// Static references to UI elements
@ -62,6 +64,7 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
ui.configCloneTable = {};
ui.configsNone = {};
ui.configTable = {};
ui.dcOther = {};
ui.destBackups = {};
ui.destBackupsPrice = {};
ui.destLabel = {};
@ -241,7 +244,17 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
}
// Display the source location
if (regionNames[data.linode.region])
var region = null;
for (var i = 0; i < data.regions.length; i++) {
if (data.regions[i].id == data.linode.region) {
region = data.regions[i];
break;
}
}
if (region && region.label && region.label.length)
ui.sourceLocation.innerHTML = region.label;
else if (regionNames[data.linode.region])
ui.sourceLocation.innerHTML = regionNames[data.linode.region];
else
ui.sourceLocation.innerHTML = data.linode.region;
@ -290,25 +303,8 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
// Callback for regions API call
var displayRegions = function(response)
{
for (var i = 0; i < response.data.length; i++) {
// Add regions to selector
var dc = document.createElement("option");
dc.value = response.data[i].id;
if (regionNames[response.data[i].id])
dc.innerHTML = regionNames[response.data[i].id];
else
dc.innerHTML = response.data[i].id;
ui.destLocation.appendChild(dc);
// Add optgroups to linode selector
var optgroup = document.createElement("optgroup");
optgroup.id = response.data[i].id;
if (regionNames[response.data[i].id])
optgroup.label = regionNames[response.data[i].id];
else
optgroup.label = response.data[i].label;
ui.destLinode.appendChild(optgroup);
}
// 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) {
@ -316,6 +312,37 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
return;
}
for (var i = 0; i < data.regions.length; i++) {
// Add regions to selector
var dc = document.createElement("option");
dc.value = data.regions[i].id;
if (data.regions[i].label && data.regions[i].label.length)
dc.innerHTML = data.regions[i].label;
else if (regionNames[data.regions[i].id])
dc.innerHTML = regionNames[data.regions[i].id];
else
dc.innerHTML = data.regions[i].id;
var group = null;
if (countryContinents[data.regions[i].country])
group = document.getElementById(countryContinents[data.regions[i].country]);
if (!group)
group = ui.dcOther;
group.style.display = "initial";
group.appendChild(dc);
// Add optgroups to linode selector
var optgroup = document.createElement("optgroup");
optgroup.id = data.regions[i].id;
if (data.regions[i].label && data.regions[i].label.length)
optgroup.label = data.regions[i].label;
else if (regionNames[data.regions[i].id])
optgroup.label = regionNames[data.regions[i].id];
else
optgroup.label = data.regions[i].label;
ui.destLinode.appendChild(optgroup);
}
apiGet("/linode/instances/" + data.params.lid, displayDetails, null);
apiGet("/linode/instances", displayLinodes, null);
};
@ -415,6 +442,7 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
ui.configCloneTable = document.getElementById(elements.configCloneTable);
ui.configsNone = document.getElementById(elements.configsNone);
ui.configTable = document.getElementById(elements.configTable);
ui.dcOther = document.getElementById(elements.dcOther);
ui.destBackups = document.getElementById(elements.destBackups);
ui.destBackupsPrice = document.getElementById(elements.destBackupsPrice);
ui.destLabel = document.getElementById(elements.destLabel);
@ -442,7 +470,6 @@ import { settings, elements, apiGet, apiPost, migrateETA, parseParams, regionNam
ui.destPlan.addEventListener("input", updatePrices);
// Get data from API
apiGet("/linode/instances/" + data.params.lid, displayDetails, null);
apiGet("/linode/instances/" + data.params.lid + "/configs", displayConfigs, null);
apiGet("/linode/instances/" + data.params.lid + "/disks", displayDisks, null);
apiGet("/linode/types", displayTypes, null);

9
linodes/clone/index.shtml
View File

@ -142,7 +142,14 @@ along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
</tr>
<tr class="lmc-tr3 new-linode">
<td>Location</td>
<td><select id="dest-location"></select></td>
<td><select id="dest-location">
<optgroup id="na" label="North America"></optgroup>
<optgroup id="eu" label="Europe"></optgroup>
<optgroup id="ap" label="Asia/Pacific"></optgroup>
<optgroup id="sa" label="South America"></optgroup>
<optgroup id="af" label="Africa"></optgroup>
<optgroup id="dc-other" label="Other"></optgroup>
</select></td>
</tr>
<tr class="lmc-tr3 new-linode">
<td>Plan</td>

78
linodes/linodes.js
View File

@ -48,6 +48,7 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
data.noTag = false;
data.notifications = [];
data.plans = [];
data.regions = [];
// Static references to UI elements
var ui = {};
@ -60,6 +61,8 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
var state = {};
state.haveLinodes = false;
state.haveNotifications = false;
state.haveRegions = false;
state.haveTypes = false;
var createLinodeRow = function(linode, alt)
{
@ -92,8 +95,10 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
plan.innerHTML = getPlanLabel(linode.type);
else
plan.innerHTML = "Unknown";
if (plan.innerHTML == "")
if (plan.innerHTML == "") {
plan.innerHTML = linode.type;
translatePlan(linode.type, plan);
}
var ip = document.createElement("td");
ip.innerHTML = linode.ipv4[0];
var ipCount = 0;
@ -110,8 +115,17 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
plus.innerHTML = " (+" + ipCount + ")";
ip.appendChild(plus);
}
var regionData = null;
for (var i = 0; i < data.regions.length; i++) {
if (data.regions[i].id == linode.region) {
regionData = data.regions[i];
break;
}
}
var region = document.createElement("td");
if (regionNames[linode.region])
if (regionData && regionData.label && regionData.label.length)
region.innerHTML = regionData.label;
else if (regionNames[linode.region])
region.innerHTML = regionNames[linode.region];
else
region.innerHTML = linode.region;
@ -312,8 +326,19 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
body.innerHTML = data.notifications[i].message;
}
// Replace "this facility" with actual location for outages
if (data.notifications[i].type == "outage" && data.notifications[i].entity && data.notifications[i].entity.type == "region" && regionNames[data.notifications[i].entity.id])
header.innerHTML = header.innerHTML.replace("this facility", regionNames[data.notifications[i].entity.id]);
if (data.notifications[i].type == "outage" && data.notifications[i].entity && data.notifications[i].entity.type == "region") {
var region = null;
for (var j = 0; j < data.regions.length; j++) {
if (data.regions[j].id == data.notifications[i].entity.id) {
region = data.regions[j];
break;
}
}
if (region && region.label && region.label.length)
header.innerHTML = header.innerHTML.replace("this facility", region.label);
else if (regionNames[data.notifications[i].entity.id])
header.innerHTML = header.innerHTML.replace("this facility", regionNames[data.notifications[i].entity.id]);
}
notification.appendChild(header);
notification.appendChild(body);
ui.notifications.appendChild(notification);
@ -379,13 +404,42 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
return;
}
// Get linodes
var filters = null;
if (data.params.tag)
filters = {
"tags": data.params.tag
};
apiGet("/linode/instances", displayLinodes, filters);
state.haveTypes = true;
if (state.haveRegions) {
// Get linodes
var filters = null;
if (data.params.tag)
filters = {
"tags": data.params.tag
};
apiGet("/linode/instances", displayLinodes, filters);
}
};
var getRegions = 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), getRegions, null);
return;
}
state.haveRegions = true;
if (state.haveTypes) {
// Get linodes
var filters = null;
if (data.params.tag)
filters = {
"tags": data.params.tag
};
apiGet("/linode/instances", displayLinodes, filters);
}
// Get notifications
apiGet("/account/notifications", displayNotifications, null);
};
var insertLinodes = function()
@ -425,9 +479,9 @@ import { settings, elements, regionNames, apiGet, parseParams, setupHeader } fro
setupHeader();
// Get linode and transfer info
apiGet("/regions", getRegions, null);
apiGet("/linode/types", getPlans, null);
apiGet("/account/transfer", displayTransfer, null);
apiGet("/account/notifications", displayNotifications, null);
};
var translatePlan = function(name, cell)