fix(refine): refine should be sorted by result name, not its id

WorldSellerGame · Apr 19, 2023 · a83c155 · a83c155
1 parent 7dd6358
commit a83c155
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/app/components/refining-page-display/refining-page-display.component.ts b/src/app/components/refining-page-display/refining-page-display.component.ts
@@ -68,6 +68,7 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
   public itemOutputs: Record<string, IGameItem> = {};
   public resourceOutputs: Record<string, IGameResource> = {};
   public rarityOutputs: Record<string, string> = {};
+  public outputIdToName: Record<string, string> = {};
 
   public summedResources: Record<string, number> = {};
 
@@ -87,6 +88,8 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
   ngOnInit() {
     this.allStarredRecipes = this.starredRecipes || {};
 
+    this.setIngredients();
+    this.setResults();
     this.setVisibleRecipes();
     this.setRefiningWorkerHash();
     this.setTotalResources();
@@ -169,15 +172,13 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
       this.setType('resources');
     }
 
-    this.setIngredients();
     this.setCanCrafts();
-    this.setResults();
   }
 
   setIngredients() {
     this.ingredients = {};
 
-    [...this.resourceRecipes, ...this.itemRecipes].forEach((recipe) => {
+    this.locationData.forEach((recipe) => {
       this.ingredients[recipe.result] = Object.keys(recipe.ingredients || {})
         .filter(x => this.contentService.isResource(x))
         .map((name) => ({ name, amount: recipe.ingredients[name] }));
@@ -202,15 +203,21 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
     this.resourceOutputs = {};
     this.rarityOutputs = {};
 
-    this.itemRecipes.forEach((recipe) => {
-      this.itemOutputs[recipe.result] = this.contentService.getItemByName(recipe.result) as IGameItem;
-      this.rarityOutputs[recipe.result] = this.itemOutputs[recipe.result].rarity;
-    });
+    this.locationData
+      .filter((recipe: IGameRecipe) => this.contentService.isItem(recipe.result))
+      .forEach((recipe: IGameRecipe) => {
+        this.itemOutputs[recipe.result] = this.contentService.getItemByName(recipe.result) as IGameItem;
+        this.rarityOutputs[recipe.result] = this.itemOutputs[recipe.result].rarity;
+        this.outputIdToName[recipe.result] = this.itemOutputs[recipe.result].name;
+      });
 
-    this.resourceRecipes.forEach((recipe) => {
-      this.resourceOutputs[recipe.result] = this.contentService.getResourceByName(recipe.result) as IGameResource;
-      this.rarityOutputs[recipe.result] = this.resourceOutputs[recipe.result].rarity;
-    });
+    this.locationData
+      .filter((recipe: IGameRecipe) => this.contentService.isResource(recipe.result))
+      .forEach((recipe: IGameRecipe) => {
+        this.resourceOutputs[recipe.result] = this.contentService.getResourceByName(recipe.result) as IGameResource;
+        this.rarityOutputs[recipe.result] = this.resourceOutputs[recipe.result].rarity;
+        this.outputIdToName[recipe.result] = this.resourceOutputs[recipe.result].name;
+      });
   }
 
   setRefiningWorkerHash() {
@@ -349,7 +356,7 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
     return sortBy(validRecipes, [
       (recipe) => !this.allStarredRecipes[recipe.result],
       (recipe) => !this.canCraftRecipe(recipe),
-      (recipe) => recipe.result
+      (recipe) => this.outputIdToName[recipe.result]
     ]);
   }