chore: fix rebase issues and refactor consts

Author: pregnantboy

packages/backend/src/apps/tiles/actions/find-multiple-rows/index.ts

@@ -3,10 +3,11 @@ import { IRawAction } from '@plumber/types'
 import { FOR_EACH_INPUT_SOURCE } from '@/apps/toolbox/common/constants'
 import StepError from '@/errors/step'
 import logger from '@/helpers/logger'
-import { getTableRows, TableRowFilter } from '@/models/dynamodb/table-row'
 import Step from '@/models/step'
 import TableCollaborator from '@/models/table-collaborators'
-import TableColumnMetadata from '@/models/table-column-metadata'
+import TableMetadata from '@/models/table-metadata'
+import { getTableOperations } from '@/models/tiles/factory'
+import { TableRowFilter } from '@/models/tiles/types'
 
 import {
   FIND_MULTIPLE_ROWS_LIMIT,
@@ -89,13 +90,24 @@ const action: IRawAction = {
     /**
      * Check for columns first, there will not be any columns if the tile has been deleted.
      */
-    const columns = await TableColumnMetadata.getColumns(tableId, $)
+    const table = await TableMetadata.query()
+      .findById(tableId)
+      .withGraphFetched('columns')
+
+    if (!table) {
+      throw new StepError(
+        'Tile not found',
+        'Tile may have been deleted. Please check your tile.',
+        $.step.position,
+        $.app.name,
+      )
+    }
 
     await TableCollaborator.hasAccess($.user?.id, tableId, 'editor', $)
 
     // Check that filters are valid
     try {
-      validateFilters(filters, columns)
+      validateFilters(filters, table.columns)
     } catch (e) {
       logger.error({
         message: 'Invalid filters',
@@ -117,16 +129,18 @@ const action: IRawAction = {
     const scanLimitRaw = +step.config?.adminOverride?.tileScanLimit
     const scanLimit = isNaN(scanLimitRaw) ? undefined : scanLimitRaw
 
-    const { rows } = await getTableRows({
+    const tableOperations = getTableOperations(table.db)
+
+    const { rows } = await tableOperations.getTableRows({
       tableId,
-      columnIds: columns.map((c) => c.id),
+      columnIds: table.columns.map((c) => c.id),
       filters,
       order: returnLastRowFirst ? 'desc' : 'asc',
       scanLimit,
     })
 
     const columnData: TileColumnMetadata[] = []
-    columns
+    table.columns
       .sort((a, b) => a.position - b.position)
       .forEach((c) => {
         columnData.push({

packages/backend/src/apps/tiles/common/constants.ts

@@ -1,6 +1,10 @@
 import { IFieldVisibilityCondition } from '@plumber/types'
 
-import { TableRowFilterOperator } from '@/models/dynamodb/table-row'
+import { TableRowFilterOperator } from '@/models/tiles/types'
+
+export const POSTGRES_FIND_ALL_ROWS_PAGINATION_LIMIT = 10000
+
+export const DYNAMODB_DEFAULT_PAGINATION_CURSOR = 'start' as const
 
 export const FIND_MULTIPLE_ROWS_LIMIT = 500
 

packages/backend/src/graphql/queries/tiles/get-all-rows.ts

@@ -1,5 +1,9 @@
 import { NotFoundError as ObjectionNotFoundError } from 'objection'
 
+import {
+  DYNAMODB_DEFAULT_PAGINATION_CURSOR,
+  POSTGRES_FIND_ALL_ROWS_PAGINATION_LIMIT,
+} from '@/apps/tiles/common/constants'
 import { NotFoundError } from '@/errors/graphql-errors/not-found'
 import { RateLimitedError } from '@/errors/graphql-errors/rate-limited'
 import InvalidTileViewKeyError from '@/errors/invalid-tile-view-key'
@@ -49,10 +53,13 @@ const getAllRows: QueryResolvers['getAllRows'] = async (
         columnIds,
         // If table is postgres, we set pagination limit
         // If table is dynamodb, the pagination size is based on dynamodb query limits
-        scanLimit: table.db === 'pg' ? 10000 : undefined,
+        scanLimit:
+          table.db === 'pg'
+            ? POSTGRES_FIND_ALL_ROWS_PAGINATION_LIMIT
+            : undefined,
         stringifiedCursor:
           table.db === 'ddb' && !stringifiedCursor
-            ? 'start'
+            ? DYNAMODB_DEFAULT_PAGINATION_CURSOR
             : stringifiedCursor,
       })
 

packages/backend/src/models/tiles/dynamodb/table-row/functions.ts

@@ -1,6 +1,7 @@
 import { type QueryCommandOutput } from '@aws-sdk/client-dynamodb'
 import { randomUUID } from 'crypto'
 
+import { DYNAMODB_DEFAULT_PAGINATION_CURSOR } from '@/apps/tiles/common/constants'
 import logger from '@/helpers/logger'
 
 import {
@@ -321,7 +322,7 @@ export const getTableRows = async ({
    * if stringifiedCursor is 'start', we will fetch the first page of results
    * if undefined, we will auto-paginate
    */
-  stringifiedCursor?: string | 'start'
+  stringifiedCursor?: string | typeof DYNAMODB_DEFAULT_PAGINATION_CURSOR
   /**
    * Optional limit on the total number of rows scanned.
    */
@@ -345,7 +346,8 @@ export const getTableRows = async ({
     const tableRows = []
     let remainingScanLimit = scanLimit ?? Infinity
     let cursor: any =
-      stringifiedCursor && stringifiedCursor !== 'start'
+      stringifiedCursor &&
+      stringifiedCursor !== DYNAMODB_DEFAULT_PAGINATION_CURSOR
         ? JSON.parse(stringifiedCursor)
         : null
     do {

packages/backend/src/models/tiles/types.ts

@@ -1,5 +1,7 @@
 import { CreateEntityItem } from 'electrodb'
 
+import { DYNAMODB_DEFAULT_PAGINATION_CURSOR } from '@/apps/tiles/common/constants'
+
 import { TableRow } from './dynamodb/table-row/model'
 
 export type TableRowItem = CreateEntityItem<typeof TableRow>
@@ -58,7 +60,7 @@ export interface TableOperations {
     columnIds?: string[]
     filters?: TableRowFilter[]
     order?: 'asc' | 'desc'
-    stringifiedCursor?: string | 'start'
+    stringifiedCursor?: string | typeof DYNAMODB_DEFAULT_PAGINATION_CURSOR
     scanLimit?: number
   }): Promise<{
     rows: TableRowOutput[]

packages/frontend/src/pages/Tile/components/TableBanner/ImportCsvButton.tsx

@@ -47,13 +47,13 @@ type IMPORT_STATUS =
   | 'completed'
   | 'error'
 
-// 5 MB in bytes
+// 2 MB in bytes for both for now
 const MAX_FILE_SIZE = {
-  [DatabaseType.Pg]: 5 * 1000 * 1000,
+  [DatabaseType.Pg]: 2 * 1000 * 1000,
   [DatabaseType.Ddb]: 2 * 1000 * 1000,
 }
 // Add row chunk size
-const CHUNK_SIZE = {
+const IMPORT_CHUNK_SIZE = {
   [DatabaseType.Pg]: 1000,
   [DatabaseType.Ddb]: 100,
 }
@@ -262,7 +262,7 @@ export const ImportCsvModalContent = ({
         setImportStatus('importing')
         setRowsToImport(mappedData.length)
         setRowsImported(0)
-        const chunkedData = chunk(mappedData, CHUNK_SIZE[databaseType])
+        const chunkedData = chunk(mappedData, IMPORT_CHUNK_SIZE[databaseType])
 
         for (let i = 0; i < chunkedData.length; i++) {
           await createRows({
@@ -276,7 +276,7 @@ export const ImportCsvModalContent = ({
           if (i === chunkedData.length - 1 && !onPreImport) {
             await refetch()
           }
-          setRowsImported((i + 1) * CHUNK_SIZE[databaseType])
+          setRowsImported((i + 1) * IMPORT_CHUNK_SIZE[databaseType])
         }
       }
       setImportStatus('completed')