mirror of
https://github.com/Sea-Haven-Industries/shoc-frontend-new.git
synced 2026-09-30 17:23:12 +00:00
Three conflicts, all where dev refactored code this branch had instrumented: - api.ts — dev extracted the session-expiry helper into lib/auth/expire-session. Took dev's import, dropped the now-duplicate local copy, kept the tracing import. - work-order-board-documents-api.ts — dev replaced the ky upload with uploadFormWithProgress, an XHR path that exists because ky's onUploadProgress streams the body and browsers refuse that over HTTP/1.1. Kept dev's helper and wrapped it in traceHttpOperation so the upload stays instrumented; neither change is lost. - work-orders-api.test.ts — kept both mock surfaces, since the merged work-orders-api calls apiRequestRaw while other code uses the ky instance. getMediaContent arrived from dev calling `api.get` directly, which this file no longer imports; routed it through apiRequestRaw like its siblings, which also brings it under tracing. |
||
|---|---|---|
| .. | ||
| api | ||
| app | ||
| components | ||
| config | ||
| domain | ||
| lib | ||
| observability | ||
| setup.ts | ||
| test-utils.tsx | ||