fix: get drafts with parent message and cid

Author: khushal87

package/src/components/MessageInput/MessageInput.tsx

@@ -120,7 +120,7 @@ type MessageInputPropsWithContext = Partial<
   >
 > &
   Pick<AttachmentPickerContextValue, 'bottomInset' | 'bottomSheetRef' | 'selectedPicker'> &
-  Pick<ChatContextValue, 'client' | 'isOnline'> &
+  Pick<ChatContextValue, 'isOnline'> &
   Pick<ChannelContextValue, 'channel' | 'members' | 'threadList' | 'watchers'> &
   Pick<
     MessageInputContextValue,
@@ -205,7 +205,6 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
     AudioRecordingPreview,
     AutoCompleteSuggestionList,
     channel,
-    client,
     closeAttachmentPicker,
     closePollCreationDialog,
     cooldownEndsAt,
@@ -295,29 +294,10 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
    */
   useEffect(() => {
     const threadId = messageComposer.threadId;
-    if (!threadId || !messageComposer.channel || !messageComposer.compositionIsEmpty) return;
-
-    // This is for the offline db support for getting drafts for legacy thread composer.
-    if (client.offlineDb && client.userID) {
-      client.offlineDb
-        .getDraft({
-          cid: messageComposer.channel.cid,
-          currentUserId: client.userID,
-          parent_id: threadId,
-        })
-        .then((draft) => {
-          if (draft) {
-            messageComposer.initState({ composition: draft });
-          }
-        });
-    }
+    if (!threadId) return;
 
-    messageComposer.channel.getDraft({ parent_id: threadId }).then(({ draft }) => {
-      if (draft) {
-        messageComposer.initState({ composition: draft });
-      }
-    });
-  }, [client.offlineDb, client.userID, messageComposer]);
+    messageComposer.getDraft();
+  }, [messageComposer]);
 
   const getMembers = () => {
     const result: UserResponse[] = [];
@@ -781,7 +761,7 @@ export type MessageInputProps = Partial<MessageInputPropsWithContext>;
  * [Translation Context](https://getstream.io/chat/docs/sdk/reactnative/contexts/translation-context/)
  */
 export const MessageInput = (props: MessageInputProps) => {
-  const { client, isOnline } = useChatContext();
+  const { isOnline } = useChatContext();
   const ownCapabilities = useOwnCapabilitiesContext();
 
   const { channel, members, threadList, watchers } = useChannelContext();
@@ -875,7 +855,6 @@ export const MessageInput = (props: MessageInputProps) => {
         CameraSelectorIcon,
         channel,
         clearEditingState,
-        client,
         closeAttachmentPicker,
         closePollCreationDialog,
         CommandInput,

package/src/store/apis/getDraft.ts

@@ -8,40 +8,52 @@ import { TableRow } from '../types';
 
 export const getDraft = async ({
   cid,
-  currentUserId,
+  userId,
   parent_id,
 }: {
   cid: string;
-  currentUserId: string;
+  userId: string;
   parent_id?: string;
 }) => {
   SqliteClient.logger?.('info', 'getDraft', { cid, parent_id });
 
-  const draftRowsWithMessage = await selectDraftMessageFromDraft([cid]);
+  try {
+    const draftRowsWithMessage = await selectDraftMessageFromDraft({
+      cid,
+      parent_id: parent_id ?? null,
+    });
 
-  const draftRowWithMessage = draftRowsWithMessage[0];
+    console.log('getDraft draftRowsWithMessage', draftRowsWithMessage);
 
-  if (!draftRowWithMessage) {
-    return null;
-  }
+    if (!draftRowsWithMessage) return null;
+
+    const draftRowWithMessage = draftRowsWithMessage;
+
+    if (!draftRowWithMessage) {
+      return null;
+    }
+
+    const channelQuery = createSelectQuery('channels', ['*'], { cid });
+    const channelRows = await SqliteClient.executeSql.apply(null, channelQuery);
 
-  const channelQuery = createSelectQuery('channels', ['*'], { cid });
-  const channelRows = await SqliteClient.executeSql.apply(null, channelQuery);
-
-  const quotedMessageRows = await selectMessageForId(draftRowWithMessage.quotedMessageId);
-
-  const polls = (await SqliteClient.executeSql.apply(
-    null,
-    createSelectQuery('poll', ['*'], {
-      id: quotedMessageRows?.poll_id,
-    }),
-  )) as unknown as TableRow<'poll'>[];
-
-  return mapStorableToDraft({
-    channelRow: channelRows[0] as unknown as TableRow<'channels'>,
-    currentUserId,
-    draftRow: draftRowWithMessage,
-    pollRow: polls[0],
-    quotedMessageRow: quotedMessageRows,
-  });
+    const quotedMessageRows = await selectMessageForId(draftRowWithMessage.quotedMessageId);
+
+    const polls = (await SqliteClient.executeSql.apply(
+      null,
+      createSelectQuery('poll', ['*'], {
+        id: quotedMessageRows?.poll_id,
+      }),
+    )) as unknown as TableRow<'poll'>[];
+
+    return mapStorableToDraft({
+      channelRow: channelRows[0] as unknown as TableRow<'channels'>,
+      currentUserId: userId,
+      draftRow: draftRowWithMessage,
+      pollRow: polls[0],
+      quotedMessageRow: quotedMessageRows,
+    });
+  } catch (error) {
+    console.error('Error in getDraft:', error);
+    throw error;
+  }
 };

package/src/store/apis/getDraftsForChannels.ts

@@ -1,6 +1,6 @@
 import { DraftResponse } from 'stream-chat';
 
-import { selectDraftMessageFromDraft } from './queries/selectDraftMessageFromDraft';
+import { selectDraftMessageFromDraftForChannels } from './queries/selectDraftMessageFromDraftForChannels';
 import { selectMessageForId } from './queries/selectMessageById';
 
 import { mapStorableToDraft } from '../mappers/mapStorableToDraft';
@@ -17,7 +17,7 @@ export const getDraftForChannels = async ({
 }) => {
   SqliteClient.logger?.('info', 'getDraftsForChannel', { channelIds });
 
-  const draftRowsWithMessage = await selectDraftMessageFromDraft(channelIds);
+  const draftRowsWithMessage = await selectDraftMessageFromDraftForChannels(channelIds);
 
   /**
    * Filter out drafts without a parent ID, as we will not show them in the channel.

package/src/store/apis/queries/selectDraftMessageFromDraft.ts

@@ -1,41 +1,43 @@
 import { tables } from '../../schema';
 import { SqliteClient } from '../../SqliteClient';
-import type { TableRowJoinedDraftMessage } from '../../types';
+import { TableRowJoinedDraftMessage } from '../../types';
 
-export const selectDraftMessageFromDraft = async (
-  cids?: string[],
-): Promise<TableRowJoinedDraftMessage<'draft'>[]> => {
-  if (!cids || cids.length === 0) {
-    return [];
-  }
-
-  const questionMarks = Array(cids.length).fill('?').join(',');
+export const selectDraftMessageFromDraft = async ({
+  cid,
+  parent_id,
+}: {
+  cid: string;
+  parent_id: string | null;
+}): Promise<TableRowJoinedDraftMessage<'draft'> | undefined> => {
   const draftColumnNames = Object.keys(tables.draft.columns)
     .map((name) => `'${name}', a.${name}`)
     .join(', ');
   const draftMessageColumnNames = Object.keys(tables.draftMessage.columns)
     .map((name) => `'${name}', b.${name}`)
     .join(', ');
 
-  SqliteClient.logger?.('info', 'selectDraft', {
-    cids,
+  SqliteClient.logger?.('info', 'selectDraftMessageFromDraft', {
+    cid,
+    parent_id,
   });
 
   const result = await SqliteClient.executeSql(
     `SELECT
-      json_object(
-        'draftMessage', json_object(
-          ${draftMessageColumnNames}
-        ),
-        ${draftColumnNames}
-      ) as value
-    FROM draft a
-    LEFT JOIN
-      draftMessage b
-    ON b.id = a.draftMessageId
-    WHERE cid in (${questionMarks}) ORDER BY datetime(a.createdAt) DESC`,
-    cids,
+        json_object(
+          'draftMessage', json_object(
+            ${draftMessageColumnNames}
+          ),
+          ${draftColumnNames}
+        ) as value
+      FROM draft a
+      LEFT JOIN
+        draftMessage b
+      ON b.id = a.draftMessageId
+      WHERE a.cid = ? AND a.parentId is ?`,
+    [cid, parent_id],
   );
 
-  return result.map((r) => JSON.parse(r.value));
+  console.log('selectDraftMessageFromDraft result', result);
+
+  return result[0] ? JSON.parse(result[0].value) : undefined;
 };

package/src/store/apis/queries/selectDraftMessageFromDraftForChannels.ts

@@ -0,0 +1,41 @@
+import { tables } from '../../schema';
+import { SqliteClient } from '../../SqliteClient';
+import type { TableRowJoinedDraftMessage } from '../../types';
+
+export const selectDraftMessageFromDraftForChannels = async (
+  cids?: string[],
+): Promise<TableRowJoinedDraftMessage<'draft'>[]> => {
+  if (!cids || cids.length === 0) {
+    return [];
+  }
+
+  const questionMarks = Array(cids.length).fill('?').join(',');
+  const draftColumnNames = Object.keys(tables.draft.columns)
+    .map((name) => `'${name}', a.${name}`)
+    .join(', ');
+  const draftMessageColumnNames = Object.keys(tables.draftMessage.columns)
+    .map((name) => `'${name}', b.${name}`)
+    .join(', ');
+
+  SqliteClient.logger?.('info', 'selectDraftMessageFromDraftForChannels', {
+    cids,
+  });
+
+  const result = await SqliteClient.executeSql(
+    `SELECT
+      json_object(
+        'draftMessage', json_object(
+          ${draftMessageColumnNames}
+        ),
+        ${draftColumnNames}
+      ) as value
+    FROM draft a
+    LEFT JOIN
+      draftMessage b
+    ON b.id = a.draftMessageId
+    WHERE cid in (${questionMarks}) ORDER BY datetime(a.createdAt) DESC`,
+    cids,
+  );
+
+  return result.map((r) => JSON.parse(r.value));
+};