aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings/RecipesScreen.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/containers/settings/RecipesScreen.js')
-rw-r--r--src/containers/settings/RecipesScreen.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index dc1534ed7..93503fb0e 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -55,8 +55,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
55 55
56 if (filter === 'all' && currentFilter !== 'all') { 56 if (filter === 'all' && currentFilter !== 'all') {
57 this.setState({ currentFilter: 'all' }); 57 this.setState({ currentFilter: 'all' });
58 } else if (filter === 'featured' && currentFilter !== 'featured') {
59 this.setState({ currentFilter: 'featured' });
60 } else if (filter === 'dev' && currentFilter !== 'dev') { 58 } else if (filter === 'dev' && currentFilter !== 'dev') {
61 this.setState({ currentFilter: 'dev' }); 59 this.setState({ currentFilter: 'dev' });
62 } 60 }
@@ -114,7 +112,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
114 service: serviceActions, 112 service: serviceActions,
115 } = this.props.actions; 113 } = this.props.actions;
116 114
117 const { filter } = this.props.params; 115 const { filter } = { filter: 'all', ...this.props.params };
118 let recipeFilter; 116 let recipeFilter;
119 117
120 if (filter === 'all') { 118 if (filter === 'all') {
@@ -124,8 +122,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
124 ]); 122 ]);
125 } else if (filter === 'dev') { 123 } else if (filter === 'dev') {
126 recipeFilter = communityRecipesStore.communityRecipes; 124 recipeFilter = communityRecipesStore.communityRecipes;
127 } else {
128 recipeFilter = recipePreviews.featured;
129 } 125 }
130 126
131 const allRecipes = this.state.needle ? this.prepareRecipes([ 127 const allRecipes = this.state.needle ? this.prepareRecipes([
@@ -140,8 +136,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
140 136
141 const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID); 137 const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID);
142 138
143 const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting 139 const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting
144 || recipePreviews.allRecipePreviewsRequest.isExecuting
145 || recipes.installRecipeRequest.isExecuting 140 || recipes.installRecipeRequest.isExecuting
146 || recipePreviews.searchRecipePreviewsRequest.isExecuting; 141 || recipePreviews.searchRecipePreviewsRequest.isExecuting;
147 142
@@ -154,7 +149,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
154 customWebsiteRecipe={customWebsiteRecipe} 149 customWebsiteRecipe={customWebsiteRecipe}
155 isLoading={isLoading} 150 isLoading={isLoading}
156 addedServiceCount={services.all.length} 151 addedServiceCount={services.all.length}
157 hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
158 showAddServiceInterface={serviceActions.showAddServiceInterface} 152 showAddServiceInterface={serviceActions.showAddServiceInterface}
159 searchRecipes={(e) => this.searchRecipes(e)} 153 searchRecipes={(e) => this.searchRecipes(e)}
160 resetSearch={() => this.resetSearch()} 154 resetSearch={() => this.resetSearch()}