diff --git a/packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx b/packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx index 8bd08acfa6..88968cd289 100644 --- a/packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx +++ b/packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx @@ -1496,8 +1496,9 @@ describe('AnalyticalTable', () => { }); it('Loading & No Data', () => { - cy.mount(); + cy.mount(); cy.get('[data-component-name="AnalyticalTableLoadingPlaceholder"]').should('be.visible'); + cy.get('.ui5-busy-indicator-busy-area').should('not.exist'); cy.mount(); cy.get('.ui5-busy-indicator-busy-area', { timeout: 2000 }).should('be.visible'); cy.mount(); diff --git a/packages/main/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx index 7720619cf3..e564e14e06 100644 --- a/packages/main/src/components/AnalyticalTable/index.tsx +++ b/packages/main/src/components/AnalyticalTable/index.tsx @@ -699,7 +699,7 @@ const AnalyticalTable = forwardRef - {loading && ( + {loading && !!rows.length && (