j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-09 03:36:48 +00:00
Code Issues Projects Releases Wiki Activity

refactor(instances): the VM page's scripts load from static files

Browse source 
The VM page's thirteen inline script blocks and its inline handlers move
to static files: instance_page.js (tabs, OS details, clone names and
MACs, Add disk dialog, boot order, host devices, migrate plan, console
window, switches that send their form), instance_stats.js (charts and
the Logs view) and instance_status.js (the reload when the VM's state
changes). Their values and messages come as data attributes of the
elements they belong to, page-wide ones on #vm-summary; a form marked
data-please-wait shows the please-wait dialog. Three blocks that did
nothing are dropped: popovers (the page has none), the video model
preselection (the server selects it) and the delete form's poll stop
(that form is on the destroy page). The HTML sink inventory now also
reads the app's own scripts.
This commit is contained in:
catborise 2026-11-02 09:04:29 +03:00
parent 393aecb8f1
commit 561937b31a
18 changed files with 507 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webvirtcloud/tests/test_poll_js.py
View file

@ -2,7 +2,6 @@
none while the page is hidden. Its behaviour is checked with Node."""
import json
import re
import shutil
import subprocess
import unittest
@ -11,7 +10,7 @@ from pathlib import Path
from django.conf import settings
BASE = Path(settings.BASE_DIR)
POLLING_TEMPLATES = ["instances/templates/instance.html", "computes/templates/overview.html"]
POLLING_SOURCES = ["static/js/instance_status.js", "static/js/instance_stats.js", "computes/templates/overview.html"]
class PollTestCase(unittest.TestCase):
@ -37,9 +36,9 @@ class PollTestCase(unittest.TestCase):
self.assertEqual(result.returncode, 0, result.stderr)
def test_pages_poll_through_poll_js(self):
for template in POLLING_TEMPLATES:
with self.subTest(template=template):
source = (BASE / template).read_text()
for path in POLLING_SOURCES:
with self.subTest(path=path):
source = (BASE / path).read_text()
self.assertNotIn("setInterval", source)
self.assertIn("pollWhileVisible(", source)
@ -47,11 +46,7 @@ class PollTestCase(unittest.TestCase):
def test_the_vm_page_reloads_only_when_the_state_changes(self):
# "status" is a property of the browser's window: a page variable of
# that name holds what the browser makes of it (a string, or nothing)
source = (BASE / "instances/templates/instance.html").read_text()
script = re.search(r"<script>\s*(backgroundJobRunning = false;.*?)</script>", source, re.S).group(1)
script = script.replace("{{ instance.status|lower }}", "1").replace(
"{% url 'instances:status' instance.id %}", "/instances/1/status/"
)
script = (BASE / "static/js/instance_status.js").read_text()
js = """
const vm = require("vm");
const results = {};
@ -60,6 +55,7 @@ class PollTestCase(unittest.TestCase):
const page = {
pollWhileVisible: (interval, request, onData) => { onData({status: answer}); return {stop() {}}; },
$: () => ({submit() {}}),
document: {getElementById: () => ({dataset: {status: "1", statusUrl: "/instances/1/status/"}})},
};
page.window = {location: {reload: () => reloads++}};
Object.defineProperty(page, "status", {get: () => "", set: () => {}});