fix: render message route anchor before context loads

Author: cassi-volkova

packages/web/src/entities/message/message-workspace.model.test.ts

@@ -11,6 +11,7 @@ import type {
 import {
   selectWorkspaceMessagesForConversation,
   selectWorkspaceMessageStatusForConversation,
+  selectWorkspaceMessageWindowStateForConversation,
   useWorkspaceMessageStore,
 } from "./message.model";
 
@@ -413,6 +414,33 @@ describe("workspace message store", () => {
     expect(state.hasMoreByConversationId[TOPIC_CONVERSATION_ID]).toBe(true);
   });
 
+  it("tracks whether a direct message window is staged or complete", () => {
+    const store = useWorkspaceMessageStore.getState();
+    store.setConversationMessageWindowState(TOPIC_CONVERSATION_ID, "staged");
+    expect(
+      selectWorkspaceMessageWindowStateForConversation(
+        useWorkspaceMessageStore.getState(),
+        TOPIC_CONVERSATION_ID,
+      ),
+    ).toBe("staged");
+
+    store.setConversationMessageWindowState(TOPIC_CONVERSATION_ID, "complete");
+    expect(
+      selectWorkspaceMessageWindowStateForConversation(
+        useWorkspaceMessageStore.getState(),
+        TOPIC_CONVERSATION_ID,
+      ),
+    ).toBe("complete");
+
+    store.clear();
+    expect(
+      selectWorkspaceMessageWindowStateForConversation(
+        useWorkspaceMessageStore.getState(),
+        TOPIC_CONVERSATION_ID,
+      ),
+    ).toBeNull();
+  });
+
   it("clears before and after window markers with the existing store reset", () => {
     useWorkspaceMessageStore.getState().setConversationWindowMarkers(TOPIC_CONVERSATION_ID, {
       beforePageMarker: "before-1",

packages/web/src/entities/message/message.model.ts

@@ -21,13 +21,15 @@ import {
   removeWorkspaceMessageId,
 } from "./message-workspace-order.lib";
 import type {
+  WorkspaceConversationMessageWindowState,
   WorkspaceConversationMessagesStatus,
   WorkspaceMessageStoreData,
   WorkspaceMessageStoreState,
   WorkspaceOptimisticMessageReadChange,
 } from "./message.model.types";
 
 export type {
+  WorkspaceConversationMessageWindowState,
   WorkspaceConversationMessagesStatus,
   WorkspaceConversationPagination,
   WorkspaceConversationWindowMarkers,
@@ -42,6 +44,9 @@ export type {
 
 const EMPTY_MESSAGES_BY_ID: Record<MessengerUuid, MessengerMessage> = {};
 const EMPTY_MESSAGE_IDS_BY_CONVERSATION_ID: Record<MessengerConversationId, MessengerUuid[]> = {};
+const EMPTY_MESSAGE_WINDOW_STATE_BY_CONVERSATION_ID: Partial<
+  Record<MessengerConversationId, WorkspaceConversationMessageWindowState>
+> = {};
 const EMPTY_MESSAGES_LOADING_BY_CONVERSATION_ID: Record<MessengerConversationId, boolean> = {};
 const EMPTY_MESSAGES_ERROR_BY_CONVERSATION_ID: Record<MessengerConversationId, string | null> = {};
 const EMPTY_NEXT_PAGE_MARKER_BY_CONVERSATION_ID: Record<MessengerConversationId, string | null> =
@@ -160,6 +165,7 @@ function createEmptyWorkspaceMessageData(): WorkspaceMessageStoreData {
   return {
     messagesById: EMPTY_MESSAGES_BY_ID,
     messageIdsByConversationId: EMPTY_MESSAGE_IDS_BY_CONVERSATION_ID,
+    messageWindowStateByConversationId: EMPTY_MESSAGE_WINDOW_STATE_BY_CONVERSATION_ID,
     messagesLoadingByConversationId: EMPTY_MESSAGES_LOADING_BY_CONVERSATION_ID,
     messagesErrorByConversationId: EMPTY_MESSAGES_ERROR_BY_CONVERSATION_ID,
     nextPageMarkerByConversationId: EMPTY_NEXT_PAGE_MARKER_BY_CONVERSATION_ID,
@@ -799,13 +805,28 @@ export const useWorkspaceMessageStore = create<WorkspaceMessageStoreState>((set)
     }));
   },
 
+  setConversationMessageWindowState(conversationId, windowState) {
+    if (isRemovedStreamConversation(conversationId)) return;
+    logStoreAction("workspaceMessage", "setConversationMessageWindowState", {
+      conversationId,
+      windowState,
+    });
+    set((state) => ({
+      messageWindowStateByConversationId: {
+        ...state.messageWindowStateByConversationId,
+        [conversationId]: windowState,
+      },
+    }));
+  },
+
   removeMessagesForStream(streamUuid) {
     logStoreAction("workspaceMessage", "removeMessagesForStream", { streamUuid });
     removedStreamUuids.add(streamUuid);
     set((state) => {
       const removedConversationIds = new Set(
         [
           ...Object.keys(state.messageIdsByConversationId),
+          ...Object.keys(state.messageWindowStateByConversationId),
           ...Object.keys(state.messagesLoadingByConversationId),
           ...Object.keys(state.messagesErrorByConversationId),
           ...Object.keys(state.nextPageMarkerByConversationId),
@@ -828,6 +849,10 @@ export const useWorkspaceMessageStore = create<WorkspaceMessageStoreState>((set)
           state.messageIdsByConversationId,
           removedConversationIds,
         ),
+        messageWindowStateByConversationId: omitConversationRecords(
+          state.messageWindowStateByConversationId,
+          removedConversationIds,
+        ),
         messagesLoadingByConversationId: omitConversationRecords(
           state.messagesLoadingByConversationId,
           removedConversationIds,
@@ -903,6 +928,13 @@ export function selectWorkspaceMessagesForConversation(
   return messages;
 }
 
+export function selectWorkspaceMessageWindowStateForConversation(
+  state: WorkspaceMessageStoreState,
+  conversationId: MessengerConversationId,
+): WorkspaceConversationMessageWindowState | null {
+  return state.messageWindowStateByConversationId[conversationId] ?? null;
+}
+
 interface ConversationStatusCacheEntry {
   loading: boolean;
   error: string | null;

packages/web/src/entities/message/message.model.types.ts

@@ -11,6 +11,9 @@ import type {
 export interface WorkspaceMessageStoreData {
   messagesById: Record<MessengerUuid, MessengerMessage>;
   messageIdsByConversationId: Record<MessengerConversationId, MessengerUuid[]>;
+  messageWindowStateByConversationId: Partial<
+    Record<MessengerConversationId, WorkspaceConversationMessageWindowState>
+  >;
   messagesLoadingByConversationId: Record<MessengerConversationId, boolean>;
   messagesErrorByConversationId: Record<MessengerConversationId, string | null>;
   nextPageMarkerByConversationId: Record<MessengerConversationId, string | null>;
@@ -53,6 +56,8 @@ export interface WorkspaceConversationWindowMarkers {
   afterPageMarker: string | null;
 }
 
+export type WorkspaceConversationMessageWindowState = "staged" | "complete";
+
 export interface WorkspaceConversationMessagesStatus {
   loading: boolean;
   error: string | null;
@@ -136,6 +141,10 @@ export interface WorkspaceMessageStoreState extends WorkspaceMessageStoreData {
     conversationId: MessengerConversationId,
     markers: WorkspaceConversationWindowMarkers,
   ) => void;
+  setConversationMessageWindowState: (
+    conversationId: MessengerConversationId,
+    state: WorkspaceConversationMessageWindowState,
+  ) => void;
   removeMessagesForStream: (streamUuid: MessengerUuid) => void;
   restoreMessagesForStream: (streamUuid: MessengerUuid) => void;
   clear: () => void;