From cc398c4cdcd11afaf2340e28c0c453fad7147332 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 17 Aug 2021 16:43:44 +0530 Subject: fix: sorted the recipes according to their service name --- src/containers/settings/RecipesScreen.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index fa8245c6e..784052bbe 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js @@ -74,6 +74,12 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend } } + _sortByName(recipe1, recipe2) { + if (recipe1.name.toLowerCase() < recipe2.name.toLowerCase()) { return -1; } + if (recipe1.name.toLowerCase() > recipe2.name.toLowerCase()) { return 1; } + return 0; + } + prepareRecipes(recipes) { return recipes // Filter out duplicate recipes @@ -82,11 +88,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend return ids.indexOf(recipe.id) === index; // Sort alphabetically - }).sort((a, b) => { - if (a.id < b.id) { return -1; } - if (a.id > b.id) { return 1; } - return 0; - }); + }).sort(this._sortByName); } // Create an array of RecipePreviews from an array of recipe objects @@ -121,6 +123,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend } else if (filter === 'dev') { recipeFilter = communityRecipesStore.communityRecipes; } + recipeFilter = recipeFilter.sort(this._sortByName); const allRecipes = this.state.needle ? this.prepareRecipes([ // All search recipes from server @@ -130,7 +133,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend this.customRecipes .filter((service) => service.name.toLowerCase().includes(this.state.needle.toLowerCase()) || (service.aliases || []).some(alias => alias.toLowerCase().includes(this.state.needle.toLowerCase()))), ), - ]) : recipeFilter; + ]).sort(this._sortByName) : recipeFilter; const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID); -- cgit v1.2.3-54-g00ecf