+
+
+
+
+ ${this.importManager.duplicateRecipes.map((recipe) => `
+
-
-
-
-
-
-
${recipe.title}
-
-
- ${formatDate(recipe.modified)}
-
-
- ${recipe.lora_count} LoRAs
-
-
-
+
`).join('')}
@@ -269,9 +265,23 @@ export class RecipeDataManager {
// Show the duplicate container
duplicateContainer.style.display = 'block';
- // Initialize deletion tracking if not already done
- if (!this.importManager.recipesToDelete) {
- this.importManager.recipesToDelete = [];
+ // Add click event for the toggle button
+ const toggleButton = document.getElementById('toggleDuplicatesList');
+ if (toggleButton) {
+ toggleButton.addEventListener('click', () => {
+ const list = duplicateContainer.querySelector('.duplicate-recipes-list');
+ if (list) {
+ list.classList.toggle('collapsed');
+ const icon = toggleButton.querySelector('i');
+ if (icon) {
+ if (list.classList.contains('collapsed')) {
+ toggleButton.innerHTML = `Show duplicates `;
+ } else {
+ toggleButton.innerHTML = `Hide duplicates `;
+ }
+ }
+ }
+ });
}
} else {
// No duplicates, hide the container if it exists
@@ -280,9 +290,8 @@ export class RecipeDataManager {
duplicateContainer.style.display = 'none';
}
- // Reset deletion tracking
+ // Reset duplicate tracking
this.importManager.duplicateRecipes = [];
- this.importManager.recipesToDelete = [];
}
}
@@ -344,59 +353,18 @@ export class RecipeDataManager {
buttonsContainer.parentNode.insertBefore(warningContainer, buttonsContainer);
}
- // Check for duplicates to adjust button actions
- const hasDuplicates = this.importManager.duplicateRecipes &&
- this.importManager.duplicateRecipes.length > 0;
-
- // If we have missing LoRAs (not deleted), show "Download Missing LoRAs"
- // Otherwise show appropriate action based on duplicates
+ // Check for duplicates but don't change button actions
const missingNotDeleted = this.importManager.recipeData.loras.filter(
lora => !lora.existsLocally && !lora.isDeleted
).length;
- // All LoRAs exist locally
- const allLorasExist = missingNotDeleted === 0;
+ // Standard button behavior regardless of duplicates
+ nextButton.classList.remove('warning-btn');
- if (hasDuplicates) {
- if (missingNotDeleted > 0) {
- // We have both duplicates and missing LoRAs
- nextButton.textContent = 'Download Missing LoRAs';
-
- // Add "Import Anyway" as a secondary option
- const importAnywayButton = document.createElement('button');
- importAnywayButton.id = 'importAnywayBtn';
- importAnywayButton.className = 'secondary-btn';
- importAnywayButton.innerHTML = ' Import as New Recipe';
- importAnywayButton.onclick = () => this.importManager.importRecipeAnyway();
-
- // Insert after the back button
- const backButton = document.querySelector('#detailsStep .secondary-btn');
- actionsContainer.insertBefore(importAnywayButton, backButton.nextSibling);
- } else {
- // All LoRAs exist locally, but we have duplicates
- nextButton.textContent = 'Replace Existing Recipe';
- nextButton.classList.add('warning-btn');
-
- // Add "Import as New" as a secondary option
- const importAsNewButton = document.createElement('button');
- importAsNewButton.id = 'importAnywayBtn';
- importAsNewButton.className = 'secondary-btn';
- importAsNewButton.innerHTML = ' Import as New Recipe';
- importAsNewButton.onclick = () => this.importManager.importRecipeAnyway();
-
- // Insert after the back button
- const backButton = document.querySelector('#detailsStep .secondary-btn');
- actionsContainer.insertBefore(importAsNewButton, backButton.nextSibling);
- }
+ if (missingNotDeleted > 0) {
+ nextButton.textContent = 'Download Missing LoRAs';
} else {
- // No duplicates, standard behavior
- nextButton.classList.remove('warning-btn');
-
- if (missingNotDeleted > 0) {
- nextButton.textContent = 'Download Missing LoRAs';
- } else {
- nextButton.textContent = 'Save Recipe';
- }
+ nextButton.textContent = 'Save Recipe';
}
}
@@ -451,58 +419,10 @@ export class RecipeDataManager {
});
}
- // Process any recipes marked for deletion
- if (this.importManager.recipesToDelete && this.importManager.recipesToDelete.length > 0) {
- this.deleteMarkedRecipes();
- }
-
// Update missing LoRAs list to exclude deleted LoRAs
this.importManager.missingLoras = this.importManager.recipeData.loras.filter(lora =>
!lora.existsLocally && !lora.isDeleted);
- // Check if we're replacing a duplicate or proceeding normally
- const hasDuplicates = this.importManager.duplicateRecipes &&
- this.importManager.duplicateRecipes.length > 0;
-
- // Store replacement flag in importManager
- this.importManager.isReplacingDuplicate = hasDuplicates &&
- this.importManager.missingLoras.length === 0 &&
- !this.importManager.importAsNew;
-
- // Check for early access loras and show warning if any exist
- const earlyAccessLoras = this.importManager.missingLoras.filter(lora => lora.isEarlyAccess);
- if (earlyAccessLoras.length > 0) {
- // Show a warning about early access loras
- const warningMessage = `
-
+
+ ${formatDate(recipe.modified)}
+
+
+ ${recipe.lora_count} LoRAs
+
-
-
- `;
-
- // Show the warning message
- const buttonsContainer = document.querySelector('#detailsStep .modal-actions');
- if (buttonsContainer) {
- // Remove existing warning if any
- const existingWarning = document.getElementById('earlyAccessWarning');
- if (existingWarning) {
- existingWarning.remove();
- }
-
- // Add new warning
- const warningContainer = document.createElement('div');
- warningContainer.id = 'earlyAccessWarning';
- warningContainer.innerHTML = warningMessage;
- buttonsContainer.parentNode.insertBefore(warningContainer, buttonsContainer);
- }
- }
-
// If we have downloadable missing LoRAs, go to location step
if (this.importManager.missingLoras.length > 0) {
// Store only downloadable LoRAs for the download step
@@ -513,46 +433,4 @@ export class RecipeDataManager {
this.importManager.saveRecipe();
}
}
-
- async deleteMarkedRecipes() {
- if (!this.importManager.recipesToDelete || this.importManager.recipesToDelete.length === 0) {
- return;
- }
-
- try {
- // Show loading indicator
- this.importManager.loadingManager.showSimpleLoading('Deleting marked recipes...');
-
- // Call API to delete recipes
- const response = await fetch('/api/recipes/bulk-delete', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify({
- recipe_ids: this.importManager.recipesToDelete
- })
- });
-
- if (!response.ok) {
- const error = await response.json();
- throw new Error(error.error || 'Failed to delete recipes');
- }
-
- const result = await response.json();
-
- // Show success message
- const deletedCount = this.importManager.recipesToDelete.length;
- showToast(`Successfully deleted ${deletedCount} ${deletedCount === 1 ? 'recipe' : 'recipes'}`, 'success');
-
- // Reset the delete list
- this.importManager.recipesToDelete = [];
-
- } catch (error) {
- console.error('Error deleting recipes:', error);
- showToast('Failed to delete recipes: ' + error.message, 'error');
- } finally {
- this.importManager.loadingManager.hide();
- }
- }
}
diff --git a/templates/components/import_modal.html b/templates/components/import_modal.html
index 7f9024e1..aafe00f6 100644
--- a/templates/components/import_modal.html
+++ b/templates/components/import_modal.html
@@ -78,17 +78,17 @@
-
- ${earlyAccessLoras.length} LoRA(s) require Early Access
-
- These LoRAs require a payment to access. Download will fail if you haven't purchased access.
- You may need to log in to your Civitai account in browser settings.
-
-