Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
refactor(web): deblockify image, video, and unknown blocks (#6497)
dev-rb7f17812e3b0f
diff --git a/apps/web/src/features/block-image/component/Block.tsx b/apps/web/src/features/block-image/component/Block.tsxindex 9b573d009f..926a90b48c 100644--- a/apps/web/src/features/block-image/component/Block.tsx+++ b/apps/web/src/features/block-image/component/Block.tsx@@ -2,10 +2,10 @@ import { useBlockEntityCommands } from '@app/features/next-soup/actions';import { FileSidePanelSections, SidePanel } from '@components/app/side-panel';import { useBlockId } from '@core/block';import { DocumentBlockContainer } from '@core/component/DocumentBlockContainer';-import { blockAcceptedFileExtensionToMimeType } from '@core/constant/allBlocks';import { blockFileSignal, blockMetadataSignal } from '@core/signal/load';import { setCopiedItem } from '@core/state/clipboard';-import { createEffect, createSignal, onCleanup, onMount, Show } from 'solid-js';+import { onCleanup, onMount, Show } from 'solid-js';+import { ImageContent } from './ImageContent';import { ModalsProvider } from './ModalsProvider';import { TopBar } from './TopBar';@@ -13,36 +13,6 @@ export default function BlockImage() {useBlockEntityCommands();const documentId = useBlockId();- const [imageUrl, setImageUrl] = createSignal<string>();-- const [fileArrayBuffer, setFileArrayBuffer] = createSignal<ArrayBuffer>();- createEffect(() => {- const file = blockFileSignal();- if (!file) return;-- file.arrayBuffer().then(setFileArrayBuffer);- });-- createEffect(() => {- try {- const ext = blockMetadataSignal()?.fileType;- if (ext == null) return;- const mime = blockAcceptedFileExtensionToMimeType[ext];-- const arrayBuffer = fileArrayBuffer();- if (!arrayBuffer) return;- const blob = new Blob([arrayBuffer], { type: mime });- const url = URL.createObjectURL(blob);- setImageUrl(url);-- onCleanup(() => {- URL.revokeObjectURL(url);- });- } catch (error) {- console.error('Error converting array buffer:', error);- }- });-onMount(() => {const copyBlockHandler = (e: KeyboardEvent) => {if (e.key === 'c' && e.metaKey) {@@ -67,20 +37,19 @@ export default function BlockImage() {<div class="flex size-full min-w-0 flex-col overflow-hidden"><TopBar /><Show- when={imageUrl()}+ when={blockFileSignal()}fallback={- <div class="size-full flex items-center justify-center">+ <div class="flex size-full items-center justify-center">{/* Loading state handled by DocumentBlockContainer */}</div>}>- <div class="size-full flex items-center justify-center">- <img- src={imageUrl()}+ {(file) => (+ <ImageContent+ file={file()}alt={blockMetadataSignal()?.documentName || 'Image'}- class="max-w-full max-h-full object-contain"/>- </div>+ )}</Show></div></SidePanel.Layout>diff --git a/apps/web/src/features/block-image/component/ImageContent.tsx b/apps/web/src/features/block-image/component/ImageContent.tsxnew file mode 100644index 0000000000..f9262ab045--- /dev/null+++ b/apps/web/src/features/block-image/component/ImageContent.tsx@@ -0,0 +1,33 @@+import { createEffect, createSignal, on, onCleanup, Show } from 'solid-js';++export function ImageContent(props: { file: Blob; alt: string }) {+ const [imageUrl, setImageUrl] = createSignal<string>();++ createEffect(+ on(+ () => props.file,+ (file) => {+ const url = URL.createObjectURL(file);+ setImageUrl(url);+ onCleanup(() => URL.revokeObjectURL(url));+ }+ )+ );++ return (+ <Show+ when={imageUrl()}+ fallback={<div class="size-full" aria-label="Loading image" />}+ >+ {(url) => (+ <div class="flex size-full items-center justify-center">+ <img+ src={url()}+ alt={props.alt}+ class="max-h-full max-w-full object-contain"+ />+ </div>+ )}+ </Show>+ );+}diff --git a/apps/web/src/features/block-unknown/component/Block.tsx b/apps/web/src/features/block-unknown/component/Block.tsxindex 73c6bedbaa..b04933f026 100644--- a/apps/web/src/features/block-unknown/component/Block.tsx+++ b/apps/web/src/features/block-unknown/component/Block.tsx@@ -7,37 +7,25 @@ import {useBlockDocumentName,} from '@core/util/currentBlockDocumentName';import { downloadFile } from '@filesystem/download';-import ShareFat from '@icon/wide-share.svg';-import DownloadSimple from '@phosphor/download-simple.svg';import { createCallback } from '@solid-primitives/rootless';-import { Button } from '@ui';import { useGetFileBlob } from '../signal/blockData';import { ModalsProvider } from './ModalsProvider';import { TopBar } from './TopBar';+import { UnknownContent } from './UnknownContent';export default function BlockUnknown() {return (<DocumentBlockContainer><div class="size-full select-none overscroll-none overflow-hidden flex flex-col relative"><ModalsProvider>- <SidePanel.Layout>- <FileSidePanelSections />- <div class="flex size-full min-w-0 flex-col overflow-hidden">- <div class="relative">- <TopBar />- </div>- <div class="w-full grow relative overflow-hidden">- <Unknown />- </div>- </div>- </SidePanel.Layout>+ <BlockUnknownContent /></ModalsProvider></div></DocumentBlockContainer>);}-const Unknown = () => {+function BlockUnknownContent() {const fileName = useBlockDocumentName();const downloadName = useBlockDocumentDownloadName();const shareCtx = useShareDialogContext();@@ -47,30 +35,27 @@ const Unknown = () => {try {const blob = await getBlob();downloadFile(blob, downloadName());- } catch (e) {- console.error('error downloading file', e);+ } catch (error) {+ console.error('error downloading file', error);toast.failure('Error downloading file');}});return (- <div class="h-full flex flex-col justify-center items-center">- <div class="w-fit mx-4 p-4 flex flex-col justify-center items-center gap-4">- <div class="text-lg text-center">- No preview available for{' '}- <span class="text-ink-muted">{fileName()}</span>+ <SidePanel.Layout>+ <FileSidePanelSections />+ <div class="flex size-full min-w-0 flex-col overflow-hidden">+ <div class="relative">+ <TopBar /></div>-- <div class="flex flex-row gap-2 items-center">- <Button variant="accent" onClick={shareCtx.open}>- <ShareFat class="size-4" /> Share- </Button>-- <Button variant="accent" onClick={downloadDocument}>- <DownloadSimple class="size-4" /> Download- </Button>+ <div class="w-full grow relative overflow-hidden">+ <UnknownContent+ fileName={fileName()}+ onShare={shareCtx.open}+ onDownload={() => void downloadDocument()}+ /></div></div>- </div>+ </SidePanel.Layout>);-};+}diff --git a/apps/web/src/features/block-unknown/component/UnknownContent.tsx b/apps/web/src/features/block-unknown/component/UnknownContent.tsxnew file mode 100644index 0000000000..d63e563a2b--- /dev/null+++ b/apps/web/src/features/block-unknown/component/UnknownContent.tsx@@ -0,0 +1,30 @@+import ShareFat from '@icon/wide-share.svg';+import DownloadSimple from '@phosphor/download-simple.svg';+import { Button } from '@ui';++export function UnknownContent(props: {+ fileName: string;+ onShare: () => void;+ onDownload: () => void;+}) {+ return (+ <div class="flex h-full flex-col items-center justify-center">+ <div class="mx-4 flex w-fit flex-col items-center justify-center gap-4 p-4">+ <div class="text-center text-lg">+ No preview available for{' '}+ <span class="text-ink-muted">{props.fileName}</span>+ </div>++ <div class="flex flex-row items-center gap-2">+ <Button variant="accent" onClick={props.onShare}>+ <ShareFat class="size-4" /> Share+ </Button>++ <Button variant="accent" onClick={props.onDownload}>+ <DownloadSimple class="size-4" /> Download+ </Button>+ </div>+ </div>+ </div>+ );+}diff --git a/apps/web/src/features/block-video/component/Block.tsx b/apps/web/src/features/block-video/component/Block.tsxindex 1aa264d43a..d5eacf915b 100644--- a/apps/web/src/features/block-video/component/Block.tsx+++ b/apps/web/src/features/block-video/component/Block.tsx@@ -1,11 +1,10 @@import { useBlockEntityCommands } from '@app/features/next-soup/actions';import { FileSidePanelSections, SidePanel } from '@components/app/side-panel';import { DocumentBlockContainer } from '@core/component/DocumentBlockContainer';-import { toast } from '@core/component/Toast/Toast';-import { createEffect, createSignal, Show } from 'solid-js';import { blockData } from '../signal/blockData';import { ModalsProvider } from './ModalsProvider';import { TopBar } from './TopBar';+import { VideoContent } from './VideoContent';export default function BlockVideo() {useBlockEntityCommands();@@ -20,7 +19,10 @@ export default function BlockVideo() {<TopBar /></div><div class="w-full grow relative overflow-hidden">- <Video />+ <VideoContent+ videoUrl={blockData()?.videoUrl}+ fileType={blockData()?.documentMetadata.fileType}+ /></div></div></SidePanel.Layout>@@ -29,32 +31,3 @@ export default function BlockVideo() {</DocumentBlockContainer>);}--const Video = () => {- const videoUrl = () => blockData()?.videoUrl;- const [playbackError, setPlaybackError] = createSignal<string>();-- createEffect(() => {- const err = playbackError();- if (err) {- toast.failure(err);- }- });-- return (- <div class="size-full flex flex-col items-center justify-center gap-3 text-ink">- <Show when={videoUrl()}>- <video- class="size-full"- controls- autoplay- src={videoUrl()}- onError={(e) => {- console.error('video error', e);- setPlaybackError('Video playback failed');- }}- />- </Show>- </div>- );-};diff --git a/apps/web/src/features/block-video/component/VideoContent.tsx b/apps/web/src/features/block-video/component/VideoContent.tsxnew file mode 100644index 0000000000..d880197bed--- /dev/null+++ b/apps/web/src/features/block-video/component/VideoContent.tsx@@ -0,0 +1,44 @@+import { toast } from '@core/component/Toast/Toast';+import type { DocumentMetadataFileType } from '@service-storage/generated/schemas/documentMetadataFileType';+import { createEffect, on, Show } from 'solid-js';++export function VideoContent(props: {+ videoUrl?: string;+ fileType?: DocumentMetadataFileType;+ notifyUnsupported?: boolean;+}) {+ createEffect(+ on(+ () => ({+ fileType: props.fileType,+ notify: props.notifyUnsupported,+ url: props.videoUrl,+ }),+ ({ fileType, notify, url }) => {+ if (!notify || url) return;+ toast.failure('Video playback is not supported for this file type', {+ subtext: `File type: ${fileType}`,+ });+ }+ )+ );++ return (+ <div class="flex size-full flex-col items-center justify-center gap-3 text-ink">+ <Show when={props.videoUrl}>+ {(videoUrl) => (+ <video+ class="size-full"+ controls+ autoplay+ src={videoUrl()}+ onError={(event) => {+ console.error('video error', event);+ toast.failure('Video playback failed');+ }}+ />+ )}+ </Show>+ </div>+ );+}diff --git a/apps/web/src/features/block-video/core/video.ts b/apps/web/src/features/block-video/core/video.tsnew file mode 100644index 0000000000..5c91815e6f--- /dev/null+++ b/apps/web/src/features/block-video/core/video.ts@@ -0,0 +1,47 @@+import type { MimeType } from '@core/block';+import { ENABLE_VIDEO_BLOCK } from '@core/constant/featureFlags';+import type { DocumentMetadataFileType } from '@service-storage/generated/schemas/documentMetadataFileType';++const SUPPORTED_VIDEO_MIMES = {+ mp4: 'video/mp4',+ mkv: 'video/x-matroska',+ webm: 'video/webm',+ avi: 'video/x-msvideo',+ mov: 'video/quicktime',+ wmv: 'video/x-ms-wmv',+ mpg: 'video/mpeg',+ mpeg: 'video/mpeg',+ m4v: 'video/mp4',+ flv: 'video/x-flv',+ f4v: 'video/mp4',+ threegp: 'video/3gpp',+} as const satisfies Record<string, MimeType>;++type SupportedVideoFileType = keyof typeof SUPPORTED_VIDEO_MIMES;++export const VIDEO_MIMES = ENABLE_VIDEO_BLOCK ? SUPPORTED_VIDEO_MIMES : {};++export const PLAYBACK_ENABLED_MIMES = {+ mp4: true,+ mkv: true,+ webm: true,+ avi: true,+ mov: true,+ wmv: true,+ mpg: true,+ mpeg: true,+ m4v: true,+ flv: true,+ f4v: true,+ threegp: true,+} as const satisfies Record<SupportedVideoFileType, boolean>;++export function isVideoPlaybackEnabled(+ fileType: DocumentMetadataFileType | undefined+): fileType is SupportedVideoFileType {+ return (+ fileType != null &&+ fileType in PLAYBACK_ENABLED_MIMES &&+ PLAYBACK_ENABLED_MIMES[fileType as SupportedVideoFileType]+ );+}diff --git a/apps/web/src/features/block-video/definition.ts b/apps/web/src/features/block-video/definition.tsindex 6238d9ff61..7edafbb25d 100644--- a/apps/web/src/features/block-video/definition.ts+++ b/apps/web/src/features/block-video/definition.ts@@ -3,51 +3,19 @@ import {type ExtractLoadType,LoadErrors,loadResult,- type MimeType,} from '@core/block';import { toast } from '@core/component/Toast/Toast';-import { ENABLE_VIDEO_BLOCK } from '@core/constant/featureFlags';import { storageServiceClient } from '@service-storage/client';-import type { DocumentMetadataFileType } from '@service-storage/generated/schemas/documentMetadataFileType';import { getPresignedUrl } from '@service-storage/util/presignedUrl';import { err, ok } from 'neverthrow';import BlockVideo from './component/Block';+import {+ isVideoPlaybackEnabled,+ PLAYBACK_ENABLED_MIMES,+ VIDEO_MIMES,+} from './core/video';-export const VIDEO_MIMES: Record<- NonNullable<DocumentMetadataFileType>,- MimeType-> = ENABLE_VIDEO_BLOCK- ? {- mp4: 'video/mp4',- mkv: 'video/x-matroska',- webm: 'video/webm',- avi: 'video/x-msvideo',- mov: 'video/quicktime',- wmv: 'video/x-ms-wmv',- mpg: 'video/mpeg',- mpeg: 'video/mpeg',- m4v: 'video/mp4',- flv: 'video/x-flv',- f4v: 'video/mp4',- threegp: 'video/3gpp',- }- : {};--export const PLAYBACK_ENABLED_MIMES: Record<keyof typeof VIDEO_MIMES, boolean> =- {- mp4: true,- mkv: true,- webm: true,- avi: true,- mov: true,- wmv: true,- mpg: true,- mpeg: true,- m4v: true,- flv: true,- f4v: true,- threegp: true,- };+export { PLAYBACK_ENABLED_MIMES, VIDEO_MIMES };export const definition = defineBlock({name: 'video',@@ -71,16 +39,11 @@ export const definition = defineBlock({if (maybeDocument.isErr()) return err(maybeDocument.error);const documentResult = maybeDocument.value;-const { documentMetadata, userAccessLevel } = documentResult;const fileType = documentMetadata.fileType;let videoUrl: string | undefined;- if (- fileType &&- Object.keys(PLAYBACK_ENABLED_MIMES).includes(fileType) &&- PLAYBACK_ENABLED_MIMES[fileType]- ) {+ if (isVideoPlaybackEnabled(fileType)) {videoUrl = await getPresignedUrl({documentId: documentMetadata.documentId,versionId: documentMetadata.documentVersionId,