Skip to content

Query for shared device if not in me/devices #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sshane wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Query for shared device if not in me/devices #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions src/pages/dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Navigate, type RouteSectionProps, useLocation } from '@solidjs/router'
import clsx from 'clsx'

import { USERADMIN_URL } from '~/api/config'
import { getDevices } from '~/api/devices'
import {getDevice, getDevices} from '~/api/devices'
import { getProfile } from '~/api/profile'
import storage from '~/utils/storage'
import type { Device } from '~/api/types'
Expand Down Expand Up @@ -116,7 +116,28 @@ const Dashboard: Component<RouteSectionProps> = () => {
const [devices] = createResource(getDevices, { initialValue: [] })
const [profile] = createResource(getProfile)

const currentDevice = () => devices()?.find((device) => device.dongle_id === urlState().dongleId)
// const currentDevice = () => devices()?.find((device) => device.dongle_id === urlState().dongleId)
// const currentDevice = createMemo(async () => {
// let device = devices()?.find((device) => device.dongle_id === urlState().dongleId)
// const dongleId = urlState().dongleId
// if (!device && dongleId) {
// device = await getDevice(dongleId)
// console.log('got device from api call instead', device)
// } else {
// console.log('got device from me/devices list query')
// }
// return device
// })

const [currentDevice] = createResource(
() => urlState().dongleId,
async (id) => {
const deviceInList = devices()?.find((d) => d.dongle_id === id)
if (deviceInList) return deviceInList
return await getDevice(id)
},
{ initialValue: undefined }
)

const getDefaultDongleId = () => {
// Do not redirect if dongle ID already selected
Expand Down
4 changes: 3 additions & 1 deletion src/pages/dashboard/activities/DeviceActivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ const DeviceActivity: VoidComponent<DeviceActivityProps> = (props) => {
</div>
</div>
<Show when={props.device}>
<DeviceStatistics dongleId={props.dongleId} class="p-4" />
<Suspense>
<DeviceStatistics dongleId={props.dongleId} class="p-4" />
</Suspense>
<Show when={queueVisible()}>
<UploadQueue dongleId={props.dongleId} />
</Show>
Expand Down
Loading