TBNilles/ComfyUI-Model-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added helpful browser window alerts on expected server model failures.

Browse Source 
- UI displays alerts sent by server on expected failures.
- Adjusted top bar CSS layout slightly.
- Fixed invalid filename turning into empty string but bypassing empty string check.
- Server prints download url too.
This commit is contained in:
Christian Bastian
2024-04-05 20:36:41 -04:00
parent fc5eccb0f8
commit d4a339802f
3 changed files with 133 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/model-manager.css
View File

@@ -452,6 +452,13 @@
width: 33px;
}
.model-manager .model-manager-head {
display: flex;
flex-direction: row-reverse; /* `row` to swap topbar direction */
justify-content: space-between;
align-items: flex-end;
}
.model-manager .model-manager-head .topbar-left {
display: flex;
float: left;
@@ -460,7 +467,7 @@
.model-manager .model-manager-head .topbar-right {
column-gap: 4px;
display: flex;
flex-direction: row-reverse;
flex-direction: row-reverse; /* `row` to swap topbar direction */
float: right;
}

55
web/model-manager.js
View File

@@ -182,7 +182,7 @@ function buttonAlert(element, success, successText = "", failureText = "", reset
* @returns {Promise<boolean>}
*/
async function saveNotes(modelPath, newValue) {
return request(
return await request(
"/model-manager/notes/save",
{
method: "POST",
@@ -192,7 +192,12 @@ async function saveNotes(modelPath, newValue) {
}),
}
).then((result) => {
return result["success"];
const saved = result["success"];
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
return saved;
})
.catch((err) => {
console.warn(err);
@@ -1728,6 +1733,10 @@ class ModelInfoView {
}
)
.then((result) => {
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
return result["success"];
})
.catch((err) => {
@@ -1747,6 +1756,10 @@ class ModelInfoView {
}
)
.then((result) => {
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
return result["success"];
})
.catch((err) => {
@@ -1794,7 +1807,11 @@ class ModelInfoView {
)
.then((result) => {
const deleted = result["success"];
if (deleted)
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
if (deleted)
{
container.innerHTML = "";
this.element.style.display = "none";
@@ -1841,6 +1858,10 @@ class ModelInfoView {
)
.then((result) => {
const moved = result["success"];
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
if (moved)
{
moveDestinationInput.value = "";
@@ -1934,11 +1955,22 @@ class ModelInfoView {
async update(searchPath, updateModels, searchSeparator) {
const path = encodeURIComponent(searchPath);
const info = await request(`/model-manager/model/info?path=${path}`)
.then((result) => {
const success = result["success"];
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
if (!success) {
return undefined;
}
return result["info"];
})
.catch((err) => {
console.log(err);
return null;
return undefined;
});
if (info === null) {
if (info === undefined || info === null) {
return;
}
const infoHtml = this.elements.info;
@@ -1985,6 +2017,10 @@ class ModelInfoView {
)
.then((result) => {
const renamed = result["success"];
const message = result["alert"];
if (message !== undefined) {
window.alert(message);
}
if (renamed)
{
container.innerHTML = "";
@@ -2713,8 +2749,9 @@ class DownloadTab {
}
).then((data) => {
const success = data["success"];
if (!success) {
console.warn(data["invalid"]);
const message = data["alert"];
if (message !== undefined) {
window.alert(message);
}
return [success, success ? "✔" : "📥︎"];
}).catch((err) => {
@@ -3053,13 +3090,13 @@ class SettingsTab {
$: (el) => (this.elements.reloadButton = el),
type: "button",
textContent: "Reload", // ⟳
onclick: () => this.reload(true),
onclick: async () => { await this.reload(true); },
}),
$el("button", {
$: (el) => (this.elements.saveButton = el),
type: "button",
textContent: "Save", // 💾︎
onclick: () => this.save(),
onclick: async () => { await this.save(); },
}),
]),
/*