Skip to content

feat(AnalyticalTable): introduce alwaysShowBusyIndicator prop #7448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2025
Merged

feat(AnalyticalTable): introduce alwaysShowBusyIndicator prop #7448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d32798f
feat(AnalyticalTable): introduce `alwaysShowBusyIndicator` prop
Lukas742 Jun 16, 2025
813df0f
Merge branch 'main' into feat/at-always-show-bi
Lukas742 Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,16 @@ describe('AnalyticalTable', () => {
'opacity',
'0.4',
);
cy.mount(<AnalyticalTable data={[]} columns={columns} loading loadingDelay={0} alwaysShowBusyIndicator />);
cy.get('[data-component-name="AnalyticalTableLoadingPlaceholder"]').should('not.exist');
cy.get('.ui5-busy-indicator-busy-area', { timeout: 2000 }).should('be.visible');
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class*="busyIndicator"])').should(
'have.css',
'opacity',
'0.4',
);
cy.mount(<AnalyticalTable data={data} columns={columns} loading />);
cy.get('[data-component-name="AnalyticalTableLoadingPlaceholder"]').should('not.exist');
cy.get('.ui5-busy-indicator-busy-area', { timeout: 2000 }).should('be.visible');
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class*="busyIndicator"])').should(
'have.css',
Expand Down
7 changes: 4 additions & 3 deletions packages/main/src/components/AnalyticalTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ const measureElement = (el: HTMLElement) => {
*/
const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTypes>((props, ref) => {
const {
alternateRowColor,
adjustTableHeightOnPopIn,
alternateRowColor,
alwaysShowBusyIndicator,
className,
columnOrder,
columns,
Expand Down Expand Up @@ -749,7 +750,7 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
className={classNames.tableContainerWithScrollBar}
data-component-name="AnalyticalTableContainerWithScrollbar"
>
{loading && !!rows.length && (
{loading && (!!rows.length || alwaysShowBusyIndicator) && (
<BusyIndicator
className={classNames.busyIndicator}
active={true}
Expand Down Expand Up @@ -816,7 +817,7 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
tabIndex={0}
className={classNames.noDataContainer}
>
{loading ? (
{loading && !alwaysShowBusyIndicator ? (
<TablePlaceholder
columns={visibleColumns}
rows={minRows}
Expand Down
6 changes: 5 additions & 1 deletion packages/main/src/components/AnalyticalTable/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ export interface AnalyticalTablePropTypes extends Omit<CommonProps, 'title'> {
/**
* Indicates whether a loading indicator should be shown.
*
* __Note:__ If the data array is not empty and loading is set to `true` a `BusyIndicator` will be displayed on top of the table, otherwise a skeleton placeholder will be shown.
* __Note:__ If the data array is not empty and loading is set to `true` a `BusyIndicator` will be displayed on top of the table, otherwise a skeleton placeholder will be shown. You can control this behavior via the `alwaysShowBusyIndicator` prop.
*/
loading?: boolean;
/**
Expand All @@ -720,6 +720,10 @@ export interface AnalyticalTablePropTypes extends Omit<CommonProps, 'title'> {
* Setting this prop to `true` will show an overlay on top of the AnalyticalTable content preventing users from interacting with it.
*/
showOverlay?: boolean;
/**
* If `true`, always shows the `BusyIndicator` component when loading instead of the skeleton loader.
*/
alwaysShowBusyIndicator?: boolean;
/**
* Defines the text shown if the data array is empty or a filtered table doesn't return results.
*
Expand Down
Loading