remove unit selector for unit text,
hide size input and unit text if disk is not resizable Signed-off-by: Arthur Lu <learthurgo@gmail.com>
This commit is contained in:
parent
1e035e878c
commit
e5bf7e383a
@ -54,7 +54,7 @@ async function populateResources () {
|
|||||||
if (type === "lxc") {
|
if (type === "lxc") {
|
||||||
addResourceLine("resources", "images/resources/swap.svg", "Swap", {type: "number", value: config.data.swap, min: 0, step: 1}, "GiB"); // TODO add max from quota API
|
addResourceLine("resources", "images/resources/swap.svg", "Swap", {type: "number", value: config.data.swap, min: 0, step: 1}, "GiB"); // TODO add max from quota API
|
||||||
let rootfs = parseDisk(config.data.rootfs);
|
let rootfs = parseDisk(config.data.rootfs);
|
||||||
addDiskLine("disks", "mp", "Root FS", null, rootfs.storage, storageOptions, rootfs.size, rootfs.sizeUnit, rootfs.sizeUnitAllowed);
|
addDiskLine("disks", "mp", "Root FS", null, rootfs, storageOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let i = 0; i < diskConfig[type].prefixOrder.length; i++){
|
for(let i = 0; i < diskConfig[type].prefixOrder.length; i++){
|
||||||
@ -69,7 +69,7 @@ async function populateResources () {
|
|||||||
let ordered_keys = getOrderedUsed(entry);
|
let ordered_keys = getOrderedUsed(entry);
|
||||||
ordered_keys.forEach(element => {
|
ordered_keys.forEach(element => {
|
||||||
let disk = parseDisk(entry.used[element]);
|
let disk = parseDisk(entry.used[element]);
|
||||||
addDiskLine("disks", prefix, busName, element, disk.storage, storageOptions, disk.size, disk.sizeUnit, disk.sizeUnitAllowed);
|
addDiskLine("disks", prefix, busName, element, disk, storageOptions);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,7 +101,7 @@ function addResourceLine (fieldset, iconHref, labelText, inputAttr, unitText=nul
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function addDiskLine (fieldset, busPrefix, busName, device, storage, storageOptions, size, sizeUnit, sizeUnitOptions) {
|
function addDiskLine (fieldset, busPrefix, busName, device, diskDataParsed, storageOptions) {
|
||||||
let field = document.querySelector(`#${fieldset}`);
|
let field = document.querySelector(`#${fieldset}`);
|
||||||
|
|
||||||
let icon = document.createElement("img");
|
let icon = document.createElement("img");
|
||||||
@ -127,6 +127,7 @@ function addDiskLine (fieldset, busPrefix, busName, device, storage, storageOpti
|
|||||||
field.append(deviceInput);
|
field.append(deviceInput);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let storage = diskDataParsed.storage;
|
||||||
let storageSelect = document.createElement("select");
|
let storageSelect = document.createElement("select");
|
||||||
storageOptions.data.forEach((element) => {
|
storageOptions.data.forEach((element) => {
|
||||||
if (element.content.includes(diskConfig[type][busPrefix].storageContent)) { // check if the storage contains rootdir or images content
|
if (element.content.includes(diskConfig[type][busPrefix].storageContent)) { // check if the storage contains rootdir or images content
|
||||||
@ -136,29 +137,25 @@ function addDiskLine (fieldset, busPrefix, busName, device, storage, storageOpti
|
|||||||
storageSelect.value = storage;
|
storageSelect.value = storage;
|
||||||
field.append(storageSelect);
|
field.append(storageSelect);
|
||||||
|
|
||||||
|
let size = diskDataParsed.size;
|
||||||
let sizeInput = document.createElement("input");
|
let sizeInput = document.createElement("input");
|
||||||
sizeInput.type = "number";
|
sizeInput.type = "number";
|
||||||
sizeInput.min = size;
|
sizeInput.min = size;
|
||||||
sizeInput.minSize = size;
|
sizeInput.minSize = size;
|
||||||
sizeInput.max = 1023; // just use the next unit
|
sizeInput.max = 131072; // 128 TiB, everything should just use GiB
|
||||||
sizeInput.value = size;
|
sizeInput.value = size;
|
||||||
sizeInput.id = `${busPrefix}${device}-size`;
|
|
||||||
if (!diskConfig[type][busPrefix].resizable) {
|
if (!diskConfig[type][busPrefix].resizable) {
|
||||||
sizeInput.disabled = true;
|
sizeInput.disabled = true;
|
||||||
|
sizeInput.classList.add("hidden");
|
||||||
}
|
}
|
||||||
field.append(sizeInput);
|
field.append(sizeInput);
|
||||||
|
|
||||||
let sizeUnitSelect = document.createElement("select");
|
let sizeUnit = document.createElement("p");
|
||||||
sizeUnitOptions.forEach((element) => {
|
sizeUnit.innerText = "GiB";
|
||||||
sizeUnitSelect.add(new Option(element));
|
|
||||||
});
|
|
||||||
sizeUnitSelect.value = sizeUnit;
|
|
||||||
if (!diskConfig[type][busPrefix].resizable) {
|
if (!diskConfig[type][busPrefix].resizable) {
|
||||||
sizeUnitSelect.disabled = true;
|
sizeUnit.classList.add("hidden");
|
||||||
}
|
}
|
||||||
sizeUnitSelect.id = `${busPrefix}${device}-unit`;
|
field.append(sizeUnit);
|
||||||
sizeUnitSelect.addEventListener("change", handleUnitChange);
|
|
||||||
field.append(sizeUnitSelect);
|
|
||||||
|
|
||||||
let deleteDiv = document.createElement("div");
|
let deleteDiv = document.createElement("div");
|
||||||
deleteDiv.classList.add("last-item");
|
deleteDiv.classList.add("last-item");
|
||||||
@ -170,20 +167,6 @@ function addDiskLine (fieldset, busPrefix, busName, device, storage, storageOpti
|
|||||||
field.append(deleteDiv);
|
field.append(deleteDiv);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleUnitChange () {
|
|
||||||
let newUnitIndex = this.selectedIndex;
|
|
||||||
let sizeInput = document.querySelector(`#${this.id.replace("unit", "size")}`);
|
|
||||||
if (newUnitIndex == 0) {
|
|
||||||
sizeInput.min = sizeInput.minSize;
|
|
||||||
if (parseInt(sizeInput.value) < parseInt(sizeInput.min)) {
|
|
||||||
sizeInput.value = sizeInput.min;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
sizeInput.min = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getOrderedUsed(entry){
|
function getOrderedUsed(entry){
|
||||||
let ordered_keys = Object.keys(entry.used).sort((a,b) => {parseInt(a) - parseInt(b)}); // ordered integer list
|
let ordered_keys = Object.keys(entry.used).sort((a,b) => {parseInt(a) - parseInt(b)}); // ordered integer list
|
||||||
return ordered_keys;
|
return ordered_keys;
|
||||||
@ -200,22 +183,18 @@ function parseDisk (disk) { // disk in format: STORAGE: FILENAME, ARG1=..., ARG2
|
|||||||
let val = element.split("=")[1];
|
let val = element.split("=")[1];
|
||||||
parsed[key] = val;
|
parsed[key] = val;
|
||||||
});
|
});
|
||||||
if (parsed.size.includes("K")) {
|
if (parsed.size.includes("G")) {
|
||||||
parsed.sizeUnit = "KiB";
|
parsed.size = parseInt(parsed.size.replace("G", ""));
|
||||||
parsed.sizeUnitAllowed = ["KiB", "MiB", "GiB", "TiB"];
|
|
||||||
}
|
|
||||||
else if (parsed.size.includes("M")) {
|
|
||||||
parsed.sizeUnit = "MiB";
|
|
||||||
parsed.sizeUnitAllowed = ["MiB", "GiB", "TiB"];
|
|
||||||
}
|
|
||||||
else if (parsed.size.includes("G")) {
|
|
||||||
parsed.sizeUnit = "GiB";
|
parsed.sizeUnit = "GiB";
|
||||||
parsed.sizeUnitAllowed = ["GiB", "TiB"];
|
|
||||||
}
|
}
|
||||||
else if (parsed.size.includes("T")) {
|
else if (parsed.size.includes("T")) {
|
||||||
|
parsed.size = parseInt(parsed.size.replace("G", "")) * 1024;
|
||||||
parsed.sizeUnit = "TiB";
|
parsed.sizeUnit = "TiB";
|
||||||
parsed.sizeUnitAllowed = ["TiB"];
|
|
||||||
}
|
}
|
||||||
parsed.size = parsed.size.replace("T", "").replace("G", "").replace("M", "").replace("K", "");
|
else {
|
||||||
|
parsed.size = null;
|
||||||
|
parsed.sizeUnit = null;
|
||||||
|
}
|
||||||
|
|
||||||
return parsed;
|
return parsed;
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user