refactor: delegate download cancellation, reorder workflowId, remove unused copy/filter helpers

This commit is contained in:
Dariusz L
2026-06-25 00:39:23 +02:00
parent c0a4398911
commit 91549dbc9b
3 changed files with 6 additions and 65 deletions
+2 -8
View File
@@ -1,4 +1,4 @@
import { app } from "../../../../../scripts/app.js";
import { app } from "../../../../../scripts/app.js";
import { api } from "../../../../../scripts/api.js";
import { $el } from "../../../../../scripts/ui.js";
import { getSvgIcon } from "../../utils/icon_utils.js";
@@ -2586,13 +2586,7 @@ export const queueMethods = {
this.showNotification(`Cancelling ${downloadIds.length} download${downloadIds.length > 1 ? 's' : ''}...`, 'info');
for (const downloadId of downloadIds) {
try {
await api.fetchApi(`/model_resolver/cancel/${downloadId}`, {
method: 'POST'
});
} catch (error) {
console.error('Model Resolver: Error cancelling download:', error);
}
await this.cancelDownload(downloadId);
}
},
@@ -1203,10 +1203,10 @@ export const resolveDownloadMethods = {
baseDirectory,
sourceUrl: url,
workflowKey,
workflowId,
workflowRouteKey,
workflowLabel,
workflowSignature,
workflowId,
workflowTabId,
workflowTabName,
workflowTabAriaControls,
@@ -1279,10 +1279,10 @@ export const resolveDownloadMethods = {
baseDirectory,
sourceUrl: url,
workflowKey,
workflowId,
workflowRouteKey,
workflowLabel,
workflowSignature,
workflowId,
workflowTabId,
workflowTabName,
workflowTabAriaControls,
@@ -1319,10 +1319,10 @@ export const resolveDownloadMethods = {
baseDirectory,
sourceUrl: url,
workflowKey,
workflowId,
workflowRouteKey,
workflowLabel,
workflowSignature,
workflowId,
workflowTabId,
workflowTabName,
workflowTabAriaControls,
+1 -54
View File
@@ -1,4 +1,4 @@
import { app } from "../../../../scripts/app.js";
import { app } from "../../../../scripts/app.js";
import { api } from "../../../../scripts/api.js";
import { $el } from "../../../../scripts/ui.js";
import { createModuleLogger } from "../log_system/log_funcs.js";
@@ -751,57 +751,4 @@ export class ModelResolver {
alert("Error opening Model Resolver: " + error.message);
}
}
static switchFilter(filter) {
document.querySelectorAll('.mr-btn-filter').forEach(b => b.classList.remove('active'));
document.getElementById('filter-' + filter).classList.add('active');
document.querySelectorAll('.mr-model-section').forEach(s => {
const hasActive = s.dataset.mlActive === 'true';
const hasInactive = s.dataset.mlInactive === 'true';
if (filter === 'all') {
s.style.display = 'block';
} else if (filter === 'active') {
s.style.display = hasActive ? 'block' : 'none';
} else if (filter === 'inactive') {
s.style.display = hasInactive ? 'block' : 'none';
}
});
const copySection = document.querySelector('[id^="mr-copy-"]');
if (copySection) {
const codeEl = copySection.querySelector('code');
const labelEl = copySection.querySelector('div');
if (filter === 'all') {
codeEl.textContent = copySection.dataset.mlAll;
labelEl.textContent = 'Copy all:';
} else if (filter === 'active') {
codeEl.textContent = copySection.dataset.mlActive;
labelEl.textContent = 'Copy active:';
} else if (filter === 'inactive') {
codeEl.textContent = copySection.dataset.mlInactive;
labelEl.textContent = 'Copy inactive:';
}
}
}
static copyToClipboard(text, btn) {
navigator.clipboard.writeText(text).then(() => {
const orig = btn.textContent;
btn.textContent = '✓';
setTimeout(() => btn.textContent = orig, 1500);
});
}
static copyFromCode(sectionId, btn) {
const section = document.getElementById(sectionId);
const codeEl = section.querySelector('code');
navigator.clipboard.writeText(codeEl.textContent).then(() => {
const orig = btn.textContent;
btn.textContent = '✓ Copied!';
setTimeout(() => btn.textContent = orig, 1500);
});
}
}