Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor plugin deletion logic and fix dropdown styling

Browse source
This commit is contained in:
Théophile Diot 2024-02-22 19:43:07 +01:00
parent 4e2c0a1908
commit f6566235ac
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ui/main.py
View file

@ -999,9 +999,9 @@ def plugins():
if variables["type"] in ("core", "pro"):
return redirect_flash_error(f"Can't delete {variables['type']} plugin {variables['name']}", "plugins", True)
plugins = app.config["CONFIG"].get_plugins()
for x, plugin in enumerate(deepcopy(plugins)):
if plugin["type"] in ("core", "pro") or plugin["id"] == variables["name"]:
plugins = app.config["CONFIG"].get_plugins(_type="external")
for x, plugin in enumerate(plugins):
if plugin["id"] == variables["name"]:
del plugins[x]
err = db.update_external_plugins(plugins)

11
src/ui/static/js/plugins.js
View file

@ -442,7 +442,7 @@ class Modal {
this.container = document.querySelector(`[data-${this.prefix}-list]`);
this.modal = document.querySelector(`[data-${this.prefix}-modal]`);
this.modalNameInp = this.modal.querySelector("input#name");
this.modalExtInp = this.modal.querySelector("input#external");
this.modalTypeInp = this.modal.querySelector("input#type");
this.modalTitle = this.modal.querySelector(
`[data-${this.prefix}-modal-title]`,
@ -490,14 +490,11 @@ class Modal {
this.modalTitle.textContent = `DELETE ${elName}`;
this.modalTxt.textContent = `Are you sure you want to delete ${elName} ?`;
//external
const isExternal = el
const pluginType = el
.closest("[data-plugins-type]")
.getAttribute("data-plugins-type")
.trim()
.includes("external")
? "True"
: "False";
this.modalExtInp.value = isExternal;
.trim();
this.modalTypeInp.value = pluginType;
}
showModal() {

1
src/ui/templates/plugins_modal.html vendored
View file

@ -26,6 +26,7 @@
<input type="hidden" name="external" id="external" />
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<input type="hidden" value="name" name="name" id="name" />
<input type="hidden" value="external" name="type" id="type" />
<input type="hidden" value="delete" name="operation" id="operation" />
<div>
<p aria-description="delete plugin message"

2
tests/ui/plugins_page.py
View file

@ -64,7 +64,7 @@ try:
if TEST_TYPE == "linux":
wait_for_service()
external_plugins = safe_get_element(DRIVER, By.XPATH, "//div[@data-plugins-external=' external ']", multiple=True)
external_plugins = safe_get_element(DRIVER, By.XPATH, "//div[@data-plugins-type='external']", multiple=True)
assert isinstance(external_plugins, list), "External plugins list is not a list"
if len(external_plugins) != 1: