Skip to content
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

[TSVB] Shows wrong labels when we get only one series after splitting #111736

Merged
merged 9 commits into from
Sep 13, 2021
Merged

[TSVB] Shows wrong labels when we get only one series after splitting #111736

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bb82a8
use correct styles when after split we have only one series
VladLasitsa Sep 9, 2021
4223f12
Fix lint
VladLasitsa Sep 9, 2021
cc772c0
Merge branch 'master' into fix_tsvb_split
kibanamachine Sep 10, 2021
da3ae62
Fix comments
VladLasitsa Sep 10, 2021
edd5f49
remove unused styles
VladLasitsa Sep 10, 2021
ee034bf
Merge branch 'master' into fix_tsvb_split
kibanamachine Sep 10, 2021
15efb50
Update _vis_with_splits.scss
VladLasitsa Sep 10, 2021
c6637ee
Merge remote-tracking branch 'upstream/master' into fix_tsvb_split
VladLasitsa Sep 13, 2021
9b4444c
Fix lint
VladLasitsa Sep 13, 2021
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
13 changes: 13 additions & 0 deletions src/plugins/vis_type_timeseries/public/application/components/_vis_with_splits.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,16 @@
min-height: $tvbSplitBlockVisMinSize / 1.25;
}
}

// When there is only one visualization, expand the full height and remove all minimum sizes
.tvbSplitVis--one {
flex: 1;

.tvbSplitVis__split {
min-width: 0;

> .tvbVis {
min-height: 0;
}
}
}
19 changes: 15 additions & 4 deletions src/plugins/vis_type_timeseries/public/application/components/vis_with_splits.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import React, { useCallback } from 'react';
import classNames from 'classnames';
import { getDisplayName } from './lib/get_display_name';
import { labelDateFormatter } from './lib/label_date_formatter';
import { findIndex, first } from 'lodash';
Expand Down Expand Up @@ -40,8 +41,7 @@ export function visWithSplits(WrappedComponent) {
[model, palettesService, syncColors, visData]
);

if (!model || !visData || !visData[model.id] || visData[model.id].series.length === 1)
return <WrappedComponent {...props} />;
if (!model || !visData || !visData[model.id]) return <WrappedComponent {...props} />;
if (visData[model.id].series.every((s) => s.id.split(':').length === 1)) {
return <WrappedComponent {...props} />;
}
Expand Down Expand Up @@ -105,7 +105,10 @@ export function visWithSplits(WrappedComponent) {
},
};
return (
<div key={key} className="tvbSplitVis__split">
<div
key={key}
className="tvbSplitVis__split"
>
<WrappedComponent
model={model}
visData={newVisData}
Expand All @@ -119,7 +122,15 @@ export function visWithSplits(WrappedComponent) {
);
});

return <div className="tvbSplitVis">{rows}</div>;
const hasOneVis = visData[model.id].series.length === 1;

return (
<div
className={classNames('tvbSplitVis', {'tvbSplitVis--one': hasOneVis})}
>
{rows}
</div>
);
}

SplitVisComponent.displayName = `SplitVisComponent(${getDisplayName(WrappedComponent)})`;
Expand Down