From 2df5284d90fc0a89eb7852e207575b305a17e141 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 27 Feb 2023 23:03:19 +0000 Subject: [PATCH] implement instance add, fix multiple onclick listeners being added Signed-off-by: Arthur Lu --- scripts/index.js | 47 +++++++++++++++++++++++++++++++++++++-------- scripts/instance.js | 8 ++++---- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/scripts/index.js b/scripts/index.js index d8979fe..cf92beb 100644 --- a/scripts/index.js +++ b/scripts/index.js @@ -1,4 +1,4 @@ -import {requestPVE, goToPage, deleteAllCookies} from "./utils.js"; +import {requestPVE, requestAPI, goToPage, deleteAllCookies} from "./utils.js"; import { Dialog } from "./dialog.js"; window.addEventListener("DOMContentLoaded", init); @@ -70,10 +70,10 @@ async function handleInstanceAdd () { - - - - + + + +

Container Options

@@ -85,6 +85,8 @@ async function handleInstanceAdd () { + + `; let typeSelect = dialog.shadowRoot.querySelector("#type"); @@ -135,13 +137,42 @@ async function handleInstanceAdd () { rootfsStorage.selectedIndex = -1; }); - let vmidInput = dialog.shadowRoot.querySelector("#vmid"); // suggest min and max based on user restrictions - let templateImage = dialog.shadowRoot.querySelector("#template-image"); // populate templateImage by + templateStorage.addEventListener("change", async () => { + let content = "vztmpl"; + let images = await requestPVE(`/nodes/${nodeSelect.value}/storage/${templateStorage.value}/content`, "GET"); + images.data.forEach((element) => { + if (element.content.includes(content)) { + templateImage.append(new Option(element.volid.replace(`${templateStorage.value}:${content}/`, ""), element.volid)); + } + }); + templateImage.selectedIndex = -1; + }); dialog.callback = async (result, form) => { if (result === "confirm") { - + let body = { + node: form.get("node"), + type: form.get("type"), + name: form.get("name"), + vmid: form.get("vmid"), + cores: form.get("cores"), + memory: form.get("memory") + }; + if (form.get("type") === "lxc") { + body.swap = form.get("swap"); + body.password = form.get("password"); + body.ostemplate = form.get("template-image"); + body.rootfslocation = form.get("rootfs-storage"); + body.rootfssize = form.get("rootfs-size"); + } + let result = await requestAPI("/instance", "POST", body); + if (result.status === 200) { + populateInstances(); + } + else { + console.error(result); + } } } diff --git a/scripts/instance.js b/scripts/instance.js index 97fedc5..25d216a 100644 --- a/scripts/instance.js +++ b/scripts/instance.js @@ -68,25 +68,25 @@ export class Instance extends HTMLElement { powerButton.src = instances[this.status].powerButtonSrc; powerButton.alt = instances[this.status].powerButtonAlt; powerButton.title = instances[this.status].powerButtonAlt; - powerButton.addEventListener("click", this.handlePowerButton.bind(this)); + powerButton.onclick = this.handlePowerButton.bind(this) let configButton = this.shadowElement.querySelector("#configure-btn"); configButton.src = instances[this.status].configButtonSrc; configButton.alt = instances[this.status].configButtonAlt; configButton.title = instances[this.status].configButtonAlt; - configButton.addEventListener("click", this.handleConfigButton.bind(this)); + configButton.onclick = this.handleConfigButton.bind(this); let consoleButton = this.shadowElement.querySelector("#console-btn"); consoleButton.src = instances[this.status].consoleButtonSrc; consoleButton.alt = instances[this.status].consoleButtonAlt; consoleButton.title = instances[this.status].consoleButtonAlt; - consoleButton.addEventListener("click", this.handleConsoleButton.bind(this)); + consoleButton.onclick = this.handleConsoleButton.bind(this); let deleteButton = this.shadowElement.querySelector("#delete-btn"); deleteButton.src = instances[this.status].deleteButtonSrc; deleteButton.alt = instances[this.status].deleteButtonAlt; deleteButton.title = instances[this.status].deleteButtonAlt; - deleteButton.addEventListener("click", this.handleDeleteButton.bind(this)); + deleteButton.onclick = this.handleDeleteButton.bind(this); if (this.node.status !== "online") { powerButton.classList.add("hidden");