defect: Fix Recipe Import (#135)

docs/_config.yml

@@ -1,4 +1,4 @@
-title: Fabricate 0.9.3
+title: Fabricate 0.9.4
 email: [email protected]
 description: >- 
   End user documentation for the Foundry Virtual Tabletop (VTT) Module, "Fabricate".

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabricate",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "A system-agnostic, flexible crafting module for FoundryVT",
   "main": "index.js",
   "type": "module",

src/applications/craftingSystemManagerApp/CraftingSystemEditor.svelte

@@ -12,8 +12,6 @@
     import {ComponentsStore} from "../stores/ComponentsStore";
     import {SelectedRecipeStore} from "../stores/SelectedRecipeStore";
     import {SelectedCraftingComponentStore} from "../stores/SelectedCraftingComponentStore";
-    import {LoadingStore} from "../common/LoadingStore";
-    import LoadingModal from "../common/LoadingModal.svelte";
 
     import eventBus from "../common/EventBus";
     import {onMount, setContext} from "svelte";
@@ -29,7 +27,6 @@
     export let fabricateAPI;
 
     const localizationPath = `${Properties.module.id}.CraftingSystemManagerApp`
-    const loading = new LoadingStore({});
 
     const craftingSystems = new CraftingSystemsStore({});
     const selectedCraftingSystem = new SelectedCraftingSystemStore({ craftingSystems });
@@ -77,8 +74,6 @@
 
 <svelte:window on:itemDeleted={(e) => handleItemDeleted(e)} use:eventBus='{"itemDeleted"}'></svelte:window>
 
-<LoadingModal loading={$loading} />
-
 <CraftingSystemNavbar />
 
 {#if $craftingSystems.length > 0}

src/applications/craftingSystemManagerApp/CraftingSystemNavbar.svelte

@@ -10,14 +10,11 @@
         craftingSystems,
         craftingSystemEditor,
         selectedCraftingSystem,
-        localization,
-        loading
+        localization
     } = getContext(key);
 
     async function createCraftingSystem() {
-        $loading = true;
         $selectedCraftingSystem = await craftingSystemEditor.createNewCraftingSystem();
-        $loading = false;
     }
 
     async function importCraftingSystem(targetCraftingSystemId) {

src/applications/craftingSystemManagerApp/componentManager/ComponentEditor.svelte

@@ -136,7 +136,7 @@
         } else {
             salvageOption.addResult(component.id);
         }
-        $selectedComponent.saveSalvageOption(salvageOption);
+        $selectedComponent.setSalvageOption(salvageOption);
         await componentEditor.saveComponent($selectedComponent);
     }
 

src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.ts

@@ -91,6 +91,11 @@ class EssenceEditor {
         return essence;
     }
 
+    public async saveAll(essences: Essence[]) {
+        await this._fabricateAPI.essences.saveAll(essences);
+        this._essences.insertAll(essences);
+    }
+
 }
 
 export { EssenceEditor }

src/applications/craftingSystemManagerApp/recipeManager/RecipeBrowser.svelte

@@ -11,17 +11,14 @@
         recipes,
         selectedRecipe,
         selectedCraftingSystem,
-        loading,
         recipeEditor
     } = getContext(key);
 
     const recipeSearchResults = new RecipeSearchStore({availableRecipes: recipes});
     const searchTerms = recipeSearchResults.searchTerms;
 
     async function importRecipe(event) {
-        $loading = true;
         await recipeEditor.importRecipe(event, $selectedCraftingSystem);
-        $loading = false;
     }
 
     function clearSearch() {
@@ -33,14 +30,11 @@
     }
 
     async function deleteRecipe(event, recipe) {
-        $loading = true;
         await recipeEditor.deleteRecipe(event, recipe, $selectedCraftingSystem);
-        $loading = false;
     }
 
     async function disableRecipe(recipe) {
         recipe.isDisabled = true;
-        $loading = true;
         await recipeEditor.saveRecipe(recipe, $selectedCraftingSystem);
         const message = localization.format(
             `${localizationPath}.recipe.disabled`,
@@ -49,12 +43,10 @@
             }
         );
         ui.notifications.info(message);
-        $loading = false;
     }
 
     async function enableRecipe(recipe) {
         recipe.isDisabled = false;
-        $loading = true;
         await recipeEditor.saveRecipe(recipe, $selectedCraftingSystem);
         const message = localization.format(
             `${localizationPath}.recipe.enabled`,
@@ -63,17 +55,14 @@
             }
         );
         ui.notifications.info(message);
-        $loading = false;
     }
 
     function toggleRecipeDisabled(recipe) {
         return recipe.isDisabled ? enableRecipe(recipe) : disableRecipe(recipe);
     }
 
     async function duplicateRecipe(recipe) {
-        $loading = true;
         await recipeEditor.duplicateRecipe(recipe, $selectedCraftingSystem);
-        $loading = false;
     }
 
     async function openItemSheet(recipe) {

src/applications/stores/EssenceStore.ts

@@ -63,6 +63,16 @@ class EssencesStore implements Writable<Essence[]> {
         });
     }
 
+    insertAll(essences: Essence[]) {
+        this._essences.update((existingEssences) => {
+            const essencesById = new Map(existingEssences.map((essence) => [essence.id, essence]));
+            essences.forEach((essence) => {
+                essencesById.set(essence.id, essence);
+            });
+            return Array.from(essencesById.values());
+        });
+    }
+
     remove(essence: Essence) {
         this._essences.update((components) => {
             const index = components.findIndex((candidate) => candidate.id === essence.id);

src/public/module.json

@@ -1,7 +1,7 @@
 {
   "id": "fabricate",
   "title": "Fabricate",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "A system-agnostic, flexible crafting module for FoundryVTT",
   "authors": [
     {

src/scripts/crafting/component/Component.ts

@@ -27,15 +27,6 @@ interface ComponentJson {
 
 class Component implements Identifiable, Serializable<ComponentJson> {
 
-    private static readonly _NONE: Component = new Component({
-        id: "NO_ID",
-        craftingSystemId: "NO_CRAFTING_SYSTEM_ID",
-        itemData: NoFabricateItemData.INSTANCE(),
-        disabled: true,
-        essences: Combination.EMPTY(),
-        salvageOptions: new SelectableOptions({})
-    });
-
     private readonly _id: string;
     private readonly _embedded: boolean;
     private readonly _craftingSystemId: string;
@@ -95,10 +86,6 @@ class Component implements Identifiable, Serializable<ComponentJson> {
         return this._itemData.uuid;
     }
 
-    public static NONE() {
-        return this._NONE;
-    }
-
     get name(): string {
         return this._itemData.name;
     }
@@ -111,26 +98,6 @@ class Component implements Identifiable, Serializable<ComponentJson> {
         return this._essences;
     }
 
-    get selectedSalvage(): Combination<ComponentReference> {
-        return this._salvageOptions.selectedOption.results;
-    }
-
-    get selectedSalvageOptionName(): string {
-        return this._salvageOptions.selectedOptionId;
-    }
-
-    public selectSalvageOption(combinationId: string) {
-        this._salvageOptions.select(combinationId);
-    }
-
-    public selectNextSalvageOption(): void {
-        this._salvageOptions.selectNext();
-    }
-
-    public selectPreviousSalvageOption(): void {
-        this._salvageOptions.selectPrevious();
-    }
-
     get isDisabled(): boolean {
         return this._disabled;
     }
@@ -212,10 +179,6 @@ class Component implements Identifiable, Serializable<ComponentJson> {
         return this._salvageOptions;
     }
 
-    public selectFirstOption(): void {
-        this._salvageOptions.selectFirst()
-    }
-
     get salvageOptionsById(): Map<string, SalvageOption> {
         return this._salvageOptions.byId;
     }
@@ -236,10 +199,6 @@ class Component implements Identifiable, Serializable<ComponentJson> {
         return this._itemData.errors.map(error => error.code);
     }
 
-    deselectSalvage() {
-        this._salvageOptions.deselect();
-    }
-
     removeEssence(essenceIdToDelete: string) {
         this._essences = this._essences.without(essenceIdToDelete);
     }
@@ -277,10 +236,6 @@ class Component implements Identifiable, Serializable<ComponentJson> {
         this._salvageOptions.set(created);
     }
 
-    public saveSalvageOption(value: SalvageOption) {
-        this._salvageOptions.set(value);
-    }
-
     addEssence(essenceId: string, quantity: number = 1) {
         this._essences = this._essences.addUnit(new Unit(new EssenceReference(essenceId), quantity));
     }