feat: reimplement dropPendingTasks

Author: isekovanic

package/src/components/Channel/Channel.tsx

@@ -1503,7 +1503,6 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
   const removeMessage: MessagesContextValue['removeMessage'] = useStableCallback(
     async (message) => {
       if (channel) {
-        // TODO: See if it's easy to refactor this to be able to accept DB queries
         channel.state.removeMessage(message);
         copyMessagesStateFromChannel(channel);
 
@@ -1513,13 +1512,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
       }
 
       if (client.offlineDb) {
-        // FIXME: Batch these maybe ?.
-        await Promise.all([
-          client.offlineDb.dropPendingTasks({ messageId: message.id }),
-          client.offlineDb.hardDeleteMessage({
-            id: message.id,
-          }),
-        ]);
+        await client.offlineDb.handleRemoveMessage({ messageId: message.id });
       }
     },
   );

package/src/components/Chat/Chat.tsx

@@ -163,14 +163,6 @@ const ChatWithContext = (props: PropsWithChildren<ChatProps>) => {
    */
   const { connectionRecovering, isOnline } = useIsOnline(client, closeConnectionOnBackground);
 
-  // const [initialisedDatabaseConfig, setInitialisedDatabaseConfig] = useState<{
-  //   initialised: boolean;
-  //   userID?: string;
-  // }>({
-  //   initialised: false,
-  //   userID: client.userID,
-  // });
-
   const { initialized: offlineDbInitialized, userId: offlineDbUserId } =
     useStateStore(client.offlineDb?.state, selector) ?? {};
 

package/src/store/OfflineDB.ts

@@ -70,6 +70,8 @@ export class OfflineDB extends AbstractOfflineDB {
 
   deleteMessagesForChannel = api.deleteMessagesForChannel;
 
+  dropPendingTasks = api.dropPendingTasks;
+
   hardDeleteMessage = api.deleteMessage;
 
   softDeleteMessage = api.softDeleteMessage;

package/src/store/apis/dropPendingTasks.ts

@@ -0,0 +1,32 @@
+import { createDeleteQuery } from '../sqlite-utils/createDeleteQuery';
+import { SqliteClient } from '../SqliteClient';
+
+/**
+ * dropPendingTasks - Drops all pending tasks from the DB given a specific messageId.
+ * Useful for when we do some message actions on a failed message and then we decide to
+ * delete it afterwards, removing it from the state.
+ *
+ * @param {Object} param
+ * @param {string} param.messageId The messageId for which we want to remove the pending tasks.
+ * @param {boolean} param.flush Whether we should immediately execute the query or return it as a prepared one.
+ *
+ * @return {() => void} - A function that can be called to remove the task from the database
+ */
+export const dropPendingTasks = async ({
+  messageId,
+  flush = true,
+}: {
+  messageId: string;
+  flush?: boolean;
+}) => {
+  const queries = [createDeleteQuery('pendingTasks', { messageId })];
+  SqliteClient.logger?.('info', 'dropPendingTasks', {
+    messageId,
+  });
+
+  if (flush) {
+    await SqliteClient.executeSqlBatch(queries);
+  }
+
+  return queries;
+};

package/src/store/apis/index.ts

@@ -30,3 +30,4 @@ export * from './deletePendingTask';
 export * from './getPendingTasks';
 export * from './softDeleteMessage';
 export * from './channelExists';
+export * from './dropPendingTasks';

package/src/store/schema.ts

@@ -1,6 +1,4 @@
-import type { MessageLabel, Role } from 'stream-chat';
-
-import type { PendingTaskTypes } from './types';
+import type { MessageLabel, PendingTaskTypes, Role } from 'stream-chat';
 
 import type { ValueOf } from '../types/types';