Add hasRawFallback to upload progress flow

Author: richiemcilroy

apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx

@@ -213,8 +213,12 @@ export const CapCard = ({
 		cap.id,
 		cap.hasActiveUpload || false,
 	);
+	const hasRawFallback =
+		uploadProgress?.status === "error" && uploadProgress.hasRawFallback;
 	const hasVisibleUploadProgress =
-		uploadProgress !== null && uploadProgress.status !== "fetching";
+		uploadProgress !== null &&
+		uploadProgress.status !== "fetching" &&
+		!hasRawFallback;
 	const [imageStatus, setImageStatus] = useState<ImageLoadingStatus>("loading");
 	const prevUploadProgressRef = useRef(uploadProgress);
 

apps/web/app/s/[videoId]/_components/ProgressCircle.tsx

@@ -27,6 +27,7 @@ type UploadProgress =
 			status: "error";
 			lastUpdated: Date;
 			errorMessage: string | null;
+			hasRawFallback: boolean;
 	  }
 	| {
 			status: "failed";
@@ -157,6 +158,7 @@ export function useUploadProgress(
 			status: "error",
 			lastUpdated,
 			errorMessage: Option.getOrNull(query.data.processingError),
+			hasRawFallback: query.data.hasRawFallback,
 		};
 	}
 
@@ -165,6 +167,7 @@ export function useUploadProgress(
 			status: "error",
 			lastUpdated,
 			errorMessage: stalledProcessingMessage,
+			hasRawFallback: query.data.hasRawFallback,
 		};
 	}
 

packages/web-backend/src/Videos/index.ts

@@ -290,6 +290,7 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 								processingProgress: Db.videoUploads.processingProgress,
 								processingMessage: Db.videoUploads.processingMessage,
 								processingError: Db.videoUploads.processingError,
+								rawFileKey: Db.videoUploads.rawFileKey,
 							})
 							.from(Db.videoUploads)
 							.where(Dz.eq(Db.videoUploads.videoId, videoId)),
@@ -307,6 +308,7 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 						processingProgress: result.processingProgress,
 						processingMessage: Option.fromNullable(result.processingMessage),
 						processingError: Option.fromNullable(result.processingError),
+						hasRawFallback: result.rawFileKey != null,
 					}),
 				);
 			}),

packages/web-domain/src/Video.ts

@@ -78,6 +78,7 @@ export class UploadProgress extends Schema.Class<UploadProgress>(
 	processingProgress: Schema.Int.pipe(Schema.greaterThanOrEqualTo(0)),
 	processingMessage: Schema.OptionFromNullOr(Schema.String),
 	processingError: Schema.OptionFromNullOr(Schema.String),
+	hasRawFallback: Schema.Boolean,
 }) {}
 
 export const UploadProgressUpdateInput = Schema.Struct({