Skip to content

Commit

Permalink
Update availabilityVizId if visualization is removed from panel (#732)
Browse files Browse the repository at this point in the history
Signed-off-by: Eugene Lee <eugenesk@amazon.com>
(cherry picked from commit 291d17f)
  • Loading branch information
eugenesk24 authored and github-actions[bot] committed May 17, 2022
1 parent 2af31ca commit 5c484d1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import PPLService from 'public/services/requests/ppl';
import SavedObjects from 'public/services/saved_objects/event_analytics/saved_objects';
import TimestampUtils from 'public/services/timestamp/timestamp';
import React, { ReactChild, useEffect, useState } from 'react';
import { uniqueId } from 'lodash';
import { useHistory } from 'react-router-dom';
import { useDispatch } from 'react-redux';
import { last } from 'lodash';
import { VisualizationType } from 'common/types/custom_panels';
import { TracesContent } from '../../../components/trace_analytics/components/traces/traces_content';
import { DashboardContent } from '../../../components/trace_analytics/components/dashboard/dashboard_content';
import { ServicesContent } from '../../trace_analytics/components/services/services_content';
Expand Down Expand Up @@ -382,6 +382,12 @@ export function Application(props: AppDetailProps) {
switchToEditViz(savedVisualizationId);
};

const updateAvailabilityVizId = (vizs: VisualizationType[]) => {
if (!vizs.map((viz) => viz.savedVisualizationId).includes(application.availabilityVisId)) {
updateApp(appId, { availabilityVisId: '' }, 'editAvailability');
}
};

const getPanel = () => {
return (
<CustomPanelView
Expand All @@ -399,6 +405,7 @@ export function Application(props: AppDetailProps) {
setToast={setToasts}
page="app"
appId={appId}
updateAvailabilityVizId={updateAvailabilityVizId}
startTime={appStartTime}
endTime={appEndTime}
setStartTime={setStartTimeForApp}
Expand Down
3 changes: 3 additions & 0 deletions public/components/custom_panels/custom_panel_view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ interface CustomPanelViewProps {
setEndTime: any;
childBreadcrumbs?: EuiBreadcrumb[];
appId?: string;
updateAvailabilityVizId?: any;
onAddClick?: any;
}

Expand All @@ -127,6 +128,7 @@ export const CustomPanelView = (props: CustomPanelViewProps) => {
endTime,
setStartTime,
setEndTime,
updateAvailabilityVizId,
renameCustomPanel,
deleteCustomPanel,
cloneCustomPanel,
Expand Down Expand Up @@ -643,6 +645,7 @@ export const CustomPanelView = (props: CustomPanelViewProps) => {
<PanelGrid
http={http}
panelId={panelId}
updateAvailabilityVizId={updateAvailabilityVizId}
chrome={chrome}
panelVisualizations={panelVisualizations}
setPanelVisualizations={setPanelVisualizations}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ interface PanelGridProps {
http: CoreStart['http'];
chrome: CoreStart['chrome'];
panelId: string;
updateAvailabilityVizId?: any;
panelVisualizations: VisualizationType[];
setPanelVisualizations: React.Dispatch<React.SetStateAction<VisualizationType[]>>;
editMode: boolean;
Expand All @@ -64,6 +65,7 @@ export const PanelGrid = (props: PanelGridProps) => {
http,
chrome,
panelId,
updateAvailabilityVizId,
panelVisualizations,
setPanelVisualizations,
editMode,
Expand Down Expand Up @@ -166,6 +168,7 @@ export const PanelGrid = (props: PanelGridProps) => {
_.omit(layout, ['static', 'moved'])
);
saveVisualizationLayouts(panelId, visualizationParams);
updateAvailabilityVizId(panelVisualizations);
}
}, [editActionType]);

Expand Down

0 comments on commit 5c484d1

Please sign in to comment.