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

[Metrics UI] Saved views bugs #72518

Merged
merged 20 commits into from
Jul 28, 2020
Merged

[Metrics UI] Saved views bugs #72518

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
653f3ea
Add test for logs and metrics telemetry
phillipb Jul 6, 2020
f00af0b
wait before you go
phillipb Jul 6, 2020
d982662
Remove kubenetes
phillipb Jul 6, 2020
0982567
Fix type check
phillipb Jul 6, 2020
5b1f83c
Add back kubernetes test
phillipb Jul 6, 2020
e5632e7
Remove kubernetes
phillipb Jul 7, 2020
fc83fe8
Don't allow deleting default default view.
phillipb Jul 20, 2020
e2bfd37
Merge branch 'master' into saved-views-bugs
phillipb Jul 20, 2020
5edad20
Fix bug with duplicate loads of data.
phillipb Jul 21, 2020
cabc2f5
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 21, 2020
aa34cdb
Remove unused variable
phillipb Jul 21, 2020
bc747c2
Merge branch 'saved-views-bugs' of github.com:phillipb/kibana into sa…
phillipb Jul 21, 2020
588e562
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 21, 2020
f0ceef3
Reload when loadData function is changed
phillipb Jul 21, 2020
2e57d7a
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 22, 2020
7c9d6ca
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 23, 2020
bc606e9
Merge branch 'saved-views-bugs' of github.com:phillipb/kibana into sa…
phillipb Jul 23, 2020
bd31fa8
Don't send the request immediately
phillipb Jul 23, 2020
a46d853
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 23, 2020
a89ef3c
Merge branch 'master' into saved-views-bugs
elasticmachine Jul 28, 2020
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
4 changes: 4 additions & 0 deletions x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ export function SavedViewManageViewsFlyout<ViewState>({

const renderDeleteAction = useCallback(
(item: SavedView<ViewState>) => {
if (item.id === '0') {
return <></>;
}

return (
<DeleteConfimation
isDisabled={item.isDefault}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
/>
</EuiFlexItem>
<EuiFlexItem>
<EuiDescriptionList onClick={showSavedViewMenu}>
<EuiDescriptionList compressed={true} onClick={showSavedViewMenu}>
<EuiDescriptionListTitle>
<FormattedMessage
defaultMessage="Current view"
Expand Down
8 changes: 3 additions & 5 deletions x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const useSavedView = (props: Props) => {
const { data, loading, find, error: errorOnFind, hasView } = useFindSavedObject<
SavedViewSavedObject<ViewState>
>(viewType);

const [shouldLoadDefault] = useState(props.shouldLoadDefault);
const [currentView, setCurrentView] = useState<SavedView<any> | null>(null);
const [loadingDefaultView, setLoadingDefaultView] = useState<boolean | null>(null);
const { create, error: errorOnCreate, data: createdViewData, createdId } = useCreateSavedObject(
Expand Down Expand Up @@ -211,8 +211,6 @@ export const useSavedView = (props: Props) => {
}, [setCurrentView, defaultViewId, defaultViewState]);

useEffect(() => {
const shouldLoadDefault = props.shouldLoadDefault;

if (loadingDefaultView || currentView || !shouldLoadDefault) {
return;
}
Expand All @@ -225,7 +223,7 @@ export const useSavedView = (props: Props) => {
}
}, [
loadDefaultView,
props.shouldLoadDefault,
shouldLoadDefault,
setDefault,
loadingDefaultView,
currentView,
Expand All @@ -246,7 +244,7 @@ export const useSavedView = (props: Props) => {
errorOnUpdate,
errorOnFind,
errorOnCreate: createError,
shouldLoadDefault: props.shouldLoadDefault,
shouldLoadDefault,
makeDefault,
sourceIsLoading,
deleteView,
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export const Layout = () => {
sourceId,
currentTime,
accountId,
region
region,
false
);

const options = {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
// load metrics explorer data after default view loaded, unless we're not loading a view
loadData();
}
}, [loadData, currentView, shouldLoadDefault]);
/* eslint-disable-next-line react-hooks/exhaustive-deps */
}, [loadData, shouldLoadDefault]);

return (
<EuiErrorBoundary>
Expand Down