From b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb Mon Sep 17 00:00:00 2001 From: kytwb <412895+kytwb@users.noreply.github.com> Date: Sat, 12 Jun 2021 19:51:28 +0200 Subject: Fix active Todos service behaviour (#1481) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Return false instead of null in isTodosServiceAdded * Resolve from TODOS_RECIPES_ID instead of hardcoded TODOS_RECIPE_ID * Fix TodosWebview width toggling when isTodosServiceActive * Add more todo service recipe IDs * Refactor todos state management * Moved todos service URL and recipe ID computation logic to todos/store * Simplified TodosWebview by delegating to the store for the URL and removing the (unused) payment logic * Made the todos service computation logic in the Service model depend on the logic in todos/store * Made ServicesStore depend on the todos service logic from the Service model * Todos appearance fixes * Hide double horizontal rules if todo settings are hidden due to an added todo service * Hide todos panel border when the panel is hidden or expanded * Make expanded todos panel obey sidebar width and vertical style settings * Make todos/store use isValidExternalURL * Harden isValidExternalURL against malformed URLs * Reduce todo URL string duplication in config.js Co-authored-by: Kristóf Marussy --- src/components/services/content/Services.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index f679eeed0..7cf02c237 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -10,7 +10,6 @@ import injectSheet from 'react-jss'; import ServiceView from './ServiceView'; import Appear from '../../ui/effects/Appear'; import serverlessLogin from '../../../helpers/serverless-helpers'; -import { TODOS_RECIPE_ID } from '../../../features/todos'; const messages = defineMessages({ welcome: { @@ -171,7 +170,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services )} - {services.filter(service => service.recipe.id !== TODOS_RECIPE_ID).map(service => ( + {services.filter(service => !service.isTodosService).map(service => (