fix: thread draft bugs, thread draft pending tasks, schema and mapping

Author: isekovanic

examples/SampleApp/src/utils/useCreateDraftFocusEffect.tsx

@@ -9,11 +9,7 @@ export const useCreateDraftFocusEffect = () => {
   useFocusEffect(
     useCallback(() => {
       return navigation.addListener('beforeRemove', async () => {
-        try {
-          await messageComposer.createDraft();
-        } catch (e) {
-          console.error('Failed to save draft before remove', e);
-        }
+        await messageComposer.createDraft();
       });
     }, [navigation, messageComposer]),
   );

package/src/store/SqliteClient.ts

@@ -28,7 +28,7 @@ import type { PreparedBatchQueries, PreparedQueries, Scalar, Table } from './typ
  * This way usage @op-engineering/op-sqlite package is scoped to a single class/file.
  */
 export class SqliteClient {
-  static dbVersion = 10;
+  static dbVersion = 11;
 
   static dbName = DB_NAME;
   static dbLocation = DB_LOCATION;

package/src/store/apis/addPendingTask.ts

@@ -14,16 +14,23 @@ import { SqliteClient } from '../SqliteClient';
  */
 export const addPendingTask = async (task: PendingTask) => {
   const storable = mapTaskToStorable(task);
-  const { channelId, channelType, payload, type } = storable;
-  const query = createUpsertQuery('pendingTasks', storable);
+  const { channelId, channelType, parentId, payload, type } = storable;
+  const queries = [];
+  if (type === 'create-draft' || type === 'delete-draft') {
+    // Only one draft pending task is allowed per entity (i.e thread, channel etc).
+    // If multiple arrive, we'll simply take the last one (since deleteDraft does not
+    // fail as an API if a draft doesn't exist).
+    queries.push(createDeleteQuery('pendingTasks', { channelId, channelType, parentId }));
+  }
+  queries.push(createUpsertQuery('pendingTasks', storable));
   SqliteClient.logger?.('info', 'addPendingTask', {
     channelId,
     channelType,
     id: task.id,
     type,
   });
 
-  await SqliteClient.executeSql.apply(null, query);
+  await SqliteClient.executeSqlBatch(queries);
 
   return async () => {
     SqliteClient.logger?.('info', 'deletePendingTaskAfterAddition', {
@@ -39,6 +46,6 @@ export const addPendingTask = async (task: PendingTask) => {
       type,
     });
 
-    await SqliteClient.executeSql.apply(null, query);
+    await SqliteClient.executeSqlBatch([query]);
   };
 };

package/src/store/mappers/mapStorableToTask.ts

@@ -3,12 +3,13 @@ import { PendingTask } from 'stream-chat';
 import type { TableRowJoinedUser } from '../types';
 
 export const mapStorableToTask = (row: TableRowJoinedUser<'pendingTasks'>): PendingTask => {
-  const { channelId, channelType, id, messageId, type } = row;
+  const { channelId, channelType, parentId, id, messageId, type } = row;
   return {
     channelId,
     channelType,
     id,
     messageId,
+    parentId,
     payload: JSON.parse(row.payload),
     type,
   };

package/src/store/schema.ts

@@ -175,6 +175,7 @@ export const tables: Tables = {
       createdAt: 'TEXT',
       id: 'INTEGER PRIMARY KEY AUTOINCREMENT',
       messageId: 'TEXT',
+      parentId: 'TEXT',
       payload: 'TEXT',
       type: 'TEXT',
     },
@@ -367,6 +368,7 @@ export type Schema = {
     createdAt: string;
     id: number;
     messageId: string;
+    parentId: string;
     payload: string;
     type: ValueOf<PendingTaskTypes>;
   };