wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-23 08:48:01 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into staging

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-12-08 11:31:27 +07:00
commit 5ad1d5b927
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/document-resources/src/components/DocumentIcon.svelte
View File

@ -20,7 +20,7 @@
import { ComponentType } from 'svelte' import { ComponentType } from 'svelte'
export let value: IconProps export let value: IconProps | undefined
export let size: IconSize export let size: IconSize
export let iconWithEmoji: AnySvelteComponent | Asset | ComponentType | undefined = view.ids.IconWithEmoji export let iconWithEmoji: AnySvelteComponent | Asset | ComponentType | undefined = view.ids.IconWithEmoji
export let defaultIcon: AnySvelteComponent | Asset | ComponentType = document.icon.Document export let defaultIcon: AnySvelteComponent | Asset | ComponentType = document.icon.Document
@ -28,10 +28,10 @@
<Icon <Icon
{size} {size}
icon={value.icon === iconWithEmoji && iconWithEmoji ? IconWithEmoji : value.icon ?? defaultIcon} icon={value?.icon === iconWithEmoji && iconWithEmoji ? IconWithEmoji : value?.icon ?? defaultIcon}
iconProps={value.icon === iconWithEmoji && iconWithEmoji iconProps={value?.icon === iconWithEmoji && iconWithEmoji
? { icon: value.color } ? { 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'
}} }}
/> />

8
plugins/drive-resources/src/components/EditFile.svelte
View File

@ -42,7 +42,13 @@
</script> </script>
{#if object !== undefined && version !== undefined && blob !== undefined && contentType !== undefined} {#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} {#if object.versions > 1}
<div class="w-full mt-6"> <div class="w-full mt-6">

3
server/collaboration/src/storage.ts
View File

@ -45,8 +45,7 @@ export async function loadCollabYdoc (
} }
if (!blob.contentType.includes('application/ydoc')) { if (!blob.contentType.includes('application/ydoc')) {
ctx.error('invalid content type', { contentType: blob.contentType }) ctx.warn('invalid content type', { contentType: blob.contentType })
return undefined
} }
// no need to apply gc because we load existing document // no need to apply gc because we load existing document