Skip to content

[7.4] [Uptime] update monitor list configs for mobile view (#43218) #44882

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
shahzad31 merged 2 commits into from
Sep 12, 2019
Merged

[7.4] [Uptime] update monitor list configs for mobile view (#43218) #44882

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
6897599
[Uptime] update monitor list configs for mobile view (#43218)
shahzad31 Aug 15, 2019
bd7e991
Merge remote-tracking branch 'upstream/7.4' into backport/7.4/pr-43218
shahzad31 Sep 11, 2019
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
52 changes: 36 additions & 16 deletions ...lic/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 43 additions & 33 deletions x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ export const MonitorListComponent = (props: Props) => {
<EuiBasicTable
error={errors ? formatUptimeGraphQLErrorList(errors) : errors}
loading={loading}
isExpandable
isExpandable={true}
hasActions={true}
itemId="monitor_id"
itemIdToExpandedRowMap={drawerIds.reduce((map: ExpandedRowMap, id: string) => {
return {
Expand Down Expand Up @@ -135,38 +136,6 @@ export const MonitorListComponent = (props: Props) => {
// TODO: reintegrate sorting in future release
// sorting={sorting}
columns={[
{
align: 'left',
field: 'monitor_id',
name: '',
sortable: true,
width: '40px',
render: (id: string) => {
return (
<EuiButtonIcon
aria-label={i18n.translate(
'xpack.uptime.monitorList.expandDrawerButton.ariaLabel',
{
defaultMessage: 'Expand row for monitor with ID {id}',
description:
'The user can click a button on this table and expand further details.',
values: {
id,
},
}
)}
iconType={drawerIds.find(item => item === id) ? 'arrowUp' : 'arrowDown'}
onClick={() => {
if (drawerIds.find(i => id === i)) {
updateDrawerIds(drawerIds.filter(p => p !== id));
} else {
updateDrawerIds([...drawerIds, id]);
}
}}
/>
);
},
},
{
align: 'left',
field: 'state.monitor.status',
Expand Down Expand Up @@ -214,6 +183,9 @@ export const MonitorListComponent = (props: Props) => {
name: i18n.translate('xpack.uptime.monitorList.monitorHistoryColumnLabel', {
defaultMessage: 'Downtime history',
}),
mobileOptions: {
show: false,
},
render: (histogramSeries: SummaryHistogramPoint[] | null) => (
<MonitorBarSeries
absoluteStartDate={absoluteStartDate}
Expand All @@ -224,8 +196,13 @@ export const MonitorListComponent = (props: Props) => {
),
},
{
id: 'actions',
align: 'right',
field: 'state',
hasActions: true,
mobileOptions: {
header: false,
},
name: i18n.translate(
'xpack.uptime.monitorList.observabilityIntegrationsColumnLabel',
{
Expand All @@ -238,6 +215,39 @@ export const MonitorListComponent = (props: Props) => {
<MonitorListActionsPopover summary={summary} />
),
},
{
align: 'left',
field: 'monitor_id',
name: '',
sortable: true,
width: '40px',
isExpander: true,
render: (id: string) => {
return (
<EuiButtonIcon
aria-label={i18n.translate(
'xpack.uptime.monitorList.expandDrawerButton.ariaLabel',
{
defaultMessage: 'Expand row for monitor with ID {id}',
description:
'The user can click a button on this table and expand further details.',
values: {
id,
},
}
)}
iconType={drawerIds.find(item => item === id) ? 'arrowUp' : 'arrowDown'}
onClick={() => {
if (drawerIds.find(i => id === i)) {
updateDrawerIds(drawerIds.filter(p => p !== id));
} else {
updateDrawerIds([...drawerIds, id]);
}
}}
/>
);
},
},
]}
/>
</EuiPanel>
Expand Down