Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions web/src/components/dashboards/perses/dashboard-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { Link, useSearchParams } from 'react-router-dom-v5-compat';

import { getDashboardUrl, usePerspective } from '../../hooks/usePerspective';
import { Timestamp } from '@openshift-console/dynamic-plugin-sdk';
import { listPersesDashboardsDataTestIDs } from 'src/components/data-test';
const perPageOptions = [
{ title: '10', value: 10 },
{ title: '20', value: 20 },
Expand Down Expand Up @@ -230,11 +231,13 @@ const DashboardsTable: React.FunctionComponent<DashboardsTableProps> = ({
filterId="name"
title={t('Name')}
placeholder={t('Filter by name')}
data-test={listPersesDashboardsDataTestIDs.NameFilter}
/>
<DataViewTextFilter
filterId="project-filter"
title={t('Project')}
placeholder={t('Filter by project')}
data-test={listPersesDashboardsDataTestIDs.ProjectFilter}
/>
</DataViewFilters>
}
Expand All @@ -248,16 +251,24 @@ const DashboardsTable: React.FunctionComponent<DashboardsTableProps> = ({
/>
) : (
<EmptyState variant={EmptyStateVariant.sm}>
<Title headingLevel="h4" size="lg">
<Title
headingLevel="h4"
size="lg"
data-test={listPersesDashboardsDataTestIDs.EmptyStateTitle}
>
{hasFiltersApplied ? t('No results found') : t('No dashboards found')}
</Title>
<EmptyStateBody>
<EmptyStateBody data-test={listPersesDashboardsDataTestIDs.EmptyStateBody}>
{hasFiltersApplied
? t('No results match the filter criteria. Clear filters to show results.')
: t('No Perses dashboards are currently available in this project.')}
</EmptyStateBody>
{hasFiltersApplied && (
<Button onClick={clearAllFilters} className="pf-c-button pf-m-link">
<Button
onClick={clearAllFilters}
className="pf-c-button pf-m-link"
data-test={listPersesDashboardsDataTestIDs.ClearAllFiltersButton}
>
{t('Clear all filters')}
</Button>
)}
Expand Down
11 changes: 10 additions & 1 deletion web/src/components/dashboards/perses/dashboard-skeleton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { useNavigate } from 'react-router-dom-v5-compat';
import { chart_color_blue_100, chart_color_blue_300 } from '@patternfly/react-tokens';
import { usePatternFlyTheme } from '../../hooks/usePatternflyTheme';
import { ListPageHeader } from '@openshift-console/dynamic-plugin-sdk';
import { listPersesDashboardsDataTestIDs } from '../../data-test';

const DashboardBreadCrumb: React.FunctionComponent = () => {
const { t } = useTranslation(process.env.I18N_NAMESPACE);
Expand Down Expand Up @@ -43,10 +44,18 @@ const DashboardBreadCrumb: React.FunctionComponent = () => {
color: linkColor,
textDecoration: 'underline',
}}
data-test={listPersesDashboardsDataTestIDs.PersesBreadcrumbDashboardItem}
>
{t('Dashboards')}
</BreadcrumbItem>
{dashboardName && <BreadcrumbItem isActive>{dashboardName}</BreadcrumbItem>}
{dashboardName && (
<BreadcrumbItem
isActive
data-test={listPersesDashboardsDataTestIDs.PersesBreadcrumbDashboardNameItem}
>
{dashboardName}
</BreadcrumbItem>
)}
</Breadcrumb>
);
};
Expand Down
9 changes: 8 additions & 1 deletion web/src/components/dashboards/perses/dashboard-toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import { useDashboardsData } from './hooks/useDashboardsData';
import { useAccessReview } from '@openshift-console/dynamic-plugin-sdk';
import { useTranslation } from 'react-i18next';

import { persesDashboardDataTestIDs } from '../../data-test';

export interface DashboardToolbarProps {
dashboardName: string;
dashboardTitleComponent?: ReactNode;
Expand Down Expand Up @@ -72,6 +74,7 @@ export const EditButton = ({ onClick }: EditButtonProps): ReactElement => {
color="secondary"
disabled={disabled || loading}
sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
data-test={persesDashboardDataTestIDs.editDashboardButtonToolbar}
>
{loading ? t('Loading...') : t('Edit')}
</Button>
Expand Down Expand Up @@ -199,7 +202,11 @@ export const OCPDashboardToolbar = (props: DashboardToolbarProps): ReactElement
<AddGroupButton />
</Stack>
<SaveDashboardButton onSave={onSave} isDisabled={isReadonly} />
<Button variant="outlined" onClick={onCancelButtonClick}>
<Button
variant="outlined"
onClick={onCancelButtonClick}
data-test={persesDashboardDataTestIDs.cancelButtonToolbar}
>
Cancel
</Button>
</Stack>
Expand Down
40 changes: 40 additions & 0 deletions web/src/components/data-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ export const LegacyTestIDs = {
export const IDs = {
ChartAxis0ChartLabel: 'chart-axis-0-ChartLabel', //id^=IDs.ChartAxis0ChartLabel AxisX
ChartAxis1ChartLabel: 'chart-axis-1-ChartLabel', //id^=IDs.ChartAxis1ChartLabel AxisY
persesDashboardCount: 'options-menu-top-pagination',
persesDashboardDownloadButton: 'download-dashboard-button',
};

export const Classes = {
Expand Down Expand Up @@ -203,3 +205,41 @@ export const Classes = {
SilenceLabelRow: '.pf-v6-l-grid.pf-m-all-12-col-on-sm.pf-m-all-4-col-on-md.pf-m-gutter, .row',
SilenceState: '.pf-v6-l-stack__item, .co-break-word',
};

export const persesAriaLabels = {
TimeRangeDropdown: 'Select time range. Currently set to [object Object]',
RefreshButton: 'Refresh',
RefreshIntervalDropdown: 'Select refresh interval. Currently set to 0s',
ZoomInButton: 'Zoom in',
ZoomOutButton: 'Zoom out',
ViewJSONButton: 'View JSON',
};

//data-testid
export const persesMUIDataTestIDs = {
variableDropdown: 'variable',
panelGroupHeader: 'panel-group-header',
panelHeader: 'panel',
};

export const persesDashboardDataTestIDs = {
editDashboardButtonToolbar: 'edit-dashboard-button-toolbar',
cancelButtonToolbar: 'cancel-button-toolbar',
};

export const listPersesDashboardsDataTestIDs = {
PersesBreadcrumbDashboardItem: 'perses-dashboards-breadcrumb-dashboard-item',
PersesBreadcrumbDashboardNameItem: 'perses-dashboards-breadcrumb-dashboard-name-item',
NameFilter: 'name-filter',
ProjectFilter: 'project-filter',
EmptyStateTitle: 'empty-state-title',
EmptyStateBody: 'empty-state-body',
ClearAllFiltersButton: 'clear-all-filters-button',
DashboardLinkPrefix: 'perseslistpage-',
};

export const listPersesDashboardsOUIAIDs = {
PageHeaderSubtitle: 'PageHeader-subtitle',
PersesBreadcrumb: 'perses-dashboards-breadcrumb',
PersesDashListDataViewTable: 'PersesDashList-DataViewTable',
};