0ct0pu5/DweebUI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uninstall fix

Browse source 
improved uninstall function and fixed duplicate form id
This commit is contained in:
lllllllillllllillll 2023-12-04 00:06:46 -08:00 • committed by GitHub
parent d73edb3ed1
commit ab909bbe0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/dashCard.js
View file

@ -184,8 +184,8 @@ module.exports.dashCard = function dashCard(data) {
<!-- Download SVG icon from http://tabler-icons.io/i/alert-triangle -->
<svg xmlns="http://www.w3.org/2000/svg" class="icon mb-2 text-danger icon-lg" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M12 9v2m0 4v.01"></path><path d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75"></path></svg>
<h3>Remove ${name}?</h3>
<form action="/uninstall" id="uninstall" method="POST">
<input type="text" class="form-control" name="service_name" value="${app_name}" hidden/>
<form action="/uninstall" id="${name}_uninstall" method="POST">
<input type="text" class="form-control" name="service_name" value="${name}" hidden/>
<div class="mb-3"> </div>
<div class="mb-2">
@ -246,7 +246,7 @@ module.exports.dashCard = function dashCard(data) {
</a>
</div>
<div class="col">
<input type="submit" form="uninstall" class="btn btn-danger w-100" value="Uninstall"/>
<input type="submit" form="${name}_uninstall" class="btn btn-danger w-100" value="Uninstall"/>
</div>
</div>
</div>

36
functions/package_manager.js
View file

@ -180,26 +180,20 @@ module.exports.install = async function (data) {
module.exports.uninstall = async function (data) {
if (data.confirm == 'Yes') {
var containerName = docker.getContainer(`${data.service_name}`);
try {
containerName.stop(function (err, data) {
if (data) {
containerName.remove(function (err, data) {
});
}
});
} catch {
containerName.remove(function (err, data) {
});
}
if (data.confirm == 'Yes') {
console.log(`Uninstalling ${data.service_name}: ${data}`);
var containerName = docker.getContainer(`${data.service_name}`);
try {
await containerName.stop();
console.log(`Stopped ${data.service_name} container`);
} catch {
console.log(`Error stopping ${data.service_name} container`);
}
try {
await containerName.remove();
console.log(`Removed ${data.service_name} container`);
} catch {
console.log(`Error removing ${data.service_name} container`);
}
}
}