Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@floating-ui/react": "^0.27.19",
"@primer/octicons-react": "^19.27.0",
"gd-eventlog": "^0.1.27",
"incyclist-services": "^1.9.26",
"incyclist-services": "^1.9.27",
"leaflet": "^1.9.4",
"leaflet-geosearch": "^4.4.0",
"react": "^19.2.6",
Expand Down
Binary file removed public/images/intervals.png
Binary file not shown.
Binary file removed public/images/velo-black.png
Binary file not shown.
123 changes: 56 additions & 67 deletions src/components/modules/Settings/Apps/AppsSettings.jsx
Original file line number Diff line number Diff line change
@@ -1,107 +1,96 @@
import { useAppsService } from "incyclist-services"
import React,{ useEffect, useState } from "react"
import styled from "styled-components";
import { AppThemeProvider } from "../../../../theme";
import { Row } from "../../../atoms";
import { AppsItem } from "../../../molecules/Apps/AppsItem";
import { StravaSettings } from "./Strava";
import { KomootSettings } from "./Komoot/KomootSettings";
import {IntervalsSettings} from './Intervals/IntervalsSettings'

import React, { useCallback, useEffect, useRef, useState } from "react"
import styled from "styled-components"
import { EventLogger } from "gd-eventlog"
import { AppThemeProvider } from "../../../../theme"
import { AppsItem } from "../../../molecules/Apps/AppsItem"
import { KomootSettings } from "./Komoot/KomootSettings"
import { OAuthAppSettings } from "./OAuthAppSettings"

export const ContentArea = styled.div`
position:relative;
width: ${props=> props.width || 'calc(100% - 2vw)'};
// height: ${props=>props.height || 'calc(100% - 2vh)'};
text-align: left ;
margin:auto;
display: flex;
flex-direction:column;
padding-left: 1vw;
padding-right: 1vw;
padding-top: 1vh;
padding-bottom: 1vh;
padding:1vw;
top:0;
left:0;
background: ${props => props.background || props.theme.dialogContent.background || 'white'};
`;

const getMapping = (service) => {
const mapping = {
strava: StravaSettings,
komoot: KomootSettings,
intervals: IntervalsSettings
}
const C = mapping[service]
return C
}
const Empty = styled.div`
padding: 1vh 1vw;
`

const SettingsPage = ( {service,onBack} ) => {

const C = getMapping(service)
if (!C)
return null
// Apps that are connected through an image button instead of a text button
const CONNECT_IMAGES = {
strava: 'images/btn_strava_connectwith_orange.svg'
}

return <C onBack={onBack}/>
const renderApp = (app) => {
if (app.key === 'komoot')
return <KomootSettings />

return <OAuthAppSettings appKey={app.key} name={app.name} connectImage={CONNECT_IMAGES[app.key]} />
}


export const AppsSettings = ( ) => {
const service = useAppsService()
const [state,setState] = useState(null)
const logger = useRef(new EventLogger('AppsSettings')).current

useEffect( ()=>{
if (state?.initialized)
return;
const [apps, setApps] = useState(null)
const [expandedKey, setExpandedKey] = useState(null)

const apps = service.openSettings()

// keeps the connection status of the entries up to date, whenever an app was (dis)connected
const refresh = useCallback( ()=>{
setApps( service.openSettings() )
},[service])

setState({apps, initialized:true})
},[service, state])
useEffect( ()=>{
refresh()
service.on('connected', refresh)
service.on('disconnected', refresh)

const onClick=(key) => {
setState( current=> ({...current, selected:key}) )
}
return ()=>{
service.off('connected', refresh)
service.off('disconnected', refresh)
}
},[service, refresh])

const onBack=()=>{
setState( current=> ({...current, selected:null}) )
const onToggle = (key) => {
const expanded = expandedKey!==key
logger.logEvent({message:'app toggled', app:key, expanded, eventSource:'user'})
setExpandedKey( expanded ? key : null)
}

if (!state?.initialized )
return null;

if (state.selected && getMapping(state.selected))
return <SettingsPage service={state.selected} onBack={onBack}/>

return <AppsSettingsView apps={state.apps} onClick={onClick}/>


if (!apps)
return null

return <AppsSettingsView apps={apps} expandedKey={expandedKey} onToggle={onToggle} renderApp={renderApp}/>
}

export const AppsSettingsView = ({apps,onClick}) => {
/**
* List of all apps (same UX as in the mobile app): every entry shows the name and the connection status
* and expands to the settings of the app. Only one entry is expanded at a time.
*/
export const AppsSettingsView = ({apps, expandedKey, onToggle, renderApp}) => {

const onClickHandler = (name) => {
if (onClick && typeof onClick==='function') {
onClick(name)
}
}

return (
<AppThemeProvider>
<ContentArea>
{ apps?.length ?
apps.map( (app) => <Row key={app.key}>
<AppsItem {...app} onClick={()=>onClickHandler(app.key)} />
</Row> ) :
<Row>No Apps available</Row>
{ apps?.length ?
apps.map( (app) =>
<AppsItem key={app.key} name={app.name} isConnected={app.isConnected}
expanded={expandedKey===app.key}
onClick={()=>onToggle?.(app.key)}>
{renderApp?.(app)}
</AppsItem>
) :
<Empty>No Apps available</Empty>
}

</ContentArea>
</AppThemeProvider>
)

}
}
58 changes: 39 additions & 19 deletions src/components/modules/Settings/Apps/AppsSettings.stories.jsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,53 @@
import styled from "styled-components";
import { Row } from "../../../atoms";
import { AppsSettingsView } from "./AppsSettings";
import React from 'react'
import React, { useState } from 'react'
import styled from "styled-components"
import { Row } from "../../../atoms"
import { AppSettingsView } from "../../../molecules/Apps/AppSettingsView"
import { AppsSettingsView } from "./AppsSettings"

const View = styled(Row)`
const View = styled(Row)`
width: 800px;
height: 600px;
overflow-y: hidden;
`;

`

export default {
component: AppsSettingsView,
title: 'Modules/Settings/AppsSettings',
argTypes: {
onClick: { action: 'select' } ,
title: 'Modules/Settings/AppsSettings',
argTypes: {
onToggle: { action: 'toggle' },
},
}

const apps = [
{ name: 'Strava', key: 'strava', isConnected: true },
{ name: 'Komoot', key: 'komoot', isConnected: false },
{ name: 'Intervals.icu', key: 'intervals', isConnected: false },
]

};
const operations = [
{ operation: 'ActivityUpload', enabled: true },
{ operation: 'RouteDownload', enabled: false },
]

const Template = args => <View className='TEST'> <AppsSettingsView {...args} /></View>
const renderApp = (app) => <AppSettingsView name={app.name} isConnected={app.isConnected} operations={operations} />

export const Default = Template.bind({});
Default.args = {
apps: [
{ name:'Strava', key:'strava', iconUrl: 'https://static.cdnlogo.com/logos/s/42/strava-wordmark.svg' },
{ name:'VeloHero', key:'velohero', iconUrl: 'images/velo-white.png' },
{ name:'Komoot', key:'komoot', iconUrl:'https://www.komoot.com/assets/4d8ae313eec53e6e.svg' },
]
const Template = args => {
const [expandedKey, setExpandedKey] = useState(args.expandedKey)
const onToggle = (key) => setExpandedKey(current => current === key ? null : key)

return <View className='TEST'>
<AppsSettingsView {...args} expandedKey={expandedKey} onToggle={onToggle} renderApp={renderApp} />
</View>
}

export const Collapsed = Template.bind({})
Collapsed.args = { apps }

export const ConnectedExpanded = Template.bind({})
ConnectedExpanded.args = { apps, expandedKey: 'strava' }

export const NotConnectedExpanded = Template.bind({})
NotConnectedExpanded.args = { apps, expandedKey: 'intervals' }

export const NoApps = Template.bind({})
NoApps.args = { apps: [] }
61 changes: 61 additions & 0 deletions src/components/modules/Settings/Apps/AppsSettings.unit.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import React from 'react'
import { describe, test, expect, vi } from 'vitest'
import { render, screen, fireEvent } from '@testing-library/react'

import { AppsSettingsView } from './AppsSettings'

const apps = [
{ name: 'Strava', key: 'strava', isConnected: true },
{ name: 'Komoot', key: 'komoot', isConnected: false },
{ name: 'Intervals.icu', key: 'intervals', isConnected: false },
]

const renderApp = (app) => <div>settings of {app.key}</div>

describe('AppsSettingsView', () => {

test('lists all apps with their connection status', () => {
render(<AppsSettingsView apps={apps} renderApp={renderApp} />)

expect(screen.getByText('Strava')).toBeDefined()
expect(screen.getByText('Komoot')).toBeDefined()
expect(screen.getByText('Intervals.icu')).toBeDefined()
expect(screen.getAllByLabelText('Connected')).toHaveLength(1)
expect(screen.getAllByLabelText('Not connected')).toHaveLength(2)
})

test('shows the settings of the expanded app only', () => {
render(<AppsSettingsView apps={apps} expandedKey='komoot' renderApp={renderApp} />)

expect(screen.getByText('settings of komoot')).toBeDefined()
expect(screen.queryByText('settings of strava')).toBeNull()
expect(screen.queryByText('settings of intervals')).toBeNull()
})

test('shows no settings if nothing is expanded', () => {
render(<AppsSettingsView apps={apps} renderApp={renderApp} />)

expect(screen.queryByText(/settings of/)).toBeNull()
})

test('reports the key of the clicked app', () => {
const onToggle = vi.fn()
render(<AppsSettingsView apps={apps} onToggle={onToggle} renderApp={renderApp} />)

fireEvent.click(screen.getByText('Intervals.icu'))

expect(onToggle).toHaveBeenCalledWith('intervals')
})

test('shows a hint if there are no apps', () => {
render(<AppsSettingsView apps={[]} renderApp={renderApp} />)

expect(screen.getByText('No Apps available')).toBeDefined()
})

test('handles missing apps', () => {
render(<AppsSettingsView renderApp={renderApp} />)

expect(screen.getByText('No Apps available')).toBeDefined()
})
})
Loading
Loading