From 4fe80d1d9bdc4b710d41671311a2f9d9bd836e7c Mon Sep 17 00:00:00 2001 From: cstns Date: Wed, 11 Nov 2026 16:45:35 +0200 Subject: [PATCH] Show that a table is loading when switching tables in the Tables explorer Picking a table gave no sign that it was loading. A table that hadn't been opened yet said there was nothing there until its columns arrived, then showed headers with no rows until the rows did. The data area now shows a loading indicator while the columns aren't known, then skeleton rows under the real headers while the rows load, and only says there is nothing to show once loading is done. Changing page and Refresh use the same skeleton rows. --- .../TableExplorer/components/RowsList.vue | 14 ++++- .../pages/team/Tables/RowsList.spec.js | 61 +++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/team/Tables/Table/TableExplorer/components/RowsList.vue b/frontend/src/pages/team/Tables/Table/TableExplorer/components/RowsList.vue index d72b57ff03..ee02c0ab1b 100644 --- a/frontend/src/pages/team/Tables/Table/TableExplorer/components/RowsList.vue +++ b/frontend/src/pages/team/Tables/Table/TableExplorer/components/RowsList.vue @@ -20,7 +20,7 @@
+ +

There doesn't seem to be anything here!

@@ -93,7 +95,11 @@ export default defineComponent({ }, watch: { tableSelection (table) { - if (!table) return + if (!table) { + this.setTableLoadingState(false) + return + } + this.setTableLoadingState(true) this.getTableSchema({ teamId: this.team.id, databaseId: this.$route.params.id, @@ -107,6 +113,10 @@ export default defineComponent({ schemaName: table.dbSchema })) .catch(e => e) + .finally(() => { + // a table picked in the meantime is still loading, so leave the state to it + if (this.tableSelection === table) this.setTableLoadingState(false) + }) } }, beforeUnmount () { diff --git a/test/unit/frontend/pages/team/Tables/RowsList.spec.js b/test/unit/frontend/pages/team/Tables/RowsList.spec.js index 7ac35d4ea1..6ebcd18f3e 100644 --- a/test/unit/frontend/pages/team/Tables/RowsList.spec.js +++ b/test/unit/frontend/pages/team/Tables/RowsList.spec.js @@ -139,4 +139,65 @@ describe('RowsList', () => { expect(wrapper.find('thead .sortable').exists()).toBe(false) }) }) + + describe('loading a table', () => { + const readings = { name: 'readings', dbSchema: 'public' } + const schema = [{ name: 'id', safeName: 'col', type: 'bigint' }] + // the store is a plain mock, so run the table selection watcher by hand + const selectTable = (wrapper, table) => wrapper.vm.$options.watch.tableSelection.call(wrapper.vm, table) + + beforeEach(() => { + vi.clearAllMocks() + mocks.tablesStore.isLoading = false + mocks.tablesStore.tableSelection = readings + mocks.tablesStore.selectedTable = { schema, payload: { safe: [{ col: 1 }], total: 1 } } + }) + + test('shows a loading indicator while the columns of a table are not known yet', () => { + mocks.tablesStore.isLoading = true + mocks.tablesStore.selectedTable = { name: 'readings' } + const wrapper = mountRowsList() + expect(wrapper.find('[data-el="table-loading"]').exists()).toBe(true) + expect(wrapper.text()).not.toContain("There doesn't seem to be anything here!") + }) + + test('shows skeleton rows under the headers while the rows are loading', () => { + mocks.tablesStore.isLoading = true + const wrapper = mountRowsList() + expect(wrapper.find('thead').text()).toContain('id') + expect(wrapper.findAll('.ff-data-table--skeleton-row').length).toBeGreaterThan(0) + }) + + test('says there is nothing to show only once loading is done', () => { + mocks.tablesStore.selectedTable = { name: 'readings' } + const wrapper = mountRowsList() + expect(wrapper.find('[data-el="table-loading"]').exists()).toBe(false) + expect(wrapper.text()).toContain("There doesn't seem to be anything here!") + }) + + test('is loading from the moment a table is picked until its rows are in', async () => { + const wrapper = mountRowsList() + selectTable(wrapper, readings) + expect(mocks.tablesStore.setTableLoadingState.mock.calls).toEqual([[true]]) + await flushPromises() + expect(mocks.tablesStore.getTableSchema).toHaveBeenCalledTimes(1) + expect(mocks.tablesStore.getTableData).toHaveBeenCalledTimes(1) + expect(mocks.tablesStore.setTableLoadingState.mock.calls).toEqual([[true], [false]]) + }) + + test('stops loading when the table fails to load', async () => { + mocks.tablesStore.getTableSchema.mockRejectedValueOnce(new Error('nope')) + const wrapper = mountRowsList() + selectTable(wrapper, readings) + await flushPromises() + expect(mocks.tablesStore.setTableLoadingState.mock.calls).toEqual([[true], [false]]) + }) + + test('stays loading when another table was picked before this one finished', async () => { + const wrapper = mountRowsList() + selectTable(wrapper, { name: 'orders', dbSchema: 'public' }) + await flushPromises() + expect(mocks.tablesStore.setTableLoadingState.mock.calls).toEqual([[true]]) + }) + }) })