From c100f427f3bef250ad63f6968a92ae5578a23159 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com>
Date: Sun, 8 Dec 2024 01:10:18 +0530
Subject: [PATCH 1/3] style(drive): fix pdf appears small  (#7291)

Signed-off-by: Dakshesh Jain <dakshesh.jain14@gmail.com>
---
 plugins/drive-resources/src/components/EditFile.svelte | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/drive-resources/src/components/EditFile.svelte b/plugins/drive-resources/src/components/EditFile.svelte
index 3b28a85685..39c362fa97 100644
--- a/plugins/drive-resources/src/components/EditFile.svelte
+++ b/plugins/drive-resources/src/components/EditFile.svelte
@@ -42,7 +42,13 @@
 </script>
 
 {#if object !== undefined && version !== undefined && blob !== undefined && contentType !== undefined}
-  <FilePreview file={blob} {contentType} name={version.title} metadata={version.metadata} fit />
+  <FilePreview
+    file={blob}
+    {contentType}
+    name={version.title}
+    metadata={version.metadata}
+    fit={contentType !== 'application/pdf'}
+  />
 
   {#if object.versions > 1}
     <div class="w-full mt-6">

From 6b3ec81f635816b8e74f0a74550cd7749fb8db44 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com>
Date: Sun, 8 Dec 2024 01:10:59 +0530
Subject: [PATCH 2/3] fix: fallback to defaultIcon when value is undefined
 (#7294)

Signed-off-by: Dakshesh Jain <dakshesh.jain14@gmail.com>
---
 .../src/components/DocumentIcon.svelte                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/document-resources/src/components/DocumentIcon.svelte b/plugins/document-resources/src/components/DocumentIcon.svelte
index 2d49ce9c84..1683cb80ed 100644
--- a/plugins/document-resources/src/components/DocumentIcon.svelte
+++ b/plugins/document-resources/src/components/DocumentIcon.svelte
@@ -20,7 +20,7 @@
 
   import { ComponentType } from 'svelte'
 
-  export let value: IconProps
+  export let value: IconProps | undefined
   export let size: IconSize
   export let iconWithEmoji: AnySvelteComponent | Asset | ComponentType | undefined = view.ids.IconWithEmoji
   export let defaultIcon: AnySvelteComponent | Asset | ComponentType = document.icon.Document
@@ -28,10 +28,10 @@
 
 <Icon
   {size}
-  icon={value.icon === iconWithEmoji && iconWithEmoji ? IconWithEmoji : value.icon ?? defaultIcon}
-  iconProps={value.icon === iconWithEmoji && iconWithEmoji
-    ? { icon: value.color }
+  icon={value?.icon === iconWithEmoji && iconWithEmoji ? IconWithEmoji : value?.icon ?? defaultIcon}
+  iconProps={value?.icon === iconWithEmoji && iconWithEmoji
+    ? { icon: value?.color }
     : {
-        fill: value.color !== undefined ? getPlatformColorDef(value.color, $themeStore.dark).icon : 'currentColor'
+        fill: value?.color !== undefined ? getPlatformColorDef(value?.color, $themeStore.dark).icon : 'currentColor'
       }}
 />

From 737279854643c782e5a0a1ae056b9cb34e66a558 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Sun, 8 Dec 2024 11:30:03 +0700
Subject: [PATCH 3/3] fix: do not fail on wrong content type in collaborator
 (#7296)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 server/collaboration/src/storage.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/collaboration/src/storage.ts b/server/collaboration/src/storage.ts
index 2d195ef3c8..d723227ae0 100644
--- a/server/collaboration/src/storage.ts
+++ b/server/collaboration/src/storage.ts
@@ -45,8 +45,7 @@ export async function loadCollabYdoc (
   }
 
   if (!blob.contentType.includes('application/ydoc')) {
-    ctx.error('invalid content type', { contentType: blob.contentType })
-    return undefined
+    ctx.warn('invalid content type', { contentType: blob.contentType })
   }
 
   // no need to apply gc because we load existing document