Merge branch 'develop-v2' into chore/vault/throw-errors

Author: m0nggh

package-lock.json

@@ -105,5 +105,5 @@
     "tsconfig-paths": "^4.2.0",
     "type-fest": "4.10.3"
   },
-  "version": "1.29.3"
+  "version": "1.29.5"
 }

packages/backend/package.json

@@ -73,10 +73,14 @@ describe('tiles create row action', () => {
     expect($.setActionItem).toBeCalled()
   })
 
-  it('should now allow non-owners to create row', async () => {
-    $.user = viewer
-    await expect(createRowAction.run($)).rejects.toThrow(StepError)
+  it('should allow editors to create row', async () => {
     $.user = editor
+    await expect(createRowAction.run($)).resolves.toBeUndefined()
+    expect($.setActionItem).toBeCalled()
+  })
+
+  it('should not allow viewers to create row', async () => {
+    $.user = viewer
     await expect(createRowAction.run($)).rejects.toThrow(StepError)
   })
 })

packages/backend/src/apps/tiles/__tests__/actions/create-row.itest.ts

@@ -81,10 +81,14 @@ describe('tiles create row action', () => {
     expect($.setActionItem).toBeCalled()
   })
 
-  it('should now allow non-owners to find single row', async () => {
-    $.user = viewer
-    await expect(findSingleRowAction.run($)).rejects.toThrow(StepError)
+  it('should allow editors to find single row', async () => {
     $.user = editor
+    await expect(findSingleRowAction.run($)).resolves.toBeUndefined()
+    expect($.setActionItem).toBeCalled()
+  })
+
+  it('should not allow viewers to find single row', async () => {
+    $.user = viewer
     await expect(findSingleRowAction.run($)).rejects.toThrow(StepError)
   })
 })

packages/backend/src/apps/tiles/__tests__/actions/find-single-row.itest.ts

@@ -82,10 +82,14 @@ describe('tiles create row action', () => {
     expect($.setActionItem).toBeCalled()
   })
 
-  it('should now allow non-owners to update row', async () => {
-    $.user = viewer
-    await expect(updateRowAction.run($)).rejects.toThrow(StepError)
+  it('should allow editors to update row', async () => {
     $.user = editor
+    await expect(updateRowAction.run($)).resolves.toBeUndefined()
+    expect($.setActionItem).toBeCalled()
+  })
+
+  it('should not allow viewers to update row', async () => {
+    $.user = viewer
     await expect(updateRowAction.run($)).rejects.toThrow(StepError)
   })
 })

packages/backend/src/apps/tiles/__tests__/actions/update-row.itest.ts

@@ -94,7 +94,7 @@ const action: IRawAction = {
       rowData: { columnId: string; cellValue: string }[]
     }
 
-    await TableCollaborator.hasAccess($.user?.id, tableId, 'owner', $)
+    await TableCollaborator.hasAccess($.user?.id, tableId, 'editor', $)
 
     const table = await TableMetadata.query().findById(tableId)
 

packages/backend/src/apps/tiles/actions/create-row/index.ts

@@ -149,7 +149,7 @@ const action: IRawAction = {
       returnLastRow: boolean | undefined
     }
 
-    await TableCollaborator.hasAccess($.user?.id, tableId, 'owner', $)
+    await TableCollaborator.hasAccess($.user?.id, tableId, 'editor', $)
 
     const columns = await TableColumnMetadata.query().where({
       table_id: tableId,

packages/backend/src/apps/tiles/actions/find-single-row/index.ts

@@ -108,7 +108,7 @@ const action: IRawAction = {
       )
     }
 
-    await TableCollaborator.hasAccess($.user?.id, tableId, 'owner', $)
+    await TableCollaborator.hasAccess($.user?.id, tableId, 'editor', $)
 
     /**
      * Row ID is empty, this could be because the previous get single row action

packages/backend/src/apps/tiles/actions/update-row/index.ts

@@ -25,7 +25,7 @@ const dynamicData: IDynamicData = {
       const tile = await currentUser
         .$relatedQuery('tables')
         .findById($.step.parameters.tableId as string)
-        .where('role', 'owner')
+        .whereIn('role', ['owner', 'editor'])
         .throwIfNotFound()
       const columns = await tile
         .$relatedQuery('columns')

packages/backend/src/apps/tiles/dynamic-data/list-columns.ts

@@ -19,7 +19,7 @@ const dynamicData: IDynamicData = {
       const currentUser = await User.query().findById($.user.id)
       const tiles = await currentUser
         .$relatedQuery('tables')
-        .where('role', 'owner')
+        .whereIn('role', ['owner', 'editor'])
         .orderBy('created_at', 'desc')
 
       return {