progress: fixes

Author: LemonardoD

backend/src/modules/attachments/handlers.ts

@@ -47,8 +47,8 @@ const attachmentsRouteHandlers = app
     // Copy over the relevant query params that the Electric client adds
     // so that we return the right part of the Shape log.
     originUrl.searchParams.set('live', offlinePrefetch ? 'false' : (live ?? 'false'));
-    originUrl.searchParams.set('handle', handle);
     originUrl.searchParams.set('offset', offset);
+    if (handle) originUrl.searchParams.set('handle', handle);
     if (cursor) originUrl.searchParams.set('cursor', cursor);
     if (where) originUrl.searchParams.set('where', where);
 

backend/src/utils/schema/common.ts

@@ -163,7 +163,7 @@ export const validDomainsSchema = z
 export const minimalElectrycSyncQuery = z.object({
   table: z.string(),
   offset: z.string(),
-  handle: z.string(),
+  handle: z.string().optional(),
   cursor: z.string().optional(),
   live: z.string().optional(),
   where: z.string().optional(),

frontend/src/api.gen/sdk.gen.ts

@@ -1721,7 +1721,7 @@ export const getPublicCounts = <ThrowOnError extends boolean = true>(options?: O
  * @param {string | string} options.path.orgidorslug - `string | string`
  * @param {string} options.query.table - `string`
  * @param {string} options.query.offset - `string`
- * @param {string} options.query.handle - `string`
+ * @param {string=} options.query.handle - `string` (optional)
  * @param {string=} options.query.cursor - `string` (optional)
  * @param {string=} options.query.live - `string` (optional)
  * @param {string=} options.query.where - `string` (optional)

frontend/src/api.gen/types.gen.ts

@@ -3457,7 +3457,7 @@ export type ShapeProxyData = {
   query: {
     table: string;
     offset: string;
-    handle: string;
+    handle?: string;
     cursor?: string;
     live?: string;
     where?: string;

frontend/src/api.gen/zod.gen.ts

@@ -1458,7 +1458,7 @@ export const zShapeProxyData = z.object({
   query: z.object({
     table: z.string(),
     offset: z.string(),
-    handle: z.string(),
+    handle: z.optional(z.string()),
     cursor: z.optional(z.string()),
     live: z.optional(z.string()),
     where: z.optional(z.string()),

frontend/src/modules/attachments/delete-attachments.tsx

@@ -20,6 +20,7 @@ const DeleteAttachments = ({ entity, attachments, callback, dialog: isDialog }:
 
   const { collection: attachmentCollection } = getAttachmentsCollection(orgIdOrSlug);
   const localAttachmentCollection = getLocalAttachmentsCollection(orgIdOrSlug);
+  localAttachmentCollection.startSyncImmediate();
 
   const onDelete = async () => {
     const localDeletionIds: string[] = [];

frontend/src/modules/attachments/helpers/local-file-storage.ts

@@ -73,11 +73,14 @@ export const LocalFileStorage = {
   async changeFile(fileId: string, newData: Partial<CustomUppyFile>): Promise<void> {
     try {
       const storageKeys = await keys();
-      if (!storageKeys.length) return undefined;
+      if (!storageKeys.length) return;
+
       for (const groupKey of storageKeys) {
         const group = await get<StoredOfflineData>(groupKey);
-        if (!group) return undefined;
+        if (!group || !group.files || !group.files[fileId]) continue;
+
         group.files[fileId] = { ...group.files[fileId], ...newData };
+        await set(groupKey, group);
       }
     } catch (error) {
       Sentry.captureException(error);

frontend/src/modules/attachments/query.ts

@@ -171,14 +171,19 @@ export const getLocalAttachmentsCollection = (organizationId: string): Collectio
 
         const groupId = files.length > 1 ? nanoid() : null;
 
-        return files.map(({ size, preview, id, type, data, meta }) => {
+        return files.map((file) => {
+          const name = file.name || file.meta.name;
+          const filename = `${name}.${file.extension}`;
+
+          const size = file.size ? String(file.size) : String(file.data.size);
+
           return {
-            id,
-            filename: meta?.name || 'Unnamed file',
-            name: meta.name,
-            content_type: type,
-            size: size ? String(size) : String(data.size),
-            original_key: preview ?? '',
+            id: file.id,
+            filename,
+            name,
+            content_type: file.type,
+            size,
+            original_key: file.preview ?? '',
             thumbnail_key: null,
             converted_key: null,
             converted_content_type: null,

frontend/src/modules/attachments/table/helpers.tsx

@@ -14,6 +14,7 @@ export const useAttachmentsUploadDialog = () => {
   const open = (organizationId: string) => {
     const { collection: attachmentCollection } = getAttachmentsCollection(organizationId);
     const localAttachmentCollection = getLocalAttachmentsCollection(organizationId);
+    localAttachmentCollection.startSyncImmediate();
 
     const onComplete = (result: UploadedUppyFile<'attachment'>) => {
       const attachments = parseUploadedAttachments(result, organizationId);

frontend/src/modules/attachments/table/table-wrapper.tsx

@@ -9,12 +9,12 @@ import { useColumns } from '~/modules/attachments/table/columns';
 import BaseDataTable from '~/modules/attachments/table/table';
 import { AttachmentsTableBar } from '~/modules/attachments/table/table-bar';
 import type { LiveQueryAttachment } from '~/modules/attachments/types';
+import { useLocalSyncAttachments } from '~/modules/attachments/use-local-sync-attachments';
 import { AlertWrap } from '~/modules/common/alert-wrap';
 import { useSortColumns } from '~/modules/common/data-table/sort-columns';
 import type { BaseTableMethods } from '~/modules/common/data-table/types';
 import type { EntityPage } from '~/modules/entities/types';
 import type { attachmentsSearchSchema } from '~/routes/organizations';
-import { useLocalSyncAttachments } from '../use-local-sync-attachments';
 
 const LIMIT = appConfig.requestLimits.attachments;