Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

feat: refetch errored/pending images on collab room init load (#5833)

David Luzar938ce241ffec
diff --git a/src/excalidraw-app/collab/Collab.tsx b/src/excalidraw-app/collab/Collab.tsx
index 0aa185ffa8..58f3a89050 100644
--- a/src/excalidraw-app/collab/Collab.tsx
+++ b/src/excalidraw-app/collab/Collab.tsx
@@ -310,16 +310,27 @@ class Collab extends PureComponent<Props, CollabState> {
}
};
- private fetchImageFilesFromFirebase = async (scene: {
+ private fetchImageFilesFromFirebase = async (opts: {
elements: readonly ExcalidrawElement[];
+ /**
+ * Indicates whether to fetch files that are errored or pending and older
+ * than 10 seconds.
+ *
+ * Use this as a machanism to fetch files which may be ok but for some
+ * reason their status was not updated correctly.
+ */
+ forceFetchFiles?: boolean;
}) => {
- const unfetchedImages = scene.elements
+ const unfetchedImages = opts.elements
.filter((element) => {
return (
isInitializedImageElement(element) &&
!this.fileManager.isFileHandled(element.fileId) &&
!element.isDeleted &&
- element.status === "saved"
+ (opts.forceFetchFiles
+ ? element.status !== "pending" ||
+ Date.now() - element.updated > 10000
+ : element.status === "saved")
);
})
.map((element) => (element as InitializedExcalidrawImageElement).fileId);
diff --git a/src/excalidraw-app/index.tsx b/src/excalidraw-app/index.tsx
index 3f78e26b82..8cffe69ac4 100644
--- a/src/excalidraw-app/index.tsx
+++ b/src/excalidraw-app/index.tsx
@@ -285,6 +285,7 @@ const ExcalidrawWrapper = () => {
collabAPI
.fetchImageFilesFromFirebase({
elements: data.scene.elements,
+ forceFetchFiles: true,
})
.then(({ loadedFiles, erroredFiles }) => {
excalidrawAPI.addFiles(loadedFiles);