From 4c49f91ceee1d11814013651e7471b50bfbee7b7 Mon Sep 17 00:00:00 2001 From: Bram Date: Sun, 15 Feb 2026 21:10:02 +0100 Subject: [PATCH 1/2] Stop loading on error (#4767) --- web-frontend/modules/database/pages/table.vue | 2 ++ web-frontend/modules/database/searchTypes.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web-frontend/modules/database/pages/table.vue b/web-frontend/modules/database/pages/table.vue index a853e02184..bc61a7be1c 100644 --- a/web-frontend/modules/database/pages/table.vue +++ b/web-frontend/modules/database/pages/table.vue @@ -139,6 +139,7 @@ const { data, error, pending, status, refresh } = await useAsyncData( if (type.isDeactivated(currentDatabase.workspace.id)) { result.error = { statusCode: 400, message: type.getDeactivatedText() } + $store.dispatch('table/setLoading', false) return result } @@ -153,6 +154,7 @@ const { data, error, pending, status, refresh } = await useAsyncData( if (e.response === undefined && !(e instanceof StoreItemLookupError)) throw e result.error = normalizeError(e) + $store.dispatch('table/setLoading', false) return result } } diff --git a/web-frontend/modules/database/searchTypes.js b/web-frontend/modules/database/searchTypes.js index e54de03768..4c370b3995 100644 --- a/web-frontend/modules/database/searchTypes.js +++ b/web-frontend/modules/database/searchTypes.js @@ -133,7 +133,6 @@ export class DatabaseRowSearchType extends BaseSearchType { tableId: result.metadata.table_id, viewId: '', rowId: result.metadata.row_id, - viewId: '', }, } } From 1a31c16e535d0e529efb2687a0c538e426c56cb2 Mon Sep 17 00:00:00 2001 From: Bram Date: Sun, 15 Feb 2026 21:23:39 +0100 Subject: [PATCH 2/2] Fix route to webhook and data sync (#4768) --- .../modules/baserow_enterprise/notificationTypes.js | 3 +++ web-frontend/modules/database/notificationTypes.js | 2 ++ 2 files changed, 5 insertions(+) diff --git a/enterprise/web-frontend/modules/baserow_enterprise/notificationTypes.js b/enterprise/web-frontend/modules/baserow_enterprise/notificationTypes.js index 30373f75bf..5d002f3a37 100644 --- a/enterprise/web-frontend/modules/baserow_enterprise/notificationTypes.js +++ b/enterprise/web-frontend/modules/baserow_enterprise/notificationTypes.js @@ -25,6 +25,7 @@ export class PeriodicDataSyncDeactivatedNotificationType extends NotificationTyp params: { databaseId: notificationData.database_id, tableId: notificationData.table_id, + viewId: '', selectedPage: PeriodicIntervalFieldsConfigureDataSyncType.getType(), }, } @@ -50,6 +51,7 @@ export class TwoWayDataSyncUpdateFiledNotificationType extends NotificationType params: { databaseId: notificationData.database_id, tableId: notificationData.table_id, + viewId: '', selectedPage: SyncedFieldsConfigureDataSyncType.getType(), }, } @@ -75,6 +77,7 @@ export class TwoWaySyncDeactivatedNotificationType extends NotificationType { params: { databaseId: notificationData.database_id, tableId: notificationData.table_id, + viewId: '', selectedPage: SyncedFieldsConfigureDataSyncType.getType(), }, } diff --git a/web-frontend/modules/database/notificationTypes.js b/web-frontend/modules/database/notificationTypes.js index 1be5325555..770b207aa8 100644 --- a/web-frontend/modules/database/notificationTypes.js +++ b/web-frontend/modules/database/notificationTypes.js @@ -103,6 +103,7 @@ export class WebhookDeactivatedNotificationType extends NotificationType { params: { databaseId: notificationData.database_id, tableId: notificationData.table_id, + viewId: '', }, } } @@ -127,6 +128,7 @@ export class WebhookPayloadTooLargedNotificationType extends NotificationType { params: { databaseId: notificationData.database_id, tableId: notificationData.table_id, + viewId: '', }, } }