Skip to content

Commit 6896d94

Browse files
authored
revert everything since commaai#578 (commaai#599)
Closes https://github.com/commaai/connect/issues/592 Changes since the PR listed above makes connect loading much less reliable. @incognitojam I would much rather revert some stuff to put connect back into a good state than trying to make fixes on top of things. This is the practice we take at comma across all repos too could not apply these due to conflicts: - commaai/connect@063ca11 - commaai/connect@a29a97f - commaai/connect@b60e915 - commaai/connect@dde34fa - commaai/connect@5485d66 - commaai/connect@5485d66 - commaai/connect@bb1f435 - commaai/connect@77a9bef - commaai/connect@8afb206
1 parent 4d233ab commit 6896d94

29 files changed

+242
-298
lines changed

src/App.browser.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ describe('Demo mode', () => {
2121
beforeEach(() => setAccessToken(Demo.ACCESS_TOKEN))
2222

2323
test('View dashboard', async () => {
24-
const { findAllByText } = renderApp('/')
25-
expect(await findAllByText('demo 3X')).toHaveLength(2)
24+
const { findByText } = renderApp('/')
25+
expect(await findByText('demo 3X')).toBeTruthy()
2626
})
2727

2828
test('View demo route', async () => {

src/api/athena.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AthenaCallResponse, BackendAthenaCallResponse, BackendAthenaCallResponseError } from '~/api/types'
1+
import { AthenaCallResponse, BackendAthenaCallResponse, BackendAthenaCallResponseError } from '~/api/types'
22
import { fetcher } from '.'
33
import { ATHENA_URL } from './config'
44

src/api/devices.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ export const getDevice = async (dongleId: string): Promise<Device> => {
5454
}
5555
}
5656

57-
export const updateDevice = async (dongleId: string, data: Partial<Pick<ApiDevice, 'alias'>>) =>
58-
fetcher<ApiDevice>(`/v1/devices/${dongleId}/`, {
59-
method: 'PATCH',
60-
headers: {
61-
'Content-Type': 'application/json',
62-
},
63-
body: JSON.stringify(data),
64-
})
65-
6657
export const getAthenaOfflineQueue = (dongleId: string) =>
6758
fetcher<AthenaOfflineQueueResponse>(`/v1/devices/${dongleId}/athena_offline_queue`)
6859

@@ -102,7 +93,7 @@ const validatePairToken = (
10293

10394
try {
10495
// jwt is base64url encoded
105-
const payload = atob(parts[1]!.replace(/-/g, '+').replace(/_/g, '/'))
96+
const payload = atob(parts[1].replace(/-/g, '+').replace(/_/g, '/'))
10697
const { identity, pair } = JSON.parse(payload) as Record<string, unknown>
10798
if (pair !== true || typeof identity !== 'string') return null
10899
return { identity, token }

src/api/file.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {
1+
import {
22
CancelUploadRequest,
33
CancelUploadResponse,
44
Files,
@@ -87,14 +87,13 @@ const generateMissingFilePaths = (
8787
}
8888

8989
const prepareUploadRequests = (paths: string[], presignedUrls: UploadFileMetadata[]): UploadFile[] =>
90-
paths.map((path, i) => ({ filePath: path, ...presignedUrls[i]! }))
90+
paths.map((path, i) => ({ filePath: path, ...presignedUrls[i] }))
9191

9292
export const uploadAllSegments = (routeName: string, totalSegments: number, types?: FileType[]) =>
9393
uploadSegments(routeName, 0, totalSegments - 1, types)
9494

9595
export const uploadSegments = async (routeName: string, segmentStart: number, segmentEnd: number, types?: FileType[]) => {
9696
const routeInfo = parseRouteName(routeName)
97-
if (!routeInfo) return []
9897
const alreadyUploadedFiles = await getFiles(routeName, types)
9998
const paths = generateMissingFilePaths(routeInfo, segmentStart, segmentEnd, alreadyUploadedFiles, types)
10099
const pathPresignedUrls = await requestToUploadFiles(routeInfo.dongleId, paths)

src/api/route.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import type { Route, RouteInfo, RouteShareSignature } from '~/api/types'
33
import { fetcher } from '.'
44
import { API_URL } from './config'
55

6-
export const parseRouteName = (routeName: string): RouteInfo | undefined => {
6+
export const parseRouteName = (routeName: string): RouteInfo => {
77
const [dongleId, routeId] = routeName.split('|')
8-
if (!dongleId || !routeId) return undefined
98
return { dongleId, routeId }
109
}
1110

src/ci/check_bundle_size.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const totalCompressedSizeKB = (totalCompressedSize / 1024).toFixed(2)
3030
files.push({}, { path: 'Total', sizeKB: totalSizeKB, compressedSizeKB: totalCompressedSizeKB })
3131
console.table(files, ['path', 'sizeKB', 'compressedSizeKB'])
3232

33-
const upperBoundKB = 272
33+
const upperBoundKB = 270
3434
const lowerBoundKB = upperBoundKB - 10
3535
if (totalCompressedSize < lowerBoundKB * 1024) {
3636
console.warn(`Bundle size lower than expected, let's lower the limit! (${totalCompressedSizeKB}KB < ${lowerBoundKB}KB)`)

src/components/DeviceLocation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const DeviceLocation: VoidComponent<DeviceLocationProps> = (props) => {
120120
if (foundLocations.length > 1) {
121121
args.map.fitBounds(L.latLngBounds(foundLocations.map((l) => [l.lat, l.lng])), { padding: [50, 50] })
122122
} else if (foundLocations.length === 1) {
123-
args.map.setView([foundLocations[0]!.lat, foundLocations[0]!.lng], 15)
123+
args.map.setView([foundLocations[0].lat, foundLocations[0].lng], 15)
124124
} else {
125125
throw new Error('Offline')
126126
}

src/components/RouteActions.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ interface RouteActionsProps {
3838
}
3939

4040
const RouteActions: VoidComponent<RouteActionsProps> = (props) => {
41-
const dongleId = () => parseRouteName(props.routeName)?.dongleId
42-
const [preservedRoutesResource] = createResource(dongleId, getPreservedRoutes)
41+
const [preservedRoutesResource] = createResource(() => parseRouteName(props.routeName).dongleId, getPreservedRoutes)
4342

4443
const [isPublic, setIsPublic] = createSignal<boolean | undefined>(undefined)
4544
const [isPreserved, setIsPreserved] = createSignal<boolean | undefined>(undefined)

src/components/RouteStaticMap.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { createResource, Match, Switch } from 'solid-js'
22
import type { JSXElement, VoidComponent } from 'solid-js'
33
import clsx from 'clsx'
44

5-
import { type GPSPathPoint, getCoords } from '~/api/derived'
6-
import { type Coords, getPathStaticMapUrl } from '~/map'
5+
import { GPSPathPoint, getCoords } from '~/api/derived'
6+
import { Coords, getPathStaticMapUrl } from '~/map'
77
import { getThemeId } from '~/theme'
88
import type { Route } from '~/api/types'
99

src/components/RouteUploadButtons.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const UploadButton: VoidComponent<UploadButtonProps> = (props) => {
4747
class="px-2 md:px-3"
4848
disabled={disabled()}
4949
leading={<Icon class={clsx(state() === 'loading' && 'animate-spin')} name={stateToIcon[state()]} size="20" />}
50+
color="primary"
5051
>
5152
<span class="flex items-center gap-1 font-mono">{props.text}</span>
5253
</Button>

0 commit comments

Comments
 (0)