🚨 Fix typescript issues after frontend dependency updates

backend/openapi-schema.yml

@@ -531,6 +531,15 @@ components:
       - document_id
       title: UnknownTask
       type: object
+    UserBase:
+      properties:
+        username:
+          title: Username
+          type: string
+      required:
+      - username
+      title: UserBase
+      type: object
     ValidationError:
       properties:
         loc:
@@ -654,7 +663,8 @@ paths:
         '200':
           content:
             application/json:
-              schema: {}
+              schema:
+                $ref: '#/components/schemas/Document'
           description: Successful Response
         '422':
           content:
@@ -1282,7 +1292,8 @@ paths:
         '200':
           content:
             application/json:
-              schema: {}
+              schema:
+                $ref: '#/components/schemas/UserBase'
           description: Successful Response
         '422':
           content:
@@ -1373,7 +1384,8 @@ paths:
         '200':
           content:
             application/json:
-              schema: {}
+              schema:
+                $ref: '#/components/schemas/UserBase'
           description: Successful Response
         '422':
           content:

backend/transcribee_backend/routers/document.py

@@ -363,7 +363,7 @@ def import_document(
     token: UserToken = Depends(get_user_token),
     session: Session = Depends(get_session),
     name: str = Form(),
-):
+) -> ApiDocument:
     document = Document(
         name=name,
         user_id=token.user_id,

backend/transcribee_backend/routers/user.py

@@ -49,7 +49,7 @@ def login(user: CreateUser, session: Session = Depends(get_session)) -> LoginRes
 @user_router.post("/logout/")
 def logout(
     token: UserToken = Depends(get_user_token), session: Session = Depends(get_session)
-):
+) -> None:
     session.delete(token)
     session.commit()
 
@@ -58,18 +58,18 @@ def logout(
 def read_user(
     token: UserToken = Depends(get_user_token),
     session: Session = Depends(get_session),
-):
+) -> UserBase:
     statement = select(User).where(User.id == token.user_id)
     user = session.exec(statement).one()
-    return {"username": user.username}
+    return UserBase(username=user.username)
 
 
 @user_router.post("/change_password/")
 def change_password(
     body: ChangePasswordRequest,
     session: Session = Depends(get_session),
     token: UserToken = Depends(get_user_token),
-):
+) -> UserBase:
     try:
         authorized_user = authorize_user(
             session=session, username=token.user.username, password=body.old_password
@@ -84,4 +84,4 @@ def change_password(
     )
     session.execute(delete(UserToken).where(UserToken.user_id == authorized_user.id))
     session.commit()
-    return {"username": user.username}
+    return UserBase(username=user.username)

frontend/src/api.ts

@@ -1,6 +1,6 @@
 import { paths } from './openapi-schema';
 import { ApiResponse, Fetcher, Middleware } from 'openapi-typescript-fetch';
-import useSwr, { SWRConfiguration } from 'swr';
+import useSwr, { SWRConfiguration, SWRResponse } from 'swr';
 import { defaultConfig } from 'swr/_internal';
 
 export function getShareToken(): string | null {
@@ -70,3 +70,8 @@ export function makeRetrySwrHook<P, R>(
       ...options,
     });
 }
+
+export type RequestDataType<T extends (...args: never) => SWRResponse> = Exclude<
+  ReturnType<T>['data'],
+  undefined
+>;

frontend/src/app.tsx

@@ -57,7 +57,7 @@ export function LoggedInRedirectRoute<T extends DefaultParams = DefaultParams>({
   if (isLoading) {
     return <Route component={LoadingPage} />;
   }
-  if (!isLoggedIn && !configLoading) {
+  if (!isLoggedIn && !configLoading && config !== undefined) {
     if (config.logged_out_redirect_url) {
       window.location.replace(config.logged_out_redirect_url);
     } else {

frontend/src/editor/share.tsx

@@ -9,8 +9,9 @@ import { HiOutlineClipboardCopy } from 'react-icons/hi';
 import clsx from 'clsx';
 import { DialogSeparator } from '../components/dialog';
 import { Tooltip } from '../components/tooltip';
+import { RequestDataType } from '../api';
 
-type ShareToken = ReturnType<typeof useListShareTokens>['data'][0];
+type ShareToken = RequestDataType<typeof useListShareTokens>[0];
 
 function pad(number: number) {
   if (number < 10) {
@@ -235,7 +236,7 @@ export function ShareModal({
         </section>
         <section className="w-full pt-4 border-t-2 sm:border-t-0 sm:border-l-2 sm:pb-6 sm:pl-6 sm:w-1/2 sm:-mb-6">
           <ShareTokenTable
-            shareTokens={shareTokens}
+            shareTokens={shareTokens !== undefined ? shareTokens : []}
             mutateShareTokens={mutateShareTokens}
             documentId={documentId}
           />

frontend/src/editor/worker_status.tsx

@@ -5,8 +5,9 @@ import { BsRobot } from 'react-icons/bs';
 import clsx from 'clsx';
 import React from 'react';
 import { useMediaQuery } from '../utils/use_media_query';
+import { RequestDataType } from '../api';
 
-type Task = ReturnType<typeof useGetDocumentTasks>['data'][0];
+type Task = RequestDataType<typeof useGetDocumentTasks>[0];
 
 function formatProgress(task: Task | null): string | undefined {
   if (!task) return;
@@ -45,7 +46,7 @@ export function getWorkerStatusString(isWorking: boolean, isFailed: boolean): st
 export function WorkerStatus({ documentId }: { documentId: string }) {
   const { data } = useGetDocumentTasks({ document_id: documentId }, { refreshInterval: 1 });
 
-  return <WorkerStatusWithData data={data} />;
+  return <WorkerStatusWithData data={data !== undefined ? data : []} />;
 }
 
 function isSuperset<T>(set: Set<T>, subset: Set<T>) {