Skip to content

Fix for app analytics crash #1255

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
mengweieric merged 4 commits into from
Nov 4, 2022
Merged

Fix for app analytics crash #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
906c554
fix for app analytics crash
mengweieric Nov 4, 2022
b3fe3c5
updated snapshots
mengweieric Nov 4, 2022
ba0e3e1
fix saved object issue and remove config options not in release
mengweieric Nov 4, 2022
e897f3d
update snapshots
mengweieric Nov 4, 2022
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
2 changes: 1 addition & 1 deletion dashboards-observability/common/types/explorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export interface IExplorerProps {
appBaseQuery?: string;
callback?: any;
callbackInApp?: any;
queryManager: QueryManager;
queryManager?: QueryManager;
}

export interface SavedQuery {
Expand Down
63 changes: 0 additions & 63 deletions ...ility/public/components/custom_panels/helpers/__tests__/__snapshots__/utils.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,13 +402,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down Expand Up @@ -864,13 +857,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down Expand Up @@ -1333,13 +1319,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down Expand Up @@ -2027,13 +2006,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
Object {
"defaultState": Array [],
"editor": [Function],
Expand Down Expand Up @@ -2557,13 +2529,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
Object {
"defaultState": Array [],
"editor": [Function],
Expand Down Expand Up @@ -3101,13 +3066,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
Object {
"defaultState": Array [],
"editor": [Function],
Expand Down Expand Up @@ -3796,13 +3754,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down Expand Up @@ -4258,13 +4209,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down Expand Up @@ -4727,13 +4671,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
},
],
},
Object {
"editor": [Function],
"id": "color-theme",
"mapTo": "colorTheme",
"name": "Color theme",
"schemas": Array [],
},
],
},
Object {
Expand Down
12 changes: 6 additions & 6 deletions dashboards-observability/public/components/event_analytics/explorer/explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import { Sidebar } from './sidebar';
import { TimechartHeader } from './timechart_header';
import { ExplorerVisualizations } from './visualizations';
import { CountDistribution } from './visualizations/count_distribution';
import { QueryManager } from '../../../../common/query_manager';

const TYPE_TAB_MAPPING = {
[SAVED_QUERY]: TAB_EVENT_ID,
Expand Down Expand Up @@ -132,7 +133,7 @@ export const Explorer = ({
setEndTime,
callback,
callbackInApp,
queryManager,
queryManager = new QueryManager(),
}: IExplorerProps) => {
const dispatch = useDispatch();
const requestParams = { tabId };
Expand Down Expand Up @@ -182,8 +183,6 @@ export const Explorer = ({
const [liveTimestamp, setLiveTimestamp] = useState(DATE_PICKER_FORMAT);
const [triggerAvailability, setTriggerAvailability] = useState(false);
const [viewLogPatterns, setViewLogPatterns] = useState(false);
const [isValidDataConfigOptionSelected, setIsValidDataConfigOptionSelected] =
useState<boolean>(false);
const [spanValue, setSpanValue] = useState(false);
const [subType, setSubType] = useState('visualization');
const [metricMeasure, setMetricMeasure] = useState('');
Expand Down Expand Up @@ -309,8 +308,9 @@ export const Explorer = ({
// fill saved user configs
if (objectData?.type) {
let visConfig = {};
if (!isEmpty(objectData.user_configs) && !isEmpty(objectData.user_configs.series)) {
visConfig = JSON.parse(objectData.user_configs);
const customConfig = objectData.user_configs ? JSON.parse(objectData.user_configs) : {};
if (!isEmpty(customConfig.dataConfig) && !isEmpty(customConfig.dataConfig?.series)) {
visConfig = { ...customConfig };
} else {
const statsTokens = queryManager.queryParser().parse(objectData.query).getStats();
visConfig = { dataConfig: { ...getDefaultVisConfig(statsTokens) } };
Expand Down Expand Up @@ -1350,7 +1350,7 @@ export const Explorer = ({
delayTime: number
) => {
setLiveTailName(name);
setLiveTailTabId(curSelectedTabId.current as unknown as string);
setLiveTailTabId((curSelectedTabId.current as unknown) as string);
setIsLiveTailOn(true);
setToast('Live tail On', 'success');
setIsLiveTailPopoverOpen(false);
Expand Down
Loading