@natoe/colab 0.1.26 → 0.1.28

package/dist/index.js

@@ -582,6 +582,16 @@ function applyThemeOverrides(theme) {
     }
   });
 }
+function previewKey(orderId, kind) {
+  return `${kind}|${orderId}`;
+}
+function parsePreviewKey(key) {
+  const separator = key.indexOf("|");
+  return {
+    kind: key.slice(0, separator),
+    orderId: key.slice(separator + 1)
+  };
+}
 var CollabContext = React4.createContext(null);
 function useCollab() {
   const context = React4.useContext(CollabContext);
@@ -597,7 +607,7 @@ function CollabProvider({ config, apiBaseUrl, children }) {
   });
   const [unreadCounts, setUnreadCounts] = React4.useState({});
   const [unreadCountsByOrder, setUnreadCountsByOrder] = React4.useState({});
-  const pendingOrderIds = React4.useRef(/* @__PURE__ */ new Set());
+  const pendingKeys = React4.useRef(/* @__PURE__ */ new Set());
   const pendingResolvers = React4.useRef(/* @__PURE__ */ new Map());
   const previewCache = React4.useRef(/* @__PURE__ */ new Map());
   const batchScheduled = React4.useRef(false);
@@ -628,47 +638,61 @@ function CollabProvider({ config, apiBaseUrl, children }) {
     [config]
   );
   const flushPreviewBatch = React4.useCallback(async () => {
-    const orderIds = Array.from(pendingOrderIds.current);
+    const keys = Array.from(pendingKeys.current);
     const resolvers = new Map(pendingResolvers.current);
-    pendingOrderIds.current.clear();
+    pendingKeys.current.clear();
     pendingResolvers.current.clear();
     batchScheduled.current = false;
-    if (orderIds.length === 0) return;
-    try {
-      const query = orderIds.map((id) => `order_ids[]=${encodeURIComponent(id)}`).join("&");
-      const response = await fetch(`${apiBaseUrl}/api/natoe-colab/conversations/previews?${query}`, {
-        headers: authHeaders()
-      });
-      if (!response.ok) throw new Error(`Preview batch failed: ${response.status}`);
-      const data = snakeToCamel(await response.json());
-      orderIds.forEach((orderId) => {
-        const preview = data.previews[orderId] ?? null;
-        if (preview !== null) {
-          previewCache.current.set(orderId, preview);
-        }
-        resolvers.get(orderId)?.forEach((resolve) => resolve(preview));
-      });
-    } catch (error) {
-      config.onError?.({
-        code: "PREVIEW_BATCH_ERROR",
-        message: "Failed to fetch conversation previews",
-        details: error
-      });
-      orderIds.forEach((orderId) => {
-        resolvers.get(orderId)?.forEach((resolve) => resolve(null));
-      });
+    if (keys.length === 0) return;
+    const byKind = /* @__PURE__ */ new Map();
+    for (const key of keys) {
+      const { orderId, kind } = parsePreviewKey(key);
+      const list = byKind.get(kind) ?? [];
+      list.push(orderId);
+      byKind.set(kind, list);
     }
+    await Promise.all(
+      Array.from(byKind.entries()).map(async ([kind, orderIds]) => {
+        try {
+          const query = orderIds.map((id) => `order_ids[]=${encodeURIComponent(id)}`).join("&");
+          const response = await fetch(
+            `${apiBaseUrl}/api/natoe-colab/conversations/previews?${query}&kind=${encodeURIComponent(kind)}`,
+            { headers: authHeaders() }
+          );
+          if (!response.ok) throw new Error(`Preview batch failed: ${response.status}`);
+          const data = snakeToCamel(await response.json());
+          orderIds.forEach((orderId) => {
+            const key = previewKey(orderId, kind);
+            const preview = data.previews[orderId] ?? null;
+            if (preview !== null) {
+              previewCache.current.set(key, preview);
+            }
+            resolvers.get(key)?.forEach((resolve) => resolve(preview));
+          });
+        } catch (error) {
+          config.onError?.({
+            code: "PREVIEW_BATCH_ERROR",
+            message: "Failed to fetch conversation previews",
+            details: error
+          });
+          orderIds.forEach((orderId) => {
+            resolvers.get(previewKey(orderId, kind))?.forEach((resolve) => resolve(null));
+          });
+        }
+      })
+    );
   }, [apiBaseUrl, authHeaders, config]);
   const requestPreview = React4.useCallback(
-    (orderId) => {
-      if (previewCache.current.has(orderId)) {
-        return Promise.resolve(previewCache.current.get(orderId) ?? null);
+    (orderId, kind = "case") => {
+      const key = previewKey(orderId, kind);
+      if (previewCache.current.has(key)) {
+        return Promise.resolve(previewCache.current.get(key) ?? null);
       }
       return new Promise((resolve) => {
-        pendingOrderIds.current.add(orderId);
-        const existing = pendingResolvers.current.get(orderId) || [];
+        pendingKeys.current.add(key);
+        const existing = pendingResolvers.current.get(key) || [];
         existing.push(resolve);
-        pendingResolvers.current.set(orderId, existing);
+        pendingResolvers.current.set(key, existing);
         if (!batchScheduled.current) {
           batchScheduled.current = true;
           queueMicrotask(flushPreviewBatch);
@@ -677,8 +701,16 @@ function CollabProvider({ config, apiBaseUrl, children }) {
     },
     [flushPreviewBatch]
   );
-  const invalidatePreview = React4.useCallback((orderId) => {
-    previewCache.current.delete(orderId);
+  const invalidatePreview = React4.useCallback((orderId, kind) => {
+    if (kind) {
+      previewCache.current.delete(previewKey(orderId, kind));
+      return;
+    }
+    for (const key of Array.from(previewCache.current.keys())) {
+      if (parsePreviewKey(key).orderId === orderId) {
+        previewCache.current.delete(key);
+      }
+    }
   }, []);
   const fetchMessages = React4.useCallback(
     async (conversationId, options = {}) => {
@@ -705,11 +737,17 @@ function CollabProvider({ config, apiBaseUrl, children }) {
           message: "Cannot create conversation: orderId is empty. Host app passed an order with no orderId/mainOrderId set."
         };
       }
+      const kind = options.kind ?? "case";
       const response = await fetch(`${apiBaseUrl}/api/natoe-colab/orders/${orderId}/messages`, {
         method: "POST",
         headers: authHeaders(),
         body: JSON.stringify({
           message,
+          // Top-level, matching the backend's `params["kind"]`. It selects
+          // BOTH which thread is addressed and which authorization path runs
+          // — help kinds go through Access.can_access_help?/5, not the
+          // broader case-chat check.
+          kind,
           conversation: {
             name: options.name,
             participant_ids: options.participantIds ?? []
@@ -721,7 +759,7 @@ function CollabProvider({ config, apiBaseUrl, children }) {
         throw { code: "CREATE_ERROR", message: "Failed to create conversation", details: error };
       }
       const data = snakeToCamel(await response.json());
-      previewCache.current.delete(orderId);
+      previewCache.current.delete(previewKey(orderId, kind));
       return data;
     },
     [apiBaseUrl, authHeaders]
@@ -855,7 +893,8 @@ function useConversation({
   orderId,
   patientData,
   participantIds = [],
-  loadHistory = true
+  loadHistory = true,
+  kind = "case"
 }) {
   const {
     socket,
@@ -983,7 +1022,7 @@ function useConversation({
       setIsLoading(true);
       setError(null);
       try {
-        const preview = await requestPreview(orderId);
+        const preview = await requestPreview(orderId, kind);
         if (cancelled) return;
         if (!preview) {
           setConversation(null);
@@ -1040,7 +1079,7 @@ function useConversation({
       markedReadIdsRef.current.clear();
       setIsConnected(false);
     };
-  }, [orderId]);
+  }, [orderId, kind]);
   const ensureConversation = React4.useCallback(
     async (payload) => {
       if (conversation) return { conv: conversation, persistedByCreate: false };
@@ -1051,13 +1090,14 @@ function useConversation({
       const inflight = (async () => {
         const result = await createConversationWithMessage(orderId, payload, {
           name: buildName(),
-          participantIds
+          participantIds,
+          kind
         });
         setConversation(result.conversation);
         setParticipants(result.conversation.participants);
         setMessages([result.message]);
         joinChannel(result.conversation);
-        invalidatePreview(orderId);
+        invalidatePreview(orderId, kind);
         if (loadHistory) {
           fetchMessages(result.conversation.id).then((history) => {
             setMessages((prev) => {
@@ -1087,6 +1127,7 @@ function useConversation({
       conversation,
       createConversationWithMessage,
       orderId,
+      kind,
       buildName,
       participantIds,
       joinChannel,
@@ -4496,6 +4537,7 @@ function CollabPanel({
   orderId,
   patientData,
   participantIds,
+  kind,
   showSeenBy = true,
   onBack,
   hidePatientName = false,
@@ -4534,7 +4576,7 @@ function CollabPanel({
     loadMoreMessages,
     pinMessage,
     unpinMessage
-  } = useConversation({ orderId, patientData, participantIds });
+  } = useConversation({ orderId, patientData, participantIds, kind });
   React4.useEffect(() => {
     onConversationChange?.(conversation);
   }, [conversation, onConversationChange]);
@@ -4753,6 +4795,7 @@ function CollabPopup({
   orderId,
   patientData,
   participantIds,
+  kind,
   isOpen,
   onClose,
   onBack,
@@ -4941,6 +4984,7 @@ function CollabPopup({
             orderId,
             patientData,
             participantIds,
+            kind,
             hidePatientName: true,
             onConversationChange: setLoadedConversation,
             showSettings,
@@ -5058,7 +5102,8 @@ function useInlineCollab({
   orderId,
   patientData,
   participantIds = [],
-  messageLimit = 5
+  messageLimit = 5,
+  kind = "case"
 }) {
   const {
     socket,
@@ -5077,6 +5122,8 @@ function useInlineCollab({
   const elementRef = React4.useRef(null);
   const observerRef = React4.useRef(null);
   const subscribedConversationIdRef = React4.useRef(null);
+  const latestMessageIdRef = React4.useRef(null);
+  const lastMarkedReadIdRef = React4.useRef(null);
   const channelSubscriptionRef = React4.useRef(null);
   const trimToLimit = React4.useCallback(
     (msgs) => msgs.length > messageLimit ? msgs.slice(msgs.length - messageLimit) : msgs,
@@ -5086,13 +5133,25 @@ function useInlineCollab({
     () => buildChannelName(patientData),
     [patientData]
   );
+  React4.useEffect(() => {
+    latestMessageIdRef.current = messages[messages.length - 1]?.id ?? null;
+  }, [messages]);
+  const markLatestRead = React4.useCallback(
+    (conversationId) => {
+      const messageId = latestMessageIdRef.current;
+      if (!messageId || lastMarkedReadIdRef.current === messageId) return;
+      lastMarkedReadIdRef.current = messageId;
+      socket.markAsRead(conversationId, messageId);
+    },
+    [socket]
+  );
   React4.useEffect(() => {
     let cancelled = false;
     const load = async () => {
       setIsLoading(true);
       setError(null);
       try {
-        const result = await requestPreview(orderId);
+        const result = await requestPreview(orderId, kind);
         if (cancelled) return;
         setPreview(result);
         if (result) {
@@ -5188,7 +5247,8 @@ function useInlineCollab({
         try {
           const result = await createConversationWithMessage(orderId, payload, {
             name: buildName(),
-            participantIds
+            participantIds,
+            kind
           });
           const newPreview = {
             conversationId: result.conversation.id,
@@ -5202,7 +5262,7 @@ function useInlineCollab({
           setPreview(newPreview);
           setMessages([result.message]);
           setParticipants(result.conversation.participants);
-          invalidatePreview(orderId);
+          invalidatePreview(orderId, kind);
           if (elementRef.current) {
             subscribe(result.conversation.id);
           }
@@ -5219,6 +5279,7 @@ function useInlineCollab({
       try {
         await socket.sendMessage(preview.conversationId, payload);
         setUnreadCount(0);
+        markLatestRead(preview.conversationId);
       } catch (err) {
         setError(err instanceof Error ? err.message : "Failed to send message");
         config.onError?.({
@@ -5237,7 +5298,8 @@ function useInlineCollab({
       invalidatePreview,
       subscribe,
       socket,
-      config
+      config,
+      markLatestRead
     ]
   );
   const sendMessage = React4.useCallback(
@@ -5325,6 +5387,7 @@ function CollabInline({
   orderId,
   patientData,
   participantIds,
+  kind,
   onExpand,
   messageLimit = 1,
   placeholder = "Discuss this case\u2026",
@@ -5343,7 +5406,7 @@ function CollabInline({
     sendMessage,
     sendAudioMessage,
     containerRef
-  } = useInlineCollab({ orderId, patientData, participantIds, messageLimit });
+  } = useInlineCollab({ orderId, patientData, participantIds, messageLimit, kind });
   const containerStyle = {
     ...styles14.container,
     backgroundColor: pal.bg,
@@ -5835,6 +5898,11 @@ function useConversationList(options) {
     totalUnread
   };
 }
+
+// src/core/types.ts
+function isHelpKind(kind) {
+  return kind === "help_lab" || kind === "help_radiologist";
+}
 function ConversationListItem({
   item,
   isSelected,
@@ -5871,6 +5939,10 @@ function ConversationListItem({
                 children: displayName
               }
             ),
+            isHelpKind(item.kind) && /* A case can show two rows with the same patient name — the shared
+               case thread and a private help thread. Without this the two are
+               indistinguishable in the inbox. */
+            /* @__PURE__ */ jsxRuntime.jsx("span", { style: styles15.helpPill, "aria-label": "Help thread", children: "Help" }),
             /* @__PURE__ */ jsxRuntime.jsx(
               "span",
               {
@@ -6017,6 +6089,17 @@ var styles15 = {
   nameUnread: {
     fontWeight: FONT_WEIGHT.bold
   },
+  helpPill: {
+    fontSize: FONT_SIZE.xs,
+    fontWeight: FONT_WEIGHT.semibold,
+    color: COLOR.primary,
+    background: COLOR.primaryBg,
+    borderRadius: RADIUS.sm,
+    padding: `0 ${SPACE.S2}`,
+    lineHeight: "16px",
+    flexShrink: 0,
+    whiteSpace: "nowrap"
+  },
   time: {
     fontSize: FONT_SIZE.xs,
     color: COLOR.neutral500,
@@ -6791,6 +6874,7 @@ exports.THEME_DEFAULTS = THEME_DEFAULTS;
 exports.THEME_VAR = THEME_VAR;
 exports.TYPING_DEBOUNCE_MS = TYPING_DEBOUNCE_MS;
 exports.applyThemeOverrides = applyThemeOverrides;
+exports.isHelpKind = isHelpKind;
 exports.useAudioRecorder = useAudioRecorder;
 exports.useChannelSettings = useChannelSettings;
 exports.useCollab = useCollab;