Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Implement last opened at interaction
Hakan Shehu65f33465f3c3
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.tsindex 11fbb61f..0e4736d7 100644--- a/apps/desktop/src/main/data/workspace/migrations.ts+++ b/apps/desktop/src/main/data/workspace/migrations.ts@@ -125,6 +125,11 @@ const createInteractionsTable: Migration = {.generatedAlwaysAs(sql`json_extract(attributes, '$.lastSeenAt')`).stored())+ .addColumn('last_opened_at', 'text', (col) =>+ col+ .generatedAlwaysAs(sql`json_extract(attributes, '$.lastOpenedAt')`)+ .stored()+ ).addColumn('created_at', 'text', (col) => col.notNull()).addColumn('updated_at', 'text').addColumn('server_created_at', 'text')diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.tsindex f9de76af..6630300f 100644--- a/apps/desktop/src/main/data/workspace/schema.ts+++ b/apps/desktop/src/main/data/workspace/schema.ts@@ -92,6 +92,7 @@ interface InteractionTable {node_type: ColumnType<NodeType, NodeType, never>;attributes: ColumnType<string, string, string>;last_seen_at: ColumnType<string | null, string | null, string | null>;+ last_opened_at: ColumnType<string | null, string | null, string | null>;created_at: ColumnType<string, string, never>;updated_at: ColumnType<string | null, string | null, string | null>;server_created_at: ColumnType<string | null, string | null, string | null>;diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.tsindex a53dd62f..f5ea05cb 100644--- a/apps/desktop/src/main/mutations/index.ts+++ b/apps/desktop/src/main/mutations/index.ts@@ -22,6 +22,7 @@ import { FolderCreateMutationHandler } from '@/main/mutations/folders/folder-creimport { FolderUpdateMutationHandler } from '@/main/mutations/folders/folder-update';import { FolderDeleteMutationHandler } from '@/main/mutations/folders/folder-delete';import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/interactions/mark-node-as-seen';+import { MarkNodeAsOpenedMutationHandler } from '@/main/mutations/interactions/mark-node-as-opened';import { MessageCreateMutationHandler } from '@/main/mutations/messages/message-create';import { MessageDeleteMutationHandler } from '@/main/mutations/messages/message-delete';import { NodeCollaboratorCreateMutationHandler } from '@/main/mutations/collaborators/node-collaborator-create';@@ -109,6 +110,7 @@ export const mutationHandlerMap: MutationHandlerMap = {space_update: new SpaceUpdateMutationHandler(),account_update: new AccountUpdateMutationHandler(),mark_node_as_seen: new MarkNodeAsSeenMutationHandler(),+ mark_node_as_opened: new MarkNodeAsOpenedMutationHandler(),view_update: new ViewUpdateMutationHandler(),view_delete: new ViewDeleteMutationHandler(),view_name_update: new ViewNameUpdateMutationHandler(),diff --git a/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.ts b/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.tsnew file mode 100644index 00000000..8041a8ea--- /dev/null+++ b/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.ts@@ -0,0 +1,46 @@+import { interactionService } from '@/main/services/interaction-service';+import { MutationHandler } from '@/main/types';+import {+ MarkNodeAsOpenedMutationInput,+ MarkNodeAsOpenedMutationOutput,+} from '@/shared/mutations/interactions/mark-node-as-opened';++export class MarkNodeAsOpenedMutationHandler+ implements MutationHandler<MarkNodeAsOpenedMutationInput>+{+ async handleMutation(+ input: MarkNodeAsOpenedMutationInput+ ): Promise<MarkNodeAsOpenedMutationOutput> {+ await interactionService.setInteraction(+ input.userId,+ input.nodeId,+ input.nodeType,+ [+ {+ attribute: 'firstSeenAt',+ value: new Date().toISOString(),+ },+ {+ attribute: 'lastSeenAt',+ value: new Date().toISOString(),+ },+ {+ attribute: 'lastSeenTransactionId',+ value: input.transactionId,+ },+ {+ attribute: 'lastOpenedAt',+ value: new Date().toISOString(),+ },+ {+ attribute: 'lastOpenedTransactionId',+ value: input.transactionId,+ },+ ]+ );++ return {+ success: true,+ };+ }+}diff --git a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts b/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.tsindex 27df697d..251c62fe 100644--- a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts+++ b/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts@@ -14,17 +14,21 @@ export class MarkNodeAsSeenMutationHandlerawait interactionService.setInteraction(input.userId,input.nodeId,- 'message',- 'lastSeenAt',- new Date().toISOString()- );-- await interactionService.setInteraction(- input.userId,- input.nodeId,- 'message',- 'firstSeenAt',- new Date().toISOString()+ input.nodeType,+ [+ {+ attribute: 'lastSeenAt',+ value: new Date().toISOString(),+ },+ {+ attribute: 'firstSeenAt',+ value: new Date().toISOString(),+ },+ {+ attribute: 'lastSeenTransactionId',+ value: input.transactionId,+ },+ ]);return {diff --git a/apps/desktop/src/main/services/interaction-service.ts b/apps/desktop/src/main/services/interaction-service.tsindex 38b7f3c2..98021608 100644--- a/apps/desktop/src/main/services/interaction-service.ts+++ b/apps/desktop/src/main/services/interaction-service.ts@@ -7,9 +7,13 @@ import {NodeType,ServerInteraction,} from '@colanode/core';+import { sql } from 'kysely';import { databaseService } from '@/main/data/database-service';-import { SelectInteractionEvent } from '@/main/data/workspace/schema';+import {+ CreateInteractionEvent,+ SelectInteractionEvent,+} from '@/main/data/workspace/schema';import { mapInteraction } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';@@ -20,21 +24,24 @@ type ServerAttributesMergeResult = {toDeleteEventIds: string[];};+export type UpdateInteractionInput = {+ attribute: InteractionAttribute;+ value: string;+};+class InteractionService {public async setInteraction(userId: string,nodeId: string,nodeType: NodeType,- attribute: InteractionAttribute,- value: string+ input: UpdateInteractionInput | UpdateInteractionInput[]) {for (let i = 0; i < UPDATE_RETRIES_COUNT; i++) {const updated = await this.tryUpdateInteraction(userId,nodeId,nodeType,- attribute,- value+ input);if (updated) {@@ -49,8 +56,7 @@ class InteractionService {userId: string,nodeId: string,nodeType: NodeType,- attribute: InteractionAttribute,- value: string+ input: UpdateInteractionInput | UpdateInteractionInput[]): Promise<boolean> {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);@@ -65,11 +71,37 @@ class InteractionService {? JSON.parse(interaction.attributes): null;- const attributes = mergeInteractionAttributes(- existingAttributes,- attribute,- value- );+ const eventsToCreate: CreateInteractionEvent[] = [];+ let attributes: InteractionAttributes | null = {+ ...existingAttributes,+ };++ const inputs = Array.isArray(input) ? input : [input];++ for (const input of inputs) {+ const merged = mergeInteractionAttributes(+ attributes,+ input.attribute,+ input.value+ );++ if (merged) {+ attributes = merged;++ eventsToCreate.push({+ node_id: nodeId,+ node_type: nodeType,+ attribute: input.attribute,+ value: input.value,+ created_at: new Date().toISOString(),+ event_id: generateId(IdType.Event),+ });+ }+ }++ if (eventsToCreate.length === 0) {+ return true;+ }if (!attributes) {return true;@@ -97,19 +129,12 @@ class InteractionService {await tx.insertInto('interaction_events')- .values({- node_id: nodeId,- node_type: nodeType,- attribute,- value,- created_at: new Date().toISOString(),- event_id: generateId(IdType.Event),- })+ .values(eventsToCreate).onConflict((b) =>b.columns(['node_id', 'attribute']).doUpdateSet({- value,+ value: sql`excluded.value`,sent_at: null,- event_id: generateId(IdType.Event),+ event_id: sql`excluded.event_id`,})).execute();@@ -159,19 +184,12 @@ class InteractionService {await tx.insertInto('interaction_events')- .values({- node_id: nodeId,- node_type: nodeType,- attribute,- value,- created_at: new Date().toISOString(),- event_id: generateId(IdType.Event),- })+ .values(eventsToCreate).onConflict((b) =>b.columns(['node_id', 'attribute']).doUpdateSet({- value,+ value: sql`excluded.value`,sent_at: null,- event_id: generateId(IdType.Event),+ event_id: sql`excluded.event_id`,})).execute();diff --git a/apps/desktop/src/main/services/node-service.ts b/apps/desktop/src/main/services/node-service.tsindex 828a6f8a..0c809b12 100644--- a/apps/desktop/src/main/services/node-service.ts+++ b/apps/desktop/src/main/services/node-service.ts@@ -239,8 +239,10 @@ class NodeService {userId,createdTransaction.node_id,createdTransaction.node_type,- 'lastReceivedTransactionId',- createdTransaction.id+ {+ attribute: 'lastReceivedTransactionId',+ value: createdTransaction.id,+ });}@@ -442,8 +444,10 @@ class NodeService {userId,createdTransaction.node_id,createdTransaction.node_type,- 'lastReceivedTransactionId',- createdTransaction.id+ {+ attribute: 'lastReceivedTransactionId',+ value: createdTransaction.id,+ });} else {this.debug(`Failed to create transaction for node ${nodeId}`);@@ -806,8 +810,10 @@ class NodeService {userId,createdNode.id,createdNode.type,- 'lastReceivedTransactionId',- transaction.id+ {+ attribute: 'lastReceivedTransactionId',+ value: transaction.id,+ });} else {this.debug(@@ -968,8 +974,10 @@ class NodeService {userId,updatedNode.id,updatedNode.type,- 'lastReceivedTransactionId',- transaction.id+ {+ attribute: 'lastReceivedTransactionId',+ value: transaction.id,+ });} else {this.debug(diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsxindex 4a020a2d..cdf6edfe 100644--- a/apps/desktop/src/renderer/components/channels/channel-body.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-body.tsx@@ -1,6 +1,9 @@import { ChannelNode, NodeRole } from '@colanode/core';+import { useEffect } from 'react';import { Conversation } from '@/renderer/components/messages/conversation';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useRadar } from '@/renderer/contexts/radar';interface ChannelBodyProps {channel: ChannelNode;@@ -8,5 +11,28 @@ interface ChannelBodyProps {}export const ChannelBody = ({ channel, role }: ChannelBodyProps) => {+ const workspace = useWorkspace();+ const radar = useRadar();++ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ channel.id,+ channel.type,+ channel.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ channel.id,+ channel.type,+ channel.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [channel.id, channel.type, channel.transactionId]);+return <Conversation conversationId={channel.id} role={role} />;};diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsxindex 03227711..4f2de4d6 100644--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx@@ -25,7 +25,12 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {rootMargin="20px"onChange={(inView) => {if (inView) {- radar.markAsSeen(workspace.userId, node.id, node.transactionId);+ radar.markAsSeen(+ workspace.userId,+ node.id,+ node.type,+ node.transactionId+ );}}}className={cn(diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsxindex 16eb4d37..37cc48c5 100644--- a/apps/desktop/src/renderer/components/chats/chat-body.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-body.tsx@@ -1,6 +1,9 @@import { ChatNode, NodeRole } from '@colanode/core';+import { useEffect } from 'react';import { Conversation } from '@/renderer/components/messages/conversation';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useRadar } from '@/renderer/contexts/radar';interface ChatBodyProps {chat: ChatNode;@@ -8,5 +11,28 @@ interface ChatBodyProps {}export const ChatBody = ({ chat, role }: ChatBodyProps) => {+ const workspace = useWorkspace();+ const radar = useRadar();++ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ chat.id,+ chat.type,+ chat.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ chat.id,+ chat.type,+ chat.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [chat.id, chat.type, chat.transactionId]);+return <Conversation conversationId={chat.id} role={role} />;};diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsxindex 9caf2abc..d719cc78 100644--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx@@ -41,7 +41,12 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {rootMargin="20px"onChange={(inView) => {if (inView) {- radar.markAsSeen(workspace.userId, node.id, node.transactionId);+ radar.markAsSeen(+ workspace.userId,+ node.id,+ node.type,+ node.transactionId+ );}}}className={cn(diff --git a/apps/desktop/src/renderer/components/databases/database-body.tsx b/apps/desktop/src/renderer/components/databases/database-body.tsxindex 8f2fb03e..cbf1be0e 100644--- a/apps/desktop/src/renderer/components/databases/database-body.tsx+++ b/apps/desktop/src/renderer/components/databases/database-body.tsx@@ -1,7 +1,10 @@import { DatabaseNode, NodeRole } from '@colanode/core';+import { useEffect } from 'react';import { Database } from '@/renderer/components/databases/database';import { DatabaseViews } from '@/renderer/components/databases/database-views';+import { useRadar } from '@/renderer/contexts/radar';+import { useWorkspace } from '@/renderer/contexts/workspace';interface DatabaseBodyProps {database: DatabaseNode;@@ -9,6 +12,29 @@ interface DatabaseBodyProps {}export const DatabaseBody = ({ database, role }: DatabaseBodyProps) => {+ const workspace = useWorkspace();+ const radar = useRadar();++ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ database.id,+ database.type,+ database.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ database.id,+ database.type,+ database.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [database.id, database.type, database.transactionId]);+return (<Database database={database} role={role}><DatabaseViews />diff --git a/apps/desktop/src/renderer/components/files/file-body.tsx b/apps/desktop/src/renderer/components/files/file-body.tsxindex a9816a93..2ab8bb11 100644--- a/apps/desktop/src/renderer/components/files/file-body.tsx+++ b/apps/desktop/src/renderer/components/files/file-body.tsx@@ -1,10 +1,12 @@import { FileNode } from '@colanode/core';import { SquareArrowOutUpRight } from 'lucide-react';+import { useEffect } from 'react';import { FilePreview } from '@/renderer/components/files/file-preview';import { FileSidebar } from '@/renderer/components/files/file-sidebar';import { Button } from '@/renderer/components/ui/button';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useRadar } from '@/renderer/contexts/radar';interface FileBodyProps {file: FileNode;@@ -12,6 +14,27 @@ interface FileBodyProps {export const FileBody = ({ file }: FileBodyProps) => {const workspace = useWorkspace();+ const radar = useRadar();++ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ file.id,+ file.type,+ file.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ file.id,+ file.type,+ file.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [file.id, file.type, file.transactionId]);return (<div className="flex h-full max-h-full w-full flex-row items-center gap-2">diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsxindex 1399b7ab..7e9bbde1 100644--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx@@ -7,7 +7,7 @@ import {List,Upload,} from 'lucide-react';-import React from 'react';+import React, { useEffect } from 'react';import { FolderFiles } from '@/renderer/components/folders/folder-files';import { Button } from '@/renderer/components/ui/button';@@ -25,6 +25,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { FolderLayoutType } from '@/shared/types/folders';import { toast } from '@/renderer/hooks/use-toast';+import { useRadar } from '@/renderer/contexts/radar';export type FolderLayout = {value: FolderLayoutType;@@ -60,6 +61,7 @@ interface FolderBodyProps {export const FolderBody = ({ folder }: FolderBodyProps) => {const workspace = useWorkspace();+ const radar = useRadar();const { mutate } = useMutation();const [layout, setLayout] = React.useState<FolderLayoutType>('grid');@@ -116,6 +118,26 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {isDialogOpenedRef.current = false;};+ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ folder.id,+ folder.type,+ folder.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ folder.id,+ folder.type,+ folder.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [folder.id, folder.type, folder.transactionId]);+return (<Dropzonetext="Drop files here to upload them in the folder"diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsxindex 3bba594f..03185bd8 100644--- a/apps/desktop/src/renderer/components/messages/message.tsx+++ b/apps/desktop/src/renderer/components/messages/message.tsx@@ -65,6 +65,7 @@ export const Message = ({ message, previousMessage }: MessageProps) => {radar.markAsSeen(workspace.userId,message.id,+ message.type,message.transactionId);}diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsxindex cccceab0..76742453 100644--- a/apps/desktop/src/renderer/components/pages/page-body.tsx+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx@@ -1,4 +1,4 @@-import { useCallback } from 'react';+import { useCallback, useEffect } from 'react';import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';import { JSONContent } from '@tiptap/core';@@ -7,6 +7,7 @@ import { ScrollArea } from '@/renderer/components/ui/scroll-area';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';+import { useRadar } from '@/renderer/contexts/radar';interface PageBodyProps {page: PageNode;@@ -15,6 +16,7 @@ interface PageBodyProps {export const PageBody = ({ page, role }: PageBodyProps) => {const workspace = useWorkspace();+ const radar = useRadar();const { mutate } = useMutation();const canEdit = hasEditorAccess(role);@@ -39,6 +41,26 @@ export const PageBody = ({ page, role }: PageBodyProps) => {[mutate, workspace.userId, page.id]);+ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ page.id,+ page.type,+ page.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ page.id,+ page.type,+ page.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [page.id, page.type, page.transactionId]);+return (<ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12"><Documentdiff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsxindex cf523cb0..34960649 100644--- a/apps/desktop/src/renderer/components/records/record-body.tsx+++ b/apps/desktop/src/renderer/components/records/record-body.tsx@@ -5,7 +5,7 @@ import {RecordNode,} from '@colanode/core';import { JSONContent } from '@tiptap/core';-import { useCallback } from 'react';+import { useCallback, useEffect } from 'react';import { Database } from '@/renderer/components/databases/database';import { Document } from '@/renderer/components/documents/document';@@ -16,6 +16,7 @@ import { Separator } from '@/renderer/components/ui/separator';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';+import { useRadar } from '@/renderer/contexts/radar';interface RecordBodyProps {record: RecordNode;@@ -31,6 +32,7 @@ export const RecordBody = ({databaseRole,}: RecordBodyProps) => {const workspace = useWorkspace();+ const radar = useRadar();const { mutate } = useMutation();const canEdit =@@ -57,6 +59,26 @@ export const RecordBody = ({[mutate]);+ useEffect(() => {+ radar.markAsOpened(+ workspace.userId,+ record.id,+ record.type,+ record.transactionId+ );++ const interval = setInterval(() => {+ radar.markAsOpened(+ workspace.userId,+ record.id,+ record.type,+ record.transactionId+ );+ }, 60000);++ return () => clearInterval(interval);+ }, [record.id, record.type, record.transactionId]);+return (<Database database={database} role={databaseRole}><ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.tsindex b2a71b17..b9279dbe 100644--- a/apps/desktop/src/renderer/contexts/radar.ts+++ b/apps/desktop/src/renderer/contexts/radar.ts@@ -1,4 +1,5 @@import { createContext, useContext } from 'react';+import { NodeType } from '@colanode/core';import {AccountReadState,@@ -12,7 +13,18 @@ interface RadarContext {getWorkspaceState: (userId: string) => WorkspaceReadState;getChatState: (userId: string, nodeId: string) => ChatReadState;getChannelState: (userId: string, nodeId: string) => ChannelReadState;- markAsSeen: (userId: string, nodeId: string, versionId: string) => void;+ markAsSeen: (+ userId: string,+ nodeId: string,+ nodeType: NodeType,+ transactionId: string+ ) => void;+ markAsOpened: (+ userId: string,+ nodeId: string,+ nodeType: NodeType,+ transactionId: string+ ) => void;}export const RadarContext = createContext<RadarContext>({} as RadarContext);diff --git a/apps/desktop/src/renderer/radar-provider.tsx b/apps/desktop/src/renderer/radar-provider.tsxindex 9b691903..b60e8f3e 100644--- a/apps/desktop/src/renderer/radar-provider.tsx+++ b/apps/desktop/src/renderer/radar-provider.tsx@@ -80,11 +80,21 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {mentionsCount: 0,};},- markAsSeen: (userId, nodeId, versionId) => {+ markAsSeen: (userId, nodeId, nodeType, transactionId) => {window.colanode.executeMutation({type: 'mark_node_as_seen',nodeId,- versionId,+ nodeType,+ transactionId,+ userId,+ });+ },+ markAsOpened: (userId, nodeId, nodeType, transactionId) => {+ window.colanode.executeMutation({+ type: 'mark_node_as_opened',+ nodeId,+ nodeType,+ transactionId,userId,});},diff --git a/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.ts b/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.tsnew file mode 100644index 00000000..62991043--- /dev/null+++ b/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.ts@@ -0,0 +1,22 @@+import { NodeType } from '@colanode/core';++export type MarkNodeAsOpenedMutationInput = {+ type: 'mark_node_as_opened';+ userId: string;+ nodeId: string;+ nodeType: NodeType;+ transactionId: string;+};++export type MarkNodeAsOpenedMutationOutput = {+ success: boolean;+};++declare module '@/shared/mutations' {+ interface MutationMap {+ mark_node_as_opened: {+ input: MarkNodeAsOpenedMutationInput;+ output: MarkNodeAsOpenedMutationOutput;+ };+ }+}diff --git a/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.ts b/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.tsindex 72bd6843..ad769ef5 100644--- a/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.ts+++ b/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.ts@@ -1,8 +1,11 @@+import { NodeType } from '@colanode/core';+export type MarkNodeAsSeenMutationInput = {type: 'mark_node_as_seen';userId: string;nodeId: string;- versionId: string;+ nodeType: NodeType;+ transactionId: string;};export type MarkNodeAsSeenMutationOutput = {diff --git a/packages/core/src/lib/interactions.ts b/packages/core/src/lib/interactions.tsindex ef13875d..8e337ef4 100644--- a/packages/core/src/lib/interactions.ts+++ b/packages/core/src/lib/interactions.ts@@ -39,7 +39,7 @@ export const mergeInteractionAttributes = (if (attribute === 'lastReceivedTransactionId') {if (!attributes.lastReceivedTransactionId ||- compareString(attributes.lastReceivedTransactionId, value) > 0+ compareString(attributes.lastReceivedTransactionId, value) < 0) {return { ...attributes, lastReceivedTransactionId: value };}@@ -48,11 +48,31 @@ export const mergeInteractionAttributes = (if (attribute === 'lastSeenTransactionId') {if (!attributes.lastSeenTransactionId ||- compareString(attributes.lastSeenTransactionId, value) > 0+ compareString(attributes.lastSeenTransactionId, value) < 0) {return { ...attributes, lastSeenTransactionId: value };}}+ if (attribute === 'lastOpenedAt') {+ const date = new Date(value);++ if (+ !attributes.lastOpenedAt ||+ compareDate(attributes.lastOpenedAt, date) < 0+ ) {+ return { ...attributes, lastOpenedAt: date };+ }+ }++ if (attribute === 'lastOpenedTransactionId') {+ if (+ !attributes.lastOpenedTransactionId ||+ compareString(attributes.lastOpenedTransactionId, value) < 0+ ) {+ return { ...attributes, lastOpenedTransactionId: value };+ }+ }+return null;};diff --git a/packages/core/src/types/interactions.ts b/packages/core/src/types/interactions.tsindex 057b0e9f..c67f99d4 100644--- a/packages/core/src/types/interactions.ts+++ b/packages/core/src/types/interactions.ts@@ -3,6 +3,8 @@ export type InteractionAttributes = {lastSeenTransactionId?: string | null;firstSeenAt?: Date | null;lastSeenAt?: Date | null;+ lastOpenedAt?: Date | null;+ lastOpenedTransactionId?: string | null;};export type InteractionAttribute = keyof InteractionAttributes;